diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 80e52f6e2..bbe11f703 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -279,7 +279,7 @@
     <string name="decrypt_result_not_encrypted">"Not Encrypted"</string>
     <string name="decrypt_result_action_show">"Show"</string>
     <string name="decrypt_result_action_Lookup">"Lookup"</string>
-    <string name="decrypt_invalid_text">"Either the signature is invalid or the key has been revoked/is expired. You can not be sure who wrote the text. Do you still want to display it?"</string>
+    <string name="decrypt_invalid_text">"Either the signature is invalid or the key has been revoked/is expired. You cannot be sure who wrote the text. Do you still want to display it?"</string>
     <string name="decrypt_invalid_button">"I understand the risks, display it!"</string>
 
     <!-- Add keys -->
@@ -670,14 +670,14 @@
         <item quantity="one">"Ignoring one certificate issued by an unknown public key"</item>
         <item quantity="other">"Ignoring %s certificates issued by unknown public keys"</item>
     </plurals>
-    <string name="msg_ip_uid_classifying_zero">"Classifying user ids (no trusted keys available)"</string>
+    <string name="msg_ip_uid_classifying_zero">"Classifying user IDs (no trusted keys available)"</string>
     <plurals name="msg_ip_uid_classifying">
-        <item quantity="one">"Classifying user ids (using one trusted key)"</item>
-        <item quantity="other">"Classifying user ids (using %s trusted keys)"</item>
+        <item quantity="one">"Classifying user IDs (using one trusted key)"</item>
+        <item quantity="other">"Classifying user IDs (using %s trusted keys)"</item>
     </plurals>
-    <string name="msg_ip_uid_reorder">"Re-ordering user ids"</string>
-    <string name="msg_ip_uid_processing">"Processing user id %s"</string>
-    <string name="msg_ip_uid_revoked">"User id is revoked"</string>
+    <string name="msg_ip_uid_reorder">"Re-ordering user IDs"</string>
+    <string name="msg_ip_uid_processing">"Processing user ID %s"</string>
+    <string name="msg_ip_uid_revoked">"User ID is revoked"</string>
     <string name="msg_is_bad_type_public">"Tried to import public keyring as secret. This is a bug, please file a report!"</string>
     <string name="msg_is_bad_type_uncanon">"Tried to import a keyring without canonicalization. This is a bug, please file a report!"</string>
 
@@ -701,7 +701,7 @@
     <string name="msg_kc_public">"Canonicalizing public keyring %s"</string>
     <string name="msg_kc_secret">"Canonicalizing secret keyring %s"</string>
     <string name="msg_kc_error_v3">"This is an OpenPGP version 3 key, which has been deprecated and is no longer supported!"</string>
-    <string name="msg_kc_error_no_uid">"Keyring has no valid user ids!"</string>
+    <string name="msg_kc_error_no_uid">"Keyring has no valid user IDs!"</string>
     <string name="msg_kc_error_master_algo">"The master key uses an unknown (%s) algorithm!"</string>
     <string name="msg_kc_error_dup_key">"Subkey %s occurs twice in keyring. Keyring is malformed, not importing!"</string>
     <string name="msg_kc_master">"Processing master key"</string>
@@ -709,7 +709,7 @@
     <string name="msg_kc_revoke_bad_local">"Removing keyring revocation certificate with "local" flag"</string>
     <string name="msg_kc_revoke_bad_time">"Removing keyring revocation certificate with future timestamp"</string>
     <string name="msg_kc_revoke_bad_type">"Removing master key certificate of unknown type (%s)"</string>
-    <string name="msg_kc_revoke_bad_type_uid">"Removing user id certificate in bad position"</string>
+    <string name="msg_kc_revoke_bad_type_uid">"Removing user ID certificate in bad position"</string>
     <string name="msg_kc_revoke_bad">"Removing bad keyring revocation certificate"</string>
     <string name="msg_kc_revoke_dup">"Removing redundant keyring revocation certificate"</string>
     <string name="msg_kc_sub">"Processing subkey %s"</string>
@@ -740,18 +740,18 @@
         <item quantity="one">"Keyring canonicalization successful, removed one redundant certificate"</item>
         <item quantity="other">"Keyring canonicalization successful, removed %d redundant certificates"</item>
     </plurals>
