diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-09-01 15:42:00 -0700 |
|---|---|---|
| committer | Ben Komalo <benkomalo@google.com> | 2011-09-06 17:45:15 -0700 |
| commit | 0e66609c95047ba7e5c0408bdc88af4315fd35b1 (patch) | |
| tree | 277e0bf22b73b3047071b9f88f81b082b1782dc8 /res/values | |
| parent | 491af0805dcf92185f1ee2767d11a933e8bb9053 (diff) | |
| download | packages_apps_Settings-0e66609c95047ba7e5c0408bdc88af4315fd35b1.tar.gz packages_apps_Settings-0e66609c95047ba7e5c0408bdc88af4315fd35b1.tar.bz2 packages_apps_Settings-0e66609c95047ba7e5c0408bdc88af4315fd35b1.zip | |
Show factory reset option if encryption went bad.
Also update the wording for the error message
Bug: 3384231
Change-Id: I25a67cba7abede913bdd8cadaafc42bcbd5c5c5f
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 78b18c0b7..f2287b65a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -733,16 +733,21 @@ <!-- Informational text when encryption fails --> <string name="crypt_keeper_failed_summary" product="tablet"> - Encryption was interrupted and can\'t complete. You must perform a factory data reset (erasing - all your data) before you can resume using your tablet. You can try encrypting your tablet - again after the reset is complete. + Encryption was interrupted and can\'t complete. As a result, the data on + your tablet is no longer accessible. + \n\n + To resume using your tablet, you must 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_failed_summary" product="default"> - Encryption was interrupted and can\'t complete. You must perform a factory data reset (erasing - all your data) before you can resume using your phone. You can try encrypting your phone - again after the reset is complete. + Encryption was interrupted and can\'t complete. As a result, the data on + your phone is no longer accessible. + \n\nTo resume using your phone, you must 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> <!-- Unlock Picker Settings --><skip /> |