diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-22 20:31:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-22 20:31:14 -0700 |
| commit | 50edbbbc092eda5a6367dac323d48d6c818fcb9a (patch) | |
| tree | da83a072468bbbed84c66b4de53f4633016a6488 /res/values | |
| parent | f61d5570ee444c8286a27c3d2d952a473e5e1fd3 (diff) | |
| parent | 87c04ba668ed856ec61326e90c1fade980d4e893 (diff) | |
| download | packages_apps_settings-50edbbbc092eda5a6367dac323d48d6c818fcb9a.zip packages_apps_settings-50edbbbc092eda5a6367dac323d48d6c818fcb9a.tar.gz packages_apps_settings-50edbbbc092eda5a6367dac323d48d6c818fcb9a.tar.bz2 | |
am 87c04ba6: am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '87c04ba668ed856ec61326e90c1fade980d4e893':
New strings for Bluetooth
Diffstat (limited to 'res/values')
| -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 7d4da00..ede8799 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -282,6 +282,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 --> |