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

Side by Side Diff: chrome/app/settings_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 | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/tether/tether_service.cc » ('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 <!-- Settings-specific strings (included from generated_resources.grd). --> 2 <!-- Settings-specific strings (included from generated_resources.grd). -->
3 <grit-part> 3 <grit-part>
4 <!-- Main Page --> 4 <!-- Main Page -->
5 <if expr="chromeos"> 5 <if expr="chromeos">
6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session."> 6 <message name="IDS_SETTINGS_SECONDARY_USER_BANNER" desc="Banner displayed in settings page when the user is secondary in a multi-profile session.">
7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in. 7 Some settings belonging to <ph name="PRIMARY_EMAIL">$1<ex>john@google.com< /ex></ph> are being shared with you. These settings only affect your account whe n using multiple sign-in.
8 </message> 8 </message>
9 </if> 9 </if>
10 10
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 </message> 542 </message>
543 <message name="IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE" desc="Title of the settings dialog for adding or pairing Bluetooth a device."> 543 <message name="IDS_SETTINGS_BLUETOOTH_PAIR_DEVICE_TITLE" desc="Title of the settings dialog for adding or pairing Bluetooth a device.">
544 Pair Bluetooth device 544 Pair Bluetooth device
545 </message> 545 </message>
546 <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES" desc="Message displayed wh en there are no paired Bluetooth devices scan."> 546 <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES" desc="Message displayed wh en there are no paired Bluetooth devices scan.">
547 No paired devices 547 No paired devices
548 </message> 548 </message>
549 <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND" desc="Message displa yed when no Bluetooth devices are found after a scan."> 549 <message name="IDS_SETTINGS_BLUETOOTH_NO_DEVICES_FOUND" desc="Message displa yed when no Bluetooth devices are found after a scan.">
550 No Bluetooth devices found 550 No Bluetooth devices found
551 </message> 551 </message>
552 <message name="IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL" desc="Acce ssibility only label for Bluetooth enable/disable toggle ."> 552 <message name="IDS_SETTINGS_BLUETOOTH_TOGGLE_ACCESSIBILITY_LABEL" desc="Acce ssibility only label for Bluetooth enable/disable toggle.">
553 Bluetooth enable 553 Bluetooth enable
554 </message> 554 </message>
555 <message name="IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL" desc="Labe l for the button that toggles showing available Bluetooth devices. Only visible by screen reader software."> 555 <message name="IDS_SETTINGS_BLUETOOTH_EXPAND_ACCESSIBILITY_LABEL" desc="Labe l for the button that toggles showing available Bluetooth devices. Only visible by screen reader software.">
556 Show available Bluetooth devices 556 Show available Bluetooth devices
557 </message> 557 </message>
558 <message name="IDS_SETTINGS_BLUETOOTH_REMOVE" desc="Label for removing (unpa iring) a paired Bluetooth device"> 558 <message name="IDS_SETTINGS_BLUETOOTH_REMOVE" desc="Label for removing (unpa iring) a paired Bluetooth device">
559 Remove from list 559 Remove from list
560 </message> 560 </message>
561 <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE" desc="Bluetooth pairi ng message typically displayed when the external Bluetooth 2.0 and older device has no display or means of input."> 561 <message name="IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE" desc="Bluetooth pairi ng message typically displayed when the external Bluetooth 2.0 and older device has no display or means of input.">
562 Please enter the PIN for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>": 562 Please enter the PIN for "<ph name="DEVICE_NAME">$1<ex>Nexus S</ex></ph>":
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1365 </message> 1365 </message>
1366 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI" des c="Settings > Internet > Tether Connection Dialog > Bullet point alerting the us er that the tether host (i.e., the device to which the current device will conne ct to) will disconnect from Wi-Fi."> 1366 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI" des c="Settings > Internet > Tether Connection Dialog > Bullet point alerting the us er that the tether host (i.e., the device to which the current device will conne ct to) will disconnect from Wi-Fi.">
1367 Disconnect from Wi-Fi 1367 Disconnect from Wi-Fi
1368 </message> 1368 </message>
1369 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON" desc= "Settings > Internet > Tether Connection Dialog > Button which, when tapped, clo ses the dialog and does not connect the device."> 1369 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON" desc= "Settings > Internet > Tether Connection Dialog > Button which, when tapped, clo ses the dialog and does not connect the device.">
1370 Not now 1370 Not now
1371 </message> 1371 </message>
1372 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON" desc= "Settings > Internet > Tether Connection Dialog > Button which, when tapped, sta rts a connection attempt to the device."> 1372 <message name="IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON" desc= "Settings > Internet > Tether Connection Dialog > Button which, when tapped, sta rts a connection attempt to the device.">
1373 Connect 1373 Connect
1374 </message> 1374 </message>
1375 <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL" desc ="Accessibility only label for tether enable/disable toggle ."> 1375 <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_LABEL" desc="Settings > I nternet: Label for Tether enable/disable toggle .">
1376 Tether enable 1376 Get data connection
1377 </message>
1378 <message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_SUBTEXT" desc="Settings > Internet: Description for Tether enable/disable toggle .">
1379 Let this device find other devices with your Google Account that have a ce llular data connection
1377 </message> 1380 </message>
1378 <message name="IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL" desc ="Accessibility only label for mobile data enable/disable toggle ."> 1381 <message name="IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL" desc ="Accessibility only label for mobile data enable/disable toggle .">
1379 Mobile data enable 1382 Mobile data enable
1380 </message> 1383 </message>
1381 <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL" desc=" Accessibility only label for WiFi enable/disable toggle ."> 1384 <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL" desc=" Accessibility only label for WiFi enable/disable toggle .">
1382 Wi-Fi enable 1385 Wi-Fi enable
1383 </message> 1386 </message>
1384 <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIMAX_ACCESSIBILITY_LABEL" desc= "Accessibility only label for WiMAX enable/disable toggle ."> 1387 <message name="IDS_SETTINGS_INTERNET_TOGGLE_WIMAX_ACCESSIBILITY_LABEL" desc= "Accessibility only label for WiMAX enable/disable toggle .">
1385 WiMAX enable 1388 WiMAX enable
1386 </message> 1389 </message>
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
3139 System 3142 System
3140 </message> 3143 </message>
3141 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available."> 3144 <message name="IDS_SETTINGS_SYSTEM_HARDWARE_ACCELERATION_LABEL" desc="Label for the checkbox that forces Chrome to render via hardware acceleration (GPU) wh en available.">
3142 Use hardware acceleration when available 3145 Use hardware acceleration when available
3143 </message> 3146 </message>
3144 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings."> 3147 <message name="IDS_SETTINGS_SYSTEM_PROXY_SETTINGS_LABEL" desc="Label for the control that opens a user's network proxy settings.">
3145 Open proxy settings 3148 Open proxy settings
3146 </message> 3149 </message>
3147 </if> 3150 </if>
3148 </grit-part> 3151 </grit-part>
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/tether/tether_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698