summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2014-10-18 03:32:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-18 03:32:10 +0000
commit225fc3a83dc5c4d8d5fa3ccb91b3d1793af98397 (patch)
treeadd85c756ffbe98a8100e0590809f862f916f953 /res
parent880e49da165ebdf764d6d4b43fc0f04ce4536d2e (diff)
parent8baf92359b0661b067de85e73d275f0421fc768a (diff)
downloadpackages_apps_Settings-225fc3a83dc5c4d8d5fa3ccb91b3d1793af98397.zip
packages_apps_Settings-225fc3a83dc5c4d8d5fa3ccb91b3d1793af98397.tar.gz
packages_apps_Settings-225fc3a83dc5c4d8d5fa3ccb91b3d1793af98397.tar.bz2
am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial automerge: c8b2003
automerge: 8baf923 * commit '8baf92359b0661b067de85e73d275f0421fc768a': Fix bad string in EncryptionInterstitial
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 8d95844..327c23f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5980,12 +5980,12 @@
<string name="encrypt_talkback_dialog_require_password">Require password?</string>
<!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
- <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like Talkback won\'t yet be available.</string>
+ <string name="encrypt_talkback_dialog_message_pin">When you enter your PIN to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
<!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
- <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like Talkback won\'t yet be available.</string>
+ <string name="encrypt_talkback_dialog_message_pattern">When you enter your pattern to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
<!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
- <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like Talkback won\'t yet be available.</string>
+ <string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\'t yet be available.</string>
</resources>