summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-09-02 12:30:05 -0700
committerMichael Chan <mchan@android.com>2009-09-02 12:30:05 -0700
commit77395cc39c88af0bb20ea18af532c87e934fb187 (patch)
tree1891ca6cc421b5b1383a78850ad59616e9524c1f /res
parent684736a9d4cc044c6970411485f4c22d5d7e3b74 (diff)
downloadpackages_apps_settings-77395cc39c88af0bb20ea18af532c87e934fb187.zip
packages_apps_settings-77395cc39c88af0bb20ea18af532c87e934fb187.tar.gz
packages_apps_settings-77395cc39c88af0bb20ea18af532c87e934fb187.tar.bz2
b/2050798 Bluetooth Passkeys should always be 6 digits so show leading zeros if needed.
Removed extra new lines in the passkey and pin dialogs because the string didn't fit in landscape mode. (scrollbars to appeared)
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2af9b18..a73f910 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -513,11 +513,11 @@
<!-- Title for the bluetooth device info screen. -->
<string name="bluetooth_device_info">Bluetooth device info</string>
<!-- Message when bluetooth dialog for pin entry is showing -->
- <string name="bluetooth_enter_pin_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType PIN to pair.\n(Try 0000 or 1234.)</string>
+ <string name="bluetooth_enter_pin_msg"><xliff:g id="device_name">%1$s</xliff:g>\nType PIN to pair.\n(Try 0000 or 1234.)</string>
<!-- Message when bluetooth dialog for passkey entry is showing -->
- <string name="bluetooth_enter_passkey_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType passkey to pair.\n</string>
+ <string name="bluetooth_enter_passkey_msg"><xliff:g id="device_name">%1$s</xliff:g>\nType passkey to pair.\n</string>
<!-- Message when bluetooth dialog for confirmation of passkey is showing -->
- <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$d</xliff:g>.</string>
+ <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string>
<!-- Button text for accepting an incoming pairing request -->
<string name="bluetooth_pairing_accept">Pair</string>
<!-- Button text for declining an incoming pairing request -->