diff options
| author | Jim Miller <jaggies@google.com> | 2014-10-17 19:56:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 19:56:45 +0000 |
| commit | 0303bb203059e75c729804405d481bd3333c4098 (patch) | |
| tree | 1290a7af13460b888670f49d3968f14c374b4f9a /res | |
| parent | b363c26e2f3255ad891d0fd466c9bbd2794a734d (diff) | |
| parent | c7ccba68592cfa1afad36abe56e4e8caba37014a (diff) | |
| download | packages_apps_Settings-0303bb203059e75c729804405d481bd3333c4098.zip packages_apps_Settings-0303bb203059e75c729804405d481bd3333c4098.tar.gz packages_apps_Settings-0303bb203059e75c729804405d481bd3333c4098.tar.bz2 | |
am c7ccba68: am 4f903c3e: Add strings for upcoming change.
* commit 'c7ccba68592cfa1afad36abe56e4e8caba37014a':
Add strings for upcoming change.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4fea1d5..7ca6efb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5933,11 +5933,20 @@ <string name="encryption_continue_button">Continue</string> <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] --> - <string name="encryption_interstitial_message_pin">Because your device is encrypted, you can further protect it by requiring that you enter your PIN before your device starts up.</string> + <string name="encryption_interstitial_message_pin"> + You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms. + \n\nThis helps protect data on lost or stolen devices. + </string> <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] --> - <string name="encryption_interstitial_message_pattern">Because your device is encrypted, you can further protect it by requiring that you enter your pattern before your device starts up.</string> + <string name="encryption_interstitial_message_pattern"> + You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms. + \n\nThis helps protect data on lost or stolen devices. + </string> <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] --> - <string name="encryption_interstitial_message_password">Because your device is encrypted, you can further protect it by requiring that you enter your password before your device starts up.</string> + <string name="encryption_interstitial_message_password"> + You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\'t receive calls, messages, or notifications, including alarms. + \n\nThis helps protect data on lost or stolen devices. + </string> <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] --> <string name="encrypt_require_pin">Require PIN to start device</string> @@ -5953,4 +5962,22 @@ <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] --> <string name="encrypt_dont_require_password">No thanks</string> + <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] --> + <string name="encrypt_talkback_dialog_require_pin">Require PIN?</string> + + <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] --> + <string name="encrypt_talkback_dialog_require_pattern">Require pattern?</string> + + <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] --> + <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 entering your PIN to start your device, accessibility services like TalkBack 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 entering your pattern to start your device, accessibility services like TalkBack 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 entering your password to start your device, accessibility services like TalkBack won\'t yet be available.</string> + </resources> |