diff options
| author | Christopher Tate <ctate@google.com> | 2012-06-19 16:34:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-19 16:34:01 -0700 |
| commit | 1b4a9b4107c1d6ba5b2ecf5657865acc24a28686 (patch) | |
| tree | 3a87d93b2d95b43509200d2b9d3e1cf52f737796 /res/values/strings.xml | |
| parent | e5d2b8b8ab0d9968c976f584917481f46995f65c (diff) | |
| parent | 5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f (diff) | |
| download | packages_apps_Settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.zip packages_apps_Settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.tar.gz packages_apps_Settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.tar.bz2 | |
am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 604fe11..0873190 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3381,6 +3381,13 @@ <!-- Summary text of the "local backup password" setting when the user has already supplied a password --> <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string> + <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_success">New backup password set</string> + <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_confirmation_mismatch">New password and confirmation don\'t match</string> + <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_validation_failure">Failure setting backup password</string> + <!-- Dialog title for confirmation to erase backup data from server --> <string name="backup_erase_dialog_title"></string> <!-- Dialog title for confirmation to erase backup data from server --> |