From 3ebd3520543547c05f49cd29e9abe34f90916e53 Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Wed, 8 Apr 2015 18:23:19 -0700
Subject: [PATCH] Updated the string resource

- Removed references to "Google services" (b/20098473)
- Made the link markers untranslatable (b/20097593)
- Updated all strings to final version (b/20128009)

Bug: 20097593
Bug: 20098473
Bug: 20128009
Change-Id: I51ecc6cd8004e6a854053abae8654bc877dcf2a6
---
 res/values/strings.xml | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bfde0c8a67c..eb3182b1e07 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1244,9 +1244,11 @@
     <!-- 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>
+    <string name="ble_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Bluetooth devices, even when Bluetooth is off.
+        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. -->
@@ -1420,9 +1422,11 @@
     <!-- 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>
+    <string name="wifi_scan_notify_text">To improve location accuracy, apps and
+        services will scan for Wi\u2011Fi networks, even when Wi\u2011Fi is off.
+        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 -->
     <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? -->
@@ -2615,16 +2619,18 @@
     <string name="location_menu_scanning">Scanning</string>
     <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
     <string name="location_scanning_screen_title">Scanning</string>
-    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning always available</string>
-    <!-- Preference description text for Wi-Fi always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_wifi_always_scanning_description">The clear history button in
-        your browser has saved more lives than Superman</string>
-    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning always available</string>
-    <!-- Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
-    <string name="location_scanning_bluetooth_always_scanning_description">If you want to catch a
-        squirrel just climb a tree and act like a nut</string>
+    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
+    <!-- Preference description text for Wi-Fi always scanning -->
+    <string name="location_scanning_wifi_always_scanning_description">Improve
+        location by allowing apps and services to scan for Wi\u2011Fi networks
+        even when Wi\u2011Fi is off</string>
+    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
+    <!-- Description text for Bluetooth always scanning -->
+    <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.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; cellular network location</string>