From d46fc3740bbfc3bac0b1133a3e9d47c7ce3e06e2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 18 Mar 2015 21:12:31 +0100
Subject: yubikey certifications!

---
 OpenKeychain/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f1c14bd32..2eb167c8c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1099,9 +1099,9 @@
     <string name="msg_crt_error_master_not_found">"Master key not found!"</string>
     <string name="msg_crt_error_nothing">"No keys certified!"</string>
     <string name="msg_crt_error_unlock">"Error unlocking master key!"</string>
-    <string name="msg_crt_error_divert">"Certification with NFC is not (yet) supported!"</string>
     <string name="msg_crt">"Certifying keyrings"</string>
     <string name="msg_crt_master_fetch">"Fetching certifying master key"</string>
+    <string name="msg_crt_nfc_return">"Returning for NFC input"</string>
     <string name="msg_crt_save">"Saving certified key %s"</string>
     <string name="msg_crt_saving">"Saving keyrings"</string>
     <string name="msg_crt_unlock">"Unlocking master key"</string>
-- 
cgit v1.2.3


From 3b04636f5daf3d171449296a5d9a67440abfbf75 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 02:27:05 +0100
Subject: support yubikeys in (some) edit key operations

---
 OpenKeychain/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2eb167c8c..e8bcbcc31 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -897,6 +897,7 @@
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">"Modifying keyring %s"</string>
+    <string name="msg_mf_divert">"Will divert to card/nfc for crypto operations"</string>
     <string name="msg_mf_error_divert_serial">"The serial number of a divert-to-card key must be 16 bytes! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_encode">"Encoding exception!"</string>
     <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string>
@@ -911,6 +912,7 @@
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
+    <string name="msg_mf_input_required">"Diverting to card/nfc for crypto operations"</string>
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -987,7 +989,6 @@
     <string name="msg_pr_success">"Key successfully promoted"</string>
 
     <!-- Other messages used in OperationLogs -->
-    <string name="msg_ek_error_divert">"Editing of NFC keys is not (yet) supported!"</string>
     <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string>
     <string name="msg_ek_error_not_found">"Key not found!"</string>
 
-- 
cgit v1.2.3


From 3e51da3afa542c62b82bbcf9a953cdcd379950a2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 18:45:00 +0100
Subject: fix unit tests (for real)

---
 OpenKeychain/src/main/res/values/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a7e9cdf7e..76514575c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -913,7 +913,7 @@
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
-    <string name="msg_mf_input_required">"Diverting to card/nfc for crypto operations"</string>
+    <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -923,8 +923,10 @@
     <string name="msg_mf_passphrase_fail">"Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
     <string name="msg_mf_primary_replace_old">"Replacing certificate of previous primary user ID"</string>
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
+    <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
-    <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
+    <string name="msg_mf_require_divert">"Diverting to card/nfc for crypto operations"</string>
+    <string name="msg_mf_require_passphrase">"Passphrase required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
-- 
cgit v1.2.3


From 88ca41d55586e5084cc3f177eb12617aa640ae1d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 20 Mar 2015 18:55:16 +0100
Subject: add edit key unit test for no-op

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 76514575c..6c8ccd340 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -910,6 +910,7 @@
     <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string>
     <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string>
+    <string name="msg_mf_error_noop">"Nothing to do!"</string>
     <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
-- 
cgit v1.2.3


From 147003123fffc84b1d658f78d0a888479ce4ff35 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 21 Mar 2015 17:13:31 +0100
Subject: first steps toward yubikey activity

- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
---
 .../main/res/layout/create_key_start_fragment.xml  | 34 ++++-----
 .../main/res/layout/create_yubikey_fragment.xml    | 83 ++++++++++++++++++++++
 2 files changed, 100 insertions(+), 17 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
index 79ffe58b1..2db147475 100644
--- a/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
@@ -50,22 +50,22 @@
             android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
 
-        <!--<TextView-->
-            <!--android:id="@+id/create_key_yubikey_button"-->
-            <!--android:paddingLeft="16dp"-->
-            <!--android:paddingRight="16dp"-->
-            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_weight="1"-->
-            <!--android:text="@string/first_time_yubikey"-->
-            <!--android:textAllCaps="true"-->
-            <!--android:minHeight="?android:attr/listPreferredItemHeight"-->
-            <!--android:drawableRight="@drawable/ic_chevron_right_grey_24dp"-->
-            <!--android:drawablePadding="8dp"-->
-            <!--android:gravity="right|center_vertical"-->
-            <!--android:clickable="true"-->
-            <!--style="?android:attr/borderlessButtonStyle" />-->
+        <TextView
+            android:id="@+id/create_key_yubikey_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/first_time_yubikey"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
 
         <TextView
             android:id="@+id/create_key_import_button"
@@ -101,4 +101,4 @@
             android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
new file mode 100644
index 000000000..d8c95c658
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/create_key_buttons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="Hold Yubikey against device dawg" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="(yubikey fingerprint)" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:background="@color/holo_gray_bright"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/create_key_back_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="left|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_next"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 1ad3635d139ea5033b06e5cdd87a7b2eab5f2e75 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 21 Mar 2015 19:52:10 +0100
Subject: work on ad-hoc yubikey import support

---
 .../main/res/layout/create_yubikey_fragment.xml    | 101 +++++++++++++++++----
 1 file changed, 85 insertions(+), 16 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
index d8c95c658..ec2505706 100644
--- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
@@ -9,30 +9,97 @@
         android:fillViewport="true"
         android:layout_above="@+id/create_key_buttons">
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <ViewAnimator
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:inAnimation="@anim/abc_fade_in"
+            android:outAnimation="@anim/abc_fade_out"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
-            android:orientation="vertical">
+            android:id="@+id/create_yubikey_animator"
+            >
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Hold Yubikey against device dawg" />
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="Hold Yubikey against device dawg"
+                    />
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/yubikey_phone" />
+
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="(yubikey fingerprint)" />
+                android:orientation="vertical">
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:id="@+id/create_yubikey_unknown_fp"
+                    android:text="(yubikey fingerprint)" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="Hit next to import this key"
+                    />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:id="@+id/create_yubikey_fingerprint"
+                    android:text="(yubikey fingerprint)" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:id="@+id/create_yubikey_user_id"
+                    android:text="(yubikey fingerprint)" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="Hit next to add this Yubikey to your own!"
+                    />
+
+            </LinearLayout>
+
+        </ViewAnimator>
 
     </ScrollView>
 
@@ -79,5 +146,7 @@
             android:gravity="right|center_vertical"
             android:clickable="true"
             style="?android:attr/borderlessButtonStyle" />
+
     </LinearLayout>
+
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 04c7639a5a9b4f85122b7d5f299ba09131ce3036 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 21 Mar 2015 22:18:58 +0100
Subject: split up wait/action yubikey fragments

---
 .../src/main/res/drawable-hdpi/yubi_icon.png       | Bin 0 -> 2517 bytes
 .../src/main/res/drawable-hdpi/yubi_icon_24dp.png  | Bin 0 -> 1203 bytes
 .../src/main/res/drawable-mdpi/yubi_icon.png       | Bin 0 -> 1715 bytes
 .../src/main/res/drawable-mdpi/yubi_icon_24dp.png  | Bin 0 -> 753 bytes
 .../src/main/res/drawable-xhdpi/yubi_icon.png      | Bin 0 -> 4078 bytes
 .../src/main/res/drawable-xhdpi/yubi_icon_24dp.png | Bin 0 -> 1715 bytes
 .../src/main/res/drawable-xxhdpi/yubi_icon.png     | Bin 0 -> 5808 bytes
 .../main/res/drawable-xxhdpi/yubi_icon_24dp.png    | Bin 0 -> 2854 bytes
 .../main/res/drawable-xxxhdpi/yubi_icon_24dp.png   | Bin 0 -> 4078 bytes
 .../main/res/layout/create_yubikey_fragment.xml    |  24 ++----
 .../res/layout/create_yubikey_wait_fragment.xml    |  83 +++++++++++++++++++++
 11 files changed, 88 insertions(+), 19 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/yubi_icon.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/yubi_icon_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/yubi_icon.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/yubi_icon_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/yubi_icon_24dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon.png b/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon.png
new file mode 100644
index 000000000..428ad6fad
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon_24dp.png
new file mode 100644
index 000000000..6fb41223d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/yubi_icon_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon.png b/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon.png
new file mode 100644
index 000000000..05c21c052
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon_24dp.png
new file mode 100644
index 000000000..753f22607
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/yubi_icon_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon.png
new file mode 100644
index 000000000..cfa799e74
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon_24dp.png
new file mode 100644
index 000000000..05c21c052
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/yubi_icon_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon.png
new file mode 100644
index 000000000..f20f562ec
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon_24dp.png
new file mode 100644
index 000000000..9bae15a02
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/yubi_icon_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/yubi_icon_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/yubi_icon_24dp.png
new file mode 100644
index 000000000..cfa799e74
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/yubi_icon_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
index ec2505706..2fb3737ba 100644
--- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
@@ -19,26 +19,12 @@
             android:id="@+id/create_yubikey_animator"
             >
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <ProgressBar
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="Hold Yubikey against device dawg"
-                    />
-
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/yubikey_phone" />
-
-            </LinearLayout>
+                android:layout_gravity="center"
+                android:indeterminate="true"
+                />
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml
new file mode 100644
index 000000000..c7f9821eb
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:layout_above="@+id/create_key_buttons">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="Hold Yubikey against device dawg"
+                />
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:src="@drawable/yubikey_phone" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:background="@color/holo_gray_bright"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/create_key_back_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="left|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_next"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/yubi_icon_24dp"
+            android:drawablePadding="16dp"
+            android:gravity="right|center_vertical"
+            android:clickable="false"
+            style="?android:attr/borderlessButtonStyle" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From a7c52a1c9f8bca83b2981347a0eceeec68a92790 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 02:36:10 +0100
Subject: move yubikey import into viewkeyfragment

---
 .../main/res/layout/create_yubikey_fragment.xml    | 87 ++++---------------
 .../src/main/res/layout/view_key_yubikey.xml       | 98 ++++++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |  2 +
 3 files changed, 117 insertions(+), 70 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_yubikey.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
index 2fb3737ba..0f5e50d42 100644
--- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
@@ -9,83 +9,30 @@
         android:fillViewport="true"
         android:layout_above="@+id/create_key_buttons">
 
-        <ViewAnimator
-            android:layout_width="fill_parent"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inAnimation="@anim/abc_fade_in"
-            android:outAnimation="@anim/abc_fade_out"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:id="@+id/create_yubikey_animator"
-            >
+            android:orientation="vertical">
 
-            <ProgressBar
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/create_yubikey_unknown_fp"
-                    android:text="(yubikey fingerprint)" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="Hit next to import this key"
-                    />
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:id="@+id/create_yubikey_unknown_fp"
+                android:text="(yubikey fingerprint)" />
 
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/create_yubikey_fingerprint"
-                    android:text="(yubikey fingerprint)" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/create_yubikey_user_id"
-                    android:text="(yubikey fingerprint)" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="Hit next to add this Yubikey to your own!"
-                    />
-
-            </LinearLayout>
+                android:layout_marginTop="16dp"
+                android:layout_marginLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="Hit next to import this key"
+                />
 
-        </ViewAnimator>
+        </LinearLayout>
 
     </ScrollView>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
new file mode 100644
index 000000000..7da1fc5c4
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
@@ -0,0 +1,98 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/card_view"
+            android:layout_gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:transitionName="card"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2dp"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/CardViewHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/section_yubikey"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_margin="14dp"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/yubi_icon"/>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:id="@+id/yubikey_serno"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="Yubikey #"
+                            />
+
+                        <TextView
+                            android:id="@+id/yubikey_userid"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="User ID"
+                            />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:text="Key matches!"
+                            />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/button_import"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right|end"
+                    android:text="Import"
+                    android:textColor="@color/link_text_material_light"
+                    style="?android:attr/borderlessButtonStyle"
+                    />
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6c8ccd340..bcee267fd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -48,6 +48,7 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
+    <string name="section_yubikey">"Yubikey"</string>
     <string name="section_linked_system_contact">"Linked System Contact"</string>
     <string name="section_should_you_trust">"Should you trust this key?"</string>
     <string name="section_proof_details">Proof verification</string>
@@ -1267,5 +1268,6 @@
     <string name="nfc_write_succesful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
+    <string name="snack_yubikey_view">View</string>
 
 </resources>
-- 
cgit v1.2.3


From 22063cdd6eca32e83e7937a849e70185a1faee2a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 03:34:34 +0100
Subject: improve status reporting in yubikey dialogue

---
 OpenKeychain/src/main/res/layout/view_key_yubikey.xml | 11 ++++++++---
 OpenKeychain/src/main/res/values/strings.xml          |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
index 7da1fc5c4..83272ef4e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_yubikey.xml
@@ -21,7 +21,8 @@
             card_view:cardBackgroundColor="@android:color/white"
             card_view:cardElevation="2dp"
             card_view:cardUseCompatPadding="true"
-            card_view:cardCornerRadius="4dp">
+            card_view:cardCornerRadius="4dp"
+            android:animateLayoutChanges="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -37,6 +38,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     android:orientation="horizontal">
 
                     <ImageView
@@ -69,6 +72,7 @@
                             />
 
                         <TextView
+                            android:id="@+id/yubikey_status"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
@@ -80,13 +84,14 @@
                 </LinearLayout>
 
                 <Button
-                    android:id="@+id/button_import"
+                    android:id="@+id/button_bind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right|end"
-                    android:text="Import"
+                    android:text="@string/button_bind_key"
                     android:textColor="@color/link_text_material_light"
                     style="?android:attr/borderlessButtonStyle"
+                    android:visibility="gone"
                     />
 
             </LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index bcee267fd..f7a9a671e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1269,5 +1269,9 @@
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
     <string name="snack_yubikey_view">View</string>
+    <string name="button_bind_key">Bind Key</string>
+    <string name="yubikey_serno">"Serial No: %s"</string>
+    <string name="yubikey_key_holder">"Key holder: "</string>
+    <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
 
 </resources>
-- 
cgit v1.2.3


From 2151411219b4e5d609d25fcbb574ccf399f54d6f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 03:56:58 +0100
Subject: actually promote to divert, pass yubikey's AID

---
 OpenKeychain/src/main/res/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f7a9a671e..6dfdb8997 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -988,7 +988,6 @@
 
     <!-- Promote key -->
     <string name="msg_pr">"Promoting public key to secret key"</string>
-    <string name="msg_pr_error_already_secret">"Key is already a secret key!"</string>
     <string name="msg_pr_error_key_not_found">"Key not found!"</string>
     <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string>
     <string name="msg_pr_success">"Key successfully promoted"</string>
@@ -1273,5 +1272,8 @@
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
+    <string name="yubikey_status_bound">Yubikey matches, bound to key</string>
+    <string name="yubikey_status_unbound">Yubikey matches, can be bound to key</string>
+    <string name="yubikey_status_partly">Yubikey matches, partly bound to key</string>
 
 </resources>
-- 
cgit v1.2.3


From 212bba18693ebfce2dfa62afde8b11e8f0c2da0d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 06:36:27 +0100
Subject: finish ui flow for yubikey import

---
 .../main/res/layout/create_yubikey_fragment.xml    |  85 --------------
 .../res/layout/create_yubikey_import_fragment.xml  | 126 +++++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |  14 ++-
 3 files changed, 134 insertions(+), 91 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
deleted file mode 100644
index 0f5e50d42..000000000
--- a/OpenKeychain/src/main/res/layout/create_yubikey_fragment.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:layout_above="@+id/create_key_buttons">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/create_yubikey_unknown_fp"
-                android:text="(yubikey fingerprint)" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Hit next to import this key"
-                />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:background="@color/holo_gray_bright"
-        android:id="@+id/create_key_buttons">
-
-        <TextView
-            android:id="@+id/create_key_back_button"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_back"
-            android:textAllCaps="true"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="left|center_vertical"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle" />
-
-        <TextView
-            android:id="@+id/create_key_next_button"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/btn_next"
-            android:textAllCaps="true"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="right|center_vertical"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml
new file mode 100644
index 000000000..e70188e49
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/create_yubikey_import_fragment.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:orientation="horizontal"
+        android:id="@+id/yubikey_status_layout" >
+
+        <ImageView
+            android:layout_margin="14dp"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/yubi_icon"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/yubikey_serno"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="Yubikey #"
+                />
+
+            <TextView
+                android:id="@+id/yubikey_userid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="User ID"
+                />
+
+            <TextView
+                android:id="@+id/yubikey_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="Unknown key, hit next to import"
+                />
+
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/button_search"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:src="@drawable/ic_search_grey_24dp"
+            android:layout_gravity="center_vertical"
+            android:background="?android:selectableItemBackground" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_marginTop="4dp"
+        android:layout_height="1dip"
+        android:layout_below="@id/yubikey_status_layout"
+        android:background="?android:attr/listDivider" />
+
+    <FrameLayout
+        android:id="@+id/yubikey_import_fragment"
+        android:layout_marginTop="8dp"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/yubikey_status_layout"
+        android:layout_above="@id/create_key_buttons"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:background="@color/holo_gray_bright"
+        android:id="@+id/create_key_buttons">
+
+        <TextView
+            android:id="@+id/create_key_back_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_back"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="left|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <TextView
+            android:id="@+id/create_key_next_button"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_import"
+            android:textAllCaps="true"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="right|center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6dfdb8997..27eda28a0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1124,7 +1124,7 @@
     <string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
     <string name="msg_import_fetch_error">"Key could not be retrieved! (Network problems?)"</string>
     <string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
-    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keybase!"</string>
+    <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keyservers: %s"</string>
     <string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
     <string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
     <string name="msg_import_keyserver">"Using keyserver %s"</string>
@@ -1267,13 +1267,15 @@
     <string name="nfc_write_succesful">Successfully written on NFC tag</string>
     <string name="unlocked">Unlocked</string>
     <string name="nfc_settings">Settings</string>
-    <string name="snack_yubikey_view">View</string>
-    <string name="button_bind_key">Bind Key</string>
+    <string name="snack_yubikey_view">"View"</string>
+    <string name="snack_yubikey_import">"Import"</string>
+    <string name="button_bind_key">"Bind Key"</string>
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
-    <string name="yubikey_status_bound">Yubikey matches, bound to key</string>
-    <string name="yubikey_status_unbound">Yubikey matches, can be bound to key</string>
-    <string name="yubikey_status_partly">Yubikey matches, partly bound to key</string>
+    <string name="yubikey_status_bound">"Yubikey matches, bound to key"</string>
+    <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string>
+    <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
+    <string name="btn_import">"Import"</string>
 
 </resources>
-- 
cgit v1.2.3


From 2e838e4cce32a5926466b6069a58c6a3579c12bf Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 22 Mar 2015 06:48:33 +0100
Subject: enable nfc in import dialog as well

---
 OpenKeychain/src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 27eda28a0..6aefbc7f5 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1273,9 +1273,10 @@
     <string name="yubikey_serno">"Serial No: %s"</string>
     <string name="yubikey_key_holder">"Key holder: "</string>
     <string name="yubikey_key_holder_unset">"Key holder: &lt;unset&gt;"</string>
-    <string name="yubikey_status_bound">"Yubikey matches, bound to key"</string>
+    <string name="yubikey_status_bound">"Yubikey matches and is bound to key"</string>
     <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string>
     <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
     <string name="btn_import">"Import"</string>
+    <string name="snack_yubi_other">Different key stored on Yubikey!</string>
 
 </resources>
-- 
cgit v1.2.3


From 3bb194fc080e5945dc8bdbeea9b91cf801406c32 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 23 Mar 2015 01:09:39 +0100
Subject: nicer handling of nfc errors

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6aefbc7f5..402dcdf7c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1278,5 +1278,6 @@
     <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string>
     <string name="btn_import">"Import"</string>
     <string name="snack_yubi_other">Different key stored on Yubikey!</string>
+    <string name="error_nfc">"NFC Error: %s"</string>
 
 </resources>
-- 
cgit v1.2.3


From c694d73cab1edf91cb94d53cc8352ca93f0eb6ce Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 23 Mar 2015 01:44:14 +0100
Subject: further improve yubikey error handling

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 402dcdf7c..c8e5ea7ca 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1279,5 +1279,6 @@
     <string name="btn_import">"Import"</string>
     <string name="snack_yubi_other">Different key stored on Yubikey!</string>
     <string name="error_nfc">"NFC Error: %s"</string>
+    <string name="error_pin_nodefault">Default PIN was rejected!</string>
 
 </resources>
-- 
cgit v1.2.3


From 76db0b3b8e8c474a50e17b165657c1a24f8e6be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 26 Mar 2015 11:04:20 +0100
Subject: Start refactoring encrypt ui, EncryptFileActivity no longer crashing

---
 OpenKeychain/src/main/res/layout/encrypt_files_activity.xml | 10 ++++------
 OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml |  6 +++---
 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml  |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index ce8b1302c..435ea96df 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -23,14 +23,12 @@
         <include layout="@layout/notify_area" />
 
         <FrameLayout
-            android:id="@+id/encrypt_pager_mode"
+            android:id="@+id/encrypt_mode_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
+            android:layout_height="wrap_content" />
 
-        <fragment
-            android:id="@+id/encrypt_file_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
+        <FrameLayout
+            android:id="@+id/encrypt_file_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index 029e735b3..5831d52e1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <ListView
@@ -12,6 +10,8 @@
         android:divider="@android:color/transparent"
         android:focusable="true"
         android:focusableInTouchMode="true"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 809e64f02..dcf5bd041 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -23,7 +23,7 @@
         <include layout="@layout/notify_area" />
 
         <FrameLayout
-            android:id="@+id/encrypt_pager_mode"
+            android:id="@+id/encrypt_mode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" />
-- 
cgit v1.2.3


From 13f4cc4ad32eb412e2ecdb649dcdd0788d30d5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Mar 2015 00:40:37 +0100
Subject: Refactoring of EncryptTextActivity

---
 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index dcf5bd041..a5082010e 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -23,14 +23,13 @@
         <include layout="@layout/notify_area" />
 
         <FrameLayout
-            android:id="@+id/encrypt_mode"
+            android:id="@+id/encrypt_mode_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
-        <fragment
-            android:id="@+id/encrypt_text_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
+        <FrameLayout
+            android:id="@+id/encrypt_text_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-- 
cgit v1.2.3


From 95f1527afe81c59a116cadc2ed37c065da1819ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 29 Mar 2015 20:37:54 +0200
Subject: Fixing crashes with new encrypt ui

---
 .../src/main/res/layout/encrypt_text_activity.xml  |  3 +-
 .../src/main/res/menu/encrypt_file_activity.xml    | 50 ----------------------
 .../src/main/res/menu/encrypt_file_fragment.xml    | 50 ++++++++++++++++++++++
 .../src/main/res/menu/encrypt_text_activity.xml    | 34 ---------------
 .../src/main/res/menu/encrypt_text_fragment.xml    | 34 +++++++++++++++
 5 files changed, 85 insertions(+), 86 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
 create mode 100644 OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index a5082010e..64ce50b74 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -25,8 +25,7 @@
         <FrameLayout
             android:id="@+id/encrypt_mode_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
+            android:layout_height="wrap_content" />
 
         <FrameLayout
             android:id="@+id/encrypt_text_container"
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
deleted file mode 100644
index d6ed726fa..000000000
--- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/encrypt_save"
-        android:title="@string/btn_encrypt_save_file"
-        android:icon="@drawable/ic_action_encrypt_save_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/encrypt_share"
-        android:title="@string/btn_encrypt_share_file"
-        android:icon="@drawable/ic_action_encrypt_share_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/check_use_symmetric"
-        android:title="@string/label_symmetric"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_delete_after_encrypt"
-        android:title="@string/label_delete_after_encryption"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_enable_compression"
-        android:title="@string/label_enable_compression"
-        android:checked="true"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_encrypt_filenames"
-        android:title="@string/label_encrypt_filenames"
-        android:checked="true"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_use_armor"
-        android:title="@string/label_file_ascii_armor"
-        android:checkable="true" />
-
-    <!--<item-->
-        <!--android:id="@+id/check_hidden_recipients"-->
-        <!--android:title="@string/label_hidden_recipients"-->
-        <!--android:checked="false"-->
-        <!--android:checkable="true" />-->
-
-</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
new file mode 100644
index 000000000..d6ed726fa
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_file_fragment.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/encrypt_save"
+        android:title="@string/btn_encrypt_save_file"
+        android:icon="@drawable/ic_action_encrypt_save_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/encrypt_share"
+        android:title="@string/btn_encrypt_share_file"
+        android:icon="@drawable/ic_action_encrypt_share_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/check_use_symmetric"
+        android:title="@string/label_symmetric"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_delete_after_encrypt"
+        android:title="@string/label_delete_after_encryption"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_enable_compression"
+        android:title="@string/label_enable_compression"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_encrypt_filenames"
+        android:title="@string/label_encrypt_filenames"
+        android:checked="true"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_use_armor"
+        android:title="@string/label_file_ascii_armor"
+        android:checkable="true" />
+
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
+
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
deleted file mode 100644
index 5a262fdd8..000000000
--- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/encrypt_copy"
-        android:title="@string/btn_copy_encrypted_signed"
-        android:icon="@drawable/ic_action_encrypt_copy_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/encrypt_share"
-        android:title="@string/btn_share_encrypted_signed"
-        android:icon="@drawable/ic_action_encrypt_share_24dp"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/check_use_symmetric"
-        android:title="@string/label_symmetric"
-        android:checkable="true" />
-
-    <item
-        android:id="@+id/check_enable_compression"
-        android:title="@string/label_enable_compression"
-        android:checked="true"
-        android:checkable="true" />
-
-    <!--<item-->
-        <!--android:id="@+id/check_hidden_recipients"-->
-        <!--android:title="@string/label_hidden_recipients"-->
-        <!--android:checked="false"-->
-        <!--android:checkable="true" />-->
-
-</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
new file mode 100644
index 000000000..5a262fdd8
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/encrypt_copy"
+        android:title="@string/btn_copy_encrypted_signed"
+        android:icon="@drawable/ic_action_encrypt_copy_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/encrypt_share"
+        android:title="@string/btn_share_encrypted_signed"
+        android:icon="@drawable/ic_action_encrypt_share_24dp"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/check_use_symmetric"
+        android:title="@string/label_symmetric"
+        android:checkable="true" />
+
+    <item
+        android:id="@+id/check_enable_compression"
+        android:title="@string/label_enable_compression"
+        android:checked="true"
+        android:checkable="true" />
+
+    <!--<item-->
+        <!--android:id="@+id/check_hidden_recipients"-->
+        <!--android:title="@string/label_hidden_recipients"-->
+        <!--android:checked="false"-->
+        <!--android:checkable="true" />-->
+
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 726ff0b501644e0cef6d5d4a086e73c258b2361c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 29 Mar 2015 21:00:36 +0200
Subject: Fix strings with email address

---
 OpenKeychain/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 274504315..78940aa9e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="error_external_storage_not_ready">"external storage not ready"</string>
     <string name="error_key_size_minimum512bit">"key size must be at least 512bit"</string>
     <string name="error_unknown_algorithm_choice">"unknown algorithm choice"</string>
-    <string name="error_user_id_no_email">"no email found"</string>
+    <string name="error_user_id_no_email">"no email address found"</string>
     <string name="error_key_needs_a_user_id">"need at least one identity"</string>
     <string name="error_no_signature_passphrase">"no passphrase given"</string>
     <string name="error_no_signature_key">"no signature key given"</string>
@@ -630,7 +630,7 @@
     <string name="create_key_edit">"Change key configuration"</string>
     <string name="create_key_add_email">"Add email address"</string>
     <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string>
-    <string name="create_key_email_already_exists_text">"Email has already been added"</string>
+    <string name="create_key_email_already_exists_text">"Email address has already been added"</string>
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-- 
cgit v1.2.3


From a3276a448528cee3ed392bf01e36835bbe8246ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 30 Mar 2015 20:41:29 +0200
Subject: Use RecyclerView in EncryptFilesFragment

---
 .../src/main/res/layout/encrypt_files_fragment.xml |  7 +-
 .../src/main/res/layout/file_list_entry.xml        | 90 +++++++++++-----------
 .../src/main/res/layout/file_list_entry_add.xml    | 25 +++---
 3 files changed, 59 insertions(+), 63 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index 5831d52e1..cb9391b6d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -4,15 +4,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ListView
+    <android.support.v7.widget.RecyclerView
         android:id="@+id/selected_files_list"
-        android:dividerHeight="4dip"
-        android:divider="@android:color/transparent"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:layout_marginTop="8dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index ca78ad161..7f0e1e89e 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -1,60 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="48dip"
-        android:background="@drawable/attachment_bg_holo">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dip"
+    android:background="@drawable/attachment_bg_holo">
 
     <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:scaleType="center"
-            android:layout_width="48dip"
-            android:layout_height="48dip"/>
+        android:id="@+id/thumbnail"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:scaleType="center"
+        android:layout_width="48dip"
+        android:layout_height="48dip" />
 
     <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/thumbnail"
-            android:layout_centerVertical="true">
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/thumbnail"
+        android:layout_centerVertical="true">
 
         <TextView
-                android:id="@+id/filename"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="32dip"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:ellipsize="end"/>
+            android:id="@+id/filename"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="32dip"
+            android:maxLines="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end" />
 
         <TextView
-                android:id="@+id/filesize"
-                android:layout_marginLeft="8dip"
-                android:layout_marginRight="32dip"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="?android:attr/textColorTertiary"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="12sp"
-                android:ellipsize="end"/>
+            android:id="@+id/filesize"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="32dip"
+            android:maxLines="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="12sp"
+            android:ellipsize="end" />
 
     </LinearLayout>
 
     <ImageButton
-            android:id="@+id/action_remove_file_from_list"
-            android:layout_width="48dip"
-            android:layout_height="48dip"
-            android:layout_alignParentRight="true"
-            android:paddingRight="16dip"
-            android:paddingLeft="16dip"
-            android:src="@drawable/ic_close_grey_24dp"
-            android:clickable="true"
-            android:layout_centerVertical="true"
-        android:background="?android:selectableItemBackground"/>
+        android:id="@+id/action_remove_file_from_list"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_alignParentRight="true"
+        android:paddingRight="16dip"
+        android:paddingLeft="16dip"
+        android:src="@drawable/ic_close_grey_24dp"
+        android:clickable="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index d7f4513d9..e5eb4c44f 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:padding="4dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    style="?android:attr/borderlessButtonStyle">
+    android:minHeight="16dp"
+    android:orientation="horizontal"
+    android:singleLine="true">
 
-    <TextView
+    <Button
+        android:id="@+id/file_list_entry_add"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
         android:layout_gravity="center"
         android:text="@string/btn_add_files"
+        style="?android:attr/borderlessButtonStyle"
         android:drawableLeft="@drawable/ic_folder_grey_24dp"
-        android:drawablePadding="8dp"
-        android:gravity="center" />
-</FrameLayout>
\ No newline at end of file
+        android:drawablePadding="16dp"
+        android:gravity="left|center_vertical" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 5052d44b7bf67dc9f5f9a6c98ce555bbb9a41edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 30 Mar 2015 20:48:18 +0200
Subject: Fix scrollbar

---
 OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index cb9391b6d..b75ec5022 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -8,6 +8,7 @@
         android:id="@+id/selected_files_list"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
+        android:scrollbars="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-- 
cgit v1.2.3


From 39b131c7e58c358adf93bb64fe297884664a4ae1 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 30 Mar 2015 23:35:32 +0200
Subject: fix Encrypt* with RequiredInputParcel

---
 OpenKeychain/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 78940aa9e..6d29ce3fd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1048,7 +1048,6 @@
     <string name="msg_se_error_input_uri_not_found">"Error opening URI for reading!"</string>
     <string name="msg_se_error_output_uri_not_found">"Error opening URI for writing!"</string>
     <string name="msg_se_error_too_many_inputs">"More inputs than outputs specified! This is probably a programming error, please report!"</string>
-    <string name="msg_se_warn_output_left">"Got outputs left but no inputs. This is probably a programming error, please report!"</string>
     <string name="msg_se_success">"Sign/encrypt operation successful"</string>
 
     <!-- Messages for PgpSignEncrypt operation -->
-- 
cgit v1.2.3


From aea52f2e6f5463b0a957a36a14604d56b342069c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 00:24:08 +0200
Subject: Simplify passphrase dialog design

---
 OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 1 -
 OpenKeychain/src/main/res/values/strings.xml           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index d2e85633f..a2e6af27c 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -26,7 +26,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
             android:imeOptions="actionDone"
             android:hint="@string/label_passphrase"
             android:ems="10"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6d29ce3fd..8d148c8fe 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="title_encrypt_text">"Encrypt"</string>
     <string name="title_encrypt_files">"Encrypt"</string>
     <string name="title_decrypt">"Decrypt"</string>
-    <string name="title_unlock">"Unlock Key"</string>
     <string name="title_add_subkey">"Add subkey"</string>
     <string name="title_edit_key">"Edit Key"</string>
     <string name="title_preferences">"Settings"</string>
@@ -86,6 +85,7 @@
     <string name="btn_encrypt_files">"Encrypt files"</string>
     <string name="btn_encrypt_text">"Encrypt text"</string>
     <string name="btn_add_email">"Add additional email address"</string>
+    <string name="btn_unlock">"Unlock"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
-- 
cgit v1.2.3


From 7c258bdedde0c7906253f82bb352ec9de170bb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 00:32:48 +0200
Subject: From passphrase to password

---
 OpenKeychain/src/main/res/values/strings.xml | 94 ++++++++++++++--------------
 1 file changed, 47 insertions(+), 47 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8d148c8fe..78ab45cf3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="title_preferences">"Settings"</string>
     <string name="title_api_registered_apps">"Apps"</string>
     <string name="title_key_server_preference">"Keyservers"</string>
-    <string name="title_change_passphrase">"Change Passphrase"</string>
+    <string name="title_change_passphrase">"Change Password"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
     <string name="title_share_file">"Share file with…"</string>
@@ -48,7 +48,7 @@
     <string name="section_cloud_evidence">"Proofs from the cloud"</string>
     <string name="section_keys">"Subkeys"</string>
     <string name="section_cloud_search">"Cloud search"</string>
-    <string name="section_passphrase_cache">"Passphrase Cache"</string>
+    <string name="section_passphrase_cache">"Password Cache"</string>
     <string name="section_certify">"Confirm"</string>
     <string name="section_actions">"Actions"</string>
     <string name="section_share_key">"Key"</string>
@@ -109,11 +109,11 @@
     <string name="label_file">"File"</string>
     <string name="label_files">"File(s)"</string>
     <string name="label_file_colon">"File:"</string>
-    <string name="label_no_passphrase">"No Passphrase"</string>
-    <string name="label_passphrase">"Passphrase"</string>
+    <string name="label_no_passphrase">"No Password"</string>
+    <string name="label_passphrase">"Password"</string>
     <string name="label_unlock">"Unlocking…"</string>
-    <string name="label_passphrase_again">"Repeat Passphrase"</string>
-    <string name="label_show_passphrase">"Show Passphrase"</string>
+    <string name="label_passphrase_again">"Repeat Password"</string>
+    <string name="label_show_passphrase">"Show Password"</string>
     <string name="label_algorithm">"Algorithm"</string>
     <string name="label_ascii_armor">"File ASCII Armor"</string>
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
@@ -128,9 +128,9 @@
     <string name="label_delete_after_decryption">"Delete after decryption"</string>
     <string name="label_encryption_algorithm">"Encryption algorithm"</string>
     <string name="label_hash_algorithm">"Hash algorithm"</string>
-    <string name="label_symmetric">"Encrypt with passphrase"</string>
+    <string name="label_symmetric">"Encrypt with password"</string>
     <string name="label_passphrase_cache_ttl">"Cache time"</string>
-    <string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string>
+    <string name="label_passphrase_cache_subs">"Cache passwords by subkey"</string>
     <string name="label_message_compression">"Text compression"</string>
     <string name="label_file_compression">"File compression"</string>
     <string name="label_keyservers">"Keyservers"</string>
@@ -203,12 +203,12 @@
     <string name="flag_authenticate">"Authenticate"</string>
 
     <!-- sentences -->
-    <string name="wrong_passphrase">"Wrong passphrase."</string>
+    <string name="wrong_passphrase">"Wrong password."</string>
     <string name="no_filemanager_installed">"No compatible file manager installed."</string>
-    <string name="passphrases_do_not_match">"The passphrases didn't match."</string>
-    <string name="passphrase_must_not_be_empty">"Please enter a passphrase."</string>
+    <string name="passphrases_do_not_match">"The passwords didn't match."</string>
+    <string name="passphrase_must_not_be_empty">"Please enter a password."</string>
     <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
-    <string name="passphrase_for">"Enter passphrase for '%s'"</string>
+    <string name="passphrase_for">"Enter password for '%s'"</string>
     <string name="pin_for">"Enter PIN for '%s'"</string>
     <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
     <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
@@ -264,11 +264,11 @@
     <string name="error_unknown_algorithm_choice">"unknown algorithm choice"</string>
     <string name="error_user_id_no_email">"no email address found"</string>
     <string name="error_key_needs_a_user_id">"need at least one identity"</string>
-    <string name="error_no_signature_passphrase">"no passphrase given"</string>
+    <string name="error_no_signature_passphrase">"no password given"</string>
     <string name="error_no_signature_key">"no signature key given"</string>
     <string name="error_invalid_data">"No valid encrypted or signed OpenPGP content!"</string>
     <string name="error_integrity_check_failed">"integrity check failed! Data has been modified!"</string>
-    <string name="error_wrong_passphrase">"wrong passphrase"</string>
+    <string name="error_wrong_passphrase">"wrong password"</string>
     <string name="error_could_not_extract_private_key">"could not extract private key"</string>
 
     <!-- errors without preceeding Error: -->
@@ -325,7 +325,7 @@
     <string name="progress_modify_subkeyrevoke">"revoking subkeys…"</string>
     <string name="progress_modify_subkeystrip">"stripping subkeys…"</string>
     <string name="progress_modify_subkeyadd">"adding subkeys…"</string>
-    <string name="progress_modify_passphrase">"changing passphrase…"</string>
+    <string name="progress_modify_passphrase">"changing passwords…"</string>
 
     <plurals name="progress_exporting_key">
         <item quantity="one">"exporting key…"</item>
@@ -592,7 +592,7 @@
     <string name="keybase_verify">"Verify"</string>
 
     <!-- Edit key -->
-    <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
+    <string name="edit_key_action_change_passphrase">"Change Password"</string>
     <string name="edit_key_action_add_identity">"Add Identity"</string>
     <string name="edit_key_action_add_subkey">"Add Subkey"</string>
     <string name="edit_key_edit_user_id_title">"Select an action!"</string>
@@ -618,14 +618,14 @@
     <!-- Create key -->
     <string name="create_key_upload">"Synchronize with the cloud"</string>
     <string name="create_key_empty">"This field is required"</string>
-    <string name="create_key_passphrases_not_equal">"Passphrases do not match"</string>
+    <string name="create_key_passphrases_not_equal">"Passwords do not match"</string>
     <string name="create_key_final_text">"You entered the following identity:"</string>
     <string name="create_key_final_robot_text">"Creating a key may take a while, have a cup of coffee in the meantime…"</string>
     <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string>
     <string name="create_key_custom">"(custom key configuration)"</string>
     <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string>
     <string name="create_key_email_text">"Enter your main email address used for secure communication."</string>
-    <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string>
+    <string name="create_key_passphrase_text">"Choose a strong password. It protects your key when your device gets stolen."</string>
     <string name="create_key_hint_full_name">"Full Name or Nickname"</string>
     <string name="create_key_edit">"Change key configuration"</string>
     <string name="create_key_add_email">"Add email address"</string>
@@ -777,7 +777,7 @@
     <string name="msg_is_pubring_generate">"Generating public keyring from secret keyring"</string>
     <string name="msg_is_subkey_nonexistent">"Subkey %s unavailable in secret key"</string>
     <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string>
-    <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty passphrase"</string>
+    <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty password"</string>
     <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with PIN"</string>
     <string name="msg_is_subkey_stripped">"Marked secret subkey %s as stripped"</string>
     <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert to smartcard/NFC'"</string>
@@ -896,7 +896,7 @@
     <string name="msg_mf_error_master_none">"No master certificate found to operate on! (All revoked?)"</string>
     <string name="msg_mf_error_noexist_primary">"Bad primary user ID specified!"</string>
     <string name="msg_mf_error_noexist_revoke">"Bad user ID for revocation specified!"</string>
-    <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string>
+    <string name="msg_mf_error_restricted">"Tried to execute restricted operation without password! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string>
     <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_noop">"Nothing to do!"</string>
@@ -907,16 +907,16 @@
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
-    <string name="msg_mf_passphrase">"Changing passphrase for keyring"</string>
-    <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new passphrase"</string>
-    <string name="msg_mf_passphrase_empty_retry">"Setting new passphrase failed, trying again with empty old passphrase"</string>
-    <string name="msg_mf_passphrase_fail">"Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
+    <string name="msg_mf_passphrase">"Changing password for keyring"</string>
+    <string name="msg_mf_passphrase_key">"Re-encrypting subkey %s with new password"</string>
+    <string name="msg_mf_passphrase_empty_retry">"Setting new password failed, trying again with empty old password"</string>
+    <string name="msg_mf_passphrase_fail">"Password for subkey could not be changed! (Does it have a different one from the other keys?)"</string>
     <string name="msg_mf_primary_replace_old">"Replacing certificate of previous primary user ID"</string>
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
     <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
     <string name="msg_mf_require_divert">"Diverting to card/nfc for crypto operations"</string>
-    <string name="msg_mf_require_passphrase">"Passphrase required for operations"</string>
+    <string name="msg_mf_require_passphrase">"Password required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
@@ -968,7 +968,7 @@
 
     <!-- Edit Key (higher level than modify) -->
     <string name="msg_ed">"Performing key operation"</string>
-    <string name="msg_ed_caching_new">"Caching new passphrase"</string>
+    <string name="msg_ed_caching_new">"Caching new password"</string>
     <string name="msg_ed_error_no_parcel">"Missing SaveKeyringParcel! (this is a bug, please report)"</string>
     <string name="msg_ed_error_key_not_found">"Key not found!"</string>
     <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string>
@@ -1002,7 +1002,7 @@
     <string name="msg_dc_clear_signature_ok">"Signature check OK"</string>
     <string name="msg_dc_clear_signature">"Saving signature data for later"</string>
     <string name="msg_dc_clear">"Processing cleartext data"</string>
-    <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad passphrase!"</string>
+    <string name="msg_dc_error_bad_passphrase">"Error unlocking key, bad password!"</string>
     <string name="msg_dc_error_extract_key">"Unknown error unlocking key!"</string>
     <string name="msg_dc_error_integrity_check">"Integrity check error!"</string>
     <string name="msg_dc_error_integrity_missing">"Missing integrity check! This can happen because the encrypting application is out of date, or from a downgrade attack."</string>
@@ -1014,9 +1014,9 @@
     <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string>
     <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string>
     <string name="msg_dc_ok">"Decryption/Verification finished"</string>
-    <string name="msg_dc_pass_cached">"Using passphrase from cache"</string>
+    <string name="msg_dc_pass_cached">"Using password from cache"</string>
     <string name="msg_dc_pending_nfc">"NFC token required, requesting user input…"</string>
-    <string name="msg_dc_pending_passphrase">"Passphrase required, requesting user input…"</string>
+    <string name="msg_dc_pending_passphrase">"Password required, requesting user input…"</string>
     <string name="msg_dc_prep_streams">"Preparing streams for decryption"</string>
     <string name="msg_dc">"Starting decrypt operation…"</string>
     <string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string>
@@ -1055,13 +1055,13 @@
     <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string>
     <string name="msg_pse_compressing">"Preparing compression"</string>
     <string name="msg_pse_encrypting">"Encrypting data"</string>
-    <string name="msg_pse_error_bad_passphrase">"Bad passphrase!"</string>
+    <string name="msg_pse_error_bad_passphrase">"Bad password!"</string>
     <string name="msg_pse_error_hash_algo">"Requested hashing algorithm is not supported by this key!"</string>
     <string name="msg_pse_error_io">"Encountered IO Exception during operation!"</string>
     <string name="msg_pse_error_key_sign">"Selected signing key cannot sign data!"</string>
     <string name="msg_pse_error_sign_key">"Error fetching signing key!"</string>
     <string name="msg_pse_error_nfc">"NFC data error!"</string>
-    <string name="msg_pse_error_no_passphrase">"No passphrase provided!"</string>
+    <string name="msg_pse_error_no_passphrase">"No password provided!"</string>
     <string name="msg_pse_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_pse_error_sig">"Encountered OpenPGP signature exception!"</string>
     <string name="msg_pse_error_unlock">"Unknown error unlocking key!"</string>
@@ -1070,7 +1070,7 @@
     <string name="msg_pse_key_warn">"Bad key for encryption: %s"</string>
     <string name="msg_pse_ok">"Sign/Encrypt operation successful!"</string>
     <string name="msg_pse_pending_nfc">"NFC token required, requesting user input…"</string>
-    <string name="msg_pse_pending_passphrase">"Passphrase required, requesting user input…"</string>
+    <string name="msg_pse_pending_passphrase">"Password required, requesting user input…"</string>
     <string name="msg_pse_signing">"Signing data (without encryption)"</string>
     <string name="msg_pse_signing_cleartext">"Creating cleartext signature"</string>
     <string name="msg_pse_signing_detached">"Creating detached signature"</string>
@@ -1181,11 +1181,11 @@
     <string name="msg_export_log_success">"Log exported successfully!"</string>
 
     <!-- PassphraseCache -->
-    <string name="passp_cache_notif_click_to_clear">"Click to clear cached passphrases"</string>
-    <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passphrases"</string>
-    <string name="passp_cache_notif_keys">"Cached Passphrases:"</string>
+    <string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string>
+    <string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string>
+    <string name="passp_cache_notif_keys">"Cached Passwords:"</string>
     <string name="passp_cache_notif_clear">"Clear Cache"</string>
-    <string name="passp_cache_notif_pwd">"Passphrase"</string>
+    <string name="passp_cache_notif_pwd">"Password"</string>
 
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
@@ -1211,7 +1211,7 @@
     <string name="error_key_processing">"Error processing key!"</string>
     <string name="key_stripped">"stripped"</string>
     <string name="key_divert">"divert to smartcard/NFC"</string>
-    <string name="key_no_passphrase">"no passphrase"</string>
+    <string name="key_no_passphrase">"no password"</string>
     <string name="key_unavailable">"unavailable"</string>
     <string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string>
     <string name="title_view_cert">"View Certificate Details"</string>
@@ -1231,20 +1231,20 @@
     <!-- Passphrase wizard -->
     <!-- TODO: rename all the things! -->
     <string name="title_unlock_method">Choose an unlock method</string>
-    <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
-    <string name="enter_passphrase">Enter passphrase</string>
-    <string name="passphrase">Passphrase</string>
-    <string name="noPassphrase">No passphrase</string>
-    <string name="no_passphrase_set">No passphrase set</string>
-    <string name="passphrases_match">Passphrases do match</string>
-    <string name="passphrase_saved">Passphrase saved</string>
-    <string name="passphrase_invalid">Passphrase invalid</string>
-    <string name="missing_passphrase">Missing passphrase</string>
+    <!--<string name="enter_passphrase_twice">Enter password twice</string>-->
+    <string name="enter_passphrase">Enter password</string>
+    <string name="passphrase">Password</string>
+    <string name="noPassphrase">No password</string>
+    <string name="no_passphrase_set">No password set</string>
+    <string name="passphrases_match">Passwords do match</string>
+    <string name="passphrase_saved">Password saved</string>
+    <string name="passphrase_invalid">Password invalid</string>
+    <string name="missing_passphrase">Missing password</string>
     <string name="passphrase_again">Again</string>
     <string name="lockpattern">Lockpattern</string>
     <string name="lockpatternNFC">NFC + Lockpattern</string>
     <string name="unlock_method">Unlock method</string>
-    <string name="set_passphrase">Set passphrase</string>
+    <string name="set_passphrase">Set password</string>
     <string name="draw_lockpattern">Draw lockpattern</string>
     <string name="nfc_title">NFC</string>
     <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
-- 
cgit v1.2.3


From 6c706f8a90940bac1088a6c4bdd21e2df5089eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 31 Mar 2015 10:49:33 +0200
Subject: Rename advanced to extended

---
 OpenKeychain/src/main/res/values/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 78ab45cf3..c1e3b51f9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="title_help">"Help"</string>
     <string name="title_log_display">"Log"</string>
     <string name="title_exchange_keys">"Exchange Keys"</string>
-    <string name="title_advanced_key_info">"Advanced Key Info"</string>
+    <string name="title_advanced_key_info">"Extended Information"</string>
     <string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
     <string name="title_export_log">"Export Log"</string>
     <string name="title_manage_my_keys">"Manage my keys"</string>
@@ -100,7 +100,7 @@
     <string name="menu_select_all">"Select all"</string>
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_update_all_keys">"Update all keys"</string>
-    <string name="menu_advanced">"Show advanced info"</string>
+    <string name="menu_advanced">"Extended information"</string>
     <string name="menu_certify_fingerprint">"Confirm via fingerprint comparison"</string>
     <string name="menu_export_log">"Export Log"</string>
 
@@ -478,10 +478,10 @@
     <string name="intent_send_decrypt">"Decrypt with OpenKeychain"</string>
 
     <!-- Remote API -->
-    <string name="api_settings_show_info">"Show advanced information"</string>
-    <string name="api_settings_hide_info">"Hide advanced information"</string>
-    <string name="api_settings_show_advanced">"Show advanced settings"</string>
-    <string name="api_settings_hide_advanced">"Hide advanced settings"</string>
+    <string name="api_settings_show_info">"Show extended information"</string>
+    <string name="api_settings_hide_info">"Hide extended information"</string>
+    <string name="api_settings_show_advanced">"Show extended settings"</string>
+    <string name="api_settings_hide_advanced">"Hide extended settings"</string>
     <string name="api_settings_no_key">"No key selected"</string>
     <string name="api_settings_select_key">"Select key"</string>
     <string name="api_settings_create_key">"Create new key"</string>
@@ -494,7 +494,7 @@
     <string name="api_settings_package_name">"Package Name"</string>
     <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string>
     <string name="api_settings_accounts">"Accounts (deprecated API)"</string>
-    <string name="api_settings_advanced">"Advanced Information"</string>
+    <string name="api_settings_advanced">"Extended Information"</string>
     <string name="api_settings_allowed_keys">"Allowed Keys"</string>
     <string name="api_settings_settings">"Settings"</string>
     <string name="api_settings_key">"Account key:"</string>
-- 
cgit v1.2.3


From 083cd100cebbbfdca3a0df76e050b817d8711cd8 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Wed, 8 Apr 2015 00:58:21 +0530
Subject: hide linked system contact card if no contact present

---
 OpenKeychain/src/main/res/layout/view_key_fragment.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 454d5f9c7..a71eb5880 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -46,6 +46,7 @@
             android:layout_gravity="center"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             card_view:cardBackgroundColor="@android:color/white"
             card_view:cardElevation="2dp"
             card_view:cardUseCompatPadding="true"
-- 
cgit v1.2.3


From a545d50f4b90915274bba7de405b251b86fdf2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 14 Apr 2015 00:40:28 +0200
Subject: Pull from transifex

---
 OpenKeychain/src/main/res/raw-bg/help_about.md     |   1 +
 .../src/main/res/raw-bg/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-bg/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-bg/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-cs/help_about.md     |   1 +
 .../src/main/res/raw-cs/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-cs/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-cs/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-de/help_about.md     |  41 +-
 .../src/main/res/raw-de/help_certification.md      |   9 +-
 OpenKeychain/src/main/res/raw-de/help_changelog.md |  81 ++--
 OpenKeychain/src/main/res/raw-de/help_start.md     |  17 +-
 OpenKeychain/src/main/res/raw-es/help_about.md     |   1 +
 .../src/main/res/raw-es/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-es/help_changelog.md | 265 ++++++------
 OpenKeychain/src/main/res/raw-es/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-et/help_about.md     |   1 +
 .../src/main/res/raw-et/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-et/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-et/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-eu/help_about.md     |   1 +
 .../src/main/res/raw-eu/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-eu/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-eu/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-fi/help_about.md     |   1 +
 .../src/main/res/raw-fi/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-fi/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-fi/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-fr/help_about.md     |   1 +
 .../src/main/res/raw-fr/help_certification.md      |   1 +
 OpenKeychain/src/main/res/raw-fr/help_changelog.md | 299 ++++++-------
 OpenKeychain/src/main/res/raw-fr/help_start.md     |   3 +-
 OpenKeychain/src/main/res/raw-is/help_about.md     |   1 +
 .../src/main/res/raw-is/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-is/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-is/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-it/help_about.md     |   1 +
 .../src/main/res/raw-it/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-it/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-it/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-ja/help_about.md     |  13 +-
 .../src/main/res/raw-ja/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-ja/help_changelog.md | 119 ++---
 OpenKeychain/src/main/res/raw-ja/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-nl/help_about.md     |   1 +
 .../src/main/res/raw-nl/help_certification.md      |  37 +-
 OpenKeychain/src/main/res/raw-nl/help_changelog.md | 225 +++++-----
 OpenKeychain/src/main/res/raw-nl/help_start.md     |   3 +-
 OpenKeychain/src/main/res/raw-pl/help_about.md     |   1 +
 .../src/main/res/raw-pl/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-pl/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-pl/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-pt/help_about.md     |   1 +
 .../src/main/res/raw-pt/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-pt/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-pt/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-ro/help_about.md     |   1 +
 .../src/main/res/raw-ro/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-ro/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-ro/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-ru/help_about.md     |   1 +
 .../src/main/res/raw-ru/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-ru/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-ru/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-sl/help_about.md     |  41 +-
 .../src/main/res/raw-sl/help_certification.md      |  37 +-
 OpenKeychain/src/main/res/raw-sl/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-sl/help_start.md     |  23 +-
 OpenKeychain/src/main/res/raw-sr/help_about.md     |   1 +
 .../src/main/res/raw-sr/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-sr/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-sr/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-sv/help_about.md     |   1 +
 .../src/main/res/raw-sv/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-sv/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-sv/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-tr/help_about.md     |   1 +
 .../src/main/res/raw-tr/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-tr/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-tr/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-uk/help_about.md     |   1 +
 .../src/main/res/raw-uk/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-uk/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-uk/help_start.md     |   5 +-
 OpenKeychain/src/main/res/raw-zh-rTW/help_about.md |   1 +
 .../src/main/res/raw-zh-rTW/help_certification.md  |   3 +-
 .../src/main/res/raw-zh-rTW/help_changelog.md      |   7 +-
 OpenKeychain/src/main/res/raw-zh-rTW/help_start.md |   5 +-
 OpenKeychain/src/main/res/raw-zh/help_about.md     |   1 +
 .../src/main/res/raw-zh/help_certification.md      |   3 +-
 OpenKeychain/src/main/res/raw-zh/help_changelog.md |   7 +-
 OpenKeychain/src/main/res/raw-zh/help_start.md     |   5 +-
 OpenKeychain/src/main/res/values-cs/strings.xml    |  38 +-
 OpenKeychain/src/main/res/values-de/strings.xml    |  39 +-
 OpenKeychain/src/main/res/values-es/strings.xml    |  85 ++--
 OpenKeychain/src/main/res/values-et/strings.xml    |   2 -
 OpenKeychain/src/main/res/values-eu/strings.xml    |  19 -
 OpenKeychain/src/main/res/values-fi/strings.xml    |  18 -
 OpenKeychain/src/main/res/values-fr/strings.xml    |  35 +-
 OpenKeychain/src/main/res/values-it/strings.xml    |  23 -
 OpenKeychain/src/main/res/values-ja/strings.xml    |  42 +-
 OpenKeychain/src/main/res/values-nl/strings.xml    |  35 +-
 OpenKeychain/src/main/res/values-pl/strings.xml    |  21 -
 OpenKeychain/src/main/res/values-ru/strings.xml    |  69 +--
 OpenKeychain/src/main/res/values-sl/strings.xml    | 480 +++++++++++++++++++--
 OpenKeychain/src/main/res/values-sv/strings.xml    |  23 -
 OpenKeychain/src/main/res/values-tr/strings.xml    |  20 -
 OpenKeychain/src/main/res/values-uk/strings.xml    |  20 -
 .../src/main/res/values-zh-rTW/strings.xml         | 170 +++++++-
 OpenKeychain/src/main/res/values-zh/strings.xml    |  14 -
 110 files changed, 1555 insertions(+), 1110 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/raw-bg/help_about.md b/OpenKeychain/src/main/res/raw-bg/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-bg/help_about.md
+++ b/OpenKeychain/src/main/res/raw-bg/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-bg/help_certification.md b/OpenKeychain/src/main/res/raw-bg/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-bg/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-bg/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-bg/help_changelog.md b/OpenKeychain/src/main/res/raw-bg/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-bg/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-bg/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-bg/help_start.md b/OpenKeychain/src/main/res/raw-bg/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-bg/help_start.md
+++ b/OpenKeychain/src/main/res/raw-bg/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-cs/help_about.md b/OpenKeychain/src/main/res/raw-cs/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_about.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-cs/help_certification.md b/OpenKeychain/src/main/res/raw-cs/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.md b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-cs/help_start.md b/OpenKeychain/src/main/res/raw-cs/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_start.md
+++ b/OpenKeychain/src/main/res/raw-cs/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-de/help_about.md b/OpenKeychain/src/main/res/raw-de/help_about.md
index d6a8eca93..ec2501ee6 100644
--- a/OpenKeychain/src/main/res/raw-de/help_about.md
+++ b/OpenKeychain/src/main/res/raw-de/help_about.md
@@ -1,12 +1,13 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
-[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android.
+[OpenKeychain](http://www.openkeychain.org) ist eine OpenPGP-Implementierung für Android.
 
-License: GPLv3+
+Lizenz: GPLv3+
 
-## Developers
-  * Dominik Schürmann (Maintainer)
+## Entwickler
+  * Dominik Schürmann (Leitender Entwickler)
   * Art O Cathain
   * Ash Hughes
   * Brian C. Barnes
@@ -27,19 +28,19 @@ License: GPLv3+
   * Tim Bray
   * Vincent Breitmoser
 
-## Libraries
-  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
-  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
-  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
-  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
-  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
-  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
-  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
-  * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
-  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
-  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache License v2)
-  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2)
-  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
-  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
-  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache License v2)
-  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
\ No newline at end of file
+## Bibliotheken
+  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11-Lizenz)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT-Lizenz)
+  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache-Lizenz v2)
+  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache-Lizenz v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache-Lizenz v2)
+  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache-Lizenz v2)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache-Lizenz v2)
+  * [ZXing](https://github.com/zxing/zxing) (Apache-Lizenz v2)
+  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache-Lizenz v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material-Design)</a> (Apache-Lizenz v2)
+  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache-Lizenz v2)
+  * [Snackbar](https://github.com/nispok/snackbar) (MIT-Lizenz)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache-Lizenz v2)
+  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache-Lizenz v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache-Lizenz v2)
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-de/help_certification.md b/OpenKeychain/src/main/res/raw-de/help_certification.md
index 8da27e8e0..5089301f3 100644
--- a/OpenKeychain/src/main/res/raw-de/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-de/help_certification.md
@@ -1,10 +1,11 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## Key Confirmation
+## Schlüsselbestätigung
 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.
+The 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.
 
-## Key Status
+## Schlüsselstatus
 
 <img src="status_signature_verified_cutout_24dp"/>  
 Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
@@ -15,7 +16,7 @@ Expired: This key is no longer valid. Only the owner can extend its validity.
 <img src="status_signature_revoked_cutout_24dp"/>  
 Revoked: This key is no longer valid. It has been revoked by its owner.
 
-## Advanced Information
+## Erweiterte Informationen
 A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
 This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) 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."
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.md b/OpenKeychain/src/main/res/raw-de/help_changelog.md
index e9d61d0f3..cd0a47f45 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md
@@ -1,11 +1,12 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
-  * Material design
-  * Integration of QR Scanner (New permissions required)
-  * Improved key creation wizard
-  * Fix missing contacts after sync
-  * Requires Android 4
+  * Material-Design
+  * QR-Scanner-Integration (benötigt neue Berechtigungen)
+  * Schlüsselerzeugungsassistent verbessert
+  * Fehlende Kontakte nach Synchronisierung behoben
+  * Benötigt Android 4
   * Redesigned key screen
   * Simplify crypto preferences, better selection of secure ciphers
   * API: Detached signatures, free selection of signing key,...
@@ -22,17 +23,17 @@
 ## 3.1.1
 
   * Fix key export to files (they were written partially)
-  * Fix crash on Android 2.3
+  * Absturz unter Android 2.3 behoben
 
 
 ## 3.1
 
-  * Fix crash on Android 5
-  * New certify screen
+  * Absturz unter Android 5 behoben
+  * Neuer Beglaubigungsbildschirm
   * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
+  * Neuer Programmablauf für QR-Codes
   * Redesigned decrypt screen
-  * New icon usage and colors
+  * Verwendung neuer Symbole und Farben
   * Fix import of secret keys from Symantec Encryption Desktop
   * Subkey IDs on Yubikeys are now checked correctly
 
@@ -70,7 +71,7 @@
   * Key sharing via SafeSlinger
   * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
   * Fix usage of stripped keys
-  * SHA256 as default for compatibility
+  * Standardmäßig SHA256 aufgrund von Kompatibilität
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
   * OpenPGP API now handles revoked/expired keys and returns all user ids
 
@@ -78,7 +79,7 @@
 ## 2.9
 
   * Fixing crashes introduced in v2.8
-  * Experimental ECC support
+  * Experimentelle ECC-Unterstützung
   * Experimental Yubikey support (signing-only with imported keys)
 
 
@@ -87,7 +88,7 @@
   * So many bugs have been fixed in this release that we focus on the main new features
   * Key edit: awesome new design, key revocation
   * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
+  * Neuer Bildschirm bei der ersten Öffnung
   * New key creation screen: autocompletion of name and email based on your personal Android accounts
   * File encryption: awesome new design, support for encrypting multiple files
   * New icons to show status of key (by Brennan Novak)
@@ -95,15 +96,15 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
-  * Purple! (Dominik, Vincent)
+  * Lila! (Dominik, Vincent)
   * New key view design (Dominik, Vincent)
   * New flat Android buttons (Dominik, Vincent)
-  * API fixes (Dominik)
-  * Keybase.io import (Tim Bray)
+  * API-Korrekturen (Dominik)
+  * Import aus keybase.io (Tim Bray)
 
 
 ## 2.6.1
@@ -116,7 +117,7 @@
   * Key certifications (thanks to Vincent Breitmoser)
   * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
   * New design for signature verification
-  * Custom key length (thanks to Greg Witczak)
+  * Benutzerdefinierte Schlüssellänge (Dank an Greg Witczak)
   * Fix share-functionality from other apps
 
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
@@ -142,7 +143,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
   * Keyserver query based on machine-readable output
   * Lock navigation drawer on tablets
   * Suggestions for emails on creation of keys
-  * Search in public key lists
+  * Suchen in öffentlichen Schlüssellisten
   * And much more improvements and fixes…
 
 
@@ -168,7 +169,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * New design with navigation drawer
   * New public key list design
-  * New public key view
+  * Neue Ansicht für öffentliche Schlüssel
   * Bug fixes for importing of keys
   * Key cross-certification (thanks to Ash Hughes)
   * Handle UTF-8 passwords properly (thanks to Ash Hughes)
@@ -185,7 +186,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 2.1
 
   * Lots of bug fixes
-  * New API for developers
+  * Neue API für Entwickler
   * PRNG bug fix by Google
 
 
@@ -193,20 +194,20 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
   * Complete redesign
   * Share public keys via QR codes, NFC beam
-  * Sign keys
-  * Upload keys to server
+  * Schlüssel unterschreiben
+  * Schlüssel auf den Server hochladen
   * Fixes import issues
-  * New AIDL API
+  * Neue AIDL-API
 
 
 ## 1.0.8
 
-  * Basic keyserver support
+  * Grundlegende Schlüsselserverunterstützung
   * App2sd
   * More choices for passphrase cache: 1, 2, 4, 8, hours
   * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
-  * Bugfixes
-  * Optimizations
+  * Fehlerbehebungen
+  * Optimierungen
 
 
 ## 1.0.7
@@ -218,19 +219,19 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 1.0.6
 
   * Account adding crash on Froyo fixed
-  * Secure file deletion
+  * Sichere Dateilöschung
   * Option to delete key file after import
-  * Stream encryption/decryption (gallery, etc.)
+  * Streamverschlüsselung/-entschlüsselung (Galerie, usw.)
   * New options (language, force v3 signatures)
-  * Interface changes
-  * Bugfixes
+  * Oberflächenänderungen
+  * Fehlerbehebungen
 
 
 ## 1.0.5
 
-  * German and Italian translation
+  * Deutsche und Italienische Übersetzung
   * Much smaller package, due to reduced BC sources
-  * New preferences GUI
+  * Neues Einstellungen-Benutzeroberfläche
   * Layout adjustment for localization
   * Signature bugfix
 
@@ -247,7 +248,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.2
 
-  * Filterable key lists
+  * Filterbare Schlüsselliste
   * Smarter pre-selection of encryption keys
   * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
   * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
@@ -261,8 +262,8 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 ## 1.0.0
 
   * K-9 Mail integration, APG supporting beta build of K-9 Mail
-  * Support of more file managers (including ASTRO)
-  * Slovenian translation
-  * New database, much faster, less memory usage
+  * Unterstützung von mehr Dateimanagern (einschließlich ASTRO)
+  * Slowenische Übersetzung
+  * Neue Datenbank, viel schneller, weniger Speicherbelegung
   * Defined Intents and content provider for other apps
-  * Bugfixes
\ No newline at end of file
+  * Fehlerbehebungen
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.md b/OpenKeychain/src/main/res/raw-de/help_start.md
index 1641f913b..b51aebf62 100644
--- a/OpenKeychain/src/main/res/raw-de/help_start.md
+++ b/OpenKeychain/src/main/res/raw-de/help_start.md
@@ -1,15 +1,16 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## How do I activate OpenKeychain in K-9 Mail?
-To use OpenKeychain with K-9 Mail, you want to follow these steps:
+## Wie kann ich OpenKeychain in K-9 Mail nutzen?
+Um OpenKeychain mit K-9 Mail zu nutzen, bitte folgenden Schritten folgen:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
-  3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
+  3. Klick auf "OpenPGP Provider" und OpenKeychain in der Liste auswählen.
 
-## I found a bug in OpenKeychain!
+## Ich habe einen Fehler in OpenKeychail gefunden!
 Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
 
-## Contribute
+## Unterstützen
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
-## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+## Übersetzungen
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-es/help_about.md b/OpenKeychain/src/main/res/raw-es/help_about.md
index 0435b2d5b..bb925e6bd 100644
--- a/OpenKeychain/src/main/res/raw-es/help_about.md
+++ b/OpenKeychain/src/main/res/raw-es/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-es/help_certification.md b/OpenKeychain/src/main/res/raw-es/help_certification.md
index 55e821498..412c13826 100644
--- a/OpenKeychain/src/main/res/raw-es/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-es/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
 ## Confirmación de clave
 Sin confirmación, no puede estar seguro de si una clave corresponde realmente a una persona específica.
-La forma más simple de confirmar una clave es escanear el código QR o intercambiarlo vía NFC.
+La forma más sencilla de confirmar una clave es escaneando el código QR o intercambiándolo vía NFC.
 Para confirmar claves entre más de dos personas, sugerimos usar el método de intercambio de claves disponible para sus claves.
 
 ## Estado de la clave
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.md b/OpenKeychain/src/main/res/raw-es/help_changelog.md
index 753da969e..7c4367594 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
 ## 3.2beta2
 
@@ -8,10 +9,10 @@
   * Requiere Android 4
   * Pantalla de clave rediseñada
   * Simplifica las preferencias de criptografía, mejor selección de algoritmos de cifrado seguro
-  * API: Firmas desacopladas, selección libre de clave de firmado...
+  * API: Firmas desacopladas, selección libre de clave de firmado,...
   * Reparación: Algunas claves válidas se mostraron revocadas o caducadas
   * No acepte algo firmado por subclaves caducadas o revocadas
-  * Soporte Keybase.io en la vista avanzada
+  * Soporte para Keybase.io en la vista avanzada
 
 
 ## 3.1.2
@@ -22,19 +23,19 @@
 ## 3.1.1
 
   * Repara la exportación de claves a ficheros (se escribían parcialmente)
-  * Repara un fallo con caída en Android 2.3
+  * Repara una caída en Android 2.3
 
 
 ## 3.1
 
-  * Repara un fallo con caída en Android 5
+  * Repara una caída en Android 5
   * Nueva pantalla de certificación
   * Intercambio seguro directamente desde la lista de claves (librería SafeSlinger)
-  * Nuevo control de flujo del programa QR Code
+  * Nuevo control de flujo del programa para código QR
   * Pantalla de descifrado rediseñada
-  * Nuevo uso del icono y colores
-  * Repara la importación de clave secretas (privadas) desde Symantec Encryption Desktop
-  * Las identificaciones de subclaves sobre Yubikeys ahora están comprobadas correctamente
+  * Nuevo uso y colores del icono
+  * Repara la importación de claves secretas (privadas) desde Symantec Encryption Desktop
+  * Las identificaciones de subclaves en Yubikeys ahora se comprueban correctamente
 
 
 ## 3.0.1
@@ -46,223 +47,223 @@
 ## 3.0
 
   * ¡Soporte completo para generación de firma y descifrado de Yubikey!
-  * Propose installable compatible apps in apps list
-  * New design for decryption screens
-  * Many fixes for key import, also fixes stripped keys
-  * Honor and display key authenticate flags
-  * User interface to generate custom keys
-  * Fixing user id revocation certificates
-  * New cloud search (searches over traditional keyservers and keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * Propone aplicaciones instalables compatibles en la lista de aplicaciones
+  * Nuevo diseño para pantallas de descifrado
+  * Muchas reparaciones para la importación de claves, también repara claves desnudas
+  * Respeta y muestra los distintivos de autentificación de claves
+  * Interfaz de usuario para generar claves personalizadas
+  * Repara certificados de revocación de identificación de usuario
+  * Nueva búsqueda en la nube (busca sobre servidores de claves tradicionales y keybase.io)
+  * Soporte para desvestir claves dentro de OpenKeychain
 
 
 ## 2.9.2
 
-  * Fix keys broken in 2.9.1
-  * Yubikey decryption now working via API
+  * Repara claves rotas en la versión 2.9.1
+  * El descifrado de Yubikey ahora funciona vía API
 
 
 ## 2.9.1
 
-  * Split encrypt screen into two
-  * Fix key flags handling (now supporting Mailvelope 0.7 keys)
-  * Improved passphrase handling
-  * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
-  * Fix usage of stripped keys
-  * SHA256 as default for compatibility
-  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
-  * OpenPGP API now handles revoked/expired keys and returns all user ids
+  * Divide en dos la pantalla de cifrado 
+  * Repara el manejo de los indicativos de claves (ahora soporta claves de Mailvelope 0.7)
+  * Manejo de frase-contraseña mejorado
+  * Compartición de claves vía SafeSlinger
+  * Yubikey: Preferencia para permitir otros PINs, actualmente sólo funciona firmando mediante la API de OpenPGP, no dentro de OpenKeychain
+  * Repara el uso de claves desnudas
+  * SHA256 por defecto para compatibilidad
+  * La API de Intent ha cambiado, vea https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * La API de OpenPGP ahora maneja claves revocadas/caducadas y devuelve todas las identificaciones de usuario
 
 
 ## 2.9
 
-  * Fixing crashes introduced in v2.8
-  * Experimental ECC support
-  * Experimental Yubikey support (signing-only with imported keys)
+  * Repara caídas introducidas en la versión 2.8
+  * Soporte para ECC (criptografía de curva elíptica) experimental
+  * Soporte experimental para Yubikey (sólo-firmante con claves importadas)
 
 
 ## 2.8
 
-  * So many bugs have been fixed in this release that we focus on the main new features
-  * Key edit: awesome new design, key revocation
-  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
-  * New key creation screen: autocompletion of name and email based on your personal Android accounts
-  * File encryption: awesome new design, support for encrypting multiple files
-  * New icons to show status of key (by Brennan Novak)
-  * Important bug fix: Importing of large key collections from a file is now possible
-  * Notification showing cached passphrases
-  * Keys are connected to Android's contacts
+  * Han sido reparados tantos fallos en esta versión que nos centramos en las nuevas características principales
+  * Edición de clave: Un estupendo diseño nuevo, revocación de clave
+  * Importación de clave: Un estupendo diseño nuevo, conexiones seguras a servidor de claves vía hkps (protocolo seguro HTTP de servidor de claves), servidor de claves resolviendo vía registros DNS SRV
+  * Nueva pantalla de primera vez
+  * Nueva pantalla de creación de clave: Autocompletado del nombre y correo electrónico basados en sus cuentas de Android personales
+  * Cifrado de ficheros: Un estupendo diseño nuevo, soporte para cifrar múltiples ficheros
+  * Nuevos iconos para mostrar el estado de la clave (por Brennan Novak)
+  * Reparación de un fallo importante: La importación de colecciones de claves largas desde un fichero ahora es posible
+  * Notificación mostrando frases-contraseña en caché
+  * Las claves están conectadas a los contactos de Android
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+Esta versión no sería posible sin el trabajo de Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
-  * Purple! (Dominik, Vincent)
-  * New key view design (Dominik, Vincent)
-  * New flat Android buttons (Dominik, Vincent)
-  * API fixes (Dominik)
-  * Keybase.io import (Tim Bray)
+  * ¡Púrpura! (Dominik, Vincent)
+  * Nuevo diseño de vista de clave (Dominik, Vincent)
+  * Nuevos botones planos de Android (Dominik, Vincent)
+  * Reparaciones de la API (Dominik)
+  * Importación desde Keybase.io (Tim Bray)
 
 
 ## 2.6.1
 
-  * Some fixes for regression bugs
+  * Algunas reparaciones para fallos regresivos
 
 
 ## 2.6
 
-  * Key certifications (thanks to Vincent Breitmoser)
-  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
-  * New design for signature verification
-  * Custom key length (thanks to Greg Witczak)
-  * Fix share-functionality from other apps
+  * Certificaciones de clave (gracias a Vincent Breitmoser)
+  * Soporte para claves secretas (privadas) parciales de GnuPG (gracias a Vincent Breitmoser)
+  * Nuevo diseño para verificación de firma
+  * Tamaño de clave personalizado (gracias a Greg Witczak)
+  * Repara la funcionalidad-compartida desde otras aplicaciones
 
 
 ## 2.5
 
-  * Fix decryption of symmetric OpenPGP messages/files
-  * Refactored key edit screen (thanks to Ash Hughes)
-  * New modern design for encrypt/decrypt screens
-  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+  * Repara el descifrado de mensajes/ficheros de OpenPGP simétricos
+  * Pantalla de edición de clave refactorizada (gracias a Ash Hughes)
+  * Nuevo diseño moderno para pantallas de cifrado/descifrado
+  * API de OpenPGP versión 3 (múltiples cuentas API, reparaciones internas, búsqueda de claves)
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
-Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-
-  * New unified key list
-  * Colorized key fingerprint
-  * Support for keyserver ports
-  * Deactivate possibility to generate weak keys
-  * Much more internal work on the API
-  * Certify user ids
-  * Keyserver query based on machine-readable output
-  * Lock navigation drawer on tablets
-  * Suggestions for emails on creation of keys
-  * Search in public key lists
-  * And much more improvements and fixes…
+¡Gracias a todos los interesados del Google Summer of Code 2014 que hicieron posible esta versión rica en características y libre de fallos!
+Además de varios parches de seguridad pequeños, un número notable de parches fueron elaborados por las siguientes personas (en orden alfabético):
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+
+  * Nueva lista de claves unificada
+  * Huella de validación de clave (fingerprint) coloreada
+  * Soporte para puertos de servidor de claves
+  * Desactivar la posibilidad de generar claves débiles
+  * Mucho más trabajo interno en la API
+  * Certificar identificaciones de usuario
+  * Petición al servidor de claves basada en salida legible-por-máquina
+  * Bloquea la bandeja deslizante de navegación en tabletas
+  * Sugerencias sobre creación de claves para correos electrónicos
+  * Buscar en listas de claves públicas
+  * Y muchas más mejoras y reparaciones...
 
 
 ## 2.3.1
 
-  * Hotfix for crash when upgrading from old versions
+  * Reparación urgente para caída al actualizar desde versiones antiguas
 
 
 ## 2.3
 
-  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
-  * Fix setting expiry dates on keys (thanks to Ash Hughes)
-  * More internal fixes when editing keys (thanks to Ash Hughes)
-  * Querying keyservers directly from the import screen
-  * Fix layout and dialog style on Android 2.2-3.0
-  * Fix crash on keys with empty user ids
-  * Fix crash and empty lists when coming back from signing screen
-  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
-  * Fix upload of key from signing screen
+  * Elimina la exportación innecesaria de claves públicas al exportar la clave secreta (privada) (gracias a Ash Hughes)
+  * Repara la configuración de fechas de caducidad sobre claves (gracias a Ash Hughes)
+  * Más reparaciones internas al editar claves (gracias a Ash Hughes)
+  * Realiza peticiones directamente a los servidores de claves desde la pantalla de importación
+  * Repara la disposición y estilo del cuadro de diálogo en Android 2.2-3.0
+  * Repara caída en claves con identificaciones de usuario vacías
+  * Repara caída y listas vacías al volver de la pantalla de firmado
+  * Bouncy Castle (librería de criptografía) actualizada desde la versión 1.47 a la 1.50 y compilada desde el código fuente
+  * Repara la subida de clave desde la pantalla de firmado
 
 
 ## 2.2
 
-  * New design with navigation drawer
-  * New public key list design
-  * New public key view
-  * Bug fixes for importing of keys
-  * Key cross-certification (thanks to Ash Hughes)
-  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
-  * First version with new languages (thanks to the contributors on Transifex)
-  * Sharing of keys via QR Codes fixed and improved
-  * Package signature verification for API
+  * Nuevo diseño con bandeja deslizante de navegación
+  * Nuevo diseño de lista de claves públicas
+  * Nueva vista de clave pública
+  * Reparaciones de fallos para la importación de claves
+  * Certificación-cruzada de claves (gracias a Ash Hughes)
+  * Maneja contraseñas UTF-8 de forma adecuada (gracias a Ash Hughes)
+  * Primera versión con nuevos idiomas (gracias a los contribuidores en Transifex)
+  * Compartición de claves mediante códigos QR reparada y mejorada
+  * Verificación de firmas de paquetes para la API
 
 
 ## 2.1.1
 
-  * API Updates, preparation for K-9 Mail integration
+  * Actualizaciones de la API, preparación para la integración de K-9 Mail
 
 
 ## 2.1
 
-  * Lots of bug fixes
-  * New API for developers
-  * PRNG bug fix by Google
+  * Muchas reparaciones de fallos
+  * Nueva API para desarrolladores
+  * Reparación de fallo de PRNG (generador de números pseudoaleatorios) por Google
 
 
 ## 2.0
 
-  * Complete redesign
-  * Share public keys via QR codes, NFC beam
-  * Sign keys
-  * Upload keys to server
-  * Fixes import issues
-  * New AIDL API
+  * Rediseño completo
+  * Comparte claves públicas mediante códigos QR, y NFC
+  * Firma de claves
+  * Subida de claves al servidor
+  * Repara problemas de importación
+  * Nueva API de AIDL (lenguaje de definición de interfaz Android)
 
 
 ## 1.0.8
 
-  * Basic keyserver support
+  * Soporte para servidor de claves básico
   * App2sd
-  * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
-  * Bugfixes
-  * Optimizations
+  * Más opciones para la caché de frase-contraseña: 1,2,4,8 horas
+  * Traducciones: Noruego (gracias, Sander Danielsen), Chino (gracias, Zhang Fredrick)
+  * Reparaciones de fallos
+  * Optimizaciones
 
 
 ## 1.0.7
 
-  * Fixed problem with signature verification of texts with trailing newline
-  * More options for passphrase cache time to live (20, 40, 60 mins)
+  * Reparado problema con la verificación de firma de textos con un salto de línea al final
+  * Más opciones para el tiempo de vida de la caché de frase-contraseña (20, 40, 60 minutos)
 
 
 ## 1.0.6
 
-  * Account adding crash on Froyo fixed
-  * Secure file deletion
-  * Option to delete key file after import
-  * Stream encryption/decryption (gallery, etc.)
-  * New options (language, force v3 signatures)
-  * Interface changes
-  * Bugfixes
+  * Reparada caída al añadir cuenta en Froyo
+  * Borrado seguro de fichero
+  * Opción para borrar el fichero de clave después de importar
+  * Cifrado/Descifrado de stream (flujo de datos) (galería, etc.)
+  * Nuevas opciones (idioma, forzado de firmas v3)
+  * Cambios en la interfaz
+  * Reparaciones de fallos
 
 
 ## 1.0.5
 
-  * German and Italian translation
-  * Much smaller package, due to reduced BC sources
-  * New preferences GUI
-  * Layout adjustment for localization
-  * Signature bugfix
+  * Traducción al alemán y al italiano
+  * Paquete mucho más pequeño, debido al código fuente reducido de Bouncy Castle (BC)
+  * Interfaz gráfica (GUI) de nuevas preferencias
+  * Ajuste de la distribución para localización
+  * Reparación de fallo de firma
 
 
 ## 1.0.4
 
-  * Fixed another crash caused by some SDK bug with query builder
+  * Reparada otra caída causada por algún fallo del SDK con el constructor de peticiones
 
 
 ## 1.0.3
 
-  * Fixed crashes during encryption/signing and possibly key export
+  * Reparadas caídas durante el cifrado/firmado y posible exportación de clave
 
 
 ## 1.0.2
 
-  * Filterable key lists
-  * Smarter pre-selection of encryption keys
-  * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
-  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+  * Listas de claves filtrables
+  * Pre-selección más inteligente de claves de cifrado
+  * Nuevo manejo de Intent para VIEW y SEND (ver y enviar), permite que los ficheros sean cifrados/descifrados fuera de los administradores de ficheros
+  * Reparaciones y características adicionales (preselección de clave) para K-9 Mail, nueva versión beta disponible
 
 
 ## 1.0.1
 
-  * GMail account listing was broken in 1.0.0, fixed again
+  * El listado de cuenta de GMail se estropeó en la versión 1.0.0, reparado de nuevo
 
 
 ## 1.0.0
 
-  * K-9 Mail integration, APG supporting beta build of K-9 Mail
-  * Support of more file managers (including ASTRO)
-  * Slovenian translation
-  * New database, much faster, less memory usage
-  * Defined Intents and content provider for other apps
-  * Bugfixes
\ No newline at end of file
+  * Integración de K-9 Mail, APG (Android Privacy Guard) soportando la versión beta de K-9 Mail
+  * Soporte para más administradores de ficheros (incluyendo ASTRO)
+  * Traducción al esloveno
+  * Nueva base de datos, mucho más rápida, menos uso de memoria
+  * Definidos Intents y el proveedor de contenido para otras aplicaciones
+  * Reparaciones de fallos
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.md b/OpenKeychain/src/main/res/raw-es/help_start.md
index e8786003c..b304ce39b 100644
--- a/OpenKeychain/src/main/res/raw-es/help_start.md
+++ b/OpenKeychain/src/main/res/raw-es/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!)
 
 ## ¿Cómo activo OpenKeychain en K-9 Mail?
 Para usar OpenKeychain con K-9 Mail, deberá seguir estos pasos:
   1. Abra K-9 Mail y realice una pulsación larga sobre la cuenta con la que quiera usar OpenKeychain.
-  2. Seleccione "Configuración de cuenta", desplácese hasta el fondo y pulse "Criptografía".
+  2. Seleccione "Configuración de cuenta", desplácese hasta el fondo y pulse "Criptografía"
   3. Haga clic sobre "Proveedor OpenPGP" y seleccione OpenKeychain de la lista.
 
 ## ¡Encontré un fallo en OpenKeychain!
@@ -12,4 +13,4 @@ Por favor informe del fallo usando el [rastreador de fallos de OpenKeychain](htt
 Si quiere ayudarnos a desarrollar OpenKeychain contribuyendo con código [siga nuestra pequeña guía en GitHub](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Traducciones
-¡Ayude a traducir OpenKeychain! Todos pueden participar en [OpenKeychain en Transifex] (https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+¡Ayude a traducir OpenKeychain! Todos pueden participar en [OpenKeychain en Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-et/help_about.md b/OpenKeychain/src/main/res/raw-et/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-et/help_about.md
+++ b/OpenKeychain/src/main/res/raw-et/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-et/help_certification.md b/OpenKeychain/src/main/res/raw-et/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-et/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-et/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.md b/OpenKeychain/src/main/res/raw-et/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.md b/OpenKeychain/src/main/res/raw-et/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-et/help_start.md
+++ b/OpenKeychain/src/main/res/raw-et/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.md b/OpenKeychain/src/main/res/raw-eu/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_about.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-eu/help_certification.md b/OpenKeychain/src/main/res/raw-eu/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.md b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-eu/help_start.md b/OpenKeychain/src/main/res/raw-eu/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-eu/help_start.md
+++ b/OpenKeychain/src/main/res/raw-eu/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-fi/help_about.md b/OpenKeychain/src/main/res/raw-fi/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_about.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-fi/help_certification.md b/OpenKeychain/src/main/res/raw-fi/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.md b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-fi/help_start.md b/OpenKeychain/src/main/res/raw-fi/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_start.md
+++ b/OpenKeychain/src/main/res/raw-fi/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-fr/help_about.md b/OpenKeychain/src/main/res/raw-fr/help_about.md
index 1ff60b089..edf3dd78d 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_about.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_about.md
@@ -1,3 +1,4 @@
+[//] : # (NOTE : veuillez mettre chaque phrase dans sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-fr/help_certification.md b/OpenKeychain/src/main/res/raw-fr/help_certification.md
index 965215a54..643756bcf 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_certification.md
@@ -1,3 +1,4 @@
+[//] : # (NOTE : veuillez mettre chaque phrase dans sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
 ## Confirmation de clef
 Sans confirmation, vous ne pouvez pas être certain que la clef appartient à une personne déterminée.
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.md b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
index e9d61d0f3..9682bacae 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md
@@ -1,268 +1,269 @@
+[//] : # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
 ## 3.2beta2
 
-  * Material design
-  * Integration of QR Scanner (New permissions required)
-  * Improved key creation wizard
-  * Fix missing contacts after sync
-  * Requires Android 4
-  * Redesigned key screen
-  * Simplify crypto preferences, better selection of secure ciphers
-  * API: Detached signatures, free selection of signing key,...
-  * Fix: Some valid keys were shown revoked or expired
-  * Don't accept signatures by expired or revoked subkeys
-  * Keybase.io support in advanced view
+  * Conception matérielle
+  * Intégration du lecteur QR (nouvelles permissions exigées)
+  * Amélioration de l'assistant de création de clef
+  * Correctif - Contacts manquants après la synchro
+  * Android 4 exigé
+  * Nouvelle conception de l'écran des clefs
+  * Simplification des préférences cryptographiques, meilleure sélection de codes de chiffrement sécurisés
+  * API : signatures détachées, sélection libre de la clef de signature...
+  * Correctif - Certaines clefs valides apparaissaient comme révoquées ou expirées
+  * Ne pas accepter de signatures par des sous-clefs expirées ou révoquées
+  * Prise en charge de keybase.io dans la vue avancée
 
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * Correctif - Exportation des clefs vers des fichiers (vraiment, maintenant)
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
-  * Fix crash on Android 2.3
+  * Correctif - Exportation des clefs vers des fichiers (elles n'étaient écrites que partiellement)
+  * Correctif - Plantage sur Android 2.3
 
 
 ## 3.1
 
-  * Fix crash on Android 5
-  * New certify screen
-  * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
-  * Redesigned decrypt screen
-  * New icon usage and colors
-  * Fix import of secret keys from Symantec Encryption Desktop
-  * Subkey IDs on Yubikeys are now checked correctly
+  * Correctif - Plantage sur Android 5
+  * Nouvel écran de certification
+  * Échange sécurisé directement de la liste des clefs (bibliothèque SafeSlinger)
+  * Nouveau flux de programme pour les codes QR
+  * Écran de déchiffrement redessiné
+  * Nouveaux agencement et couleurs d'icônes
+  * Importation des clefs secrètes corrigée de Symantec Encryption Desktop
+  * Les ID de sous-clefs des Yubikeys sont maintenant vérifiés correctement
 
 
 ## 3.0.1
 
-  * Better handling of large key imports
-  * Improved subkey selection
+  * Meilleure gestion de l'importation de nombreuses clefs
+  * Sélection des sous-clefs améliorée
 
 
 ## 3.0
 
-  * Full support for Yubikey signature generation and decryption!
-  * Propose installable compatible apps in apps list
-  * New design for decryption screens
-  * Many fixes for key import, also fixes stripped keys
-  * Honor and display key authenticate flags
-  * User interface to generate custom keys
-  * Fixing user id revocation certificates
-  * New cloud search (searches over traditional keyservers and keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * Prise en charge complète de la génération de signature par Yubikey et de leur déchiffrement !
+  * Des applis compatibles installables sont proposées dans la liste des applis
+  * Nouvelle conception pour les écrans de déchiffrement
+  * Nombreux correctifs d'importation des clefs, corrigent aussi les clefs dépouillées
+  * Accepter et afficher les drapeaux d'authentification des clefs
+  * Interface utilisateur pour générer des clefs personnalisées
+  * Corrigé - Certificats de révocation des ID utilisateurs
+  * Nouvelle recherche nuagique (dans les serveurs traditionnels et dans keybase.io)
+  * Prise en charge du dépouillement des clefs dans OpenKeychain
 
 
 ## 2.9.2
 
-  * Fix keys broken in 2.9.1
-  * Yubikey decryption now working via API
+  * Correctif - Clefs brisées dans 2.9.1
+  * Le déchiffrement des Yukukeys par l'API fonctionne maintenant
 
 
 ## 2.9.1
 
-  * Split encrypt screen into two
-  * Fix key flags handling (now supporting Mailvelope 0.7 keys)
-  * Improved passphrase handling
-  * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
-  * Fix usage of stripped keys
-  * SHA256 as default for compatibility
-  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
-  * OpenPGP API now handles revoked/expired keys and returns all user ids
+  * Partage de l'écran de chiffrement en deux
+  * Correctif - Gestion des drapeaux de clefs (prend maintenant en charge les clefs Mailvelope 0.7)
+  * Gestion des phrases de passe améliorée
+  * Partage de clefs par SafeSlinger
+  * Yubikey : préférence pour permette d'autre NIP, seule la signature par l'API OpenPGP fonctionne présentement, mais pas à l'intérieur d'OpenKeychain
+  * Correctif - Utilisation de clefs dépouillées
+  * SHA256 par défaut pour la compatibilité
+  * L'API des intentions a changé, voir https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * L'API d'OpenPGP gère maintenant les clefs révoquées/expirées et retourne tous les ID utilisateurs
 
 
 ## 2.9
 
-  * Fixing crashes introduced in v2.8
-  * Experimental ECC support
-  * Experimental Yubikey support (signing-only with imported keys)
+  * Correction des plantages présents dans v2.8
+  * Prise en charge expérimentale CCE
+  * Prise en charge expérimentale de Yubikey (signature seulement avec les clefs importées)
 
 
 ## 2.8
 
-  * So many bugs have been fixed in this release that we focus on the main new features
-  * Key edit: awesome new design, key revocation
-  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
-  * New key creation screen: autocompletion of name and email based on your personal Android accounts
-  * File encryption: awesome new design, support for encrypting multiple files
-  * New icons to show status of key (by Brennan Novak)
-  * Important bug fix: Importing of large key collections from a file is now possible
-  * Notification showing cached passphrases
-  * Keys are connected to Android's contacts
+  * Tellement de bogues ont été réglés dans cette version que nous nous concentrons sur les nouvelles caractéristiques principales.
+  * Modification des clefs : nouvelle et superbe conception, révocations des clefs
+  * Importation des clefs : nouvelle et superbe conception, connexion sécurisé aux serveurs de clefs par hkps, résolution des serveurs de clefs par transactions DNS SRV
+  * Nouvel écran de premier lancement
+  * Nouvel écran de création de clef : auto-remplissage du nom et du courriel d'après vos coordonnées Android
+  * Chiffrement des fichiers : nouvelle et superbe conception, prise en charge du chiffrement de fichiers multiples
+  * Nouvelles icônes d'état des clefs (par Brennan Novak)
+  * Correctif important de bogue : l'importation de grandes collections de clefs à partir d'un fichier est maintenant possible
+  * Notification montrant les phrases de passe en cache
+  * Les clefs sont connectées aux contacts d'Android
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+Cette version ne serait pas possible sans le travail de Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
-  * Purple! (Dominik, Vincent)
-  * New key view design (Dominik, Vincent)
-  * New flat Android buttons (Dominik, Vincent)
-  * API fixes (Dominik)
-  * Keybase.io import (Tim Bray)
+  * Violet ! (Dominik, Vincent)
+  * Nouvelle présentation de la visualisation des clefs (Dominik, Vincent)
+  * Nouveaux boutons Android plats (Dominik, Vincent)
+  * Correctifs de l'API (Dominik)
+  * Importation de Keybase.io (Tim Bray)
 
 
 ## 2.6.1
 
-  * Some fixes for regression bugs
+  * Quelques correctifs de bogues de régression
 
 
 ## 2.6
 
-  * Key certifications (thanks to Vincent Breitmoser)
-  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
-  * New design for signature verification
-  * Custom key length (thanks to Greg Witczak)
-  * Fix share-functionality from other apps
+  * Certifications des clefs (merci à Vincent Breitmoser)
+  * Prise en charge clefs secrètes partielles de GnuPG (merci à Vincent Breitmoser)
+  * Nouvelle conception de la vérification de signatures
+  * Longueur de clef personnalisée (merci à Greg Witczak)
+  * Correctif - Fonctionnalités partagées d'autres applis
 
 
 ## 2.5
 
-  * Fix decryption of symmetric OpenPGP messages/files
-  * Refactored key edit screen (thanks to Ash Hughes)
-  * New modern design for encrypt/decrypt screens
-  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+  * Correctif - Déchiffrement des messages/fichiers symétriques OpenPGP
+  * Écran de modification des clefs remanié (merci à Ash Hughes)
+  * Nouvelle conception moderne pour les écrans de chiffrement/déchiffrement
+  * API OpenPGP version 3 (comptes multiples d'api, correctifs internes, recherche de clefs)
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
-Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-
-  * New unified key list
-  * Colorized key fingerprint
-  * Support for keyserver ports
-  * Deactivate possibility to generate weak keys
-  * Much more internal work on the API
-  * Certify user ids
-  * Keyserver query based on machine-readable output
-  * Lock navigation drawer on tablets
-  * Suggestions for emails on creation of keys
-  * Search in public key lists
-  * And much more improvements and fixes…
+Merci à tous les participants de « Google Summer of Code 2014 » qui ont rendu cette version riche en fonctions et sans bogue !
+À part plusieurs petits correctifs, un nombre notable de correctifs ont été apportés par les personnes suivantes (par ordre alphabétique) :
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+
+  * Nouvelle liste de clefs unifiée
+  * Empreintes de clefs colorées
+  * Prise en charge des ports des serveurs de clefs
+  * Désactiver la possibilité de générer des clefs faibles
+  * Encore plus de travail interne dans l'API
+  * Certifier les ID utilisateurs
+  * Requêtes des serveurs de clefs basées sur des sorties assimilables par la machine
+  * Verrouiller les tiroirs de navigation sur les tablettes
+  * Suggestion de courriels à la création de clefs
+  * Rechercher dans les listes de clefs publiques
+  * Et bien plus d'améliorations et de correctifs
 
 
 ## 2.3.1
 
-  * Hotfix for crash when upgrading from old versions
+  * Correctif d'urgence pour le plantage lors de la mise à niveau à partir d'anciennes versions
 
 
 ## 2.3
 
-  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
-  * Fix setting expiry dates on keys (thanks to Ash Hughes)
-  * More internal fixes when editing keys (thanks to Ash Hughes)
-  * Querying keyservers directly from the import screen
-  * Fix layout and dialog style on Android 2.2-3.0
-  * Fix crash on keys with empty user ids
-  * Fix crash and empty lists when coming back from signing screen
-  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
-  * Fix upload of key from signing screen
+  * Suppressions de l'exportation non nécessaire des clefs publiques lors de l'exportation de clefs secrètes (merci à Ash Hughes)
+  * Correctif - Définition de la date de péremption des clefs (merci à Ash Hughes)
+  * Plus de correctifs internes affectant la modifications des clefs (merci à Ash hughes)
+  * Interrogation des serveurs de clefs directement de l'écran d'importation
+  * Correctif - Mise en page et du style des fenêtres de dialogue sur Android 2.2-3.0
+  * Correctif - Plantage pour les clefs avec des ID utilisateur vides
+  * Correctif - Plantage et listes vides en revenant de l'écran de signature
+  * Bouncy Castle (bibliothèque cryptographique) mise à jour de 1.47 à 1.50 et compilée de la source
+  * Correctif - Téléversement d'une clef de l'écran de signature
 
 
 ## 2.2
 
-  * New design with navigation drawer
-  * New public key list design
-  * New public key view
-  * Bug fixes for importing of keys
-  * Key cross-certification (thanks to Ash Hughes)
-  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
-  * First version with new languages (thanks to the contributors on Transifex)
-  * Sharing of keys via QR Codes fixed and improved
-  * Package signature verification for API
+  * Nouvelle conception avec tiroir de navigation
+  * Nouvelle conception de la liste des clefs publics
+  * Nouvelle vue des clefs publics
+  * Correctif de bogues d'importation de clefs
+  * Certification croisée des clefs (merci à Ash Hughes)
+  * Bonne gestion des mots de passe UTF-8 (merci à Ash Hughes)
+  * Première version avec de nouvelles langues (merci aux contributeurs sur Transifex)
+  * Correctif et amélioration du partage de clefs par codes QR
+  * Vérification de la signature des paquets pour l'API
 
 
 ## 2.1.1
 
-  * API Updates, preparation for K-9 Mail integration
+  * Mise à jour de l'API, préparation à l'intégration à K-9 Mail
 
 
 ## 2.1
 
-  * Lots of bug fixes
-  * New API for developers
-  * PRNG bug fix by Google
+  * Beaucoup de bogues corrigés
+  * Nouvelle API pour les développeurs
+  * Correctif du blogue PRNG par Google
 
 
 ## 2.0
 
-  * Complete redesign
-  * Share public keys via QR codes, NFC beam
-  * Sign keys
-  * Upload keys to server
-  * Fixes import issues
-  * New AIDL API
+  * Conception complètement repensée
+  * Partage de clefs publiques par codes QR, faisceau NFC
+  * Signer les clefs
+  * Téléverser les clefs vers le serveur
+  * Corrige des problèmes d'importation
+  * Nouvelle API AIDL
 
 
 ## 1.0.8
 
-  * Basic keyserver support
+  * Prise en charge de base du serveur de clefs
   * App2sd
-  * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
-  * Bugfixes
-  * Optimizations
+  * Plus de choix pour le cache de la phrase de passe : 1, 2, 4, 8 heures
+  * Traductions : norvégien (merci Sander Danielsen), chinois (merci Zhang Fredrick)
+  * Correctifs de bogues
+  * Optimisations
 
 
 ## 1.0.7
 
-  * Fixed problem with signature verification of texts with trailing newline
-  * More options for passphrase cache time to live (20, 40, 60 mins)
+  * Problème corrigé avec la vérification de la signature des textes se terminant par un retour à la ligne
+  * Plus de choix pour la durée de vie de la phrase de passe (20, 40, 60 min)
 
 
 ## 1.0.6
 
-  * Account adding crash on Froyo fixed
-  * Secure file deletion
-  * Option to delete key file after import
-  * Stream encryption/decryption (gallery, etc.)
-  * New options (language, force v3 signatures)
-  * Interface changes
-  * Bugfixes
+  * Correctif - Plantage lors de l'ajout de compte sur Froyo
+  * Suppression sécurisée de fichiers
+  * Option de suppression du fichier de clef après l'importation
+  * Chiffrement/déchiffrement de flux (galerie, etc.)
+  * Nouvelles options (langue, forcer les signatures v3)
+  * Changements dans l'interface
+  * Correctifs de bogues
 
 
 ## 1.0.5
 
-  * German and Italian translation
-  * Much smaller package, due to reduced BC sources
-  * New preferences GUI
-  * Layout adjustment for localization
-  * Signature bugfix
+  * Traduction allemande et italienne
+  * Paquet beaucoup plus petit grâce à des sources BC réduites
+  * Nouvelle IUG pour les préférences
+  * Ajustement de la mise en page pour les localisations
+  * Correctif de bogue de signature
 
 
 ## 1.0.4
 
-  * Fixed another crash caused by some SDK bug with query builder
+  * Correction d'un autre plantage causé par quelque bogue SDK avec le constructeur de requêtes
 
 
 ## 1.0.3
 
-  * Fixed crashes during encryption/signing and possibly key export
+  * Corrections de plantages durant le chiffrement/la signature et possiblement l'exportation de clefs
 
 
 ## 1.0.2
 
-  * Filterable key lists
-  * Smarter pre-selection of encryption keys
-  * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
-  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+  * Listes de clefs filtrables
+  * Présélection plus intelligente des clefs de chiffrement
+  * Nouvelle gestion des intentions pour VIEW et SEND, permet le chiffrement/déchiffrement des fichiers du gestionnaires de fichiers
+  * Correctifs et fonctions additionnelles (présélection des clefs) pour K-9-Mail, nouvelle version bêta proposée
 
 
 ## 1.0.1
 
-  * GMail account listing was broken in 1.0.0, fixed again
+  * Le listage des comptes Gmail ne fonctionnait pas dans 1.0.0, maintenant corrigé
 
 
 ## 1.0.0
 
-  * K-9 Mail integration, APG supporting beta build of K-9 Mail
-  * Support of more file managers (including ASTRO)
-  * Slovenian translation
-  * New database, much faster, less memory usage
-  * Defined Intents and content provider for other apps
-  * Bugfixes
\ No newline at end of file
+  * Intégration à K-9 Mail, APG prenant en charge la version bêta de K-9 Mail
+  * Prise en charge de plus de gestionnaires de fichiers (incluant ASTRO)
+  * Traduction slovène
+  * Nouvelle base de données, bien plus rapide, utilisation de la mémoire moindre
+  * Intentions définies et fournisseur de contenu pour d'autres applis
+  * Correctifs de bogues
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.md b/OpenKeychain/src/main/res/raw-fr/help_start.md
index c7a5cb744..7ac45cc88 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_start.md
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.md
@@ -1,3 +1,4 @@
+[//] : # (NOTE : veuillez mettre chaque phrase dans sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !)
 
 ## Comment puis-je activer OpenKeychain dans K-9 Mail ?
 Pour utiliser OpenKeychain avec K-9 Mail, vous devez suivre ces étapes :
@@ -12,4 +13,4 @@ Veuillez signaler le bogue en utilisant le [gestionnaire de bogue d'OpenKeychain
 Si vous voulez nous aider à développer OpenKeychain en y contribuant par du code [veuillez suivre notre petit guide sur Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Traductions
-Aidez à traduire OpenKeychain ! Tout le monde peut y participer sur la [page d'OpenKeychain sur Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
+Aidez-nous à traduire le OpenKeychain ! Tout le monde peut y participer sur la <a href="https://www.transifex.com/projects/p/open-keychain/">page d'OpenKeychain sur Transifex</a>.
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-is/help_about.md b/OpenKeychain/src/main/res/raw-is/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-is/help_about.md
+++ b/OpenKeychain/src/main/res/raw-is/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-is/help_certification.md b/OpenKeychain/src/main/res/raw-is/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-is/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-is/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.md b/OpenKeychain/src/main/res/raw-is/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-is/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-is/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-is/help_start.md b/OpenKeychain/src/main/res/raw-is/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-is/help_start.md
+++ b/OpenKeychain/src/main/res/raw-is/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-it/help_about.md b/OpenKeychain/src/main/res/raw-it/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-it/help_about.md
+++ b/OpenKeychain/src/main/res/raw-it/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-it/help_certification.md b/OpenKeychain/src/main/res/raw-it/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-it/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-it/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.md b/OpenKeychain/src/main/res/raw-it/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-it/help_start.md b/OpenKeychain/src/main/res/raw-it/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-it/help_start.md
+++ b/OpenKeychain/src/main/res/raw-it/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-ja/help_about.md b/OpenKeychain/src/main/res/raw-ja/help_about.md
index d6a8eca93..f19a5f877 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_about.md
@@ -1,12 +1,13 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
-[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android.
+[OpenKeychain](http://www.openkeychain.org) は Android における OpenPGP 実装です。
 
-License: GPLv3+
+ライセンス: GPLv3以降
 
-## Developers
-  * Dominik Schürmann (Maintainer)
+## Developers## 開発者
+  * Dominik Schürmann (メンテナ)
   * Art O Cathain
   * Ash Hughes
   * Brian C. Barnes
@@ -27,7 +28,7 @@ License: GPLv3+
   * Tim Bray
   * Vincent Breitmoser
 
-## Libraries
+## ライブラリ
   * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
   * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
   * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
@@ -37,7 +38,7 @@ License: GPLv3+
   * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
   * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
   * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
-  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache License v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
   * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2)
   * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
   * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
diff --git a/OpenKeychain/src/main/res/raw-ja/help_certification.md b/OpenKeychain/src/main/res/raw-ja/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
index e9d61d0f3..c25d91a19 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md
@@ -1,51 +1,52 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
-  * Material design
-  * Integration of QR Scanner (New permissions required)
-  * Improved key creation wizard
-  * Fix missing contacts after sync
-  * Requires Android 4
-  * Redesigned key screen
-  * Simplify crypto preferences, better selection of secure ciphers
-  * API: Detached signatures, free selection of signing key,...
-  * Fix: Some valid keys were shown revoked or expired
-  * Don't accept signatures by expired or revoked subkeys
-  * Keybase.io support in advanced view
+  * マテリアルデザイン
+  * QRスキャナの統合 (新しいパーミッションを必要とします)
+  * 鍵生成ウィザードの改善
+  * 同期後に連絡先を見失う問題の修正
+  * Android 4を必要とします
+  * 鍵画面の再デザイン
+  * 暗号の設定をシンプル化、より良いセキュアな暗号の選択方法
+  * API: 分離署名、署名する鍵の選択がフリーとなる、...
+  * 修正: いくつかの正しい鍵が破棄もしくは期限切れとして表示される
+  * 副鍵が期限切れもしくは破棄されている場合に署名を受け入れない
+  * 拡張ビューでのKeybase.ioのサポート
 
 
 ## 3.1.2
 
-  * Fix key export to files (now for real)
+  * 鍵のファイルへのエクスポートの修正 (現実的になりました)
 
 
 ## 3.1.1
 
-  * Fix key export to files (they were written partially)
-  * Fix crash on Android 2.3
+  * 鍵のファイルへのエクスポートの修正 (部分的に修正)
+  * Android 2.3でのクラッシュ修正
 
 
 ## 3.1
 
-  * Fix crash on Android 5
-  * New certify screen
-  * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
-  * Redesigned decrypt screen
-  * New icon usage and colors
-  * Fix import of secret keys from Symantec Encryption Desktop
-  * Subkey IDs on Yubikeys are now checked correctly
+  * Android 5でのクラッシュ修正
+  * 新しい検証画面
+  * セキュアな鍵リストの直接交換(SafeSlinger ライブラリ)
+  * 新しいQRコードのプログラムフロー
+  * 復号化画面の再デザイン
+  * 新しいアイコン利用とカラー
+  * Symantec Encryption Desktopから秘密鍵をインポート時の問題修正
+  * Yubikeyでの副鍵IDを正くチェックするようになりました
 
 
 ## 3.0.1
 
-  * Better handling of large key imports
-  * Improved subkey selection
+  * 巨大な鍵のインポートのより良い取り扱い
+  * 副鍵選択の改善
 
 
 ## 3.0
 
-  * Full support for Yubikey signature generation and decryption!
+  * Yubikeyでの署名生成と復号化のフルサポート
   * Propose installable compatible apps in apps list
   * New design for decryption screens
   * Many fixes for key import, also fixes stripped keys
@@ -53,67 +54,67 @@
   * User interface to generate custom keys
   * Fixing user id revocation certificates
   * New cloud search (searches over traditional keyservers and keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * OpenKeychain内で鍵をストリップするのをサポートしました
 
 
 ## 2.9.2
 
-  * Fix keys broken in 2.9.1
-  * Yubikey decryption now working via API
+  * 2.9.1での鍵破壊問題修正
+  * API経由でYubikeyの復号処理が動くようになった
 
 
 ## 2.9.1
 
-  * Split encrypt screen into two
-  * Fix key flags handling (now supporting Mailvelope 0.7 keys)
-  * Improved passphrase handling
-  * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
-  * Fix usage of stripped keys
-  * SHA256 as default for compatibility
-  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
-  * OpenPGP API now handles revoked/expired keys and returns all user ids
+  * 暗号化スクリーンを2つに分割
+  * 鍵のフラグ管理を修正 (現在Mailvelope 0.7 鍵をサポート)
+  * パスフレーズの取り回しを改善
+  * SafeSlingerでの鍵の共有
+  * Yubikey: 設定で他のPINを受け付け、現在OpenPGP API経由での署名しか動きません、OpenKeychainの内部ではないため
+  * ストリップした鍵の利用法を修正
+  * 互換性のためデフォルトをSHA256に
+  * インテント API を変更しました、以下参照 https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * OpenPGP API は現在破棄/期限切れの鍵を扱えるようになり、またすべてのユーザIDを返すようになりました
 
 
 ## 2.9
 
-  * Fixing crashes introduced in v2.8
-  * Experimental ECC support
-  * Experimental Yubikey support (signing-only with imported keys)
+  * v2.8 から発生したクラッシュ問題をFix
+  * 実験的にECCをサポート
+  * 実験的にYubikeyをサポート(インポート済みの鍵での署名のみ)
 
 
 ## 2.8
 
-  * So many bugs have been fixed in this release that we focus on the main new features
-  * Key edit: awesome new design, key revocation
-  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
-  * New key creation screen: autocompletion of name and email based on your personal Android accounts
-  * File encryption: awesome new design, support for encrypting multiple files
-  * New icons to show status of key (by Brennan Novak)
-  * Important bug fix: Importing of large key collections from a file is now possible
-  * Notification showing cached passphrases
-  * Keys are connected to Android's contacts
+  * そして主要な新しい機能を主眼としたこのリリースでたくさんのバグが修正されました
+  * 鍵編集: 新しいすごいデザイン、鍵の破棄
+  * 鍵インポート: 新しいすごいデザイン、hkps経由での鍵サーバとの安全な接続、そしてDNS SRVレコードによる鍵サーバの解決
+  * 新しい初回表示
+  * 新しい鍵生成画面: Androidのあなたの個人アカウントをベースとした名前とメールの自動補完
+  * ファイル暗号化: 新しいすごいデザイン、複数ファイルの暗号化をサポートする
+  * 鍵のステータス表示の新しいアイコン(Brennan Novak提供)
+  * 重要なバグ修正: 巨大な鍵コレクションをファイルからインポートするのが可能になりました
+  * キャッシュしたパスフレーズの通知表示
+  * 鍵のアドレスをAndroidの連絡先と連携するようにした
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfiharの働きなくしてはこのリリースはありませんでした
 
 ## 2.7
 
   * Purple! (Dominik, Vincent)
-  * New key view design (Dominik, Vincent)
-  * New flat Android buttons (Dominik, Vincent)
-  * API fixes (Dominik)
-  * Keybase.io import (Tim Bray)
+  * 新しい鍵のビューのデザイン (Dominik, Vincent)
+  * 新しいフラットな Android ボタン (Dominik, Vincent)
+  * API のフィックス (Dominik)
+  * Keybase.io からのインポート (Tim Bray)
 
 
 ## 2.6.1
 
-  * Some fixes for regression bugs
+  * いくつかのリグレッションバグ修正
 
 
 ## 2.6
 
-  * Key certifications (thanks to Vincent Breitmoser)
+  * 鍵証明 (ありがとうVincent Breitmoser)
   * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
   * New design for signature verification
   * Custom key length (thanks to Greg Witczak)
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.md b/OpenKeychain/src/main/res/raw-ja/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_start.md
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-nl/help_about.md b/OpenKeychain/src/main/res/raw-nl/help_about.md
index 15d3796e9..9d3693d33 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_about.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-nl/help_certification.md b/OpenKeychain/src/main/res/raw-nl/help_certification.md
index 8da27e8e0..c7b8c6d4c 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_certification.md
@@ -1,27 +1,28 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## Key Confirmation
-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.
+## Sleutelbevestiging
+Zonder bevestiging kan je niet zeker zijn dat een sleutel echt overeenkomt met een bepaald persoon.
+De meest eenvoudige manier om een sleutel te bevestigen is door de QR-code te scannen of de sleutel uit te wisselen via NFC.
+Om sleutels tussen meer dan twee personen te bevestigen stellen we voor om de sleuteluitwisselingsmethode beschikbaar voor je sleutels te gebruiken.
 
-## Key Status
+## Sleutelstatus
 
 <img src="status_signature_verified_cutout_24dp"/>  
-Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
+Bevestigd: je hebt deze sleutel al bevestigd, bv. door de QR-code te scannen.  
 <img src="status_signature_unverified_cutout_24dp"/>  
-Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.  
+Niet bevestigd: deze sleutel is nog niet bevestigd. Je kan niet zeker zijn dat de sleutel echt overeenkomt met een bepaald persoon.  
 <img src="status_signature_expired_cutout_24dp"/>  
-Expired: This key is no longer valid. Only the owner can extend its validity.  
+Verlopen: deze sleutel is niet meer geldig. Enkel de eigenaar kan de geldigheid verlengen.  
 <img src="status_signature_revoked_cutout_24dp"/>  
-Revoked: This key is no longer valid. It has been revoked by its owner.
+Ingetrokken: deze sleutel is niet meer geldig. Ze is door de eigenaar ingetrokken.
 
-## Advanced Information
-A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
-This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) 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."
+## Geavanceerde informatie
+Een "sleutelbevestiging" in OpenKeychain is geïmplementeerd door een certificatie aan te maken volgens de OpenPGP-standaard.
+Deze certificatie is een ["generische certificatie (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) omschreven in de standaard als:
+"De uitgever van deze certificatie maakt geen specifieke aanname over hoe goed de certificeerder heeft nagegaan dat de eigenaar van sleutel effectief de persoon is beschreven door het gebruikers-ID."
 
-Traditionally, certifications (also 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 an ownertrust database like in GnuPG.
-Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
\ No newline at end of file
+Traditioneel worden certificaties (ook met hogere certificatieniveau's, zoals "positieve certificaties" (0x13)) georganiseerd in OpenPGP's Web of Trust.
+Ons model van sleutelbevestiging is een veel eenvoudige concept om veel voorkomende gebruiksproblemen gerelateerd aan dit Web of Trust te vermijden.
+We nemen aan dat sleutels slechts geverifieerd zijn tot een bepaalde graad die nog steeds bruikbaar genoeg is om "onderweg" uitgevoerd te worden.
+We implementeren ook geen (mogelijk transitieve) vertrouwensondertekeningen of een gebruikersvertrouwendatabase zoals in GnuPG.
+Bovendien worden sleutels die minstens een gebruikers-ID gecertificeerd door een vertrouwde sleutel bevatten aangeduid als "bevestigd" in de sleutellijsten.
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.md b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
index 96dcb5241..6fd5d9872 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -28,13 +29,13 @@
 ## 3.1
 
   * Oplossing voor crash op Android 5
-  * New certify screen
-  * Secure Exchange directly from key list (SafeSlinger library)
-  * New QR Code program flow
-  * Redesigned decrypt screen
-  * New icon usage and colors
-  * Fix import of secret keys from Symantec Encryption Desktop
-  * Subkey IDs on Yubikeys are now checked correctly
+  * Nieuw certificeerscherm
+  * Veilig uitwisselen vanuit sleutellijst (SafeSlinger bibliotheek)
+  * Nieuwe QR code programma flow
+  * Nieuw design voor ontcijferingsscherm
+  * Nieuw icoon en kleuren
+  * Oplossing voor importeren van geheime sleutels van Symantec Encryption Desktop
+  * Subsleutel-ID's op Yubikeys worden nu currect gecontroleerd
 
 
 ## 3.0.1
@@ -45,15 +46,15 @@
 
 ## 3.0
 
-  * Full support for Yubikey signature generation and decryption!
-  * Propose installable compatible apps in apps list
-  * New design for decryption screens
-  * Many fixes for key import, also fixes stripped keys
-  * Honor and display key authenticate flags
-  * User interface to generate custom keys
-  * Fixing user id revocation certificates
-  * New cloud search (searches over traditional keyservers and keybase.io)
-  * Support for stripping keys inside OpenKeychain
+  * Volledige ondersteuning voor Yubikey ondertekeningsgeneratie en ontcijfering!
+  * Stel installeerbare compatibele apps voor in apps-lijst
+  * Nieuw design voor ontcijferingsschermen
+  * Veel oplossingen voor sleutelimporteren, lost ook gestripte sleutels op
+  * Eer en toon sleutelauthenticatievlaggen
+  * Gebruikersinterface om eigen sleutels aan te maken
+  * Oplossing voor gebruikers-ID-intrekkingscertificaten
+  * Nieuwe cloud search (zoekt op traditionele sleutelservers en keybase.io)
+  * Ondersteuning voor strippen van sleutels in OpenKeychain
 
 
 ## 2.9.2
@@ -64,15 +65,15 @@
 
 ## 2.9.1
 
-  * Split encrypt screen into two
-  * Fix key flags handling (now supporting Mailvelope 0.7 keys)
-  * Improved passphrase handling
-  * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
-  * Fix usage of stripped keys
-  * SHA256 as default for compatibility
-  * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
-  * OpenPGP API now handles revoked/expired keys and returns all user ids
+  * Deel versleutelingsscherm in twee
+  * Oplossing voor sleutelvlaggen (ondersteunt nu Mailvelope 0.7 sleutels)
+  * Verbeterde behandeling van wachtwoorden
+  * Sleutels delen via SafeSlinger
+  * Yubikey: optie om andere PINs toe te staan, momenteel werkt enkel ondertekenen via de OpenPGP API, niet in OpenKeychain zelf
+  * Oplossing voor gestripte sleutels
+  * SHA256 als standaard voor compatibiliteit
+  * Intent API is veranderd, zie https://github.com/open-keychain/open-keychain/wiki/Intent-API
+  * OpenPGP API behandelt nu ingetrokken/verlopen sleutels en geeft alle gebruikers-ID's weer
 
 
 ## 2.9
@@ -84,24 +85,24 @@
 
 ## 2.8
 
-  * So many bugs have been fixed in this release that we focus on the main new features
-  * Key edit: awesome new design, key revocation
-  * Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records
-  * New first time screen
-  * New key creation screen: autocompletion of name and email based on your personal Android accounts
-  * File encryption: awesome new design, support for encrypting multiple files
-  * New icons to show status of key (by Brennan Novak)
-  * Important bug fix: Importing of large key collections from a file is now possible
-  * Notification showing cached passphrases
-  * Keys are connected to Android's contacts
+  * Er zijn zoveel bugs opgelost in deze release dat we kunnen focussen op de belangrijke nieuwe mogelijkheden
+  * Sleutels wijzigen: nieuw design, sleutels intrekken
+  * Sleutels importeren: nieuw design, veilige verbindingen met sleutelservers via hkps, sleutelserver resolving via DNS SRV records
+  * Nieuw eerste gebruiksscherm
+  * Nieuw scherm voor sleutels aanmaken: automatisch aanvullen van naam en e-mailadres gebaseerd op persoonlijke Android-accounts
+  * Bestandsversleuteling: nieuw design, ondersteuning voor versleutelen van meerdere bestanden
+  * Nieuwe iconen om sleutelstatus weer te geven (door Brennan Novak)
+  * Belangrijke bugfix: importeren van grote sleutelbossen uit een bestand is nu mogelijk
+  * Melding om gecachete wachtwoorden weer te geven
+  * Sleutels worden verbonden aan Android's contacten
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+Deze release zou niet mogelijk zijn zonder het werkt van Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
-  * Purple! (Dominik, Vincent)
-  * New key view design (Dominik, Vincent)
-  * New flat Android buttons (Dominik, Vincent)
+  * Paars! (Dominik, Vincent)
+  * Nieuw sleutel scherm design (Dominik, Vincent)
+  * Nieuwe platte Android toetsen (Dominik, Vincent)
   * API fixes (Dominik)
   * Keybase.io import (Tim Bray)
 
@@ -113,37 +114,37 @@
 
 ## 2.6
 
-  * Key certifications (thanks to Vincent Breitmoser)
-  * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
-  * New design for signature verification
-  * Custom key length (thanks to Greg Witczak)
-  * Fix share-functionality from other apps
+  * Sleutelcertificaties (dank aan Vincent Breitmoser)
+  * Ondersteuning voor GnuPG gedeeltelijke geheime sleutels (dank aan Vincent Breitmoser)
+  * Nieuw design voor ondertekeningsverificatie
+  * Aangepaste sleutellengte (dank aan Greg Witczak)
+  * Oplossing voor delen vanuit andere apps
 
 
 ## 2.5
 
-  * Fix decryption of symmetric OpenPGP messages/files
-  * Refactored key edit screen (thanks to Ash Hughes)
-  * New modern design for encrypt/decrypt screens
-  * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)
+  * Oplossing voor ontcijfering van symmetrische OpenPGP berichten/bestanden
+  * Nieuw ontwerp voor sleutelbewerkingsscherm (dank aan Ash Hughes)
+  * Nieuw modern design voor versleutelings/ontcijferingsschermen
+  * OpenPGP API versie 3 (meerdere api accounts, interne fixes, sleutel lookup)
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
-Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
-
-  * New unified key list
-  * Colorized key fingerprint
-  * Support for keyserver ports
-  * Deactivate possibility to generate weak keys
-  * Much more internal work on the API
-  * Certify user ids
-  * Keyserver query based on machine-readable output
-  * Lock navigation drawer on tablets
-  * Suggestions for emails on creation of keys
-  * Search in public key lists
-  * And much more improvements and fixes…
+Bedankt aan alle deelnemers van Google Summer of Code 2014 die deze release vol met nieuwe mogelijkheden en vrij van bugs gemaakt hebben!
+Naast vele kleine patches werden ook een aanzienlijk aantal patches gemaakt door de volgende personen (in alfabetische volgorde):
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
+
+  * Nieuwe geünificeerde sleutellijst
+  * Gekleurde sleutelvingerafdruk
+  * Ondersteuning voor sleutelserver-poorten
+  * Zet mogelijkheid om zwakke sleutels aan te maken uit
+  * Veel meer intern werk aan API
+  * Certificeer gebruikers-ID's
+  * Sleutelserverzoekopdracht gebaseerd op machine-leesbare output
+  * Zet navigatiedrawer op tablets vast
+  * Suggesties voor e-mailadress bij aanmaken van sleutels
+  * Zoeken in publieke sleutellijsten
+  * En veel meer verbeteringen en fixes...
 
 
 ## 2.3.1
@@ -153,28 +154,28 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 2.3
 
-  * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
-  * Fix setting expiry dates on keys (thanks to Ash Hughes)
-  * More internal fixes when editing keys (thanks to Ash Hughes)
-  * Querying keyservers directly from the import screen
-  * Fix layout and dialog style on Android 2.2-3.0
-  * Fix crash on keys with empty user ids
-  * Fix crash and empty lists when coming back from signing screen
-  * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source
-  * Fix upload of key from signing screen
+  * Verwijder onnodige export van publieke sleutels bij exporteren van geheime sleutel (dank aan Ash Hughes)
+  * Oplossing voor verloopdata op sleutels (dank aan Ash Hughes)
+  * Meer interne fixes by bewerken van sleutels (dank aan Ash Hughes)
+  * Zoeken op sleutelservers rechtstreeks van importscherm
+  * Oplossing voor layout en dialoogstijl op Android 2.2-3.0
+  * Oplossing voor crash op sleutels met lege gebruikers-ID's
+  * Oplossing voor crash en lege lijsten bij terugkeren van ondertekeningsscherm
+  * Bouncy Castle (cryptografie bibliotheek) bijgewerkt van 1.47 naar 1.50 en versie van bron
+  * Oplossing voor uploaden van sleutel van ondertekeningsscherm
 
 
 ## 2.2
 
-  * New design with navigation drawer
-  * New public key list design
-  * New public key view
-  * Bug fixes for importing of keys
-  * Key cross-certification (thanks to Ash Hughes)
-  * Handle UTF-8 passwords properly (thanks to Ash Hughes)
-  * First version with new languages (thanks to the contributors on Transifex)
-  * Sharing of keys via QR Codes fixed and improved
-  * Package signature verification for API
+  * Nieuw design met navigatiebalk
+  * Nieuw publieke sleutellijst design
+  * Nieuwe publieke sleutel view
+  * Bugfixes voor importeren van sleutels
+  * Sleutel certificatie (dank aan Ash Hughes)
+  * Behandel UTF-8 wachtwoorden correct (dank aan Ash Hughes)
+  * Eerste versie met nieuwe talen (dank aan de medewerkers op Transifex)
+  * Delen van sleutels via QR codes opgelost en verbeterd
+  * Pakketondertekeningsverificatie voor API
 
 
 ## 2.1.1
@@ -191,22 +192,22 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 2.0
 
-  * Complete redesign
-  * Share public keys via QR codes, NFC beam
-  * Sign keys
-  * Upload keys to server
-  * Fixes import issues
-  * New AIDL API
+  * Volledig nieuw design
+  * Publieke sleutels delen via QR codes, NFC beam
+  * Sleutels ondertekenen
+  * Upload sleutels naar server
+  * Importeerproblemen opgelost
+  * Nieuwe AIDL API
 
 
 ## 1.0.8
 
-  * Basic keyserver support
-  * App2sd
-  * More choices for passphrase cache: 1, 2, 4, 8, hours
-  * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+  * Basisondersteuning voor sleutelservers
+  * App2SD
+  * Meer keuzes voor wachtwoordcache: 1, 2, 4, 8 uur
+  * Vertalingen: Noors (bedankt, Sander Danielsen), Chinees (bedankt, Zhang Fredrick)
   * Bugfixes
-  * Optimizations
+  * Optimalisaties
 
 
 ## 1.0.7
@@ -217,22 +218,22 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.6
 
-  * Account adding crash on Froyo fixed
-  * Secure file deletion
-  * Option to delete key file after import
-  * Stream encryption/decryption (gallery, etc.)
-  * New options (language, force v3 signatures)
-  * Interface changes
+  * Crash bij toevoegen van account op Froyo opgelost
+  * Veilige bestandsverwijdering
+  * Optie om sleutelbestand na importeren te verwijderen
+  * Stream versleuteling/ontsleuteling (galerij, enz.)
+  * Nieuwe opties (taal, forceer v3 ondertekeningen)
+  * Wijzigingen in interface
   * Bugfixes
 
 
 ## 1.0.5
 
-  * German and Italian translation
-  * Much smaller package, due to reduced BC sources
-  * New preferences GUI
-  * Layout adjustment for localization
-  * Signature bugfix
+  * Duitse en Italiaanse vertaling
+  * Veel kleiner pakket, door verminderde BC bronnen
+  * Nieuwe GUI voor voorkeuren
+  * Layout wijzigingen voor localisatie
+  * Bugfix voor ondertekeningen
 
 
 ## 1.0.4
@@ -247,10 +248,10 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.2
 
-  * Filterable key lists
-  * Smarter pre-selection of encryption keys
-  * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
-  * Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+  * Filterbare sleutellijsten
+  * Slimmere preselectie van cryptosleutels
+  * Nieuwe Intents voor VIEW en SEND, laat toe bestanden te versleutelen/ontcijferen vanuit bestandsbeheerders
+  * Oplossingen en nieuwe functies (sleutel preselectie) voor K-9 Mail, nieuwe beta build beschikbaar
 
 
 ## 1.0.1
@@ -260,9 +261,9 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 ## 1.0.0
 
-  * K-9 Mail integration, APG supporting beta build of K-9 Mail
-  * Support of more file managers (including ASTRO)
-  * Slovenian translation
-  * New database, much faster, less memory usage
-  * Defined Intents and content provider for other apps
+  * K-9 Mail integratie, APG ondersteunende beta versie van K-9 Mail
+  * Ondersteuning voor meer bestandsbeheerders (waaronder ASTRO)
+  * Sloveense vertaling
+  * Nieuwe database, veel sneller, minder geheugengebruik
+  * Intents en content provider voor andere apps gedefinieerd
   * Bugfixes
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-nl/help_start.md b/OpenKeychain/src/main/res/raw-nl/help_start.md
index 83e27bf97..9eaf23640 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_start.md
+++ b/OpenKeychain/src/main/res/raw-nl/help_start.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Hoe activeer ik OpenKeychain in K-9 Mail?
 Volg deze stappen om OpenKeychain te gebruiken met K-9 Mail:
@@ -12,4 +13,4 @@ Rapporteer de bug met de [problementracker van OpenKeychain](https://github.com/
 Als je ons wil helpen om OpenKeychain te ontwikkelen door code bij te dragen, [volg dan onze kleine gids op GitHub](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Vertalingen
-Help OpenKeychain te vertalen! Iedereen kan deelnemen op [OpenKeychain op Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help OpenKeychain te vertalen! Iedereen kan deelnemen op [OpenKeychain op Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-pl/help_about.md b/OpenKeychain/src/main/res/raw-pl/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_about.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-pl/help_certification.md b/OpenKeychain/src/main/res/raw-pl/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.md b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.md b/OpenKeychain/src/main/res/raw-pl/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_start.md
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-pt/help_about.md b/OpenKeychain/src/main/res/raw-pt/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_about.md
+++ b/OpenKeychain/src/main/res/raw-pt/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-pt/help_certification.md b/OpenKeychain/src/main/res/raw-pt/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-pt/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.md b/OpenKeychain/src/main/res/raw-pt/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-pt/help_start.md b/OpenKeychain/src/main/res/raw-pt/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_start.md
+++ b/OpenKeychain/src/main/res/raw-pt/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-ro/help_about.md b/OpenKeychain/src/main/res/raw-ro/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-ro/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ro/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-ro/help_certification.md b/OpenKeychain/src/main/res/raw-ro/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-ro/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-ro/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.md b/OpenKeychain/src/main/res/raw-ro/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-ro/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ro/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-ro/help_start.md b/OpenKeychain/src/main/res/raw-ro/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-ro/help_start.md
+++ b/OpenKeychain/src/main/res/raw-ro/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-ru/help_about.md b/OpenKeychain/src/main/res/raw-ru/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_about.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-ru/help_certification.md b/OpenKeychain/src/main/res/raw-ru/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.md b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.md b/OpenKeychain/src/main/res/raw-ru/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.md
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-sl/help_about.md b/OpenKeychain/src/main/res/raw-sl/help_about.md
index d6a8eca93..dc333ca2d 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_about.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_about.md
@@ -1,12 +1,13 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
-[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android.
+[OpenKeychain](http://www.openkeychain.org) je implementacija OpenPGP za Android.
 
-License: GPLv3+
+Licenca: GPLv3+
 
-## Developers
-  * Dominik Schürmann (Maintainer)
+## Razvijalci
+  * Dominik Schürmann (Skrbnik)
   * Art O Cathain
   * Ash Hughes
   * Brian C. Barnes
@@ -27,19 +28,19 @@ License: GPLv3+
   * Tim Bray
   * Vincent Breitmoser
 
-## Libraries
-  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License)
-  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License)
-  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2)
-  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Apache License v2)
-  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2)
-  * [MiniDNS](https://github.com/rtreffer/minidns) (Apache License v2)
-  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2)
-  * [ZXing](https://github.com/zxing/zxing) (Apache License v2)
-  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Apache License v2)
-  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache License v2)
-  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Apache License v2)
-  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
-  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Apache License v2)
-  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Apache License v2)
-  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Apache License v2)
\ No newline at end of file
+## Knjižnice
+  * [SpongyCastle](http://rtyley.github.com/spongycastle/) (Licenca MIT X11)
+  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (Licenca MIT)
+  * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Licenca Apache v2)
+  * [KeybaseLib](https://github.com/timbray/KeybaseLib) (Licenca Apache v2)
+  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licenca Apache v2)
+  * [MiniDNS](https://github.com/rtreffer/minidns) (Licenca Apache v2)
+  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licenca Apache v2)
+  * [ZXing](https://github.com/zxing/zxing) (Licenca Apache v2)
+  * [ZXing Android Minimal](https://github.com/journeyapps/zxing-android-embedded) (Licenca Apache v2)
+  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Licenca Apache v2)
+  * [MaterialNavigationDrawer](https://github.com/neokree/MaterialNavigationDrawer) (Licenca Apache v2)
+  * [Snackbar](https://github.com/nispok/snackbar) (Licenca MIT)
+  * [FloatingActionButton](https://github.com/futuresimple/android-floating-action-button) (Licenca Apache v2)
+  * [HtmlTextView](https://github.com/dschuermann/html-textview) (Licenca Apache v2)
+  * [Markdown4J](https://github.com/jdcasey/markdown4j) (Licenca Apache v2)
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-sl/help_certification.md b/OpenKeychain/src/main/res/raw-sl/help_certification.md
index 8da27e8e0..12a86e726 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_certification.md
@@ -1,27 +1,28 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## Key Confirmation
-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.
+## Potrjevanje ključev
+Brez overitve ne morete vedeti, če nek ključ zares pripada določeni osebi.
+Najbolj preprost način za overitev ključa je skeniranje kode QR ali izmenjava ključev preko NFC.
+Za overjanje ključev med več kot dvema osebama priporočamo uporabo izmenjave, ki je na voljo za vaše ključe.
 
-## Key Status
+## Status ključa
 
 <img src="status_signature_verified_cutout_24dp"/>  
-Confirmed: You have already confirmed this key, e.g., by scanning the QR Code.  
+Ključ je potrjen: ta ključ ste že potrdili, npr. s skeniranjem kode QR.  
 <img src="status_signature_unverified_cutout_24dp"/>  
-Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person.  
+Ključ ni potrjen: Ta ključ še ni bil overjen, zato ne morete vedeti, če res pripada osebi, ki naj bi jo predstavljal.  
 <img src="status_signature_expired_cutout_24dp"/>  
-Expired: This key is no longer valid. Only the owner can extend its validity.  
+Ključ je potekel: Ta ključ ni več veljaven. Samo lastnik lahko podaljša veljavnost svojega ključa.  
 <img src="status_signature_revoked_cutout_24dp"/>  
-Revoked: This key is no longer valid. It has been revoked by its owner.
+Ključ preklican: Ta ključ ni več veljaven. Lastnik ga je preklical.
 
-## Advanced Information
-A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.
-This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) 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."
+## Dodatne informacije
+"Overitev ključa" se v aplikaciji OpenKeychain izvede s stvaritvijo potrdila v skladu s standardom OpenPGP.
+To potrdilo je ["generično potrdilo (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1), kot je zapisano v standardu:
+"Izdajatelj tega potrdila ne jamči za kakovost preverjanja overitelja, če je lastnik ključa dejansko oseba, označena v identifikaciji (ID) ključa."
 
-Traditionally, certifications (also 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 an ownertrust database like in GnuPG.
-Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
\ No newline at end of file
+Navadno so potrdila (tudi na višji stopnji overjanja, kot so "pozitivna pravila" (0x13)) organizirana v Omrežje zaupanja OpenPGP.
+Naš način overjanja je mnogo bolj preprost, s čimer se želimo izogniti pogostim težavam povezanim z Omrežjem zaupanja.
+Domnevamo, da so ključi preverjeni do mere, ki je še uporabna, glede na mobilno naravo aplikacije.
+Tudi ne ponujamo (potencialno prenosljivih) t.i. podpisov zaupanja kot jih ponuja GnuPG.
+Nadalje; ključi, ki vsebujejo vsaj en ID potrjen s strani zaupanja vrednega ključa, bodo na seznamu označeni kot "overjeni".
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-sl/help_start.md b/OpenKeychain/src/main/res/raw-sl/help_start.md
index 1641f913b..78c002de4 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_start.md
+++ b/OpenKeychain/src/main/res/raw-sl/help_start.md
@@ -1,15 +1,16 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
-## How do I activate OpenKeychain in K-9 Mail?
-To use OpenKeychain with K-9 Mail, you want to follow these steps:
-  1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
-  3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
+## Kako aktivirati OpenKeychain v aplikaciji K-9 Mail?
+Za uporabo OpenKeychain v aplikaciji K-9 Mail sledite naslednjim korakom:
+  1. Odprite aplikacijo K-9 Mail in dlje časa zadržite prst na računu s katerim želite uporabljati OpenKeychain.
+  2. Izberite "Nastavitve računa", se pomaknite na dno in kliknite "Šifriranje".
+  3. Kliknite na "Ponudnik OpenPGP" in na seznamu izberite OpenKeychain.
 
-## I found a bug in OpenKeychain!
-Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
+## Našel sem 'hrošča' v aplikaciji OpenKeychain!
+Za prijavo hrošča uporabite [sledilnik težav za OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues).
 
-## Contribute
-If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
+## Prispevajte
+Če želite pomagati pri razvoju aplikacije OpenKeychain in prispevati lastno kodo [prosimo sledite navodilom na Github-u](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
-## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+## Prevodi
+Pomagajte nam pri prevajanju aplikacije OpenKeychain! Svoje prevode lahko prispevate tukaj: [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-sr/help_about.md b/OpenKeychain/src/main/res/raw-sr/help_about.md
index 2ffe80e3b..77a4904e5 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_about.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_about.md
@@ -1,3 +1,4 @@
+[//]: #
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-sr/help_certification.md b/OpenKeychain/src/main/res/raw-sr/help_certification.md
index 03af89a61..20b68cf9b 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_certification.md
@@ -1,7 +1,8 @@
+[//]: #
 
 ## Потврда кључа
 Без потврде не можете бити сигурни да ли кључ заиста одговара одређеној особи.
-Најједноставнији начин потврђивања кључа је очитавање бар-кôда или размена преко НФЦ.
+Најједноставнији начин да потврдите кључ је очитавањем бар-кôда или разменом преко НФЦ.
 Да бисте потврдили кључеве између две или више особа, предлажемо да користите методу размене кључева која је доступна за ваш кључ.
 
 ## Стање кључа
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.md b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
index 3b0dbcc05..e33c6b4e4 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: #
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Обавештење које показује кеширане лозинке
   * Кључеви су повезани са Андроидовим контактима
 
-<p>Ово издање не би било могуће без рада Винсента Брајтмозера (ГСоЦ 2014), „mar-v-in“-а (ГСоЦ 2014), Данијела Алберта (Daniel Albert), Арта Катијана (Art O Cathain), Данијела Хаса, Тима Бреја, „Thialfihar“-а</p>
+Ово издање не би било могуће без рада Винсента Брајтмозера (ГСоЦ 2014), „mar-v-in“-а (ГСоЦ 2014), Данијела Алберта (Daniel Albert), Арта Катијана (Art O Cathain), Данијела Хаса, Тима Бреја, „Thialfihar“-а
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Хвала свим апликантима Гугловог Лета Ко̂да 2014 који су учинили ово издање богатим у могућностима и без грешака!
+Хвала свим апликантима Гугловог Лета Кôда 2014 који су учинили ово издање богатим у могућностима и без грешака!
 Осим неколицине малих закрпа, значајан број закрпа направили су следећи људи (по абецедном реду):
-Данијел Хаман (Daniel Hammann), Данијел Хас (Daniel Haß), Грег Вичак (Greg Witczak), Мируђин Бакши (Miroojin Bakshi), Никил Питер Раж (Nikhil Peter Raj), Паул Сарбиновски (Paul Sarbinowski), Срирам Бујапати (Sreeram Boyapati), Винсент Брајтмозер (Vincent Breitmoser).</p>
+Данијел Хаман (Daniel Hammann), Данијел Хас (Daniel Haß), Грег Вичак (Greg Witczak), Мируђин Бакши (Miroojin Bakshi), Никил Питер Раж (Nikhil Peter Raj), Паул Сарбиновски (Paul Sarbinowski), Срирам Бујапати (Sreeram Boyapati), Винсент Брајтмозер (Vincent Breitmoser).
 
   * Нови обједињени списак кључева
   * Обојени отисак прста кључа
diff --git a/OpenKeychain/src/main/res/raw-sr/help_start.md b/OpenKeychain/src/main/res/raw-sr/help_start.md
index f531fdc82..1375f91eb 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_start.md
+++ b/OpenKeychain/src/main/res/raw-sr/help_start.md
@@ -1,8 +1,9 @@
+[//]: #
 
 ## Како да активирам Отворени кључарник у К-9 Пошти?
 Да бисте користили Отворени кључарник са К-9 Поштом, пратите ове кораке:
   1. Отворите К-9 Пошту и тапните и задржите на налог са којим желите да користите Отворени кључарник.
-  2. Изаберите „поставке налога“ и клизајте на дно и тапните на „криптографија“.
+  2. Изаберите „поставке налога“, клизајте на дно и тапните на „криптографија“.
   3. Тапните на „ОпенПГП апликација“ и изаберите Отворени кључарник са списка.
 
 ## Пронађох грешку у Отвореном кључарнику!
@@ -12,4 +13,4 @@
 Ако желите да нам помогнете у развоју Отвореног кључарника доприношењем кôда, [пратите наш мали водич на Гитхабу](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Преводи
-Помозите превођењем Отвореног кључарника! Било ко може да учествује на [пројекту Отвореног кључарника на Трансифексу](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Помозите превођењем Отвореног кључарника! Сви могу да учествују на [пројекту Отвореног кључарника на Трансифексу](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-sv/help_about.md b/OpenKeychain/src/main/res/raw-sv/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_about.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-sv/help_certification.md b/OpenKeychain/src/main/res/raw-sv/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.md b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-sv/help_start.md b/OpenKeychain/src/main/res/raw-sv/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_start.md
+++ b/OpenKeychain/src/main/res/raw-sv/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-tr/help_about.md b/OpenKeychain/src/main/res/raw-tr/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_about.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-tr/help_certification.md b/OpenKeychain/src/main/res/raw-tr/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.md b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.md b/OpenKeychain/src/main/res/raw-tr/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_start.md
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-uk/help_about.md b/OpenKeychain/src/main/res/raw-uk/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_about.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-uk/help_certification.md b/OpenKeychain/src/main/res/raw-uk/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.md b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-uk/help_start.md b/OpenKeychain/src/main/res/raw-uk/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_start.md
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/raw-zh/help_about.md b/OpenKeychain/src/main/res/raw-zh/help_about.md
index d6a8eca93..9d635d9df 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_about.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_about.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 [http://www.openkeychain.org](http://www.openkeychain.org)
 
diff --git a/OpenKeychain/src/main/res/raw-zh/help_certification.md b/OpenKeychain/src/main/res/raw-zh/help_certification.md
index 8da27e8e0..3518adf73 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_certification.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_certification.md
@@ -1,7 +1,8 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## Key Confirmation
 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.
+The 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.
 
 ## Key Status
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
index e9d61d0f3..4a7ddb7f2 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md
@@ -1,3 +1,4 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## 3.2beta2
 
@@ -95,7 +96,7 @@
   * Notification showing cached passphrases
   * Keys are connected to Android's contacts
 
-<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar
 
 ## 2.7
 
@@ -129,9 +130,9 @@
 
 
 ## 2.4
-<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
+Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free!
 Besides several small patches, a notable number of patches are made by the following people (in alphabetical order):
-Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
+Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
 
   * New unified key list
   * Colorized key fingerprint
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.md b/OpenKeychain/src/main/res/raw-zh/help_start.md
index 1641f913b..4cc331942 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.md
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.md
@@ -1,8 +1,9 @@
+[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
 
 ## How do I activate OpenKeychain in K-9 Mail?
 To use OpenKeychain with K-9 Mail, you want to follow these steps:
   1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with.
-  2. Select "Account settings" and scroll to the very bottom and click "Cryptography".
+  2. Select "Account settings", scroll to the very bottom and click "Cryptography".
   3. Click on "OpenPGP Provider" and select OpenKeychain from the list.
 
 ## I found a bug in OpenKeychain!
@@ -12,4 +13,4 @@ Please report the bug using the [issue tracker of OpenKeychain](https://github.c
 If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code).
 
 ## Translations
-Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/openpgp-keychain/).
\ No newline at end of file
+Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 2434c91df..f99b32a2d 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Vybrat klíče</string>
-  <string name="title_select_secret_key">Vybrat svůj klíč</string>
   <string name="title_encrypt_text">Zašifrovat</string>
   <string name="title_encrypt_files">Zašifrovat</string>
   <string name="title_decrypt">Rozšifrovat</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Přidat podklíč</string>
   <string name="title_edit_key">Editovat klíč</string>
   <string name="title_preferences">Nastavení</string>
-  <string name="title_cloud_search_preferences">Nastavení vyhledávání v cloudu</string>
   <string name="title_api_registered_apps">Aplikace</string>
   <string name="title_change_passphrase">Změnit heslo</string>
   <string name="title_share_fingerprint_with">Sdílet otisk s...</string>
@@ -23,7 +20,6 @@
   <string name="title_encrypt_to_file">Zašifrovat do souboru</string>
   <string name="title_decrypt_to_file">Rozšifrovat do souboru</string>
   <string name="title_import_keys">Importovat klíče</string>
-  <string name="title_add_keys">Přidat klíče</string>
   <string name="title_export_key">Exportovat klíče</string>
   <string name="title_export_keys">Exportovat klíče</string>
   <string name="title_key_not_found">Klíč nebyl nalezen</string>
@@ -32,36 +28,33 @@
   <string name="title_key_details">Detaily klíče</string>
   <string name="title_help">Nápověda</string>
   <string name="title_log_display">Log</string>
-  <string name="title_create_key">Vytvořit klíč</string>
   <string name="title_exchange_keys">Vyměnit klíče</string>
   <string name="title_advanced_key_info">Další informace ke klíči</string>
-  <string name="title_keys">Klíče</string>
   <string name="title_delete_secret_key">Smazat Váš klíč \'%s\'?</string>
   <string name="title_export_log">Exportovat log</string>
+  <string name="title_manage_my_keys">Spravovat klíče</string>
   <!--section-->
   <string name="section_user_ids">Identity</string>
+  <string name="section_linked_system_contact">Propojený kontakt v systému</string>
   <string name="section_should_you_trust">Důvěřujete tomuto klíči?</string>
+  <string name="section_proof_details">Doložit ověření</string>
+  <string name="section_cloud_evidence">Doložení z cloudu</string>
   <string name="section_keys">Podklíče</string>
   <string name="section_cloud_search">Vyhledávání v Cloud službě</string>
-  <string name="section_general">Obecné</string>
-  <string name="section_defaults">Výchozí hodnoty</string>
-  <string name="section_advanced">Pokročilé</string>
   <string name="section_passphrase_cache">Cache hesel</string>
   <string name="section_certify">Potvrdit</string>
   <string name="section_actions">Akce</string>
   <string name="section_share_key">Klíč</string>
-  <string name="section_upload_key">Synchronizovat klíč</string>
   <string name="section_key_server">Keyserver</string>
   <string name="section_fingerprint">Otisk</string>
-  <string name="section_decrypt_files">Soubory</string>
-  <string name="section_decrypt_text">Text</string>
-  <string name="section_certs">Certifikáty</string>
   <string name="section_encrypt">Zašifrovat</string>
   <string name="section_decrypt">Rozšifrovat</string>
+  <string name="section_current_expiry">Současná expirace</string>
+  <string name="section_new_expiry">Nová expirace</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dešifrovat, ověřit a uložit soubor</string>
-  <string name="btn_encrypt_file">Zaširovat a uložit soubor</string>
   <string name="btn_encrypt_share_file">Zašifrovat a sdílet soubor</string>
+  <string name="btn_encrypt_save_file">Zašifrovat a uložit soubor</string>
   <string name="btn_save">Uložit</string>
   <string name="btn_do_not_save">Zrušit</string>
   <string name="btn_delete">Smazat</string>
@@ -70,25 +63,31 @@
   <string name="btn_export_to_server">Nahrát na keyserver</string>
   <string name="btn_next">Další</string>
   <string name="btn_back">Zpět</string>
-  <string name="btn_lookup_key">Vyhledat klíč</string>
+  <string name="btn_no">Ne</string>
+  <string name="btn_match">Otisky souhlasí</string>
+  <string name="btn_share_encrypted_signed">Zašifrovat a sdílet text</string>
+  <string name="btn_copy_encrypted_signed">Zašifrovat a zkopírovat text</string>
   <string name="btn_view_cert_key">Zobrazit klíč certifikátu</string>
   <string name="btn_create_key">Vytvořit klíč</string>
   <string name="btn_add_files">Přidat soubor(y)</string>
   <string name="btn_add_share_decrypted_text">Sdílet dešifrovaný text</string>
+  <string name="btn_decrypt_clipboard">Dešifrovat text ze schránky</string>
   <string name="btn_decrypt_and_verify">a ověřit podpisy</string>
   <string name="btn_decrypt_files">Dešifrovat soubory</string>
+  <string name="btn_encrypt_files">Zašifrovat soubory</string>
+  <string name="btn_encrypt_text">Zašifrovat text</string>
+  <string name="btn_add_email">Přidat další emailové adresy</string>
   <!--menu-->
   <string name="menu_preferences">Nastavení</string>
   <string name="menu_help">Nápověda</string>
   <string name="menu_export_key">Exportovat do souboru</string>
   <string name="menu_delete_key">Smazat klíč</string>
-  <string name="menu_import_existing_key">Importovat ze souboru</string>
+  <string name="menu_manage_keys">Spravovat klíče</string>
   <string name="menu_search">Hledat</string>
+  <string name="menu_nfc_preferences">NFC nastavení</string>
   <string name="menu_beam_preferences">Beam settings</string>
-  <string name="menu_key_edit_cancel">Zrušit</string>
   <string name="menu_encrypt_to">Zašifrovat do...</string>
   <string name="menu_select_all">Vybrat vše</string>
-  <string name="menu_add_keys">Přidat klíče</string>
   <string name="menu_export_all_keys">Exportovat všechny klíče</string>
   <string name="menu_advanced">Zobrazit pokročilé info</string>
   <!--label-->
@@ -187,9 +186,6 @@
   <string name="encrypt_sign_clipboard_successful">Úspěšně podepsání a/nebo zašifrováno do schránky.</string>
   <string name="select_encryption_key">Vyberte alespoň jeden šifrovací klíč.</string>
   <string name="select_encryption_or_signature_key">Vyberte alespoň jeden šifrovací nebo podpisový klíč.</string>
-  <string name="specify_file_to_encrypt_to">Prosím specifikujte do kterého souboru zašifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
-  <string name="specify_file_to_decrypt_to">Prosím specifikujte do kterého souboru rozšifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
-  <string name="specify_file_to_export_to">Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
   <string name="also_export_secret_keys">Zárověň exportovat tajný klíč</string>
   <string name="reinstall_openkeychain">Narazili jste na známou chybu v Androidu. Přeinstalujte prosím OpenKeychain pokud chcete své propojit kontakty s klíči.</string>
   <string name="key_exported">Úspěšně exportován 1 klíč.</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 0022153a6..4fd310837 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Wähle Schlüssel</string>
-  <string name="title_select_secret_key">Wähle Deinen Schlüssel</string>
   <string name="title_encrypt_text">Verschlüsseln</string>
   <string name="title_encrypt_files">Verschlüsseln</string>
   <string name="title_decrypt">Entschlüsseln</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Unterschlüssel hinzufügen</string>
   <string name="title_edit_key">Schlüssel bearbeiten</string>
   <string name="title_preferences">Einstellungen</string>
-  <string name="title_cloud_search_preferences">Einstellungen Cloudsuche</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Schlüsselserver</string>
   <string name="title_change_passphrase">Passwort ändern</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string>
   <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string>
   <string name="title_import_keys">Schlüssel importieren</string>
-  <string name="title_add_keys">Schlüssel hinzufügen</string>
   <string name="title_export_key">Schlüssel exportieren</string>
   <string name="title_export_keys">Schlüssel exportieren</string>
   <string name="title_key_not_found">Schlüssel nicht gefunden</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">Schlüsseldetails</string>
   <string name="title_help">Hilfe</string>
   <string name="title_log_display">Log</string>
-  <string name="title_create_key">Schlüssel erzeugen</string>
   <string name="title_exchange_keys">Schlüssel austauschen</string>
   <string name="title_advanced_key_info">Erweiterte Schlüsselinformation</string>
-  <string name="title_keys">Schlüssel</string>
   <string name="title_delete_secret_key">DEINEN Schlüssel \'%s\' löschen?</string>
   <string name="title_export_log">Log exportieren</string>
   <string name="title_manage_my_keys">Meine Schlüssel verwalten</string>
@@ -48,27 +42,18 @@
   <string name="section_cloud_evidence">Nachweise aus der Cloud</string>
   <string name="section_keys">Unterschlüssel</string>
   <string name="section_cloud_search">Cloudsuche</string>
-  <string name="section_general">Allgemein</string>
-  <string name="section_defaults">Standardwerte</string>
-  <string name="section_advanced">Fortgeschrittene Einstellungen</string>
   <string name="section_passphrase_cache">Passwort Zwischenspeicher</string>
   <string name="section_certify">Bestätigen</string>
   <string name="section_actions">Aktionen</string>
   <string name="section_share_key">Schlüssel</string>
-  <string name="section_upload_key">Schlüssel synchronisieren</string>
   <string name="section_key_server">Schlüsselserver</string>
   <string name="section_fingerprint">Fingerabdruck</string>
-  <string name="section_decrypt_files">Dateien</string>
-  <string name="section_decrypt_text">Text</string>
-  <string name="section_certs">Beglaubigungen</string>
   <string name="section_encrypt">Verschlüsseln</string>
   <string name="section_decrypt">Entschlüsseln</string>
   <string name="section_current_expiry">Aktuelles Ablaufdatum</string>
   <string name="section_new_expiry">Neues Ablaufdatum</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Datei entschlüsseln, verifizieren und speichern</string>
-  <string name="btn_decrypt_verify_message">Nachricht entschlüsseln und überprüfen</string>
-  <string name="btn_encrypt_file">Datei verschlüsseln und speichern</string>
   <string name="btn_encrypt_share_file">Datei verschlüsseln und teilen</string>
   <string name="btn_encrypt_save_file">Datei verschlüsseln und speichern</string>
   <string name="btn_save">Speichern</string>
@@ -81,7 +66,6 @@
   <string name="btn_back">Zurück</string>
   <string name="btn_no">Nein</string>
   <string name="btn_match">Fingerabdrücke stimmen überein</string>
-  <string name="btn_lookup_key">Schlüssel nachschlagen</string>
   <string name="btn_share_encrypted_signed">Nachricht verschlüsseln und teilen</string>
   <string name="btn_copy_encrypted_signed">Text verschlüsseln und kopieren</string>
   <string name="btn_view_cert_key">Beglaubigungsschlüssel anzeigen</string>
@@ -100,16 +84,13 @@
   <string name="menu_export_key">In Datei exportieren</string>
   <string name="menu_delete_key">Schlüssel löschen</string>
   <string name="menu_manage_keys">Meine Schlüssel verwalten</string>
-  <string name="menu_import_existing_key">Von Datei importieren</string>
   <string name="menu_search">Suchen</string>
   <string name="menu_nfc_preferences">NFC-Einstellungen</string>
   <string name="menu_beam_preferences">Beam-Einstellungen</string>
-  <string name="menu_key_edit_cancel">Abbrechen</string>
   <string name="menu_encrypt_to">Verschlüsseln nach…</string>
   <string name="menu_select_all">Alles auswählen</string>
-  <string name="menu_add_keys">Schlüssel hinzufügen</string>
-  <string name="menu_search_cloud">Cloud durchsuchen</string>
   <string name="menu_export_all_keys">Alle Schlüssel exportieren</string>
+  <string name="menu_update_all_keys">Alle Schlüssel aktualisieren</string>
   <string name="menu_advanced">Erweiterte Infos anzeigen</string>
   <string name="menu_certify_fingerprint">Über Fingerabdruckvergleich bestätigen</string>
   <string name="menu_export_log">Log exportieren</string>
@@ -161,6 +142,10 @@
   <string name="label_enable_compression">Komprimierung aktivieren</string>
   <string name="label_encrypt_filenames">Dateinamen verschlüsseln</string>
   <string name="label_hidden_recipients">Empfänger verbergen</string>
+  <string name="pref_keyserver">Schlüsselserver durchsuchen</string>
+  <string name="pref_keyserver_summary">HKP-Schlüsselserver durchsuchen</string>
+  <string name="pref_keybase">Keybase.io durchsuchen</string>
+  <string name="pref_keybase_summary">Keybase.io-Index durchsuchen</string>
   <string name="user_id_no_name">&lt;kein Name&gt;</string>
   <string name="none">&lt;keine&gt;</string>
   <plurals name="n_keys">
@@ -218,8 +203,8 @@
   <string name="select_encryption_key">Mindestens einen Schlüssel zum Verschlüsseln auswählen.</string>
   <string name="select_encryption_or_signature_key">Mindestens einen Schlüssel zum Verschlüsseln oder einen zum Signieren auswählen.</string>
   <string name="specify_file_to_encrypt_to">Bitte angeben in welche Datei verschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string>
-  <string name="specify_file_to_decrypt_to">Bitte angeben in welche Datei entschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
-  <string name="specify_file_to_export_to">Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
+  <string name="specify_file_to_decrypt_to">Bitte angeben in welche Datei entschlüsselt werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string>
+  <string name="specify_file_to_export_to">Bitte angeben in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert.</string>
   <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten Schlüssel löschen?</string>
   <string name="secret_key_deletion_confirmation">Nach dem Löschen wird es dir nicht mehr möglich sein mit diesem Schlüssel verschlüsselte Nachrichten zu lesen und zudem wirst du alle damit getätigten Bestätigungen verlieren!</string>
   <string name="public_key_deletetion_confirmation">Schlüssel löschen \'%s\'?</string>
@@ -289,6 +274,7 @@
   <string name="progress_cancelling">Abbrechen...</string>
   <string name="progress_saving">Wird gespeichert…</string>
   <string name="progress_importing">Wird importiert…</string>
+  <string name="progress_updating">Aktualisiere Schlüssel...</string>
   <string name="progress_exporting">Wird exportiert…</string>
   <string name="progress_uploading">Wird hochgeladen...</string>
   <string name="progress_building_key">Schlüssel wird erstellt…</string>
@@ -333,7 +319,7 @@
   <string name="progress_con_saving">Zusammenführung: Im Cache speichern...</string>
   <string name="progress_con_reimport">Zusammenführung: Neuimportierung...</string>
   <!--action strings-->
-  <string name="hint_cloud_search_hint">Suche via Name, E-Mail...</string>
+  <string name="hint_cloud_search_hint">Via Name, E-Mail durchsuchen...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -451,7 +437,7 @@
   <string name="api_settings_hide_advanced">Erweiterte Einstellungen ausblenden</string>
   <string name="api_settings_no_key">Kein Schlüssel ausgewählt</string>
   <string name="api_settings_select_key">Schlüssel auswählen</string>
-  <string name="api_settings_create_key">Erzeuge meinen Schlüssel</string>
+  <string name="api_settings_create_key">Neuen Schlüssel erzeugen</string>
   <string name="api_settings_save">Speichern</string>
   <string name="api_settings_save_msg">Benutzerkonto wurde gespeichert</string>
   <string name="api_settings_cancel">Abbrechen</string>
@@ -589,6 +575,7 @@
   <string name="create_key_edit">Schlüsselkonfiguration ändern</string>
   <string name="create_key_add_email">E-Mail-Adresse hinzufügen</string>
   <string name="create_key_add_email_text">Es sind zusätzliche E-Mail-Adressen mit diesem Schlüssel verknüpft, die zur sicheren Kommunikation verwendet werden können.</string>
+  <string name="create_key_email_already_exists_text">E-Mail wurde bereits hinzugefügt</string>
   <!--View key-->
   <string name="view_key_revoked">Widerrufen: Schlüssel darf nicht mehr genutzt werden!</string>
   <string name="view_key_expired">Abgelaufen: Der Kontakt muss die Gültigkeit des Schlüssels verlängern!</string>
@@ -1097,7 +1084,7 @@
   <string name="msg_download_query_too_short">Die Suchanfrage ist zu kurz, bitte die Suchanfrage verfeinern!</string>
   <string name="msg_download_too_many_responses">Schlüsselsuchanfrage lieferte zu viele Kandidaten, bitte die Suchanfrage verfeinern!</string>
   <string name="msg_download_query_too_short_or_too_many_responses">Entweder keine oder zu viele Schlüssel wurden gefunden, bitte die Suchanfrage prä­zi­sie­ren!</string>
-  <string name="msg_download_query_failed">Beim suchen der Schlüssel ist ein Fehler aufgetreten.</string>
+  <string name="msg_download_query_failed">Beim Suchen der Schlüssel ist ein Fehler aufgetreten.</string>
   <!--Messages for Export Log operation-->
   <string name="msg_export_log_start">Exportiere Protokoll</string>
   <string name="msg_export_log_error_fopen">Fehler beim Öffnen der Datei</string>
@@ -1112,7 +1099,7 @@
   <string name="passp_cache_notif_pwd">Passwort</string>
   <!--First Time-->
   <string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
-  <string name="first_time_create_key">Meinen Schlüssel erzeugen (empfohlen)</string>
+  <string name="first_time_create_key">Meinen Schlüssel erzeugen</string>
   <string name="first_time_import_key">Schlüssel aus Datei importieren</string>
   <string name="first_time_yubikey">YubiKey NEO verwenden</string>
   <string name="first_time_skip">Setup überspringen</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index a042f3809..2d94eb6a2 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -4,27 +4,23 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Seleccionar claves</string>
-  <string name="title_select_secret_key">Seleccionar su clave</string>
-  <string name="title_encrypt_text">Cifrar</string>
-  <string name="title_encrypt_files">Cifrar</string>
+  <string name="title_encrypt_text">Encriptar</string>
+  <string name="title_encrypt_files">Encriptar</string>
   <string name="title_decrypt">Descifrar</string>
   <string name="title_unlock">Desbloquear clave</string>
   <string name="title_add_subkey">Añadir subclave</string>
   <string name="title_edit_key"> Editar clave</string>
   <string name="title_preferences">Configuración</string>
-  <string name="title_cloud_search_preferences">Preferencias de búsqueda en la nube</string>
   <string name="title_api_registered_apps">Aplicaciones</string>
   <string name="title_key_server_preference">Servidores de claves</string>
   <string name="title_change_passphrase">Cambiar frase de contraseña</string>
-  <string name="title_share_fingerprint_with">Compartir huella de validación de clave con...</string>
+  <string name="title_share_fingerprint_with">Compartir huella digital con...</string>
   <string name="title_share_key">Compartir clave con...</string>
-  <string name="title_share_file">Compartir fichero con...</string>
+  <string name="title_share_file">Compartir archivo con...</string>
   <string name="title_share_message">Compartir texto con...</string>
   <string name="title_encrypt_to_file">Cifrar hacia archivo</string>
   <string name="title_decrypt_to_file">Descifrar hacia archivo</string>
   <string name="title_import_keys">Importar claves</string>
-  <string name="title_add_keys">Añadir claves</string>
   <string name="title_export_key">Exportar clave</string>
   <string name="title_export_keys">Exportar claves</string>
   <string name="title_key_not_found">Clave no encontrada</string>
@@ -33,11 +29,9 @@
   <string name="title_key_details">Detalles de la clave</string>
   <string name="title_help">Ayuda</string>
   <string name="title_log_display">Registro (log)</string>
-  <string name="title_create_key">Crear clave</string>
   <string name="title_exchange_keys">Intercambiar claves</string>
   <string name="title_advanced_key_info">Información avanzada de clave</string>
-  <string name="title_keys">Claves</string>
-  <string name="title_delete_secret_key">¿Borrar la clave DE USTED \'%s\'?</string>
+  <string name="title_delete_secret_key">¿Borrar clave \'%s\'?</string>
   <string name="title_export_log">Exportar registro (log)</string>
   <string name="title_manage_my_keys">Administrar mis claves</string>
   <!--section-->
@@ -48,51 +42,41 @@
   <string name="section_cloud_evidence">Comprobantes desde la nube</string>
   <string name="section_keys">Subclaves</string>
   <string name="section_cloud_search">Búsqueda en la nube</string>
-  <string name="section_general">General</string>
-  <string name="section_defaults">Predeterminados</string>
-  <string name="section_advanced">Avanzado</string>
   <string name="section_passphrase_cache">Caché de frase-contraseña</string>
   <string name="section_certify">Confirmar</string>
   <string name="section_actions">Acciones</string>
   <string name="section_share_key">Clave</string>
-  <string name="section_upload_key">Sincronizar clave</string>
   <string name="section_key_server">Servidor de claves</string>
-  <string name="section_fingerprint">Huella de validación de clave</string>
-  <string name="section_decrypt_files">Ficheros</string>
-  <string name="section_decrypt_text">Texto</string>
-  <string name="section_certs">Certificados</string>
-  <string name="section_encrypt">Cifrar</string>
-  <string name="section_decrypt">Descifrar</string>
+  <string name="section_fingerprint">Huella digital</string>
+  <string name="section_encrypt">Encriptar</string>
+  <string name="section_decrypt">Desencriptar</string>
   <string name="section_current_expiry">Caducidad actual</string>
   <string name="section_new_expiry">Nueva caducidad</string>
   <!--button-->
-  <string name="btn_decrypt_verify_file">Descifrar, verificar, y guardar fichero</string>
-  <string name="btn_decrypt_verify_message">Descifrar y verificar texto</string>
-  <string name="btn_encrypt_file">Cifrar y guardar fichero</string>
-  <string name="btn_encrypt_share_file">Cifrar y compartir fichero</string>
-  <string name="btn_encrypt_save_file">Cifrar y guardar fichero</string>
+  <string name="btn_decrypt_verify_file">Desencriptar, verificar, y guardar fichero</string>
+  <string name="btn_encrypt_share_file">Encriptar y compartir fichero</string>
+  <string name="btn_encrypt_save_file">Encriptar y guardar fichero</string>
   <string name="btn_save">Guardar</string>
   <string name="btn_do_not_save">Cancelar</string>
   <string name="btn_delete">Eliminar</string>
-  <string name="btn_no_date">Sin fecha de expiración</string>
+  <string name="btn_no_date">No caduca</string>
   <string name="btn_okay">De acuerdo</string>
   <string name="btn_export_to_server">Cargar al servidor de claves</string>
   <string name="btn_next">Siguiente</string>
   <string name="btn_back">Volver</string>
   <string name="btn_no">No</string>
-  <string name="btn_match">Las huellas de validación coinciden</string>
-  <string name="btn_lookup_key">Buscar clave</string>
-  <string name="btn_share_encrypted_signed">Cifrar y compartir texto</string>
-  <string name="btn_copy_encrypted_signed">Cifrar y copiar texto</string>
+  <string name="btn_match">Las huellas digitales coinciden</string>
+  <string name="btn_share_encrypted_signed">Encriptar y compartir texto</string>
+  <string name="btn_copy_encrypted_signed">Encriptar y copiar texto</string>
   <string name="btn_view_cert_key">Ver clave de verificación</string>
   <string name="btn_create_key">Crear clave</string>
-  <string name="btn_add_files">Añadir fichero(s)</string>
-  <string name="btn_add_share_decrypted_text">Compartir texto descifrado</string>
+  <string name="btn_add_files">Añadir archivo(s)</string>
+  <string name="btn_add_share_decrypted_text">Compartir texto desencriptado</string>
   <string name="btn_decrypt_clipboard">Descifrar texto desde el portapapeles</string>
   <string name="btn_decrypt_and_verify">y verificar firmas</string>
-  <string name="btn_decrypt_files">Descifrar ficheros</string>
-  <string name="btn_encrypt_files">Cifrar ficheros</string>
-  <string name="btn_encrypt_text">Cifrar texto</string>
+  <string name="btn_decrypt_files">Desencriptar ficheros</string>
+  <string name="btn_encrypt_files">Encriptar ficheros</string>
+  <string name="btn_encrypt_text">Encriptar texto</string>
   <string name="btn_add_email">Añadir dirección de correo electrónico adicional</string>
   <!--menu-->
   <string name="menu_preferences">Ajustes</string>
@@ -100,24 +84,21 @@
   <string name="menu_export_key">Exportar hacia archivo</string>
   <string name="menu_delete_key">Borrar clave</string>
   <string name="menu_manage_keys">Administrar mis claves</string>
-  <string name="menu_import_existing_key">Importar desde fichero</string>
   <string name="menu_search">Buscar</string>
   <string name="menu_nfc_preferences">Configuraciones NFC</string>
   <string name="menu_beam_preferences">Ajustes de Beam</string>
-  <string name="menu_key_edit_cancel">Cancelar</string>
   <string name="menu_encrypt_to">Cifrar hacia...</string>
   <string name="menu_select_all">Seleccionar todo</string>
-  <string name="menu_add_keys">Añadir claves</string>
-  <string name="menu_search_cloud">Buscar en la nube</string>
   <string name="menu_export_all_keys">Exportar todas las claves</string>
+  <string name="menu_update_all_keys">Actualizar todas las claves</string>
   <string name="menu_advanced">Mostrar información avanzada</string>
-  <string name="menu_certify_fingerprint">Confirmar mediante comparación de la huella de validación (fingerprint)</string>
-  <string name="menu_export_log">Exportar registro (log)</string>
+  <string name="menu_certify_fingerprint">Confirmar mediante comparación de la huella digital</string>
+  <string name="menu_export_log">Exportar registro</string>
   <!--label-->
   <string name="label_message">Texto</string>
   <string name="label_file">Archivo</string>
-  <string name="label_files">Fichero(s)</string>
-  <string name="label_file_colon">Fichero:</string>
+  <string name="label_files">Archivo(s)</string>
+  <string name="label_file_colon">Archivo:</string>
   <string name="label_no_passphrase">No hay frase de contraseña</string>
   <string name="label_passphrase">Frase de contraseña</string>
   <string name="label_unlock">Desbloqueando...</string>
@@ -161,6 +142,10 @@
   <string name="label_enable_compression">Habilitar compresión</string>
   <string name="label_encrypt_filenames">Cifrar nombres de ficheros</string>
   <string name="label_hidden_recipients">Ocultar receptores</string>
+  <string name="pref_keyserver">Buscar en servidor de claves</string>
+  <string name="pref_keyserver_summary">Buscar en servidor de claves HKP</string>
+  <string name="pref_keybase">Buscar en Keybase.io</string>
+  <string name="pref_keybase_summary">Buscar en el índice de Keybase.io</string>
   <string name="user_id_no_name">&lt;sin nombre&gt;</string>
   <string name="none">&lt;ninguna&gt;</string>
   <plurals name="n_keys">
@@ -217,9 +202,9 @@
   <string name="encrypt_sign_clipboard_successful">Firmado y/o cifrado del portapapeles con éxito.</string>
   <string name="select_encryption_key">Selecciona al menos una clave de cifrado.</string>
   <string name="select_encryption_or_signature_key">Selecciona al menos una clave de cifrado o de firma.</string>
-  <string name="specify_file_to_encrypt_to">Por favor especifique hacia qué fichero cifrar.\nADVERTENCIA: El fichero se sobreescribirá si existe.</string>
-  <string name="specify_file_to_decrypt_to">Por favor especifique hacia que fichero descifrar.\nADVERTENCIA: El fichero se sobreescribirá si existe.</string>
-  <string name="specify_file_to_export_to">Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: El fichero se sobreescribirá si existe.</string>
+  <string name="specify_file_to_encrypt_to">Por favor especifique hacia qué fichero cifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string>
+  <string name="specify_file_to_decrypt_to">Por favor especifique hacia qué fichero descifrar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string>
+  <string name="specify_file_to_export_to">Por favor especifique hacia qué fichero exportar.\nADVERTENCIA: ¡El fichero se sobreescribirá si existe!</string>
   <string name="key_deletion_confirmation_multi">¿De verdad quiere borrar todas las claves seleccionadas?</string>
   <string name="secret_key_deletion_confirmation">¡Después del borrado no podrá leer mensajes cifrados con esta clave y perderá todas las confirmaciones de clave hechas con ella!</string>
   <string name="public_key_deletetion_confirmation">¿Borrar clave \'%s\'?</string>
@@ -289,6 +274,7 @@
   <string name="progress_cancelling">cancelando...</string>
   <string name="progress_saving">guardando...</string>
   <string name="progress_importing">importando...</string>
+  <string name="progress_updating">Actualizando claves...</string>
   <string name="progress_exporting">exportando...</string>
   <string name="progress_uploading">subiendo...</string>
   <string name="progress_building_key">construyendo la clave...</string>
@@ -589,6 +575,7 @@
   <string name="create_key_edit">Cambiar configuración de clave</string>
   <string name="create_key_add_email">Añadir dirección de correo electrónico</string>
   <string name="create_key_add_email_text">Las direcciones adicionales de correo electrónico también están asociadas a esta clave y pueden utilizarse para asegurar la comunicación.</string>
+  <string name="create_key_email_already_exists_text">Ya se ha añadido el correo electrónico</string>
   <!--View key-->
   <string name="view_key_revoked">Revocada: ¡La clave no debe volver a ser usada!</string>
   <string name="view_key_expired">Caducada: ¡El contacto necesita extender la vigencia de la clave!</string>
@@ -1111,7 +1098,7 @@
   <string name="passp_cache_notif_pwd">Frase-contraseña</string>
   <!--First Time-->
   <string name="first_time_text1">¡Recupere su privacidad con OpenKeychain!</string>
-  <string name="first_time_create_key">Crear mi clave (recomendado)</string>
+  <string name="first_time_create_key">Crear mi clave</string>
   <string name="first_time_import_key">Importar clave desde fichero</string>
   <string name="first_time_yubikey">Usar Yubikey NEO</string>
   <string name="first_time_skip">Omitir configuración</string>
@@ -1123,7 +1110,7 @@
   <string name="empty_certs">No hay certificados para esta clave</string>
   <string name="certs_text">Aquí sólo se muestran auto-certificados validados y certificados validados creados con sus claves.</string>
   <string name="section_uids_to_certify">Identificaciones para</string>
-  <string name="certify_text">Las claves que está importando contienen \"identidades\": nombres y correos electrónicos. Seleccione exactamente aquellos para confirmación que coinciden con lo que esperaba.</string>
+  <string name="certify_text">Las claves que está importando contienen \"identidades\": nombres y direcciones de correo electrónico. Para confirmación seleccione exactamente aquellas que coincidan con lo que esperaba.</string>
   <string name="certify_fingerprint_text">Compare la huella de validación mostrada, caracter por caracter, con la que se muestra en el dispositivo de su colega.</string>
   <string name="certify_fingerprint_text2">¿Coinciden las huellas de validación mostradas?</string>
   <string name="label_revocation">Razón de la revocación</string>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index 15b0c6c1e..cc9061149 100644
--- a/OpenKeychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
@@ -12,8 +12,6 @@
   <string name="title_send_key">Lae võtmeserverisse</string>
   <string name="title_help">Abi</string>
   <!--section-->
-  <string name="section_general">Üldine</string>
-  <string name="section_defaults">Vaikeseaded</string>
   <!--button-->
   <string name="btn_save">Salvesta</string>
   <string name="btn_do_not_save">Katkesta</string>
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
index 77f897b7c..784217b95 100644
--- a/OpenKeychain/src/main/res/values-eu/strings.xml
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Hautatu Giltzak</string>
-  <string name="title_select_secret_key">Hautatu Zure Giltza</string>
   <string name="title_encrypt_text">Enkriptatu</string>
   <string name="title_encrypt_files">Enkriptatu</string>
   <string name="title_decrypt">Dekriptatu</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Gehitu azpigiltza</string>
   <string name="title_edit_key">Editatu Giltza</string>
   <string name="title_preferences">Ezarpenak</string>
-  <string name="title_cloud_search_preferences">Hodei Bilaketa Hobespenak</string>
   <string name="title_api_registered_apps">Aplikazioak</string>
   <string name="title_key_server_preference">Giltza-zerbitzariak</string>
   <string name="title_change_passphrase">Aldatu Sar-esaldia</string>
@@ -23,7 +20,6 @@
   <string name="title_encrypt_to_file">Enkriptatu Agirira</string>
   <string name="title_decrypt_to_file">Dekriptatu Agirira</string>
   <string name="title_import_keys">Inportatu Giltzak</string>
-  <string name="title_add_keys">Gehitu Giltzak</string>
   <string name="title_export_key">Esportatu Giltza</string>
   <string name="title_export_keys">Esportatu Giltzak</string>
   <string name="title_key_not_found">Giltza Ez da Aurkitu</string>
@@ -32,10 +28,8 @@
   <string name="title_key_details">Giltzaren Xehetasunak</string>
   <string name="title_help">Laguntza</string>
   <string name="title_log_display">Oharra</string>
-  <string name="title_create_key">Sortu Giltza</string>
   <string name="title_exchange_keys">Trukatu Giltzak</string>
   <string name="title_advanced_key_info">Giltza Argibide Aurreratuak</string>
-  <string name="title_keys">Giltzak</string>
   <string name="title_export_log">Esportatu Oharra</string>
   <string name="title_manage_my_keys">Kudeatu nire giltzak</string>
   <!--section-->
@@ -44,26 +38,17 @@
   <string name="section_should_you_trust">Fildatu behar zara giltza honetaz?</string>
   <string name="section_keys">Azpigiltzak</string>
   <string name="section_cloud_search">Hodei bilaketa</string>
-  <string name="section_general">Orokorra</string>
-  <string name="section_defaults">Berezkoak</string>
-  <string name="section_advanced">Aurreratua</string>
   <string name="section_passphrase_cache">Sar-esaldi Katxea</string>
   <string name="section_certify">Baieztatu</string>
   <string name="section_actions">Ekintzak</string>
   <string name="section_share_key">Giltza</string>
-  <string name="section_upload_key">Aldiberetu Giltza</string>
   <string name="section_key_server">Giltza-zerbitzaria</string>
-  <string name="section_decrypt_files">Agiriak</string>
-  <string name="section_decrypt_text">Idazkia</string>
-  <string name="section_certs">Egiaztagiriak</string>
   <string name="section_encrypt">Enkriptatu</string>
   <string name="section_decrypt">Dekriptatu</string>
   <string name="section_current_expiry">Oraingo epemuga</string>
   <string name="section_new_expiry">Epemuga berria</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dekriptatu, egiaztatu eta gorde agiria</string>
-  <string name="btn_decrypt_verify_message">Dekriptatu eta egiaztatu idazkia</string>
-  <string name="btn_encrypt_file">Enkriptatu eta gorde agiria</string>
   <string name="btn_encrypt_share_file">Enkriptatu eta elkarbanatu agiria</string>
   <string name="btn_encrypt_save_file">Enkriptatu eta gorde agiria</string>
   <string name="btn_save">Gorde</string>
@@ -93,15 +78,11 @@
   <string name="menu_export_key">Esportatu agirira</string>
   <string name="menu_delete_key">Ezabatu giltza</string>
   <string name="menu_manage_keys">Kudeatu nire giltzak</string>
-  <string name="menu_import_existing_key">inportatu agiritik</string>
   <string name="menu_search">Bilatu</string>
   <string name="menu_nfc_preferences">NFC ezarpenak</string>
   <string name="menu_beam_preferences">Beam ezarpenak</string>
-  <string name="menu_key_edit_cancel">Ezeztatu</string>
   <string name="menu_encrypt_to">Enkriptatu hona...</string>
   <string name="menu_select_all">Hautatu denak</string>
-  <string name="menu_add_keys">Gehitu giltzak</string>
-  <string name="menu_search_cloud">Bilatu hodeian</string>
   <string name="menu_export_all_keys">Esportatu giltza guztiak</string>
   <string name="menu_advanced">Erakutsi argibide aurreratuak</string>
   <string name="menu_export_log">Esportatu Oharra</string>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index 3a87d53c1..6cbc2b1fc 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -3,14 +3,11 @@
   <!--GENERAL: Please put all strings inside quotes as described in example 1 on
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
-  <string name="title_select_recipients">Valitse Avaimet</string>
-  <string name="title_select_secret_key">Valitse Oma Avain</string>
   <string name="title_decrypt">Pura Salaus</string>
   <string name="title_unlock">Avaa Avain</string>
   <string name="title_add_subkey">Lisää aliavain</string>
   <string name="title_edit_key">Muokkaa avainta</string>
   <string name="title_preferences">Asetukset</string>
-  <string name="title_cloud_search_preferences">Pilvihaun Asetukset</string>
   <string name="title_api_registered_apps">Sovellukset</string>
   <string name="title_change_passphrase">Vaihda Salasana</string>
   <string name="title_share_fingerprint_with">Jaa sormenjälki...</string>
@@ -19,7 +16,6 @@
   <string name="title_encrypt_to_file">Salaa Tiedostoon</string>
   <string name="title_decrypt_to_file">Pura Tiedostoon</string>
   <string name="title_import_keys">Tuo Avaimia</string>
-  <string name="title_add_keys">Lisää Avaimia</string>
   <string name="title_export_key">Vie Avain</string>
   <string name="title_export_keys">Vie Avaimia</string>
   <string name="title_key_not_found">Avainta Ei Löydy</string>
@@ -27,28 +23,19 @@
   <string name="title_key_details">Avaimen Tiedot</string>
   <string name="title_help">Apua</string>
   <string name="title_log_display">Loki</string>
-  <string name="title_create_key">Luo Avain</string>
   <string name="title_exchange_keys">Vaihda Avaimia</string>
   <string name="title_advanced_key_info">Lisätietoa Avaimesta</string>
   <!--section-->
   <string name="section_user_ids">Identiteetit</string>
   <string name="section_keys">Aliavaimet</string>
   <string name="section_cloud_search">Pilvihaku</string>
-  <string name="section_general">Yleistä</string>
-  <string name="section_defaults">Vakiot</string>
-  <string name="section_advanced">Lisäasetukset</string>
   <string name="section_passphrase_cache">Salasanavälimuisti</string>
   <string name="section_actions">Toiminteet</string>
   <string name="section_share_key">Avain</string>
-  <string name="section_upload_key">Synkronoi Avain</string>
   <string name="section_key_server">Avainpalvelin</string>
   <string name="section_fingerprint">Sormenjälki</string>
-  <string name="section_decrypt_files">Tiedostot</string>
-  <string name="section_decrypt_text">Teksti</string>
-  <string name="section_certs">Varmenteet</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Pura, todenna ja tallenna tiedosto</string>
-  <string name="btn_encrypt_file">Salaa ja tallenna tiedosto</string>
   <string name="btn_encrypt_share_file">Salaa ja jaa tiedosto</string>
   <string name="btn_save">Tallenna</string>
   <string name="btn_do_not_save">Peruuta</string>
@@ -58,7 +45,6 @@
   <string name="btn_export_to_server">Lataa Avainpalvelimelle</string>
   <string name="btn_next">Seuraava</string>
   <string name="btn_back">Takaisin</string>
-  <string name="btn_lookup_key">Etsi avain</string>
   <string name="btn_view_cert_key">Näytä varmennusavain</string>
   <string name="btn_create_key">Luo avain</string>
   <string name="btn_add_files">Lisää tiedosto(ja)</string>
@@ -70,14 +56,10 @@
   <string name="menu_help">Apua</string>
   <string name="menu_export_key">Vie tiedostoon</string>
   <string name="menu_delete_key">Poista avain</string>
-  <string name="menu_import_existing_key">Tuo tiedostosta</string>
   <string name="menu_search">Etsi</string>
   <string name="menu_beam_preferences">Beam asetukset</string>
-  <string name="menu_key_edit_cancel">Peruuta</string>
   <string name="menu_encrypt_to">Salaa...</string>
   <string name="menu_select_all">Valitse kaikki</string>
-  <string name="menu_add_keys">Lisää avaimia</string>
-  <string name="menu_search_cloud">Etsi pilvestä</string>
   <string name="menu_export_all_keys">Vie kaikki avaimet</string>
   <string name="menu_advanced">Näytä lisäinformaatio</string>
   <!--label-->
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index f2c249869..f34dd8e46 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Choisir des clefs</string>
-  <string name="title_select_secret_key">Choisir ma clef</string>
   <string name="title_encrypt_text">Chiffrer</string>
   <string name="title_encrypt_files">Chiffrer</string>
   <string name="title_decrypt">Déchiffrer</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Ajouter une sous-clef</string>
   <string name="title_edit_key">Modifier une clef</string>
   <string name="title_preferences">Paramètres</string>
-  <string name="title_cloud_search_preferences">Préférences de recherche nuagique</string>
   <string name="title_api_registered_apps">Applis</string>
   <string name="title_key_server_preference">Serveurs de clefs</string>
   <string name="title_change_passphrase">Modifier la phrase de passe</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">Chiffrer vers un fichier</string>
   <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string>
   <string name="title_import_keys">importer des clefs</string>
-  <string name="title_add_keys">Ajouter des clefs</string>
   <string name="title_export_key">Exporter la clef</string>
   <string name="title_export_keys">Exporter les clefs</string>
   <string name="title_key_not_found">Clef introuvable</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">Détails sur la clef</string>
   <string name="title_help">Aide</string>
   <string name="title_log_display">Journal</string>
-  <string name="title_create_key">Créer une clef</string>
   <string name="title_exchange_keys">Échanger des clefs</string>
   <string name="title_advanced_key_info">Infos avancées sur les clefs</string>
-  <string name="title_keys">Clefs</string>
   <string name="title_delete_secret_key">Supprimer VOTRE clef « %s » ?</string>
   <string name="title_export_log">Exporter le journal</string>
   <string name="title_manage_my_keys">Gérer mes clefs</string>
@@ -48,27 +42,18 @@
   <string name="section_cloud_evidence">Preuves provenant du nuage</string>
   <string name="section_keys">Sous-clefs</string>
   <string name="section_cloud_search">Recherche nuagique</string>
-  <string name="section_general">Général</string>
-  <string name="section_defaults">Valeurs par défaut</string>
-  <string name="section_advanced">Avancée</string>
   <string name="section_passphrase_cache">Cache de la phrase de passe</string>
   <string name="section_certify">Confirmer</string>
   <string name="section_actions">Actions</string>
   <string name="section_share_key">Clef</string>
-  <string name="section_upload_key">Synchroniser la clef</string>
   <string name="section_key_server">Serveur de clefs</string>
   <string name="section_fingerprint">Empreinte</string>
-  <string name="section_decrypt_files">Fichiers</string>
-  <string name="section_decrypt_text">Texte</string>
-  <string name="section_certs">Certificats</string>
   <string name="section_encrypt">Chiffrer</string>
   <string name="section_decrypt">Déchiffrer</string>
   <string name="section_current_expiry">Expiration actuelle</string>
   <string name="section_new_expiry">Nouvelle expiration</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Déchiffrer, vérifier et enregistrer le fichier</string>
-  <string name="btn_decrypt_verify_message">Déchiffrer et vérifier le texte</string>
-  <string name="btn_encrypt_file">Chiffrer et enregistrer le fichier</string>
   <string name="btn_encrypt_share_file">Chiffrer et partager le fichier</string>
   <string name="btn_encrypt_save_file">Chiffrer et enregistrer un fichier</string>
   <string name="btn_save">Enregistrer</string>
@@ -81,7 +66,6 @@
   <string name="btn_back">Retour</string>
   <string name="btn_no">Non</string>
   <string name="btn_match">Les empreintes correspondent</string>
-  <string name="btn_lookup_key">Rechercher la clef</string>
   <string name="btn_share_encrypted_signed">Chiffrer et partager du texte</string>
   <string name="btn_copy_encrypted_signed">Chiffrer et copier du texte</string>
   <string name="btn_view_cert_key">Voir la clef de certification</string>
@@ -100,16 +84,13 @@
   <string name="menu_export_key">Exporter vers un fichier</string>
   <string name="menu_delete_key">Supprimer la clef</string>
   <string name="menu_manage_keys">Gérer mes clefs</string>
-  <string name="menu_import_existing_key">Importer d\'un fichier</string>
   <string name="menu_search">Rechercher</string>
   <string name="menu_nfc_preferences">Paramètres NFC</string>
   <string name="menu_beam_preferences">Paramètres Beam</string>
-  <string name="menu_key_edit_cancel">Annuler</string>
   <string name="menu_encrypt_to">Chiffrer vers...</string>
   <string name="menu_select_all">Tout sélectionner</string>
-  <string name="menu_add_keys">Ajouter des clefs</string>
-  <string name="menu_search_cloud">Rechercher dans le nuage</string>
   <string name="menu_export_all_keys">Exporter toutes les clefs</string>
+  <string name="menu_update_all_keys">Mettre toutes les clefs à jour</string>
   <string name="menu_advanced">Afficher les infos avancées</string>
   <string name="menu_certify_fingerprint">Confirmer par une comparaison d\'empreinte</string>
   <string name="menu_export_log">Exporter le journal</string>
@@ -161,6 +142,10 @@
   <string name="label_enable_compression">Activer la compression</string>
   <string name="label_encrypt_filenames">Chiffrer les nom de fichier</string>
   <string name="label_hidden_recipients">Cacher les destinataires</string>
+  <string name="pref_keyserver">Rechercher dans le serveur de clef</string>
+  <string name="pref_keyserver_summary">Rechercher dans le serveur de clef HKP</string>
+  <string name="pref_keybase">Rechercher dans Keybase.io</string>
+  <string name="pref_keybase_summary">Rechercher dans l\'index de Keybase.io</string>
   <string name="user_id_no_name">&lt;aucun nom&gt;</string>
   <string name="none">&lt;aucune&gt;</string>
   <plurals name="n_keys">
@@ -217,9 +202,9 @@
   <string name="encrypt_sign_clipboard_successful">Signé et/ou chiffré vers le presse-papiers avec succès.</string>
   <string name="select_encryption_key">Choisir au moins une clef de chiffrement.</string>
   <string name="select_encryption_or_signature_key">Choisir au moins une clef de chiffrement ou de signature.</string>
-  <string name="specify_file_to_encrypt_to">Veuillez spécifier vers quel fichier chiffrer.\nAVERTISSEMENT ! Le fichier sera écrasé s\'il existe.</string>
-  <string name="specify_file_to_decrypt_to">Veuillez spécifier vers quel fichier déchiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe.</string>
-  <string name="specify_file_to_export_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT ! Le fichier sera écrasé s\'il existe.</string>
+  <string name="specify_file_to_encrypt_to">Veuillez spécifier vers quel fichier chiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string>
+  <string name="specify_file_to_decrypt_to">Veuillez spécifier vers quel fichier déchiffrer.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string>
+  <string name="specify_file_to_export_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT : le fichier sera écrasé s\'il existe !</string>
   <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs sélectionnées ?</string>
   <string name="secret_key_deletion_confirmation">Après suppression vous ne pourrez plus lire les messages chiffrés avec cette clef et vous perdrez toutes les confirmations de clefs faites avec elle !</string>
   <string name="public_key_deletetion_confirmation">Supprimer la clef \'%s\' ?</string>
@@ -289,6 +274,7 @@
   <string name="progress_cancelling">annulation...</string>
   <string name="progress_saving">sauvegarde...</string>
   <string name="progress_importing">importation...</string>
+  <string name="progress_updating">Mise à jour des clefs...</string>
   <string name="progress_exporting">exportation...</string>
   <string name="progress_uploading">téléversement...</string>
   <string name="progress_building_key">assemblage de la clef...</string>
@@ -589,6 +575,7 @@
   <string name="create_key_edit">Changer la configuration de la clef</string>
   <string name="create_key_add_email">Ajouter une adresse courriel</string>
   <string name="create_key_add_email_text">Des adresses courriel supplémentaires sont aussi associées à cette clef et peuvent être utilisées pour des communications sécurisées.</string>
+  <string name="create_key_email_already_exists_text">Le courriel a déjà été ajouté</string>
   <!--View key-->
   <string name="view_key_revoked">Révoquée : la clef ne doit plus être utilisée !</string>
   <string name="view_key_expired">Expirée : le contact doit prolonger la validité de la clef !</string>
@@ -1111,7 +1098,7 @@
   <string name="passp_cache_notif_pwd">Phrase de passe</string>
   <!--First Time-->
   <string name="first_time_text1">Reprenez le contrôle de votre vie privée avec OpenKeychain |</string>
-  <string name="first_time_create_key">Créer ma clef (recommandé)</string>
+  <string name="first_time_create_key">Créer ma clef</string>
   <string name="first_time_import_key">Importer la clef d\'un fichier</string>
   <string name="first_time_yubikey">Utiliser YubiKey NEO</string>
   <string name="first_time_skip">Ignorer le paramétrage</string>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 4d0e4d6cb..6db044b49 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -4,12 +4,9 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Seleziona chiavi</string>
-  <string name="title_select_secret_key">Seleziona la tua chiave</string>
   <string name="title_decrypt">Decodifica</string>
   <string name="title_add_subkey">Aggiungi Sottochiave</string>
   <string name="title_edit_key">Modifica Chiave</string>
-  <string name="title_cloud_search_preferences">Preferenze di ricerca</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_change_passphrase">Cambia Frase Di Accesso</string>
   <string name="title_share_fingerprint_with">Condivi impronta con...</string>
@@ -18,7 +15,6 @@
   <string name="title_encrypt_to_file">Codifica File</string>
   <string name="title_decrypt_to_file">Decodifica File</string>
   <string name="title_import_keys">Importa Chiavi</string>
-  <string name="title_add_keys">Aggiungi Chiavi</string>
   <string name="title_export_key">Esporta Chiave</string>
   <string name="title_export_keys">Esporta Chiavi</string>
   <string name="title_key_not_found">Chiave Non Trovata</string>
@@ -26,28 +22,19 @@
   <string name="title_key_details">Dettagli Chiave</string>
   <string name="title_help">Aiuto</string>
   <string name="title_log_display">Registro</string>
-  <string name="title_create_key">Crea Chiave</string>
   <string name="title_exchange_keys">Scambia le chiavi</string>
   <string name="title_advanced_key_info">Informazioni avanzate sulla chiave</string>
   <!--section-->
   <string name="section_user_ids">Identità</string>
   <string name="section_keys">Sottochiavi</string>
   <string name="section_cloud_search">Ricerca</string>
-  <string name="section_general">Generale</string>
-  <string name="section_defaults">Predefiniti</string>
-  <string name="section_advanced">Avanzato</string>
   <string name="section_passphrase_cache">Cache Frase di Accesso</string>
   <string name="section_actions">Azioni</string>
   <string name="section_share_key">Chiave</string>
-  <string name="section_upload_key">Sincronizza Chiave</string>
   <string name="section_key_server">Server delle Chiavi</string>
   <string name="section_fingerprint">Impronta</string>
-  <string name="section_decrypt_files">Files</string>
-  <string name="section_decrypt_text">Testo</string>
-  <string name="section_certs">Certificati</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Decodifica, verifica e salva su file</string>
-  <string name="btn_encrypt_file">Codifica e salva file</string>
   <string name="btn_encrypt_share_file">Codifica e condividi file</string>
   <string name="btn_save">Salva</string>
   <string name="btn_do_not_save">Annulla</string>
@@ -57,7 +44,6 @@
   <string name="btn_export_to_server">Carica sul Server delle Chiavi</string>
   <string name="btn_next">Prossimo</string>
   <string name="btn_back">Precedente</string>
-  <string name="btn_lookup_key">Chiave di ricerca</string>
   <string name="btn_view_cert_key">Mostra chiave di certificazione</string>
   <string name="btn_create_key">Crea chiave</string>
   <string name="btn_add_files">Aggiungi file(s)</string>
@@ -69,13 +55,10 @@
   <string name="menu_help">Aiuto</string>
   <string name="menu_export_key">Esporta su un file</string>
   <string name="menu_delete_key">Cancella chiave</string>
-  <string name="menu_import_existing_key">Importa da file</string>
   <string name="menu_search">Cerca</string>
   <string name="menu_beam_preferences">Impostazioni Beam</string>
-  <string name="menu_key_edit_cancel">Annulla</string>
   <string name="menu_encrypt_to">Codifica su...</string>
   <string name="menu_select_all">Seleziona tutto</string>
-  <string name="menu_add_keys">Aggiungi chiavi</string>
   <string name="menu_export_all_keys">Esporta tutte le chiavi</string>
   <string name="menu_advanced">Mostra informazioni avanzate</string>
   <!--label-->
@@ -167,12 +150,6 @@
   <string name="encrypt_sign_clipboard_successful">Firmato e/o codificato con successo negli appunti.</string>
   <string name="select_encryption_key">Seleziona almeno una chiave di codifica.</string>
   <string name="select_encryption_or_signature_key">Seleziona almeno una chiave di codifica o di firma.</string>
-  <string name="specify_file_to_encrypt_to">Perfavore specifica il file da codificare.
-ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
-  <string name="specify_file_to_decrypt_to">Perfavore specifica il file da decodificare.
-ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
-  <string name="specify_file_to_export_to">Perfavore specifica il file da esportare.
-ATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="also_export_secret_keys">Esporta anche chiave segreta</string>
   <string name="reinstall_openkeychain">Hai riscontrato un bug noto con Android. Si prega di reinstallare OpenKeychain se vuoi collegare i tuoi contatti con le chiavi.</string>
   <string name="key_exported">1 chiave esportata correttamente.</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index d77ae0cf6..13647a1bb 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">鍵を選択</string>
-  <string name="title_select_secret_key">あなたの鍵を選択</string>
   <string name="title_encrypt_text">暗号化</string>
   <string name="title_encrypt_files">暗号化</string>
   <string name="title_decrypt">復号化</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">副鍵の追加</string>
   <string name="title_edit_key">鍵の編集</string>
   <string name="title_preferences">設定</string>
-  <string name="title_cloud_search_preferences">クラウド検索設定</string>
   <string name="title_api_registered_apps">アプリ</string>
   <string name="title_key_server_preference">鍵サーバ</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">暗号化してファイルに</string>
   <string name="title_decrypt_to_file">復号化してファイルに</string>
   <string name="title_import_keys">鍵のインポート</string>
-  <string name="title_add_keys">鍵の追加</string>
   <string name="title_export_key">鍵のエクスポート</string>
   <string name="title_export_keys">複数鍵のエクスポート</string>
   <string name="title_key_not_found">鍵が見当りません</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">鍵の概要</string>
   <string name="title_help">ヘルプ</string>
   <string name="title_log_display">ログ</string>
-  <string name="title_create_key">鍵の生成</string>
   <string name="title_exchange_keys">鍵の交換</string>
   <string name="title_advanced_key_info">鍵の詳細情報</string>
-  <string name="title_keys">鍵</string>
   <string name="title_delete_secret_key">あなたの鍵 \'%s\' を削除しますか?</string>
   <string name="title_export_log">エクスポートログ</string>
   <string name="title_manage_my_keys">自分の鍵の管理</string>
@@ -48,27 +42,18 @@
   <string name="section_cloud_evidence">クラウドからの証明</string>
   <string name="section_keys">副鍵</string>
   <string name="section_cloud_search">クラウド検索</string>
-  <string name="section_general">一般</string>
-  <string name="section_defaults">デフォルト</string>
-  <string name="section_advanced">拡張</string>
   <string name="section_passphrase_cache">パスフレーズキャッシュ</string>
   <string name="section_certify">確認</string>
   <string name="section_actions">アクション</string>
   <string name="section_share_key">鍵</string>
-  <string name="section_upload_key">鍵の同期</string>
   <string name="section_key_server">鍵サーバ</string>
   <string name="section_fingerprint">指紋</string>
-  <string name="section_decrypt_files">ファイル</string>
-  <string name="section_decrypt_text">テキスト</string>
-  <string name="section_certs">証明</string>
   <string name="section_encrypt">暗号化</string>
   <string name="section_decrypt">復号化</string>
   <string name="section_current_expiry">現在の期限</string>
   <string name="section_new_expiry">新しい期限</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">復号化と検証、そしてファイルの保存</string>
-  <string name="btn_decrypt_verify_message">テキストの復号化と検証</string>
-  <string name="btn_encrypt_file">暗号化してファイルを保存</string>
   <string name="btn_encrypt_share_file">暗号化してファイルを共有</string>
   <string name="btn_encrypt_save_file">暗号化してファイルを保存</string>
   <string name="btn_save">保存</string>
@@ -81,7 +66,6 @@
   <string name="btn_back">戻る</string>
   <string name="btn_no">なし</string>
   <string name="btn_match">指紋一致</string>
-  <string name="btn_lookup_key">鍵検出</string>
   <string name="btn_share_encrypted_signed">暗号化してテキストを共有</string>
   <string name="btn_copy_encrypted_signed">暗号化してテキストをコピー</string>
   <string name="btn_view_cert_key">検証した鍵を見る</string>
@@ -100,16 +84,13 @@
   <string name="menu_export_key">ファイルへのエクスポート</string>
   <string name="menu_delete_key">鍵の削除</string>
   <string name="menu_manage_keys">自分の鍵の管理</string>
-  <string name="menu_import_existing_key">ファイルからインポート</string>
   <string name="menu_search">検索</string>
   <string name="menu_nfc_preferences">NFC設定</string>
   <string name="menu_beam_preferences">Beamの設定</string>
-  <string name="menu_key_edit_cancel">キャンセル</string>
   <string name="menu_encrypt_to">暗号化...</string>
   <string name="menu_select_all">すべて選択</string>
-  <string name="menu_add_keys">鍵の追加</string>
-  <string name="menu_search_cloud">クラウドを検索</string>
   <string name="menu_export_all_keys">すべての鍵のエクスポート</string>
+  <string name="menu_update_all_keys">全部のキーをアップデートする</string>
   <string name="menu_advanced">詳細情報を表示</string>
   <string name="menu_certify_fingerprint">指紋比較による確認</string>
   <string name="menu_export_log">エクスポートログ</string>
@@ -161,6 +142,10 @@
   <string name="label_enable_compression">圧縮を有効</string>
   <string name="label_encrypt_filenames">暗号化するファイル名</string>
   <string name="label_hidden_recipients">受信者を隠す</string>
+  <string name="pref_keyserver">キーサーバーで探す</string>
+  <string name="pref_keyserver_summary">HKPキーサーバーで探す</string>
+  <string name="pref_keybase">Keybase.ioで探す</string>
+  <string name="pref_keybase_summary">Keybase.ioのインデックスで探す</string>
   <string name="user_id_no_name">&lt;名前なし&gt;</string>
   <string name="none">&lt;無し&gt;</string>
   <plurals name="n_keys">
@@ -215,12 +200,9 @@
   <string name="encrypt_sign_clipboard_successful">クリップボードの中身の署名/暗号化に成功しました。</string>
   <string name="select_encryption_key">少なくとも1つの暗号化鍵を選択して下さい。</string>
   <string name="select_encryption_or_signature_key">少なくとも1つの暗号化鍵か署名鍵を選択して下さい。</string>
-  <string name="specify_file_to_encrypt_to">どのファイルを暗号化するか決めてください。
-注意: 既存のファイルがあると上書きされます。</string>
-  <string name="specify_file_to_decrypt_to">どのファイルを復号化するか決めてください。
-注意: 既存のファイルがあると上書きされます。</string>
-  <string name="specify_file_to_export_to">どのファイルをエクスポートするか決めてください。
-注意: 既存のファイルがあると上書きされます。</string>
+  <string name="specify_file_to_encrypt_to">どれのファイルを暗号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string>
+  <string name="specify_file_to_decrypt_to">どれのファイルを暗号するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string>
+  <string name="specify_file_to_export_to">どれのファイルを復号化するのを入力してください。\n注意：ファイルが存在しているなら上書きされる！</string>
   <string name="key_deletion_confirmation_multi">選択したすべての鍵を本当に削除してよいですか?</string>
   <string name="secret_key_deletion_confirmation">削除後はこの鍵で暗号化されたメッセージが読めなくなります、またその鍵で行われたすべての鍵確認を失います!</string>
   <string name="public_key_deletetion_confirmation">鍵 \'%s\' を削除しますか?</string>
@@ -294,6 +276,7 @@
   <string name="progress_cancelling">キャンセル中...</string>
   <string name="progress_saving">保存...</string>
   <string name="progress_importing">インポート...</string>
+  <string name="progress_updating">キーをアップデート中。。。</string>
   <string name="progress_exporting">エクスポート...</string>
   <string name="progress_uploading">アップロード中...</string>
   <string name="progress_building_key">鍵の構築中...</string>
@@ -512,12 +495,16 @@
   <string name="key_trust_maybe">この鍵はすでに破棄されたか期限切れです。\n確認済みではなく、しかしあなたは信頼すると選択することもできます。</string>
   <string name="key_trust_revoked">このIDは鍵の所有者により破棄されています。信頼することはできません。</string>
   <string name="key_trust_expired">この鍵は期限切れです。信頼することができません。</string>
+  <string name="key_trust_old_keys">このキーの有効な日付の時で書いてあるメッセージを復号化 するのは恐らく大丈夫です。</string>
   <string name="key_trust_no_cloud_evidence">この鍵の信頼性についてのクラウドでの検証がありません。</string>
   <string name="key_trust_start_cloud_search">検索開始</string>
+  <string name="key_trust_results_prefix">Keybase.ioはこのキーのオーナーだと言う証拠を提供している：</string>
+  <string name="key_trust_header_text">注意：Keybase.ioのオーナー証拠は実験的な機会です。キーを確認することに加えて、QRコードや、NFCでキーを交換するのもお勧めする。</string>
   <!--keybase proof stuff-->
   <string name="keybase_narrative_twitter">Twitterへ以下のIDで投稿</string>
   <string name="keybase_narrative_github">Githubでは以下のIDで知られています</string>
   <string name="keybase_narrative_dns">制御下にあるドメイン名(たち)</string>
+  <string name="keybase_narrative_web_site">サイトに投稿できる</string>
   <string name="keybase_narrative_reddit">Redditへ以下のIDで投稿</string>
   <string name="keybase_narrative_coinbase">Coinbaseでは以下で知られています</string>
   <string name="keybase_narrative_hackernews">Hacker Newsへ以下のIDで投稿</string>
@@ -580,6 +567,7 @@
   <string name="create_key_edit">鍵の設定変更</string>
   <string name="create_key_add_email">Eメールアドレスの追加</string>
   <string name="create_key_add_email_text">追加のEメールアドレスがこの鍵に紐付きそしてセキュアな通信に使うことができます。</string>
+  <string name="create_key_email_already_exists_text">メールはすでに追加している</string>
   <!--View key-->
   <string name="view_key_revoked">破棄: 鍵はもう使われません!</string>
   <string name="view_key_expired">期限切れ: この連絡先は鍵の妥当性を拡張する必要があります!</string>
@@ -1081,7 +1069,7 @@
   <string name="passp_cache_notif_pwd">パスフレーズ</string>
   <!--First Time-->
   <string name="first_time_text1">OpenKeychainであなたのプライバシーを取り戻しましょう!</string>
-  <string name="first_time_create_key">自分の鍵の生成(推奨)</string>
+  <string name="first_time_create_key">自分のキーを作る</string>
   <string name="first_time_import_key">ファイルから鍵をインポート</string>
   <string name="first_time_yubikey">YubiKey NEOを使用する</string>
   <string name="first_time_skip">セットアップをスキップ</string>
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 04c6f10f4..74e2c7117 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Selecteer sleutels</string>
-  <string name="title_select_secret_key">Selecteer je sleutel</string>
   <string name="title_encrypt_text">Versleutelen</string>
   <string name="title_encrypt_files">Versleutelen</string>
   <string name="title_decrypt">Ontsleutelen</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Voeg subsleutel toe</string>
   <string name="title_edit_key">Sleutel bewerken</string>
   <string name="title_preferences">Instellingen</string>
-  <string name="title_cloud_search_preferences">Cloud-zoekvoorkeuren</string>
   <string name="title_api_registered_apps">Apps</string>
   <string name="title_key_server_preference">Sleutelservers</string>
   <string name="title_change_passphrase">Wachtwoord wijzigen</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">Versleutelen naar bestand</string>
   <string name="title_decrypt_to_file">Ontsleutelen naar bestand</string>
   <string name="title_import_keys">Sleutels importeren</string>
-  <string name="title_add_keys">Voeg sleutels toe</string>
   <string name="title_export_key">Sleutels exporteren</string>
   <string name="title_export_keys">Sleutels exporteren</string>
   <string name="title_key_not_found">Sleutel niet gevonden</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">Sleutel Details</string>
   <string name="title_help">Help</string>
   <string name="title_log_display">Log</string>
-  <string name="title_create_key">Sleutel aanmaken</string>
   <string name="title_exchange_keys">Sleutels uitwisselen</string>
   <string name="title_advanced_key_info">Geavanceerde sleutelinfo</string>
-  <string name="title_keys">Sleutels</string>
   <string name="title_delete_secret_key">JOUW sleutel \'%s\' verwijderen?</string>
   <string name="title_export_log">Log exporteren</string>
   <string name="title_manage_my_keys">Beheer mijn sleutels</string>
@@ -48,27 +42,18 @@
   <string name="section_cloud_evidence">Bewijzen van de cloud</string>
   <string name="section_keys">Subsleutels</string>
   <string name="section_cloud_search">Cloud zoeken</string>
-  <string name="section_general">Algemeen</string>
-  <string name="section_defaults">Standaard</string>
-  <string name="section_advanced">Geavanceerd</string>
   <string name="section_passphrase_cache">Wachtwoordcache</string>
   <string name="section_certify">Bevestigen</string>
   <string name="section_actions">Acties</string>
   <string name="section_share_key">Sleutel</string>
-  <string name="section_upload_key">Synchroniseer sleutel</string>
   <string name="section_key_server">Sleutelserver</string>
   <string name="section_fingerprint">Vingerafdruk</string>
-  <string name="section_decrypt_files">Bestanden</string>
-  <string name="section_decrypt_text">Tekst</string>
-  <string name="section_certs">Certificaten</string>
   <string name="section_encrypt">Versleutelen</string>
   <string name="section_decrypt">Ontsleutelen</string>
   <string name="section_current_expiry">Huidige verloopdatum</string>
   <string name="section_new_expiry">Nieuwe verloopdatum</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Decodeer, verifiëer en sla bestand op</string>
-  <string name="btn_decrypt_verify_message">Tekst ontsleutelen en verifiëren</string>
-  <string name="btn_encrypt_file">Codeer en sla bestanden op</string>
   <string name="btn_encrypt_share_file">Bestand versleutelen en delen</string>
   <string name="btn_encrypt_save_file">Bestand versleutelen en opslaan</string>
   <string name="btn_save">Opslaan</string>
@@ -81,7 +66,6 @@
   <string name="btn_back">Terug</string>
   <string name="btn_no">Nee</string>
   <string name="btn_match">Vingerafdrukken komen overeen</string>
-  <string name="btn_lookup_key">Opzoeksleutel</string>
   <string name="btn_share_encrypted_signed">Tekst versleutelen en opslaan</string>
   <string name="btn_copy_encrypted_signed">Tekst versleutelen en kopiëren</string>
   <string name="btn_view_cert_key">Toon certificatiesleutel</string>
@@ -100,16 +84,13 @@
   <string name="menu_export_key">Exporteren naar bestand</string>
   <string name="menu_delete_key">Sleutel verwijderen</string>
   <string name="menu_manage_keys">Beheer mijn sleutels</string>
-  <string name="menu_import_existing_key">Importeren van bestand</string>
   <string name="menu_search">Zoeken</string>
   <string name="menu_nfc_preferences">NFC-instellingen</string>
   <string name="menu_beam_preferences">Beam-instellingen</string>
-  <string name="menu_key_edit_cancel">Annuleren</string>
   <string name="menu_encrypt_to">Versleutelen naar…</string>
   <string name="menu_select_all">Alles selecteren</string>
-  <string name="menu_add_keys">Sleutels toevoegen</string>
-  <string name="menu_search_cloud">Zoeken</string>
   <string name="menu_export_all_keys">Alle sleutels exporteren</string>
+  <string name="menu_update_all_keys">Alle sleutels bijwerken</string>
   <string name="menu_advanced">Geavanceerde info tonen</string>
   <string name="menu_certify_fingerprint">Bevestigen door vingerafdrukken te vergelijken</string>
   <string name="menu_export_log">Log exporteren</string>
@@ -161,6 +142,10 @@
   <string name="label_enable_compression">Compressie aanzetten</string>
   <string name="label_encrypt_filenames">Versleutel bestandsnamen</string>
   <string name="label_hidden_recipients">Verberg ontvangers</string>
+  <string name="pref_keyserver">Zoeken op sleutelserver</string>
+  <string name="pref_keyserver_summary">Zoeken op HKP sleutelserver</string>
+  <string name="pref_keybase">Zoeken op Keybase.io</string>
+  <string name="pref_keybase_summary">Zoeken in Keybase.io-index</string>
   <string name="user_id_no_name">&lt;no naam&gt;</string>
   <string name="none">&lt;geen&gt;</string>
   <plurals name="n_keys">
@@ -217,9 +202,9 @@
   <string name="encrypt_sign_clipboard_successful">Succesvol gesigneerd en/of gecodeerd naar klembord.</string>
   <string name="select_encryption_key">Selecteer ten minste één versleutelingssleutel.</string>
   <string name="select_encryption_or_signature_key">Selecter ten minste één versleutelings-/ondertekeningssleutel.</string>
-  <string name="specify_file_to_encrypt_to">Gelieve aan te geven naar welk bestand versleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden.</string>
-  <string name="specify_file_to_decrypt_to">Gelieve aan te geven naar welk bestand ontcijferd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden.</string>
-  <string name="specify_file_to_export_to">Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden.</string>
+  <string name="specify_file_to_encrypt_to">Gelieve aan te geven naar welk bestand versleuteld moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string>
+  <string name="specify_file_to_decrypt_to">Gelieve aan te geven naar welk bestand ontcijferd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string>
+  <string name="specify_file_to_export_to">Gelieve aan te geven naar welk bestand geëxporteerd moet worden.\nWAARSCHUWING: Als het bestand al bestaat, zal het overschreven worden!</string>
   <string name="key_deletion_confirmation_multi">Ben je zeker dat je alle geselecteerde sleutels wil verwijderen?</string>
   <string name="secret_key_deletion_confirmation">Na verwijderen zal je niet langer berichten versleuteld met deze sleutel kunnen lezen, en alle sleutelbevestigingen die ermee gedaan zijn verliezen!</string>
   <string name="public_key_deletetion_confirmation">Sleutel \'%s\' verwijderen?</string>
@@ -289,6 +274,7 @@
   <string name="progress_cancelling">bezig met annuleren…</string>
   <string name="progress_saving">opslaan…</string>
   <string name="progress_importing">importeren…</string>
+  <string name="progress_updating">Bezig met bijwerken van sleutels…</string>
   <string name="progress_exporting">exporteren…</string>
   <string name="progress_uploading">bezig met uploaden…</string>
   <string name="progress_building_key">sleutel maken…</string>
@@ -589,6 +575,7 @@
   <string name="create_key_edit">Sleutelconfiguratie wijzigen</string>
   <string name="create_key_add_email">E-mailadres toevoegen</string>
   <string name="create_key_add_email_text">Bijkomstige e-mailadressen zijn ook verbonden met deze sleutel en kunnen gebruikt worden voor veilige communicatie.</string>
+  <string name="create_key_email_already_exists_text">E-mail is al toegevoegd</string>
   <!--View key-->
   <string name="view_key_revoked">Ingetrokken: sleutel mag niet meer gebruikt worden!</string>
   <string name="view_key_expired">Verlopen: het contact moet de geldigheid van de sleutel verlengen!</string>
@@ -1111,7 +1098,7 @@
   <string name="passp_cache_notif_pwd">Wachtwoord</string>
   <!--First Time-->
   <string name="first_time_text1">Neem je privacy terug met OpenKeychain!</string>
-  <string name="first_time_create_key">Maak mijn sleutel aan (aanbevolen)</string>
+  <string name="first_time_create_key">Mijn sleutel aanmaken</string>
   <string name="first_time_import_key">Sleutel importeren uit bestand</string>
   <string name="first_time_yubikey">Gebruik YubiKey NEO</string>
   <string name="first_time_skip">Setup overslaan</string>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index cbaca4aa1..b0cf1abaa 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -4,14 +4,11 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Wybierz klucze</string>
-  <string name="title_select_secret_key">Wybierz swój klucz</string>
   <string name="title_decrypt">Odszyfruj</string>
   <string name="title_unlock">Odblokuj klucz</string>
   <string name="title_add_subkey">Dodaj pod-klucz</string>
   <string name="title_edit_key">Edytuj klucz</string>
   <string name="title_preferences">Ustawienia</string>
-  <string name="title_cloud_search_preferences">Właściwości Szukania w Chmurze</string>
   <string name="title_api_registered_apps">Aplikacje</string>
   <string name="title_key_server_preference">Serwery kluczy</string>
   <string name="title_change_passphrase">Zmień hasło</string>
@@ -21,7 +18,6 @@
   <string name="title_encrypt_to_file">Zaszyfruj do pliku</string>
   <string name="title_decrypt_to_file">Odszyfruj do pliku</string>
   <string name="title_import_keys">Importuj klucze</string>
-  <string name="title_add_keys">Dodaj klucze</string>
   <string name="title_export_key">Eksportuj klucz</string>
   <string name="title_export_keys">Eksportuj klucze</string>
   <string name="title_key_not_found">Nie znaleziono klucza</string>
@@ -29,31 +25,21 @@
   <string name="title_key_details">Szczegóły klucza</string>
   <string name="title_help">Pomoc</string>
   <string name="title_log_display">Logi</string>
-  <string name="title_create_key">Utwórz klucz</string>
   <string name="title_exchange_keys">Wymień się kluczami</string>
   <string name="title_advanced_key_info">Zaawansowane informacje o kluczu</string>
-  <string name="title_keys">Klucze</string>
   <!--section-->
   <string name="section_user_ids">Tożsamości</string>
   <string name="section_keys">Pod-klucze</string>
   <string name="section_cloud_search">Szukanie w Chmurze</string>
-  <string name="section_general">Ogólne</string>
-  <string name="section_defaults">Domyślne</string>
-  <string name="section_advanced">Zaawansowane</string>
   <string name="section_passphrase_cache">Pamięć cache hasła</string>
   <string name="section_actions">Działania</string>
   <string name="section_share_key">Klucz</string>
-  <string name="section_upload_key">Synchronizuj Klucz</string>
   <string name="section_key_server">Serwer kluczy</string>
   <string name="section_fingerprint">Odcisk klucza</string>
-  <string name="section_decrypt_files">Pliki</string>
-  <string name="section_decrypt_text">Tekst</string>
-  <string name="section_certs">Certyfikaty</string>
   <string name="section_encrypt">Zaszyfruj</string>
   <string name="section_decrypt">Odszyfruj</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Odszyfruj, weryfikuj i zapisz plik</string>
-  <string name="btn_encrypt_file">Szyfruj i zapisz plik</string>
   <string name="btn_encrypt_share_file">Szyfruj i podziel się plikiem</string>
   <string name="btn_save">Zapisz</string>
   <string name="btn_do_not_save">Anuluj</string>
@@ -63,7 +49,6 @@
   <string name="btn_export_to_server">Wyślij do serwera kluczy</string>
   <string name="btn_next">Dalej</string>
   <string name="btn_back">Wstecz</string>
-  <string name="btn_lookup_key">Sprawdź klucz</string>
   <string name="btn_view_cert_key">Wyświetl klucz certyfikacji</string>
   <string name="btn_create_key">Utwórz klucz</string>
   <string name="btn_add_files">Dodaj plik(i)</string>
@@ -78,13 +63,10 @@
   <string name="menu_help">Pomoc</string>
   <string name="menu_export_key">Eksportuj do pliku</string>
   <string name="menu_delete_key">Usuń klucz</string>
-  <string name="menu_import_existing_key">Importuj z pliku</string>
   <string name="menu_search">Szukaj</string>
   <string name="menu_beam_preferences">Ustawienia Beam</string>
-  <string name="menu_key_edit_cancel">Anuluj</string>
   <string name="menu_encrypt_to">Zaszyfruj do...</string>
   <string name="menu_select_all">Wybierz wszystko</string>
-  <string name="menu_add_keys">Dodaj klucze</string>
   <string name="menu_export_all_keys">Eksportuj wszystkie klucze</string>
   <string name="menu_advanced">Pokaż zaawansowane informacje</string>
   <!--label-->
@@ -182,9 +164,6 @@
   <string name="encrypt_sign_clipboard_successful">Pomyslnie podpisano i/lub zaszyfrowano do schowka.</string>
   <string name="select_encryption_key">Wybierz co najmniej jeden klucz szyfrujący.</string>
   <string name="select_encryption_or_signature_key">Wybierz co najmniej jeden klucz szyfrujący lub klucz podpisujący.</string>
-  <string name="specify_file_to_encrypt_to">Wskaż, do którego pliku zapisać zaszyfrowane dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string>
-  <string name="specify_file_to_decrypt_to">Wskaż, do którego pliku zapisać odszyfrowane dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string>
-  <string name="specify_file_to_export_to">Wskaż, do którego pliku wyeksportować dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string>
   <string name="also_export_secret_keys">Także eksportuj tajne klucze</string>
   <string name="reinstall_openkeychain">Napotkałeś się na znany błąd w Androidzie. Proszę ponownie zainstalować OpenKeychain jeśli chcesz połączyć kontakty z kluczami.</string>
   <string name="key_exported">Pomyślnie wyeksportowano 1 klucz.</string>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 0724ced26..2dd1821ee 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -4,16 +4,13 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Выберите ключи</string>
-  <string name="title_select_secret_key">Выберите Ваш ключ</string>
   <string name="title_encrypt_text">Зашифровать текст</string>
   <string name="title_encrypt_files">Зашифровать файлы</string>
   <string name="title_decrypt">Расшифровать</string>
   <string name="title_unlock">Разблокировать ключ</string>
-  <string name="title_add_subkey">Добавить доп. ключ</string>
+  <string name="title_add_subkey">Добавить подключ</string>
   <string name="title_edit_key">Изменить ключ</string>
   <string name="title_preferences">Настройки</string>
-  <string name="title_cloud_search_preferences">Настройки облачного поиска</string>
   <string name="title_api_registered_apps">Приложения</string>
   <string name="title_key_server_preference">Серверы ключей</string>
   <string name="title_change_passphrase">Изменить пароль</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">Зашифровать в файл</string>
   <string name="title_decrypt_to_file">Расшифровать в файл</string>
   <string name="title_import_keys">Импорт ключей</string>
-  <string name="title_add_keys">Добавить ключи</string>
   <string name="title_export_key">Экспортировать ключ</string>
   <string name="title_export_keys">Экспорт ключей</string>
   <string name="title_key_not_found">Ключ не найден</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">Сведения о ключе</string>
   <string name="title_help">Помощь</string>
   <string name="title_log_display">Журнал</string>
-  <string name="title_create_key">Создать ключ</string>
   <string name="title_exchange_keys">Обмен ключами</string>
   <string name="title_advanced_key_info">Детальная информация о ключе</string>
-  <string name="title_keys">Ключи</string>
   <string name="title_delete_secret_key">Удалить ВАШ ключ \'%s\'?</string>
   <!--section-->
   <string name="section_user_ids">Идентификаторы</string>
@@ -46,26 +40,17 @@
   <string name="section_cloud_evidence">Подтвердить из облака</string>
   <string name="section_keys">Доп. ключи</string>
   <string name="section_cloud_search">Облачный поиск</string>
-  <string name="section_general">Приложение</string>
-  <string name="section_defaults">Алгоритмы</string>
-  <string name="section_advanced">Дополнительно</string>
   <string name="section_passphrase_cache">Кэш пароля</string>
   <string name="section_actions">Действия</string>
   <string name="section_share_key">Ключ</string>
-  <string name="section_upload_key">Синхронизировать ключ</string>
   <string name="section_key_server">Сервер ключей</string>
   <string name="section_fingerprint">Отпечаток ключа</string>
-  <string name="section_decrypt_files">Файлы</string>
-  <string name="section_decrypt_text">Текст</string>
-  <string name="section_certs">Сертификаты</string>
   <string name="section_encrypt">Зашифровать</string>
   <string name="section_decrypt">Расшифровать</string>
   <string name="section_current_expiry">Текущий срок годности</string>
   <string name="section_new_expiry">Новый срок годности</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Расшифровать, проверить и сохранить файл</string>
-  <string name="btn_decrypt_verify_message">Расшифровать и проверить текст</string>
-  <string name="btn_encrypt_file">Зашифровать и сохранить файл</string>
   <string name="btn_encrypt_share_file">Зашифровать и отправить файл</string>
   <string name="btn_save">Сохранить</string>
   <string name="btn_do_not_save">Отмена</string>
@@ -77,7 +62,6 @@
   <string name="btn_back">Назад</string>
   <string name="btn_no">Нет</string>
   <string name="btn_match">Отпечатки совпадают</string>
-  <string name="btn_lookup_key">Найти ключ</string>
   <string name="btn_view_cert_key">Просмотр ключа</string>
   <string name="btn_create_key">Создать ключ</string>
   <string name="btn_add_files">Добавить файл(ы)</string>
@@ -92,15 +76,11 @@
   <string name="menu_help">Помощь</string>
   <string name="menu_export_key">Экспорт в файл</string>
   <string name="menu_delete_key">Удалить ключ</string>
-  <string name="menu_import_existing_key">Импорт из файла</string>
   <string name="menu_search">Поиск</string>
   <string name="menu_nfc_preferences">Настройки NFC</string>
   <string name="menu_beam_preferences">Настройки Beam</string>
-  <string name="menu_key_edit_cancel">Отмена</string>
   <string name="menu_encrypt_to">Зашифровать....</string>
   <string name="menu_select_all">Выбрать все</string>
-  <string name="menu_add_keys">Добавить ключи</string>
-  <string name="menu_search_cloud">Поиск в облаке</string>
   <string name="menu_export_all_keys">Экспорт всех ключей</string>
   <string name="menu_advanced">Подробные данные</string>
   <!--label-->
@@ -127,6 +107,7 @@
   <string name="label_symmetric">Зашифровать паролем</string>
   <string name="label_passphrase_cache_ttl">Время хранения в кэше</string>
   <string name="label_passphrase_cache_subs">Кэшировать пароли по доп. ключу</string>
+  <string name="label_message_compression">Сжатие текста</string>
   <string name="label_file_compression">Сжатие файла</string>
   <string name="label_keyservers">Серверы ключей</string>
   <string name="label_key_id">ID ключа</string>
@@ -202,9 +183,6 @@
   <string name="encrypt_sign_clipboard_successful">Успешно подписано и/или зашифровано в буфер обмена.</string>
   <string name="select_encryption_key">Укажите хотя бы один ключ.</string>
   <string name="select_encryption_or_signature_key">Выберите хотя бы один ключ для шифрования или подписи.</string>
-  <string name="specify_file_to_encrypt_to">Пожалуйста, выберите файл для шифрования.\nВНИМАНИЕ! Файл будет перезаписан если он уже существует.</string>
-  <string name="specify_file_to_decrypt_to">Пожалуйста, выберите файл для расшифровки.\nВНИМАНИЕ! Файл будет перезаписан если он уже существует.</string>
-  <string name="specify_file_to_export_to">Пожалуйста, выберите файл для экспорта.\nВНИМАНИЕ! Файл будет перезаписан если он уже существует.</string>
   <string name="also_export_secret_keys">Экспортировать секретные ключи</string>
   <string name="reinstall_openkeychain">Вы столкнулись с багом Андроид. Пожалуйста, переустановите OpenKeychain чтобы связать ваши контакты и ключи.  </string>
   <string name="key_exported">Успешный экспорт 1 ключа.</string>
@@ -723,16 +701,37 @@
   <!--Consolidate-->
   <string name="msg_con">Консолидация базы данных</string>
   <string name="msg_con_error_bad_state">Консолидация началась но база не кэширована! Это программная ошибка, пожалуйста, сообщите об этом.</string>
+  <string name="msg_con_db_clear">Очистка базы данных</string>
   <string name="msg_con_error_db">Ошибка открытия базы данных!</string>
+  <string name="msg_con_error_io_public">Ошибка записи публичных ключей в кэш!</string>
+  <string name="msg_con_error_io_secret">Ошибка записи приватных ключей в кэш!</string>
+  <string name="msg_con_error_public">Ошибка переимпортирования публичных ключей!</string>
+  <string name="msg_con_error_secret">Ошибка переимпортирования приватных ключей!</string>
   <!--Edit Key (higher level than modify)-->
   <string name="msg_ed_error_key_not_found">Ключ не найден!</string>
+  <string name="msg_ed_success">Операция с ключом успешна!</string>
   <!--Promote key-->
+  <string name="msg_pr_error_already_secret">Этот ключ уже приватный!</string>
   <string name="msg_pr_error_key_not_found">Ключ не найден!</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">Редактирование NFC ключей (еще) не поддерживается!</string>
   <string name="msg_ek_error_not_found">Ключ не найден!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_clear_decompress">Распаковка сжатых данных</string>
+  <string name="msg_dc_clear_meta_size_unknown">Неизвестный размер файла</string>
+  <string name="msg_dc_clear_signature_bad">Проверка подписи НЕ ПРОЙДЕНА!</string>
+  <string name="msg_dc_error_unsupported_hash_algo">Неподдерживаемый, и потенциально небезопасный алгоритм хэширования!</string>
+  <string name="msg_dc_clear_signature_check">Проверка подписи данных</string>
+  <string name="msg_dc_clear_signature_ok">Проверка подписи ПРОЙДЕНА</string>
+  <string name="msg_dc_clear_signature">Сохранение данных подписи</string>
+  <string name="msg_dc_error_bad_passphrase">Ошибка разблокирования ключа, неверная фраза-пароль!</string>
+  <string name="msg_dc_error_extract_key">Неизвестная ошибка разблокировения ключа!</string>
+  <string name="msg_dc_error_no_data">Зашифрованные данные не найдены!</string>
+  <string name="msg_dc_error_no_key">Зашифрованные данные с известным приватным ключом не найдены!</string>
+  <string name="msg_dc_ok">Расшифрование/проверка закончена</string>
+  <string name="msg_dc_pass_cached">Использование фразы-пароля из кэша</string>
   <string name="msg_dc_unlocking">Разблокировка секретного ключа</string>
+  <string name="msg_dc_old_symmetric_encryption_algo">Был использован потенциально небезопасный алгоритм шифрования!</string>
   <!--Messages for VerifySignedLiteralData operation-->
   <string name="msg_vl_clear_signature_check">Проверка подписи данных</string>
   <string name="msg_vl_ok">ОК</string>
@@ -758,16 +757,30 @@
   <string name="msg_pse_error_nfc">Ошибка данных NFC!</string>
   <string name="msg_pse_error_no_passphrase">Парольных фраз не найдено!</string>
   <string name="msg_pse_error_pgp">Внутренняя ошибка OpenPGP!</string>
+  <string name="msg_crt_certifying">Генерация сертификатов</string>
+  <string name="msg_crt_error_master_not_found">Основной ключ не найден!</string>
+  <string name="msg_crt_error_nothing">Нет сертифицированных ключей!</string>
+  <string name="msg_crt_error_unlock">Ошибка разблокирования основного ключа!</string>
   <string name="msg_crt_saving">Сохранение связки</string>
   <string name="msg_crt_unlock">Разблокировка основного ключа</string>
   <string name="msg_crt_warn_not_found">Ключ не найден!</string>
   <string name="msg_crt_warn_cert_failed">Создание сертификата не удалось!</string>
+  <string name="msg_crt_warn_save_failed">Ошибка операции сохранения!</string>
   <string name="msg_crt_upload_success">Ключ успешно загружен на сервер</string>
   <string name="msg_import_fingerprint_ok">Проверка отпечатка успешна</string>
+  <string name="msg_import_error">Ошибка операции импорта!</string>
+  <string name="msg_import_error_io">Операция импорта прервана из-за ошибки ввода/вывода!</string>
+  <string name="msg_import_success">Операция импорта успешна!</string>
+  <string name="msg_export_all">Экспорт всех ключей</string>
+  <string name="msg_export_error_no_file">Не выбрано имя файла!</string>
   <string name="msg_export_error_fopen">Ошибка открытия файла!</string>
+  <string name="msg_export_error_no_uri">Не выбран URL!</string>
+  <string name="msg_export_error_storage">Диск не готов для записи!</string>
   <string name="msg_export_error_db">Ошибка базы данных!</string>
   <string name="msg_export_error_io">Ошибка ввода/вывода!</string>
+  <string name="msg_export_success">Операция экспорта успешна</string>
   <string name="msg_del_error_empty">Нет данных для удаления!</string>
+  <string name="msg_del_error_multi_secret">Секретные ключи можно удалять только по одному!</string>
   <string name="msg_acc_saved">Аккаунт сохранен</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
@@ -775,12 +788,19 @@
     <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
   </plurals>
   <!--Messages for Export Log operation-->
+  <string name="msg_export_log_error_fopen">Ошибка открытия файла</string>
+  <string name="msg_export_log_error_no_file">Не выбрано имя файла!</string>
+  <string name="msg_export_log_error_writing">Ошибка записи в файл!</string>
+  <string name="msg_export_log_success">Лог успешно экспортирован!</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_keys">Кэшированные пароли:</string>
   <string name="passp_cache_notif_clear">Очистить кэш</string>
   <string name="passp_cache_notif_pwd">Пароль</string>
   <!--First Time-->
   <string name="first_time_text1">Верните вашу приватность с помощью OpenKeychain!</string>
+  <string name="first_time_create_key">Создать свой ключ</string>
+  <string name="first_time_import_key">Импорт ключа из файла</string>
+  <string name="first_time_yubikey">Использовать YubiKey NEO</string>
   <string name="first_time_skip">Пропустить настройку</string>
   <!--unsorted-->
   <string name="section_certifier_id">Кем подписан</string>
@@ -792,6 +812,7 @@
   <string name="label_cert_type">Тип</string>
   <string name="error_key_not_found">Ключ не найден!</string>
   <string name="error_key_processing">Ошибка обработки ключа!</string>
+  <string name="key_no_passphrase">Без фразы-пароля</string>
   <string name="key_unavailable">недоступно</string>
   <string name="title_view_cert">Просмотреть детали сертификации</string>
   <string name="unknown_algorithm">неизв.</string>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 051f960ed..4fee0250d 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -4,24 +4,23 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Izberi ključe</string>
-  <string name="title_select_secret_key">Izberi zasebni ključ</string>
+  <string name="title_encrypt_text">Šifriraj</string>
+  <string name="title_encrypt_files">Šifriraj</string>
   <string name="title_decrypt">Dešifriraj</string>
   <string name="title_unlock">Odkleni ključ</string>
   <string name="title_add_subkey">Dodaj podključ</string>
   <string name="title_edit_key">Uredi ključ</string>
   <string name="title_preferences">Nastavitve</string>
-  <string name="title_cloud_search_preferences">Nastavitve iskanja v oblaku</string>
   <string name="title_api_registered_apps">Aplikacije</string>
   <string name="title_key_server_preference">Strežniki javnih ključev</string>
   <string name="title_change_passphrase">Spremeni geslo</string>
   <string name="title_share_fingerprint_with">Deli prstni odtis z...</string>
   <string name="title_share_key">Deli ključ z...</string>
   <string name="title_share_file">Deli datoteko z...</string>
+  <string name="title_share_message">Deli besedilo z...</string>
   <string name="title_encrypt_to_file">Šifriraj v datoteko</string>
   <string name="title_decrypt_to_file">Dešifriraj v datoteko</string>
   <string name="title_import_keys">Uvozi ključe</string>
-  <string name="title_add_keys">Dodaj ključe</string>
   <string name="title_export_key">Izvozi kluč</string>
   <string name="title_export_keys">Izvozi ključe</string>
   <string name="title_key_not_found">Ključ ni bil najden</string>
@@ -30,32 +29,33 @@
   <string name="title_key_details">Podrobnosti o ključu</string>
   <string name="title_help">Pomoč</string>
   <string name="title_log_display">Dnevnik</string>
-  <string name="title_create_key">Ustvari kluč</string>
   <string name="title_exchange_keys">Izmenjava ključev</string>
   <string name="title_advanced_key_info">Napredne informacije o ključu</string>
-  <string name="title_keys">Ključi</string>
+  <string name="title_delete_secret_key">Izbrišem VAŠ ključ \'%s\'?</string>
+  <string name="title_export_log">Izvozi sistemsko zabeležbo</string>
+  <string name="title_manage_my_keys">Upravljanje mojih ključev</string>
   <!--section-->
   <string name="section_user_ids">Identitete</string>
+  <string name="section_linked_system_contact">Povezan stik</string>
   <string name="section_should_you_trust">Ali zaupate temu ključu?</string>
+  <string name="section_proof_details">Overba dokazila</string>
+  <string name="section_cloud_evidence">Dokazila iz oblaka</string>
   <string name="section_keys">Podključi</string>
   <string name="section_cloud_search">Iskanje v oblaku</string>
-  <string name="section_general">Splošno</string>
-  <string name="section_defaults">Privzeto</string>
-  <string name="section_advanced">Napredno</string>
+  <string name="section_passphrase_cache">Hranjenje gesla v spominu</string>
   <string name="section_certify">Potrdi</string>
   <string name="section_actions">Ravnanja</string>
   <string name="section_share_key">Ključ</string>
   <string name="section_key_server">Strežnik</string>
   <string name="section_fingerprint">Prstni odtis</string>
-  <string name="section_decrypt_files">Datoteke</string>
-  <string name="section_decrypt_text">Besedilo</string>
-  <string name="section_certs">Certifikati</string>
   <string name="section_encrypt">Šifriraj</string>
   <string name="section_decrypt">Dešifriraj</string>
+  <string name="section_current_expiry">Trenuten datum poteka</string>
+  <string name="section_new_expiry">Nov datum poteka</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dešifriraj, preveri in shrani</string>
-  <string name="btn_encrypt_file">Šifriraj in shrani datoteko</string>
   <string name="btn_encrypt_share_file">Šifriraj in deli datoteko</string>
+  <string name="btn_encrypt_save_file">Šifriraj in shrani datoteko</string>
   <string name="btn_save">Shrani</string>
   <string name="btn_do_not_save">Prekliči</string>
   <string name="btn_delete">Izbriši</string>
@@ -64,26 +64,38 @@
   <string name="btn_export_to_server">Naloži na strežnik</string>
   <string name="btn_next">Naprej</string>
   <string name="btn_back">Nazaj</string>
-  <string name="btn_lookup_key">Išči ključ</string>
+  <string name="btn_no">Ne</string>
+  <string name="btn_match">Prstna odtisa se ujemata</string>
+  <string name="btn_share_encrypted_signed">Šifriraj in deli besedilo</string>
+  <string name="btn_copy_encrypted_signed">Šifriraj besedilo in kopiraj v odložišče</string>
   <string name="btn_view_cert_key">Poglej ključ za overjanje</string>
   <string name="btn_create_key">Ustvari ključ</string>
   <string name="btn_add_files">Dodaj datoteko</string>
+  <string name="btn_add_share_decrypted_text">Deli dešifrirano besedilo</string>
+  <string name="btn_decrypt_clipboard">Dešifriraj besedilo iz odložišča</string>
+  <string name="btn_decrypt_and_verify">in preveri podpise</string>
   <string name="btn_decrypt_files">Dešifriraj datoteke</string>
+  <string name="btn_encrypt_files">Šifriraj datoteke</string>
+  <string name="btn_encrypt_text">Šifriraj besedilo</string>
+  <string name="btn_add_email">Dodaj elektronske naslove</string>
   <!--menu-->
   <string name="menu_preferences">Nastavitve</string>
   <string name="menu_help">Pomoč</string>
   <string name="menu_export_key">Izvozi v datoteko</string>
   <string name="menu_delete_key">Izbriši ključ</string>
-  <string name="menu_import_existing_key">Uvozi iz datoteke</string>
+  <string name="menu_manage_keys">Upravljanje mojih ključev</string>
   <string name="menu_search">Išči</string>
+  <string name="menu_nfc_preferences">Nastavitve NFC</string>
   <string name="menu_beam_preferences">Nastavitve Beam</string>
-  <string name="menu_key_edit_cancel">Prekliči</string>
   <string name="menu_encrypt_to">Šifriraj v...</string>
   <string name="menu_select_all">Izberi vse</string>
-  <string name="menu_add_keys">Dodaj ključe</string>
   <string name="menu_export_all_keys">Izvozi vse ključe</string>
+  <string name="menu_update_all_keys">Posodobi vse ključe</string>
   <string name="menu_advanced">Prikaži dodatne informacije</string>
+  <string name="menu_certify_fingerprint">Potrdi s primerjavo prstnih odtisov</string>
+  <string name="menu_export_log">Izvozi sistemsko zabeležbo</string>
   <!--label-->
+  <string name="label_message">Besedilo</string>
   <string name="label_file">Datoteka</string>
   <string name="label_files">Datoteke</string>
   <string name="label_file_colon">Datoteka:</string>
@@ -91,17 +103,25 @@
   <string name="label_passphrase">Geslo</string>
   <string name="label_unlock">Odklepanje...</string>
   <string name="label_passphrase_again">Ponovi geslo</string>
+  <string name="label_show_passphrase">Prikaži geslo</string>
   <string name="label_algorithm">Algoritem</string>
   <string name="label_ascii_armor">ASCII oklep datotek</string>
   <string name="label_file_ascii_armor">Omogoči ASCII ovoj</string>
   <string name="label_write_version_header">Daj drugim vedeti, da uporabljate OpenKeychain</string>
   <string name="label_write_version_header_summary">Zapiše \'OpenKeychain v2.7\' v OpenPGP podpis, šifrirano besedilo in izvožene ključe</string>
+  <string name="label_use_default_yubikey_pin">Uporabi privzeto YubiKey PIN kodo</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Uporabi numerično tipkovnico za YubiKey PIN kodo</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Uporablja privzeto PIN kodo (123456) za dostop do ključev YubiKey preko NFC</string>
   <string name="label_asymmetric_from">Podpisal:</string>
   <string name="label_to">Šifriraj za:</string>
+  <string name="label_delete_after_encryption">Po dešifriranju izbriši datoteke</string>
   <string name="label_delete_after_decryption">Izbriši po dešifriranju</string>
   <string name="label_encryption_algorithm">Šifrirni algoritem</string>
   <string name="label_hash_algorithm">Zgostitveni algoritem</string>
   <string name="label_symmetric">Šifriranje z geslom</string>
+  <string name="label_passphrase_cache_ttl">Čas pomnjenja</string>
+  <string name="label_passphrase_cache_subs">Pomni gesla glede na podključ</string>
+  <string name="label_message_compression">Kompresija besedila</string>
   <string name="label_file_compression">Stiskanje datotek</string>
   <string name="label_keyservers">Strežniki</string>
   <string name="label_key_id">ID ključa</string>
@@ -114,8 +134,18 @@
   <string name="label_name">Ime</string>
   <string name="label_comment">Komentar</string>
   <string name="label_email">E-pošta</string>
+  <string name="label_send_key">Sinhroniziraj z oblakom</string>
   <string name="label_fingerprint">Prstni odtis</string>
   <string name="expiry_date_dialog_title">Določi datum poteka veljavnosti</string>
+  <string name="label_first_keyserver_is_used">(Prednost ima prvi strežnik na seznamu)</string>
+  <string name="label_preferred">prednostni</string>
+  <string name="label_enable_compression">Omogoči kompresijo</string>
+  <string name="label_encrypt_filenames">Šifriraj imena datotek</string>
+  <string name="label_hidden_recipients">Skrij prejemnike</string>
+  <string name="pref_keyserver">Preišči strežnik s ključi</string>
+  <string name="pref_keyserver_summary">Preišči strežnik HKP</string>
+  <string name="pref_keybase">Preišči strežnik Keybase.io</string>
+  <string name="pref_keybase_summary">Preišči seznam Keybase.io</string>
   <string name="user_id_no_name">&lt;brez imena&gt;</string>
   <string name="none">&lt;nič&gt;</string>
   <plurals name="n_keys">
@@ -165,28 +195,49 @@
   <string name="passphrase_must_not_be_empty">Vnesite geslo.</string>
   <string name="passphrase_for_symmetric_encryption">Simetrično šifriranje.</string>
   <string name="passphrase_for">Vnesite geslo za \'%s\'</string>
+  <string name="pin_for">Vnesite PIN kodo za \'%s\'</string>
+  <string name="yubikey_pin_for">Vnesite PIN kodo za dostop YubiKey za \'%s\'</string>
+  <string name="nfc_text">Prislonite YubiKey k hrbtišču mobilne naprave.</string>
+  <string name="file_delete_confirmation_title">Izbrišem izvirne datoteke?</string>
+  <string name="file_delete_confirmation">Izbrisane bodo naslednje datoteke:%s</string>
+  <string name="file_delete_successful">Izbrisanih je bilo %1$d od %2$d datotek.%3$s</string>
   <string name="no_file_selected">Najprej izberite datoteko.</string>
   <string name="encrypt_sign_successful">Uspešno podpisano in/ali šifrirano.</string>
   <string name="encrypt_sign_clipboard_successful">Uspešno podpisano in/ali šifrirano ter poslano v odložišče.</string>
   <string name="select_encryption_key">Izberite vsaj en šifrirni ključ.</string>
   <string name="select_encryption_or_signature_key">Vnesite vsaj en šifrirni ključ ali ključ za podpisovanje.</string>
   <string name="specify_file_to_encrypt_to">Določite datoteko, v katero želite šifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string>
+  <string name="specify_file_to_decrypt_to">Določite datoteko, v katero želite dešifrirati vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string>
   <string name="specify_file_to_export_to">Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string>
+  <string name="key_deletion_confirmation_multi">Ali zares želite izbrisati vse izbrane ključe?</string>
+  <string name="secret_key_deletion_confirmation">Po izbrisu ne bo več mogoče prebirati sporočil šifriranih s tem ključem! Izgubljene bodo tudi vse z njim narejene potrditve.</string>
+  <string name="public_key_deletetion_confirmation">Izbrišem ključ \'%s\'?</string>
   <string name="also_export_secret_keys">Izvozi tudi zasebne ključe</string>
+  <string name="reinstall_openkeychain">Naleteli ste na poznanega \'hrošča\' v sistemu Android. Za povezavo vaših stikov s ključi ponovno naložite aplikacijo OpenKeycahain.</string>
   <string name="key_exported">Uspešno izvožen 1 ključ.</string>
   <string name="keys_exported">Uspešno izvoženih ključev: %d</string>
   <string name="no_keys_exported">Noben ključ ni bil izvožen.</string>
   <string name="key_creation_el_gamal_info">Pozor: ELGamal podpirajo samo podključi.</string>
   <string name="key_not_found">Ne najdem ključa %08X.</string>
+  <string name="specify_file_to_export_log_to">Določite datoteko, v katero želite izvoziti vsebino.\nPOZOR: če datoteka že obstaja, bo prepisana.</string>
+  <plurals name="bad_keys_encountered">
+    <item quantity="one">Neupoštevan %d slab zasebni ključ. Morda je bil izvožen na način\n --export-secret-subkeys\nPoskrbite, da bo izvožen z\n --export-secret-keys</item>
+    <item quantity="two">Neupoštevana %d slaba zasebna ključa. Morda sta bila izvožena na način\n --export-secret-subkeys\nPoskrbite, da bosta izvožena z\n --export-secret-keys</item>
+    <item quantity="few">Neupoštevani %d slabi zasebni ključi. Morda so bili izvoženi na način\n --export-secret-subkeys\nPoskrbite, da bodo izvoženi z\n --export-secret-keys</item>
+    <item quantity="other">Neupoštevanih %d slabih zasebnih ključev. Morda so bili izvoženi na način\n --export-secret-subkeys\nPoskrbite, da bodo izvoženi z\n --export-secret-keys</item>
+  </plurals>
   <string name="list_empty">Lista je prazna!</string>
   <string name="nfc_successful">Ključ uspešno poslan preko NFC Beam!</string>
   <string name="key_copied_to_clipboard">Ključ je bil prekopiran v odložišče!</string>
   <string name="fingerprint_copied_to_clipboard">Prstni odtis je bil prekopiran v odložišče!</string>
+  <string name="select_key_to_certify">Izberite ključ, ki ga boste uporabljali za potrjevanje!</string>
   <string name="key_too_big_for_sharing">Ključ je prevelik za delitev na ta način!</string>
   <string name="text_copied_to_clipboard">Besedilo je bilo prekopirano v odložišče!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">niso bili izbisani. Izbrišite jih ročno!</string>
+  <string name="error_file_added_already">%s je bil že dodan.</string>
   <string name="error_file_not_found">ne najdem datoteke</string>
   <string name="error_no_secret_key_found">ne najdem ustreznega zasebnega ključa</string>
   <string name="error_external_storage_not_ready">zunanja shramba ni na voljo</string>
@@ -196,12 +247,16 @@
   <string name="error_key_needs_a_user_id">potrebujete vsaj eno identiteto</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>
+  <string name="error_invalid_data">Ne najdem nobene vsebine šifrirane ali podpisane z OpenPGP!</string>
   <string name="error_integrity_check_failed">Preverba neokrnjenosti ni bila uspešna! Podatki so bili spremenjeni!</string>
   <string name="error_wrong_passphrase">napačno geslo</string>
   <string name="error_could_not_extract_private_key">ne morem izvleči zasebnega ključa</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Za uporabo storitve NFC Beam potrebujete najmanj Android 4.1!</string>
+  <string name="error_nfc_needed">Vključen mora biti NFC!</string>
+  <string name="error_beam_needed">Vključen mora biti Beam!</string>
   <string name="error_nothing_import">Najden ni bil noben ključ!</string>
+  <string name="error_contacts_key_id_missing">Pridobivanje ID-jev ključev iz vaših stikov ni bilo uspešno!</string>
   <string name="error_generic_report_bug">Pripetila se je splošna napaka, prosimo ustvarite poročilo o \'hrošču\'.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">Ni podpisano</string>
@@ -215,6 +270,8 @@
   <string name="decrypt_result_not_encrypted">Nešifrirano</string>
   <string name="decrypt_result_action_show">Prikaži</string>
   <string name="decrypt_result_action_Lookup">Poišči</string>
+  <string name="decrypt_invalid_text">Nekaj ni v redu: ali je neveljaven podpis ali pa je ključ potekel oz. bil preklican. Zato se ne da reči, kdo je v resnici napisal besedilo. Naj ga vseeno prikažem?</string>
+  <string name="decrypt_invalid_button">Seznanjen sem s tveganji, prikaži!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Moj ključ:</string>
   <!--progress dialogs, usually ending in '…'-->
@@ -223,6 +280,7 @@
   <string name="progress_cancelling">preklic...</string>
   <string name="progress_saving">shranjujem...</string>
   <string name="progress_importing">uvažam...</string>
+  <string name="progress_updating">Posodabljam ključe...</string>
   <string name="progress_exporting">izvažam...</string>
   <string name="progress_uploading">pošiljanje...</string>
   <string name="progress_building_key">ustvarjam ključ...</string>
@@ -232,9 +290,15 @@
   <string name="progress_generating_elgamal">ustvarjanje novega ElGamal ključa...</string>
   <string name="progress_generating_ecdsa">ustvarjanje novega ECDSA ključa...</string>
   <string name="progress_generating_ecdh">ustvarjanje novega ECDH ključa...</string>
-  <string name="progress_modify_primaryuid">menjavam glavno identiteto uporabnika...</string>
+  <string name="progress_modify">spreminjam zbirko ključev...</string>
+  <string name="progress_modify_unlock">odklepam zbirko ključev...</string>
+  <string name="progress_modify_adduid">dodajam ID-je uporabnikov...</string>
+  <string name="progress_modify_adduat">dodajam lastnosti uporabnikov...</string>
+  <string name="progress_modify_revokeuid">razveljavljam ID-je uporabnikov...</string>
+  <string name="progress_modify_primaryuid">menjavam glavni ID...</string>
   <string name="progress_modify_subkeychange">spreminjanje podključev...</string>
   <string name="progress_modify_subkeyrevoke">preklicevanje podključev...</string>
+  <string name="progress_modify_subkeystrip">razstavljam podključe...</string>
   <string name="progress_modify_subkeyadd">dodajanje podključev...</string>
   <string name="progress_modify_passphrase">menjava gesla...</string>
   <plurals name="progress_exporting_key">
@@ -260,7 +324,10 @@
   <string name="progress_verifying_integrity">preverjam neokrnjenost...</string>
   <string name="progress_deleting_securely">varno brišem \'%s\'…</string>
   <string name="progress_deleting">brisanje ključev...</string>
+  <string name="progress_con_saving">združevanje: spravljanje v spomin...</string>
+  <string name="progress_con_reimport">združevanje: ponoven uvoz...</string>
   <!--action strings-->
+  <string name="hint_cloud_search_hint">Iskanje po Imenu, E-pošti...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -288,6 +355,7 @@
   <!--Help-->
   <string name="help_tab_start">Start</string>
   <string name="help_tab_faq">Pogosta vprašanja</string>
+  <string name="help_tab_wot">Potrjevanje ključev</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Dnevnik sprememb</string>
   <string name="help_tab_about">O aplikaciji</string>
@@ -296,15 +364,101 @@
   <string name="import_tab_keyserver">Strežnik</string>
   <string name="import_tab_cloud">Iskanje v oblaku</string>
   <string name="import_tab_direct">Datoteka/odložišče</string>
+  <string name="import_tab_qr_code">Koda QR/NFC</string>
   <string name="import_import">Uvozi izbrane ključe</string>
   <string name="import_qr_code_wrong">Koda QR je deformirana! Poskusite znova!</string>
   <string name="import_qr_code_too_short_fingerprint">Prstni odtis je prekratek (&lt; 16 znakov)</string>
+  <string name="import_qr_code_button">Skeniraj kodo QR</string>
+  <string name="import_qr_code_text">Zajamite kodo QR s kamero!</string>
   <!--Generic result toast-->
+  <string name="view_log">Podrobnosti</string>
+  <string name="with_warnings">, z opozorili</string>
+  <string name="with_cancelled">, do preklica</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">Uspešno uvožen ključ</item>
+    <item quantity="two">Uspešno uvožena %1$d ključa</item>
+    <item quantity="few">Uspešno uvoženi %1$d ključi</item>
+    <item quantity="other">Uspešno uvoženih %1$d ključev</item>
+  </plurals>
+  <plurals name="import_keys_added_and_updated_2">
+    <item quantity="one">in posodobljen ključ%2$s.</item>
+    <item quantity="two">in posodobljena %1$d ključa%2$s.</item>
+    <item quantity="few">in posodobljeni %1$d ključi%2$s.</item>
+    <item quantity="other">in posodobljenih %1$d ključev%2$s.</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="one">Uspešno uvožen ključ%2$s.</item>
+    <item quantity="two">Uspešno uvožena %1$d ključa%2$s.</item>
+    <item quantity="few">Uspešno uvoženi %1$d ključi%2$s.</item>
+    <item quantity="other">Uspešno uvoženih %1$d ključev%2$s.</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="one">Uspešno posodobljen ključ%2$s.</item>
+    <item quantity="two">Uspešno posodobljena %1$d ključa%2$s.</item>
+    <item quantity="few">Uspešno posodobljeni %1$d ključi%2$s.</item>
+    <item quantity="other">Uspešno posodobljenih %1$d ključev%2$s.</item>
+  </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="one">Neuspešen uvoz enega ključa!</item>
+    <item quantity="two">Neuspešen uvoz %d ključev!</item>
+    <item quantity="few">Neuspešen uvoz %d ključev!</item>
+    <item quantity="other">Neuspešen uvoz %d ključev!</item>
+  </plurals>
+  <plurals name="import_error">
+    <item quantity="one">Uvoz neuspešen!</item>
+    <item quantity="two">Uvoz %d ključev neuspešen!!</item>
+    <item quantity="few">Uvoz %d ključev neuspešen!!</item>
+    <item quantity="other">Uvoz %d ključev neuspešen!!</item>
+  </plurals>
   <string name="import_error_nothing">Nič za uvoziti.</string>
   <string name="import_error_nothing_cancelled">Uvoz preklican.</string>
   <!--Delete result toast-->
+  <plurals name="delete_ok_but_fail_1">
+    <item quantity="one">Uspešno izbrisan en ključ</item>
+    <item quantity="two">Uspešno izbrisana %1$d ključa</item>
+    <item quantity="few">Uspešno izbrisani %1$d ključi</item>
+    <item quantity="other">Uspešno izbrisanih %1$d ključev</item>
+  </plurals>
+  <plurals name="delete_ok_but_fail_2">
+    <item quantity="one">, en ključ%2$s ni bil izbrisan.</item>
+    <item quantity="two">, %1$d ključa%2$s nista bila izbrisana.</item>
+    <item quantity="few">, %1$d ključi%2$s niso bili izbrisani.</item>
+    <item quantity="other">, %1$d ključev%2$s ni bilo izbrisanih.</item>
+  </plurals>
+  <plurals name="delete_ok">
+    <item quantity="one">Uspešno izbrisanih ključ%2$s.</item>
+    <item quantity="two">Uspešno izbrisana %1$d ključa%2$s.</item>
+    <item quantity="few">Uspešno izbrisani %1$d ključi%2$s.</item>
+    <item quantity="other">Uspešno izbrisanih %1$d ključev%2$s.</item>
+  </plurals>
+  <plurals name="delete_fail">
+    <item quantity="one">Napaka pri brisanju enega ključa%2$s.</item>
+    <item quantity="two">Napaka pri brisanju %1$d ključev.</item>
+    <item quantity="few">Napaka pri brisanju %1$d ključev.</item>
+    <item quantity="other">Napaka pri brisanju %1$d ključev.</item>
+  </plurals>
+  <string name="delete_nothing">Ničesar ni za izbrisati.</string>
+  <string name="delete_cancelled">Operacija brisanja prekinjena.</string>
   <!--Certify result toast-->
+  <plurals name="certify_keys_ok">
+    <item quantity="one">Uspešno potrjen ključ%2$s.</item>
+    <item quantity="two">Uspešno potrjena %1$d ključa%2$s.</item>
+    <item quantity="few">Uspešno potrjeni %1$d ključi%2$s.</item>
+    <item quantity="other">Uspešno potrjenih %1$d ključev%2$s.</item>
+  </plurals>
+  <plurals name="certify_keys_with_errors">
+    <item quantity="one">Ključ ni bil potrjen!</item>
+    <item quantity="two">%d ključa nista bila potrjena!</item>
+    <item quantity="few">%d ključi niso bili potrjeni!</item>
+    <item quantity="other">%d ključev ni bilo potrjenih!</item>
+  </plurals>
+  <plurals name="certify_error">
+    <item quantity="one">Potrditev neuspešna!</item>
+    <item quantity="two">Potrditev %d ključev neuspešna!</item>
+    <item quantity="few">Potrditev %d ključev neuspešna!</item>
+    <item quantity="other">Potrditev %d ključev neuspešna!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dešifriraj datoteko z OpenKeychain</string>
   <string name="intent_import_key">Uvozi ključ z OpenKeychain</string>
@@ -317,21 +471,33 @@
   <string name="api_settings_hide_advanced">Skrij napredne nastavitve</string>
   <string name="api_settings_no_key">Izbran ni bil noben ključ</string>
   <string name="api_settings_select_key">Izberite ključ</string>
+  <string name="api_settings_create_key">Ustvari nov ključ</string>
   <string name="api_settings_save">Shrani</string>
+  <string name="api_settings_save_msg">Račun je bil shranjen</string>
   <string name="api_settings_cancel">Prekliči</string>
   <string name="api_settings_revoke">Prekliči dostop</string>
   <string name="api_settings_start">Zaženi aplikacijo</string>
   <string name="api_settings_delete_account">Izbriši račun</string>
   <string name="api_settings_package_name">Ime paketa</string>
   <string name="api_settings_package_signature">SHA-256 podpisa paketa</string>
+  <string name="api_settings_accounts">Računi (opuščen API)</string>
+  <string name="api_settings_advanced">Dodatne informacije</string>
+  <string name="api_settings_allowed_keys">Dovoljeni ključi</string>
   <string name="api_settings_settings">Nastavitve</string>
+  <string name="api_settings_key">Ključ računa:</string>
   <string name="api_settings_accounts_empty">S to aplikacijo ni povezan noben račun</string>
+  <string name="api_create_account_text">Za ta račun ni nastavljen noben ključ. Izberite enega izmed svojih obstoječih ključev, oziroma ustvarite novega.\nAplikacije lahko dešifrirajo/podpisujejo le s tu izbranimi ključi!</string>
+  <string name="api_update_account_text">Ključ nastavljen za ta račun je bil izbrisan. Prosimo izberite drugega.\nAplikacije lahko dešifrirajo/podpisujejo le s tu izbranimi ključi!</string>
+  <string name="api_register_text">Prikazane aplikacije želijo šifrirati/dešifrirati sporočila ter jih podpisovati v vašem imenu.\nDovolim dostop?\n\nPOZOR: Če ne veste zakaj se je pojavilo to obvestilo, ne dovolite dostopa! Dostop lahko prekličete tudi kasneje, v oknu \'Aplikacije\'.</string>
   <string name="api_register_allow">Dovoli dostop</string>
   <string name="api_register_disallow">Zavrni dostop</string>
   <string name="api_register_error_select_key">Izberite ključ!</string>
+  <string name="api_select_pub_keys_missing_text">Za te identitete ni bil najden noben ključ:</string>
+  <string name="api_select_pub_keys_dublicates_text">Za te identitete obstaja več ključev:</string>
   <string name="api_select_pub_keys_text">Preverite seznam prejemnikov!</string>
   <string name="api_select_pub_keys_text_no_user_ids">Prosim, izberite prejemnike!</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>
+  <string name="api_select_sign_key_text">Prosimo izberite enega od svojih obstoječih ključev, oziroma ustvarite novega.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Deli s kodo QR</string>
   <string name="share_nfc_dialog">Deli preko NFC</string>
@@ -342,10 +508,14 @@
     <item quantity="few">Izbrani %d ključi.</item>
     <item quantity="other">Izbranih %d ključev.</item>
   </plurals>
+  <string name="key_list_empty_text1">Najden ni bil noben ključ!</string>
+  <string name="key_list_filter_show_all">Prikaži vse ključe</string>
+  <string name="key_list_filter_show_certified">Prikaži samo overjene ključe</string>
   <!--Key view-->
   <string name="key_view_action_edit">Uredi ključ</string>
   <string name="key_view_action_encrypt">Šifriraj besedilo</string>
   <string name="key_view_action_encrypt_files">datoteke</string>
+  <string name="key_view_action_certify">Potrdi ključ</string>
   <string name="key_view_action_update">Posodobi s strežnika</string>
   <string name="key_view_action_share_with">Deli z...</string>
   <string name="key_view_action_share_nfc">Deli preko NFC</string>
@@ -353,27 +523,102 @@
   <string name="key_view_tab_main">Glavne informacije</string>
   <string name="key_view_tab_share">Deli</string>
   <string name="key_view_tab_keys">Podključi</string>
-  <string name="key_view_tab_certs">Certifikati</string>
+  <string name="key_view_tab_certs">Potrdila</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
   <string name="user_id_info_revoked_title">Preklican</string>
   <string name="user_id_info_revoked_text">Lastnik ključa je preklical to identiteto. Ta ni več veljavna.</string>
+  <string name="user_id_info_certified_title">Overjeno</string>
+  <string name="user_id_info_certified_text">Ta identiteta je bila overjena z vaše strani.</string>
+  <string name="user_id_info_uncertified_title">Neoverjeno</string>
+  <string name="user_id_info_uncertified_text">Ta identiteta še ni bila overjena, zato ni mogoče vedeti, če ustreza osebi za katero se predstavlja.</string>
   <string name="user_id_info_invalid_title">Neveljaven</string>
+  <string name="user_id_info_invalid_text">Nekaj je narobe s to identiteto!</string>
   <!--Key trust-->
+  <string name="key_trust_already_verified">Ta ključ ste že potrdili!</string>
+  <string name="key_trust_it_is_yours">To je en izmed vaših ključev!</string>
+  <string name="key_trust_maybe">Ta ključ ni niti preklican, niti potečen.\nNiste ga potrdili, a mogoče mu zaupate.</string>
+  <string name="key_trust_revoked">Ta ključ je bil preklican s strani lastnika, zato mu ne gre zaupati.</string>
+  <string name="key_trust_expired">Ta ključ je potekel, zato mu ne gre zaupati.</string>
+  <string name="key_trust_old_keys">Uporaba tega ključa za dešifriranje starejših sporočil iz časa, ko ključ še ni potekel, oz. bil preklican, ni kritična.</string>
+  <string name="key_trust_no_cloud_evidence">Ni podatkov z oblaka o pristnosti tega ključa.</string>
+  <string name="key_trust_start_cloud_search">Začni iskanje</string>
+  <string name="key_trust_results_prefix">Keybase.io ponuja \"dokazilo\", da je lastnik tega kluča:</string>
+  <string name="key_trust_header_text">Pozor: Dokazila Keybase.io v aplikaciji OpenKeychain so eksperimantalne narave. Za večjo zanesljivost priporočamo, da dodatno skenirate kode QR ali izmenjate ključe preko NFC.</string>
   <!--keybase proof stuff-->
+  <string name="keybase_narrative_twitter">Objavlja na Twitterju kot</string>
+  <string name="keybase_narrative_github">Prisoten na GitHub-u kot</string>
+  <string name="keybase_narrative_dns">Upravlja domeno(e)</string>
+  <string name="keybase_narrative_web_site">Objavlja na spletni strani(eh)</string>
+  <string name="keybase_narrative_reddit">Objavlja na Reddit-u kot</string>
+  <string name="keybase_narrative_coinbase">Prisoten na Coinbase-u kot</string>
+  <string name="keybase_narrative_hackernews">Objavlja na Hacker News kot</string>
+  <string name="keybase_narrative_unknown">Neznano dokazilo</string>
+  <string name="keybase_proof_failure">Dokazila se žal ne da preveriti.</string>
+  <string name="keybase_unknown_proof_failure">Neznan problem pri pregledovalniku dokazil</string>
+  <string name="keybase_problem_fetching_evidence">Problem z dokazilom</string>
+  <string name="keybase_key_mismatch">Prstni odtis ključa ne ustreza tistemu v dokazilu</string>
+  <string name="keybase_message_payload_mismatch">Dešifrirano dokazilo ne ustreza pričakovani vrednosti</string>
+  <string name="keybase_message_fetching_data">Pridobivam dokazilo</string>
+  <string name="keybase_proof_succeeded">To dokazilo je bilo overjeno!</string>
+  <string name="keybase_a_post">Objava</string>
+  <string name="keybase_fetched_from">pridobljeno od</string>
+  <string name="keybase_for_the_domain">za domeno</string>
+  <string name="keybase_contained_signature">vsebuje sporočilo, ki ga je lahko ustvaril samo lastnik tega ključa.</string>
+  <string name="keybase_twitter_proof">Čivk</string>
+  <string name="keybase_web_site_proof">Datoteka z besedilom</string>
+  <string name="keybase_github_proof">Gist</string>
+  <string name="keybase_reddit_proof">Datoteka JSON</string>
+  <string name="keybase_verify">Overi</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Zamenjaj geslo</string>
   <string name="edit_key_action_add_identity">Dodaj identiteto</string>
   <string name="edit_key_action_add_subkey">Dodaj podključ</string>
   <string name="edit_key_edit_user_id_title">Izberite dejanje!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Zamenjaj za primarno identiteto</item>
+    <item>Prekliči identitetoy</item>
+  </string-array>
   <string-array name="edit_key_edit_user_id_revert_revocation">
     <item>Revert revocation</item>
   </string-array>
+  <string name="edit_key_edit_user_id_revoked">Identiteta je bila preklicana. Ta poteza ne more biti razveljavljena.</string>
   <string name="edit_key_edit_subkey_title">Izberite dejanje!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Spremeni datum poteka</item>
+    <item>Prekliči podključ</item>
+    <item>Razstavi podključ</item>
+  </string-array>
+  <string name="edit_key_new_subkey">nov podključ</string>
+  <string name="edit_key_select_flag">Izberite vsaj eno oznako!</string>
+  <string name="edit_key_error_add_identity">Dodajte vsaj eno identiteto!</string>
+  <string name="edit_key_error_add_subkey">Dodajte vsaj en podključ!</string>
   <!--Create key-->
+  <string name="create_key_upload">Sinhroniziraj z oblakom</string>
   <string name="create_key_empty">To polje je obvezno</string>
   <string name="create_key_passphrases_not_equal">Gesli se ne ujemata</string>
+  <string name="create_key_final_text">Vnesli ste identiteto:</string>
+  <string name="create_key_final_robot_text">Ustvarjanje ključa zna potrajati. Privoščite si kavo...</string>
+  <string name="create_key_rsa">(3 podključi, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(konfiguracija po meri)</string>
+  <string name="create_key_name_text">Izberite ime povezano s tem ključem. Lahko je polno ime, npr. \'Marjan Novak\', ali nadimek, npr. \'Mare\'.</string>
+  <string name="create_key_email_text">Vnesite svoj glavni e-poštni naslov za varno komunikacijo.</string>
+  <string name="create_key_passphrase_text">Izberite močno geslo. To bo varovalo vaš ključ v primeru odtujitve naprave.</string>
+  <string name="create_key_hint_full_name">Polno ime ali nadimek</string>
+  <string name="create_key_edit">Spremeni konfiguracijo ključa.</string>
+  <string name="create_key_add_email">Dodaj naslov e-pošte</string>
+  <string name="create_key_add_email_text">Dodatni e-poštni naslovi so prav tako povezani s tem ključem in so na voljo za varno komunikacijo.</string>
+  <string name="create_key_email_already_exists_text">E-poštni naslov je že bil dodan</string>
   <!--View key-->
+  <string name="view_key_revoked">Ključ je preklican: ne smete ga več uporabljati!</string>
+  <string name="view_key_expired">Ključ je potekel: stvaritelj mora podaljšati njegovo veljavo!</string>
+  <string name="view_key_expired_secret">Ključ je potekel: njegovo veljavnost lahko podaljšate, če ga popravite!</string>
+  <string name="view_key_my_key">Moj ključ</string>
+  <string name="view_key_verified">Potrjen ključ</string>
+  <string name="view_key_unverified">Ključ ni potrjen: za potrditev skenirajte kodo QR!</string>
+  <string name="view_key_fragment_no_system_contact">&lt;brez&gt;</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ključi</string>
+  <string name="nav_encrypt_decrypt">Šifriraj/Dešifriraj</string>
   <string name="nav_apps">Aplikacije</string>
   <string name="drawer_open">Odprite navigacijski poteznik</string>
   <string name="drawer_close">Zaprite navigacijski poteznik</string>
@@ -391,6 +636,7 @@
   <string name="cert_verify_error">napaka!</string>
   <string name="cert_verify_unavailable">ključ ni na voljo</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Interna napaka!</string>
   <string name="msg_cancelled">Dejanje preklicano.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">Uveljavljam serijsko dodajanje.</string>
@@ -398,35 +644,208 @@
   <string name="msg_ip_delete_old_fail">Noben star ključ ni bil izbrisan (ustvarim novega?)</string>
   <string name="msg_ip_delete_old_ok">Star ključ je bil izbrisan iz baze</string>
   <string name="msg_ip_encode_fail">Operacija ni uspela zaradi napake</string>
+  <string name="msg_ip_error_io_exc">Postopek ni uspel zaradi napake i/o</string>
+  <string name="msg_ip_error_op_exc">Postopek ni uspel zaradi napake v bazi podatkov</string>
+  <string name="msg_ip_error_remote_ex">Postopek ni uspel zaradi interne napake</string>
   <string name="msg_ip">Uvažam javno zbirko ključev %s</string>
   <string name="msg_ip_insert_keyring">Šifriram podatke zbirke klučev</string>
+  <string name="msg_ip_insert_keys">Razčlenjujem ključe</string>
   <string name="msg_ip_prepare">Pripravljam </string>
   <string name="msg_ip_master">Obdelujem glavni ključ %s</string>
+  <string name="msg_ip_master_expired">Zbirka ključev je potekla %s</string>
+  <string name="msg_ip_master_expires">Zbirka ključev poteče %s</string>
+  <string name="msg_ip_master_flags_unspecified">Glavne oznake: nedoločeno (najverjetneje vse)</string>
+  <string name="msg_ip_master_flags_cesa">Glavne oznake: potrdi, šifriraj, podpiši, overi</string>
+  <string name="msg_ip_master_flags_cesx">Glavne oznake: potrdi. šifriraj, podpiši</string>
+  <string name="msg_ip_master_flags_cexa">Glavne oznake: potrdi, šifriraj, overi</string>
+  <string name="msg_ip_master_flags_cexx">Glavne oznake: potrdi, šifriraj</string>
+  <string name="msg_ip_master_flags_cxsa">Glavne oznake: potrdi, podpiši, overi</string>
+  <string name="msg_ip_master_flags_cxsx">Glavne oznake: potrdi, podpiši</string>
+  <string name="msg_ip_master_flags_cxxa">Glavne oznake: potrdi, overi</string>
+  <string name="msg_ip_master_flags_cxxx">Glavne oznake: potrdi</string>
+  <string name="msg_ip_master_flags_xesa">Glavne oznake: šifriraj, podpiši, overi</string>
+  <string name="msg_ip_master_flags_xesx">Glavne oznake: šifriraj, podpiši</string>
+  <string name="msg_ip_master_flags_xexa">Glavne oznake: šifriraj, overi</string>
+  <string name="msg_ip_master_flags_xexx">Glavne oznake: šifriraj</string>
+  <string name="msg_ip_master_flags_xxsa">Glavne oznake: podpiši, overi</string>
+  <string name="msg_ip_master_flags_xxsx">Glavne oznake: podpiši</string>
+  <string name="msg_ip_master_flags_xxxa">Glavne oznake: overi</string>
+  <string name="msg_ip_master_flags_xxxx">Glavne oznake: brez</string>
+  <string name="msg_ip_merge_public">Združujem uvožene podatke z obstoječo zbirko javnih ključev</string>
+  <string name="msg_ip_merge_secret">Združujem uvožene podatke z obstoječo zbirko javnih ključev</string>
   <string name="msg_ip_subkey">Obdelujem podključ %s</string>
   <string name="msg_ip_subkey_expired">Podključ je potekel %s</string>
   <string name="msg_ip_subkey_expires">Podključ poteče %s</string>
+  <string name="msg_ip_subkey_flags_unspecified">Oznake podključev: nedoločeno (najverjetneje vse)</string>
+  <string name="msg_ip_subkey_flags_cesa">Oznake podključev: potrdi, šifriraj, podpiši, overi</string>
+  <string name="msg_ip_subkey_flags_cesx">Oznake podključev: potrdi, šifriraj, podpiši</string>
+  <string name="msg_ip_subkey_flags_cexa">Oznake podključev: potrdi, šifriraj, overi</string>
+  <string name="msg_ip_subkey_flags_cexx">Oznake podključev: potrdi, šifriraj</string>
+  <string name="msg_ip_subkey_flags_cxsa">Oznake podključev: potrdi, podpiši, overi</string>
+  <string name="msg_ip_subkey_flags_cxsx">Oznake podključev: potrdi, podpiši</string>
+  <string name="msg_ip_subkey_flags_cxxa">Oznake podključev: potrdi, overi</string>
+  <string name="msg_ip_subkey_flags_cxxx">Oznake podključev: potrdi</string>
+  <string name="msg_ip_subkey_flags_xesa">Oznake podključev: šifriraj, podpiši, overi</string>
+  <string name="msg_ip_subkey_flags_xesx">Oznake podključev: šifriraj, podpiši</string>
+  <string name="msg_ip_subkey_flags_xexa">Oznake podključev: šifriraj, overi</string>
+  <string name="msg_ip_subkey_flags_xexx">Oznake podključev: šifriraj</string>
+  <string name="msg_ip_subkey_flags_xxsa">Oznake podključev: podpiši, overi</string>
+  <string name="msg_ip_subkey_flags_xxsx">Oznake podključev: podpiši</string>
+  <string name="msg_ip_subkey_flags_xxxa">Oznake podključev: overi</string>
+  <string name="msg_ip_subkey_flags_xxxx">Oznake podključev: brez</string>
   <string name="msg_ip_success">Uspešno uvožena javna zbirka klučev </string>
+  <string name="msg_ip_success_identical">Zbirka ključev ne vsebuje novih podatkov. Nič za storiti.</string>
   <string name="msg_ip_reinsert_secret">Ponovno vnašam zasebni ključ</string>
-  <string name="msg_ip_uid_cert_bad">Naleteli ste na slab certifikat!</string>
-  <string name="msg_ip_uid_cert_error">Napaka pri obdelavi certifikata!</string>
+  <string name="msg_ip_uid_cert_bad">Naleteli ste na slabo potrdilo!</string>
+  <string name="msg_ip_uid_cert_error">Napaka pri obdelavi potrdila!</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Že posedujete ne-preklicna potrdila. Izpuščam.</string>
+  <string name="msg_ip_uid_cert_old">Potrdilo je starejše od trenutnega. Izpuščam.</string>
+  <string name="msg_ip_uid_cert_new">Potrdilo je novejše. Menjam trenutnega.</string>
+  <string name="msg_ip_uid_cert_good">Najdeno uporabno potrdilo od %1$s</string>
+  <string name="msg_ip_uid_cert_good_revoke">Najdeno preklicano potrdilo od %1$s</string>
+  <plurals name="msg_ip_uid_certs_unknown">
+    <item quantity="one">Izpuščam potrdilo, potrjeno s strani neznanih javnih ključev.</item>
+    <item quantity="two">Izpuščam %s potrdili, potrjeni s strani neznanih javnih ključev.</item>
+    <item quantity="few">Izpuščam %s potrdila, potrjena s strani neznanih javnih ključev.</item>
+    <item quantity="other">Izpuščam %s potrdil, potrjenih s strani neznanih javnih ključev.</item>
+  </plurals>
+  <string name="msg_ip_uid_classifying_zero">Razvrščam ID-je (na voljo ni noben ključ vreden zaupanja)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Razvrščam ID-je (uporabljam en ključ vreden zaupanja)</item>
+    <item quantity="two">Razvrščam ID-je (uporabljam %s ključa vredna zaupanja)</item>
+    <item quantity="few">Razvrščam ID-je (uporabljam %s ključe vredne zaupanja)</item>
+    <item quantity="other">Razvrščam ID-je (uporabljam %s ključev vrednih zaupanja)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Prerazvrščam ID-je</string>
+  <string name="msg_ip_uid_processing">Procesiram ID %s</string>
+  <string name="msg_ip_uid_revoked">ID je preklican</string>
+  <string name="msg_ip_uat_cert_bad">Najdeno slabo potrdilo!</string>
+  <string name="msg_ip_uat_cert_error">Napaka pri obdelavi potrdil!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Že posedujete ne-preklicno potrdilo. Izpuščam.</string>
+  <string name="msg_ip_uat_cert_old">Potrdilo je starejše od trenutnega. Izpuščam.</string>
+  <string name="msg_ip_uat_cert_new">Potrdilo je novejše. Menjam trenutnega.</string>
+  <string name="msg_ip_uat_cert_good">Najdeno uporabno potrdilo od %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Najden preklic potrdila od %1$s</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Izpuščam potrdilo, potrjenio s strani neznanih javnih ključev</item>
+    <item quantity="two">Izpuščam %s potrdii, potrjeni s strani neznanih javnih ključev</item>
+    <item quantity="few">Izpuščam %s potrdila, potrjena s strani neznanih javnih ključev</item>
+    <item quantity="other">Izpuščam %s potrdil, potrjenih s strani neznanih javnih ključev</item>
+  </plurals>
   <string name="msg_is_bad_type_public">Poskus uvoza javne zbirke ključev kot zasebne. Prosimo prijavite dogodek kot \'hrošč\' (napako).</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Uvažam zasebni ključ %s</string>
+  <string name="msg_is_db_exception">Napaka v bazi podatkov!</string>
   <string name="msg_is_importing_subkeys">Procesiram zasebne podključe</string>
+  <string name="msg_is_error_io_exc">Napaka pri kodiranju zbirke ključev</string>
+  <string name="msg_is_merge_public">Združujem uvožene podatke v obstoječo zbirko ključev</string>
+  <string name="msg_is_merge_secret">Združujem uvožene podatke v obstoječo javno zbirko ključev</string>
+  <string name="msg_is_merge_special">Združujem podatke o samo-potrdilih iz javne zbirke ključev</string>
+  <string name="msg_is_pubring_generate">Generiram javno zbirko ključev iz zasebne</string>
+  <string name="msg_is_subkey_nonexistent">Podključ %s ni na voljo v zasebnem ključu</string>
+  <string name="msg_is_subkey_ok">Zasebni podključ %s označen kot razpoložljiv</string>
+  <string name="msg_is_subkey_empty">Zasebni podključ %s označen kot razpoložljiv, s praznim geslom</string>
+  <string name="msg_is_subkey_pin">Zasebni podključ %s označen kot razpoložljiv, s PIN kodo</string>
+  <string name="msg_is_subkey_stripped">Zasebni podključ %s označen kot razstavljen</string>
+  <string name="msg_is_subkey_divert">Zasebni podključ %s označen kot \'preusmerjen na pamtno kartico/NFC\'</string>
+  <string name="msg_is_success_identical">Zbirka ključev ne vsebuje nobenih novih podatkov. Nič za storiti.</string>
   <string name="msg_is_success">Zasebna zbirka ključev uspešno uvožena</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_public">Kanoniziram javno zbirko ključev %s</string>
+  <string name="msg_kc_secret">Kanoniziram zasebno zbirko ključev %s</string>
+  <string name="msg_kc_error_v3">Toje ključ verzije OpenPGP 3, ki je zastarela in ni več podprta!</string>
+  <string name="msg_kc_error_no_uid">Zbirka ključev nima nobenega veljavnega ID-ja!</string>
+  <string name="msg_kc_error_master_algo">Glavni ključ uporablja neznan (%s) algoritem!</string>
   <string name="msg_kc_master">Obdelujem glavni ključ...</string>
-  <string name="msg_kc_revoke_dup">Umikam odvečen certifikat za preklic zbirk ključev</string>
+  <string name="msg_kc_master_bad_type">Odstranjujem potrdilo glavnega ključa neznanega tipa (%s)</string>
+  <string name="msg_kc_master_bad_local">Odstranjujem potrdilo glavnega ključa z oznako \'lokalno\'</string>
+  <string name="msg_kc_master_bad_err">Odstranjujem slabo potrdilo glavnega ključa</string>
+  <string name="msg_kc_master_bad_time">Odstranjujem preklicno potrdilo zbirke ključev s časovno znamko v prihodnosti</string>
+  <string name="msg_kc_master_bad_type_uid">Odstranjujem potrdilo ID-ja na slabi poziciji</string>
+  <string name="msg_kc_master_bad">Odstranjujem slabo potrdilo glavnega ključa</string>
+  <string name="msg_kc_master_local">Odstranjujem potrdilo glavnega ključa z oznako \"lokalno\"</string>
+  <string name="msg_kc_revoke_dup">Odstranjujem odvečno preklicno potrdilo zbirke ključev</string>
+  <string name="msg_kc_notation_dup">Odstranjujem odvečno potrdilo notacije</string>
+  <string name="msg_kc_notation_empty">Odstranjujem prazno potrdilo notacije</string>
   <string name="msg_kc_sub">Obdelujem podključ %s</string>
-  <string name="msg_kc_sub_bad">Umikam neveljaven certifikat za povezovanje podključev</string>
-  <string name="msg_kc_sub_bad_err">Umikam slab certifikat za povezovanje podključev</string>
-  <string name="msg_kc_sub_bad_time">Umikam certifikat za povezovanje podključev z časovno znamko v prihodnosti</string>
+  <string name="msg_kc_sub_bad">Umikam neveljavno potrdilo za povezovanje podključev</string>
+  <string name="msg_kc_sub_bad_err">Umikam slabo potrdilo za povezovanje podključev</string>
+  <string name="msg_kc_sub_bad_local">Odstranjujem povezano potrdilo podključa z oznako \'lokalno\'</string>
+  <string name="msg_kc_sub_bad_time">Umikam potrdilo za povezovanje podključev z časovno znamko v prihodnosti</string>
+  <string name="msg_kc_sub_bad_type">Neznano potrdilo podključa tipa %s</string>
+  <string name="msg_kc_sub_dup">Odstranjujem odvečno povezano potrdilo podključa</string>
+  <string name="msg_kc_sub_primary_bad">Zaradi neveljavnega primarnega povezanega potrdila odstranjujem povezano potrdilo podključa</string>
+  <string name="msg_kc_sub_primary_bad_err">Zaradi slabega glavnega povezanega potrdila odstranjujem povezano potrdilo podključa</string>
+  <string name="msg_kc_sub_primary_none">Zaradi manjkajočega primarnega povezanega potrdila odstranjujem povezano potrdilo podključa</string>
+  <string name="msg_kc_sub_no_cert">Najti ni nobenega veljavnega potrdila za %s. Odstranjujem iz zbirke.</string>
+  <string name="msg_kc_sub_revoke_bad_err">Odstranjujem slabo preklicno potrdilo podključa</string>
+  <string name="msg_kc_sub_revoke_bad">Odstranjujem slabo preklicno potrdilo podključa</string>
+  <string name="msg_kc_sub_revoke_dup">Odstranjujem odvečno preklicno potrdilo podključa</string>
+  <string name="msg_kc_sub_algo_bad_encrpyt">Podključ je označen za šifriranje, toda algoritem tega ne podpira.</string>
+  <string name="msg_kc_sub_algo_bad_sign">Podključ je označen za podpisovanje, toda algoritem tega ne podpira.</string>
+  <plurals name="msg_kc_success_bad">
+    <item quantity="one">Kanonizacija zbirke ključev uspešna. Odstranjeno je bilo eno napačno potrdilo.</item>
+    <item quantity="two">Kanonizacija zbirke ključev uspešna. Odstranjeni sta bili %d napačni potrdili.</item>
+    <item quantity="few">Kanonizacija zbirke ključev uspešna. Odstranjena so bila %d napačna potrdila.</item>
+    <item quantity="other">Kanonizacija zbirke ključev uspešna. Odstranjenih je bilo %d napačnih potrdil.</item>
+  </plurals>
+  <string name="msg_kc_success_bad_and_red">Kanonizacija zbirke ključev uspešna. Odstranjenih je bilo %1$s napačnih in %2$s odvečnih potrdil.</string>
+  <plurals name="msg_kc_success_redundant">
+    <item quantity="one">Kanonizacija zbirke ključev uspešna. Odstranjeno je bilo eno odvečno potrdilo.</item>
+    <item quantity="two">Kanonizacija zbirke ključev uspešna. Odstranjeni sta bili %d odvečni potrdili.</item>
+    <item quantity="few">Kanonizacija zbirke ključev uspešna. Odstranjena so bila %d odvečna potrdia.</item>
+    <item quantity="other">Kanonizacija zbirke ključev uspešna. Odstranjenih je bilo %d odvečnih potrdil.</item>
+  </plurals>
+  <string name="msg_kc_uid_bad_err">Odstranjujem slabo samo-potrdilo ID-ja \'%s\'</string>
+  <string name="msg_kc_uid_bad_local">Odstranjujem potrdilo ID-ja z oznako \'lokalno\'</string>
+  <string name="msg_kc_uid_bad_time">Odstranjujem ID z časovno oznako v prihodnosti</string>
+  <string name="msg_kc_uid_bad_type">Odstranjujem potrdilo ID-ja neznanega tipa (%s)</string>
+  <string name="msg_kc_uid_bad">Odstranujem slabo samo-potrdilo ID-ja \'%s\'</string>
+  <string name="msg_kc_uid_cert_dup">Odstranujem zastarelo samo-potrdilo ID-ja \'%s\'</string>
+  <string name="msg_kc_uid_foreign">Odstranjuejm potrdilo tujega ID-ja od \'%s\'</string>
+  <string name="msg_kc_uid_revoke_dup">Odstranjujem odvečno preklicno potrdilo ID-ja \'%s\'</string>
+  <string name="msg_kc_uid_revoke_old">Odstranjujem zastarelo preklicno potrdilo za ID %s\'</string>
+  <string name="msg_kc_uid_no_cert">Ne najdem veljavnega samo-potrdila za ID %s\'. Odstranjujem iz zbirke.</string>
+  <string name="msg_kc_uid_remove">Odstranjujem neveljaven ID \'%s\'</string>
+  <string name="msg_kc_uid_dup">Odstranjujem podvojeo identiteto %s\'. Ključ je vseboval dve. To lahko privede do manjkajočih potrdil!</string>
+  <string name="msg_kc_uid_warn_encoding">ID ni potrjen kot UTF-8!</string>
+  <string name="msg_kc_uat_bad_err">Odstranjujem slabo samo-potrdilo za povezanega uporabnika</string>
+  <string name="msg_kc_uat_bad_local">Odstranjujem potrdilo s strani uporabnika z oznako \'lokalno\'</string>
+  <string name="msg_kc_uat_bad_type">Odstranjujem potrdilo povezanega uporabnika neznanega tipa (%s)</string>
+  <string name="msg_kc_uat_bad">Odstranjujem slabo samo-potrdilo za povezanega uporabnika</string>
+  <string name="msg_kc_uat_cert_dup">Odstranjujem zastarelo samo-potrdilo za povezanega uporabnika</string>
+  <string name="msg_kc_uat_dup">Odstranjujem podvojenega povezanega uporabnika. Ključ je vseboval dva. To lahko privede do manjkajočih potrdil!</string>
+  <string name="msg_kc_uat_foreign">Odstranjujem potrdilo tujega povezanega uporabnika od</string>
+  <string name="msg_kc_uat_revoke_dup">Odstranjujem odvečno preklicno potrdilo za povezanega uporabnika</string>
+  <string name="msg_kc_uat_revoke_old">Odstranjujem zastarelo preklicno potrdilo za povezanega uporabnika</string>
+  <string name="msg_kc_uat_no_cert">Najdeno ni bilo nobeno veljavno samo-potrdilo povezanega uporabnika. Odstranjujem iz zbirke.</string>
+  <string name="msg_kc_uat_remove">Odstranjujem neveljavnega povezanega uporabnika</string>
+  <string name="msg_kc_uat_warn_encoding">ID ni potrjen kot UTF-8!</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_found_new">Najdenih %s novih potrdil v zbirki ključev</string>
   <!--createSecretKeyRing-->
+  <string name="msg_cr_error_no_user_id">Zbirke ključev morajo biti ustvarjene z najmanj enim ID-jem!</string>
+  <string name="msg_cr_error_no_certify">Glavni ključ mora biti označen za potrjevanje!</string>
+  <string name="msg_cr_error_flags_dsa">Ključ vsebuje napačne oznake, DSA ne more biti uporabljen za šifriranje!</string>
+  <string name="msg_cr_error_flags_elgamal">Ključ vsebuje napačne oznake, ElGamal ne more biti uporabljen za podpisovanje!</string>
+  <string name="msg_cr_error_flags_ecdsa">Ključ vsebuje napačne oznake, ECDSA ne more biti uporabljen za šifriranje!</string>
+  <string name="msg_cr_error_flags_ecdh">Ključ vsebuje napačne oznake, ECDH ne more biti uporabljen za podpisovanje!</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mf_error_keyid">NI ID-ja ključa. To je interna napaka, prosimo prijavite hrošča!</string>
+  <string name="msg_mf_error_master_none">Najdeno ni bilo nobeno uporabno glavno potrdilo (so vsa odstranjena?)</string>
+  <string name="msg_mf_error_noexist_primary">Naveden je slab primarni ID!</string>
+  <string name="msg_mf_error_noexist_revoke">Naveden je slab ID za preklic!</string>
+  <string name="msg_mf_error_revoked_primary">Preklican ID ne more biti primaren!</string>
+  <string name="msg_mf_primary_replace_old">Menjavam potrdilo prejšnjega ID-ja</string>
+  <string name="msg_mf_primary_new">Ustvarjam novo potrdilo za nov primaren ID</string>
   <string name="msg_mf_subkey_new_id">Nov podključ z ID-jem: %s</string>
   <string name="msg_mf_subkey_revoke">Preklic podključa %s</string>
+  <string name="msg_mf_uid_add">Dodajam ID %s</string>
+  <string name="msg_mf_uid_primary">Menjam primarni ID za %s</string>
+  <string name="msg_mf_uid_revoke">Preklicujem ID %s</string>
+  <string name="msg_mf_uid_error_empty">ID ne more biti prazen!</string>
   <!--Consolidate-->
+  <string name="msg_con">Konsolidiram bazo podatkov</string>
   <string name="msg_con_db_clear">Čiščenje podatkovne baze</string>
   <!--Edit Key (higher level than modify)-->
   <!--Promote key-->
@@ -436,7 +855,15 @@
   <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
+  <plurals name="msg_crt_certify_uids">
+    <item quantity="one">Potrjujem en ID za ključ %2$s</item>
+    <item quantity="two">Potrjujem %1$d ID-ja za ključ %2$s</item>
+    <item quantity="few">Potrjujem %1$d ID-je za ključ %2$s</item>
+    <item quantity="other">Potrjujem %1$d ID-jev za ključ %2$s</item>
+  </plurals>
+  <string name="msg_crt_error_self">Tak način izdajanja samo-potrdil ni mogoč!</string>
   <string name="msg_crt_warn_not_found">Ključ ni bil najden!</string>
+  <string name="msg_crt_warn_cert_failed">Generacija potrdila ni uspela!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Del naložene datoteke je veljavnen objekt OpenPGP a ni ključ.</item>
     <item quantity="two">Deli naložene datoteke so veljavni objekti OpenPGP a niso ključi.</item>
@@ -458,6 +885,7 @@
   <string name="label_user_id">Identiteta</string>
   <string name="unknown_uid">&lt;neznan&gt;</string>
   <string name="empty_certs">Ni potrdil za ta ključ</string>
+  <string name="certs_text">Tu so prikazana samo preverjena samo-potrdila in preverjena potrdila ustvarjena z vašimi ključi</string>
   <string name="label_revocation">Razlog za preklic</string>
   <string name="label_cert_type">Vrsta</string>
   <string name="error_key_not_found">Ključ ni bil najden!</string>
@@ -466,7 +894,7 @@
   <string name="key_divert">preusmeri na pametno kartico/NFC</string>
   <string name="key_no_passphrase">brez gesla</string>
   <string name="key_unavailable">ni na voljo</string>
-  <string name="title_view_cert">Preglej podrobosti certifikata</string>
+  <string name="title_view_cert">Preglej podrobosti potrdila</string>
   <string name="unknown_algorithm">neznan</string>
   <string name="can_sign_not">ne more podpisati</string>
   <string name="error_no_encrypt_subkey">Ni nobenega podključa za šifriranje!</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index e17fcdddc..f73be4861 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -4,8 +4,6 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Välj nycklar</string>
-  <string name="title_select_secret_key">Välj din nyckel</string>
   <string name="title_encrypt_text">Kryptera</string>
   <string name="title_encrypt_files">Kryptera</string>
   <string name="title_decrypt">Dekryptera</string>
@@ -13,7 +11,6 @@
   <string name="title_add_subkey">Lägg till undernyckel</string>
   <string name="title_edit_key">Redigera nyckel</string>
   <string name="title_preferences">Inställningar</string>
-  <string name="title_cloud_search_preferences">Inställningar för molnsökning</string>
   <string name="title_api_registered_apps">Appar</string>
   <string name="title_key_server_preference">Nyckelservrar</string>
   <string name="title_change_passphrase">Ändra lösenordsfras</string>
@@ -24,7 +21,6 @@
   <string name="title_encrypt_to_file">Kryptera till fil</string>
   <string name="title_decrypt_to_file">Dekryptera till fil</string>
   <string name="title_import_keys">Importera nycklar</string>
-  <string name="title_add_keys">Lägg till nycklar</string>
   <string name="title_export_key">Exportera nyckel</string>
   <string name="title_export_keys">Exportera nycklar</string>
   <string name="title_key_not_found">Nyckel hittades inte</string>
@@ -33,10 +29,8 @@
   <string name="title_key_details">Nyckelinformation</string>
   <string name="title_help">Hjälp</string>
   <string name="title_log_display">Logg</string>
-  <string name="title_create_key">Skapa nyckel</string>
   <string name="title_exchange_keys">Utbyt nycklar</string>
   <string name="title_advanced_key_info">Avancerad nyckelinfo</string>
-  <string name="title_keys">Nycklar</string>
   <string name="title_delete_secret_key">Radera DIN nyckel \'%s\'?</string>
   <string name="title_export_log">Exportera logg</string>
   <!--section-->
@@ -46,27 +40,18 @@
   <string name="section_cloud_evidence">Bevis från molnet</string>
   <string name="section_keys">Undernycklar</string>
   <string name="section_cloud_search">Molnsökning</string>
-  <string name="section_general">Allmänt</string>
-  <string name="section_defaults">Förval</string>
-  <string name="section_advanced">Avancerat</string>
   <string name="section_passphrase_cache">Cache för lösenordsfras</string>
   <string name="section_certify">Bekräfta</string>
   <string name="section_actions">Åtgärder</string>
   <string name="section_share_key">Nyckel</string>
-  <string name="section_upload_key">Synkronisera nyckel</string>
   <string name="section_key_server">Nyckelserver</string>
   <string name="section_fingerprint">Fingeravtryck</string>
-  <string name="section_decrypt_files">Filer</string>
-  <string name="section_decrypt_text">Text</string>
-  <string name="section_certs">Certifikat</string>
   <string name="section_encrypt">Kryptera</string>
   <string name="section_decrypt">Dekryptera</string>
   <string name="section_current_expiry">Aktuellt utgångsdatum</string>
   <string name="section_new_expiry">Nytt utgångsdaum</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dekryptera, verifiera och spara fil</string>
-  <string name="btn_decrypt_verify_message">Avkryptera och verifiera text</string>
-  <string name="btn_encrypt_file">Kryptera och spara fil</string>
   <string name="btn_encrypt_share_file">Kryptera och dela fil</string>
   <string name="btn_encrypt_save_file">Kryptera och spara fil</string>
   <string name="btn_save">Spara</string>
@@ -79,7 +64,6 @@
   <string name="btn_back">Föregående</string>
   <string name="btn_no">Nej</string>
   <string name="btn_match">Fingeravtrycken matchar</string>
-  <string name="btn_lookup_key">Sök efter nyckel</string>
   <string name="btn_share_encrypted_signed">Kryptera och dela text</string>
   <string name="btn_copy_encrypted_signed">Kryptera och kopiera text</string>
   <string name="btn_view_cert_key">Visa nyckel för certifiering</string>
@@ -97,15 +81,11 @@
   <string name="menu_help">Hjälp</string>
   <string name="menu_export_key">Exportera till fil</string>
   <string name="menu_delete_key">Radera nyckel</string>
-  <string name="menu_import_existing_key">Importera från fil</string>
   <string name="menu_search">Sök</string>
   <string name="menu_nfc_preferences">NFC-inställningar</string>
   <string name="menu_beam_preferences">Beam-inställningar</string>
-  <string name="menu_key_edit_cancel">Avbryt</string>
   <string name="menu_encrypt_to">Kryptera till…</string>
   <string name="menu_select_all">Markera alla</string>
-  <string name="menu_add_keys">Lägg till nycklar</string>
-  <string name="menu_search_cloud">Sök i molnet</string>
   <string name="menu_export_all_keys">Exportera alla nycklar</string>
   <string name="menu_advanced">Visa avancerad information</string>
   <string name="menu_certify_fingerprint">Bekräfta via fingeravtrycksjämförelse</string>
@@ -213,9 +193,6 @@
   <string name="encrypt_sign_clipboard_successful">Signerades och/eller krypterades till urklipp.</string>
   <string name="select_encryption_key">Välj åtminstone en krypteringsnyckel.</string>
   <string name="select_encryption_or_signature_key">Välj åtminstone en krypterings- eller signeringsnyckel.</string>
-  <string name="specify_file_to_encrypt_to">Ange vilken fil som du vill kryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över.</string>
-  <string name="specify_file_to_decrypt_to">Ange vilken fil som du vill dekryptera till.\nVARNING: Om filen redan finns kommer den att skrivas över.</string>
-  <string name="specify_file_to_export_to">Ange vilken fil som du vill exportera till.\nVARNING: Om filen redan finns kommer den att skrivas över.</string>
   <string name="key_deletion_confirmation_multi">Vill du verkligen radera alla markerade nycklar?</string>
   <string name="secret_key_deletion_confirmation">Efter radering kommer du inte kunna läsa meddelande krypterade med den här nyckeln samt förlora alla nyckelbekräftningar som gjorts med den!</string>
   <string name="public_key_deletetion_confirmation">Radera nyckel \'%s\'?</string>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 2e55eb620..12115e93b 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -4,12 +4,9 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Anahtarları Seç</string>
-  <string name="title_select_secret_key">Anahtarını Seç</string>
   <string name="title_decrypt">Şifre çöz</string>
   <string name="title_add_subkey">Alt anahtar ekle</string>
   <string name="title_edit_key">Anahtarı düzenle</string>
-  <string name="title_cloud_search_preferences">Bulut Arama Seçenekleri</string>
   <string name="title_api_registered_apps">Uygulamalar</string>
   <string name="title_change_passphrase">Parolayı Değiştir</string>
   <string name="title_share_fingerprint_with">Parmak izini paylaş...</string>
@@ -18,7 +15,6 @@
   <string name="title_encrypt_to_file">Dosyaya Şifrele</string>
   <string name="title_decrypt_to_file">Dosyaya Çözümle</string>
   <string name="title_import_keys">Anahtarları Al</string>
-  <string name="title_add_keys">Anahtarlar Ekle</string>
   <string name="title_export_key">Anahtarı Ver</string>
   <string name="title_export_keys">Anahtarları Ver</string>
   <string name="title_key_not_found">Anahtar Bulunamadı</string>
@@ -26,28 +22,19 @@
   <string name="title_key_details">Anahtar Detayları</string>
   <string name="title_help">Yardım</string>
   <string name="title_log_display">Günlük</string>
-  <string name="title_create_key">Anahtar Oluştur</string>
   <string name="title_exchange_keys">Anahtarları Değiş Tokuş Et</string>
   <string name="title_advanced_key_info">Gelişmiş Anahtar Bilgisi</string>
   <!--section-->
   <string name="section_user_ids">Kimlikler</string>
   <string name="section_keys">Alt anahtarlar</string>
   <string name="section_cloud_search">Bulut araması</string>
-  <string name="section_general">Genel</string>
-  <string name="section_defaults">Varsayılanlar</string>
-  <string name="section_advanced">Gelişmiş</string>
   <string name="section_passphrase_cache">Parola Önbelleği</string>
   <string name="section_actions">Eylemler</string>
   <string name="section_share_key">Anahtar</string>
-  <string name="section_upload_key">Anahtarı Eşitle</string>
   <string name="section_key_server">Anahtar Sunucusu</string>
   <string name="section_fingerprint">Parmak izi</string>
-  <string name="section_decrypt_files">Dosyalar</string>
-  <string name="section_decrypt_text">Metin</string>
-  <string name="section_certs">Sertifikalar</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Şifreyi çöz, doğrula ve dosyayı kaydet</string>
-  <string name="btn_encrypt_file">Şifrele ve dosyayı kaydet</string>
   <string name="btn_encrypt_share_file">Şifrele ve dosyayı paylaş</string>
   <string name="btn_save">Kaydet</string>
   <string name="btn_do_not_save">İptal</string>
@@ -57,7 +44,6 @@
   <string name="btn_export_to_server">Anahtar Sunucusuna Yükle</string>
   <string name="btn_next">İleri</string>
   <string name="btn_back">Geri</string>
-  <string name="btn_lookup_key">Anahtarı ara</string>
   <string name="btn_view_cert_key">Tasdikleme anahtarını görüntüle</string>
   <string name="btn_create_key">Anahtar oluştur</string>
   <string name="btn_add_files">Dosya(lar) ekle</string>
@@ -69,13 +55,10 @@
   <string name="menu_help">Yardım</string>
   <string name="menu_export_key">Dosyaya ver</string>
   <string name="menu_delete_key">Anahtar sil</string>
-  <string name="menu_import_existing_key">Dosyadan al</string>
   <string name="menu_search">Ara</string>
   <string name="menu_beam_preferences">NFC ayarları</string>
-  <string name="menu_key_edit_cancel">İptal</string>
   <string name="menu_encrypt_to">Şuna şifrele...</string>
   <string name="menu_select_all">Hepsini seç</string>
-  <string name="menu_add_keys">Anahtar ekle</string>
   <string name="menu_export_all_keys">Tüm anahtarları ver</string>
   <string name="menu_advanced">Gelişmiş bilgiyi göster</string>
   <!--label-->
@@ -170,9 +153,6 @@
   <string name="encrypt_sign_clipboard_successful">Kopyalama önbelleğine başarıyla imzalandı ve/veya şifrelendi.</string>
   <string name="select_encryption_key">En az bir şifreleme anahtarı seçiniz.</string>
   <string name="select_encryption_or_signature_key">En az bir şifreleme anahtarı veya imza anahtarı seçiniz.</string>
-  <string name="specify_file_to_encrypt_to">Lütfen şifreleme sonucu hangi dosyanın oluşturulması gerektiğini belirtin.\nUYARI: Eğer dosya mevcutsa üzerine yazılacaktır.</string>
-  <string name="specify_file_to_decrypt_to">Lütfen şifre çözme sonucu hangi dosyanın oluşturulması gerektiğini belirtin.\nUYARI: Eğer dosya mevcutsa üzerine yazılacaktır.</string>
-  <string name="specify_file_to_export_to">Lütfen dışa aktarım için hangi dosyanın kullanılması gerektiğini belirtin.\nUYARI: Eğer dosya mevcutsa üzerine yazılacaktır.</string>
   <string name="also_export_secret_keys">Özel anahtarları da dışa aktar</string>
   <string name="reinstall_openkeychain">Android için bilinen bir hataya denk geldiniz. Eğer kişilerinizi anahtarlarla eşlemek istiyorsanız, lütfen OpenKeychain uygulamasını yeniden yükleyin.</string>
   <string name="key_exported">1 anahtar başarıyla dışa aktarıldı.</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index ecd5592be..58272c597 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -4,12 +4,9 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">Вибрати ключі</string>
-  <string name="title_select_secret_key">Виберіть ваш ключ</string>
   <string name="title_decrypt">Розшифрувати</string>
   <string name="title_add_subkey">Додати підключ</string>
   <string name="title_edit_key">Редагувати ключ</string>
-  <string name="title_cloud_search_preferences">Налаштування хмарного пошуку</string>
   <string name="title_api_registered_apps">Програми</string>
   <string name="title_change_passphrase">Змінити парольну фразу</string>
   <string name="title_share_fingerprint_with">Поділитися відбитком із…</string>
@@ -18,7 +15,6 @@
   <string name="title_encrypt_to_file">Зашифрувати до файлу</string>
   <string name="title_decrypt_to_file">Розшифрувати до файлу</string>
   <string name="title_import_keys">Імпортувати ключі</string>
-  <string name="title_add_keys">Додати ключі</string>
   <string name="title_export_key">Експортувати ключ</string>
   <string name="title_export_keys">Експортувати ключі</string>
   <string name="title_key_not_found">Ключ не знайдено</string>
@@ -26,28 +22,19 @@
   <string name="title_key_details">Подробиці про ключ</string>
   <string name="title_help">Довідка</string>
   <string name="title_log_display">Журнал</string>
-  <string name="title_create_key">Створити ключ</string>
   <string name="title_exchange_keys">Обміняти ключі</string>
   <string name="title_advanced_key_info">Додаткова інформація про ключ</string>
   <!--section-->
   <string name="section_user_ids">Сутності</string>
   <string name="section_keys">Підключі</string>
   <string name="section_cloud_search">Хмарний пошук</string>
-  <string name="section_general">Загальне</string>
-  <string name="section_defaults">Типове</string>
-  <string name="section_advanced">Додаткове</string>
   <string name="section_passphrase_cache">Кеш парольної фрази</string>
   <string name="section_actions">Дії</string>
   <string name="section_share_key">Ключ</string>
-  <string name="section_upload_key">Синхронізувати ключ</string>
   <string name="section_key_server">Сервер ключів</string>
   <string name="section_fingerprint">Відбиток</string>
-  <string name="section_decrypt_files">Файли</string>
-  <string name="section_decrypt_text">Текст</string>
-  <string name="section_certs">Сертифікати</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Розшифрувати, перевірити та зберегти файл</string>
-  <string name="btn_encrypt_file">Шифрувати і зберегти файл</string>
   <string name="btn_encrypt_share_file">Зашифрувати та поширити файл</string>
   <string name="btn_save">Зберегти</string>
   <string name="btn_do_not_save">Скасувати</string>
@@ -57,7 +44,6 @@
   <string name="btn_export_to_server">Завантажити на сервер ключів</string>
   <string name="btn_next">Далі</string>
   <string name="btn_back">Назад</string>
-  <string name="btn_lookup_key">Шукати ключ</string>
   <string name="btn_view_cert_key">Переглянути ключ сертифікації</string>
   <string name="btn_create_key">Створити ключ</string>
   <string name="btn_add_files">Додати файл(и)</string>
@@ -69,13 +55,10 @@
   <string name="menu_help">Довідка</string>
   <string name="menu_export_key">Експорт до файлу</string>
   <string name="menu_delete_key">Вилучити ключ</string>
-  <string name="menu_import_existing_key">Імпорт з файлу</string>
   <string name="menu_search">Пошук</string>
   <string name="menu_beam_preferences">Налаштування променя</string>
-  <string name="menu_key_edit_cancel">Скасувати</string>
   <string name="menu_encrypt_to">Зашифрувати…</string>
   <string name="menu_select_all">Вибрати усе</string>
-  <string name="menu_add_keys">Додати ключі</string>
   <string name="menu_export_all_keys">Експортувати усі ключі</string>
   <string name="menu_advanced">Показати додаткову інформацію</string>
   <!--label-->
@@ -171,9 +154,6 @@
   <string name="encrypt_sign_clipboard_successful">Успішно підписано та/або зашифровано до буфера обміну.</string>
   <string name="select_encryption_key">Виберіть принаймні один ключ шифрування.</string>
   <string name="select_encryption_or_signature_key">Виберіть принаймні один ключ шифрування або ключ підпису.</string>
-  <string name="specify_file_to_encrypt_to">Будь ласка, виберіть файл для шифрування.\nУВАГА! Якщо файл існує, то він буде переписаний.</string>
-  <string name="specify_file_to_decrypt_to">Будь ласка, виберіть файл для розшифрування.\nУВАГА! Якщо файл існує, то він буде переписаний.</string>
-  <string name="specify_file_to_export_to">Будь ласка, виберіть файл для експорту.\nУВАГА! Якщо файл існує, то він буде переписаний.</string>
   <string name="also_export_secret_keys">Також експортувати секретні ключі</string>
   <string name="key_exported">Успішно експортовано 1 ключ.</string>
   <string name="keys_exported">Успішно експортовано %d ключів.</string>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index a6fd905e1..ffe2d0aae 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -4,47 +4,53 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">選擇金鑰</string>
-  <string name="title_select_secret_key">選擇私鑰</string>
+  <string name="title_encrypt_text">加密</string>
+  <string name="title_encrypt_files">加密</string>
   <string name="title_decrypt">解密</string>
+  <string name="title_unlock">解鎖金鑰</string>
   <string name="title_add_subkey">新增子金鑰</string>
   <string name="title_edit_key">編輯金鑰</string>
-  <string name="title_cloud_search_preferences">雲端查詢設定</string>
+  <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">應用程式</string>
+  <string name="title_key_server_preference">金鑰伺服器</string>
   <string name="title_change_passphrase">變更口令</string>
   <string name="title_share_fingerprint_with">分享指紋…</string>
   <string name="title_share_key">分享金鑰…</string>
   <string name="title_share_file">分享檔案…</string>
+  <string name="title_share_message">分享文字...</string>
   <string name="title_encrypt_to_file">加密到檔案</string>
   <string name="title_decrypt_to_file">解密到檔案</string>
   <string name="title_import_keys">匯入金鑰</string>
-  <string name="title_add_keys">新增金鑰</string>
   <string name="title_export_key">匯出金鑰</string>
   <string name="title_export_keys">匯出所有金鑰</string>
   <string name="title_key_not_found">找不到金鑰</string>
   <string name="title_send_key">上傳到金鑰伺服器</string>
+  <string name="title_certify_key">確認金鑰</string>
   <string name="title_key_details">金鑰內容</string>
   <string name="title_help">說明</string>
   <string name="title_log_display">紀錄</string>
-  <string name="title_create_key">建立金鑰</string>
   <string name="title_exchange_keys">交換金鑰</string>
   <string name="title_advanced_key_info">進階資訊</string>
+  <string name="title_delete_secret_key">刪除您的金鑰 \'%s\'？</string>
+  <string name="title_export_log">匯出記錄</string>
+  <string name="title_manage_my_keys">管理我的金鑰</string>
   <!--section-->
   <string name="section_user_ids">身份</string>
+  <string name="section_should_you_trust">您信任這把金鑰嗎？</string>
   <string name="section_keys">子金鑰</string>
   <string name="section_cloud_search">雲端查詢</string>
-  <string name="section_general">一般</string>
-  <string name="section_defaults">預設</string>
-  <string name="section_advanced">進階</string>
   <string name="section_passphrase_cache">口令快取</string>
+  <string name="section_certify">確認</string>
+  <string name="section_actions">操作</string>
+  <string name="section_share_key">金鑰</string>
   <string name="section_key_server">金鑰伺服器</string>
   <string name="section_fingerprint">指紋</string>
-  <string name="section_decrypt_files">檔案</string>
-  <string name="section_decrypt_text">文字</string>
+  <string name="section_encrypt">加密</string>
+  <string name="section_decrypt">解密</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">解密並驗證檔案</string>
-  <string name="btn_encrypt_file">加密檔案</string>
   <string name="btn_encrypt_share_file">加密並分享檔案</string>
+  <string name="btn_encrypt_save_file">加密並儲存檔案</string>
   <string name="btn_save">儲存</string>
   <string name="btn_do_not_save">取消</string>
   <string name="btn_delete">刪除</string>
@@ -53,42 +59,61 @@
   <string name="btn_export_to_server">上傳到金鑰伺服器</string>
   <string name="btn_next">下一步</string>
   <string name="btn_back">返回</string>
-  <string name="btn_lookup_key">尋找金鑰</string>
+  <string name="btn_no">不</string>
+  <string name="btn_match">指紋符合</string>
+  <string name="btn_share_encrypted_signed">加密並分享文字</string>
+  <string name="btn_copy_encrypted_signed">加密並複製文字</string>
   <string name="btn_view_cert_key">檢視簽署的金鑰</string>
   <string name="btn_create_key">建立金鑰</string>
   <string name="btn_add_files">加入檔案</string>
   <string name="btn_add_share_decrypted_text">解密並分享訊息</string>
+  <string name="btn_decrypt_clipboard">解密剪貼簿裏的文字</string>
   <string name="btn_decrypt_and_verify">並且驗證簽名</string>
   <string name="btn_decrypt_files">解密檔案</string>
+  <string name="btn_encrypt_files">加密檔案</string>
+  <string name="btn_encrypt_text">加密文字</string>
+  <string name="btn_add_email">增加額外的電子郵件信箱</string>
   <!--menu-->
   <string name="menu_preferences">設定</string>
   <string name="menu_help">說明</string>
   <string name="menu_export_key">匯出到檔案</string>
   <string name="menu_delete_key">刪除金鑰</string>
-  <string name="menu_import_existing_key">從檔案匯入</string>
+  <string name="menu_manage_keys">管理我的金鑰</string>
   <string name="menu_search">搜尋</string>
+  <string name="menu_nfc_preferences">NFC 設定</string>
   <string name="menu_beam_preferences">Beam 設定</string>
-  <string name="menu_key_edit_cancel">取消</string>
+  <string name="menu_encrypt_to">加密到...</string>
   <string name="menu_select_all">全選</string>
-  <string name="menu_add_keys">加入金鑰</string>
   <string name="menu_export_all_keys">匯出所有金鑰</string>
+  <string name="menu_update_all_keys">上傳所有金鑰</string>
   <string name="menu_advanced">顯示進階資訊</string>
+  <string name="menu_certify_fingerprint">藉由指紋比對來認證</string>
+  <string name="menu_export_log">匯出記錄</string>
   <!--label-->
+  <string name="label_message">文字</string>
   <string name="label_file">檔案</string>
   <string name="label_files">檔案</string>
+  <string name="label_file_colon">檔案：</string>
   <string name="label_no_passphrase">沒有口令</string>
   <string name="label_passphrase">口令</string>
+  <string name="label_unlock">解鎖中...</string>
   <string name="label_passphrase_again">再次輸入口令</string>
+  <string name="label_show_passphrase">顯示口令</string>
   <string name="label_algorithm">演算法</string>
   <string name="label_write_version_header">讓別人知道我在使用OpenKeychain</string>
   <string name="label_write_version_header_summary">在簽名、密文與匯出的金鑰裡寫入\'OpenKeychain v2.7\'</string>
+  <string name="label_use_default_yubikey_pin">使用預設的 Yubikey PIN</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">輸入 YubiKey PIN 時使用數字鍵盤</string>
+  <string name="label_label_use_default_yubikey_pin_summary">使用預設的 PIN (123456) 來使用 NFC 存取 Yubikeys</string>
   <string name="label_asymmetric_from">簽名自:</string>
   <string name="label_to">加密給:</string>
+  <string name="label_delete_after_encryption">加密後刪除檔案</string>
   <string name="label_delete_after_decryption">解密後刪除檔案</string>
   <string name="label_encryption_algorithm">加密演算法</string>
   <string name="label_hash_algorithm">雜湊演算法</string>
   <string name="label_symmetric">使用口令加密</string>
   <string name="label_passphrase_cache_ttl">快取時間</string>
+  <string name="label_message_compression">文字壓縮</string>
   <string name="label_file_compression">檔案壓縮</string>
   <string name="label_keyservers">金鑰伺服器</string>
   <string name="label_key_id">金鑰ID</string>
@@ -100,12 +125,30 @@
   <string name="label_main_user_id">主身份</string>
   <string name="label_name">名字</string>
   <string name="label_comment">註記</string>
-  <string name="label_email">Email</string>
+  <string name="label_email">電子郵件</string>
   <string name="label_send_key">與雲端同步</string>
   <string name="label_fingerprint">指紋</string>
   <string name="expiry_date_dialog_title">設定效期</string>
+  <string name="label_first_keyserver_is_used">(先列出的金鑰伺服器爲優先)</string>
+  <string name="label_preferred">優先</string>
+  <string name="label_enable_compression">啓用壓縮</string>
+  <string name="label_encrypt_filenames">加密檔名</string>
+  <string name="label_hidden_recipients">隱藏收件人</string>
+  <string name="pref_keyserver">搜尋金鑰伺服器</string>
+  <string name="pref_keyserver_summary">搜尋 HKP 金鑰伺服器</string>
+  <string name="pref_keybase">搜尋 Keybase.io</string>
+  <string name="pref_keybase_summary">搜尋 Keybase.io 索引</string>
+  <string name="user_id_no_name">&lt;無名&gt;</string>
+  <string name="none">&lt;無&gt;</string>
+  <plurals name="n_keys">
+    <item quantity="other">%d 金鑰</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="other">%d 金鑰伺服器</item>
+  </plurals>
   <string name="secret_key">密鑰:</string>
   <!--choice-->
+  <string name="choice_none">無</string>
   <string name="choice_15secs">15秒</string>
   <string name="choice_1min">1分鐘</string>
   <string name="choice_3mins">3分鐘</string>
@@ -137,58 +180,93 @@
   <string name="passphrases_do_not_match">口令不相符。</string>
   <string name="passphrase_must_not_be_empty">請輸入口令。</string>
   <string name="passphrase_for_symmetric_encryption">對稱加密。</string>
+  <string name="passphrase_for">輸入 \'%s\' 的口令</string>
+  <string name="pin_for">輸入 \'%s\' 的 PIN</string>
+  <string name="yubikey_pin_for">輸入 PIN 來存取 \'%s\' 的 YubiKey</string>
+  <string name="file_delete_confirmation_title">刪除原始檔案？</string>
+  <string name="file_delete_confirmation">下列的檔案將會被刪除：%s</string>
+  <string name="file_delete_successful">%1$d 之 %2$d 的檔案已經被刪除。%3$s</string>
   <string name="no_file_selected">請先選擇檔案。</string>
   <string name="encrypt_sign_successful">成功簽名並/或加密。</string>
   <string name="encrypt_sign_clipboard_successful">成功簽名並/或加密到剪貼簿。</string>
   <string name="select_encryption_key">選擇至少一把加密金鑰。</string>
   <string name="select_encryption_or_signature_key">選擇至少一把加密或簽名金鑰。</string>
-  <string name="specify_file_to_encrypt_to">請選擇要將檔案加密到哪。\n警告：已經存在的檔案將被覆蓋。</string>
-  <string name="specify_file_to_decrypt_to">請選擇要將檔案解密到哪。\n警告：已經存在的檔案將被覆蓋。</string>
-  <string name="specify_file_to_export_to">請選擇要將檔案匯出到哪。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="specify_file_to_encrypt_to">請指定欲加密的檔案。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="specify_file_to_decrypt_to">請指定欲解密的檔案。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="specify_file_to_export_to">請指定欲輸出的檔案。\n警告：已經存在的檔案將被覆蓋。</string>
+  <string name="key_deletion_confirmation_multi">您真的想要刪除所有已選金鑰嗎？</string>
+  <string name="secret_key_deletion_confirmation">刪除之後您將無法閱讀以這把金鑰加密的訊息，而且所有用這把金鑰做的認證都會失效！</string>
+  <string name="public_key_deletetion_confirmation">刪除金鑰 \'%s\' ?</string>
   <string name="also_export_secret_keys">一併匯出私鑰</string>
+  <string name="reinstall_openkeychain">您遇到了一個已知的 Android 錯誤。如果您想要鏈接聯絡人和金鑰，請重新安裝 OpenKeychain。</string>
   <string name="key_exported">成功匯出 1 把金鑰。</string>
   <string name="keys_exported">成功匯出 %d 把金鑰。</string>
+  <string name="no_keys_exported">沒有金鑰被匯出。</string>
+  <string name="key_creation_el_gamal_info">注意：只有子金鑰支援 ElGamal。</string>
+  <string name="key_not_found">無法找到金鑰 %08X。</string>
+  <string name="specify_file_to_export_log_to">請指定欲匯出的檔案。\n警告：已經存在的檔案將被覆蓋。</string>
+  <plurals name="bad_keys_encountered">
+    <item quantity="other">%d 忽略不良的密鑰。或許您在輸出時使用\n --export-secret-subkeys 選項\n 請確認您使用\n --export-secret-keys\n 作爲選項。\"</item>
+  </plurals>
+  <string name="list_empty">這個清單是空的 !</string>
   <string name="nfc_successful">NFC Beam發送金鑰成功!</string>
   <string name="key_copied_to_clipboard">金鑰已複製到剪貼簿!</string>
   <string name="fingerprint_copied_to_clipboard">指紋已複製到剪貼簿!</string>
+  <string name="select_key_to_certify">請選擇一把金鑰來做認證 !</string>
   <string name="key_too_big_for_sharing">金鑰太大無法使用此方式分享!</string>
   <string name="text_copied_to_clipboard">文字已複製到剪貼簿!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
+  <string name="error_file_delete_failed">尚未被刪除。請手動刪除他們 !</string>
+  <string name="error_file_added_already">%s 已經加入。</string>
   <string name="error_file_not_found">找不到檔案</string>
   <string name="error_no_secret_key_found">沒有適合的私鑰</string>
   <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_user_id_no_email">沒有找到電子郵件</string>
   <string name="error_key_needs_a_user_id">需要至少一個身分識別</string>
   <string name="error_no_signature_passphrase">沒有提供口令</string>
   <string name="error_no_signature_key">找不到簽名金鑰</string>
+  <string name="error_invalid_data">沒有有效的 OpenPGP 加密或簽署內容 !</string>
   <string name="error_integrity_check_failed">完整性檢查失敗！資料已被修改！</string>
   <string name="error_wrong_passphrase">口令錯誤</string>
   <string name="error_could_not_extract_private_key">無法抽取私鑰</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">需要Android 4.1以上才能使用NFC Beam功能！</string>
+  <string name="error_nfc_needed">NFC 必須開啓 !</string>
+  <string name="error_beam_needed">Bean 必須開啓 !</string>
   <string name="error_nothing_import">找不到金鑰！</string>
+  <string name="error_contacts_key_id_missing">從聯絡人取回金鑰 ID 失敗 !</string>
+  <string name="error_generic_report_bug">發生錯誤，請建立一個新的錯誤回報給 OpenKeychain。</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">尚未簽名</string>
   <string name="decrypt_result_invalid_signature">無效的簽章!</string>
+  <string name="decrypt_result_signature_uncertified">簽署自 (未認證 !)</string>
+  <string name="decrypt_result_signature_certified">簽署自</string>
   <string name="decrypt_result_signature_expired_key">金鑰已過期！</string>
   <string name="decrypt_result_signature_revoked_key">金鑰已被撤銷！</string>
   <string name="decrypt_result_signature_missing_key">未知的公鑰</string>
   <string name="decrypt_result_encrypted">已加密</string>
   <string name="decrypt_result_not_encrypted">未加密</string>
+  <string name="decrypt_result_action_show">顯示</string>
+  <string name="decrypt_result_action_Lookup">查詢</string>
   <string name="decrypt_invalid_text">簽名無效或是金鑰已經過期/被撤銷，無法確認訊息內容的作者。是否繼續顯示？</string>
   <string name="decrypt_invalid_button">我明白這樣做的風險，顯示它！</string>
   <!--Add keys-->
+  <string name="add_keys_my_key">我的金鑰：</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完成。</string>
   <string name="progress_cancel">取消</string>
   <string name="progress_cancelling">正在取消…</string>
   <string name="progress_saving">正在儲存…</string>
   <string name="progress_importing">匯入中…</string>
+  <string name="progress_updating">正在更新金鑰...</string>
   <string name="progress_exporting">匯出中…</string>
   <string name="progress_uploading">正在上傳…</string>
+  <string name="progress_building_key">正在建立金鑰...</string>
+  <string name="progress_building_master_key">正在建立主環...</string>
   <string name="progress_generating_rsa">正在產生新的RSA金鑰…</string>
   <string name="progress_generating_dsa">正在產生新的DSA金鑰…</string>
   <string name="progress_generating_elgamal">正在產生新的ElGamal金鑰…</string>
@@ -197,10 +275,12 @@
   <string name="progress_modify">正在變更鑰匙圈…</string>
   <string name="progress_modify_unlock">正在解鎖鑰匙圈…</string>
   <string name="progress_modify_adduid">正在新增使用者身份…</string>
+  <string name="progress_modify_adduat">正在增加使用者屬性...</string>
   <string name="progress_modify_revokeuid">正在撤銷使用者身份…</string>
   <string name="progress_modify_primaryuid">正在變更主要使用者身份…</string>
   <string name="progress_modify_subkeychange">正在變更子金鑰…</string>
   <string name="progress_modify_subkeyrevoke">正在撤銷子金鑰…</string>
+  <string name="progress_modify_subkeystrip">正在卸下子金鑰...</string>
   <string name="progress_modify_subkeyadd">正在新增子金鑰…</string>
   <string name="progress_modify_passphrase">正在變更口令…</string>
   <plurals name="progress_exporting_key">
@@ -221,8 +301,10 @@
   <string name="progress_finding_key">正在尋找金鑰…</string>
   <string name="progress_decompressing_data">正在解壓縮…</string>
   <string name="progress_verifying_integrity">正在驗證完整性…</string>
+  <string name="progress_deleting_securely">正在安全地刪除 \'%s\'...</string>
   <string name="progress_deleting">正在刪除金鑰…</string>
   <!--action strings-->
+  <string name="hint_cloud_search_hint">使用姓名，電子郵件尋找...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -233,6 +315,9 @@
   <string name="key_size_4096">4096</string>
   <string name="key_size_8192">8192</string>
   <string name="key_size_custom">自訂金鑰長度</string>
+  <string name="key_size_custom_info">輸入自定金鑰長度 (位元數)：</string>
+  <string name="key_size_custom_info_rsa">RSA 金鑰長度必須要大於 1024 最多 16384。且必須爲 8 的倍數。</string>
+  <string name="key_size_custom_info_dsa">DSA 金鑰長度必須要大於 512 最多 1024。且必須爲 64 的倍數。</string>
   <!--elliptic curve names-->
   <string name="key_curve_nist_p256">NIST P-256</string>
   <string name="key_curve_nist_p384">NIST P-384</string>
@@ -247,6 +332,7 @@
   <!--Help-->
   <string name="help_tab_start">快速上手</string>
   <string name="help_tab_faq">常見問題</string>
+  <string name="help_tab_wot">金鑰認證</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">更新紀錄</string>
   <string name="help_tab_about">關於</string>
@@ -257,8 +343,14 @@
   <string name="import_tab_direct">檔案/剪貼簿</string>
   <string name="import_tab_qr_code">二維條碼/NFC</string>
   <string name="import_import">匯入選擇的金鑰</string>
+  <string name="import_qr_code_wrong">QR Code 異常 ! 請再試一次 !</string>
+  <string name="import_qr_code_too_short_fingerprint">指紋過短 (&lt; 16 個字元)</string>
   <string name="import_qr_code_button">掃描二維條碼</string>
+  <string name="import_qr_code_text">將您的相機對準 QR Code !</string>
   <!--Generic result toast-->
+  <string name="view_log">詳細</string>
+  <string name="with_warnings">，包含警告</string>
+  <string name="with_cancelled">，直到被取消</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="other">成功匯入%1$d金鑰</item>
@@ -272,12 +364,39 @@
   <plurals name="import_keys_updated">
     <item quantity="other">成功更新%1$d金鑰%2$s。</item>
   </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="other">匯入 %d 金鑰失敗 !</item>
+  </plurals>
+  <plurals name="import_error">
+    <item quantity="other">匯入 %d 金鑰失敗 !</item>
+  </plurals>
   <string name="import_error_nothing">沒有東西可以匯入。</string>
   <string name="import_error_nothing_cancelled">匯入已取消。</string>
   <!--Delete result toast-->
+  <plurals name="delete_ok_but_fail_1">
+    <item quantity="other">成功刪除 %1$d 金鑰</item>
+  </plurals>
+  <plurals name="delete_ok_but_fail_2">
+    <item quantity="other">，但刪除 %1$d 金鑰%2$s 失敗。</item>
+  </plurals>
+  <plurals name="delete_ok">
+    <item quantity="other">成功刪除 %1$d 金鑰%2$s。</item>
+  </plurals>
+  <plurals name="delete_fail">
+    <item quantity="other">錯誤刪除 %1$d 金鑰。</item>
+  </plurals>
   <string name="delete_nothing">沒有東西可以刪除。</string>
   <string name="delete_cancelled">刪除已取消。</string>
   <!--Certify result toast-->
+  <plurals name="certify_keys_ok">
+    <item quantity="other">成功認證 %1$d 金鑰%2$s。</item>
+  </plurals>
+  <plurals name="certify_keys_with_errors">
+    <item quantity="other">認證 %d 金鑰失敗 !</item>
+  </plurals>
+  <plurals name="certify_error">
+    <item quantity="other">認證 %d 金鑰失敗 !</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">使用OpenKeychain解密檔案</string>
   <string name="intent_import_key">匯入金鑰至OpenKeychain</string>
@@ -290,12 +409,15 @@
   <string name="api_settings_hide_advanced">隱藏進階設定</string>
   <string name="api_settings_no_key">沒有選擇金鑰</string>
   <string name="api_settings_select_key">選擇金鑰</string>
+  <string name="api_settings_create_key">建立新金鑰</string>
   <string name="api_settings_save">儲存</string>
   <string name="api_settings_save_msg">帳戶已儲存</string>
   <string name="api_settings_cancel">取消</string>
   <string name="api_settings_revoke">撤銷存取</string>
   <string name="api_settings_start">開啟應用程式</string>
   <string name="api_settings_delete_account">移除帳戶</string>
+  <string name="api_settings_package_name">打包名稱</string>
+  <string name="api_settings_package_signature">SHA-256 所打包的簽章</string>
   <string name="api_settings_settings">設定</string>
   <string name="api_settings_key">帳戶金鑰：</string>
   <string name="api_settings_accounts_empty">沒有帳戶被指派給這個應用程式。</string>
@@ -421,5 +543,15 @@
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="passphrase_again">再一次</string>
+  <string name="unlock_method">解鎖方法</string>
+  <string name="set_passphrase">設定口令</string>
+  <string name="nfc_title">NFC</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="nfc_wrong_tag">錯誤的標籤。請再試一次。</string>
+  <string name="enable_nfc">請在您的設定中啓用 NFC</string>
+  <string name="no_nfc_support">該裝置不支援 NFC</string>
+  <string name="nfc_write_succesful">成功寫入 NFC 標籤</string>
+  <string name="unlocked">解鎖</string>
+  <string name="nfc_settings">設定</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 86059840a..f43cb3ebd 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -4,13 +4,10 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <string name="app_name">OpenKeychain</string>
   <!--title-->
-  <string name="title_select_recipients">选择密钥</string>
-  <string name="title_select_secret_key">选择私钥</string>
   <string name="title_decrypt">解密</string>
   <string name="title_add_subkey">添加子密钥</string>
   <string name="title_edit_key">编辑密钥</string>
   <string name="title_preferences">设置</string>
-  <string name="title_cloud_search_preferences">云搜索设置</string>
   <string name="title_api_registered_apps">已注册应用</string>
   <string name="title_key_server_preference">密钥服务器</string>
   <string name="title_change_passphrase">变更密码</string>
@@ -21,7 +18,6 @@
   <string name="title_encrypt_to_file">加密至文件</string>
   <string name="title_decrypt_to_file">解密至文件</string>
   <string name="title_import_keys">导入密钥</string>
-  <string name="title_add_keys">添加密钥</string>
   <string name="title_export_key">导出密钥</string>
   <string name="title_export_keys">导出密钥</string>
   <string name="title_key_not_found">无法找到密钥</string>
@@ -30,27 +26,19 @@
   <string name="title_key_details">密钥详情</string>
   <string name="title_help">帮助</string>
   <string name="title_log_display">日志</string>
-  <string name="title_create_key">创建密钥</string>
   <string name="title_advanced_key_info">更多密钥详情</string>
-  <string name="title_keys">密钥</string>
   <string name="title_export_log">导出日志</string>
   <!--section-->
   <string name="section_user_ids">用户名</string>
   <string name="section_should_you_trust">应该相信此密钥?</string>
   <string name="section_keys">子密钥</string>
   <string name="section_cloud_search">在线搜索</string>
-  <string name="section_general">常规</string>
-  <string name="section_defaults">缺省</string>
-  <string name="section_advanced">高级</string>
   <string name="section_passphrase_cache">密语缓存</string>
   <string name="section_certify">确认</string>
   <string name="section_key_server">密钥服务器</string>
   <string name="section_fingerprint">签名</string>
-  <string name="section_decrypt_files">解密文件</string>
-  <string name="section_decrypt_text">解密文本</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">解密并验证文件</string>
-  <string name="btn_encrypt_file">加密文件</string>
   <string name="btn_encrypt_share_file">加密并分享文件</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">取消</string>
@@ -73,10 +61,8 @@
   <string name="menu_delete_key">删除密钥</string>
   <string name="menu_search">搜索</string>
   <string name="menu_beam_preferences">参数</string>
-  <string name="menu_key_edit_cancel">取消</string>
   <string name="menu_encrypt_to">加密到...</string>
   <string name="menu_select_all">选择全部</string>
-  <string name="menu_add_keys">添加密钥</string>
   <string name="menu_export_all_keys">导出全部密钥</string>
   <string name="menu_advanced">高级</string>
   <!--label-->
-- 
cgit v1.2.3


From 3668c8897d88989780da800ecd648c7b33a0e8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 15 Apr 2015 10:02:41 +0200
Subject: Fix YubiKey naming, cleanup

---
 OpenKeychain/src/main/res/raw/help_changelog.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md
index 18203b1c5..104454f39 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw/help_changelog.md
@@ -35,7 +35,7 @@
   * Redesigned decrypt screen
   * New icon usage and colors
   * Fix import of secret keys from Symantec Encryption Desktop
-  * Subkey IDs on Yubikeys are now checked correctly
+  * Subkey IDs on YubiKeys are now checked correctly
 
 
 ## 3.0.1
@@ -46,7 +46,7 @@
 
 ## 3.0
 
-  * Full support for Yubikey signature generation and decryption!
+  * Full support for YubiKey signature generation and decryption!
   * Propose installable compatible apps in apps list
   * New design for decryption screens
   * Many fixes for key import, also fixes stripped keys
@@ -60,7 +60,7 @@
 ## 2.9.2
 
   * Fix keys broken in 2.9.1
-  * Yubikey decryption now working via API
+  * YubiKey decryption now working via API
 
 
 ## 2.9.1
@@ -69,7 +69,7 @@
   * Fix key flags handling (now supporting Mailvelope 0.7 keys)
   * Improved passphrase handling
   * Key sharing via SafeSlinger
-  * Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
+  * YubiKey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain
   * Fix usage of stripped keys
   * SHA256 as default for compatibility
   * Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API
@@ -80,7 +80,7 @@
 
   * Fixing crashes introduced in v2.8
   * Experimental ECC support
-  * Experimental Yubikey support (signing-only with imported keys)
+  * Experimental YubiKey support (signing-only with imported keys)
 
 
 ## 2.8
-- 
cgit v1.2.3