diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-20 15:54:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-20 15:54:16 -0700 |
| commit | f3670df2ca8e521179907978c7009cba791df7c4 (patch) | |
| tree | ebbd5a01df4ae3201edb1f88ab73c5ec74895afa /res/values | |
| parent | 3c75fbc55667d4b3f368afbd29ef78eab55303a2 (diff) | |
| parent | 2c85966dd881917b426eefd9643adedf6b0d4ffc (diff) | |
| download | packages_apps_settings-f3670df2ca8e521179907978c7009cba791df7c4.zip packages_apps_settings-f3670df2ca8e521179907978c7009cba791df7c4.tar.gz packages_apps_settings-f3670df2ca8e521179907978c7009cba791df7c4.tar.bz2 | |
am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '2c85966dd881917b426eefd9643adedf6b0d4ffc':
New strings for Bluetooth
Diffstat (limited to 'res/values')
| -rwxr-xr-x | 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 90bfddf..a39dfd5 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -274,6 +274,15 @@ <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary --> <string name="bluetooth_device_info_deviceInfo_text"></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 --> |