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

Side by Side Diff: ash/ash_chromeos_strings.grdp

Issue 2510083006: chromeos: Move ownership of ash VPN provider list from chrome into ash (Closed)
Patch Set: Collapse VPNProvider::Key and VPNProvider structs Created 4 years, 1 month 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 | ash/common/BUILD.gn » ('j') | ash/common/system/chromeos/network/vpn_list_view.cc » ('J')
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 ash_strings.grd). 2 <!-- ChromeOS-specific strings (included from ash_strings.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 5
6 <!-- Device types --> 6 <!-- Device types -->
7 <message name="IDS_ASH_CHROMEBASE" desc="The device name for a Chromebase (ver sus say Chromebox)"> 7 <message name="IDS_ASH_CHROMEBASE" desc="The device name for a Chromebase (ver sus say Chromebox)">
8 Chromebase 8 Chromebase
9 </message> 9 </message>
10 <message name="IDS_ASH_CHROMEBIT" desc="The device name for a Chromebit (versu s say Chromebox)"> 10 <message name="IDS_ASH_CHROMEBIT" desc="The device name for a Chromebit (versu s say Chromebox)">
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 </message> 89 </message>
90 <message name="IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING" desc="The label used when a network connection is connecting."> 90 <message name="IDS_ASH_STATUS_TRAY_NETWORK_STATUS_CONNECTING" desc="The label used when a network connection is connecting.">
91 Connecting... 91 Connecting...
92 </message> 92 </message>
93 <message name="IDS_ASH_STATUS_TRAY_CELLULAR_STATUS_NOT_ACTIVATED" desc="The la bel used when a cellular connection is not activated."> 93 <message name="IDS_ASH_STATUS_TRAY_CELLULAR_STATUS_NOT_ACTIVATED" desc="The la bel used when a cellular connection is not activated.">
94 Not activated 94 Not activated
95 </message> 95 </message>
96 <message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detail ed view header."> 96 <message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detail ed view header.">
97 Private Network 97 Private Network
98 </message> 98 </message>
99 <message name="IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER" desc="The name of th e built-in VPN provider that supports OpenVPN and L2TP over IPsec.">
100 OpenVPN / L2TP
101 </message>
102 <message name="IDS_ASH_STATUS_TRAY_VPN_DISCONNECT" desc="Message on button tha t disconnects from the current VPN.">
103 Disconnect
104 </message>
99 <message name="IDS_ASH_STATUS_TRAY_VPN_MONITORED" desc="The label used when a VPN connection may be monitored."> 105 <message name="IDS_ASH_STATUS_TRAY_VPN_MONITORED" desc="The label used when a VPN connection may be monitored.">
100 Connection may be monitored 106 Connection may be monitored
101 </message> 107 </message>
102 <message name="IDS_ASH_STATUS_TRAY_WIFI" desc="The wifi network device."> 108 <message name="IDS_ASH_STATUS_TRAY_WIFI" desc="The wifi network device.">
103 Wi-Fi 109 Wi-Fi
104 </message> 110 </message>
105 <message name="IDS_ASH_STATUS_TRAY_CELLULAR" desc="The accessible text for the cellular button."> 111 <message name="IDS_ASH_STATUS_TRAY_CELLULAR" desc="The accessible text for the cellular button.">
106 Cellular 112 Cellular
107 </message> 113 </message>
108 <message name="IDS_ASH_STATUS_TRAY_NETWORK_INFO" desc="The accessible text for the network info button."> 114 <message name="IDS_ASH_STATUS_TRAY_NETWORK_INFO" desc="The accessible text for the network info button.">
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 </message> 176 </message>
171 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_ACCEPT" desc="Message on button t o accept Bluetooth pairing request."> 177 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_ACCEPT" desc="Message on button t o accept Bluetooth pairing request.">
172 Accept 178 Accept
173 </message> 179 </message>
174 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_REJECT" desc="Message on button t o reject Bluetooth pairing request."> 180 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_REJECT" desc="Message on button t o reject Bluetooth pairing request.">
175 Reject 181 Reject
176 </message> 182 </message>
177 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED" desc="Notification shown when a new device is paired with the computer."> 183 <message name="IDS_ASH_STATUS_TRAY_BLUETOOTH_PAIRED" desc="Notification shown when a new device is paired with the computer.">
178 Bluetooth device "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>" has been p aired and is now available to all users. You may remove this pairing using Setti ngs. 184 Bluetooth device "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>" has been p aired and is now available to all users. You may remove this pairing using Setti ngs.
179 </message> 185 </message>
180 <message name="IDS_ASH_STATUS_TRAY_VPN_DISCONNECT" desc="Message on button tha t disconnects from the current VPN.">
181 Disconnect
182 </message>
183 186
184 <!-- Ash multi-user warning dialog --> 187 <!-- Ash multi-user warning dialog -->
185 <message name="IDS_DESKTOP_CASTING_ACTIVE_TITLE" desc="The title for the dialo g which tells the user that desktop casting is in progress, asking if the castin g should be stopped before switching - or - the switch should be aborted."> 188 <message name="IDS_DESKTOP_CASTING_ACTIVE_TITLE" desc="The title for the dialo g which tells the user that desktop casting is in progress, asking if the castin g should be stopped before switching - or - the switch should be aborted.">
186 Stop screen sharing? 189 Stop screen sharing?
187 </message> 190 </message>
188 <message name="IDS_DESKTOP_CASTING_ACTIVE_MESSAGE" desc="The message for the d ialog which tells the user that desktop casting is in progress, asking if the ca sting should be stopped before switching - or - the switch should be aborted."> 191 <message name="IDS_DESKTOP_CASTING_ACTIVE_MESSAGE" desc="The message for the d ialog which tells the user that desktop casting is in progress, asking if the ca sting should be stopped before switching - or - the switch should be aborted.">
189 Screen sharing will stop when you switch to another user. Do you want to con tinue? 192 Screen sharing will stop when you switch to another user. Do you want to con tinue?
190 </message> 193 </message>
191 <message name="IDS_DESKTOP_CASTING_ACTIVE_BUTTON_SWITCH_USER" desc="The button label for the dialog which tells the user that desktop casting is in progress. By selecting this button the casting will be stopped and the user will get switc hed."> 194 <message name="IDS_DESKTOP_CASTING_ACTIVE_BUTTON_SWITCH_USER" desc="The button label for the dialog which tells the user that desktop casting is in progress. By selecting this button the casting will be stopped and the user will get switc hed.">
192 Yes 195 Yes
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 desc="Notification message to tell users about the deprecation of Shi ft+Alt shortcut to switch to the next input method."> 619 desc="Notification message to tell users about the deprecation of Shi ft+Alt shortcut to switch to the next input method.">
617 The shortcut to switch to the next input method has changed. Please use <ph name="NEW_SHORTCUT">$1<ex>Ctrl+Shift+Space</ex></ph> instead of <ph name="OLD_SH ORTCUT">$2<ex>Shift+Alt</ex></ph>. 620 The shortcut to switch to the next input method has changed. Please use <ph name="NEW_SHORTCUT">$1<ex>Ctrl+Shift+Space</ex></ph> instead of <ph name="OLD_SH ORTCUT">$2<ex>Shift+Alt</ex></ph>.
618 </message> 621 </message>
619 622
620 <!-- Notification that an accelerator was pressed, so the user knows how to to ggle it back --> 623 <!-- Notification that an accelerator was pressed, so the user knows how to to ggle it back -->
621 <message name="IDS_HIGH_CONTRAST_ACCEL_MSG" 624 <message name="IDS_HIGH_CONTRAST_ACCEL_MSG"
622 desc="Notification message to tell users that they just pressed the S earch+Shift+H shortcut to toggle High Contrast Mode, and that pressing it again will toggle it off."> 625 desc="Notification message to tell users that they just pressed the S earch+Shift+H shortcut to toggle High Contrast Mode, and that pressing it again will toggle it off.">
623 High Contrast Mode enabled. Press Search+Shift+H again to toggle it off. 626 High Contrast Mode enabled. Press Search+Shift+H again to toggle it off.
624 </message> 627 </message>
625 </grit-part> 628 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | ash/common/BUILD.gn » ('j') | ash/common/system/chromeos/network/vpn_list_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698