-    <string name="msg_kc_uid_bad_err">"Removing bad self certificate for user id '%s'"</string>
-    <string name="msg_kc_uid_bad_local">"Removing user id certificate with 'local' flag"</string>
-    <string name="msg_kc_uid_bad_time">"Removing user id with future timestamp"</string>
-    <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_cert_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>
-    <string name="msg_kc_uid_remove">"Removing invalid user id '%s'"</string>
-    <string name="msg_kc_uid_dup">"Removing duplicate user id '%s'. The secret key contained two of them. This may result in missing certificates!"</string>
+    <string name="msg_kc_uid_bad_err">"Removing bad self certificate for user ID '%s'"</string>
+    <string name="msg_kc_uid_bad_local">"Removing user ID certificate with 'local' flag"</string>
+    <string name="msg_kc_uid_bad_time">"Removing user ID with future timestamp"</string>
+    <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_cert_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>
+    <string name="msg_kc_uid_remove">"Removing invalid user ID '%s'"</string>
+    <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The secret key contained two of them. This may result in missing certificates!"</string>
     <string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string>
 
     <!-- Keyring merging log entries -->
@@ -767,7 +767,7 @@
     <!-- createSecretKeyRing -->
     <string name="msg_cr">"Generating new master key"</string>
     <string name="msg_cr_error_no_master">"No master key options specified!"</string>
-    <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_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>
@@ -787,9 +787,9 @@
     <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string>
     <string name="msg_mf_error_integrity">"Internal error, integrity check failed!"</string>
     <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_revoked_primary">"Revoked user ids cannot be primary!"</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_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_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal PGP error!"</string>
@@ -799,8 +799,8 @@
     <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_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_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_subkey_change">"Modifying subkey %s"</string>
     <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
@@ -809,9 +809,9 @@
     <string name="msg_mf_subkey_revoke">"Revoking subkey %s"</string>
     <string name="msg_mf_subkey_strip">"Stripping 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 user id to %s"</string>
-    <string name="msg_mf_uid_revoke">"Revoking user id %s"</string>
+    <string name="msg_mf_uid_add">"Adding user ID %s"</string>
+    <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
+    <string name="msg_mf_uid_revoke">"Revoking user ID %s"</string>
     <string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string>
     <string name="msg_mf_unlock_error">"Error unlocking keyring!"</string>
     <string name="msg_mf_unlock">"Unlocking keyring"</string>
@@ -917,10 +917,10 @@
     <string name="msg_se_symmetric">"Preparing symmetric encryption"</string>
 
     <string name="msg_crt_certifying">"Generating certifications"</string>
-    <string name="msg_crt_certify_all">"Certifying all user ids for key %s"</string>
+    <string name="msg_crt_certify_all">"Certifying all user IDs for key %s"</string>
     <plurals name="msg_crt_certify_some">
-        <item quantity="one">"Certifying one user id for key %2$s"</item>
-        <item quantity="other">"Certifying %1$d user ids for key %2$s"</item>
+        <item quantity="one">"Certifying one user ID for key %2$s"</item>
+        <item quantity="other">"Certifying %1$d user IDs for key %2$s"</item>
     </plurals>
     <string name="msg_crt_error_master_not_found">"Master key not found!"</string>
     <string name="msg_crt_error_nothing">"No keys certified!"</string>
@@ -953,17 +953,17 @@
     <string name="msg_import_merge">"Merging retrieved data"</string>
     <string name="msg_import_error">"Import operation failed!"</string>
     <string name="msg_import_partial">"Import operation successful, with errors!"</string>
-    <string name="msg_import_success">"Import operation successful"</string>
+    <string name="msg_import_success">"Import operation successful!"</string>
 
     <plurals name="msg_export">
-        <item quantity="one">"Exporting one keys"</item>
+        <item quantity="one">"Exporting one key"</item>
         <item quantity="other">"Exporting %d keys"</item>
     </plurals>
     <string name="msg_export_all">"Exporting all keys"</string>
     <string name="msg_export_public">"Exporting 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_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>
@@ -992,7 +992,7 @@
     <string name="msg_acc_saved">"Account saved"</string>
 
     <string name="msg_download_success">"Downloaded successfully!"</string>
-    <string name="msg_download_no_valid_keys">"No valid keys found in File/Clipboard!"</string>
+    <string name="msg_download_no_valid_keys">"No valid keys found in file/clipboard!"</string>
     <string name="msg_download_no_pgp_parts">"TODO: plurals!"</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>