From acfe01e0e2f7519eb659b011d6f8a6bf1b1888c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 5 May 2014 01:20:42 +0200
Subject: [PATCH] Update from transifex

---
 .../src/main/res/raw-de/help_about.html       |  2 +-
 .../src/main/res/raw-de/help_changelog.html   |  6 +--
 .../src/main/res/raw-de/help_nfc_beam.html    |  8 +--
 .../src/main/res/values-de/strings.xml        | 53 ++++++++++++-------
 .../src/main/res/values-es/strings.xml        | 15 ------
 .../src/main/res/values-et/strings.xml        |  1 -
 .../src/main/res/values-fr/strings.xml        | 15 ------
 .../src/main/res/values-it-rIT/strings.xml    | 15 ------
 .../src/main/res/values-ja/strings.xml        | 15 ------
 .../src/main/res/values-nl-rNL/strings.xml    |  6 ---
 .../src/main/res/values-pl/strings.xml        | 15 ------
 .../src/main/res/values-ru/strings.xml        | 14 -----
 .../src/main/res/values-sl/strings.xml        | 15 ------
 .../src/main/res/values-tr/strings.xml        |  4 --
 .../src/main/res/values-uk/strings.xml        | 13 -----
 .../src/main/res/values-zh/strings.xml        |  3 --
 OpenKeychain/src/main/res/values/strings.xml  |  3 +-
 17 files changed, 44 insertions(+), 159 deletions(-)
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html
index b356c9897..c40267e73 100644
--- a/OpenKeychain/src/main/res/raw-de/help_about.html
+++ b/OpenKeychain/src/main/res/raw-de/help_about.html
@@ -22,7 +22,7 @@
 </ul>
 <h2>Entwickler APG 1.x</h2>
 <ul>
-<li>Thialfihar (Lead developer)</li>
+<li>Thialfihar (Hauptentwickler)</li>
 <li>'Senecaso' (QR-Code, Schlüssel signtieren, Schlüssel hochladen)</li>
 <li>Markus Doits</li>
 </ul>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index e1640f2b3..550596ca9 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -57,7 +57,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <ul>
 <li>new design with navigation drawer</li>
 <li>Neus Design für die Liste der öffentlichen Schlüssel</li>
-<li>new public key view</li>
+<li>Neue Ansicht für öffentliche Schlüssel</li>
 <li>Fehler beim Schlüsselimport behoben</li>
 <li>key cross-certification (thanks to Ash Hughes)</li>
 <li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
@@ -82,7 +82,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>Schlüssel signieren</li>
 <li>Schlüssel auf den Server hochladen</li>
 <li>Importprobleme behoben</li>
-<li>new AIDL API</li>
+<li>neue AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
@@ -137,7 +137,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 </ul>
 <h2>1.0.0</h2>
 <ul>
-<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>K-9 Mail integration, APG unterstützt beta build von K-9 Mail</li>
 <li>Unterstützung von mehr Filemanagern (einschließlich ASTRO)</li>
 <li>Slowenische Übersetzung</li>
 <li>Neue Datenbank, viel schneller, weniger Speicherbedarf</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
index 88492731c..6fb3d6dd1 100644
--- a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>Wie werden Schlüssel empfangen</h2>
 <ol>
-<li>Go to your partners contacts and open the contact you want to share.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>Gehen Sie zu Ihren Kontakten und öffnen Sie den Kontakt, den Sie teilen wollen.</li>
+<li>Halten sie die zwei Geräte Rückseitig aneinander (sie müssen sich fast berühren) und sie werden ein Vibrieren fühlen.</li>
 <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the your device.</li>
+<li>Tippen sie die Karte an und der Inhalt wird dann auf Ihr Gerät geladen.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 801e3cc42..46c5a0aa6 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -13,7 +13,8 @@
   <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 mit...</string>
+  <string name="title_share_fingerprint_with">Teile Fingerabdruck über…</string>
+  <string name="title_share_key_with">Teile Schlüssel über...</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>
@@ -26,19 +27,21 @@
   <string name="title_key_details">Schlüsseldetails</string>
   <string name="title_help">Hilfe</string>
   <!--section-->
-  <string name="section_user_ids">Benutzer-IDs</string>
+  <string name="section_user_ids">Identitäten</string>
   <string name="section_keys">Schlüssel</string>
   <string name="section_general">Allgemein</string>
   <string name="section_defaults">Standardwerte</string>
   <string name="section_advanced">Fortgeschrittene Einstellungen</string>
   <string name="section_master_key">Hauptschlüssel</string>
-  <string name="section_master_user_id">Hauptbenutzer-ID</string>
+  <string name="section_master_user_id">Hauptidentität</string>
   <string name="section_actions">Aktionen</string>
+  <string name="section_share_key">Schlüssel teilen</string>
   <string name="section_certification_key">Mit diesem Schlüssel beglaubigen</string>
   <string name="section_upload_key">Schlüssel hochladen</string>
   <string name="section_key_server">Schlüsselserver</string>
   <string name="section_encrypt_and_or_sign">Verschlüsseln und/oder Signieren</string>
   <string name="section_decrypt_verify">Entschlüsseln und Verifizieren</string>
