diff --git a/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
index 204b28c38..c3d7cc4c9 100644
--- a/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml
@@ -19,7 +19,6 @@
   <string name="title_send_key">Nahrát na server s klíči</string>
   <string name="title_help">Nápověda</string>
   <!--section-->
-  <string name="section_keys">Klíče</string>
   <!--button-->
   <!--menu-->
   <!--label-->
@@ -44,6 +43,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 3a771d44f..d90125c51 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -13,8 +13,9 @@
   <string name="title_key_server_preference">Schlüsselserver</string>
   <string name="title_change_passphrase">Passphrase ändern</string>
   <string name="title_set_passphrase">Passwort setzen</string>
+  <string name="title_share_with">Teilen über...</string>
   <string name="title_share_fingerprint_with">Teile Fingerabdruck über…</string>
-  <string name="title_share_key">Teile Schlüssel über...</string>
+  <string name="title_share_key">Gesamter Schlüssel</string>
   <string name="title_share_file">Datei teilen mit…</string>
   <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string>
   <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string>
@@ -23,12 +24,12 @@
   <string name="title_export_keys">Schlüssel exportieren</string>
   <string name="title_key_not_found">Schlüssel nicht gefunden</string>
   <string name="title_send_key">Auf Schlüsselserver hochladen</string>
-  <string name="title_certify_key">Schlüssel beglaubigen</string>
+  <string name="title_certify_key">Identitäten beglaubigen</string>
   <string name="title_key_details">Schlüsseldetails</string>
   <string name="title_help">Hilfe</string>
   <!--section-->
   <string name="section_user_ids">Identitäten</string>
-  <string name="section_keys">Schlüssel</string>
+  <string name="section_keys">Unterschlüssel</string>
   <string name="section_general">Allgemein</string>
   <string name="section_defaults">Standardwerte</string>
   <string name="section_advanced">Fortgeschrittene Einstellungen</string>
@@ -44,9 +45,9 @@
   <string name="section_fingerprint">Fingerabdruck</string>
   <!--button-->
   <string name="btn_certify">Beglaubigen</string>
-  <string name="btn_decrypt_verify">Entschlüsseln und Verifizieren</string>
+  <string name="btn_decrypt_verify">Entschlüsselte Datei verifizieren und speichern</string>
   <string name="btn_decrypt_verify_clipboard">Aus der Zwischenablage</string>
-  <string name="btn_encrypt_file">Datei verschlüsseln</string>
+  <string name="btn_encrypt_file">Verschlüsselte Datei speichern</string>
   <string name="btn_save">Speichern</string>
   <string name="btn_do_not_save">Abbrechen</string>
   <string name="btn_delete">Löschen</string>
@@ -62,6 +63,7 @@
   <string name="btn_lookup_key">Schlüssel nachschlagen</string>
   <string name="btn_encryption_advanced_settings_show">Erweiterte Einstellungen anzeigen</string>
   <string name="btn_encryption_advanced_settings_hide">Erweiterte Einstellungen verbergen</string>
+  <string name="btn_share_encrypted_signed">Verschlüsselt/signierten Text teilen…</string>
   <!--menu-->
   <string name="menu_preferences">Einstellungen</string>
   <string name="menu_help">Hilfe</string>
@@ -74,6 +76,7 @@
   <string name="menu_create_key_expert">Schlüssel erstellen (Experte)</string>
   <string name="menu_search">Suchen</string>
   <string name="menu_import_from_key_server">Schlüsselserver</string>
+  <string name="menu_import_from_keybase">Keybase.io</string>
   <string name="menu_key_server">Schlüsselserver…</string>
   <string name="menu_update_key">Von einem Schlüsselserver aktualisieren</string>
   <string name="menu_export_key_to_server">Auf Schlüsselserver hochladen</string>
@@ -232,13 +235,13 @@
     <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_certify_success">Schlüssel erfolgreich beglaubigt</string>
+  <string name="key_certify_success">Identitäten erfolgreich beglaubigt</string>
   <string name="list_empty">Diese Liste ist leer!</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="fingerprint_copied_to_clipboard">Fingerabdruck wurde in die Zwischenablage kopiert!</string>
   <string name="key_has_already_been_certified">Schlüssel wurde bereits beglaubigt</string>
-  <string name="select_key_to_certify">Bitte wähle einen Signaturschlüssel!</string>
+  <string name="select_key_to_certify">Bitte wähle einen Schlüssel um zu Beglaubigen!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -413,11 +416,11 @@
   <string name="key_view_action_edit">Schlüssel bearbeiten</string>
   <string name="key_view_action_encrypt">Mit diesem Schlüssel verschlüsseln</string>
   <string name="key_view_action_certify">Identitäten beglaubigen</string>
-  <string name="key_view_action_share_with">über…</string>
-  <string name="key_view_action_share_nfc">über NFC (Geräte Rückseite an Rückseite halten)</string>
+  <string name="key_view_action_share_with">Teilen über...</string>
+  <string name="key_view_action_share_nfc">Teilen über NFC (Geräte Rückseite an Rückseite halten)</string>
   <string name="key_view_tab_main">Informationen</string>
   <string name="key_view_tab_share">Teilen</string>
-  <string name="key_view_tab_keys">Schlüsseldetails</string>
+  <string name="key_view_tab_keys">Unterschlüssel</string>
   <string name="key_view_tab_certs">Beglaubigungen</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
@@ -435,22 +438,23 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Hier die Nachricht schreiben welche verschlüsselt und/oder signiert werden soll...</string>
   <string name="decrypt_content_edit_text_hint">Hier den verslüsselten Text eingeben um ihn zu entschlüsseln und/oder zu überprüfen</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">Grundeinstellung</string>
   <string name="cert_none">kein</string>
   <string name="cert_casual">einfach überprüft</string>
   <string name="cert_positive">positiv</string>
+  <string name="cert_revoke">widerrufen</string>
   <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">fehlgeschlagen!</string>
   <string name="cert_verify_error">Fehler!</string>
   <string name="cert_verify_unavailable">Schlüssel nicht verfügbar</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Unterzeichner</string>
+  <string name="section_certifier_id">Beglaubiger</string>
   <string name="section_cert">Zertifikatdetails</string>
   <string name="label_user_id">Identität</string>
   <string name="unknown_uid">&lt;unbekannt&gt;</string>
   <string name="empty_certs">Keine Beglaubigungen für diesen Schlüssel</string>
-  <string name="section_uids_to_certify">Zu signierende Identitäten</string>
+  <string name="section_uids_to_certify">Zu beglaubigende Identitäten</string>
   <string name="label_revocation">Widerrufsgrund</string>
   <string name="label_verify_status">Verificationsstatus</string>
   <string name="label_cert_type">Typ</string>
@@ -461,4 +465,5 @@
   <string name="title_view_cert">Zertifikatdetails anzeigen</string>
   <string name="unknown_algorithm">unbekannt</string>
   <string name="can_sign_not">Kann nicht unterschreiben</string>
+  <string name="error_no_encrypt_subkey">Kein Unterschlüssel zum Verschlüsseln verfügbar!</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-el/strings.xml b/OpenKeychain/src/main/res/values-el/strings.xml
index e5ba3e0b9..9a9e74223 100644
--- a/OpenKeychain/src/main/res/values-el/strings.xml
+++ b/OpenKeychain/src/main/res/values-el/strings.xml
@@ -48,6 +48,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index e36db1885..ea8127f60 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Prioridad del servidor de claves</string>
   <string name="title_change_passphrase">Cambiar frase de contraseña</string>
   <string name="title_set_passphrase">Establecer frase de contraseña</string>
+  <string name="title_share_with">Compartir con...</string>
+  <string name="title_share_fingerprint_with">Compartir huella de validación de clave con...</string>
   <string name="title_share_file">Compartir fichero con...</string>
   <string name="title_encrypt_to_file">Cifrar hacia archivo</string>
   <string name="title_decrypt_to_file">Descifrar hacia archivo</string>
