diff options
Diffstat (limited to 'OpenKeychain/src/main')
3 files changed, 51 insertions, 51 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 02500df65..074e40b22 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -191,7 +191,8 @@ public class PassphraseDialogActivity extends FragmentActivity { CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(theme); - alert.setTitle(R.string.title_unlock); + // No title, see http://www.google.com/design/spec/components/dialogs.html#dialogs-alerts + //alert.setTitle() LayoutInflater inflater = LayoutInflater.from(theme); View view = inflater.inflate(R.layout.passphrase_dialog, null); @@ -318,7 +319,7 @@ public class PassphraseDialogActivity extends FragmentActivity { AlertDialog dialog = alert.create(); dialog.setButton(DialogInterface.BUTTON_POSITIVE, - activity.getString(android.R.string.ok), (DialogInterface.OnClickListener) null); + activity.getString(R.string.btn_unlock), (DialogInterface.OnClickListener) null); return dialog; } diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index d2e85633f..a2e6af27c 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -26,7 +26,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" android:imeOptions="actionDone" android:hint="@string/label_passphrase" android:ems="10" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 6d29ce3fd..78ab45cf3 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -12,13 +12,12 @@ <string name="title_encrypt_text">"Encrypt"</string> <string name="title_encrypt_files">"Encrypt"</string> <string name="title_decrypt">"Decrypt"</string> - <string name="title_unlock">"Unlock Key"</string> <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_preferences">"Settings"</string> <string name="title_api_registered_apps">"Apps"</string> <string name="title_key_server_preference">"Keyservers"</string> - <string name="title_change_passphrase">"Change Passphrase"</string> + <string name="title_change_passphrase">"Change Password"</string> <string name="title_share_fingerprint_with">"Share fingerprint with…"</string> <string name="title_share_key">"Share key with…"</string> <string name="title_share_file">"Share file with…"</string> @@ -49,7 +48,7 @@ <string name="section_cloud_evidence">"Proofs from the cloud"</string> <string name="section_keys">"Subkeys"</string> <string name="section_cloud_search">"Cloud search"</string> - <string name="section_passphrase_cache">"Passphrase Cache"</string> + <string name="section_passphrase_cache">"Password Cache"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -86,6 +85,7 @@ <string name="btn_encrypt_files">"Encrypt files"</string> <string name="btn_encrypt_text">"Encrypt text"</string> <string name="btn_add_email">"Add additional email address"</string> + <string name="btn_unlock">"Unlock"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> @@ -109,11 +109,11 @@ <string name="label_file">"File"</string> <string name="label_files">"File(s)"</string> <string name="label_file_colon">"File:"</string> - <string name="label_no_passphrase">"No Passphrase"</string> - <string name="label_passphrase">"Passphrase"</string> + <string name="label_no_passphrase">"No Password"</string> + <string name="label_passphrase">"Password"</string> <string name="label_unlock">"Unlocking…"</string> - <string name="label_passphrase_again">"Repeat Passphrase"</string> - <string name="label_show_passphrase">"Show Passphrase"</string> + <string name="label_passphrase_again">"Repeat Password"</string> + <string name="label_show_passphrase">"Show Password"</string> <string name="label_algorithm">"Algorithm"</string> <string name="label_ascii_armor">"File ASCII Armor"</string> <string name="label_file_ascii_armor">"Enable ASCII Armor"</string> @@ -128,9 +128,9 @@ <string name="label_delete_after_decryption">"Delete after decryption"</string> <string name="label_encryption_algorithm">"Encryption algorithm"</string> <string name="label_hash_algorithm">"Hash algorithm"</string> - <string name="label_symmetric">"Encrypt with passphrase"</string> + <string name="label_symmetric">"Encrypt with password"</string> <string name="label_passphrase_cache_ttl">"Cache time"</string> - <string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string> + <string name="label_passphrase_cache_subs">"Cache passwords by subkey"</string> <string name="label_message_compression">"Text compression"</string> <string name="label_file_compression">"File compression"</string> <string name="label_keyservers">"Keyservers"</string> @@ -203,12 +203,12 @@ <string name="flag_authenticate">"Authenticate"</string> <!-- sentences --> - <string name="wrong_passphrase">"Wrong passphrase."</string> + <string name="wrong_passphrase">"Wrong password."</string> <string name="no_filemanager_installed">"No compatible file manager installed."</string> - <string name="passphrases_do_not_match">"The passphrases didn't match."</string> - <string name="passphrase_must_not_be_empty">"Please enter a passphrase."</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">"Enter passphrase for '%s'"</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> <string name="nfc_text">"Hold YubiKey against the back of your device."</string> @@ -264,11 +264,11 @@ <string name="error_unknown_algorithm_choice">"unknown algorithm choice"</string> <string name="error_user_id_no_email">"no email address found"</string> <string name="error_key_needs_a_user_id">"need at least one identity"</string> - <string name="error_no_signature_passphrase">"no passphrase given"</string> + <string name="error_no_signature_passphrase">"no password given"</string> <string name="error_no_signature_key">"no signature key given"</string> <string name="error_invalid_data">"No valid encrypted or signed OpenPGP content!"</string> <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string> - <string name="error_wrong_passphrase">"wrong passphrase"</string> + <string name="error_wrong_passphrase">"wrong password"</string> <string name="error_could_not_extract_private_key">"could not extract private key"</string> <!-- errors without preceeding Error: --> @@ -325,7 +325,7 @@ <string name="progress_modify_subkeyrevoke">"revoking subkeys…"</string> <string name="progress_modify_subkeystrip">"stripping subkeys…"</string> <string name="progress_modify_subkeyadd">"adding subkeys…"</string> - <string name="progress_modify_passphrase">"changing passphrase…"</string> + <string name="progress_modify_passphrase">"changing passwords…"</string> <plurals name="progress_exporting_key"> <item quantity="one">"exporting key…"</item> @@ -592,7 +592,7 @@ <string name="keybase_verify">"Verify"</string> <!-- Edit key --> - <string name="edit_key_action_change_passphrase">"Change Passphrase"</string> + <string name="edit_key_action_change_passphrase">"Change Password"</string> <string name="edit_key_action_add_identity">"Add Identity"</string> <string name="edit_key_action_add_subkey">"Add Subkey"</string> <string name="edit_key_edit_user_id_title">"Select an action!"</string> @@ -618,14 +618,14 @@ <!-- Create key --> <string name="create_key_upload">"Synchronize with the cloud"</string> <string name="create_key_empty">"This field is required"</string> - <string name="create_key_passphrases_not_equal">"Passphrases do not match"</string> + <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_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> <string name="create_key_email_text">"Enter your main email address used for secure communication."</string> - <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string> + <string name="create_key_passphrase_text">"Choose a strong password. It protects your key when your device gets stolen."</string> <string name="create_key_hint_full_name">"Full Name or Nickname"</string> <string name="create_key_edit">"Change key configuration"</string> <string name="create_key_add_email">"Add email address"</string> @@ -777,7 +777,7 @@ <string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string> <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string> <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string> - <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty passphrase"</string> + <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 smartcard/NFC'"</string> @@ -896,7 +896,7 @@ <string name="msg_mf_error_master_none">"No master certificate found to operate on! (All revoked?)"</string> <string name="msg_mf_error_noexist_primary">"Bad primary user ID specified!"</string> <string name="msg_mf_error_noexist_revoke">"Bad user ID for revocation specified!"</string> - <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string> + <string name="msg_mf_error_restricted">"Tried to execute restricted operation without password! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string> <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_noop">"Nothing to do!"</string> @@ -907,16 +907,16 @@ <string name="msg_mf_master">"Modifying master certifications"</string> <string name="msg_mf_notation_empty">"Adding empty notation packet"</string> <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string> - <string name="msg_mf_passphrase">"Changing passphrase for keyring"</string> - <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new passphrase"</string> - <string name="msg_mf_passphrase_empty_retry">"Setting new passphrase failed, trying again with empty old passphrase"</string> - <string name="msg_mf_passphrase_fail">"Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)"</string> + <string name="msg_mf_passphrase">"Changing password for keyring"</string> + <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new password"</string> + <string name="msg_mf_passphrase_empty_retry">"Setting new password failed, trying again with empty old password"</string> + <string name="msg_mf_passphrase_fail">"Password for subkey could not be changed! (Does it have a different one from the other keys?)"</string> <string name="msg_mf_primary_replace_old">"Replacing certificate of previous primary user ID"</string> <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 card/nfc for crypto operations"</string> - <string name="msg_mf_require_passphrase">"Passphrase required for 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> <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string> @@ -968,7 +968,7 @@ <!-- Edit Key (higher level than modify) --> <string name="msg_ed">"Performing key operation"</string> - <string name="msg_ed_caching_new">"Caching new passphrase"</string> + <string name="msg_ed_caching_new">"Caching new password"</string> <string name="msg_ed_error_no_parcel">"Missing SaveKeyringParcel! (this is a bug, please report)"</string> <string name="msg_ed_error_key_not_found">"Key not found!"</string> <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string> @@ -1002,7 +1002,7 @@ <string name="msg_dc_clear_signature_ok">"Signature check OK"</string> <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 passphrase!"</string> + <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad password!"</string> <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string> <string name="msg_dc_error_integrity_check">"Integrity check error!"</string> <string name="msg_dc_error_integrity_missing">"Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack."</string> @@ -1014,9 +1014,9 @@ <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> <string name="msg_dc_ok">"Decryption/Verification finished"</string> - <string name="msg_dc_pass_cached">"Using passphrase from cache"</string> + <string name="msg_dc_pass_cached">"Using password from cache"</string> <string name="msg_dc_pending_nfc">"NFC token required, requesting user input…"</string> - <string name="msg_dc_pending_passphrase">"Passphrase required, requesting user input…"</string> + <string name="msg_dc_pending_passphrase">"Password required, requesting user input…"</string> <string name="msg_dc_prep_streams">"Preparing streams for decryption"</string> <string name="msg_dc">"Starting decrypt operation…"</string> <string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string> @@ -1055,13 +1055,13 @@ <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 passphrase!"</string> + <string name="msg_pse_error_bad_passphrase">"Bad password!"</string> <string name="msg_pse_error_hash_algo">"Requested hashing algorithm is not supported by this key!"</string> <string name="msg_pse_error_io">"Encountered IO Exception during operation!"</string> <string name="msg_pse_error_key_sign">"Selected signing key cannot sign data!"</string> <string name="msg_pse_error_sign_key">"Error fetching signing key!"</string> <string name="msg_pse_error_nfc">"NFC data error!"</string> - <string name="msg_pse_error_no_passphrase">"No passphrase provided!"</string> + <string name="msg_pse_error_no_passphrase">"No password provided!"</string> <string name="msg_pse_error_pgp">"Internal OpenPGP error!"</string> <string name="msg_pse_error_sig">"Encountered OpenPGP signature exception!"</string> <string name="msg_pse_error_unlock">"Unknown error unlocking key!"</string> @@ -1070,7 +1070,7 @@ <string name="msg_pse_key_warn">"Bad key for encryption: %s"</string> <string name="msg_pse_ok">"Sign/Encrypt operation successful!"</string> <string name="msg_pse_pending_nfc">"NFC token required, requesting user input…"</string> - <string name="msg_pse_pending_passphrase">"Passphrase required, requesting user input…"</string> + <string name="msg_pse_pending_passphrase">"Password required, requesting user input…"</string> <string name="msg_pse_signing">"Signing data (without encryption)"</string> <string name="msg_pse_signing_cleartext">"Creating cleartext signature"</string> <string name="msg_pse_signing_detached">"Creating detached signature"</string> @@ -1181,11 +1181,11 @@ <string name="msg_export_log_success">"Log exported successfully!"</string> <!-- PassphraseCache --> - <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string> - <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string> - <string name="passp_cache_notif_keys">"Cached Passphrases:"</string> + <string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string> + <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string> + <string name="passp_cache_notif_keys">"Cached Passwords:"</string> <string name="passp_cache_notif_clear">"Clear Cache"</string> - <string name="passp_cache_notif_pwd">"Passphrase"</string> + <string name="passp_cache_notif_pwd">"Password"</string> <!-- First Time --> <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string> @@ -1211,7 +1211,7 @@ <string name="error_key_processing">"Error processing key!"</string> <string name="key_stripped">"stripped"</string> <string name="key_divert">"divert to smartcard/NFC"</string> - <string name="key_no_passphrase">"no passphrase"</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> <string name="title_view_cert">"View Certificate Details"</string> @@ -1231,20 +1231,20 @@ <!-- Passphrase wizard --> <!-- TODO: rename all the things! --> <string name="title_unlock_method">Choose an unlock method</string> - <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>--> - <string name="enter_passphrase">Enter passphrase</string> - <string name="passphrase">Passphrase</string> - <string name="noPassphrase">No passphrase</string> - <string name="no_passphrase_set">No passphrase set</string> - <string name="passphrases_match">Passphrases do match</string> - <string name="passphrase_saved">Passphrase saved</string> - <string name="passphrase_invalid">Passphrase invalid</string> - <string name="missing_passphrase">Missing passphrase</string> + <!--<string name="enter_passphrase_twice">Enter password twice</string>--> + <string name="enter_passphrase">Enter password</string> + <string name="passphrase">Password</string> + <string name="noPassphrase">No password</string> + <string name="no_passphrase_set">No password set</string> + <string name="passphrases_match">Passwords do match</string> + <string name="passphrase_saved">Password saved</string> + <string name="passphrase_invalid">Password invalid</string> + <string name="missing_passphrase">Missing password</string> <string name="passphrase_again">Again</string> <string name="lockpattern">Lockpattern</string> <string name="lockpatternNFC">NFC + Lockpattern</string> <string name="unlock_method">Unlock method</string> - <string name="set_passphrase">Set passphrase</string> + <string name="set_passphrase">Set password</string> <string name="draw_lockpattern">Draw lockpattern</string> <string name="nfc_title">NFC</string> <!--<string name="nfc_text">Please place a NFC tag near your device</string>--> |