diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-18 02:06:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 02:06:44 +0000 |
| commit | 4db26eff7418391c0541309f5750aee17c499c14 (patch) | |
| tree | ebefbeec5951b5bdd7c6f0d326e1a319fa21a0c7 /res | |
| parent | 6421180bc88cf2aba492af0aa1ac3be920a068b3 (diff) | |
| parent | ecc8c2b7c3a757bb285ede98cb7bd511c9eb422e (diff) | |
| download | android_packages_apps_Nfc-4db26eff7418391c0541309f5750aee17c499c14.tar.gz android_packages_apps_Nfc-4db26eff7418391c0541309f5750aee17c499c14.tar.bz2 android_packages_apps_Nfc-4db26eff7418391c0541309f5750aee17c499c14.zip | |
am ecc8c2b7: am eadc627c: Merge "Make BT pairing strings localizable" into lmp-mr1-dev
* commit 'ecc8c2b7c3a757bb285ede98cb7bd511c9eb422e':
Make BT pairing strings localizable
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/strings.xml | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 923e4322..1ca995d0 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -29,14 +29,25 @@ <string name="beam_handover_not_supported">The receiver\'s device doesn\'t support large file transfer via beam.</string> <string name="beam_try_again">Bring devices together again</string> - <string name="connecting_peripheral">Connecting</string> - <string name="connected_peripheral">Connected</string> - <string name="connect_peripheral_failed">Could not connect</string> - <string name="disconnecting_peripheral">Disconnecting</string> - <string name="disconnected_peripheral">Disconnected</string> - <string name="pairing_peripheral">Pairing</string> - <string name="pairing_peripheral_failed">Could not pair</string> + <!-- String referring to the device being connected when there is no name for the device --> + <string name="device">device</string> + <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] --> + <string name="connecting_peripheral">Connecting <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] --> + <string name="connected_peripheral">Connected <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] --> + <string name="connect_peripheral_failed">Could not connect <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device is disconnecting [CHAR_LIMIT=35] --> + <string name="disconnecting_peripheral">Disconnecting <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device is disconnected [CHAR_LIMIT=35] --> + <string name="disconnected_peripheral">Disconnected <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] --> + <string name="pairing_peripheral">Pairing <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] --> + <string name="pairing_peripheral_failed">Could not pair <xliff:g id="device_name">%1$s</xliff:g></string> + <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] --> <string name="failed_to_enable_bt">Could not enable Bluetooth</string> + <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] --> <string name="confirm_pairing">Are you sure you want to pair the Bluetooth device <xliff:g id="device_name">%1$s</xliff:g>?</string> <string name="pair_yes">Yes</string> <string name="pair_no">No</string> |