@@ -21,26 +23,27 @@
   <string name="title_export_keys">Exportar claves</string>
   <string name="title_key_not_found">Clave no encontrada</string>
   <string name="title_send_key">Cargar al servidor de claves</string>
-  <string name="title_certify_key">Certificar clave</string>
   <string name="title_key_details">Detalles de la clave</string>
   <string name="title_help">Ayuda</string>
   <!--section-->
-  <string name="section_keys">Claves</string>
+  <string name="section_user_ids">Identidades</string>
+  <string name="section_keys">Subclaves</string>
   <string name="section_general">General</string>
   <string name="section_defaults">Predeterminados</string>
   <string name="section_advanced">Avanzado</string>
   <string name="section_master_key">Clave maestra</string>
+  <string name="section_master_user_id">Identidad primaria</string>
   <string name="section_actions">Acciones</string>
+  <string name="section_share_key">Compartir clave</string>
   <string name="section_certification_key">Tu clave usada para las certificaciones</string>
   <string name="section_upload_key">Cargar clave</string>
   <string name="section_key_server">Servidor de claves</string>
   <string name="section_encrypt_and_or_sign">Cifrar y/o firmar</string>
   <string name="section_decrypt_verify">Descifrar y verificar</string>
+  <string name="section_fingerprint">Huella de validación de clave</string>
   <!--button-->
   <string name="btn_certify">Certificar</string>
-  <string name="btn_decrypt_verify">Descifrar y verificar</string>
   <string name="btn_decrypt_verify_clipboard">Desde el portapapeles</string>
-  <string name="btn_encrypt_file">Cifrar archivo</string>
   <string name="btn_save">Guardar</string>
   <string name="btn_do_not_save">Cancelar</string>
   <string name="btn_delete">Eliminar</string>
@@ -68,6 +71,7 @@
   <string name="menu_create_key_expert">Crear clave (experto)</string>
   <string name="menu_search">Buscar</string>
   <string name="menu_import_from_key_server">Servidor de claves...</string>
+  <string name="menu_import_from_keybase">Importar desde Keybase.io</string>
   <string name="menu_key_server">Servidor de claves...</string>
   <string name="menu_update_key">Actualizar desde servidor de claves</string>
   <string name="menu_export_key_to_server">Cargar al servidor de claves</string>
@@ -113,6 +117,7 @@
   <string name="label_expiry">Caducidad</string>
   <string name="label_usage">Uso</string>
   <string name="label_key_size">Tamaño de clave</string>
+  <string name="label_main_user_id">Identidad primaria</string>
   <string name="label_name">Nombre</string>
   <string name="label_comment">Comentario</string>
   <string name="label_email">Email</string>
@@ -190,6 +195,7 @@
   <string name="key_deletion_confirmation_multi">¿De veras quiere borrar todas las claves públicas seleccionadas?\n¡No puede deshacer esto!</string>
   <string name="secret_key_deletion_confirmation">¿Quieres realmente borrar la clave SECRETA \'%s\'?\n¡No podrás deshacerlo!</string>
   <string name="ask_save_changed_key">Has hecho cambios en el almacén de claves, ¿quieres guardarlos?</string>
+  <string name="ask_empty_id_ok">Ha añadido una identidad vacía, ¿está seguro de que quiere continuar?</string>
   <string name="public_key_deletetion_confirmation">¿De veras quiere borrar la clave pública \'%s\'?\n¡No puede deshacer esto!</string>
   <string name="also_export_secret_keys">¿Exportar también las claves secretas?</string>
   <plurals name="keys_added_and_updated_1">
@@ -224,12 +230,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_certify_success">Clave certificada con éxito</string>
   <string name="list_empty">¡Esta lista está vacía!</string>
   <string name="nfc_successful">¡Clave enviada con éxito vía NFC Beam (haz NFC)!</string>
   <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
+  <string name="fingerprint_copied_to_clipboard">¡La huella de validación de clave se ha copiado al portapapeles!</string>
   <string name="key_has_already_been_certified">¡La clave ya ha sido certificada!</string>
-  <string name="select_key_to_certify">¡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
          no punctuation, all lowercase,
@@ -242,6 +247,8 @@
   <string name="error_master_key_must_not_be_el_gamal">la clave maestra no puede ser una clave ElGamal</string>
   <string name="error_unknown_algorithm_choice">elegido algoritmo desconocido</string>
   <string name="error_user_id_no_email">no se ha encontrado un email</string>
+  <string name="error_key_needs_a_user_id">necesita al menos una identidad</string>
+  <string name="error_main_user_id_must_not_be_empty">la identidad primaria no debe estar vacía</string>
   <string name="error_key_needs_master_key">necesitas al menos una clave maestra</string>
   <string name="error_no_signature_passphrase">no has proporcionado una frase de contraseña</string>
   <string name="error_no_signature_key">no has proporcionado una clave de firma</string>
@@ -313,6 +320,7 @@
   <string name="hint_public_keys">Buscar claves públicas</string>
   <string name="hint_secret_keys">Buscar claves secretas</string>
   <string name="action_share_key_with">Compartir la clave con...</string>
+  <string name="hint_keybase_search">Buscar en Keybase.io</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -352,6 +360,7 @@
   <string name="import_nfc_text">Para recibir las claves a través de NFC, el dispositivo tiene que estar desbloqueado.</string>
   <string name="import_nfc_help_button">Ayuda</string>
   <string name="import_clipboard_button">Tomar la clave desde el portapapeles</string>
+  <string name="import_keybase_button">Obtener clave desde Keybase.io</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Descifrar archivo con OpenKeychain</string>
   <string name="intent_import_key">Importar clave con OpenKeychain</string>
@@ -379,6 +388,8 @@
   <string name="api_register_allow">Permitir el acceso</string>
   <string name="api_register_disallow">Denegar el acceso</string>
   <string name="api_register_error_select_key">¡Por favor, selecciona una clave!</string>
+  <string name="api_select_pub_keys_missing_text">No se encontraron claves públicas para estas identidades:</string>
+  <string name="api_select_pub_keys_dublicates_text">Existe más de una clave pública para estas identidades:</string>
   <string name="api_select_pub_keys_text">¡Por favor, revisa la lista de destinatarios!</string>
   <string name="api_error_wrong_signature">¡La comprobación de la firma ha fallado! ¿Has instalado esta app desde una fuente distinta? Si estás seguro de que esto no es un ataque, revoca el registro de esta app en OpenKeychain y regístrala de nuevo.</string>
   <!--Share-->
@@ -398,8 +409,11 @@
   <string name="key_list_empty_button_create">crear tu propia clave</string>
   <string name="key_list_empty_button_import">importar claves</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Editar clave</string>
   <string name="key_view_action_encrypt">Cifrar con esta clave</string>
-  <string name="key_view_tab_certs">Certificaciones</string>
+  <string name="key_view_action_certify">Certificar identidades</string>
+  <string name="key_view_tab_main">Información principal</string>
+  <string name="key_view_tab_share">Compartir</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Claves</string>
   <string name="nav_encrypt">Firmar y cifrar</string>
@@ -416,18 +430,19 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Escribe aquí el mensaje que quieras cifrar y/o firmar...</string>
   <string name="decrypt_content_edit_text_hint">Introduce aquí el texto cifrado para descifrarlo y/o verificarlo...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">predeterminado</string>
   <string name="cert_none">ninguno</string>
   <string name="cert_casual">casual</string>
   <string name="cert_positive">positivo</string>
+  <string name="cert_revoke">revocada</string>
   <string name="cert_verify_ok">correcto</string>
   <string name="cert_verify_failed">¡falló!</string>
   <string name="cert_verify_error">¡error!</string>
   <string name="cert_verify_unavailable">clave no disponible</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Firmante</string>
   <string name="section_cert">Detalles del certificado</string>