+  <string name="section_fingerprint">Fingerabdruck</string>
   <!--button-->
   <string name="btn_certify">Beglaubigen</string>
   <string name="btn_decrypt_verify">Entschlüsseln und Verifizieren</string>
@@ -116,7 +119,7 @@
   <string name="label_expiry">Ablaufdatum</string>
   <string name="label_usage">Verwendungszweck</string>
   <string name="label_key_size">Schlüssellänge</string>
-  <string name="label_main_user_id">Hauptbenutzer-ID</string>
+  <string name="label_main_user_id">Hauptidentität</string>
   <string name="label_name">Name</string>
   <string name="label_comment">Kommentar</string>
   <string name="label_email">E-Mail</string>
@@ -136,11 +139,15 @@
   <string name="can_certify">kann bestätigen</string>
   <string name="can_certify_not">kann nicht bestätigen</string>
   <string name="expired">abgelaufen</string>
-  <string name="revoked">zurückgezogen</string>
+  <string name="revoked">widerrufen</string>
   <plurals name="n_keys">
     <item quantity="one">1 Schlüssel</item>
     <item quantity="other">%d Schlüssel</item>
   </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="one">%d Schlüsselserver</item>
+    <item quantity="other">%d Schlüsselserver</item>
+  </plurals>
   <string name="secret_key">Privater Schlüssel:</string>
   <!--choice-->
   <string name="choice_none">Keine</string>
@@ -190,7 +197,7 @@
   <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten öffentlichen Schlüssel löschen?\nDies kann nicht rückgängig gemacht werden!</string>
   <string name="secret_key_deletion_confirmation">Soll der PRIVATE Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden!</string>
   <string name="ask_save_changed_key">Es wurden am Schlüsselbund Veränderungen vorgenommen. Sollen dies gespeichert werden?</string>
-  <string name="ask_empty_id_ok">Es wurde eine leere Nutzer ID hinzugefügt. Sind sie sicher das sie forfahren wollen?</string>
+  <string name="ask_empty_id_ok">Es wurde eine leere Identität hinzugefügt. Wirklich fortfahren?</string>
   <string name="public_key_deletetion_confirmation">Soll der öffentliche Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden! </string>
   <string name="also_export_secret_keys">Private Schlüssel auch exportieren</string>
   <plurals name="keys_added_and_updated_1">
@@ -227,7 +234,9 @@
   <string name="key_send_success">Schlüssel wurde erfolgreich hochgeladen.</string>
   <string name="key_certify_success">Schlüssel 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_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>
@@ -242,8 +251,8 @@
   <string name="error_master_key_must_not_be_el_gamal">Der Hauptschlüssel kann kein ElGamal Schlüssel sein</string>
   <string name="error_unknown_algorithm_choice">Unbekannte Auswahl für Algorithmus</string>
   <string name="error_user_id_no_email">keine E-Mail gefunden</string>
-  <string name="error_key_needs_a_user_id">Mindestens eine Benutzer-ID wird benötigt</string>
-  <string name="error_main_user_id_must_not_be_empty">Hauptbenutzer-ID darf nicht leer sein</string>
+  <string name="error_key_needs_a_user_id">Mindestens eine Identität wird benötigt</string>
+  <string name="error_main_user_id_must_not_be_empty">Hauptidentität darf nicht leer sein</string>
   <string name="error_key_needs_master_key">Mindestens ein Hauptschlüssel wird benötigt</string>
   <string name="error_no_signature_passphrase">kein Passwort angegeben</string>
   <string name="error_no_signature_key">kein Signaturschlüssel angegeben</string>
@@ -324,8 +333,8 @@
   <string name="key_size_3072">3072</string>
   <string name="key_size_4096">4096</string>
   <string name="key_size_8192">8192</string>
-  <string name="key_size_custom">Individuelle Schlüsselgröße</string>
-  <string name="key_size_custom_info">Geben Sie benutzerdefinierte Schlüssellänge an (in Bit):</string>
+  <string name="key_size_custom">Benutzerdefinierte Schlüssellänge</string>
+  <string name="key_size_custom_info">Benutzerdefinierte Schlüssellänge (in Bit):</string>
   <string name="key_size_custom_info_rsa">Die RSA-Schlüssellänge muss größer als 1024 sein und höchstens 8192 sein. Auch muss sie ein Mehrfaches von 8 sein.</string>
   <string name="key_size_custom_info_dsa">Die DSA-Schlüssellänge muss mindestens 512 und höchstens 1024 sein. Auch muss sie ein Mehrfaches von 64 sein.</string>
   <!--compression-->
@@ -380,8 +389,8 @@
   <string name="api_register_allow">Zugriff erlauben</string>
   <string name="api_register_disallow">Zugriff verbieten</string>
   <string name="api_register_error_select_key">Bitte einen Schlüssel auswählen!</string>
-  <string name="api_select_pub_keys_missing_text">Für diese Benutzer-IDs wurden keine öffentlichen Schlüssel gefunden:</string>
-  <string name="api_select_pub_keys_dublicates_text">Für diese Benutzer-IDs existieren mehrere öffentliche Schlüssel:</string>
+  <string name="api_select_pub_keys_missing_text">Für diese Identität wurden keine öffentlichen Schlüssel gefunden:</string>
+  <string name="api_select_pub_keys_dublicates_text">Für diese Identität existieren mehrere öffentliche Schlüssel:</string>
   <string name="api_select_pub_keys_text">Bitte die Liste der Empfänger überprüfen!</string>
   <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese Anwendung aus einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die Anwendung erneut registrieren.</string>
   <!--Share-->
