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

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

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Fix browser_tests Created 3 years, 6 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/app/settings_strings.grdp » ('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 <!-- Chrome OS-specific strings (included from generated_resources.grd). 2 <!-- Chrome OS-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 <!-- Idle logout dialog for retail mode --> 7 <!-- Idle logout dialog for retail mode -->
8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only."> 8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only.">
9 Are you still there? 9 Are you still there?
10 </message> 10 </message>
(...skipping 3874 matching lines...) Expand 10 before | Expand all | Expand 10 after
3885 <message name="IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK" desc="The menu option to disable spoken feedback accessibility feature."> 3885 <message name="IDS_STATUSBAR_DISABLE_SPOKEN_FEEDBACK" desc="The menu option to disable spoken feedback accessibility feature.">
3886 Disable ChromeVox (spoken feedback) 3886 Disable ChromeVox (spoken feedback)
3887 </message> 3887 </message>
3888 <message name="IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET" desc="Label for an ether net network device."> 3888 <message name="IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET" desc="Label for an ether net network device.">
3889 Ethernet 3889 Ethernet
3890 </message> 3890 </message>
3891 <message name="IDS_STATUSBAR_NETWORK_DEVICE_WIFI" desc="Label for a wifi netwo rk device."> 3891 <message name="IDS_STATUSBAR_NETWORK_DEVICE_WIFI" desc="Label for a wifi netwo rk device.">
3892 Wi-Fi 3892 Wi-Fi
3893 </message> 3893 </message>
3894 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR" desc="Label for a cellul ar network device."> 3894 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR" desc="Label for a cellul ar network device.">
3895 Mobile Data 3895 Mobile data
3896 </message> 3896 </message>
3897 <message name="IDS_NETWORK_TYPE_ETHERNET" desc="The ethernet network type."> 3897 <message name="IDS_NETWORK_TYPE_ETHERNET" desc="Label for Ethernet networks.">
3898 Ethernet 3898 Ethernet
3899 </message> 3899 </message>
3900 <message name="IDS_NETWORK_TYPE_TETHER" desc="The Tether network type."> 3900 <message name="IDS_NETWORK_TYPE_WIFI" desc="Label for WiFi networks.">
3901 Tether
3902 </message>
3903 <message name="IDS_NETWORK_TYPE_WIFI" desc="The wifi network type.">
3904 Wi-Fi 3901 Wi-Fi
3905 </message> 3902 </message>
3906 <message name="IDS_NETWORK_TYPE_WIMAX" desc="The wimax network type."> 3903 <message name="IDS_NETWORK_TYPE_WIMAX" desc="Label for WiMAX networks.">
3907 WiMAX 3904 WiMAX
3908 </message> 3905 </message>
3909 <message name="IDS_NETWORK_TYPE_BLUETOOTH" desc="The bluetooth network type."> 3906 <message name="IDS_NETWORK_TYPE_BLUETOOTH" desc="Label for Bluetooth networks. ">
3910 Bluetooth 3907 Bluetooth
3911 </message> 3908 </message>
3912 <message name="IDS_NETWORK_TYPE_CELLULAR" desc="The cellular network type."> 3909 <message name="IDS_NETWORK_TYPE_MOBILE_DATA" desc="Label for Cellular and Teth er networks.">
3913 Mobile 3910 Mobile data
3914 </message> 3911 </message>
3915 <message name="IDS_NETWORK_TYPE_VPN" desc="The vpn network type."> 3912 <message name="IDS_NETWORK_TYPE_VPN" desc="Label for VPN networks.">
3916 VPN 3913 VPN
3917 </message> 3914 </message>
3918 <message name="IDS_NETWORK_TYPE_VPN_BUILTIN" desc="The built-in VPN types (Ope n VPN and L2TP/IPSec)."> 3915 <message name="IDS_NETWORK_TYPE_VPN_BUILTIN" desc="The built-in VPN types (Ope n VPN and L2TP/IPSec).">
3919 OpenVPN / L2TP 3916 OpenVPN / L2TP
3920 </message> 3917 </message>
3921 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING" desc="The network devi ce status connecting."> 3918 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING" desc="The network devi ce status connecting.">
3922 Connecting... 3919 Connecting...
3923 </message> 3920 </message>
3924 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED" desc="The network devic e status connected."> 3921 <message name="IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED" desc="The network devic e status connected.">
3925 Connected 3922 Connected
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after
6125 Attempts left: $1 6122 Attempts left: $1
6126 </message> 6123 </message>
6127 <message name="IDS_REQUEST_PIN_DIALOG_PIN" desc="The Provider Identification N umber abbreviation"> 6124 <message name="IDS_REQUEST_PIN_DIALOG_PIN" desc="The Provider Identification N umber abbreviation">
6128 PIN 6125 PIN
6129 </message> 6126 </message>
6130 <message name="IDS_REQUEST_PIN_DIALOG_PUK" desc="The Personal Unlocking Key (a s used in mobile phones) abbreviation"> 6127 <message name="IDS_REQUEST_PIN_DIALOG_PUK" desc="The Personal Unlocking Key (a s used in mobile phones) abbreviation">
6131 PUK 6128 PUK
6132 </message> 6129 </message>
6133 6130
6134 </grit-part> 6131 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/settings_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698