am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread

* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
  New strings for Bluetooth
This commit is contained in:
Jaikumar Ganesh
2011-06-20 15:58:25 -07:00
committed by Android Git Automerger

View File

@@ -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 &amp; 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 -->