diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-20 15:58:25 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-20 15:58:25 -0700 |
commit | 87c04ba668ed856ec61326e90c1fade980d4e893 (patch) | |
tree | 8edcb1eaff098d823f562d739f9efac864c22930 | |
parent | 50c32a16f34ea154fe97afdc5aaebba6598f58be (diff) | |
parent | f3670df2ca8e521179907978c7009cba791df7c4 (diff) | |
download | packages_apps_settings-87c04ba668ed856ec61326e90c1fade980d4e893.zip packages_apps_settings-87c04ba668ed856ec61326e90c1fade980d4e893.tar.gz packages_apps_settings-87c04ba668ed856ec61326e90c1fade980d4e893.tar.bz2 |
am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
New strings for Bluetooth
-rw-r--r-- | res/values/strings.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 92b355f..c34b05f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -272,6 +272,15 @@ <!-- Strings for device profile auto connect setting --> <string name="bluetooth_auto_connect">Auto connect</string> + <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]--> + <string name="bluetooth_connection_permission_request">"Bluetooth connection request"</string> + + <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]--> + <string name="bluetooth_connection_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022"</string> + + <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]--> + <string name="bluetooth_connection_dialog_text [CHAR LIMIT=none]">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string> + <!-- Date & time settings screen title --> <string name="date_and_time">Date & time settings</string> <!-- Date/time settings. Summary of the checkbox for choosing between 12 hour time or 24 hour time. Sample of 12-hour time --> |