+  <string name="label_user_id">Identidad</string>
   <string name="unknown_uid">&lt;desconocido&gt;</string>
   <string name="empty_certs">No hay certificados para esta clave</string>
   <string name="label_revocation">Razón de la revocación</string>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index 6086fa486..3b18bd0df 100644
--- a/OpenKeychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
@@ -19,7 +19,6 @@
   <string name="title_send_key">Lae võtmeserverisse</string>
   <string name="title_help">Abi</string>
   <!--section-->
-  <string name="section_keys">Võtmed</string>
   <string name="section_general">Üldine</string>
   <string name="section_defaults">Vaikeseaded</string>
   <!--button-->
@@ -102,6 +101,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-fa-rIR/strings.xml b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
index 10047ae91..e3d3a6493 100644
--- a/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
+++ b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml
@@ -26,6 +26,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 73ccb730b..be0f2003f 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Préférences du serveur de clefs</string>
   <string name="title_change_passphrase">Modifier la phrase de passe</string>
   <string name="title_set_passphrase">Définir la phrase de passe</string>
+  <string name="title_share_with">Partager avec...</string>
+  <string name="title_share_fingerprint_with">Partager l\'empreinte avec...</string>
   <string name="title_share_file">Partager le fichier avec...</string>
   <string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
   <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string>
@@ -21,26 +23,27 @@
   <string name="title_export_keys">Exporter les clefs</string>
   <string name="title_key_not_found">Clef introuvable</string>
   <string name="title_send_key">Téléverser vers le serveur de clefs</string>
-  <string name="title_certify_key">Certifier la clef</string>
   <string name="title_key_details">Détails sur la clef</string>
   <string name="title_help">Aide</string>
   <!--section-->
-  <string name="section_keys">Clefs</string>
+  <string name="section_user_ids">identités</string>
+  <string name="section_keys">Sous-clefs</string>
   <string name="section_general">Général</string>
   <string name="section_defaults">Valeurs par défaut</string>
   <string name="section_advanced">Avancé</string>
   <string name="section_master_key">Clef maîtresse</string>
+  <string name="section_master_user_id">Identité principale</string>
   <string name="section_actions">Actions</string>
+  <string name="section_share_key">Partager la clef</string>
   <string name="section_certification_key">Votre clef utilisée pour la certification</string>
   <string name="section_upload_key">Téléverser la clef</string>
   <string name="section_key_server">Serveur de clefs</string>
   <string name="section_encrypt_and_or_sign">Chiffrer et/ou signer</string>
   <string name="section_decrypt_verify">Déchiffrer et vérifier</string>
+  <string name="section_fingerprint">Empreinte</string>
   <!--button-->
   <string name="btn_certify">Certifier</string>
-  <string name="btn_decrypt_verify">Déchiffrer et vérifier</string>
   <string name="btn_decrypt_verify_clipboard">À partir du presse-papiers</string>
-  <string name="btn_encrypt_file">Chiffrer le fichier</string>
   <string name="btn_save">Enregistrer</string>
   <string name="btn_do_not_save">Annuler</string>
   <string name="btn_delete">Supprimer</string>
@@ -68,6 +71,7 @@
   <string name="menu_create_key_expert">Créer une clef (expert)</string>
   <string name="menu_search">Rechercher</string>
   <string name="menu_import_from_key_server">Serveur de clefs</string>
+  <string name="menu_import_from_keybase">Importer depuis Keybase.io</string>
   <string name="menu_key_server">Serveur de clefs...</string>
   <string name="menu_update_key">Mettre à jour depuis le serveur de clefs</string>
   <string name="menu_export_key_to_server">Téléverser vers le serveur de clefs</string>
@@ -113,6 +117,7 @@
   <string name="label_expiry">Expiration</string>
   <string name="label_usage">Utilisation</string>
   <string name="label_key_size">Taille de la clef</string>
+  <string name="label_main_user_id">Identité principale</string>
   <string name="label_name">Nom</string>
   <string name="label_comment">Commentaire</string>
   <string name="label_email">Courriel</string>
@@ -190,8 +195,9 @@
   <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs publiques choisies ?\nCeci est irréversible !</string>
   <string name="secret_key_deletion_confirmation">Voulez-vous vraiment supprimer la clef SECRÈTE %s ?\nVous ne pourrez pas la restituer !</string>
   <string name="ask_save_changed_key">Vous avez apporté des changements au trousseau, voulez-vous l\'enregistrer ?</string>
+  <string name="ask_empty_id_ok">Vous avez ajouté une identité vide, êtes-vous certain de vouloir continuer ?</string>
   <string name="public_key_deletetion_confirmation">Voulez-vous vraiment supprimer la clef publique %s ?\nCeci est irréversible !</string>
-  <string name="also_export_secret_keys">Exporter aussi les clefs secrètes?</string>
+  <string name="also_export_secret_keys">Exporter aussi les clefs secrètes ?</string>
   <plurals name="keys_added_and_updated_1">
     <item quantity="one">%d clef ajoutée avec succès</item>
     <item quantity="other">%d clefs ajoutées avec succès</item>
@@ -224,12 +230,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_certify_success">Clef certifiée avec succès</string>
   <string name="list_empty">Cette liste est vide !</string>
   <string name="nfc_successful">Clef envoyée par Beam NFC avec succès |</string>
   <string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
+  <string name="fingerprint_copied_to_clipboard">L\'empreinte a été copié vers le presse-papiers !</string>
   <string name="key_has_already_been_certified">La clef a déjà été certifiée !</string>
-  <string name="select_key_to_certify">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
          no punctuation, all lowercase,
@@ -242,6 +247,8 @@
   <string name="error_master_key_must_not_be_el_gamal">la clef maîtresse ne peut être une clef ElGama</string>
   <string name="error_unknown_algorithm_choice">choix d\'algorhitme inconnu</string>
   <string name="error_user_id_no_email">aucun courriel trouvé</string>
+  <string name="error_key_needs_a_user_id">au moins une identité est nécessaire</string>
+  <string name="error_main_user_id_must_not_be_empty">l\'identité principale ne doit pas être vide</string>
   <string name="error_key_needs_master_key">au moins une clef maîtresse est nécessaire</string>
   <string name="error_no_signature_passphrase">aucune phrase de passe n\'a été donnée</string>
   <string name="error_no_signature_key">aucune clef de signature n\'a été donnée</string>
@@ -313,6 +320,7 @@
   <string name="hint_public_keys">Rechercher des clefs publiques</string>
   <string name="hint_secret_keys">Rechercher des clefs secrètes</string>
   <string name="action_share_key_with">Partager la clef avec...</string>
+  <string name="hint_keybase_search">Rechercher dans Keybase.io</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -352,6 +360,7 @@
   <string name="import_nfc_text">Pour recevoir des clefs par la NFC, les appareils doivent être déverrouillés.</string>
   <string name="import_nfc_help_button">Aide</string>
   <string name="import_clipboard_button">Obtenir la clef depuis le presse-papiers</string>
+  <string name="import_keybase_button">Obtenir la clef depuis Keybase.io</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Déchiffrer le fichier avec OpenKeychain</string>
   <string name="intent_import_key">Importer la clef avec OpenKeychain</string>
@@ -379,6 +388,8 @@
   <string name="api_register_allow">Permettre l\'accès</string>
   <string name="api_register_disallow">Enlever l\'accès</string>
   <string name="api_register_error_select_key">Veuillez choisir une clef !</string>
+  <string name="api_select_pub_keys_missing_text">Aucune clef publique n\'a été trouvée pour ces identités :</string>
+  <string name="api_select_pub_keys_dublicates_text">Plus d\'une clef publique existe pour ces identités :</string>
   <string name="api_select_pub_keys_text">Veuillez revoir la liste des destinataires !</string>
   <string name="api_error_wrong_signature">La vérification de la signature a échoué ! Avez-vous installé cette appli à partir d\'une source différente ? Si vous êtes sûr que ce n\'est pas une attaque, révoquez l\'enregistrement de cette appli dans OpenKeychain et enregistrez-la à nouveau.</string>
   <!--Share-->
