Simplified language: Confirm keys

55 files changed, 82 insertions, 781 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
index 2eb35351e..cd6cdf4d6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
@@ -32,10 +32,9 @@ public class HelpActivity extends BaseActivity {
 
     public static final int TAB_START = 0;
     public static final int TAB_FAQ = 1;
-    public static final int TAB_WOT = 2;
-    public static final int TAB_NFC = 3;
-    public static final int TAB_CHANGELOG = 4;
-    public static final int TAB_ABOUT = 5;
+    public static final int TAB_TRUST = 2;
+    public static final int TAB_CHANGELOG = 3;
+    public static final int TAB_ABOUT = 4;
 
     ViewPager mViewPager;
     private PagerTabStripAdapter mTabsAdapter;
@@ -69,21 +68,11 @@ public class HelpActivity extends BaseActivity {
         mTabsAdapter.addTab(HelpHtmlFragment.class, startBundle,
                 getString(R.string.help_tab_start));
 
-        Bundle faqBundle = new Bundle();
-        faqBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_faq);
-        mTabsAdapter.addTab(HelpHtmlFragment.class, faqBundle,
-                getString(R.string.help_tab_faq));
-
         Bundle wotBundle = new Bundle();
-        wotBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_wot);
+        wotBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_certification);
         mTabsAdapter.addTab(HelpHtmlFragment.class, wotBundle,
                 getString(R.string.help_tab_wot));
 
