diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 78 |
1 files changed, 43 insertions, 35 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index bf3333458..3221cd9cd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -75,16 +75,11 @@ <!-- menu --> <string name="menu_preferences">Settings</string> <string name="menu_help">Help</string> - <string name="menu_import_from_file">Import from file</string> - <string name="menu_import_from_qr_code">Import from QR Code</string> - <string name="menu_import_from_nfc">Import from NFC</string> <string name="menu_export_key">Export to file</string> <string name="menu_delete_key">Delete key</string> <string name="menu_create_key">Create key</string> <string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_search">Search</string> - <string name="menu_import_from_key_server">Keyserver</string> - <string name="menu_import_from_keybase">Import from Keybase.io</string> <string name="menu_key_server">Keyserver…</string> <string name="menu_update_key">Update from keyserver</string> <string name="menu_export_key_to_server">Upload to key server</string> @@ -229,11 +224,6 @@ <string name="key_creation_weak_rsa_info">Note: generating RSA key with length 1024-bit and less is considered unsafe and it\'s disabled for generating new keys.</string> <string name="key_not_found">Couldn\'t find key %08X.</string> - <plurals name="keys_found"> - <item quantity="one">Found %d key.</item> - <item quantity="other">Found %d keys.</item> - </plurals> - <plurals name="bad_keys_encountered"> <item quantity="one">%d bad secret key ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> <item quantity="other">%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> @@ -278,11 +268,11 @@ <string name="error_only_files_are_supported">Direct binary data without actual file in filesystem is not supported.</string> <string name="error_jelly_bean_needed">You need Android 4.1 to use Android\'s NFC Beam feature!</string> <string name="error_nfc_needed">NFC is not available on your device!</string> - <string name="error_nothing_import">Nothing to import!</string> + <string name="error_nothing_import">No keys found!</string> <string name="error_keyserver_insufficient_query">Key search query too short</string> <string name="error_searching_keys">Unrecoverable error searching for keys at server</string> <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string> - <string name="error_import_file_no_content">File has no content</string> + <string name="error_import_file_no_content">File/Clipboard is empty</string> <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string> <plurals name="error_import_non_pgp_part"> <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item> @@ -339,10 +329,10 @@ <string name="progress_deleting_securely">deleting \'%s\' securely…</string> <!-- action strings --> - <string name="hint_public_keys">Search Public Keys</string> + <string name="hint_public_keys">Name/Email/Key ID…</string> <string name="hint_secret_keys">Search Secret Keys</string> <string name="action_share_key_with">Share Key with…</string> - <string name="hint_keybase_search">Search Keybase.io</string> + <string name="hint_keybase_search">Name/Keybase.io username…</string> <!-- key bit length selections --> <string name="key_size_512">512</string> @@ -372,6 +362,10 @@ <string name="help_about_version">Version:</string> <!-- Import --> + <string name="import_tab_keyserver">Keyserver</string> + <string name="import_tab_direct">File/Clipboard</string> + <string name="import_tab_qr_code">QR Code/NFC</string> + <string name="import_tab_keybase">Keybase.io</string> <string name="import_import">Import selected keys</string> <string name="import_from_clipboard">Import from clipboard</string> @@ -387,6 +381,7 @@ <string name="import_qr_scan_button">Scan QR Code with \'Barcode Scanner\'</string> <string name="import_nfc_text">To receive keys via NFC, the device needs to be unlocked.</string> <string name="import_nfc_help_button">Help</string> + <string name="import_qr_code_button">Scan QR Code…</string> <string name="import_clipboard_button">Get key from clipboard</string> <string name="import_keybase_button">Get key from Keybase.io</string> @@ -512,13 +507,12 @@ <string name="msg_ip_delete_old_ok">Deleted old key from database</string> <string name="msg_ip_encode_fail">Operation failed due to encoding error</string> <string name="msg_ip_fail_io_exc">Operation failed due to i/o error</string> - <string name="msg_ip_fail_op_ex">Operation failed due to database error</string> + <string name="msg_ip_fail_op_exc">Operation failed due to database error</string> <string name="msg_ip_fail_remote_ex">Operation failed due to internal error</string> <string name="msg_ip">Importing public keyring %s</string> <string name="msg_ip_insert_keyring">Encoding keyring data</string> <string name="msg_ip_insert_keys">Parsing keys</string> <string name="msg_ip_prepare">Preparing database operations</string> - <string name="msg_ip_preserving_secret">Preserving available secret key</string> <string name="msg_ip_master">Processing master key %s</string> <string name="msg_ip_master_expired">Keyring expired on %s</string> <string name="msg_ip_master_expires">Keyring expires on %s</string> @@ -542,6 +536,7 @@ <string name="msg_ip_subkey_flags_xxs">Subkey flags: sign</string> <string name="msg_ip_subkey_flags_xxx">Subkey flags: none</string> <string name="msg_ip_success">Successfully imported public keyring</string> + <string name="msg_ip_success_identical">Keyring contains no new data, nothing to do</string> <string name="msg_ip_reinsert_secret">Re-inserting secret key</string> <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string> <string name="msg_ip_uid_cert_error">Error processing certificate!</string> @@ -555,15 +550,19 @@ <!-- Import Secret log entries --> <string name="msg_is">Importing secret key %s</string> + <string name="msg_is_db_exception">Database error!</string> <string name="msg_is_importing_subkeys">Processing secret subkeys</string> - <string name="msg_is_io_excption">Error encoding keyring</string> + <string name="msg_is_io_exc">Error encoding keyring</string> + <string name="msg_is_pubring_generate">Generating public keyring from secret keyring</string> <string name="msg_is_subkey_nonexistent">Subkey %s unavailable in public key</string> <string name="msg_is_subkey_ok">Marked %s as available</string> <string name="msg_is_subkey_stripped">Marked %s as stripped</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> <!-- Keyring Canonicalization log entries --> - <string name="msg_kc">Canonicalizing keyring %s</string> + <string name="msg_kc_public">Canonicalizing public keyring %s</string> + <string name="msg_kc_secret">Canonicalizing secret keyring %s</string> <string name="msg_kc_fatal_no_uid">Keyring canonicalization failed: Keyring has no valid user ids</string> <string name="msg_kc_master">Processing master key</string> <string name="msg_kc_revoke_bad_err">Removing bad keyring revocation certificate</string> @@ -586,7 +585,7 @@ <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string> - <string name="msg_kc_success">Keyring canonicalization successful</string> + <string name="msg_kc_success">Keyring canonicalization successful, no changes</string> <string name="msg_kc_success_bad">Keyring canonicalization successful, removed %s erroneous certificates</string> <string name="msg_kc_success_bad_and_red">Keyring canonicalization successful, removed %1$s erroneous and %2$s redundant certificates</string> <string name="msg_kc_success_redundant">Keyring canonicalization successful, removed %s redundant certificates</string> @@ -596,28 +595,37 @@ <string name="msg_kc_uid_bad_type">Removing user id certificate of unknown type (%s)</string> <string name="msg_kc_uid_bad">Removing bad self certificate for user id "%s"</string> <string name="msg_kc_uid_dup">Removing outdated self certificate for user id "%s"</string> + <string name="msg_kc_uid_foreign">Removing foreign user id certificate by %s</string> <string name="msg_kc_uid_revoke_dup">Removing redundant revocation certificate for user id "%s"</string> <string name="msg_kc_uid_revoke_old">Removing outdated revocation certificate for user id "%s"</string> <string name="msg_kc_uid_no_cert">No valid self-certificate found for user id %s, removing from ring</string> + <!-- Keyring merging log entries --> + <string name="msg_mg_public">Merging into public keyring %s</string> + <string name="msg_mg_secret">Merging into secret keyring %s</string> + <string name="msg_mg_fatal_encode">Fatal error encoding signature</string> + <string name="msg_mg_heterogeneous">Tried to consolidate heterogeneous keyrings</string> + <string name="msg_mg_new_subkey">Adding new subkey %s</string> + <string name="msg_mg_found_new">Found %s new certificates in keyring</string> + <!-- modifySecretKeyRing --> <string name="msg_mr">Modifying keyring %s</string> - <string name="msg_mr_error_encode">Encoding exception!</string> - <string name="msg_mr_error_pgp">PGP internal exception!</string> - <string name="msg_mr_error_sig">Signature exception!</string> - <string name="msg_mr_passphrase">Changing passphrase</string> - <string name="msg_mr_subkey_change">Modifying subkey %s</string> - <string name="msg_mr_subkey_missing">Tried to operate on missing subkey %s!</string> - <string name="msg_mr_subkey_new">Generating new %1$s bit %2$s subkey</string> - <string name="msg_mr_subkey_new_id">New subkey id: %s</string> - <string name="msg_mr_subkey_past_expiry">Expiry date cannot be in the past!</string> - <string name="msg_mr_subkey_revoke">Revoking subkey %s</string> - <string name="msg_mr_success">Keyring successfully modified</string> - <string name="msg_mr_uid_add">Adding user id %s</string> - <string name="msg_mr_uid_primary">Changing primary uid to %s</string> - <string name="msg_mr_uid_revoke">Revoking user id %s</string> - <string name="msg_mr_unlock_error">Error unlocking keyring!</string> - <string name="msg_mr_unlock">Unlocking keyring</string> + <string name="msg_mf_error_encode">Encoding exception!</string> + <string name="msg_mf_error_pgp">PGP internal exception!</string> + <string name="msg_mf_error_sig">Signature exception!</string> + <string name="msg_mf_passphrase">Changing passphrase</string> + <string name="msg_mf_subkey_change">Modifying subkey %s</string> + <string name="msg_mf_subkey_missing">Tried to operate on missing subkey %s!</string> + <string name="msg_mf_subkey_new">Generating new %1$s bit %2$s subkey</string> + <string name="msg_mf_subkey_new_id">New subkey id: %s</string> + <string name="msg_mf_subkey_past_expiry">Expiry date cannot be in the past!</string> + <string name="msg_mf_subkey_revoke">Revoking subkey %s</string> + <string name="msg_mf_success">Keyring successfully modified</string> + <string name="msg_mf_uid_add">Adding user id %s</string> + <string name="msg_mf_uid_primary">Changing primary uid to %s</string> + <string name="msg_mf_uid_revoke">Revoking user id %s</string> + <string name="msg_mf_unlock_error">Error unlocking keyring!</string> + <string name="msg_mf_unlock">Unlocking keyring</string> <!-- unsorted --> <string name="section_certifier_id">Certifier</string> |