@@ -398,8 +409,11 @@
   <string name="key_list_empty_button_create">créer votre propre clef</string>
   <string name="key_list_empty_button_import">Importer des clefs.</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Modifier la clef</string>
   <string name="key_view_action_encrypt">Chiffrer avec cette clef</string>
-  <string name="key_view_tab_certs">Certifications</string>
+  <string name="key_view_action_certify">Certifier les identités</string>
+  <string name="key_view_tab_main">Infos principales</string>
+  <string name="key_view_tab_share">Partager</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Clefs</string>
   <string name="nav_encrypt">Signer et chiffrer</string>
@@ -416,18 +430,19 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Écrire ici le message à chiffrer et/ou signer...</string>
   <string name="decrypt_content_edit_text_hint">Saisir le cryptogramme à déchiffrer et/ou à vérifier ici...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">valeur par défaut</string>
   <string name="cert_none">aucun</string>
   <string name="cert_casual">rapide</string>
   <string name="cert_positive">positif</string>
+  <string name="cert_revoke">révoqué</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">échec!</string>
   <string name="cert_verify_error">erreur!</string>
   <string name="cert_verify_unavailable">clef non disponible</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Signataire</string>
   <string name="section_cert">Détails du certificat</string>
+  <string name="label_user_id">identité</string>
   <string name="unknown_uid">&lt;inconnu&gt;</string>
   <string name="empty_certs">Aucun certificat pour cette clef</string>
   <string name="label_revocation">Raison de la révocation</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index be4fc5ccc..0550a5708 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Preferenze Server delle Chiavi</string>
   <string name="title_change_passphrase">Cambia Frase Di Accesso</string>
   <string name="title_set_passphrase">Imposta Frase di Accesso</string>
+  <string name="title_share_with">Condividi con...</string>
+  <string name="title_share_fingerprint_with">Condivi impronta con...</string>
   <string name="title_share_file">Condividi file con...</string>
   <string name="title_encrypt_to_file">Codifica File</string>
   <string name="title_decrypt_to_file">Decodifica File</string>
@@ -21,26 +23,27 @@
   <string name="title_export_keys">Esporta Chiavi</string>
   <string name="title_key_not_found">Chiave Non Trovata</string>
   <string name="title_send_key">Carica sul Server delle Chiavi</string>
-  <string name="title_certify_key">Certifica Chiave</string>
   <string name="title_key_details">Dettagli Chiave</string>
   <string name="title_help">Aiuto</string>
   <!--section-->
-  <string name="section_keys">Chiavi</string>
+  <string name="section_user_ids">Identità</string>
+  <string name="section_keys">Sottochiavi</string>
   <string name="section_general">Generale</string>
   <string name="section_defaults">Predefiniti</string>
   <string name="section_advanced">Avanzato</string>
   <string name="section_master_key">Chiave Principale</string>
+  <string name="section_master_user_id">Identità Primaria</string>
   <string name="section_actions">Azioni</string>
+  <string name="section_share_key">Condividi chiave...</string>
   <string name="section_certification_key">La Tua Chiave usata per la certificazione</string>
   <string name="section_upload_key">Carica Chiave</string>
   <string name="section_key_server">Server delle Chiavi</string>
   <string name="section_encrypt_and_or_sign">Codifica e/o Firma</string>
   <string name="section_decrypt_verify">Decodifica e Verifica</string>
+  <string name="section_fingerprint">Impronta</string>
   <!--button-->
   <string name="btn_certify">Certifica</string>
-  <string name="btn_decrypt_verify">Decodifica e Verifica</string>
   <string name="btn_decrypt_verify_clipboard">Dagli Appunti</string>
-  <string name="btn_encrypt_file">Codifica File</string>
   <string name="btn_save">Salva</string>
   <string name="btn_do_not_save">Annulla</string>
   <string name="btn_delete">Elimina</string>
@@ -68,6 +71,7 @@
   <string name="menu_create_key_expert">Crea chiave (avanzato)</string>
   <string name="menu_search">Cerca</string>
   <string name="menu_import_from_key_server">Server delle Chiavi</string>
+  <string name="menu_import_from_keybase">Importa da Keybase.io</string>
   <string name="menu_key_server">Server delle Chiavi...</string>
   <string name="menu_update_key">Aggiorna dal server delle chiavi</string>
   <string name="menu_export_key_to_server">Carica chiave nel server</string>
@@ -113,6 +117,7 @@
   <string name="label_expiry">Scadenza</string>
   <string name="label_usage">Utilizzo</string>
   <string name="label_key_size">Dimensione Chiave</string>
+  <string name="label_main_user_id">Identità Primaria</string>
   <string name="label_name">Nome</string>
   <string name="label_comment">Commento</string>
   <string name="label_email">Email</string>
@@ -190,6 +195,7 @@
   <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare tutte le chiavi pubbliche selezionate?\nNon potrai annullare!</string>
   <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?\nNon potrai annullare!</string>
   <string name="ask_save_changed_key">Hai apportato modifiche al tuo portachiavi, vuoi salvarlo?</string>
+  <string name="ask_empty_id_ok">Hai aggiunto una identità vuota, sei sicuro di voler continuare?</string>
   <string name="public_key_deletetion_confirmation">Vuoi veramente eliminare la chiave pubblica \'%s\'?\nNon potrai annullare!</string>
   <string name="also_export_secret_keys">Esportare anche le chiavi segrete?</string>
   <plurals name="keys_added_and_updated_1">
@@ -224,12 +230,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_certify_success">Chiave certrificata correttamente</string>
   <string name="list_empty">Lista vuota!</string>
   <string name="nfc_successful">Chiave correttamente inviata tramite NFC Beam!</string>
   <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
+  <string name="fingerprint_copied_to_clipboard">Impronta copiata negli appunti!</string>
   <string name="key_has_already_been_certified">La chiave è già certificata!</string>
-  <string name="select_key_to_certify">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
          no punctuation, all lowercase,
@@ -242,6 +247,8 @@
   <string name="error_master_key_must_not_be_el_gamal">La chiave principale non puo\' essere ElGamal</string>
   <string name="error_unknown_algorithm_choice">opzione algoritmo sconosciuta</string>
   <string name="error_user_id_no_email">Nessuna email trovata</string>
+  <string name="error_key_needs_a_user_id">neccessaria almeno una identità</string>
+  <string name="error_main_user_id_must_not_be_empty">L\'identità primaria non può essere vuota</string>
   <string name="error_key_needs_master_key">necessaria almeno una chiave principale</string>
   <string name="error_no_signature_passphrase">nessuna frase di accesso inserita</string>
   <string name="error_no_signature_key">nessuna chiave di firma inserita</string>
@@ -313,6 +320,7 @@
   <string name="hint_public_keys">Ricerca Chiavi Pubbliche</string>
   <string name="hint_secret_keys">Cerca Chiave Privata</string>
   <string name="action_share_key_with">Condividi chiave con...</string>
+  <string name="hint_keybase_search">Cerca Keybase.io</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -352,6 +360,7 @@
   <string name="import_nfc_text">Per ricevere le chiavi via NFC, il dispositivo deve essere sbloccato.</string>
   <string name="import_nfc_help_button">Aiuto</string>
   <string name="import_clipboard_button">Ottieni chiave dagli appunti</string>
+  <string name="import_keybase_button">Ottieni chiave da Keybase.io</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Decodifica File con OpenKeychain</string>
   <string name="intent_import_key">Importa Chiave con OpenKeychain</string>
