commit 2c85966dd881917b426eefd9643adedf6b0d4ffc
author Jaikumar Ganesh <jaikumar@google.com> Mon Jun 20 15:29:43 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 20 15:29:43 2011 -0700
tree d6d1ce34455c9eb8dd06848feefece93b229125d
parent 5bdc3e9139a7b37b97a56554cc9a89abc196b437
parent 0f44329c740de1dce194b40c838350f235c58ad6

Merge "New strings for Bluetooth" into gingerbread

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6d58827..dd273d9 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -272,6 +272,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 &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 -->