diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 165 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 8 |
4 files changed, 118 insertions, 66 deletions
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 28b6fcd78..393a1e091 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -48,17 +48,15 @@ <item>@string/key_size_custom</item> </string-array> <string-array name="elgamal_key_size_spinner_values" translatable="false"> - <item>@string/key_size_1536</item> <item>@string/key_size_2048</item> <item>@string/key_size_3072</item> <item>@string/key_size_4096</item> <item>@string/key_size_8192</item> </string-array> <string-array name="dsa_key_size_spinner_values" translatable="false"> - <item>@string/key_size_512</item> - <item>@string/key_size_768</item> - <item>@string/key_size_1024</item> - <item>@string/key_size_custom</item> + <item>@string/key_size_2048</item> + <item>@string/key_size_3072</item> + <item>@string/key_size_4096</item> </string-array> <string-array name="theme_entries" translatable="false"> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 06fe2a9cd..4eb9e7d68 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -33,4 +33,7 @@ <color name="translucent_scrim_bottom">#2A000000</color> <color name="translucent_scrim_bottom_center">#2A000000</color> + <!-- linked ID view --> + <color name="link_text_material_light">#ff009688</color> + </resources> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 312bf4023..ff148b0c7 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -30,6 +30,7 @@ <string name="title_export_keys">"Backup Keys"</string> <string name="title_key_not_found">"Key Not Found"</string> <string name="title_send_key">"Upload to Keyserver"</string> + <string name="title_backup">"Backup Key"</string> <string name="title_certify_key">"Confirm Key"</string> <string name="title_key_details">"Key Details"</string> <string name="title_help">"Help"</string> @@ -62,6 +63,7 @@ <string name="section_share_key">"Key"</string> <string name="section_key_server">"Keyserver"</string> <string name="section_fingerprint">"Fingerprint"</string> + <string name="section_phrases">"Phrases"</string> <string name="section_encrypt">"Encrypt"</string> <string name="section_decrypt">"Decrypt / Verify"</string> <string name="section_current_expiry">"Current expiry"</string> @@ -83,12 +85,15 @@ <string name="btn_back">"Back"</string> <string name="btn_no">"No"</string> <string name="btn_match">"Fingerprints match"</string> + <string name="btn_match_phrases">"Phrases match"</string> <string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string> <string name="btn_copy_encrypted_signed">"Encrypt/sign and copy text"</string> + <string name="btn_paste_encrypted_signed">"Encrypt/sign and paste text"</string> <string name="btn_view_cert_key">"View certification key"</string> <string name="btn_create_key">"Create key"</string> <string name="btn_add_files">"Add file(s)"</string> <string name="btn_share_decrypted_text">"Share"</string> + <string name="btn_open_with">"Open with…"</string> <string name="btn_copy_decrypted_text">"Copy decrypted text"</string> <string name="btn_decrypt_clipboard">"Read from clipboard"</string> <string name="btn_decrypt_files">"Select input file"</string> @@ -99,6 +104,7 @@ <string name="btn_add_keyserver">"Add"</string> <string name="btn_save_default">"Save as default"</string> <string name="btn_saved">"Saved!"</string> + <string name="btn_not_matching">"Doesn't match"</string> <!-- Content Description --> <string name="cd_encrypt_files">"Encrypt Files"</string> @@ -109,7 +115,7 @@ <!-- menu --> <string name="menu_preferences">"Settings"</string> <string name="menu_help">"Help"</string> - <string name="menu_export_key">"Backup to file"</string> + <string name="menu_export_key">"Backup key"</string> <string name="menu_delete_key">"Delete key"</string> <string name="menu_manage_keys">"Manage my keys"</string> <string name="menu_search">"Search"</string> @@ -121,7 +127,7 @@ <string name="menu_update_all_keys">"Update all keys"</string> <string name="menu_advanced">"Extended information"</string> <string name="menu_certify_fingerprint">"Confirm via fingerprint"</string> - <string name="menu_certify_fingerprint_word">"Confirm via words"</string> + <string name="menu_certify_fingerprint_phrases">"Confirm via phrases"</string> <string name="menu_share_log">"Share Log"</string> <string name="menu_keyserver_add">"Add"</string> @@ -133,6 +139,7 @@ <string name="label_file_colon">"File:"</string> <string name="label_no_passphrase">"No Password"</string> <string name="label_passphrase">"Password"</string> + <string name="label_pin">"PIN"</string> <string name="label_unlock">"Unlocking…"</string> <string name="label_passphrase_again">"Repeat Password"</string> <string name="label_show_passphrase">"Show Password"</string> @@ -141,9 +148,7 @@ <string name="label_file_ascii_armor">"Enable ASCII Armor"</string> <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string> <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string> - <string name="label_use_default_yubikey_pin">"Use default YubiKey PIN"</string> <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string> - <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string> <string name="label_asymmetric_from">"Sign with:"</string> <string name="label_to">"Encrypt to:"</string> <string name="label_delete_after_encryption">"Delete files after encryption"</string> @@ -178,8 +183,9 @@ <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> - <string name="label_verify_keyserver">"Verify keyserver"</string> - <string name="label_enter_keyserver_url">"Enter keyserver URL"</string> + <string name="label_verify_keyserver_connection">"Test connection"</string> + <string name="label_only_trusted_keyserver">"Only trusted keyserver"</string> + <string name="label_enter_keyserver_url">"URL"</string> <string name="label_keyserver_dialog_delete">"Delete keyserver"</string> <string name="label_theme">"Theme"</string> @@ -200,8 +206,8 @@ <string name="label_experimental_settings_desc_title">"Warning"</string> <string name="label_experimental_settings_desc_summary">"These features are not yet finished or results of user experience/security research. Thus, don't rely on their security and please don't report issues you encounter!"</string> - <string name="label_experimental_settings_word_confirm_title">"Word Confirm"</string> - <string name="label_experimental_settings_word_confirm_summary">"Confirm keys with words instead of hexadecimal fingerprints"</string> + <string name="label_experimental_settings_word_confirm_title">"Phrase Confirmation"</string> + <string name="label_experimental_settings_word_confirm_summary">"Confirm keys with phrases instead of hexadecimal fingerprints"</string> <string name="label_experimental_settings_linked_identities_title">"Linked Identities"</string> <string name="label_experimental_settings_linked_identities_summary">"Link keys to Twitter, GitHub, websites or DNS (similar to keybase.io but decentralized)"</string> <string name="label_experimental_settings_keybase_title">"Keybase.io Proofs"</string> @@ -223,22 +229,22 @@ <string name="pref_proxy_type_choice_socks">"SOCKS"</string> <!-- OrbotHelper strings --> - <string name="orbot_ignore_tor">"Don\'t use Tor"</string> + <string name="orbot_ignore_tor">"Don't use Tor"</string> <!-- InstallDialogFragment strings --> <string name="orbot_install_dialog_title">Install Orbot to use Tor?</string> <string name="orbot_install_dialog_install">"Install"</string> <string name="orbot_install_dialog_content">You must have Orbot installed and activated to proxy traffic through it. Would you like to install it?</string> <string name="orbot_install_dialog_cancel">"Cancel"</string> - <string name="orbot_install_dialog_ignore_tor">"Don\'t use Tor"</string> + <string name="orbot_install_dialog_ignore_tor">"Don't use Tor"</string> <!-- StartOrbotDialogFragment strings --> <string name="orbot_start_dialog_title">Start Orbot?</string> - <string name="orbot_start_dialog_content">"Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?"</string> + <string name="orbot_start_dialog_content">"Orbot doesn't appear to be running. Would you like to start it up and connect to Tor?"</string> <string name="orbot_start_btn">"Start Orbot"</string> <string name="orbot_start_dialog_start">"Start Orbot"</string> <string name="orbot_start_dialog_cancel">"Cancel"</string> - <string name="orbot_start_dialog_ignore_tor">"Don\'t use Tor"</string> + <string name="orbot_start_dialog_ignore_tor">"Don't use Tor"</string> <string name="user_id_no_name"><![CDATA[<no name>]]></string> @@ -293,7 +299,8 @@ <string name="no_filemanager_installed">"No compatible file manager installed."</string> <string name="passphrases_do_not_match">"The passwords didn't match."</string> <string name="passphrase_must_not_be_empty">"Please enter a password."</string> - <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string> + <string name="passphrase_for_symmetric_encryption">"Enter password"</string> + <string name="passphrase_for_backup">"Enter backup code"</string> <string name="passphrase_for">"Enter password for '%s'"</string> <string name="pin_for">"Enter PIN for '%s'"</string> <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string> @@ -316,7 +323,7 @@ <string name="specify_backup_dest_secret_single">"A full backup of your key will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> <string name="specify_backup_dest_secret">"A full backup of all keys including yours will be made, please specify a destination file.\nWARNING: File will be overwritten if it exists!"</string> <string name="key_deletion_confirmation_multi">"Do you really want to delete all selected keys?"</string> - <string name="secret_key_deletion_confirmation">"After deletion you will not be able to read messages encrypted with this key and lose all key confirmations done with it!"</string> + <string name="secret_key_deletion_confirmation">"After deletion you will not be able to decrypt messages/files encrypted with this key and lose all key confirmations done with it!"</string> <string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string> <string name="also_export_secret_keys">"Also export secret keys"</string> <string name="reinstall_openkeychain">"You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys."</string> @@ -337,7 +344,6 @@ <string name="key_copied_to_clipboard">"Key has been copied to the clipboard!"</string> <string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string> <string name="select_key_to_certify">"Please select a key to be used for confirmation!"</string> - <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string> <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string> <!-- @@ -397,6 +403,7 @@ <string name="progress_cancelling">"cancelling…"</string> <string name="progress_saving">"saving…"</string> <string name="progress_importing">"importing…"</string> + <string name="progress_benchmarking">"benchmarking…"</string> <string name="progress_revoking_uploading">"Revoking and uploading key…"</string> <string name="progress_updating">"Updating keys…"</string> <string name="progress_exporting">"exporting…"</string> @@ -436,8 +443,8 @@ <string name="progress_encrypting">"encrypting data…"</string> <string name="progress_decrypting">"decrypting data…"</string> <string name="progress_preparing_signature">"preparing signature…"</string> + <string name="progress_processing_signature">processing signature…</string> <string name="progress_generating_signature">"generating signature…"</string> - <string name="progress_processing_signature">"processing signature…"</string> <string name="progress_verifying_signature">"verifying signature…"</string> <string name="progress_signing">"signing…"</string> <string name="progress_certifying">"certifying…"</string> @@ -451,7 +458,7 @@ <string name="progress_con_saving">"consolidate: saving to cache…"</string> <string name="progress_con_reimport">"consolidate: reimporting…"</string> - <string name="progress_verifying_keyserver_url">"verifying keyserver…"</string> + <string name="progress_verifying_keyserver_connection">"verifying connection…"</string> <string name="progress_starting_orbot">"Starting Orbot…"</string> @@ -459,10 +466,6 @@ <string name="hint_cloud_search_hint">"Search via Name, Email…"</string> <!-- key bit length selections --> - <string name="key_size_512">"512"</string> - <string name="key_size_768">"768"</string> - <string name="key_size_1024">"1024"</string> - <string name="key_size_1536">"1536"</string> <string name="key_size_2048">"2048"</string> <string name="key_size_3072">"3072"</string> <string name="key_size_4096">"4096"</string> @@ -686,7 +689,6 @@ <string name="key_trust_no_cloud_evidence">"No proof from the Internet on this key’s trustworthiness."</string> <string name="key_trust_start_cloud_search">"Start search"</string> <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string> - <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to confirming them."</string> <!-- keybase proof stuff --> <string name="keybase_narrative_twitter">"Posts to Twitter as %s"</string> @@ -763,13 +765,14 @@ <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_yubi_key_pin_text">"Please remember the PIN, it is required to use your YubiKey later. Please write down the Admin PIN and store it in a safe place."</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> <string name="create_key_yubi_key_admin_pin">"Admin PIN"</string> - <string name="create_key_yubi_key_pin_repeat_text">"Please enter the PIN and Admin PIN to proceed."</string> <string name="create_key_yubi_key_pin_repeat">"Repeat PIN"</string> - <string name="create_key_yubi_key_admin_pin_repeat">"Repeat Admin PIN"</string> <string name="create_key_yubi_key_pin_not_correct">"PIN is not correct!"</string> + <string name="create_key_yubi_key_pin_too_short">"PIN must be at least 6 numbers long!"</string> + <string name="create_key_yubi_key_pin_insecure">"Please choose a secure PIN, not 000000, 123456 or similar combinations."</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> @@ -784,9 +787,10 @@ <!-- Add/Edit keyserver --> <string name="add_keyserver_dialog_title">"Add keyserver"</string> <string name="edit_keyserver_dialog_title">"Edit keyserver"</string> - <string name="add_keyserver_verified">"Keyserver verified!"</string> + <string name="add_keyserver_connection_verified">"Connection verified!"</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> + <string name="add_keyserver_keyserver_not_trusted">"Keyserver is not one of the trusted ones (no pinned certificate available)!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your Internet connection."</string> <string name="keyserver_preference_deleted">"%s deleted"</string> <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string> @@ -798,7 +802,7 @@ <string name="drawer_open">"Open navigation drawer"</string> <string name="drawer_close">"Close navigation drawer"</string> <string name="my_keys">"My Keys"</string> - <string name="nav_backup">"Backup"</string> + <string name="nav_backup">"Backup/Restore"</string> <!-- hints --> <string name="encrypt_content_edit_text_hint">"Type text"</string> @@ -995,6 +999,7 @@ <string name="msg_kc_uid_no_cert">"No valid self-certificate found for user ID '%s', removing from ring"</string> <string name="msg_kc_uid_remove">"Removing invalid user ID '%s'"</string> <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The keyring contained two of them. This may result in missing certificates!"</string> + <string name="msg_kc_uid_too_many">"Removing user ID '%s'. More than 100 User IDs are not imported!"</string> <string name="msg_kc_uid_warn_encoding">"User ID does not verify as UTF-8!"</string> <string name="msg_kc_uat_jpeg">"Processing user attribute of type JPEG"</string> <string name="msg_kc_uat_unknown">"Processing user attribute of unknown type"</string> @@ -1028,7 +1033,7 @@ <string name="msg_cr_error_no_user_id">"Keyrings must be created with at least one user ID!"</string> <string name="msg_cr_error_no_certify">"Master key must have certify flag!"</string> <string name="msg_cr_error_null_expiry">"Expiry time cannot be 'same as before' on key creation. This is a programming error, please file a bug report!"</string> - <string name="msg_cr_error_keysize_512">"Key size must be greater or equal 512!"</string> + <string name="msg_cr_error_keysize_2048">"Key size must be greater or equal 2048!"</string> <string name="msg_cr_error_no_curve">"No key size specified! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_no_keysize">"No elliptic curve specified! This is a programming error, please file a bug report!"</string> <string name="msg_cr_error_internal_pgp">"Internal OpenPGP error!"</string> @@ -1151,10 +1156,13 @@ <string name="msg_ek_error_not_found">"Key not found!"</string> <!-- Messages for DecryptVerify operation --> + <string name="msg_dc_askip_bad_flags">"Key is not an encryption key, skipping…"</string> + <string name="msg_dc_askip_unavailable">"Key not available, skipping…"</string> <string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string> <string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string> <string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string> <string name="msg_dc_charset">"Found charset header: '%s'"</string> + <string name="msg_dc_backup_version">"Found backupVersion header: '%s'"</string> <string name="msg_dc_clear_data">"Processing literal data"</string> <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string> <string name="msg_dc_clear_meta_file">"Filename: %s"</string> @@ -1177,6 +1185,7 @@ <string name="msg_dc_error_input">"Error opening input data stream!"</string> <string name="msg_dc_error_no_data">"No encrypted data found in stream!"</string> <string name="msg_dc_error_no_key">"No encrypted data with known secret key found in stream!"</string> + <string name="msg_dc_error_no_signature">"Missing signature data!"</string> <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string> <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string> <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string> @@ -1200,8 +1209,9 @@ <!-- Messages for VerifySignedLiteralData operation --> <string name="msg_vl">"Starting signature check"</string> - <string name="msg_vl_error_no_siglist">"No signature list in signed literal data"</string> - <string name="msg_vl_error_wrong_key">"Message not signed with right key"</string> + <string name="msg_vl_error_no_siglist">"No signature list in signed literal data!"</string> + <string name="msg_vl_error_wrong_key">"Message not signed with expected key!"</string> + <string name="msg_vl_error_no_signature">"Missing signature data!"</string> <string name="msg_vl_error_missing_literal">"No payload in signed literal data"</string> <string name="msg_vl_clear_meta_file">"Filename: %s"</string> <string name="msg_vl_clear_meta_mime">"MIME type: %s"</string> @@ -1223,7 +1233,6 @@ <!-- Messages for PgpSignEncrypt operation --> <string name="msg_pse_asymmetric">"Preparing public keys for encryption"</string> - <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string> <string name="msg_pse_compressing">"Preparing compression"</string> <string name="msg_pse_encrypting">"Encrypting data"</string> <string name="msg_pse_error_bad_passphrase">"Bad password!"</string> @@ -1294,26 +1303,28 @@ <string name="msg_import_partial">"Import operation successful, with errors!"</string> <string name="msg_import_success">"Import operation successful!"</string> - <plurals name="msg_export"> - <item quantity="one">"Exporting one key"</item> - <item quantity="other">"Exporting %d keys"</item> + <plurals name="msg_backup"> + <item quantity="one">"Backup with one key"</item> + <item quantity="other">"Backup with %d keys"</item> </plurals> - <string name="msg_export_file_name">"Filename: %s"</string> - <string name="msg_export_all">"Exporting all keys"</string> - <string name="msg_export_public">"Exporting public key %s"</string> - <string name="msg_export_upload_public">"Uploading public key %s"</string> - <string name="msg_export_secret">"Exporting secret key %s"</string> - <string name="msg_export_error_no_file">"No filename specified!"</string> - <string name="msg_export_error_fopen">"Error opening file!"</string> - <string name="msg_export_error_no_uri">"No URI specified!"</string> - <string name="msg_export_error_uri_open">"Error opening URI stream!"</string> - <string name="msg_export_error_storage">"Storage is not ready for writing!"</string> - <string name="msg_export_error_db">"Database error!"</string> - <string name="msg_export_error_io">"Input/output error!"</string> - <string name="msg_export_error_key">"Error preprocessing key data!"</string> - <string name="msg_export_error_upload">"Error uploading key to server! Please check your Internet connection"</string> - <string name="msg_export_success">"Export operation successful"</string> - <string name="msg_export_upload_success">"Upload to keyserver successful"</string> + <string name="msg_backup_all">"Backup with all keys"</string> + <string name="msg_backup_public">"Creating backup of public key %s"</string> + <string name="msg_backup_secret">"Creating backup of secret key %s"</string> + <string name="msg_backup_error_uri_open">"Error opening URI stream!"</string> + <string name="msg_backup_error_db">"Database error!"</string> + <string name="msg_backup_error_io">"Input/output error!"</string> + <string name="msg_backup_success">"Backup operation successful"</string> + + <string name="msg_upload">"Uploading public key"</string> + <string name="msg_upload_proxy_direct">"Using proxy: None"</string> + <string name="msg_upload_proxy_tor">"Using proxy: TOR"</string> + <string name="msg_upload_proxy">"Using proxy: %s"</string> + <string name="msg_upload_server">"Server: %s"</string> + <string name="msg_upload_key">"Key id: %s"</string> + <string name="msg_upload_error_key">"Error preprocessing key data!"</string> + <string name="msg_upload_error_not_found">"Key not found!"</string> + <string name="msg_upload_error_upload">"Error uploading key to server! Please check your Internet connection"</string> + <string name="msg_upload_success">"Upload to keyserver successful"</string> <string name="msg_del_error_empty">"Nothing to delete!"</string> <string name="msg_del_error_multi_secret">"Secret keys can only be deleted individually!"</string> @@ -1361,6 +1372,15 @@ <string name="msg_lv_fetch_error_format">"Format error!"</string> <string name="msg_lv_fetch_error_nothing">"Resource not found!"</string> + <string name="msg_bench">"Benchmarking some operations…"</string> + <string name="msg_bench_enc_time">"Encryption time: %ss"</string> + <string name="msg_bench_enc_time_avg">"Average time to encrypt 5M: %ss"</string> + <string name="msg_bench_dec_time">"Decryption time: %ss"</string> + <string name="msg_bench_dec_time_avg">"Average time to decrypt 5M: %ss"</string> + <string name="msg_bench_s2k_100ms_its">"S2K Iteration Count for 100ms: %s"</string> + <string name="msg_bench_s2k_for_it">"Time for %1$s SHA1 S2K iterations: %2$sms"</string> + <string name="msg_bench_success">"Benchmarking complete!"</string> + <string name="msg_data">"Processing input data"</string> <string name="msg_data_openpgp">"Attempting to process OpenPGP data"</string> <string name="msg_data_detached">"Encountered detached signature"</string> @@ -1371,9 +1391,9 @@ <string name="msg_data_detached_trailing">"Skipping trailing data after signed part!"</string> <string name="msg_data_detached_unsupported">"Unsupported type of detached signature!"</string> <string name="msg_data_error_io">"Error reading input data!"</string> - <string name="msg_data_error_openpgp">"Error processing OpenPGP data!"</string> <string name="msg_data_mime_bad">"Could not parse as MIME data"</string> <string name="msg_data_mime_filename">"Filename: '%s'"</string> + <string name="msg_data_mime_from_extension">"Guessing MIME type from extension"</string> <string name="msg_data_mime_length">"Content-Length: %s"</string> <string name="msg_data_mime">"Parsing MIME data structure"</string> <string name="msg_data_mime_ok">"Finished parsing</string> @@ -1441,6 +1461,7 @@ <string name="backup_all">"All keys + your own keys"</string> <string name="backup_public_keys">"All keys"</string> <string name="backup_section">"Backup"</string> + <string name="restore_section">"Restore"</string> <!-- unsorted --> <string name="section_certifier_id">"Certifier"</string> @@ -1451,9 +1472,8 @@ <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string> <string name="section_uids_to_certify">"Identities for "</string> <string name="certify_text">"The keys you are importing contain “identities”: names and email addresses. Select exactly those for confirmation which match what you expected."</string> - <string name="certify_fingerprint_text">"Compare the displayed fingerprint, character by character, with the one displayed on your partners device."</string> - <string name="certify_fingerprint_text_words">"Compare the displayed fingerprint, word by word, with the one displayed on your partners device."</string> - <string name="certify_fingerprint_text2">"Do the fingerprints match?"</string> + <string name="certify_fingerprint_text">"Compare the fingerprint, character by character, with the one displayed on your partner’s device."</string> + <string name="certify_fingerprint_text_phrases">"Compare these phrases with the ones displayed on your partner’s device."</string> <string name="label_revocation">"Revocation Reason"</string> <string name="label_cert_type">"Type"</string> <string name="error_key_not_found">"Key not found!"</string> @@ -1521,7 +1541,12 @@ <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string> <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string> <string name="yubikey_create">"Hold YubiKey against the back of your device."</string> + <string name="yubikey_reset_or_import">"This YubiKey already contains a key. You can import the key using the cloud or reset the YubiKey."</string> <string name="btn_import">"Import"</string> + <string name="btn_reset">"Reset"</string> + <string name="yubikey_import_radio">"Import key"</string> + <string name="yubikey_reset_radio">"Reset YubiKey"</string> + <string name="yubikey_reset_warning">"Resetting the YubiKey completely destroys the keys on it. Afterwards, you will not be able to decrypt messages/files encrypted with this key!"</string> <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> <plurals name="error_pin"> @@ -1539,8 +1564,9 @@ <string name="error_nfc_chaining_error">"YubiKey expected last command in a chain."</string> <string name="error_nfc_header">"YubiKey reported invalid %s byte."</string> <string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string> + <string name="error_nfc_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string> <string name="error_nfc_try_again">"Try again"</string> - <string name="error_pin_nodefault">Default PIN was rejected!</string> + <string name="error_pin_wrong">PIN is wrong!</string> <string name="error_temp_file">Error creating temporary file.</string> <string name="btn_delete_original">Delete original file</string> @@ -1557,6 +1583,7 @@ <string name="error_reading_k9">"Received incomplete data, try pressing 'Download complete message' in K-9 Mail!"</string> <string name="filename_unknown">Unknown filename (click to open)</string> <string name="filename_unknown_text">Text (click to show)</string> + <string name="filename_keys">"Key Backup (click to import)"</string> <string name="intent_show">Show Signed/Encrypted Content</string> <string name="intent_share">Share Signed/Encrypted Content</string> <string name="view_internal">"View in OpenKeychain"</string> @@ -1610,7 +1637,7 @@ </plurals> <!-- Other Linked Identity strings --> - <string name="linked_select_1">"A \'linked identity\' connects your pgp key to a resource on the web."</string> + <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> @@ -1628,7 +1655,8 @@ <string name="linked_title_twitter">"Twitter"</string> <string name="card_linked_identity">"Linked Identity"</string> <string name="linked_button_verify">"Verify"</string> - <string name="linked_button_retry">"Retry last step"</string> + <string name="linked_button_retry">"Retry"</string> + <string name="linked_button_retry_step">"Retry last step"</string> <string name="linked_button_confirm">"Confirm"</string> <string name="linked_button_view">"View"</string> <string name="linked_text_verifying">"Verifying…"</string> @@ -1647,5 +1675,28 @@ <string name="linked_error_http">"Communication error: %s"</string> <string name="linked_webview_title_github">"GitHub Authorization"</string> <string name="linked_gist_description">"OpenKeychain API Tests"</string> + <string name="snack_btn_overwrite">"Overwrite"</string> + <string name="backup_code_explanation">"The backup will be secured with a backup code. Write it down before you proceed!"</string> + <string name="backup_code_enter">"Please enter the backup code:"</string> + <string name="backup_code_ok">"Code accepted!"</string> + <string name="btn_code_wrotedown">"OK, I wrote it down!"</string> + <string name="backup_code_wrong">"The backup code you entered is wrong!\nDid you write it down correctly?"</string> + <string name="btn_backup_share">"Share backup"</string> + <string name="btn_backup_save">"Save backup"</string> + <string name="snack_backup_error_saving">"Error saving backup!"</string> + <string name="snack_backup_saved">"Backup saved"</string> + <string name="snack_backup_exists">"Backup already exists!"</string> + <string name="snack_backup_saved_dir">"Saved to OpenKeychain directory"</string> + <string name="btn_backup_back">Go back to check</string> + <string name="snack_text_too_long">"Text is too long to show in full!"</string> + <string name="snack_shared_text_too_long">"Shared text was cut because it was too long!"</string> + + <string name="share_log_dialog_title">"Share log?"</string> + <string name="share_log_dialog_message">"While logs can be super helpful for developers to find bugs in OpenKeychain, they can contain potential sensitive information such as data about the updated keys. Please make sure you are okay with sharing this information."</string> + <string name="share_log_dialog_share_button">"Share"</string> + <string name="share_log_dialog_cancel_button">"Cancel"</string> + <string name="toast_wrong_mimetype">"Wrong data type, expected text!"</string> + <string name="toast_no_text">"No text in shared data!"</string> + <string name="btn_search_for_query">"Search for\n'%s'"</string> </resources> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 38cf8a3db..fc6ae3846 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -85,11 +85,9 @@ <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> </style> - <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> - </style> + <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"></style> - <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"> - </style> + <style name="Theme.Keychain.Dark" parent="Base.Theme.Keychain.Dark"></style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> <style name="Widget.Keychain.SearchView" parent="Widget.AppCompat.SearchView"> @@ -134,4 +132,6 @@ <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> + + <style name="Theme.Keychain.Transparent" parent="@android:style/Theme.NoDisplay" /> </resources> |