-        Bundle nfcBundle = new Bundle();
-        nfcBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_nfc_beam);
-        mTabsAdapter.addTab(HelpHtmlFragment.class, nfcBundle,
-                getString(R.string.help_tab_nfc_beam));
-
         Bundle changelogBundle = new Bundle();
         changelogBundle.putInt(HelpHtmlFragment.ARG_HTML_FILE, R.raw.help_changelog);
         mTabsAdapter.addTab(HelpHtmlFragment.class, changelogBundle,
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
index 215cde1b7..44bcc52a5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
@@ -475,7 +475,8 @@ public class ContactHelper {
      */
     private static void writeContactEmail(ArrayList<ContentProviderOperation> ops, ContentResolver resolver,
                                           long rawContactId, long masterKeyId) {
-        ops.add(selectByRawContactAndItemType(ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI),
+        ops.add(selectByRawContactAndItemType(
+                ContentProviderOperation.newDelete(ContactsContract.Data.CONTENT_URI),
                 rawContactId, ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE).build());
         Cursor ids = resolver.query(UserPackets.buildUserIdsUri(masterKeyId),
                 new String[]{
@@ -487,7 +488,8 @@ public class ContactHelper {
             while (ids.moveToNext()) {
                 String[] userId = KeyRing.splitUserId(ids.getString(0));
                 if (userId[1] != null) {
-                    ops.add(referenceRawContact(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI),
+                    ops.add(referenceRawContact(
+                            ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI),
                             rawContactId)
                             .withValue(ContactsContract.Data.MIMETYPE,
                                     ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index ff485cd48..f5423817e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -7,23 +7,6 @@
     android:singleLine="true">
 
     <LinearLayout
-        android:id="@+id/user_id_item_certified_layout"
-        android:layout_width="22dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/user_id_item_certified"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/status_signature_unverified_cutout_24px"
-            android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <LinearLayout
         android:orientation="vertical"
         android:layout_gravity="center_vertical"
         android:layout_width="0dip"
@@ -57,6 +40,26 @@
 
     </LinearLayout>
 
+
+    <LinearLayout
+        android:id="@+id/user_id_item_certified_layout"
+        android:layout_width="22dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/user_id_item_certified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/status_signature_unverified_cutout_24px"
+            android:layout_gravity="center_horizontal" />
+
+    </LinearLayout>
+
     <ImageView
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_wot.html b/OpenKeychain/src/main/res/raw-bg/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-bg/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
deleted file mode 100644
index e40da69bf..000000000
--- a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Jak přijmout klíče</h2>
-<ol>
-<li>Go to your partners keys and open the key you want to share.</li>
-<li>Podržte dvě zařízení zády k sobě (musí se téměř dotýkat) a ucítíte vibraci.</li>
-<li>Po tom co ucítíte vibraci, uvidíte že se obsah na displeji zařízení vašeho partnera změní na objekt typu karta s animací na pozadí připomínající rychlost warpu ze Star Treku.</li>
-<li>Tapněte na kartu a obsah se nahraje do zařízení.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_wot.html b/OpenKeychain/src/main/res/raw-cs/help_wot.html
deleted file mode 100644
index 29b4fc420..000000000
--- a/OpenKeychain/src/main/res/raw-cs/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Síť důvěry</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Podpora v OpenKeychain</h2>
-<p>Podpora pro síť důvěry v OpenKeychain je teprve ve svých začátcích. Tento stav se bude velmi měnit v dalších verzích aplikace.</p>
-
-<h2>Model důvěry</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifikace klíčů</h2>
-<p>Podpora pro certifikaci klíčů je dostupná a uživatelská ID mohou být certifikována jednotlivě. Ještě není možné určovat úroveň důvěryhodnosti nebo vytvářet lokální a jiné speciální typy certifikátů.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
deleted file mode 100644
index 3f1b9e22d..000000000
--- a/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Wie kann man Schlüssel empfangen</h2>
-<ol>
-<li>Gehe zu den Schlüsseln deiner Partner und öffne den Schlüssel welcher geteilt werden soll.</li>
-<li>Halten Sie die zwei Geräte rückseitig aneinander (sodass sie sich fast berühren) und es wird vibrieren</li>
-<li>Nachdem es vibriert sehen sie wie sich der Inhalt des Gerätes ihres Bekannten von einer Warp-Geschwindigkeit Animation umgeben wird</li>
-<li>Wenn sie die Karte antippen, wird der Inhalt auf ihr Gerät übertragen</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-de/help_wot.html b/OpenKeychain/src/main/res/raw-de/help_wot.html
deleted file mode 100644
index ad33ddbb1..000000000
--- a/OpenKeychain/src/main/res/raw-de/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>Das Web of Trust beschreibt den Teil von PGP der sich mit der Erstellung und dem Verwalten von Zertifikaten beschäftigt. Nutzer können so im Auge behalten zu wem ein bestimmter Public Key gehört, sowie diese Information teilen: Um die Privatsphäre von verschlüsselter Kommunikation zu gewährleisten ist es essentiell zu wissen ob der Public Key den man zum Verschlüsseln nutzt zu der Person gehört, die man erwartet.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>Es gibt nur eine rudimentäre Unterstützung für das Web of Trust in OpenKeychain. Am Web of Trust System wird kontinuierlich gearbeitet und es wird in den kommenden Version überarbeitet.</p>
-
-<h2>Vertrauens-Modell</h2>
-<p>Die Bewertung des Vertrauens basiert auf der Grundannahme, dass alle Schlüssel zu denen ein privater Schlüssel vorhanden ist, vertrauenswürdig sind. Öffentliche Schlüssel welche mindestens eine User ID beinhalten, die von einem Trusted Key verifiziert wurden, werden mit einem grünen Punkt in der Schlüsselliste gekennzeichnet. Es ist (noch) nicht möglich bestimmte Trust Level für Zertifikate anderer bekannter öffentlicher Schlüssel festzulegen.</p>
-
-<h2>Schlüssel beglaubigen</h2>
-<p>Die Unterstützung für die Zertifizierung von Schlüsseln ist vorhanden. Nutzer IDs können separat zertifiziert werden. Es ist jedoch sowohl noch nicht möglich das Vertrauenslevel festzulegen, als auch lokale oder andere spezielle Zertifikate zu erstellen.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
deleted file mode 100644
index b1c29183f..000000000
--- a/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Cómo recibir las claves</h2>
-<ol>
-<li>Vaya a las claves de socios y abra la clave que quiera compartir.</li>
-<li>Mantén los dos dispositivos de con ambos reversos juntos (tienen que estar casi en contacto) y notarás una vibración.</li>
-<li>Después de que vibre, verás el contenido en el dispositivo de tu compañero convertirse en una especie de ficha con una animación de Star Trek de fondo.</li>
-<li>Toca la ficha y el contenido se cargará en tu dispositivo.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-es/help_wot.html b/OpenKeychain/src/main/res/raw-es/help_wot.html
deleted file mode 100644
index 3af2cae10..000000000
--- a/OpenKeychain/src/main/res/raw-es/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Anillo de confianza</h2>
-<p>El anillo de confianza (web of trust) describe la parte de OpenPGP que se encarga de la creación y registro de las certificaciones. Proporciona mecanismos para ayudar al usuario a llevar un seguimiento de a quién pertenece una clave pública, y compartir esta información con otros. Para asegurar la privacidad de la comunicación cifrada, es esencial saber que la clave pública con la que usted la cifra pertenece a la persona que usted cree.</p>
-
-<h2>Soporte en OpenKeychain</h2>
-<p>Sólo hay soporte básico para el anillo de confianza (web of trust) en OpenKeychain. Esta es una pesada tarea que tenemos en marcha sujeta a cambios en versiones posteriores.</p>
-
-<h2>Modelo de confianza</h2>
-<p>La evaluación de la confianza está basada en la simple asunción de que todas las claves que tienen disponibles claves privadas (secretas) son de confianza. Las claves públicas que contienen al menos una identificación de usuario certificada por una clave de confianza serán marcadas con un punto verde en los listados de claves. No es posible (aún) especificar niveles de confianza para certificados de otras claves públicas conocidas.</p>
-
-<h2>Certificando claves</h2>
-<p>Está disponible el soporte para certificación de clave, y las identificaciones de usuario pueden ser certificadas individualmente. No es posible aún especificar el nivel de confianza o crear certificados locales y otros tipos especiales de certificados.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-et/help_wot.html b/OpenKeychain/src/main/res/raw-et/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-et/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_wot.html b/OpenKeychain/src/main/res/raw-eu/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-eu/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-fi/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_wot.html b/OpenKeychain/src/main/res/raw-fi/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-fi/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
deleted file mode 100644
index 374975b73..000000000
--- a/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Comment recevoir des clefs</h2>
-<ol>
-<li>Allez aux clefs de votre partenaire et ouvrez la clef que vous voulez partager.</li>
-<li>Tenir les deux appareils dos à dos (se touchant presque) et une vibration sera ressentie.</li>
-<li>Après la vibration, le contenu de l'appareil de votre partenaire deviendra un objet en forme de carte avec une animation à la Star Trek en arrière-plan.</li>
-<li>Toquer la carte et le contenu se chargera alors sur votre appareil.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_wot.html b/OpenKeychain/src/main/res/raw-fr/help_wot.html
deleted file mode 100644
index 6763b8969..000000000
--- a/OpenKeychain/src/main/res/raw-fr/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Toile de confiance</h2>
-<p>La toile de confiance décrit la partie d'OpenPGP qui s'occupe de la création et du suivi des certifications. Elle fournit des mécanismes pour aider l'utilisateur à suivre à qui appartient une clef publique, et partager cette information avec d'autres. Pour assurer la confidentialité d'une communication chiffrée, il est essentiel de savoir que la clef publique vers laquelle vous chiffrez appartient à la personne à qui vous croyez qu'elle appartient.</p>
-
-<h2>Prise en charge dans OpenKeychain</h2>
-<p>OpenKeychain offre seulement une prise en charge de base de la toile de confiance. Un travail important est en cours et ceci pourrait changer dans les versions à venir.</p>
-
-<h2>Modèle de confiance</h2>
-<p>L'évaluation de la confiance est fondée sur la simple supposition que toutes les clefs proposant des clefs secrètes sont de confiance. Les clefs publiques contenant au moins un ID utilisateur certifié par une clef de confiance seront marquées par un point vert dans le listage des clefs. Il n'est pas (encore) possible de spécifier les niveaux de confiance pour les certificats d'autres clefs publiques inconnues.</p>
-
-<h2>Certifications des clefs</h2>
-<p>La prise en charge de la certification des clefs est proposée et les ID utilisateurs peuvent être certifiées individuellement. Il n'est pas encore possible de spécifier le niveau de confiance ou de créer des certificats locaux et d'autres types spéciaux.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-is/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_wot.html b/OpenKeychain/src/main/res/raw-is/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-is/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html
deleted file mode 100644
index f6bf27fe8..000000000
--- a/OpenKeychain/src/main/res/raw-it/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Come ricevere le chiavi</h2>
-<ol>
-<li>Vai alle chiavi dei contatti dei tuoi partner e apri la chiave che si desidera condividere.</li>
-<li>Mantieni i due dispositivi vicini (devono quasi toccarsi) e sentirai una vibrazione.</li>
-<li>Dopo che ha vibrato, vedrai il contenuto del tuo dispositivo diventare come una scheda e nello sfondo apparirà una animazione come la propulsione a curvatura di Star Trek.</li>
-<li>Tocca la scheda e il contenuto dopo si trasferira' nel dispositivo dell'altra persona.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-it/help_wot.html b/OpenKeychain/src/main/res/raw-it/help_wot.html
deleted file mode 100644
index 09b38199b..000000000
--- a/OpenKeychain/src/main/res/raw-it/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Rete di Fiducia</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Supporto in OpenKeychain</h2>
-<p>Esiste solo un supporto di base per le Reti di Fiducia in OpenKeychain. Questo è un grosso lavoro in corso e soggetto a modifiche nei prossimi rilasci.</p>
-
-<h2>Modello di Fiducia</h2>
-<p>La valutazione di fiducia si basa sul semplice presupposto che tutte le chiavi che hanno chiavi segrete disponibili sono attendibili. Le chiavi pubbliche che contengono almeno un id utente certificato da una chiave di fiducia saranno contrassegnati con un punto verde negli elenchi principali. Non è (ancora) possibile specificare livelli di attendibilità per i certificati di altre chiavi pubbliche conosciute.</p>
-
-<h2>Chiavi di certificazione</h2>
-<p>Il supporto per la certificazione chiave è disponibile, e gli id utenti possono essere certificati singolarmente. Non è ancora possibile specificare il livello di fiducia o creare certificati locali e altro di tipo speciale.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
deleted file mode 100644
index c19280fd1..000000000
--- a/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>鍵の受信方法</h2>
-<ol>
-<li>パートナーの連絡先に行き、共有したい連絡先を開きます。</li>
-<li>2つのデバイスを背中合せ(ほとんどすべてのタッチ方法)にしてバイブを感じるまで保持しておいてください。</li>
-<li>バイブの後、相手のデバイスでスタートレック風のバックグラウンドアニメーションしているカード風のコンテンツを見ると思います。</li>
-<li>カードをタップしコンテンツをあなたのデバイスにロードします。</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_wot.html b/OpenKeychain/src/main/res/raw-ja/help_wot.html
deleted file mode 100644
index e4db99bb8..000000000
--- a/OpenKeychain/src/main/res/raw-ja/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>信頼の輪</h2>
-<p>信頼の輪はOpenPGPの一面で証明の作成とその維持の一面を説明します。ユーザが公開鍵に属する者の追跡を維持し、他のユーザーとその情報を共有する手助けになるメカニズムを提供します。暗号化通信のプライバシーを確保するためには、あなたが暗号化したいという相手の公開鍵が必要な要素となります。</p>
-
-<h2>OpenKeychainでサポート</h2>
-<p>OpenKeychainで信頼の輪の基本のみサポートされます。とても重い作業を進めており今後やってくるリリースにおいて状態が変更されていきます。</p>
-
-<h2>信頼モデル</h2>
-<p>信頼の評価はシンプルな仮定に基づいています、それはすべての鍵は秘密鍵が信頼できるというものです。公開鍵は信頼された鍵で検証された最低1つのユーザIDを含んでおり、それは鍵リストにおいて、緑でマークされます。ただしそれは他の既知の公開鍵の信頼レベルを特別なものには(まだ)しません。</p>
-
-<h2>鍵の検証</h2>
-<p>鍵検証のサポートが提供されており、またユーザIDは個別に検証できます。ただしそれは他の既知の公開鍵の信頼レベルを特別なものにはしないローカルもしくは他の特別なタイプの証明です。</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
deleted file mode 100644
index 4caf75748..000000000
--- a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Hoe sleutels te ontvangen</h2>
-<ol>
-<li>Ga naar je partner's sleutels en open de sleutel die je wil delen.</li>
-<li>Houd de twee toestellen met de achterkant tegen elkaar (ze moeten elkaar bijna aanraken) en je zal een trilling voelen.</li>
-<li>Nadat het trilt zal je de inhoud op je partner's toestel in een soort kaart zien veranderen met Star Trek warp snelheid-eruitziende animatie op de achtergrond.</li>
-<li>Druk op de kaart en de inhoud zal dan laden op het toestel.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_wot.html b/OpenKeychain/src/main/res/raw-nl/help_wot.html
deleted file mode 100644
index 4c72a875c..000000000
--- a/OpenKeychain/src/main/res/raw-nl/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web van Vertrouwen</h2>
-<p>Het Web van Vertrouwen beschrijft het deel van OpenPGP dat te maken heeft met aanmaken en boekhouden van certificaten. Het voorziet van mechanismes zodat de gebruiker bij kan houden van aan wie een publieke sleutel toebehoort, en deze informatie met anderen kan delen; om de privacy van versleutelde communicatie te verzekeren, is het essentiëel om te weten dat de publieke sleutel die je versleutelt, toebehoort aan de persoon aan wie je denkt dat het toebehoort.</p>
-
-<h2>Ondersteuning in OpenKeychain</h2>
-<p>Er is alleen basisondersteuning voor Web van Vertrouwen in OpenKeychain. Dit is een zware 'werk in uitvoering' en onderwerp voor veranderingen in toekomstige releases.</p>
-
-<h2>Vertrouwensmodel</h2>
-<p>Vertrouwensevaluatie is gebaseerd om de simpele aanname dat alle sleutels die beschikbare geheime sleutels hebben, vertrouwd zijn. Publieke sleutels die minstens een gebruikers-ID bevatten, gecertificeerd door een vertrouwde sleutel, zullen gemarkeerd worden met een groene stip in de sleutel lijsten. Het is (nog) niet mogelijk om vertrouwen niveaus voor certificaten van andere bekende publieke sleutels te specifiëren.</p>
-
-<h2>Bezig met certificeren van sleutels&lt;br&gt;</h2>
-<p>Ondersteuning voor sleutelcertificatie is beschikbaar, en gebruikers-ID's kunnen individueel gecertificeerd worden. Het is nog niet mogelijk om het niveau van vertrouwen te specifiëren om locale en andere speciale typen van certificaten te maken.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
deleted file mode 100644
index 8d42a8261..000000000
--- a/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Jak odbierać klucze</h2>
-<ol>
-<li>Idź to kluczy swoich partnerów i otwórz klucz którym chcesz się podzielić.</li>
-<li>Przytrzymaj oba urządzenia tyłem do siebie (powinny się niemal dotykać) aż poczujesz wibrację.</li>
-<li>Po zakończeniu wibracji zobaczysz, że zawartość urządzenia partnera zamienia się w obiekt zbliżony do wizytówki, z animacją rodem ze Star Treka w tle.</li>
-<li>Dotknij wizytówkę, a jej zawartość zostanie wysłana na Twoje urządzenie.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_wot.html b/OpenKeychain/src/main/res/raw-pl/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-pl/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_wot.html b/OpenKeychain/src/main/res/raw-pt/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-pt/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html
deleted file mode 100644
index 966fb554a..000000000
--- a/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_wot.html b/OpenKeychain/src/main/res/raw-ro/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-ro/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
deleted file mode 100644
index fcf55cdaf..000000000
--- a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Как обменяться ключами</h2>
-<ol>
-<li>Нажмите и удерживайте ключ, который вы хотите передать.</li>
-<li>Поднесите оба устройства вплотную обратными сторонами (до полного касания). Вы почувствуете небольшую вибрацию.</li>
-<li>Как только устройства завибрируют, на экране появится карточка с передаваемым содержимым.</li>
-<li>Нажмите на карточку, что бы передать данные (ключи) с одного устройства на другое.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_wot.html b/OpenKeychain/src/main/res/raw-ru/help_wot.html
deleted file mode 100644
index 7fbde44d3..000000000
--- a/OpenKeychain/src/main/res/raw-ru/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Сеть доверия (WoT)</h2>
-<p>Сеть доверия (The Web of Trust) предоставляет механизм заверения ключей посредством присоединения и распространения информации о выполненной сертификации. Для гарантии безопасного зашифрованного общения крайне важно не сомневаться, что владельцем ключа является ваш собеседник.</p>
-
-<h2>Поддержка в OpenKeychain</h2>
-<p>В настоящее время реализованы только базовые возможности WoT. Работа в самом разгаре и в будущих версиях OpenKeychain будут появляться дополнительные возможности.</p>
-
-<h2>Модель доверия</h2>
-<p>Проверка доверия основана на простом принципе, что если доступен секретный ключ, то доверие к нему абсолютное. Однако, публичные должны содержать подписи кого-то, кому вы доверяете, что бы подпись, сделанная таким ключом, была отмечена зелёным индикатором. К сожалению, (пока) нельзя определять степень доверия к другим известным публичным ключам.</p>
-
-<h2>Сертификация ключей</h2>
-<p>Поддержка сертификации ключей уже реализована, и Вы можете сертифицировать отдельные ID пользователя. Пока нельзя выбирать степень доверия, создавать локальные или специальные типы сертификатов.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html
deleted file mode 100644
index 62599edc2..000000000
--- a/OpenKeychain/src/main/res/raw-sl/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Kako pridobiti ključe</h2>
-<ol>
-<li>Go to your partners keys and open the key you want to share.</li>
-<li>S hrbtoma približajte dve napravi (vašo ter vašega partnerja - morata se skoraj dotikati) in začutili boste vibracijo.</li>
-<li>Po vibraciji se bo vsebina na napravi vašega partnerja spremenila v vizitki podoben objekt s 'Star Trek' animacijo v ozadju.</li>
-<li>Tapnite vizitko in njena vsebnina se bo prenesla na vašo napravo.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_wot.html b/OpenKeychain/src/main/res/raw-sl/help_wot.html
deleted file mode 100644
index 224110e18..000000000
--- a/OpenKeychain/src/main/res/raw-sl/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Omrežje zaupanja</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Podpora v OpenKeychain</h2>
-<p>OpenKeychain ponuja zgolj osnovno podporo za 'Omrežje zaupanja'. V prihodnjih različicah bomo to podporo še nadgrajevali in izboljševali.</p>
-
-<h2>Model zaupanja</h2>
-<p>Ocena zaupanja temelji na predpostavki, da so vsi ključi, ki vsebujejo tudi zasebne ključe, vredni zaupanja. Javni ključi, ki vsebujejo vsaj en uporabniški ID, ki je overjen z zaupanja vrednim ključem, so na seznamu ključev označeni z zeleno piko. Zaenkrat (še) ni možno natančneje določiti stopnje zaupanja potrdil drugih znanih javnih ključev.</p>
-
-<h2>Overjanje ključev</h2>
-<p>Overjanje ključev je na voljo. Uporabniške ID-je ključev overjamo individualno. Zaenkrat ni možno natančneje določiti stopnje zaupanja ali ustvarjati lokalne ali druge posebne vrste potrdil.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
deleted file mode 100644
index bef6f591e..000000000
--- a/OpenKeychain/src/main/res/raw-sr/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Како примити кључеве</h2>
-<ol>
-<li>Идите у кључеве вашег другара и отворите кључ којег желите да поделите.</li>
-<li>Држите оба уређаја леђа о леђа (треба да се скоро додирују) и осетићете вибрацију.</li>
-<li>Након вибрације видећете да се садржај на уређају вашег другара претвара у нешто што личи на картицу са анимацијом сличном ворп брзини из Звезданих Стаза у позадини.</li>
-<li>Додирните картицу и садржај ће се потом учитати на вашем уређају.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_wot.html b/OpenKeychain/src/main/res/raw-sr/help_wot.html
deleted file mode 100644
index 713b3e331..000000000
--- a/OpenKeychain/src/main/res/raw-sr/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Веб Поверења</h2>
-<p>Веб Поверења описује део ОпенПГП-а који се бави прављењем и спремањем сертификата. Пружа механизме који помажу кориснику у праћењу коме јавни кључ припада и дељењу ове информације са осталима; да би се осигурала приватност шифроване комуникације, нужно је знати да јавни кључ на који шифрујете припада особи којој и мислите да припада.</p>
-
-<h2>Подршка у Отвореном кључарнику</h2>
-<p>Постоји само основна подршка за Веб поверења у Отвореном кључарнику. Ово је велики посао у току и подложан променама у наредним издањима.</p>
-
-<h2>Модел поверења</h2>
-<p>Евалуација поверења се заснива на једноставној претпоставци да су сви кључеви који имају доступне тајне кључеве, од поверења. Јавни кључеви који садрже најмање један кориснички ид оверен кључем од поверења биће означени зеленом тачком у исписима кључева. Није (још) могуће одредити нивое поверења за сертификате других познатих јавних кључева.</p>
-
-<h2>Оверавање кључева</h2>
-<p>Подршка за оверу кључева је доступна, и кориснички ид-ови могу бити оверавани појединачно. Још није могуће одредити ниво поверења или направити локалне и друге посебне врсте сертификата.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html
deleted file mode 100644
index 4e940a398..000000000
--- a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Hur man tar emot nycklar</h2>
-<ol>
-<li>Go to your partners keys and open the key you want to share.</li>
-<li>Håll de två enheternas baksidor mot varandra (de måste nästan vidröras) och du känner av en vibration.</li>
-<li>Efter vibrationen kommer du att se innehållet på din partners enhet omvandlas till ett kortliknande föremål och en animation i bakgrunden som ser ut som Star Treks warp speed.</li>
-<li>Tryck på kortet och innehållet kommer att laddas på den andra personens enhet.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_wot.html b/OpenKeychain/src/main/res/raw-sv/help_wot.html
deleted file mode 100644
index 68a2e3997..000000000
--- a/OpenKeychain/src/main/res/raw-sv/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Tillitsnät</h2>
-<p>Tillitsnätet beskriver den del av OpenPGP som handlar om hur man skapar och bokför certifieringar. Det gör det möjligt för användaren att hålla reda på vem en publik nyckel tillhör, och dela denna information med andra; för att försäkra sig om integriteten i  krypterad kommunikation är det avgörande att veta att den publika nyckel du krypterar till tillhör den person du tror att den gör.</p>
-
-<h2>Stöd i OpenKeychain</h2>
-<p>Endast grundläggande stöd för tillitsnät finns i OpenKeychain. Arbetet med funktionen pågår och den kan komma att ändras i kommande versioner.</p>
-
-<h2>Tillitsmodell</h2>
-<p>Värderingen av tillit utgår från det enkla antagandet att alla nycklar som har en privat nyckel är tillförlitliga. Publika nycklar som innehåller åtminstone ett användar-ID certifierat av en tillförlitlig nyckel kommer att ha en grön prick i nyckellistorna. Det är (ännu) inte möjligt att ange nivån av tillit för andra kända publika nycklars certifikat.</p>
-
-<h2>Certifiera nycklar</h2>
-<p>Stöd för nyckelcertifiering finns, och enskilda användar-ID:n kan certifieras. Det är ännu inte möjligt att ange nivån av tillit eller skapa ett lokalt eller andra typer av certifikat.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
deleted file mode 100644
index 49f79e157..000000000
--- a/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Anahtarlar nasıl alınır</h2>
-<ol>
-<li>Eşleşecek cihazın anahtarlarına girin ve paylaşmak istediğiniz anahtarı açın.</li>
-<li>İki cihazı arka arkaya tutun (neredeyse temas edecek şekilde) ve bir titreşim hissedeceksiniz.</li>
-<li>Titreşimden sonra içeriğin eşleşecek cihazda arkaplanında Star Trek ışınlanma animasyonu olan kart'a benzer bir objeye dönüştüğünü göreceksiniz.</li>
-<li>Kart'a tıklayın ve içerik sizin cihazınıza yüklensin.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_wot.html b/OpenKeychain/src/main/res/raw-tr/help_wot.html
deleted file mode 100644
index f2282908b..000000000
--- a/OpenKeychain/src/main/res/raw-tr/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>OpenKeychain Desteği</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Güven Modeli</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Anahtar Tasdikleme</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
deleted file mode 100644
index fb4698b7f..000000000
--- a/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Як обмінятися ключами</h2>
-<ol>
-<li>Go to your partners keys and open the key you want to share.</li>
-<li>Піднесіть обидва пристрої впритул зворотними сторонами (до повного торкання). Ви відчуєте невелику вібрацію.</li>
-<li>Після вібрації пристроїв на екрані з'явиться картка з передаваним вмістом.</li>
-<li>Натисніть на картку, що б передати дані з одного пристрою на інший.</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_wot.html b/OpenKeychain/src/main/res/raw-uk/help_wot.html
deleted file mode 100644
index 669aa0649..000000000
--- a/OpenKeychain/src/main/res/raw-uk/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Мережа довіри</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Підтримка у OpenKeychain</h2>
-<p>Наразі реалізовані тільки базові можливості WoT. Робота в самому розпалі, і в майбутніх версіях OpenKeychain будуть з'являтися додаткові можливості.</p>
-
-<h2>Модель довіри</h2>
-<p>Перевірка довіри заснована на простому принципі, що якщо доступний секретний ключ, то довіра до нього абсолютна. Однак, публічні повинні містити підписи когось, кому ви довіряєте, що б підпис, зроблений таким ключем, був відзначений зеленим індикатором. На жаль, (поки що) не можна визначати ступінь довіри до інших відомих публічних ключів.</p>
-
-<h2>Сертифікація ключів</h2>
-<p>Підтримка сертифікації ключів вже реалізована, і Ви можете сертифікувати окремі ID користувача. Наразі не можна вибирати ступінь довіри, створювати локальні або спеціальні типи сертифікатів.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
deleted file mode 100644
index f789438a7..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>使用NFC接收和分享金鑰</h2>
-<ol>
-<li>找到並打開你要分享的金鑰。</li>
-<li>將裝置背對背輕靠，直到感覺到震動。</li>
-<li>震動後會發現畫面變成卡片狀，並且背景帶有Star Trek的特效。</li>
-<li>輕觸畫面，內容將顯示在對方的畫面上。</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
deleted file mode 100644
index 0db0d354f..000000000
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>信任網</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>OpenKeychain的支援狀況</h2>
-<p>目前OpenKeychain對信任網只有基本程度的支援。這是一件大工程，有任何進展將隨時發佈。</p>
-
-<h2>信任模式</h2>
-<p>信用評價基於一個前提：所有帶有密鑰的金鑰都是可以信任的。所有可信任金鑰簽署過的公鑰，會在清單裡被標上一個綠圓點。目前並不支援指定其他公鑰的信任等級。</p>
-
-<h2>金鑰認證</h2>
-<p>金鑰認證是支援的，而且每個身份可以個別進行認證。然而，目前並不支援指定簽署的信任等級與建立本機或其他形式的認證。</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
deleted file mode 100644
index 3f08fa6a2..000000000
--- a/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>使用NFC功能接收和分享密钥</h2>
-<ol>
-<li>选择并打开你想要分享的密钥。</li>
-<li>将两部手机背面接触，之后会感受到震动。</li>
-<li>震动后会发现界面变成卡片状，并有Star Trek 般的特效。</li>
-<li>轻触卡片，内容即可显示。</li>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_wot.html b/OpenKeychain/src/main/res/raw-zh/help_wot.html
deleted file mode 100644
index 2a551f79c..000000000
--- a/OpenKeychain/src/main/res/raw-zh/help_wot.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head></head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_certification.html b/OpenKeychain/src/main/res/raw/help_certification.html
new file mode 100644
index 000000000..19ca85b4f
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw/help_certification.html
@@ -0,0 +1,32 @@
+<!-- Maintain structure with headings with h2 tags and content with p tags.
+This makes it easy to translate the values with transifex!
+And don't add newlines before or after p tags because of transifex -->
+<html>
+<head>
+</head>
+<body>
+
+<h2>Key Confirmation</h2>
+Without confirmation, you cannot be sure if a key really corresponds to a specific person.
+The most simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC.
+To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.
+
+<h2>Key Status</h2>
+<p><img src="status_signature_verified_cutout_24px"/><br/>Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.
+<br/><img src="status_signature_unverified_cutout_24px"/><br/>Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.
+<br/><img src="status_signature_expired_cutout_24px"/><br/>Expired: This key is no longer valid. Only the owner can extend its validity.
+<br/><img src="status_signature_revoked_cutout_24px"/><br/>Revoked: This key is no longer valid. It has been revoked by its owner.</p>
+
+<h2>Advanced Information</h2>
+<p>A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
+This certification is a <a href="http://tools.ietf.org/html/rfc4880#section-5.2.1">"generic certification (0x10)"</a> described in the standard by:
+"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."</p>
+
+<p>Traditionally, certifications (often with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
+Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
+We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
+We also do not implement (potentially transitive) trust signatures or any other internal trust model.
+Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html
deleted file mode 100644
index 094065909..000000000
--- a/OpenKeychain/src/main/res/raw/help_faq.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-<h2>How can I specify connection port for Keyserver?</h2>
-<p>Add a new Keyserver (or modify existing one) by going to Preferences -> General -> Keyservers. Enter the port number after the Keyserver address and preceded it by a colon. For example, "p80.pool.sks-keyservers.net:80" (without quotation marks) means that server "p80.pool.sks-keyservers.net" is working on a port 80.</p>
-<p>Default connection port is 11371 and it doesn't need to be specified.</p>
-
-<h2>A wrong primary user id is shown when searching on a Keyserver</h2>
-<p>Unfortunately, this is a bug in the SKS Keyserver software. Its machine-readable output returns the user ids in an arbitrary order. Read the <a href="https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index">related bug report</a> for more information.</p>
-
-<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
-<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
-<ol>
-    <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
-    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
-    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
-</ol>
-<p>Thats it.</p>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_nfc_beam.html b/OpenKeychain/src/main/res/raw/help_nfc_beam.html
deleted file mode 100644
index 30060a897..000000000
--- a/OpenKeychain/src/main/res/raw/help_nfc_beam.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-<h2>How to receive keys</h2>
-<ol>
-<li>Go to your partners keys and open the key 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>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>
-</ol>
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html
index 75fe9de26..0a30cbd92 100644
--- a/OpenKeychain/src/main/res/raw/help_start.html
+++ b/OpenKeychain/src/main/res/raw/help_start.html
@@ -5,10 +5,14 @@ And don't add newlines before or after p tags because of transifex -->
 <head>
 </head>
 <body>
-<h2>Getting started</h2>
-<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
+<h2>How do I activate OpenKeychain in K-9 Mail?</h2>
+<p>To use OpenKeychain with K-9 Mail, you want to follow these steps:</p>
+<ol>
+    <li>Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.</li>
+    <li>Select "Account settings" and scroll to the very bottom and click "Cryptography".</li>
+    <li>Click on "OpenPGP Provider" and select OpenKeychain from the list.</li>
+</ol>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw/help_wot.html b/OpenKeychain/src/main/res/raw/help_wot.html
deleted file mode 100644
index d2ce4a7ae..000000000
--- a/OpenKeychain/src/main/res/raw/help_wot.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Maintain structure with headings with h2 tags and content with p tags.
-This makes it easy to translate the values with transifex!
-And don't add newlines before or after p tags because of transifex -->
-<html>
-<head>
-</head>
-<body>
-<h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
-
-<h2>Support in OpenKeychain</h2>
-<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
-
-<h2>Trust Model</h2>
-<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
-
-<h2>Certifying keys</h2>
-<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
-
-</body>
-</html>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 30c3d5018..f60c0dd5b 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="title_export_keys">"Export Keys"</string>
     <string name="title_key_not_found">"Key Not Found"</string>
     <string name="title_send_key">"Upload to Keyserver"</string>
-    <string name="title_certify_key">"Verify Key"</string>
+    <string name="title_certify_key">"Confirm Key"</string>
     <string name="title_key_details">"Key Details"</string>
     <string name="title_help">"Help"</string>
     <string name="title_log_display">"Log"</string>
@@ -55,7 +55,7 @@
     <string name="section_defaults">"Defaults"</string>
     <string name="section_advanced">"Advanced"</string>
     <string name="section_passphrase_cache">"Passphrase Cache"</string>
-    <string name="section_certify">"Certify"</string>
+    <string name="section_certify">"Confirm"</string>
     <string name="section_actions">"Actions"</string>
     <string name="section_share_key">"Key"</string>
     <string name="section_upload_key">"Synchronize Key"</string>
@@ -113,7 +113,7 @@
     <string name="menu_search_cloud">"Search cloud"</string>
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_advanced">"Show advanced info"</string>
-    <string name="menu_certify_fingerprint">"Verify via fingerprint comparison"</string>
+    <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
 
     <!-- label -->
     <string name="label_message">"Message"</string>
@@ -225,7 +225,7 @@
     <string name="specify_file_to_decrypt_to">"Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists."</string>
     <string name="specify_file_to_export_to">"Please specify which file to export to.\nWARNING: File will be overwritten if it exists."</string>
     <string name="key_deletion_confirmation_multi">"Do you really want to delete all selected keys?"</string>
-    <string name="secret_key_deletion_confirmation">"After deletion you will not be able to read messages encrypted with this key and loose all key verifications related to it!"</string>
+    <string name="secret_key_deletion_confirmation">"After deletion you will not be able to read messages encrypted with this key and lose all key verifications related to it!"</string>
     <string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string>
     <string name="also_export_secret_keys">"Also export secret keys"</string>
     <string name="reinstall_openkeychain">"You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys."</string>
@@ -245,7 +245,7 @@
     <string name="nfc_successful">"Successfully sent key with NFC Beam!"</string>
     <string name="key_copied_to_clipboard">"Key has been copied to the clipboard!"</string>
     <string name="fingerprint_copied_to_clipboard">"Fingerprint has been copied to the clipboard!"</string>
-    <string name="select_key_to_certify">"Please select a key to be used for certification!"</string>
+    <string name="select_key_to_certify">"Please select a key to be used for confirmation!"</string>
     <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string>
     <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string>
 
@@ -384,7 +384,7 @@
     <!-- Help -->
     <string name="help_tab_start">"Start"</string>
     <string name="help_tab_faq">"FAQ"</string>
-    <string name="help_tab_wot">"Web of Trust"</string>
+    <string name="help_tab_wot">"Key Confirmation"</string>
     <string name="help_tab_nfc_beam">"NFC Beam"</string>
     <string name="help_tab_changelog">"Changelog"</string>
     <string name="help_tab_about">"About"</string>
@@ -526,7 +526,7 @@
     <string name="key_view_action_edit">"Edit key"</string>
     <string name="key_view_action_encrypt">"Encrypt text"</string>
     <string name="key_view_action_encrypt_files">"files"</string>
-    <string name="key_view_action_certify">"Verify key"</string>
+    <string name="key_view_action_certify">"Confirm key"</string>
     <string name="key_view_action_update">"Update from keyserver"</string>
     <string name="key_view_action_share_with">"Share with…"</string>
     <string name="key_view_action_share_nfc">"Share over NFC"</string>
@@ -546,16 +546,16 @@
     <string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>
 
     <!-- Key trust -->
-    <string name="key_trust_already_verified">"You have already certified this key!"</string>
+    <string name="key_trust_already_verified">"You have already confirmed this key!"</string>
     <string name="key_trust_it_is_yours">"This is one of your keys!"</string>
-    <string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t certified it, but you may choose to trust it."</string>
+    <string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t confirmed it, but you may choose to trust it."</string>
     <string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
     <string name="key_trust_expired">"This key has expired. You should not trust it."</string>
     <string name="key_trust_old_keys">" It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
     <string name="key_trust_no_cloud_evidence">"No proof from the cloud on this key’s trustworthiness."</string>
     <string name="key_trust_start_cloud_search">"Start search"</string>
     <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
-    <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to verifying them."</string>
+    <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to confirming them."</string>
 
     <!-- keybase proof stuff -->
     <string name="keybase_narrative_twitter">"Posts to Twitter as"</string>
@@ -628,8 +628,8 @@
     <string name="view_key_expired">"Expired: The contact needs to extend the key's validity!"</string>
     <string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
     <string name="view_key_my_key">"My Key"</string>
-    <string name="view_key_verified">"Verified Key"</string>
-    <string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string>
+    <string name="view_key_verified">"Confirmed Key"</string>
+    <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string>
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">"Keys"</string>
@@ -831,7 +831,7 @@
     <string name="msg_kc_uid_no_cert">"No valid self-certificate found for user ID '%s', removing from ring"</string>
     <string name="msg_kc_uid_remove">"Removing invalid user ID '%s'"</string>
     <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The keyring contained two of them. This may result in missing certificates!"</string>
-    <string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string>
+    <string name="msg_kc_uid_warn_encoding">"User ID does not verify as UTF-8!"</string>
     <string name="msg_kc_uat_jpeg">"Processing user attribute of type JPEG"</string>
     <string name="msg_kc_uat_unknown">"Processing user attribute of unknown type"</string>
     <string name="msg_kc_uat_bad_err">"Removing bad self certificate for user attribute"</string>
@@ -846,7 +846,7 @@
     <string name="msg_kc_uat_revoke_old">"Removing outdated revocation certificate for user attribute"</string>
     <string name="msg_kc_uat_no_cert">"No valid self-certificate found for user attribute, removing from ring"</string>
     <string name="msg_kc_uat_remove">"Removing invalid user attribute"</string>
-    <string name="msg_kc_uat_warn_encoding">"User id does not verify as UTF-8!"</string>
+    <string name="msg_kc_uat_warn_encoding">"User ID does not verify as UTF-8!"</string>
 
     <!-- Keyring merging log entries -->
     <string name="msg_mg_error_secret_dummy">"New public subkey found, but secret subkey dummy generation is not supported!"</string>
@@ -1176,11 +1176,10 @@
     <string name="empty_certs">"No certificates for this key"</string>
     <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string>
     <string name="section_uids_to_certify">"Identities for "</string>
-    <string name="certify_text">"The keys you are importing contain “identities”: names and emails. Select exactly those for certification which match what you expected."</string>
+    <string name="certify_text">"The keys you are importing contain “identities”: names and emails. Select exactly those for confirmation which match what you expected."</string>
     <string name="certify_fingerprint_text">"Compare the displayed fingerprint, character by character, with the one displayed on your partners device."</string>
     <string name="certify_fingerprint_text2">"Do the displayed fingerprints match?"</string>
     <string name="label_revocation">"Revocation Reason"</string>
-    <string name="label_verify_status">"Verification Status"</string>
     <string name="label_cert_type">"Type"</string>
     <string name="error_key_not_found">"Key not found!"</string>
     <string name="error_key_processing">"Error processing key!"</string>