@@ -379,6 +388,8 @@
   <string name="api_register_allow">Permetti accesso</string>
   <string name="api_register_disallow">Nega accesso</string>
   <string name="api_register_error_select_key">Per favore selezionare una chiave!</string>
+  <string name="api_select_pub_keys_missing_text">Nessuna chiave pubblica trovata per queste identità:</string>
+  <string name="api_select_pub_keys_dublicates_text">Esistono piu\' di una chiave pubblica per queste identità:</string>
   <string name="api_select_pub_keys_text">Per favore ricontrolla la lista destinatari!</string>
   <string name="api_error_wrong_signature">Controllo della firma fallito! Hai installato questa app da una fonte diversa? Se sei sicuro che non sia un attacco, revoca la registrazione di questa app in OpenKeychain e dopo registra di nuovo l\'app.</string>
   <!--Share-->
@@ -398,8 +409,11 @@
   <string name="key_list_empty_button_create">creazione della tua chiave</string>
   <string name="key_list_empty_button_import">importazione chiavi.</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Modifica chiave</string>
   <string name="key_view_action_encrypt">Codifica con questa chiave</string>
-  <string name="key_view_tab_certs">Certificazioni</string>
+  <string name="key_view_action_certify">Certifica identità</string>
+  <string name="key_view_tab_main">Info Principale</string>
+  <string name="key_view_tab_share">Condividi</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
   <string name="nav_encrypt">Firma e Codifica</string>
@@ -416,18 +430,19 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Scrivi qui il messaggio da codificare e/o firmare...</string>
   <string name="decrypt_content_edit_text_hint">Inserisci il testo cifrato qui per la decodifica e/o verifica...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">predefiniti</string>
   <string name="cert_none">nessuno</string>
   <string name="cert_casual">casuale</string>
   <string name="cert_positive">positivo</string>
+  <string name="cert_revoke">revocato</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">fallito!</string>
   <string name="cert_verify_error">errore!</string>
   <string name="cert_verify_unavailable">chiave non disponibile</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Firmatario</string>
   <string name="section_cert">Dettagli Certificato</string>
+  <string name="label_user_id">Identit</string>
   <string name="unknown_uid">&lt;sconosciuto&gt;</string>
   <string name="empty_certs">Nessun certificato per questa chiave</string>
   <string name="label_revocation">Ragione della Revoca</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index e3b797fc9..95d668a25 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">鍵サーバ設定</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
   <string name="title_set_passphrase">パスフレーズの設定</string>
+  <string name="title_share_with">...で共有</string>
+  <string name="title_share_fingerprint_with">...で指紋の共有</string>
   <string name="title_share_file">...でファイルの共有</string>
   <string name="title_encrypt_to_file">暗号化してファイルに</string>
   <string name="title_decrypt_to_file">復号化してファイルに</string>
@@ -21,26 +23,27 @@
   <string name="title_export_keys">複数鍵のエクスポート</string>
   <string name="title_key_not_found">鍵が見当りません</string>
   <string name="title_send_key">鍵サーバへアップロード</string>
-  <string name="title_certify_key">証明鍵</string>
   <string name="title_key_details">鍵の概要</string>
   <string name="title_help">ヘルプ</string>
   <!--section-->
-  <string name="section_keys">鍵</string>
+  <string name="section_user_ids">ユーザID</string>
+  <string name="section_keys">副鍵</string>
   <string name="section_general">一般</string>
   <string name="section_defaults">デフォルト</string>
   <string name="section_advanced">拡張</string>
   <string name="section_master_key">主鍵</string>
+  <string name="section_master_user_id">メインのユーザID</string>
   <string name="section_actions">アクション</string>
+  <string name="section_share_key">鍵の共有</string>
   <string name="section_certification_key">あなたの鍵を証明に利用します</string>
   <string name="section_upload_key">鍵のアップロード</string>
   <string name="section_key_server">鍵サーバ</string>
   <string name="section_encrypt_and_or_sign">暗号化/署名</string>
   <string name="section_decrypt_verify">復号化と検証</string>
+  <string name="section_fingerprint">指紋</string>
   <!--button-->
   <string name="btn_certify">証明</string>
-  <string name="btn_decrypt_verify">復号化と検証</string>
   <string name="btn_decrypt_verify_clipboard">クリップボードから</string>
-  <string name="btn_encrypt_file">ファイル暗号化</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">キャンセル</string>
   <string name="btn_delete">削除</string>
@@ -68,6 +71,7 @@
   <string name="menu_create_key_expert">鍵の生成(上級)</string>
   <string name="menu_search">検索</string>
   <string name="menu_import_from_key_server">鍵サーバ</string>
+  <string name="menu_import_from_keybase">Keybase.ioからのインポート</string>
   <string name="menu_key_server">鍵サーバ...</string>
   <string name="menu_update_key">鍵サーバからの更新</string>
   <string name="menu_export_key_to_server">鍵サーバへのアップロード</string>
@@ -113,6 +117,7 @@
   <string name="label_expiry">満了</string>
   <string name="label_usage">使い方</string>
   <string name="label_key_size">鍵サイズ</string>
+  <string name="label_main_user_id">メインのユーザID</string>
   <string name="label_name">名前</string>
   <string name="label_comment">コメント</string>
   <string name="label_email">Eメールアドレス</string>
@@ -164,7 +169,7 @@
   <string name="flag_certify">証明</string>
   <string name="flag_sign">署名</string>
   <string name="flag_encrypt">暗号化</string>
-  <string name="flag_authenticate">証明</string>
+  <string name="flag_authenticate">認証</string>
   <!--sentences-->
   <string name="wrong_passphrase">良くないパスフレーズ</string>
   <string name="set_a_passphrase">最初にパスフレーズを設定してください。</string>
@@ -187,6 +192,7 @@
   <string name="key_deletion_confirmation_multi">選択したすべての公開鍵を削除して本当に良いのですか?\nこれは元に戻せません!</string>
   <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="ask_save_changed_key">あなたは鍵輪に変更を加えました、これを保存しますか?</string>
+  <string name="ask_empty_id_ok">あなたは空のユーザーIDを追加しました、このまま続けますか?</string>
   <string name="public_key_deletetion_confirmation">公開鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
   <string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string>
   <plurals name="keys_added_and_updated_1">
@@ -215,12 +221,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_certify_success">鍵を検証しました</string>
   <string name="list_empty">このリストは空です!</string>
   <string name="nfc_successful">NFCビームで鍵を送信しました!</string>
   <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
+  <string name="fingerprint_copied_to_clipboard">指紋はクリプボードにコピーされました!</string>
   <string name="key_has_already_been_certified">鍵はすでに検証されています!</string>
-  <string name="select_key_to_certify">署名に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -233,6 +238,8 @@
   <string name="error_master_key_must_not_be_el_gamal">主鍵を ElGamal にすることはできません</string>
   <string name="error_unknown_algorithm_choice">未知のアルゴリズムを選択しています</string>
   <string name="error_user_id_no_email">メールが見付かりません</string>
+  <string name="error_key_needs_a_user_id">最低でも1つのユーザIDが必要です</string>
+  <string name="error_main_user_id_must_not_be_empty">メインのユーザIDは空にすることはできません</string>
   <string name="error_key_needs_master_key">主鍵が最低でも1つ必要です</string>
   <string name="error_no_signature_passphrase">パスフレーズが与えられていません</string>
   <string name="error_no_signature_key">署名鍵を与えられていません</string>
@@ -301,6 +308,7 @@
   <string name="hint_public_keys">公開鍵の検索</string>
   <string name="hint_secret_keys">秘密鍵の検索</string>
   <string name="action_share_key_with">...で鍵の共有</string>
+  <string name="hint_keybase_search">Keybase.ioでの検索</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -339,6 +347,7 @@
   <string name="import_nfc_text">NFCで鍵を受信しました、デバイスのロックを解除する必要があります。</string>
   <string name="import_nfc_help_button">ヘルプ</string>
   <string name="import_clipboard_button">クリップボードから鍵を取得</string>
