diff options
| author | Lifu Tang <lifu@google.com> | 2015-04-06 22:39:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-06 22:39:28 +0000 |
| commit | c36e1c4e0acd694edd5524f3719f984f1057ff59 (patch) | |
| tree | 3acf459746ef2451ae7153693be94075870fed93 /res | |
| parent | bec3e0114371dc2cfc36e7b1ae0f7bcfe57ae310 (diff) | |
| parent | be794c30ca49c17521e66482ce30c94ffb2ec8ee (diff) | |
| download | packages_apps_Settings-c36e1c4e0acd694edd5524f3719f984f1057ff59.zip packages_apps_Settings-c36e1c4e0acd694edd5524f3719f984f1057ff59.tar.gz packages_apps_Settings-c36e1c4e0acd694edd5524f3719f984f1057ff59.tar.bz2 | |
Merge "Added links to scanning settings"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a7d5bd4..fe3935c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1246,6 +1246,12 @@ <string name="bluetooth_advanced_titlebar">Advanced Bluetooth</string> <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]--> <string name="bluetooth_empty_list_bluetooth_off">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.</string> + <!-- 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 + the user to "scanning settings" screen. --> + <string name="ble_scan_notify_text">To improve location accuracy, Google services will scan for + Bluetooth devices, even when Bluetooth is off. You can change this in LINK_BEGINscanning + settingsLINK_END.</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. --> @@ -1416,8 +1422,12 @@ <string name="wifi_select_assistant_dialog_title">Choose assistant</string> <!-- Preference title for option to install certificates --> <string name="wifi_install_credentials">Install certificates</string> - <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced > Scanning always available.</string> - <string name="wifi_scan_notify_text_location_off">Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced > Scanning always available.</string> + <!-- 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 + the user to "scanning settings" screen. --> + <string name="wifi_scan_notify_text">To improve location accuracy, Google services will scan for + Wi\u2011Fi networks, even when Wi\u2011Fi is off. You can change this in LINK_BEGINscanning + settingsLINK_END.</string> <!-- Wifi scan always mode checkbox text --> <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? --> |