diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-09-10 12:43:40 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2009-09-10 12:50:10 +0800 |
| commit | f71c8b40b5a92e21d09dd75880e16aa857c1b6cb (patch) | |
| tree | 188fb76d1fe8750e5fab4065b944d24dec90622a /res | |
| parent | 18cd40930179a7c6ab30e4e5ce62919fde16ce6f (diff) | |
| download | packages_apps_settings-f71c8b40b5a92e21d09dd75880e16aa857c1b6cb.zip packages_apps_settings-f71c8b40b5a92e21d09dd75880e16aa857c1b6cb.tar.gz packages_apps_settings-f71c8b40b5a92e21d09dd75880e16aa857c1b6cb.tar.bz2 | |
Add install-cert-from-sdcard in Security settings
Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 06057e7..847e879 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2012,6 +2012,10 @@ found in the list of installed applications.</string> <!-- Description of dialog to enable/dislable access to credential storage from an action that requires the credential storage --> <string name="cstor_access_dialog_hint_from_action">Enter the credential storage password.</string> + <!-- Title of preference to install p12 cert from SD card --> + <string name="cstor_cert_install_title">Install from SD card</string> + <!-- Summary of preference to install p12 cert from SD card --> + <string name="cstor_cert_install_summary">Install encrypted certificates from SD card</string> <!-- Title of preference to set storage password --> <string name="cstor_set_passwd_title">Set password</string> <!-- Summary of preference to set storage password --> @@ -2052,7 +2056,7 @@ found in the list of installed applications.</string> <string name="cstor_passwords_error">Passwords do not match.</string> <string name="cstor_passwords_empty_error">You must enter and confirm a password.</string> <string name="cstor_password_empty_error">Please enter the password.</string> - <string name="cstor_password_verification_error">Please enter the password again. The password must have at least 8 characters and must not contain spaces.</string> + <string name="cstor_password_verification_error">Please enter the password again. The password must have at least 8 characters.</string> <string name="cstor_name_empty_error">Please enter a name.</string> <string name="cstor_name_char_error">Please enter a name that contains only letters and numbers.</string> <string name="cstor_storage_error">Unable to save the certificate. Click OK to retry.</string> |