diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a46e03e43..7a27ee9ef 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -380,6 +380,7 @@ <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string> <string name="error_wrong_passphrase">"wrong password"</string> <string name="error_could_not_extract_private_key">"could not extract private key"</string> + <string name="error_wrong_security_token">"this security token doesn't contain required key"</string> <!-- errors without preceeding Error: --> <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string> @@ -576,7 +577,7 @@ <item quantity="other">"Successfully deleted %1$d keys%2$s."</item> </plurals> <plurals name="delete_fail"> - <item quantity="one">"Error deleting one key%2$s."</item> + <item quantity="one">"Error deleting one key."</item> <item quantity="other">"Error deleting %1$d keys."</item> </plurals> <string name="delete_nothing">"Nothing to delete."</string> @@ -761,7 +762,7 @@ <string name="edit_key_error_add_subkey">"Add at least one subkey!"</string> <string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string> <string name="edit_key_error_bad_security_token_size">"Key size not supported by Security Token!"</string> - <string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or 'divert-to-card')!"</string> + <string name="edit_key_error_bad_security_token_stripped">"Cannot move key to Security Token (either stripped or already on Security Token)!"</string> <!-- Create key --> <string name="create_key_upload">"Synchronize with the Internet"</string> @@ -769,6 +770,7 @@ <string name="create_key_passphrases_not_equal">"Passwords do not match"</string> <string name="create_key_final_text">"You entered the following identity:"</string> <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string> + <string name="create_key_final_email_valid_warning">"Many applications work better when provided with keys only containing valid email addresses"</string> <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string> <string name="create_key_custom">"(custom key configuration)"</string> <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string> @@ -779,7 +781,7 @@ <string name="create_key_add_email">"Add email address"</string> <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> - <string name="create_key_email_invalid_email">"Email address format is invalid"</string> + <string name="create_key_email_empty_email">"Email address can not be empty"</string> <string name="create_key_yubi_key_pin_text">"Please choose a PIN with 6 numbers."</string> <string name="create_key_yubi_key_admin_pin_text">"Please write down the Admin PIN and store it in a safe place (required when you used a wrong PIN 3 times)."</string> <string name="create_key_yubi_key_pin">"PIN"</string> @@ -951,7 +953,7 @@ <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty password"</string> <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with PIN"</string> <string name="msg_is_subkey_stripped">"Marked secret subkey %s as stripped"</string> - <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert-to-card'"</string> + <string name="msg_is_subkey_divert">"Marked secret subkey %s as key on Security Token"</string> <string name="msg_is_success_identical">"Keyring contains no new data, nothing to do"</string> <string name="msg_is_success">"Successfully imported secret keyring"</string> @@ -1060,9 +1062,9 @@ <!-- modifySecretKeyRing --> <string name="msg_mr">"Modifying keyring %s"</string> - <string name="msg_mf_divert">"Will divert to Security Token for crypto operations"</string> - <string name="msg_mf_error_divert_newsub">"Creation of new subkeys is not supported for 'divert-to-card' primary keys!"</string> - <string name="msg_mf_error_divert_serial">"The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!"</string> + <string name="msg_mf_divert">"Will use Security Token for crypto operations"</string> + <string name="msg_mf_error_divert_newsub">"Creation of new subkeys is not supported for primary keys on Security Tokens!"</string> + <string name="msg_mf_error_divert_serial">"The serial number of a key on Security Tokens must be 16 bytes! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_encode">"Encoding exception!"</string> <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string> <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string> @@ -1095,7 +1097,7 @@ <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string> <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string> <string name="msg_mf_subkey_change">"Modifying subkey %s"</string> - <string name="msg_mf_require_divert">"Diverting to Security Token for crypto operations"</string> + <string name="msg_mf_require_divert">"Using Security Token for crypto operations"</string> <string name="msg_mf_require_passphrase">"Password required for operations"</string> <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string> <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string> @@ -1191,7 +1193,7 @@ <string name="msg_dc_clear_signature">"Saving signature data for later"</string> <string name="msg_dc_clear">"Processing cleartext data"</string> <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad password!"</string> - <string name="msg_dc_error_sym_passphrase">"Error decrypting data! (Bad passphrase?)"</string> + <string name="msg_dc_error_sym_passphrase">"Error decrypting data! (Bad password?)"</string> <string name="msg_dc_error_corrupt_data">"Data is corrupt!"</string> <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string> <string name="msg_dc_error_integrity_check">"Integrity check error!"</string> @@ -1497,7 +1499,7 @@ <string name="error_key_not_found">"Key not found!"</string> <string name="error_key_processing">"Error processing key!"</string> <string name="key_stripped">"stripped"</string> - <string name="key_divert">"divert to Security Token"</string> + <string name="key_divert">"on Security Token"</string> <string name="key_no_passphrase">"no password"</string> <string name="key_unavailable">"unavailable"</string> <string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string> @@ -1635,7 +1637,7 @@ <string name="linked_create_twitter_handle">Twitter Handle</string> <string name="linked_create_twitter_2_1">"Touch either button to tweet the message!"</string> <string name="linked_create_twitter_2_2">"You can edit the Tweet before posting it, so long as the text inside the brackets is unmodified."</string> - <string name="linked_create_twitter_2_3">"Once your Tweet is published as <b>@%s</b>, touch the Verify button to scan your timeline for it."</string> + <string name="linked_create_twitter_2_3">"Once your Tweet is published as <b>@%s</b>, touch the Verify button to scan your timeline for it."</string> <string name="linked_create_twitter_2_4">"After successful verification, touch Finish button to add the Linked Identity to your keyring and finish the process."</string> <string name="linked_create_verify">"Verify"</string> @@ -1658,7 +1660,7 @@ <string name="linked_select_1">"A 'linked identity' connects your PGP key to a resource on the web."</string> <string name="linked_select_2">"Please select a type:"</string> <string name="linked_id_generic_text">"This file claims ownership of the OpenPGP key with long id %2$s.\n\nToken for proof:\n%1$s"</string> - <string name="linked_id_github_text">"This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.\n\nToken for proof:\n%1$s"</string> + <string name="linked_id_github_text" translatable="false">"This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.\n\nToken for proof:\n%1$s"</string> <string name="linked_verifying">"Verifying…"</string> <string name="linked_verify_success">"Verified!"</string> <string name="linked_verify_error">"Verification error!"</string> @@ -1751,4 +1753,9 @@ <item>50 EUR</item> <item>100 EUR</item> </string-array> + <string name="redirect_import_key_title">"Scan with OpenKeychain!"</string> + <string name="redirect_import_key_message">"You scanned a OpenPGP QR Code with another app, please scan with Openkeychain directly to be safe."</string> + <string name="redirect_import_key_yes">"Scan again"</string> + <string name="redirect_import_key_no">"Close"</string> + <string name="title_activity_redirect_key">"Key import redirection"</string> </resources> |