+  <string name="import_keybase_button">Keybase.ioから鍵を取得</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">OpenKeychainでファイルを復号化</string>
   <string name="intent_import_key">OpenKeychainに鍵をインポート</string>
@@ -366,6 +375,8 @@
   <string name="api_register_allow">許可されたアクセス</string>
   <string name="api_register_disallow">許可されないアクセス</string>
   <string name="api_register_error_select_key">鍵を選択してください!</string>
+  <string name="api_select_pub_keys_missing_text">このユーザIDについて公開鍵が見付かりません:</string>
+  <string name="api_select_pub_keys_dublicates_text">このユーザIDについて1つ以上の公開鍵が存在します:</string>
   <string name="api_select_pub_keys_text">受信者リストを確認してください!</string>
   <string name="api_error_wrong_signature">署名チェックが失敗! 違うところからこのアプリをインストールしましたか? もし攻撃されてでなくそうであるなら、OpenKeychainにあるこのアプリの登録を破棄し、再度アプリを登録してください。</string>
   <!--Share-->
@@ -384,8 +395,11 @@
   <string name="key_list_empty_button_create">あなた所有の鍵を作る</string>
   <string name="key_list_empty_button_import">鍵のインポート。</string>
   <!--Key view-->
+  <string name="key_view_action_edit">鍵の編集</string>
   <string name="key_view_action_encrypt">この鍵で暗号化</string>
-  <string name="key_view_tab_certs">証明</string>
+  <string name="key_view_action_certify">ユーザID検証</string>
+  <string name="key_view_tab_main">情報</string>
+  <string name="key_view_tab_share">共有</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">鍵</string>
   <string name="nav_encrypt">署名と暗号化</string>
@@ -402,18 +416,19 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">ここに書いたメッセージを暗号化/署名..</string>
   <string name="decrypt_content_edit_text_hint">ここに入力された暗号化テキストを復号化/検証...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">デフォルト</string>
   <string name="cert_none">無し</string>
   <string name="cert_casual">因果</string>
   <string name="cert_positive">肯定的</string>
+  <string name="cert_revoke">破棄</string>
   <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">失敗!</string>
   <string name="cert_verify_error">エラー!</string>
   <string name="cert_verify_unavailable">鍵がありません</string>
   <!--unsorted-->
-  <string name="section_certifier_id">署名者</string>
   <string name="section_cert">証明の詳細</string>
+  <string name="label_user_id">ユーザID</string>
   <string name="unknown_uid">&lt;不明&gt;</string>
   <string name="empty_certs">この鍵に証明がない</string>
   <string name="label_revocation">破棄の理由</string>
diff --git a/OpenKeychain/src/main/res/values-ko/strings.xml b/OpenKeychain/src/main/res/values-ko/strings.xml
index 10047ae91..e3d3a6493 100644
--- a/OpenKeychain/src/main/res/values-ko/strings.xml
+++ b/OpenKeychain/src/main/res/values-ko/strings.xml
@@ -26,6 +26,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index cb099269f..bf6d7f911 100644
--- a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
@@ -19,12 +19,10 @@
   <string name="title_key_not_found">Sleutel niet gevonden</string>
   <string name="title_help">Help</string>
   <!--section-->
-  <string name="section_keys">Sleutels</string>
   <string name="section_general">Algemeen</string>
   <string name="section_defaults">Standaard</string>
   <string name="section_advanced">Geavanceerd</string>
   <!--button-->
-  <string name="btn_encrypt_file">Bestand versleutelen</string>
   <string name="btn_save">Opslaan</string>
   <string name="btn_do_not_save">Annuleren</string>
   <string name="btn_delete">Verwijderen</string>
@@ -195,6 +193,6 @@
   <!--Key view-->
   <!--Navigation Drawer-->
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index e4bfc75ec..542998eca 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -21,11 +21,9 @@
   <string name="title_export_keys">Eksportuj klucze</string>
   <string name="title_key_not_found">Nie znaleziono klucza</string>
   <string name="title_send_key">Wyślij do serwera kluczy</string>
-  <string name="title_certify_key">Certyfikuj klucz</string>
   <string name="title_key_details">Szczegóły klucza</string>
   <string name="title_help">Pomoc</string>
   <!--section-->
-  <string name="section_keys">Klucze</string>
   <string name="section_general">Ogólne</string>
   <string name="section_defaults">Domyślne</string>
   <string name="section_advanced">Zaawansowane</string>
@@ -38,9 +36,7 @@
   <string name="section_decrypt_verify">Deszyfruj i weryfikuj</string>
   <!--button-->
   <string name="btn_certify">Certyfikuj</string>
-  <string name="btn_decrypt_verify">Deszyfruj i weryfikuj</string>
   <string name="btn_decrypt_verify_clipboard">Ze schowka</string>
-  <string name="btn_encrypt_file">Zaszyfruj plik</string>
   <string name="btn_save">Zapisz</string>
   <string name="btn_do_not_save">Anuluj</string>
   <string name="btn_delete">Usuń</string>
@@ -233,12 +229,10 @@
     <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_certify_success">Pomyślnie podpisano klucz</string>
   <string name="list_empty">Lista jest pusta!</string>
   <string name="nfc_successful">Pomyślnie wysłano klucz przez NFC Beam!</string>
   <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string>
   <string name="key_has_already_been_certified">Klucz został już wcześniej certyfikowany!</string>
-  <string name="select_key_to_certify">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
          no punctuation, all lowercase,
@@ -413,7 +407,6 @@
   <string name="key_list_empty_button_import">importowanie kluczy.</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Zaszyfruj korzystając z tego klucza</string>
-  <string name="key_view_tab_certs">Certyfikaty</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klucze</string>
   <string name="nav_encrypt">Podpisz i zaszyfruj</string>
@@ -430,7 +423,7 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Wpisz tutaj wiadomość do zaszyfrowania i/lub podpisania...</string>
   <string name="decrypt_content_edit_text_hint">Wpisz tutaj tekst do zaszyfrowania i/lub zweryfikowania...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">domyślny</string>
   <string name="cert_none">żaden</string>
   <string name="cert_casual">typowy</string>
@@ -440,7 +433,6 @@
   <string name="cert_verify_error">błąd!</string>
   <string name="cert_verify_unavailable">klucz niedostępny</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Podpisujący</string>
   <string name="section_cert">Szczegóły certyfikatu</string>
   <string name="unknown_uid">&lt;nieznany&gt;</string>
   <string name="empty_certs">Nie ma certyfikatów dla tego klucza</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 97c36b328..326a6fe25 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -20,11 +20,9 @@
   <string name="title_export_keys">Экспорт ключей</string>
   <string name="title_key_not_found">Ключ не найден</string>
   <string name="title_send_key">Загрузить на сервер ключей</string>
-  <string name="title_certify_key">Сертифицировать ключ</string>
   <string name="title_key_details">Сведения о ключе</string>
   <string name="title_help">Помощь</string>
   <!--section-->
-  <string name="section_keys">Ключи</string>
   <string name="section_general">Приложение</string>
   <string name="section_defaults">Алгоритмы</string>
   <string name="section_advanced">Дополнительно</string>
@@ -37,9 +35,7 @@
   <string name="section_decrypt_verify">Расшифровать и проверить</string>
   <!--button-->
   <string name="btn_certify">Сертифицировать</string>
-  <string name="btn_decrypt_verify">Расшифровать и проверить</string>
   <string name="btn_decrypt_verify_clipboard">Из буфера обмена</string>
-  <string name="btn_encrypt_file">Зашифровать файл</string>
   <string name="btn_save">Сохранить</string>
   <string name="btn_do_not_save">Отмена</string>
   <string name="btn_delete">Удалить</string>