@@ -401,10 +410,14 @@
   <string name="key_list_empty_button_create">deinen eigenen Schlüssel erstellst</string>
   <string name="key_list_empty_button_import">existierende Schlüssel importierst.</string>
   <!--Key view-->
-  <string name="key_view_action_edit">Diesen Schlüssel bearbeiten</string>
+  <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">Diesen Schlüssel beglaubigen</string>
-  <string name="key_view_tab_main">Info</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_tab_main">Informationen</string>
+  <string name="key_view_tab_share">Teilen</string>
+  <string name="key_view_tab_keys_details">Schlüsseldetails</string>
   <string name="key_view_tab_certs">Beglaubigungen</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
@@ -425,8 +438,8 @@
   <!--certifications-->
   <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">Wiederrufen</string>
   <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">fehlgeschlagen!</string>
   <string name="cert_verify_error">Fehler!</string>
@@ -434,10 +447,10 @@
   <!--unsorted-->
   <string name="section_signer_id">Unterzeichner</string>
   <string name="section_cert">Zertifikatdetails</string>
-  <string name="label_user_id">Nutzer ID</string>
+  <string name="label_user_id">Identität</string>
   <string name="unknown_uid">&lt;unbekannt&gt;</string>
-  <string name="empty_certs">Kein Zertifikat für diesen Schlüssel</string>
-  <string name="section_uids_to_sign">Benutzer-IDs, die beglaubigt werden sollen</string>
+  <string name="empty_certs">Keine Beglaubigungen für diesen Schlüssel</string>
+  <string name="section_uids_to_sign">Zu signierende Identitäten</string>
   <string name="label_revocation">Widerrufsgrund</string>
   <string name="label_verify_status">Verificationsstatus</string>
   <string name="label_cert_type">Typ</string>
@@ -446,4 +459,6 @@
   <string name="no_subkey">Unterschlüssel nicht verfügbar</string>
   <string name="secret_cannot_multiple">Geheime Schlüssel können nur einzeln gelöscht werden!</string>
   <string name="title_view_cert">Zertifikatdetails anzeigen</string>
+  <string name="unknown_algorithm">unbekannt</string>
+  <string name="can_sign_not">Kann nicht unterschreiben</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 207503b3f..195ce9743 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -13,7 +13,6 @@
   <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_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>
@@ -26,13 +25,11 @@
   <string name="title_key_details">Detalles de la clave</string>
   <string name="title_help">Ayuda</string>
   <!--section-->
-  <string name="section_user_ids">IDs de usuario</string>
   <string name="section_keys">Claves</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">ID del usuario principal</string>
   <string name="section_actions">Acciones</string>
   <string name="section_certification_key">Tu clave usada para las certificaciones</string>
   <string name="section_upload_key">Cargar clave</string>
@@ -116,7 +113,6 @@
   <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">ID del usuario principal</string>
   <string name="label_name">Nombre</string>
   <string name="label_comment">Comentario</string>
   <string name="label_email">Email</string>
@@ -194,7 +190,6 @@
   <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">Has añadido una ID de usuario vacía, ¿Estás seguro que quieres 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">
@@ -247,8 +242,6 @@
   <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">necesitas al menos una ID de usuario</string>
-  <string name="error_main_user_id_must_not_be_empty">la ID del usuario principal no puede 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>
@@ -386,8 +379,6 @@
   <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 han encontrado claves públicas para estas IDs de usuario:</string>
-  <string name="api_select_pub_keys_dublicates_text">Existe más de una clave pública para estos IDs de usuario:</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-->
@@ -407,10 +398,7 @@
   <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 esta clave</string>
   <string name="key_view_action_encrypt">Cifrar con esta clave</string>
-  <string name="key_view_action_certify">Certificar esta clave</string>
-  <string name="key_view_tab_main">Información</string>
   <string name="key_view_tab_certs">Certificaciones</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Claves</string>
@@ -433,7 +421,6 @@
   <string name="cert_none">ninguno</string>
   <string name="cert_casual">casual</string>
   <string name="cert_positive">positivo</string>
-  <string name="cert_revoke">revocar</string>
   <string name="cert_verify_ok">correcto</string>
   <string name="cert_verify_failed">¡falló!</string>
   <string name="cert_verify_error">¡error!</string>
@@ -441,10 +428,8 @@
   <!--unsorted-->
   <string name="section_signer_id">Firmante</string>
   <string name="section_cert">Detalles del certificado</string>
-  <string name="label_user_id">Identificador del usuario</string>
   <string name="unknown_uid">&lt;desconocido&gt;</string>
   <string name="empty_certs">No hay certificados para esta clave</string>
