diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
index 56fc76de3..fbcbbb0c3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
@@ -265,7 +265,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
                     startSigning();
                 }
             } else {
-                AppMsg.makeText(this, R.string.key_has_already_been_signed, AppMsg.STYLE_ALERT)
+                AppMsg.makeText(this, R.string.key_has_already_been_certified, AppMsg.STYLE_ALERT)
                         .show();
 
                 setResult(RESULT_CANCELED);
@@ -312,7 +312,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
 
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
 
-                    AppMsg.makeText(CertifyKeyActivity.this, R.string.key_sign_success,
+                    AppMsg.makeText(CertifyKeyActivity.this, R.string.key_certify_success,
                             AppMsg.STYLE_INFO).show();
 
                     // check if we need to send the key to the server or not
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index c98063ef9..e595c1889 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -402,7 +402,7 @@ public class ViewKeyActivity extends ActionBarActivity {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case NFC_SENT:
-                    AppMsg.makeText(ViewKeyActivity.this, R.string.nfc_successfull,
+                    AppMsg.makeText(ViewKeyActivity.this, R.string.nfc_successful,
                             AppMsg.STYLE_INFO).show();
                     break;
             }
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index ca2b124d2..44e8c85f6 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -207,11 +207,11 @@
     <item quantity="other">%d schlechte private Schlüssel ignoriert. Evtl. wurden sie mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item>
   </plurals>
   <string name="key_send_success">Schlüssel wurde erfolgreich hochgeladen.</string>
-  <string name="key_sign_success">Schlüssel erfolgreich signiert</string>
+  <string name="key_certify_success">Schlüssel erfolgreich signiert</string>
   <string name="list_empty">Diese Liste ist leer!</string>
-  <string name="nfc_successfull">Schlüssel erfolgreich mit NFC Beam gesendet!</string>
+  <string name="nfc_successful">Schlüssel erfolgreich mit NFC Beam gesendet!</string>
   <string name="key_copied_to_clipboard">Schlüssel wurde in die Zwischenablage kopiert!</string>
-  <string name="key_has_already_been_signed">Dieser Schlüssel wurde schon signiert!</string>
+  <string name="key_has_already_been_certified">Dieser Schlüssel wurde schon signiert!</string>
   <string name="select_key_to_sign">Bitte wähle einen Signaturschlüssel!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index d071737d7..1bf4686cb 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -212,11 +212,11 @@
     <item quantity="other">%d malas claves secretas ignoradas. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
   </plurals>
   <string name="key_send_success">Clave cargada al servidor satisfactoriamente</string>
-  <string name="key_sign_success">Clave firmada satisfactoriamente</string>
+  <string name="key_certify_success">Clave firmada satisfactoriamente</string>
   <string name="list_empty">¡Esta lista está vacía!</string>
-  <string name="nfc_successfull">¡Clave enviada satisfactoriamente con NFC Beam!</string>
+  <string name="nfc_successful">¡Clave enviada satisfactoriamente con NFC Beam!</string>
   <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
-  <string name="key_has_already_been_signed">¡La clave ya ha sido firmada!</string>
+  <string name="key_has_already_been_certified">¡La clave ya ha sido firmada!</string>
   <string name="select_key_to_sign">¡Por favor, selecciona la clave que se usará para firmar!</string>
   <string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 57ca4bbb1..0738586d5 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -216,11 +216,11 @@
     <item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
   </plurals>
   <string name="key_send_success">Clef téléversée vers le serveur avec succès</string>
-  <string name="key_sign_success">Clef signée avec succès</string>
+  <string name="key_certify_success">Clef signée avec succès</string>
   <string name="list_empty">Cette liste est vide !</string>
-  <string name="nfc_successfull">Clef envoyée par NFC BEAM avec succès !</string>
+  <string name="nfc_successful">Clef envoyée par NFC BEAM avec succès !</string>
   <string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
-  <string name="key_has_already_been_signed">La clef a déjà été signée !</string>
+  <string name="key_has_already_been_certified">La clef a déjà été signée !</string>
   <string name="select_key_to_sign">Veuillez choisir une clef a utiliser pour la signature !</string>
   <string name="key_too_big_for_sharing">La clef est trop grosse pour être partagée ainsi !</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index 95cafb6b2..df33c67c6 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -213,11 +213,11 @@
     <item quantity="other">%d chiavi private non valide  ignorate. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
   </plurals>
   <string name="key_send_success">Chiave caricata con successo sul server</string>
-  <string name="key_sign_success">Chiave firmata correttamente</string>
+  <string name="key_certify_success">Chiave firmata correttamente</string>
   <string name="list_empty">Lista vuota!</string>
-  <string name="nfc_successfull">Chiave inviata tramite NFC Beam!</string>
+  <string name="nfc_successful">Chiave inviata tramite NFC Beam!</string>
   <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
-  <string name="key_has_already_been_signed">La chiave e\' gia\' firmata!</string>
+  <string name="key_has_already_been_certified">La chiave e\' gia\' firmata!</string>
   <string name="select_key_to_sign">Per favore seleziona la chiave per la firma!</string>
   <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index d8f82da9b..1122e2c96 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -208,11 +208,11 @@
     <item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item>
   </plurals>
   <string name="key_send_success">鍵を鍵サーバにアップロードしました</string>
-  <string name="key_sign_success">鍵に署名しました。</string>
+  <string name="key_certify_success">鍵に署名しました。</string>
   <string name="list_empty">このリストは空です!</string>
-  <string name="nfc_successfull">NFCビームで鍵を送信しました!</string>
+  <string name="nfc_successful">NFCビームで鍵を送信しました!</string>
   <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
-  <string name="key_has_already_been_signed">鍵はすでに署名されています!</string>
+  <string name="key_has_already_been_certified">鍵はすでに署名されています!</string>
   <string name="select_key_to_sign">署名に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index bb3ace2a6..a2faafb0c 100644
--- a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
@@ -114,9 +114,9 @@
   <string name="key_exported">1 sleutel succesvol geëxporteerd.</string>
   <string name="no_keys_exported">Geen sleutels geëxporteerd.</string>
   <string name="key_not_found">Kan de sleutel %08X niet vinden.</string>
-  <string name="key_sign_success">Sleutel succesvol ondertekend</string>
+  <string name="key_certify_success">Sleutel succesvol ondertekend</string>
   <string name="list_empty">Lijst is leeg</string>
-  <string name="nfc_successfull">Sleutel succesvol verzonden met Beam</string>
+  <string name="nfc_successful">Sleutel succesvol verzonden met Beam</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 33f8b6bff..a8627eaea 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -220,11 +220,11 @@
     <item quantity="other">zignorowano %d niepoprawnych kluczy prywatnych. Prawdopodobnie zostały wyeksportowane przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz je z opcją\n --export-secret-keys\nktóra jest poprawna.</item>
   </plurals>
   <string name="key_send_success">Pomyślnie wysłano klucz na serwer</string>
-  <string name="key_sign_success">Pomyślnie podpisano klucz</string>
+  <string name="key_certify_success">Pomyślnie podpisano klucz</string>
   <string name="list_empty">Lista jest pusta!</string>
-  <string name="nfc_successfull">Pomyślnie wysłano klucz przez NFC!</string>
+  <string name="nfc_successful">Pomyślnie wysłano klucz przez NFC!</string>
   <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string>
-  <string name="key_has_already_been_signed">Klucz został już wcześniej podpisany!</string>
+  <string name="key_has_already_been_certified">Klucz został już wcześniej podpisany!</string>
   <string name="select_key_to_sign">Wybierz klucz, który zostanie użyty do podpisania!</string>
   <string name="key_too_big_for_sharing">Klucz ma za duży rozmiar by być udostępniony w ten sposób!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index ca80e9a2c..4468b5fda 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -215,11 +215,11 @@
     <item quantity="other">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item>
   </plurals>
   <string name="key_send_success">Ключ успешно загружен на сервер</string>
-  <string name="key_sign_success">Ключ успешно подписан</string>
+  <string name="key_certify_success">Ключ успешно подписан</string>
   <string name="list_empty">Список пуст!</string>
-  <string name="nfc_successfull">Ключ успешно передан через NFC!</string>
+  <string name="nfc_successful">Ключ успешно передан через NFC!</string>
   <string name="key_copied_to_clipboard">Ключ скопирован в буфер обмена!</string>
-  <string name="key_has_already_been_signed">Ключ уже был подписан ранее!</string>
+  <string name="key_has_already_been_certified">Ключ уже был подписан ранее!</string>
   <string name="select_key_to_sign">Выберите ключ, используемый для подписи!</string>
   <string name="key_too_big_for_sharing">Ключ слишком большой для этого способа передачи!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 7fdd064d2..c2adaa8d4 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -77,7 +77,7 @@
   <string name="file_delete_successful">Başarıyla silindi.</string>
   <string name="no_file_selected">Önce bir dosya seçin.</string>
   <string name="key_not_found">Anahtar %08X bulunamadı.</string>
-  <string name="key_sign_success">Anahtar başarıyla imzalandı</string>
+  <string name="key_certify_success">Anahtar başarıyla imzalandı</string>
   <string name="list_empty">Liste boş!</string>
   <!--errors
          no punctuation, all lowercase,
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 100ce4ee8..fe5c1b3c9 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -223,11 +223,11 @@
     <item quantity="other">%d поганих секретних ключів проігноровано. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item>
   </plurals>
   <string name="key_send_success">Успішно завантажено ключ на сервер</string>
-  <string name="key_sign_success">Успішно підписаний ключ</string>
+  <string name="key_certify_success">Успішно підписаний ключ</string>
   <string name="list_empty">Цей список - порожній!</string>
-  <string name="nfc_successfull">Успішно відправлений ключ з NFC променем!</string>
+  <string name="nfc_successful">Успішно відправлений ключ з NFC променем!</string>
   <string name="key_copied_to_clipboard">Ключ вже скопійовано у буфер обміну!</string>
-  <string name="key_has_already_been_signed">Ключ уже був підписаний раніше!</string>
+  <string name="key_has_already_been_certified">Ключ уже був підписаний раніше!</string>
   <string name="select_key_to_sign">Будь ласка, виберіть ключ, використаний для підписування!</string>
   <string name="key_too_big_for_sharing">Ключ надто великий для цього способу поширення!</string>
   <!--errors
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 180538764..baa257fa6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -245,11 +245,11 @@
     </plurals>
 
     <string name="key_send_success">Successfully uploaded key to server</string>
-    <string name="key_sign_success">Successfully certified key</string>
+    <string name="key_certify_success">Successfully certified key</string>
     <string name="list_empty">This list is empty!</string>
-    <string name="nfc_successfull">Successfully sent key with NFC Beam!</string>
+    <string name="nfc_successful">Successfully sent key with NFC Beam!</string>
     <string name="key_copied_to_clipboard">Key has been copied to the clipboard!</string>
-    <string name="key_has_already_been_signed">Key has already been certified!</string>
+    <string name="key_has_already_been_certified">Key has already been certified!</string>
     <string name="select_key_to_sign">Please select a key to be used for signing!</string>
     <string name="key_too_big_for_sharing">Key is too big to be shared this way!</string>
 
@@ -279,8 +279,8 @@
     <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string>
 
     <!-- errors without preceeding Error: -->
-    <string name="error_only_files_are_supported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string>
-    <string name="error_jelly_bean_needed">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string>
+    <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_keyserver_insufficient_query">Insufficient server query</string>
@@ -472,7 +472,7 @@
     <string name="section_signer_id">Signer</string>
     <string name="section_cert">Certificate Details</string>
     <string name="label_user_id">User ID</string>
-    <string name="unknown_uid"><![CDATA[<unknown>]]></string>
+    <string name="unknown_uid">&lt;unknown&gt;</string>
     <string name="empty_certs">No certificates for this key</string>
     <string name="section_uids_to_sign">User IDs to sign</string>
     <string name="cert_default">default</string>