@@ -230,7 +226,6 @@
   <string name="nfc_successful">Ключ успешно передан через NFC!</string>
   <string name="key_copied_to_clipboard">Ключ скопирован в буфер обмена!</string>
   <string name="key_has_already_been_certified">Ключ уже был сертифицирован ранее!</string>
-  <string name="select_key_to_certify">Выберите ключ, используемый для подписи!</string>
   <string name="key_too_big_for_sharing">Ключ слишком большой для этого способа передачи!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -401,7 +396,6 @@
   <string name="key_list_empty_button_import">Импортировать ключи</string>
   <!--Key view-->
   <string name="key_view_action_encrypt">Зашифровать этим ключом</string>
-  <string name="key_view_tab_certs">Сертификация</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ключи</string>
   <string name="nav_encrypt">Подписать и зашифровать</string>
@@ -418,7 +412,7 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишите сообщение здесь, что бы зашифровать и/или подписать...</string>
   <string name="decrypt_content_edit_text_hint">Введите сюда шифр для расшифровки и/или проверки...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">по умолчанию</string>
   <string name="cert_none">нет</string>
   <string name="cert_verify_ok">ok</string>
@@ -426,7 +420,6 @@
   <string name="cert_verify_error">ошибка!</string>
   <string name="cert_verify_unavailable">ключ не доступен</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Подписант</string>
   <string name="section_cert">Детали сертификации</string>
   <string name="unknown_uid">&lt;неизв.&gt;</string>
   <string name="empty_certs">Этот ключ не сертифицирован</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 73c51d31d..d6e2bff77 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -13,6 +13,8 @@
   <string name="title_key_server_preference">Nastavitve strežnikov</string>
   <string name="title_change_passphrase">Spremeni geslo</string>
   <string name="title_set_passphrase">Določi geslo</string>
+  <string name="title_share_with">Deli z...</string>
+  <string name="title_share_fingerprint_with">Deli prstni odtis z...</string>
   <string name="title_share_file">Deli datoteko z...</string>
   <string name="title_encrypt_to_file">Šifriraj v datoteko</string>
   <string name="title_decrypt_to_file">Dešifriraj v datoteko</string>
@@ -21,26 +23,27 @@
   <string name="title_export_keys">Izvozi ključe</string>
   <string name="title_key_not_found">Ključ ni bil najden</string>
   <string name="title_send_key">Naloži na strežnik</string>
-  <string name="title_certify_key">Overi ključ</string>
   <string name="title_key_details">Podrobnosti o ključu</string>
   <string name="title_help">Pomoč</string>
   <!--section-->
-  <string name="section_keys">Ključi</string>
+  <string name="section_user_ids">Identitete</string>
+  <string name="section_keys">Podključi</string>
   <string name="section_general">Splošno</string>
   <string name="section_defaults">Privzeto</string>
   <string name="section_advanced">Napredno</string>
   <string name="section_master_key">Glavni ključ</string>
+  <string name="section_master_user_id">Glavna identiteta</string>
   <string name="section_actions">Ravnanja</string>
+  <string name="section_share_key">Deli ključ</string>
   <string name="section_certification_key">Vaš ključ, uporabljan za overitev</string>
   <string name="section_upload_key">Naloži ključ</string>
   <string name="section_key_server">Strežnik</string>
   <string name="section_encrypt_and_or_sign">Šifriraj in/ali podpiši</string>
   <string name="section_decrypt_verify">Dešifriraj in preveri</string>
+  <string name="section_fingerprint">Prstnim odtisom</string>
   <!--button-->
   <string name="btn_certify">Overi</string>
-  <string name="btn_decrypt_verify">Dešifriraj in preveri</string>
   <string name="btn_decrypt_verify_clipboard">Iz odložišča</string>
-  <string name="btn_encrypt_file">Šifriraj datoteko</string>
   <string name="btn_save">Shrani</string>
   <string name="btn_do_not_save">Prekliči</string>
   <string name="btn_delete">Izbriši</string>
@@ -68,6 +71,7 @@
   <string name="menu_create_key_expert">Ustvari ključ (napredno)</string>
   <string name="menu_search">Išči</string>
   <string name="menu_import_from_key_server">Strežnik</string>
+  <string name="menu_import_from_keybase">Uvozi iz Keybase.io</string>
   <string name="menu_key_server">Strežnik...</string>
   <string name="menu_update_key">Posodobi s strežnika</string>
   <string name="menu_export_key_to_server">Naloži na strežnik</string>
@@ -113,6 +117,7 @@
   <string name="label_expiry">Pretek</string>
   <string name="label_usage">Uporaba</string>
   <string name="label_key_size">Velikost ključa</string>
+  <string name="label_main_user_id">Glavna identiteta</string>
   <string name="label_name">Ime</string>
   <string name="label_comment">Komentar</string>
   <string name="label_email">E-pošta</string>
@@ -196,6 +201,7 @@
   <string name="key_deletion_confirmation_multi">Ali res želite izbrisati vse izbrane javne ključe?\nTega koraka ne boste mogli preklicati!</string>
   <string name="secret_key_deletion_confirmation">Ali res želite izbrisati ZASEBNI ključ \'%s\'?\nTega koraka ne boste mogli preklicati!</string>
   <string name="ask_save_changed_key">Vnesli ste spremembe v vaš \'keyring\'. Jih želite shraniti?</string>
+  <string name="ask_empty_id_ok">Dodali ste prazno identiteto, ali res želite nadaljevati?</string>
   <string name="public_key_deletetion_confirmation">Ali res želite izbrisati javni ključ \'%s\'?\nTega koraka ne boste mogli preklicati!</string>
   <string name="also_export_secret_keys">Želite izvoziti tudi zasebne ključe?</string>
   <plurals name="keys_added_and_updated_1">
@@ -242,12 +248,11 @@
     <item quantity="other">Neupoštevanih %d slabih zasebnih ključev. Morda so bili izvoženi na način\n --export-secret-subkeys\nPoskrbite, da bodo izvoženi z\n --export-secret-keys</item>
   </plurals>
   <string name="key_send_success">Ključ je bil uspešno naložen na strežnik.</string>
-  <string name="key_certify_success">Uspešno overjen ključ</string>
   <string name="list_empty">Lista je prazna!</string>
   <string name="nfc_successful">Ključ uspešno poslan preko NFC Beam!</string>
   <string name="key_copied_to_clipboard">Ključ je bil prekopiran v odložišče!</string>
+  <string name="fingerprint_copied_to_clipboard">Prstni odtis je bil prekopiran v odložišče!</string>
   <string name="key_has_already_been_certified">Ključ je že bil overjen!</string>
-  <string name="select_key_to_certify">Izberite ključ, ki ga boste uporabljali za podpisovanje</string>
   <string name="key_too_big_for_sharing">Ključ je prevelik za delitev na ta način!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -260,6 +265,8 @@
   <string name="error_master_key_must_not_be_el_gamal">glavni ključ ne more biti ElGamal</string>
   <string name="error_unknown_algorithm_choice">neznana izbira algoritma</string>
   <string name="error_user_id_no_email">najti ni nobene e-pošte</string>
+  <string name="error_key_needs_a_user_id">potrebujete vsaj eno identiteto</string>
+  <string name="error_main_user_id_must_not_be_empty">glavna identiteta ne more biti prazna</string>
   <string name="error_key_needs_master_key">potrebujem vsaj glavni ključ</string>
   <string name="error_no_signature_passphrase">dano ni bilo nobeno geslo</string>
   <string name="error_no_signature_key">dan ni bil noben podpisni ključ</string>
@@ -337,6 +344,7 @@
   <string name="hint_public_keys">Iskanje javnih ključev</string>
   <string name="hint_secret_keys">Iskanje zasebnih ključev</string>
   <string name="action_share_key_with">Deli ključ z...</string>