-  <string name="section_uids_to_sign">IDs de usuario para firmar</string>
   <string name="label_revocation">Razón de la revocación</string>
   <string name="label_verify_status">Estado de la verificación</string>
   <string name="label_cert_type">Tipo</string>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index 62172f138..6086fa486 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_user_ids">Kasutaja ID-d</string>
   <string name="section_keys">Võtmed</string>
   <string name="section_general">Üldine</string>
   <string name="section_defaults">Vaikeseaded</string>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index fa45c789d..19d304276 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -13,7 +13,6 @@
   <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_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>
@@ -26,13 +25,11 @@
   <string name="title_key_details">Détails sur la clef</string>
   <string name="title_help">Aide</string>
   <!--section-->
-  <string name="section_user_ids">IDs utilisateurs</string>
   <string name="section_keys">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">ID utilisateur maître</string>
   <string name="section_actions">Actions</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>
@@ -116,7 +113,6 @@
   <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">ID utilisateur principal</string>
   <string name="label_name">Nom</string>
   <string name="label_comment">Commentaire</string>
   <string name="label_email">Courriel</string>
@@ -194,7 +190,6 @@
   <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é un ID utilisateur 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>
   <plurals name="keys_added_and_updated_1">
@@ -247,8 +242,6 @@
   <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">vous avez besoin d\'au moins un ID utilisateur</string>
-  <string name="error_main_user_id_must_not_be_empty">l\'ID utilisateur principal 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>
@@ -386,8 +379,6 @@
   <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 IDs utilisateur :</string>
-  <string name="api_select_pub_keys_dublicates_text">Plus d\'une clef publique existe pour ces IDs utilisateur</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-->
@@ -407,10 +398,7 @@
   <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 cette clef</string>
   <string name="key_view_action_encrypt">Chiffrer avec cette clef</string>
-  <string name="key_view_action_certify">Certifier cette clef</string>
-  <string name="key_view_tab_main">Infos</string>
   <string name="key_view_tab_certs">Certifications</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Clefs</string>
@@ -433,7 +421,6 @@
   <string name="cert_none">aucun</string>
   <string name="cert_casual">rapide</string>
   <string name="cert_positive">positif</string>
-  <string name="cert_revoke">révoquer</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">échec!</string>
   <string name="cert_verify_error">erreur!</string>
@@ -441,10 +428,8 @@
   <!--unsorted-->
   <string name="section_signer_id">Signataire</string>
   <string name="section_cert">Détails du certificat</string>
-  <string name="label_user_id">ID utilisateur</string>
   <string name="unknown_uid">&lt;inconnu&gt;</string>
   <string name="empty_certs">Aucun certificat pour cette clef</string>
-  <string name="section_uids_to_sign">ID utilisateur pour signer</string>
   <string name="label_revocation">Raison de la révocation</string>
   <string name="label_verify_status">État de vérification</string>
   <string name="label_cert_type">Type</string>
diff --git a/OpenKeychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
index c652f85d9..d79bc7ee6 100644
--- a/OpenKeychain/src/main/res/values-it-rIT/strings.xml
+++ b/OpenKeychain/src/main/res/values-it-rIT/strings.xml
@@ -13,7 +13,6 @@
   <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_file">Condividi file con...</string>
   <string name="title_encrypt_to_file">Codifica File</string>
   <string name="title_decrypt_to_file">Decodifica File</string>
@@ -26,13 +25,11 @@
   <string name="title_key_details">Dettagli Chiave</string>
   <string name="title_help">Aiuto</string>
   <!--section-->
-  <string name="section_user_ids">ID Utente</string>
   <string name="section_keys">Chiavi</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">ID Utente Principale</string>
   <string name="section_actions">Azioni</string>
   <string name="section_certification_key">La Tua Chiave usata per la certificazione</string>
   <string name="section_upload_key">Carica Chiave</string>
@@ -116,7 +113,6 @@
   <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">ID Utente Principale</string>
   <string name="label_name">Nome</string>
   <string name="label_comment">Commento</string>
   <string name="label_email">Email</string>
@@ -194,7 +190,6 @@
   <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">È stato aggiunto un ID utente vuoto, 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">
@@ -247,8 +242,6 @@
   <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">necessario almeno un id utente</string>
-  <string name="error_main_user_id_must_not_be_empty">id utente principale non puo\' essere vuoto</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>
@@ -386,8 +379,6 @@
   <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 id utente:</string>
-  <string name="api_select_pub_keys_dublicates_text">Esistono piu\' di una chiave pubblica per gli id utenti:</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-->
@@ -407,10 +398,7 @@
   <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_action_certify">Certifica questa chiave</string>
-  <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_certs">Certificazioni</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
@@ -433,7 +421,6 @@
   <string name="cert_none">nessuno</string>
   <string name="cert_casual">casuale</string>
   <string name="cert_positive">positivo</string>
-  <string name="cert_revoke">revoca</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">fallito!</string>
   <string name="cert_verify_error">errore!</string>
@@ -441,10 +428,8 @@
   <!--unsorted-->
   <string name="section_signer_id">Firmatario</string>
   <string name="section_cert">Dettagli Certificato</string>
-  <string name="label_user_id">ID Utente</string>
   <string name="unknown_uid">&lt;sconosciuto&gt;</string>
   <string name="empty_certs">Nessun certificato per questa chiave</string>
