am 2546ac02: (-s ours) am 86b2f598: (-s ours) Import revised translations. DO NOT MERGE
* commit '2546ac02e62bb29c8a99529de605062bb1137114':
Import revised translations. DO NOT MERGE
diff --git a/res/values/strings.xml b/res/values/strings.xml
index cb46b2f..d4b8edd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,12 +18,12 @@
<string name="app_name">Certificate Installer</string>
<!-- Title of the file picker screen -->
- <string name="pick_file_title">Pick a certificate</string>
+ <string name="pick_file_title">Choose a certificate</string>
<!-- Title of dialog to enter password for pkcs12 -->
<string name="pkcs12_password_dialog_title">Extract certificate</string>
<!-- message in progress bar when waiting for extracting certs from a pkcs12 package -->
- <string name="extracting_pkcs12">Extracting...</string>
+ <string name="extracting_pkcs12">Extracting\u2026</string>
<!-- Title of dialog to enter password for pkcs12 file -->
<string name="pkcs12_file_password_dialog_title">Extract from %s</string>
<!-- Title of dialog to name a credential -->
@@ -32,7 +32,7 @@
<string name="credential_name">Certificate name:</string>
<!-- Title of the credential info -->
<!-- Description for the credential password input box -->
- <string name="credential_password">Enter the password to extract the certificates.</string>
+ <string name="credential_password">Type the password to extract the certificates.</string>
<string name="credential_info">The package contains:</string>
<string name="p12_description">Certificates in PKCS12 keystore.</string>
@@ -45,12 +45,12 @@
<!-- Item found in the PKCS12 keystore being investigated [CHAR LIMIT=NONE]-->
<string name="n_cacrts">%d CA certificates</string>
- <string name="password_error">Please enter the correct password.</string>
- <string name="password_empty_error">Please enter the password.</string>
- <string name="name_empty_error">Please enter a name.</string>
- <string name="name_char_error">Please enter a name that contains only letters and numbers.</string>
- <string name="storage_error">Unable to save the certificate. Click OK to retry.</string>
- <string name="unable_to_save_cert">Unable to save the certificate. The credential storage is not enabled or properly initialized.</string>
+ <string name="password_error">Type the correct password.</string>
+ <string name="password_empty_error">Type the password.</string>
+ <string name="name_empty_error">Type a name.</string>
+ <string name="name_char_error">Type a name that contains only letters and numbers.</string>
+ <string name="storage_error">Couldn\'t save the certificate. Touch OK to retry.</string>
+ <string name="unable_to_save_cert">Couldn\'t save the certificate. The credential storage isn\'t enabled or properly initialized.</string>
<string name="cert_not_saved">The certificate is not installed.</string>
<string name="no_cert_to_saved">No certificate to install.</string>
<string name="invalid_cert">The certificate is invalid.</string>
@@ -58,16 +58,16 @@
<!-- toast message -->
<string name="cert_is_added"><xliff:g id="credential">%s</xliff:g> is installed.</string>
<!-- toast message -->
- <string name="cert_too_large_error">Installation failed. Certificate size is too large.</string>
+ <string name="cert_too_large_error">Couldn\'t install because the certificate size is too large.</string>
<!-- toast message -->
- <string name="cert_missing_error">Installation failed. Cannot locate the certificate file.</string>
+ <string name="cert_missing_error">Couldn\'t install because the certificate file couldn\'t be located.</string>
<!-- toast message -->
- <string name="cert_read_error">Installation failed. Cannot read the certificate file.</string>
+ <string name="cert_read_error">Couldn\'t install because the certificate file couldn\'t be read.</string>
<!-- Shown when the certificate file can't be found. [CHAR LIMIT=NONE] -->
<string name="no_cert_file_found" product="nosdcard">No certificate file found in USB storage.</string>
<string name="no_cert_file_found" product="default">No certificate file found in the SD card.</string>
<!-- Shown when USB storage can't be found to look for a certificate. [CHAR LIMIT=30] -->
<string name="sdcard_not_present" product="nosdcard">USB storage not available.</string>
- <string name="sdcard_not_present" product="default">SD card is not present.</string>
+ <string name="sdcard_not_present" product="default">SD card isn\'t present.</string>
</resources>