+  <string name="hint_keybase_search">Išči v Keybase.io</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -378,6 +386,7 @@
   <string name="import_nfc_text">Za prejem ključev preko NFC mora biti naprava odklenjena.</string>
   <string name="import_nfc_help_button">Pomoč</string>
   <string name="import_clipboard_button">Pridobi ključ iz odložišča</string>
+  <string name="import_keybase_button">Pridobi ključ iz Keybase.io</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dešifriraj datoteko z OpenKeychain</string>
   <string name="intent_import_key">Uvozi ključ z OpenKeychain</string>
@@ -405,6 +414,8 @@
   <string name="api_register_allow">Dovoli dostop</string>
   <string name="api_register_disallow">Zavrni dostop</string>
   <string name="api_register_error_select_key">Izberite ključ!</string>
+  <string name="api_select_pub_keys_missing_text">Za te identitete ni bil najden noben javni ključ:</string>
+  <string name="api_select_pub_keys_dublicates_text">Za te identitete obstaja več ključev:</string>
   <string name="api_select_pub_keys_text">Preverite seznam prejemnikov!</string>
   <string name="api_error_wrong_signature">Preverjanje podpisa ni uspelo! Ste namestili to aplikacijo iz drugega vira? Če ste prepričani, da to ni napad, prekličite registracijo te aplikacije v OpenKeychain in jo izvedite znova.</string>
   <!--Share-->
@@ -426,8 +437,11 @@
   <string name="key_list_empty_button_create">stvaritvijo lastnega ključa</string>
   <string name="key_list_empty_button_import">uvozom obstoječih ključev.</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Uredi ključ</string>
   <string name="key_view_action_encrypt">Šifriraj s tem ključem</string>
-  <string name="key_view_tab_certs">Overitve</string>
+  <string name="key_view_action_certify">Overi identitete</string>
+  <string name="key_view_tab_main">Glavne informacije</string>
+  <string name="key_view_tab_share">Deli</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ključi</string>
   <string name="nav_encrypt">Podpiši in šifriraj</string>
@@ -444,18 +458,19 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Tu zapišite sporočilo, ki ga želite šifrirati in/ali podpisati...</string>
   <string name="decrypt_content_edit_text_hint">Tu vnesite tajnopis za dešifriranje in/ali overbo...</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">privzeto</string>
   <string name="cert_none">brez</string>
   <string name="cert_casual">navadno</string>
   <string name="cert_positive">pozitivno</string>
+  <string name="cert_revoke">preklicano</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">neuspešno!</string>
   <string name="cert_verify_error">napaka!</string>
   <string name="cert_verify_unavailable">ključ ni na voljo</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Podpisnik</string>
   <string name="section_cert">Podrobnosti potrdil</string>
+  <string name="label_user_id">Identiteta</string>
   <string name="unknown_uid">&lt;neznan&gt;</string>
   <string name="empty_certs">Ni potrdil za ta ključ</string>
   <string name="label_revocation">Razlog za preklic</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 6440b43bf..1205095aa 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -15,7 +15,6 @@
   <string name="title_key_details">Anahtar Detayları</string>
   <string name="title_help">Yardım</string>
   <!--section-->
-  <string name="section_keys">Anahtarlar</string>
   <string name="section_general">Genel</string>
   <string name="section_defaults">Varsayılanlar</string>
   <string name="section_advanced">Gelişmiş</string>
@@ -174,13 +173,12 @@
   <string name="secret_key_yes">mevcut</string>
   <string name="secret_key_no">mevcut değil</string>
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">varsayılan</string>
   <string name="cert_verify_ok">tamam</string>
   <string name="cert_verify_failed">başarısız!</string>
   <string name="cert_verify_error">hata!</string>
   <string name="cert_verify_unavailable">anahtar mevcut değil</string>
   <!--unsorted-->
-  <string name="section_certifier_id">İmzalayan</string>
   <string name="can_sign_not">imzalanamadı</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index dc9fe2d6a..508737e00 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -20,11 +20,9 @@
   <string name="title_export_keys">Експортувати ключі</string>
   <string name="title_key_not_found">Ключ не знайдено</string>
   <string name="title_send_key">Завантажити на сервер ключів</string>
-  <string name="title_certify_key">Сертифікувати ключ</string>
   <string name="title_key_details">Подробиці про ключ</string>
   <string name="title_help">Довідка</string>
   <!--section-->
-  <string name="section_keys">Ключі</string>
   <string name="section_general">Загальне</string>
   <string name="section_defaults">Типове</string>
   <string name="section_advanced">Додаткове</string>
@@ -37,9 +35,7 @@
   <string name="section_decrypt_verify">Розшифрувати і Перевірити</string>
   <!--button-->
   <string name="btn_certify">Сертифікувати</string>
-  <string name="btn_decrypt_verify">Розшифрувати і Перевірити</string>
   <string name="btn_decrypt_verify_clipboard">З буфера обміну</string>
-  <string name="btn_encrypt_file">Шифрувати файл</string>
   <string name="btn_save">Зберегти</string>
   <string name="btn_do_not_save">Скасувати</string>
   <string name="btn_delete">Вилучити</string>
@@ -223,7 +219,6 @@
   <string name="key_send_success">Успішно завантажено ключ на сервер</string>
   <string name="list_empty">Цей список - порожній!</string>
   <string name="key_copied_to_clipboard">Ключ вже скопійовано у буфер обміну!</string>
-  <string name="select_key_to_certify">Будь ласка, виберіть ключ, використаний для підписування!</string>
   <string name="key_too_big_for_sharing">Ключ надто великий для цього способу поширення!</string>
   <!--errors
          no punctuation, all lowercase,
@@ -394,7 +389,6 @@
   <string name="key_list_empty_button_create">створюється ваш власний ключ</string>
   <string name="key_list_empty_button_import">імпортуюся ключі.</string>
   <!--Key view-->
-  <string name="key_view_tab_certs">Сертифікати</string>
   <!--Navigation Drawer-->
   <string name="nav_encrypt">Підписати і зашифрувати</string>
   <string name="nav_decrypt">Розшифрувати і Перевірити</string>
@@ -410,7 +404,7 @@
   <!--hints-->
   <string name="encrypt_content_edit_text_hint">Напишіть повідомлення для шифрування та/або підпису…</string>
   <string name="decrypt_content_edit_text_hint">Уведіть зашифрований текст тут для його розшифрування та/або перевірки…</string>
-  <!--certifications-->
+  <!--certs-->
   <string name="cert_default">типово</string>
   <string name="cert_none">жоден</string>
   <string name="cert_casual">випадковий</string>
@@ -420,7 +414,6 @@
   <string name="cert_verify_error">Помилка!</string>
   <string name="cert_verify_unavailable">Недоступний ключ</string>
   <!--unsorted-->
-  <string name="section_certifier_id">Підписувач</string>
   <string name="section_cert">Дані сертифікату</string>
   <string name="empty_certs">Немає сертифікатів для цього ключа</string>
   <string name="label_revocation">Причина відхилення</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index cf0fff97d..8dfb6b2ca 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -21,7 +21,6 @@
   <string name="title_send_key">上传到密钥服务器</string>
   <string name="title_help">帮助</string>
   <!--section-->
-  <string name="section_keys">密钥</string>
   <string name="section_general">常规</string>
   <string name="section_defaults">缺省</string>
   <string name="section_advanced">高级</string>
@@ -29,8 +28,6 @@
   <string name="section_key_server">密钥服务器</string>
   <string name="section_decrypt_verify">解密并验证</string>
   <!--button-->
-  <string name="btn_decrypt_verify">解密并验证</string>
-  <string name="btn_encrypt_file">加密文件</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">取消</string>
   <string name="btn_delete">删除</string>
@@ -158,6 +155,6 @@
   <!--Navigation Drawer-->
   <string name="nav_import">导入密钥</string>
   <!--hints-->
-  <!--certifications-->
+  <!--certs-->
   <!--unsorted-->
 </resources>