Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: chrome/app/chromeos_strings.grdp

Issue 1026463003: Revert of Allow users to add third-party VPNs from the settings page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_3_460428_update_details_dialog
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/options/chromeos/network_list.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- ChromeOS-specific strings (included from generated_resources.grd). 2 <!-- ChromeOS-specific strings (included from generated_resources.grd).
3 Everything in this file is wrapped in <if expr="chromeos">. --> 3 Everything in this file is wrapped in <if expr="chromeos">. -->
4 <grit-part> 4 <grit-part>
5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required."> 5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required.">
6 </message> 6 </message>
7 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook."> 7 <message name="IDS_CHROMEBOOK" desc="The localized name for Chromebook.">
8 Chromebook 8 Chromebook
9 </message> 9 </message>
10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox"> 10 <message name="IDS_CHROMEBOX" desc="The localized name for Chromebox">
(...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1880 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION" desc="Title for control to add a new network connection." > 1880 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION" desc="Title for control to add a new network connection." >
1881 Add connection 1881 Add connection
1882 </message> 1882 </message>
1883 <message name="IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI" desc="Menu item for a dding a new Wi-Fi connection" > 1883 <message name="IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI" desc="Menu item for a dding a new Wi-Fi connection" >
1884 Add Wi-Fi... 1884 Add Wi-Fi...
1885 </message> 1885 </message>
1886 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_REMEMBERED_NETWORK" desc="Ti tle for section in settings/internet for list of remembered (favirote) networks" > 1886 <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_REMEMBERED_NETWORK" desc="Ti tle for section in settings/internet for list of remembered (favirote) networks" >
1887 Remembered networks 1887 Remembered networks
1888 1888
1889 </message> 1889 </message>
1890 <message name="IDS_OPTIONS_SETTINGS_ADD_VPN_TEMPLATE" desc="Template for const ructing a menu item that will ask a given VPN provider to show its 'add network' dialog.">
1891 Add <ph name="PROVIDER_NAME">$1<ex>OpenVPN</ex></ph>...
1892 </message>
1893 <!-- Network state strings --> 1890 <!-- Network state strings -->
1894 <message name="IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED" desc="Displayed state for a network when not connected."> 1891 <message name="IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED" desc="Displayed state for a network when not connected.">
1895 Not connected 1892 Not connected
1896 </message> 1893 </message>
1897 <message name="IDS_CHROMEOS_NETWORK_STATE_CONNECTED" desc="Displayed state for a network when connected"> 1894 <message name="IDS_CHROMEOS_NETWORK_STATE_CONNECTED" desc="Displayed state for a network when connected">
1898 Connected 1895 Connected
1899 </message> 1896 </message>
1900 <message name="IDS_CHROMEOS_NETWORK_STATE_CONNECTING" desc="Displayed state fo r a network when connecting"> 1897 <message name="IDS_CHROMEOS_NETWORK_STATE_CONNECTING" desc="Displayed state fo r a network when connecting">
1901 Not Connected 1898 Not Connected
1902 </message> 1899 </message>
(...skipping 4207 matching lines...) Expand 10 before | Expand all | Expand 10 after
6110 <message name="IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL" desc="Option in chrome://settings that allows Captive Portal authorization pages to ignore proxy settings."> 6107 <message name="IDS_OPTIONS_CAPTIVE_PORTAL_BYPASS_PROXY_LABEL" desc="Option in chrome://settings that allows Captive Portal authorization pages to ignore proxy settings.">
6111 Allow captive portal sign-in page to bypass proxy servers 6108 Allow captive portal sign-in page to bypass proxy servers
6112 </message> 6109 </message>
6113 <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME" desc="Name of the option to enable punching holes in the Chrome OS firewall."> 6110 <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME" desc="Name of the option to enable punching holes in the Chrome OS firewall.">
6114 Enable firewall hole punching. 6111 Enable firewall hole punching.
6115 </message> 6112 </message>
6116 <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION" desc="Desc ription of the option to enable punching holes in the Chrome OS firewall."> 6113 <message name="IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION" desc="Desc ription of the option to enable punching holes in the Chrome OS firewall.">
6117 Enable punching holes in the Chrome OS firewall for Chrome Apps that open a TCP/IP server socket or UDP socket. 6114 Enable punching holes in the Chrome OS firewall for Chrome Apps that open a TCP/IP server socket or UDP socket.
6118 </message> 6115 </message>
6119 </grit-part> 6116 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/chromeos/network_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698