diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-08-08 22:56:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-07 18:49:59 +0000 |
| commit | f8811a59ffd4fa39997154681d753d3370697b83 (patch) | |
| tree | dc19bba703b0f7ed0f0f09a7f0f505be93f4280c /res/values | |
| parent | ff72b3ee556e3524e0c5e3218e781a914aa1fa4e (diff) | |
| parent | 1d14e386afc1edfa8a7d65a62697846266a5efd5 (diff) | |
| download | packages_apps_Settings-f8811a59ffd4fa39997154681d753d3370697b83.zip packages_apps_Settings-f8811a59ffd4fa39997154681d753d3370697b83.tar.gz packages_apps_Settings-f8811a59ffd4fa39997154681d753d3370697b83.tar.bz2 | |
Merge "Strings for next change" into lmp-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d2a2f5d..90580e1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -897,6 +897,27 @@ to restore any data that was backed up to your Google Account. </string> + <!-- Title of the encryption screen when decrypting the device failed --> + <string name="crypt_keeper_data_corrupt_title">Decryption unsuccessful</string> + + <!-- Informational text when encryption fails --> + <string name="crypt_keeper_data_corrupt_summary" product="tablet"> + The password you entered is correct, but unfortunately your data is + corrupt. + \n\nTo resume using your tablet, you need to perform a factory reset. + When you set up your tablet after the reset, you\'ll have an opportunity + to restore any data that was backed up to your Google Account. + </string> + + <!-- Informational text when encryption fails --> + <string name="crypt_keeper_data_corrupt_summary" product="default"> + The password you entered is correct, but unfortunately your data is + corrupt. + \n\nTo resume using your phone, you need to perform a factory reset. + When you set up your phone after the reset, you\'ll have an opportunity + to restore any data that was backed up to your Google Account. + </string> + <!-- Image button description to switch input method --> <string name="crypt_keeper_switch_input_method">Switch input method</string> |