diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2011-05-27 13:28:49 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-27 13:28:49 -0700 |
commit | eddb21a2ebd39900893da63749a00570f37e5038 (patch) | |
tree | 77b5cc54c65e87709b26845f9d2dfb5cba3f071f /res | |
parent | c955d8ee1d2b134f8c41989b545b7b3ed830d058 (diff) | |
parent | 32c7a774f505be6aae23984ee341bede59395d68 (diff) | |
download | packages_apps_settings-eddb21a2ebd39900893da63749a00570f37e5038.zip packages_apps_settings-eddb21a2ebd39900893da63749a00570f37e5038.tar.gz packages_apps_settings-eddb21a2ebd39900893da63749a00570f37e5038.tar.bz2 |
Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
Diffstat (limited to 'res')
-rwxr-xr-x | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a2b9f90..6d58827 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -249,7 +249,7 @@ <string name="bluetooth_ask_discovery">"An application on your phone is requesting permission to make your phone discoverable by other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string> <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode --> - <string name="bluetooth_ask_lasting_discovery">"An application on your phone is requesting permission to make your phone always discoverable by other Bluetooth devices. Do you want to do this?"</string> + <string name="bluetooth_ask_lasting_discovery">"An application on your phone is requesting permission to make your phone \u201calways discoverable\u201d by other Bluetooth devices. Do you want to do this?"</string> <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode --> <string name="bluetooth_ask_enablement_and_discovery">"An application on your phone is requesting permission to turn on Bluetooth and to make your phone discoverable by other devices for <xliff:g id="timeout">%1$d</xliff:g> seconds. Do you want to do this?"</string> |