-  <string name="section_uids_to_sign">ID Utente da firmare</string>
   <string name="label_revocation">Ragione della Revoca</string>
   <string name="label_verify_status">Stato Verifica</string>
   <string name="label_cert_type">Tipo</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index e3b4d559a..a6b802152 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -13,7 +13,6 @@
   <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_file">...でファイルの共有</string>
   <string name="title_encrypt_to_file">暗号化してファイルに</string>
   <string name="title_decrypt_to_file">復号化してファイルに</string>
@@ -26,13 +25,11 @@
   <string name="title_key_details">鍵の概要</string>
   <string name="title_help">ヘルプ</string>
   <!--section-->
-  <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_certification_key">あなたの鍵を証明に利用します</string>
   <string name="section_upload_key">鍵のアップロード</string>
@@ -116,7 +113,6 @@
   <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>
@@ -191,7 +187,6 @@
   <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">
@@ -238,8 +233,6 @@
   <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>
@@ -373,8 +366,6 @@
   <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-->
@@ -393,10 +384,7 @@
   <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_action_certify">この鍵で検証</string>
-  <string name="key_view_tab_main">情報</string>
   <string name="key_view_tab_certs">証明</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">鍵</string>
@@ -419,7 +407,6 @@
   <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>
@@ -427,10 +414,8 @@
   <!--unsorted-->
   <string name="section_signer_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="section_uids_to_sign">署名に使うユーザーID</string>
   <string name="label_revocation">破棄の理由</string>
   <string name="label_verify_status">検証ステータス</string>
   <string name="label_cert_type">種別</string>
diff --git a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
index a4d1744b8..cb099269f 100644
--- a/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml
@@ -19,7 +19,6 @@
   <string name="title_key_not_found">Sleutel niet gevonden</string>
   <string name="title_help">Help</string>
   <!--section-->
-  <string name="section_user_ids">Gebruikers-id\'s</string>
   <string name="section_keys">Sleutels</string>
   <string name="section_general">Algemeen</string>
   <string name="section_defaults">Standaard</string>
@@ -65,7 +64,6 @@
   <string name="label_expiry">Verlopen</string>
   <string name="label_usage">Gebruik</string>
   <string name="label_key_size">Sleutelgrootte</string>
-  <string name="label_main_user_id">Hoofdgebruikers-id</string>
   <string name="label_name">Naam</string>
   <string name="label_comment">Opmerking</string>
   <string name="label_email">E-mailadres</string>
@@ -125,8 +123,6 @@
   <string name="error_key_size_minimum512bit">sleutelgrootte moet minstens 512-bits zijn</string>
   <string name="error_master_key_must_not_be_el_gamal">de hoofdsleutel kan geen ElGamal-sleutel zijn</string>
   <string name="error_unknown_algorithm_choice">onbekende algoritmekeuze</string>
-  <string name="error_key_needs_a_user_id">ten minste één gebruiksers-id vereist</string>
-  <string name="error_main_user_id_must_not_be_empty">hoofdgebruikers-id kan niet leeg zijn</string>
   <string name="error_key_needs_master_key">ten minste een hoofdsleutel is vereist</string>
   <string name="error_no_signature_passphrase">geen wachtwoord opgegeven</string>
   <string name="error_no_signature_key">geen ondertekeningssleutel opgegeven</string>
@@ -192,8 +188,6 @@
   <string name="api_register_allow">Toegang toestaan</string>
   <string name="api_register_disallow">Toegang weigeren</string>
   <string name="api_register_error_select_key">Selecteert u a.u.b. een sleutel</string>
-  <string name="api_select_pub_keys_missing_text">Geen publieke sleutels gevonden voor deze gebruiker-id\'s:</string>
-  <string name="api_select_pub_keys_dublicates_text">Meer dan een publieke sleutel gevonden voor deze gebruikers-id\'s:</string>
   <string name="api_select_pub_keys_text">Bekijkt u a.u.b. de ontvangers</string>
   <!--Share-->
   <string name="share_qr_code_dialog_start">U gaat door alle QR-codes met \'Volgende\', en scant ze een voor een.</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index d72e78546..1d67f2223 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -13,7 +13,6 @@
   <string name="title_key_server_preference">Właściwości serwera kluczy</string>
   <string name="title_change_passphrase">Zmień hasło</string>
   <string name="title_set_passphrase">Ustaw hasło</string>
-  <string name="title_share_with">Udostępnij...</string>
   <string name="title_share_file">Udostępnij plik...</string>
   <string name="title_encrypt_to_file">Zaszyfruj do pliku</string>
   <string name="title_decrypt_to_file">Odszyfruj do pliku</string>
@@ -26,13 +25,11 @@
   <string name="title_key_details">Szczegóły klucza</string>
   <string name="title_help">Pomoc</string>
   <!--section-->
-  <string name="section_user_ids">Identyfikator użytkownika</string>
   <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>
   <string name="section_master_key">Klucz główny</string>
-  <string name="section_master_user_id">Główny identyfikator użytkownika</string>
   <string name="section_actions">Działania</string>
   <string name="section_certification_key">Twój klucz użyty do certyfikacji</string>
   <string name="section_upload_key">Wyślij klucz</string>
@@ -116,7 +113,6 @@
   <string name="label_expiry">Wygaśnięcia</string>
   <string name="label_usage">Wykorzystanie</string>
   <string name="label_key_size">Rozmiar klucza</string>
