diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-01-06 14:26:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 14:26:57 -0800 |
| commit | 586fa0264cacb216f04f003770562c77fb7dd646 (patch) | |
| tree | f7d1acfb308f3c2e9a5c78a9cb178e6275bec50b /res | |
| parent | 8630cde72bde17dd3aa59326596df7b9c0d6183f (diff) | |
| parent | da23ae88d110dce585b19581a180feefbb0be4c8 (diff) | |
| download | packages_apps_settings-586fa0264cacb216f04f003770562c77fb7dd646.zip packages_apps_settings-586fa0264cacb216f04f003770562c77fb7dd646.tar.gz packages_apps_settings-586fa0264cacb216f04f003770562c77fb7dd646.tar.bz2 | |
Merge "Add new pairing dialog for keyboard pairings." into honeycomb
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ee1a805..408ff2e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -763,8 +763,8 @@ <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> <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing --> <string name="bluetooth_incoming_pairing_msg"><xliff:g id="device_name">%1$s</xliff:g>\nwants to pair.</string> - <!-- Message when bluetooth dialog when passkey needs to be displayed. --> - <string name="bluetooth_display_passkey_msg">Enter <xliff:g id="passkey">%2$s</xliff:g> on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair. </string> + <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. --> + <string name="bluetooth_display_passkey_pin_msg">Enter \u0022<xliff:g id="passkey">%2$s</xliff:g>\u0022 on \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022 to pair followed by return or enter. </string> <!-- Button text for accepting an incoming pairing request --> <string name="bluetooth_pairing_accept">Pair</string> <!-- Button text for declining an incoming pairing request --> |