PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updated the string resource"

Browse Source
This commit is contained in:
Lifu Tang
2015-04-10 22:27:31 +00:00
committed by Android (Google) Code Review
parent 35fba3eeaf 3ebd352054
commit b1c342929c
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
res/values/strings.xml
View File

@@ -1237,9 +1237,11 @@
<!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
the user to "scanning settings" screen. --> the user to "scanning settings" screen. -->
<string name="ble_scan_notify_text">To improve location accuracy, Google services will scan for <string name="ble_scan_notify_text">To improve location accuracy, apps and
Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning services will scan for Bluetooth devices, even when Bluetooth is off.
settingsLINK_END.</string> You can change this in
<xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
<!-- Bluetooth settings. The title of the screen to pick which profiles to connect to on the device. For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. --> <!-- Bluetooth settings. The title of the screen to pick which profiles to connect to on the device. For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
@@ -1413,9 +1415,11 @@
<!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
the user to "scanning settings" screen. --> the user to "scanning settings" screen. -->
<string name="wifi_scan_notify_text">To improve location accuracy, Google services will scan for <string name="wifi_scan_notify_text">To improve location accuracy, apps and
Wi\u2011Fi networks, even when Wi\u2011Fi is off. You can change this in LINK_BEGINscanning services will scan for Wi\u2011Fi networks, even when Wi\u2011Fi is off.
settingsLINK_END.</string> You can change this in
<xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
<!-- Wifi scan always mode checkbox text --> <!-- Wifi scan always mode checkbox text -->
<string name="wifi_scan_notify_remember_choice">Don\'t show again</string> <string name="wifi_scan_notify_remember_choice">Don\'t show again</string>
<!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? --> <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
@@ -2608,16 +2612,18 @@
<string name="location_menu_scanning">Scanning</string> <string name="location_menu_scanning">Scanning</string>
<!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title --> <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
<string name="location_scanning_screen_title">Scanning</string> <string name="location_scanning_screen_title">Scanning</string>
<!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning [DO NOT TRANSLATE] --> <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
<string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning always available</string> <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
<!-- Preference description text for Wi-Fi always scanning [DO NOT TRANSLATE] --> <!-- Preference description text for Wi-Fi always scanning -->
<string name="location_scanning_wifi_always_scanning_description">The clear history button in <string name="location_scanning_wifi_always_scanning_description">Improve
your browser has saved more lives than Superman</string> location by allowing apps and services to scan for Wi\u2011Fi networks
<!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning [DO NOT TRANSLATE] --> even when Wi\u2011Fi is off</string>
<string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning always available</string> <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
<!-- Description text for Bluetooth always scanning [DO NOT TRANSLATE] --> <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
<string name="location_scanning_bluetooth_always_scanning_description">If you want to catch a <!-- Description text for Bluetooth always scanning -->
squirrel just climb a tree and act like a nut</string> <string name="location_scanning_bluetooth_always_scanning_description">
Improve location by allowing system services to scan for Bluetooth
devices, even when Bluetooth is off</string>
<!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) --> <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
<string name="location_network_based">Wi\u2011Fi &amp; cellular network location</string> <string name="location_network_based">Wi\u2011Fi &amp; cellular network location</string>