-  <string name="label_main_user_id">Identyfikator głównego użytkownika</string>
   <string name="label_name">Imię</string>
   <string name="label_comment">Komentarz</string>
   <string name="label_email">Adres email</string>
@@ -197,7 +193,6 @@
   <string name="key_deletion_confirmation_multi">Czy na pewno chcesz usunąć wszystkie zaznaczone klucze publiczne?\nTej operacji nie można cofnąć!</string>
   <string name="secret_key_deletion_confirmation">Czy na pewno chcesz usunąć klucz prywatny \'%s\'?\nNie można cofnąć tej operacji!</string>
   <string name="ask_save_changed_key">Zostały dokonane zmiany w pęku kluczy, czy chcesz je zachować?</string>
-  <string name="ask_empty_id_ok">Dodałeś pusty identyfikator użytkownika, czy na pewno chcesz kontynuować?</string>
   <string name="public_key_deletetion_confirmation">Czy na pewno chcesz usunąć klucz publiczny \'%s\'?\nNie można cofnąć tej operacji!</string>
   <string name="also_export_secret_keys">Czy wyeksportować również klucze prywatne?</string>
   <plurals name="keys_added_and_updated_1">
@@ -256,8 +251,6 @@
   <string name="error_master_key_must_not_be_el_gamal">klucz EnGamal nie może być kluczem głównym</string>
   <string name="error_unknown_algorithm_choice">wybrano nieznany algorytm</string>
   <string name="error_user_id_no_email">nie znaleziono adresu email</string>
-  <string name="error_key_needs_a_user_id">potrzeba co najmniej jednego identyfikatora użytkownika</string>
-  <string name="error_main_user_id_must_not_be_empty">główny identyfikator użytkownika nie może być pusty</string>
   <string name="error_key_needs_master_key">potrzeba co najmniej klucza głównego</string>
   <string name="error_no_signature_passphrase">nie podano hasła</string>
   <string name="error_no_signature_key">nie podano klucza podpisu</string>
@@ -399,8 +392,6 @@
   <string name="api_register_allow">Zezwól na dostęp</string>
   <string name="api_register_disallow">Odmów dostępu</string>
   <string name="api_register_error_select_key">Wybierz klucz!</string>
-  <string name="api_select_pub_keys_missing_text">Nie znaleziono kluczy publiczych dla tych identyfikatorów użytkownika:</string>
-  <string name="api_select_pub_keys_dublicates_text">Więcej niż jeden klucz publiczny istnieje dla tych identyfikatorów użytkownika:</string>
   <string name="api_select_pub_keys_text">Proszę przejrzeć listę adresatów!</string>
   <string name="api_error_wrong_signature">Sprawdzanie podpisu zakończone niepowodzeniem! Czy zainstalowałeś tę aplikację z innego źródła? Jeżeli jesteś pewien, że nie jest to atak, odwołaj rejestrację teg aplikacji w OpenKeychain, a następnie zarejestruj ją ponownie.</string>
   <!--Share-->
@@ -421,10 +412,7 @@
   <string name="key_list_empty_button_create">tworzenie własnego klucza</string>
   <string name="key_list_empty_button_import">importowanie kluczy.</string>
   <!--Key view-->
-  <string name="key_view_action_edit">Edytuj ten klucz</string>
   <string name="key_view_action_encrypt">Zaszyfruj korzystając z tego klucza</string>
-  <string name="key_view_action_certify">Certyfikuj ten klucz</string>
-  <string name="key_view_tab_main">Informacje</string>
   <string name="key_view_tab_certs">Certyfikaty</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klucze</string>
@@ -447,7 +435,6 @@
   <string name="cert_none">żaden</string>
   <string name="cert_casual">typowy</string>
   <string name="cert_positive">pozytywny</string>
-  <string name="cert_revoke">odwołaj</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">niepowodzenie!</string>
   <string name="cert_verify_error">błąd!</string>
@@ -455,10 +442,8 @@
   <!--unsorted-->
   <string name="section_signer_id">Podpisujący</string>
   <string name="section_cert">Szczegóły certyfikatu</string>
-  <string name="label_user_id">Identyfikator użytkownika</string>
   <string name="unknown_uid">&lt;nieznany&gt;</string>
   <string name="empty_certs">Nie ma certyfikatów dla tego klucza</string>
-  <string name="section_uids_to_sign">Identyfikator użytkownika do podpisu</string>
   <string name="label_revocation">Powód odwołania</string>
   <string name="label_verify_status">Stan weryfikacji</string>
   <string name="label_cert_type">Typ</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 7b304b914..1dc0a6e36 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -24,13 +24,11 @@
   <string name="title_key_details">Сведения о ключе</string>
   <string name="title_help">Помощь</string>
   <!--section-->
-  <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">Владелец</string>
   <string name="section_actions">Действия</string>
   <string name="section_certification_key">Ваш ключ для сертификации</string>
   <string name="section_upload_key">Загрузить ключ</string>
@@ -114,7 +112,6 @@
   <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">Email</string>
@@ -189,7 +186,6 @@
   <string name="specify_file_to_export_to">Пожалуйста, выберите файл для экспорта.\nВНИМАНИЕ! Если файл существует, он будет перезаписан.</string>
   <string name="key_deletion_confirmation_multi">Вы уверены, что хотите удалить выбранные ключи?\nЭто действие нельзя отменить!</string>
   <string name="secret_key_deletion_confirmation">Вы уверены, что ходите удалить СЕКРЕТНЫЙ ключ \'%s\'?\nЭто действие нельзя отменить!</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">
@@ -247,8 +243,6 @@
   <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">email не найден</string>
-  <string name="error_key_needs_a_user_id">необходим хотя бы один id пользователя</string>
-  <string name="error_main_user_id_must_not_be_empty">основная запись пользователя не может быть пустой</string>
   <string name="error_key_needs_master_key">необходим основной ключ</string>
   <string name="error_no_signature_passphrase">пароль не задан</string>
   <string name="error_no_signature_key">ключ для подписи не задан</string>
@@ -386,8 +380,6 @@
   <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 найдено более одного ключа:</string>
   <string name="api_select_pub_keys_text">Пожалуйста, проверьте получателей!</string>
   <string name="api_error_wrong_signature">Проверка подписи пакета не удалась! Если  вы установили программу из другого источника, отзовите для неё доступ к этой программе или обновите право доступа.</string>
   <!--Share-->
@@ -408,10 +400,7 @@
   <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_action_certify">Сертифицировать этот ключ</string>
-  <string name="key_view_tab_main">Информация</string>
   <string name="key_view_tab_certs">Сертификация</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ключи</string>
@@ -432,7 +421,6 @@
   <!--certifications-->
   <string name="cert_default">по умолчанию</string>
   <string name="cert_none">нет</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>
@@ -440,10 +428,8 @@
   <!--unsorted-->
   <string name="section_signer_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="section_uids_to_sign">Подписываемые ID пользователя</string>
   <string name="label_revocation">Причина отзыва</string>
   <string name="label_verify_status">Статус верификации</string>
   <string name="label_cert_type">Тип</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index d0c70dc73..f2bf134e5 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -13,7 +13,6 @@
   <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_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>
@@ -26,13 +25,11 @@
   <string name="title_key_details">Podrobnosti o ključu</string>
   <string name="title_help">Pomoč</string>
   <!--section-->
-  <string name="section_user_ids">Uporabniški ID-ji</string>
   <string name="section_keys">Ključ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">Glavni ID uporabnika</string>
   <string name="section_actions">Ravnanja</string>
   <string name="section_certification_key">Vaš ključ, uporabljan za overitev</string>
   <string name="section_upload_key">Naloži ključ</string>
@@ -116,7 +113,6 @@
   <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">Glavni ID uporabnika</string>
   <string name="label_name">Ime</string>
   <string name="label_comment">Komentar</string>
   <string name="label_email">E-pošta</string>
@@ -200,7 +196,6 @@
   <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 prezen uporabniški iD! Ste prepričani, da ž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">
@@ -265,8 +260,6 @@
   <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">potrebujem vsaj en uporabniški ID</string>
-  <string name="error_main_user_id_must_not_be_empty">glavni uporabniški ID ne more biti prazen</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>
@@ -412,8 +405,6 @@
   <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 naslednje uporabniške ID-je ni bil najden noben javni ključ:</string>
-  <string name="api_select_pub_keys_dublicates_text">Za naslednje uporabniške ID-je obstaja več kot en javni ključ:</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-->
@@ -435,10 +426,7 @@
   <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_action_certify">Overi ta kluč</string>
-  <string name="key_view_tab_main">Info</string>
   <string name="key_view_tab_certs">Overitve</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ključi</string>
@@ -461,7 +449,6 @@
   <string name="cert_none">brez</string>
   <string name="cert_casual">navadno</string>
   <string name="cert_positive">pozitivno</string>
-  <string name="cert_revoke">preklic</string>
   <string name="cert_verify_ok">ok</string>
   <string name="cert_verify_failed">neuspešno!</string>
   <string name="cert_verify_error">napaka!</string>
@@ -469,10 +456,8 @@
   <!--unsorted-->
   <string name="section_signer_id">Podpisnik</string>
   <string name="section_cert">Podrobnosti potrdil</string>
-  <string name="label_user_id">ID uporabnika</string>
   <string name="unknown_uid">&lt;neznan&gt;</string>
   <string name="empty_certs">Ni potrdil za ta ključ</string>
-  <string name="section_uids_to_sign">Uporabniški ID-ji za podpisovanje</string>
   <string name="label_revocation">Razlog za preklic</string>
   <string name="label_verify_status">Status preverjanja</string>
   <string name="label_cert_type">Vrsta</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index dfb060fb2..19115e141 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_user_ids">Kullanıcı IDleri</string>
   <string name="section_keys">Anahtarlar</string>
   <string name="section_general">Genel</string>
   <string name="section_defaults">Varsayılanlar</string>
@@ -167,8 +166,6 @@
   <!--Key list-->
   <string name="key_list_empty_text3">ya da</string>
   <!--Key view-->
-  <string name="key_view_action_edit">Bu anahtarı düzenle</string>
-  <string name="key_view_tab_main">Bilgi</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Anahtarlar</string>
   <string name="edit">Düzenle</string>
@@ -185,6 +182,5 @@
   <string name="cert_verify_unavailable">anahtar mevcut değil</string>
   <!--unsorted-->
   <string name="section_signer_id">İmzalayan</string>
-  <string name="label_user_id">Kullanıcı ID</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 91f7305f6..a8c7243b3 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -24,13 +24,11 @@
   <string name="title_key_details">Подробиці про ключ</string>
   <string name="title_help">Довідка</string>
   <!--section-->
-  <string name="section_user_ids">ІД користувача</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">ІД основного ключа</string>
   <string name="section_actions">Дії</string>
   <string name="section_certification_key">Ваш ключ використаний для сертифікації</string>
   <string name="section_upload_key">Завантажити ключ</string>
@@ -113,7 +111,6 @@
   <string name="label_expiry">Закінчення</string>
   <string name="label_usage">Використання</string>
   <string name="label_key_size">Розмір ключа</string>
-  <string name="label_main_user_id">ІД основного користувача</string>
   <string name="label_name">Назва</string>
   <string name="label_comment">Коментар</string>
   <string name="label_email">Ел. пошта</string>
@@ -184,7 +181,6 @@
   <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">Ви вже додали порожній ідентифікатор користувача. Справді хочете продовжити?</string>
   <string name="public_key_deletetion_confirmation">Ви справді хочете вилучити відкритий ключ \'%s\'?\nВи не зможете це відмінити!</string>
   <string name="also_export_secret_keys">Також експортувати секретні ключі?</string>
   <plurals name="keys_added_and_updated_1">
@@ -240,8 +236,6 @@
   <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">потрібний хоча б один ІД користувача</string>
-  <string name="error_main_user_id_must_not_be_empty">ІД основного користувача не має бути порожнім</string>
   <string name="error_key_needs_master_key">потрібний хоча б один основний ключ</string>
   <string name="error_no_signature_passphrase">не подано парольної фрази</string>
   <string name="error_no_signature_key">не подано ключ підпису</string>
@@ -380,8 +374,6 @@
   <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">Не знайдено публічних ключів для цих ІД  користувачів:</string>
-  <string name="api_select_pub_keys_dublicates_text">Більше ніж один публічний ключ існує для цих ІД користувачів:</string>
   <string name="api_select_pub_keys_text">Будь ласка, перевірте список одержувачів!</string>
   <string name="api_error_wrong_signature">Перевірка підпису пакету не вдалася! Може ви встановили програму з іншого джерела? Якщо ви впевнені, що це не атака, то відкличте реєстрацію програми у OpenKeychain та знову зареєструйте її.</string>
   <!--Share-->
@@ -402,8 +394,6 @@
   <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_tab_main">Інформація</string>
   <string name="key_view_tab_certs">Сертифікати</string>
   <!--Navigation Drawer-->
   <string name="nav_encrypt">Підписати і зашифрувати</string>
@@ -425,7 +415,6 @@
   <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">Гаразд</string>
   <string name="cert_verify_failed">Невдача!</string>
   <string name="cert_verify_error">Помилка!</string>
@@ -433,9 +422,7 @@
   <!--unsorted-->
   <string name="section_signer_id">Підписувач</string>
   <string name="section_cert">Дані сертифікату</string>
-  <string name="label_user_id">ІД користувача</string>
   <string name="empty_certs">Немає сертифікатів для цього ключа</string>
-  <string name="section_uids_to_sign">ІД користувача для реєстрації</string>
   <string name="label_revocation">Причина відхилення</string>
   <string name="label_verify_status">Стан перевірки</string>
   <string name="label_cert_type">Тип</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 6783f809f..cf0fff97d 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_user_ids">用户ID</string>
   <string name="section_keys">密钥</string>
   <string name="section_general">常规</string>
   <string name="section_defaults">缺省</string>
@@ -104,8 +103,6 @@
   <string name="error_external_storage_not_ready">外置存储没有准备好</string>
   <string name="error_key_size_minimum512bit">密钥的大小必须至少512位</string>
   <string name="error_unknown_algorithm_choice">位置的算法选择</string>
-  <string name="error_key_needs_a_user_id">需要至少一个用户id</string>
-  <string name="error_main_user_id_must_not_be_empty">主用户id不能是空的</string>
   <string name="error_key_needs_master_key">需要至少一个主密钥</string>
   <string name="error_no_signature_passphrase">没有提供密语</string>
   <string name="error_no_signature_key">没有提供密钥</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2a1a045ef..0c14efcec 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="title_key_server_preference">Keyserver Preference</string>
     <string name="title_change_passphrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
+    <string name="title_share_with">Share with…</string>
     <string name="title_share_fingerprint_with">Share fingerprint with…</string>
     <string name="title_share_key_with">Share key with…</string>
     <string name="title_share_file">Share file with…</string>
@@ -484,7 +485,7 @@
     <string name="cert_none">none</string>
     <string name="cert_casual">casual</string>
     <string name="cert_positive">positive</string>
-    <string name="cert_revoke">revoke</string>
+    <string name="cert_revoke">revoked</string>
     <string name="cert_verify_ok">ok</string>
     <string name="cert_verify_failed">failed!</string>
     <string name="cert_verify_error">error!</string>
