From c05441667e151dceb6f5874b290d70a53258061b Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 7 Nov 2014 12:28:27 -0800
Subject: Moved from WebView to Spannables, some proof cleanup too

---
 .../main/res/layout/view_key_trust_fragment.xml    | 105 +++++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |  48 ++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
new file mode 100644
index 000000000..f97401271
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
@@ -0,0 +1,105 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_should_you_trust"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/view_key_trust_readout"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            style="?android:attr/textAppearanceMedium"/>
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_cloud_evidence"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_trust_search_cloud"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_trust_start_cloud_search"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_search_cloud"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/view_key_trust_cloud_narrative"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="14dp"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            style="?android:attr/textAppearanceMedium" />
+
+        <TableLayout
+            android:id="@+id/view_key_proof_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/view_key_proof_verify_header"
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/section_proof_details"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/view_key_proof_verify_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            style="?android:attr/textAppearanceMedium"/>
+
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e2b92d875..f582bd746 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -44,6 +44,9 @@
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
+    <string name="section_should_you_trust">"Should you trust this key?"</string>
+    <string name="section_proof_details">Proof verification</string>
+    <string name="section_cloud_evidence">"Evidence from the cloud"</string>
     <string name="section_keys">"Subkeys"</string>
     <string name="section_cloud_search">"Cloud search"</string>
     <string name="section_general">"General"</string>
@@ -525,6 +528,7 @@
     <string name="key_view_tab_share">"Share"</string>
     <string name="key_view_tab_keys">"Subkeys"</string>
     <string name="key_view_tab_certs">"Certificates"</string>
+    <string name="key_view_tab_trust">"Trust this key?"</string>
     <string name="user_id_info_revoked_title">"Revoked"</string>
     <string name="user_id_info_revoked_text">"This identity has been revoked by the key owner. It is no longer valid."</string>
     <string name="user_id_info_certified_title">"Certified"</string>
@@ -534,6 +538,37 @@
     <string name="user_id_info_invalid_title">"Invalid"</string>
     <string name="user_id_info_invalid_text">"Something is wrong with this identity!"</string>
 
+    <!-- Key trust -->
+    <string name="key_trust_already_verified">"You have already certified this key!"</string>
+    <string name="key_trust_it_is_yours">"This is one of your keys!"</string>
+    <string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t certified it, but you may choose to trust it."</string>
+    <string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
+    <string name="key_trust_expired">"This key has expired. You should not trust it."</string>
+    <string name="key_trust_old_keys">" It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
+    <string name="key_trust_no_cloud_evidence">"No evidence from the cloud on this key’s trustworthiness."</string>
+    <string name="key_trust_start_cloud_search">"Start search"</string>
+    <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
+
+    <!-- keybase proof stuff -->
+    <string name="keybase_narrative_twitter">"Posts to Twitter as"</string>
+    <string name="keybase_narrative_github">"Is known on GitHub as"</string>
+    <string name="keybase_narrative_dns">"Controls the domain name(s)"</string>
+    <string name="keybase_narrative_web_site">"Can post to the Web site(s)"</string>
+    <string name="keybase_narrative_reddit">"Posts to Reddit as"</string>
+    <string name="keybase_narrative_coinbase">"Is known on Coinbase as"</string>
+    <string name="keybase_narrative_hackernews">"Posts to Hacker News as"</string>
+    <string name="keybase_narrative_unknown">"Unknown proof type"</string>
+    <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
+    <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
+    <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_no_prover_found">"No proof checker found for"</string>
+    <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
+    <string name="keybase_message_fetching_data">"Fetching proof evidence"</string>
+    <string name="keybase_proof_succeeded">"This proof has been verified!"</string>
+    <string name="keybase_a_post">"A post"</string>
+    <string name="keybase_fetched_from">"fetched from"</string>
+    <string name="keybase_contained_signature">"contains a message which could only have been created by the owner of this key."</string>
+
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
     <string name="edit_key_action_add_identity">"Add Identity"</string>
@@ -894,6 +929,19 @@
     <string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string>
     <string name="msg_dc_unlocking">"Unlocking secret key"</string>
 
+    <!-- Messages for VerifySignedLiteralData operation -->
+    <string name="msg_vl">"Starting signature check"</string>
+    <string name="msg_vl_error_no_siglist">"No signature list in signed literal data"</string>
+    <string name="msg_vl_error_wrong_key">"Message not signed with right key"</string>
+    <string name="msg_vl_error_missing_literal">"No payload in signed literal data"</string>
+    <string name="msg_vl_clear_meta_file">"Filename: %s"</string>
+    <string name="msg_vl_clear_meta_mime">"MIME type: %s"</string>
+    <string name="msg_vl_clear_meta_time">"Modification time: %s"</string>
+    <string name="msg_vl_clear_meta_size">"Filesize: %s"</string>
+    <string name="msg_vl_clear_signature_check">"Verifying signature data"</string>
+    <string name="msg_vl_error_integrity_check">"Integrity check error!"</string>
+    <string name="msg_vl_ok">"OK"</string>
+
     <!-- Messages for SignEncrypt operation -->
     <string name="msg_se_asymmetric">"Preparing public keys for encryption"</string>
     <string name="msg_se_clearsign_only">"Signing of cleartext input not supported!"</string>
-- 
cgit v1.2.3


From 4929e346a2ec2a2e046162d4e7b0870b54c17747 Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Fri, 7 Nov 2014 12:29:17 -0800
Subject: XML fragment for proof listing

---
 .../src/main/res/layout/view_key_keybase_proof.xml    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
new file mode 100644
index 000000000..0ffd151c1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/proof_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dip"
+        android:text="1."
+        style="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/proof_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dip"
+        android:text="Posts to twitter as Timbray"
+        style="?android:attr/textAppearanceMedium" />
+</TableRow>
-- 
cgit v1.2.3


From 36bac67dd5f19b72a58584f2fab104e6e26df66a Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Tue, 11 Nov 2014 18:45:36 -0800
Subject: All keybase proofs now in place

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

(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 f582bd746..9596cccc1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -567,7 +567,14 @@
     <string name="keybase_proof_succeeded">"This proof has been verified!"</string>
     <string name="keybase_a_post">"A post"</string>
     <string name="keybase_fetched_from">"fetched from"</string>
+    <string name="keybase_for_the_domain">"for the domain"</string>
     <string name="keybase_contained_signature">"contains a message which could only have been created by the owner of this key."</string>
+    <string name="keybase_twitter_proof">"A tweet"</string>
+    <string name="keybase_dns_proof">"A DNS TXT record"</string>
+    <string name="keybase_web_site_proof">"A text file"</string>
+    <string name="keybase_github_proof">"A gist"</string>
+    <string name="keybase_reddit_proof">"A JSON file"</string>
+    <string name="keybase_reddit_attribution">"attributed by Reddit to"</string>
 
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
-- 
cgit v1.2.3


From 0f59e6bd950087d99a0909e55276e649639bb51b Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Tue, 18 Nov 2014 22:12:50 -0800
Subject: In the ImportKeysList display, arrange for Keybase UserIDs to sort
 below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website

---
 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 9596cccc1..27c81fe21 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -575,6 +575,7 @@
     <string name="keybase_github_proof">"A gist"</string>
     <string name="keybase_reddit_proof">"A JSON file"</string>
     <string name="keybase_reddit_attribution">"attributed by Reddit to"</string>
+    <string name="keybase_verify">"Verify"</string>
 
     <!-- Edit key -->
     <string name="edit_key_action_change_passphrase">"Change Passphrase"</string>
-- 
cgit v1.2.3


From b5cdeb7f5a54be7443894ca2cb4bd27359fae9ce Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Wed, 19 Nov 2014 14:35:05 -0800
Subject: Prevent multiple cloud-trust-search launches.  Handle DNS query
 failure gracefully.  Fixes #1007 & #1008.

---
 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 27c81fe21..59c0ce408 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -561,6 +561,7 @@
     <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
     <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
     <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
     <string name="keybase_no_prover_found">"No proof checker found for"</string>
     <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
     <string name="keybase_message_fetching_data">"Fetching proof evidence"</string>
-- 
cgit v1.2.3


From 2a608c12ca592c8662586898a161e7054fc0693c Mon Sep 17 00:00:00 2001
From: Tim Bray <tbray@textuality.com>
Date: Sat, 22 Nov 2014 09:27:28 -0800
Subject: Check fingerprint match between proof & database

---
 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 b98f47146..cac38c361 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -562,6 +562,7 @@
     <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
     <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
     <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_key_mismatch">"Key fingerprint doesn’t match that in proof post"</string>
     <string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
     <string name="keybase_no_prover_found">"No proof checker found for"</string>
     <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
-- 
cgit v1.2.3


From fc3397de5dabf23fac0de3fd297bcc4125864861 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 12 Jan 2015 20:03:03 +0100
Subject: add support for user attributes (during canonicalization)

---
 OpenKeychain/src/main/res/values/strings.xml | 17 ++++++++++++++++-
 1 file changed, 16 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 301de0be1..4b5c46a5f 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -760,8 +760,23 @@
     <string name="msg_kc_uid_revoke_old">"Removing outdated revocation certificate for user ID '%s'"</string>
     <string name="msg_kc_uid_no_cert">"No valid self-certificate found for user ID '%s', removing from ring"</string>
     <string name="msg_kc_uid_remove">"Removing invalid user ID '%s'"</string>
-    <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The secret key contained two of them. This may result in missing certificates!"</string>
+    <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The keyring contained two of them. This may result in missing certificates!"</string>
     <string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string>
+    <string name="msg_kc_uat_jpeg">"Processing user attribute of type JPEG"</string>
+    <string name="msg_kc_uat_unknown">"Processing user attribute of unknown type"</string>
+    <string name="msg_kc_uat_bad_err">"Removing bad self certificate for user attribute"</string>
+    <string name="msg_kc_uat_bad_local">"Removing user attribute certificate with 'local' flag"</string>
+    <string name="msg_kc_uat_bad_time">"Removing user attribute with future timestamp"</string>
+    <string name="msg_kc_uat_bad_type">"Removing user attribute certificate of unknown type (%s)"</string>
+    <string name="msg_kc_uat_bad">"Removing bad self certificate for user attribute"</string>
+    <string name="msg_kc_uat_cert_dup">"Removing outdated self certificate for user attribute"</string>
+    <string name="msg_kc_uat_dup">"Removing duplicate user attribute. The keyring contained two of them. This may result in missing certificates!"</string>
+    <string name="msg_kc_uat_foreign">"Removing foreign user attribute certificate by"</string>
+    <string name="msg_kc_uat_revoke_dup">"Removing redundant revocation certificate for user attribute"</string>
+    <string name="msg_kc_uat_revoke_old">"Removing outdated revocation certificate for user attribute"</string>
+    <string name="msg_kc_uat_no_cert">"No valid self-certificate found for user attribute, removing from ring"</string>
+    <string name="msg_kc_uat_remove">"Removing invalid user attribute"</string>
+    <string name="msg_kc_uat_warn_encoding">"User id does not verify as UTF-8!"</string>
 
     <!-- Keyring merging log entries -->
     <string name="msg_mg_error_secret_dummy">"New public subkey found, but secret subkey dummy generation is not supported!"</string>
-- 
cgit v1.2.3


From 84eece622bb321c316a230432b85559ab2067084 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 12 Jan 2015 20:59:37 +0100
Subject: support addition of user attributes

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
---
 OpenKeychain/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(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 4b5c46a5f..6e2b84642 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -309,6 +309,7 @@
 
     <string name="progress_modify_unlock">"unlocking keyring…"</string>
     <string name="progress_modify_adduid">"adding user IDs…"</string>
+    <string name="progress_modify_adduat">"adding user attributes…"</string>
     <string name="progress_modify_revokeuid">"revoking user IDs…"</string>
     <string name="progress_modify_primaryuid">"changing primary user ID…"</string>
     <string name="progress_modify_subkeychange">"modifying subkeys…"</string>
@@ -839,6 +840,8 @@
     <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
     <string name="msg_mf_uid_revoke">"Revoking user ID %s"</string>
     <string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string>
+    <string name="msg_mf_uat_add_image">"Adding user attribute of type image"</string>
+    <string name="msg_mf_uat_add_unknown">"Adding user attribute of unknown type"</string>
     <string name="msg_mf_unlock_error">"Error unlocking keyring!"</string>
     <string name="msg_mf_unlock">"Unlocking keyring"</string>
 
-- 
cgit v1.2.3


From 2e3545949ba9ab48ed21cb2198c9f0d2b8691ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 13 Jan 2015 21:55:53 +0100
Subject: Start working on Material Design

---
 .../main/res/layout-v11/safe_slinger_activity.xml  | 75 ----------------------
 .../main/res/layout/create_key_final_fragment.xml  |  4 +-
 .../src/main/res/layout/key_list_content.xml       | 69 +++++++++++---------
 .../src/main/res/layout/safe_slinger_activity.xml  | 11 ++--
 OpenKeychain/src/main/res/layout/toolbar.xml       |  9 +++
 .../main/res/values-v11/themes_keychaintheme.xml   |  2 +-
 OpenKeychain/src/main/res/values-v21/themes.xml    | 11 ++++
 OpenKeychain/src/main/res/values/colors.xml        | 53 +++++++++++----
 OpenKeychain/src/main/res/values/styles.xml        | 33 +++++++++-
 OpenKeychain/src/main/res/values/themes.xml        | 12 ++++
 10 files changed, 154 insertions(+), 125 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/toolbar.xml
 create mode 100644 OpenKeychain/src/main/res/values-v21/themes.xml
 create mode 100644 OpenKeychain/src/main/res/values/themes.xml

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

diff --git a/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml
deleted file mode 100644
index 7e4410f85..000000000
--- a/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<ScrollView 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:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/exchange_description"
-                android:layout_weight="1"
-                android:gravity="center_vertical"/>
-
-            <NumberPicker
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/safe_slinger_picker"
-                />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/safe_slinger_button"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="Start exchange"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <!-- separate ImageView required for recoloring -->
-            <ImageView
-                android:id="@+id/safe_slinger_button_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
-            android:background="?android:attr/listDivider" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 7f7b2cdce..189579f91 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -86,7 +86,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/create_key_rsa"
-                    android:textColor="@color/android_green_dark"
+                    android:textColor="@color/android_green_light"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:minHeight="?android:attr/listPreferredItemHeight"
                     android:clickable="true"
@@ -128,7 +128,7 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="8dp"
                 android:text="@string/create_key_final_robot_text"
-                android:textColor="@color/android_green_dark"
+                android:textColor="@color/android_green_light"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:drawableLeft="@drawable/create_key_robot"
                 android:drawablePadding="8dp" />
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index dd230806f..7179793b5 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -1,47 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <LinearLayout
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
         android:orientation="vertical"
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <!--<LinearLayout
+        <include layout="@layout/notify_area" />
+
+        <LinearLayout
+            android:id="@+id/content_frame"
+            android:layout_marginLeft="@dimen/drawer_content_padding"
             android:orientation="vertical"
-            android:background="@color/holo_gray_bright"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
-            <Spinner
-                android:id="@+id/key_list_filter_spinner"
+            <!--<LinearLayout
+                android:orientation="vertical"
+                android:background="@color/holo_gray_bright"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp" />
-
-            <View
+                android:layout_height="wrap_content">
+
+                <Spinner
+                    android:id="@+id/key_list_filter_spinner"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+            </LinearLayout>-->
+
+            <fragment
+                android:id="@+id/key_list_fragment"
+                android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
                 android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider" />
-
-        </LinearLayout>-->
-
-        <fragment
-            android:id="@+id/key_list_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
+        </LinearLayout>
     </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index 39f4b7238..7e4410f85 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -16,17 +16,18 @@
 
             <TextView
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginBottom="4dp"
                 android:layout_marginTop="14dp"
                 android:text="@string/exchange_description"
-                android:layout_weight="1"/>
+                android:layout_weight="1"
+                android:gravity="center_vertical"/>
 
-            <Spinner
+            <NumberPicker
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/safe_slinger_spinner"
-                android:gravity="center_vertical"/>
+                android:id="@+id/safe_slinger_picker"
+                />
 
         </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml
new file mode 100644
index 000000000..d0c5e4f99
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/toolbar.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorPrimaryDark"
+    app:theme="@style/KeychainToolbarOverflow"
+    app:popupTheme="@style/KeychainTheme" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
index 4f13f81c6..6db455383 100644
--- a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
+++ b/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
@@ -3,7 +3,7 @@
 <!-- Generated with http://android-holo-colors.com -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <style name="KeychainTheme" parent="@style/_KeychainTheme"/>
+  <style name="KeychainThemeOLD" parent="@style/_KeychainTheme"/>
 
   <style name="_KeychainTheme" parent="Theme.AppCompat.Light">
 
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml
new file mode 100644
index 000000000..7ba601d79
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-v21/themes.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="KeychainTheme" parent="KeychainTheme.Base">
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+        <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
+        <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index a21f949d1..353e33058 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -1,8 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="emphasis">#aa66cc</color>
-    <color name="emphasis_dark">#9933cc</color>
+    <!--<color name="colorPrimary">@color/material_deep_teal_500</color>-->
+    <!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>-->
+
+    <!-- TODO: -->
+
+    <color name="colorSecondary">@color/material_deep_teal_200</color>
+    <color name="colorSecondaryDark">@color/material_deep_teal_500</color>
+    <!--<color name="windowBackgroundColor">#333333</color>-->
+    <color name="black_translucent">#80000000</color>
+
+    <!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
+    <color name="colorPrimary">#4CAF50</color>
+    <color name="colorPrimaryDark">#388E3C</color>
+
+    <!-- TODO: -->
+    <color name="primary">#4CAF50</color>
+    <color name="primary_dark">#388E3C</color>
+    <color name="primary_light">#C8E6C9</color>
+    <color name="accent">#536DFE</color>
+    <color name="primary_text">#212121</color>
+    <color name="secondary_text">#727272</color>
+    <color name="icons">#FFFFFF</color>
+    <color name="divider">#B6B6B6</color>
+
+
+    <!-- set to text colors -->
+    <color name="emphasis">#212121</color>
+    <color name="emphasis_dark">#727272</color>
+
     <color name="bg_gray">#cecbce</color>
     <color name="tertiary_text_light">#808080</color>
     <color name="alert">#ffdd3333</color>
@@ -10,14 +37,18 @@
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</color>
 
-    <!-- http://developer.android.com/design/style/color.html -->
-    <color name="android_red_light">#ffff4444</color>
-    <color name="android_red_dark">#ffCC0000</color>
-    <color name="android_orange_light">#ffffbb33</color>
-    <color name="android_orange_dark">#ffFF8800</color>
-    <color name="android_green_light">#ff99cc00</color>
-    <color name="android_green_dark">#ff669900</color>
-    <color name="android_purple_light">#ffaa66cc</color>
-    <color name="android_purple_dark">#ff9933CC</color>
+    <!--
+        http://www.google.com/design/spec/style/color.html#color-color-palette
+        light = normal color
+        dark = 900
+    -->
+    <color name="android_red_light">#f44336</color>
+    <color name="android_red_dark">#b71c1c</color>
+    <color name="android_orange_light">#ff9800</color>
+    <color name="android_orange_dark">#e65100</color>
+    <color name="android_green_light">#4caf50</color>
+    <color name="android_green_dark">#1b5e20</color>
+    <color name="android_purple_light">#673ab7</color>
+    <color name="android_purple_dark">#311b92</color>
 
 </resources>
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 27cd1546a..11d2bfde4 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 <resources>
     <!-- Used in Android < 4 -->
 
-    <style name="KeychainTheme" parent="@style/Theme.AppCompat.Light">
+    <style name="KeychainThemeOLD" parent="@style/Theme.AppCompat.Light">
         <item name="android:alertDialogStyle">@style/CustomDialogTheme</item>
     </style>
 
@@ -34,4 +34,35 @@
         <item name="android:background">@drawable/selector_transparent_button</item>
     </style>
 
+    <!--
+        Make Toolbar with white text and white overflow menu
+        http://www.murrayc.com/permalink/2014/10/28/android-changing-the-toolbars-text-color-and-overflow-icon-color/
+    -->
+    <style name="KeychainToolbarOverflow" parent="KeychainTheme">
+        <!-- android:textColorPrimary is the  color of the title text
+             in the Toolbar, in the Theme.AppCompat theme:  -->
+        <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
+
+        <!-- android:textColorPrimaryInverse is the  color of the title
+             text in the Toolbar, in the Theme.AppCompat.Light theme:  -->
+        <!-- <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> -->
+
+        <!-- android:actionMenuTextColor is the color of the text of
+              action (menu) items in the Toolbar, at least in the
+              Theme.AppCompat theme.
+              For some reason, they already get the textColorPrimary
+              when running on API 21, but not on older versions of
+              Android, so this is only necessary to support older
+              Android versions.-->
+        <item name="actionMenuTextColor">@color/abc_primary_text_material_dark</item>
+        <!-- android:textColorSecondary is the color of the menu
+             overflow icon (three vertical dots) -->
+        <item name="android:textColorSecondary">@color/abc_primary_text_material_dark</item>
+
+        <!-- This would set the toolbar's background color,
+              but setting this also changes the popup menu's background,
+              even if we define popupTheme for our <Toolbar> -->
+        <!-- <item name="android:background">@color/color_primary</item> -->
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
new file mode 100644
index 000000000..864e2805c
--- /dev/null
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="KeychainTheme" parent="KeychainTheme.Base" />
+
+    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 862d1f1971a16d639dec47bd60226a959efe76b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 13 Jan 2015 22:18:40 +0100
Subject: Green

---
 .../apptheme_fastscroll_thumb_default_holo.png     | Bin 260 -> 0 bytes
 .../apptheme_fastscroll_thumb_pressed_holo.png     | Bin 467 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 402 -> 398 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 413 -> 413 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 800 -> 792 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 1699 -> 1668 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 1519 -> 1483 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 330 -> 327 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 400 -> 398 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 1398 -> 1420 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 1467 -> 1507 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 736 -> 790 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 2383 -> 2366 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 2199 -> 2253 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 1402 -> 1409 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 0 -> 395 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 0 -> 419 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 0 -> 387 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 0 -> 459 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 0 -> 419 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 0 -> 420 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 0 -> 514 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 0 -> 428 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 0 -> 523 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 0 -> 556 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 0 -> 260 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 0 -> 467 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 115 -> 115 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 139 -> 139 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 381 -> 384 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 149 -> 149 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 729 -> 785 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 810 -> 866 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 913 -> 977 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 954 -> 1022 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 840 -> 928 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 960 -> 1037 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 761 -> 812 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 832 -> 886 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 0 -> 845 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 0 -> 1108 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 0 -> 1371 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 0 -> 1721 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 0 -> 148 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 0 -> 147 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 0 -> 169 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 304 -> 312 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 499 -> 481 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 0 -> 1376 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 0 -> 1495 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 0 -> 1502 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 199 -> 198 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 187 -> 227 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 298 -> 295 bytes
 .../apptheme_fastscroll_thumb_default_holo.png     | Bin 169 -> 0 bytes
 .../apptheme_fastscroll_thumb_pressed_holo.png     | Bin 306 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 300 -> 298 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 319 -> 318 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 592 -> 570 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 1100 -> 1077 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 1004 -> 982 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 232 -> 232 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 286 -> 293 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 276 -> 286 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 778 -> 770 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 802 -> 785 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 451 -> 428 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 1278 -> 1256 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 1184 -> 1155 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 847 -> 829 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 0 -> 334 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 0 -> 331 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 0 -> 382 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 0 -> 344 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 0 -> 298 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 0 -> 307 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 0 -> 346 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 0 -> 324 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 0 -> 397 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 0 -> 361 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 0 -> 170 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 0 -> 306 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 110 -> 110 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 117 -> 117 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 270 -> 273 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 135 -> 135 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 413 -> 457 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 485 -> 526 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 539 -> 589 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 521 -> 573 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 506 -> 545 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 538 -> 584 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 489 -> 535 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 507 -> 553 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 0 -> 520 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 0 -> 694 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 0 -> 815 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 0 -> 983 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 0 -> 138 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 0 -> 138 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 0 -> 163 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 237 -> 263 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 390 -> 375 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 0 -> 861 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 0 -> 885 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 0 -> 959 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 165 -> 165 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 151 -> 182 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 264 -> 261 bytes
 .../apptheme_fastscroll_thumb_default_holo.png     | Bin 324 -> 0 bytes
 .../apptheme_fastscroll_thumb_pressed_holo.png     | Bin 613 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 462 -> 470 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 479 -> 483 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 1059 -> 1054 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 2921 -> 2891 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 2651 -> 2617 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 390 -> 385 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 443 -> 451 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 520 -> 528 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 2082 -> 2109 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 2161 -> 2200 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 950 -> 1043 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 3484 -> 3537 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 3568 -> 3670 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 2467 -> 2416 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 0 -> 420 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 0 -> 528 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 0 -> 452 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 0 -> 574 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 0 -> 546 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 0 -> 452 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 0 -> 633 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 0 -> 525 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 0 -> 567 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 0 -> 721 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 0 -> 323 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 0 -> 611 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 121 -> 121 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 154 -> 154 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 477 -> 476 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 150 -> 150 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 821 -> 889 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 989 -> 1068 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 1187 -> 1262 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 1135 -> 1218 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 1083 -> 1183 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 1190 -> 1297 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 1069 -> 1155 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 1055 -> 1139 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 0 -> 1101 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 0 -> 1392 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 0 -> 1610 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 0 -> 2366 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 0 -> 156 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 0 -> 154 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 0 -> 175 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 392 -> 408 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 659 -> 645 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 0 -> 1859 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 0 -> 2075 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 0 -> 2065 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 237 -> 234 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 434 -> 432 bytes
 .../apptheme_fastscroll_thumb_default_holo.png     | Bin 600 -> 0 bytes
 .../apptheme_fastscroll_thumb_pressed_holo.png     | Bin 911 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 455 -> 455 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 538 -> 541 bytes
 .../keychaintheme_btn_check_off_holo_light.png     | Bin 329 -> 443 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 1117 -> 1112 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 3942 -> 3906 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 3606 -> 3595 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 544 -> 542 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 834 -> 826 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 890 -> 972 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 2511 -> 2512 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 2720 -> 2706 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 1490 -> 1660 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 4515 -> 4512 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 4895 -> 4769 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 3657 -> 3485 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 0 -> 633 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 0 -> 1662 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 0 -> 653 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 0 -> 852 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 0 -> 869 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 0 -> 703 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 0 -> 1033 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 0 -> 781 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 0 -> 847 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 0 -> 1197 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 0 -> 623 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 0 -> 980 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 133 -> 133 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 158 -> 158 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 847 -> 847 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 147 -> 145 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 1328 -> 1351 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 1631 -> 1654 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 1909 -> 1926 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 1906 -> 1924 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 1801 -> 1857 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 1947 -> 1991 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 1745 -> 1771 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 1748 -> 1772 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 0 -> 1403 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 0 -> 2105 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 0 -> 2534 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 0 -> 2720 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 0 -> 149 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 0 -> 150 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 0 -> 1095 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 443 -> 473 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 696 -> 691 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 0 -> 2823 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 0 -> 3098 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 0 -> 2712 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 338 -> 334 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 513 -> 511 bytes
 .../drawable/apptheme_fastscroll_thumb_holo.xml    |  20 ---------
 .../keychaintheme_btn_toggle_holo_light.xml        |  50 +++++++++++++++++++++
 .../keychaintheme_fastscroll_thumb_holo.xml        |  20 +++++++++
 ...ntheme_scrubber_control_selector_holo_light.xml |  22 +++++++++
 ...eme_scrubber_progress_horizontal_holo_light.xml |  28 ++++++++++++
 .../main/res/values-v11/styles_keychaintheme.xml   |  35 ---------------
 .../main/res/values-v11/themes_keychaintheme.xml   |  32 -------------
 .../src/main/res/values/colors_keychaintheme.xml   |   4 ++
 .../src/main/res/values/styles_keychaintheme.xml   |  39 ++++++++++++++++
 OpenKeychain/src/main/res/values/themes.xml        |   2 +-
 .../src/main/res/values/themes_keychaintheme.xml   |  43 ++++++++++++++++++
 229 files changed, 207 insertions(+), 88 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml
 create mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
 create mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
 create mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
 create mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml
 delete mode 100644 OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
 create mode 100644 OpenKeychain/src/main/res/values/colors_keychaintheme.xml
 create mode 100644 OpenKeychain/src/main/res/values/styles_keychaintheme.xml
 create mode 100644 OpenKeychain/src/main/res/values/themes_keychaintheme.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index 0ddafab03..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index c062b17f8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
index f74fcdd8d..964832508 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png
index 58a99014e..6f221e7cb 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
index 1d06ee46f..cd3de280a 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png
index 0f9718950..e271afeff 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png
index 8db606b56..0d06ce453 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
index 8ee0aa89c..d1e8f795f 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png
index e6ce2835c..5b295174b 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
index 0dc2a75ab..0d079e5fe 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png
index 0c22251f3..7ef86d832 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png
index 932257123..5021bb434 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
index 82eb795b8..e1e75b295 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png
index fbee3366d..c627a6247 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png
index eda8002eb..0a45b94a4 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..49343edc3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
new file mode 100644
index 000000000..a7e6bc3c5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
new file mode 100644
index 000000000..c31f805bd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
new file mode 100644
index 000000000..aba55810b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
new file mode 100644
index 000000000..9f68344ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..0cb6fcfef
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
new file mode 100644
index 000000000..aed04dd6c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
new file mode 100644
index 000000000..43329514c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
new file mode 100644
index 000000000..1d7474560
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
new file mode 100644
index 000000000..a0d649d24
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png
new file mode 100644
index 000000000..5ea146b28
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
new file mode 100644
index 000000000..25ad77295
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png
index e98c2a4d2..63c53a343 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png
index 84d9006eb..59d605fba 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png
index c14605dab..e3ce6fd56 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png
index 60aefe181..ade0f6d82 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png
index b9977dedb..3889a0e92 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png
index 88601174a..d4ca8797f 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png
index 6cd634a91..099ba55de 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png
index 9456cf4e1..99c38df70 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png
index fc6c57e16..cd380c371 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png
index 3c2e03356..ddba06e81 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png
index 2618d0e50..cef58060d 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png
index 56745c26b..74b6d01ae 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png
new file mode 100644
index 000000000..1a9ced650
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png
new file mode 100644
index 000000000..b873aeb30
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png
new file mode 100644
index 000000000..6451fe6e4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png
new file mode 100644
index 000000000..480786ac4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png
new file mode 100644
index 000000000..6bc032e27
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png
new file mode 100644
index 000000000..880456b02
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png
new file mode 100644
index 000000000..90528b130
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png
index a02ebb450..a5fd6ca04 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png
index 12c3cd5af..ae4ba5fc1 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png
new file mode 100644
index 000000000..5f262c9d4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png
new file mode 100644
index 000000000..e4f292ff6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png
new file mode 100644
index 000000000..5f5e7f173
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png
index 70691cddc..9f400ba30 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png
index d5ac69c23..5fa1d0315 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png
index 257eba9a0..96109c07b 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index ebffb16a0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index b6739b564..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
index d7be4f996..10a3e55fa 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png
index 2c5949eb9..bd65c9fd5 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
index d5e0ef543..3d5364179 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png
index d12f33b7d..cae17c8da 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png
index 517ea4302..d0ade76a2 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
index c6a653217..6cf3e64d9 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png
index dca8db91f..0edd1628a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png
index 502f762af..bbe7baafc 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
index ef648d9df..e61c664c5 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png
index aefa6e2c7..325125494 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png
index 590c37c6c..0d81a6ad4 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
index fa981c2f4..72f7f3717 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png
index b7421f31a..0599c3d62 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png
index 0f3beeea6..247f8c19d 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..bf6992195
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
new file mode 100644
index 000000000..3a35a4e3e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
new file mode 100644
index 000000000..0516d15e5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
new file mode 100644
index 000000000..37f70c55d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
new file mode 100644
index 000000000..98a9f10ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..f54b70ffd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
new file mode 100644
index 000000000..603cb3f30
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
new file mode 100644
index 000000000..e9c001eed
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
new file mode 100644
index 000000000..36b6534b5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
new file mode 100644
index 000000000..54f56e187
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png
new file mode 100644
index 000000000..00c08d808
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
new file mode 100644
index 000000000..2532f32dc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png
index aa1130332..b6862ea33 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png
index 8d1b4af83..cd4d77dc2 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png
index fdb236d7c..c1ec11fb9 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png
index 64b72e8ee..14b87c197 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png
index 0cff52503..3331b051d 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png
index 3a290e871..c0540bb6d 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png
index d6b4a1326..fb502a712 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png
index 98061c845..184a0aceb 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png
index cf130fdf2..39115cb49 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png
index 72d43ea01..c70815d42 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png
index 6a7307dcf..48f0571fe 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png
index 0d3cb5fe7..242297424 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png
new file mode 100644
index 000000000..97a637c1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png
new file mode 100644
index 000000000..60874b80c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png
new file mode 100644
index 000000000..5020b7947
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png
new file mode 100644
index 000000000..e2beb812a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png
new file mode 100644
index 000000000..55b07371f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png
new file mode 100644
index 000000000..9bfdf2318
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png
new file mode 100644
index 000000000..359ae4a1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png
index 574ea43ba..5303d6ef4 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png
index 33c452dcd..add105bbb 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png
new file mode 100644
index 000000000..5cb13d1ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png
new file mode 100644
index 000000000..6a7607826
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png
new file mode 100644
index 000000000..c354870e4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png
index 4569d71a9..5358a857a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png
index 47302c93e..15efce9bb 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png
index 39ca1ffda..96a1ac5a2 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index 7c5e21eeb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index 86814b45d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
index 0b0606462..8c444bb97 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png
index 65d850957..f0e76edea 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
index 80ad53ff0..74347750d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png
index b72dea7f8..eb8004be8 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png
index f24991826..00fe90604 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
index 5c122118e..73106561c 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png
index e738f8218..0611a95e6 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png
index 8bb32617b..908d601f7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
index 83af2dcc3..edcca62f9 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
index b02c9b6d1..697ca2ca7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png
index 2360f30be..08b65d235 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
index 1a2ed89db..28a808de5 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
index 306e47e71..8454a0e2a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png
index d22876cb2..330b85e4f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..bc74c108c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
new file mode 100644
index 000000000..61230cbdc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
new file mode 100644
index 000000000..2abf70dcf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
new file mode 100644
index 000000000..54e5e8eb7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
new file mode 100644
index 000000000..a096c03ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..fd43d3779
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
new file mode 100644
index 000000000..a1a66fbb0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
new file mode 100644
index 000000000..0bd49f267
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
new file mode 100644
index 000000000..7d1ba0c4a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
new file mode 100644
index 000000000..7490663c6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png
new file mode 100644
index 000000000..da5a4cdb5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
new file mode 100644
index 000000000..bea07662b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png
index 6a24d21e7..053686014 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png
index 430387245..75c9e3340 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png
index 9e08305f5..582d3a05e 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png
index 95c75a6db..c5e146368 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png
index 06f79cba3..f5ce0144a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png
index f7bae4cef..0289af47c 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png
index fc5808cbf..60fc76e51 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png
index ef108bdf4..ffffb0478 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png
index f826eee36..9d4354800 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png
index dfd468fe9..b9bd4c6ec 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png
index 6a223873c..b33d3eec2 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png
index 27a2832af..1df288012 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png
new file mode 100644
index 000000000..c3389745f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png
new file mode 100644
index 000000000..971f70f9f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png
new file mode 100644
index 000000000..e97197c5a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png
new file mode 100644
index 000000000..afa8bcdc2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png
new file mode 100644
index 000000000..2f81fdcac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png
new file mode 100644
index 000000000..51d99830f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png
new file mode 100644
index 000000000..a7d396de2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png
index 10458c01a..8c469f65d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png
index e4d7abf4d..4de02f1ff 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png
new file mode 100644
index 000000000..1d7ea81b1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png
new file mode 100644
index 000000000..e66240fe2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png
new file mode 100644
index 000000000..92ae3058b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png
index dc19219cf..d133f4614 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png
index b84a6fed1..88fe46270 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index 5e4818bfc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index 7dd89e1f4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
index c0fdc45b0..645a7bf93 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png
index 911bad8a3..bcadf4553 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png
index 310ab257c..441cd8660 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
index 456471129..ed742229d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png
index e67994690..6ac275165 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png
index 0c5038fc0..c40b01964 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
index e90491aee..2268fd1cd 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png
index a0ba2a3a2..9cfe77d71 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png
index 24daa6b8a..ee4d44903 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
index 78ab31858..1575dcdaf 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
index 2af5bf37b..2438d4e96 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png
index 7d6fa76cd..6112308fa 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
index 01e04d15e..90163e927 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
index 90c4cac28..f9ade3353 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png
index 7860fc848..df1188084 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..0e343f7be
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
new file mode 100644
index 000000000..9b3900a77
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
new file mode 100644
index 000000000..e4742d90e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
new file mode 100644
index 000000000..d3ef0e1a6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
new file mode 100644
index 000000000..c9edf5c87
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
new file mode 100644
index 000000000..71a96f167
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
new file mode 100644
index 000000000..f0d3a6c97
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
new file mode 100644
index 000000000..90423ce4e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
new file mode 100644
index 000000000..4c95cf030
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
new file mode 100644
index 000000000..f907579a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png
new file mode 100644
index 000000000..bb03584f3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
new file mode 100644
index 000000000..6167f00a5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png
index b3b0da723..b6b64d316 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png
index 0458c7f37..443ba5db5 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png
index f89b6477b..16a92d086 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png
index 30a079d6e..f9622cb95 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png
index ca952535f..a7cd41efa 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png
index 88804968f..ee8b812aa 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png
index 580a9cf9c..9ef2f180b 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png
index 8ce77b135..46dddfa8d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png
index 9c17f17a2..808d452ce 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png
index 2cab8426e..49858655c 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png
index 18d252948..c9ad3229b 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png
index d0632ca2d..158279fbd 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png
new file mode 100644
index 000000000..6c4fe4e8e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png
new file mode 100644
index 000000000..37055e319
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png
new file mode 100644
index 000000000..f6eeaa9e5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png
new file mode 100644
index 000000000..43eca997b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png
new file mode 100644
index 000000000..cac367df7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png
new file mode 100644
index 000000000..a9cef40e2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png
new file mode 100644
index 000000000..1a6f577fc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png
index f9facd05d..dfcd63db7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png
index f7a9f7c55..e3e6c8c0f 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png
new file mode 100644
index 000000000..f55d53bb5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png
new file mode 100644
index 000000000..212d020b0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png
new file mode 100644
index 000000000..cdffc3863
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png
index 733255647..f445e8b33 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png
index 01af8180e..e019443f9 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png differ
diff --git a/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml b/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml
deleted file mode 100644
index e7121f083..000000000
--- a/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/apptheme_fastscroll_thumb_pressed_holo" />
-    <item android:drawable="@drawable/apptheme_fastscroll_thumb_default_holo" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
new file mode 100644
index 000000000..733728e79
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+        android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_normal_holo_light" />
+    <item android:state_checked="true"
+        android:state_window_focused="false" android:state_enabled="false"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_holo_light" />
+    <item android:state_checked="true" android:state_pressed="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_pressed_holo_light" />
+    <item android:state_checked="true"
+        android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_focused_holo_light" />
+    <item android:state_checked="true" android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_normal_holo_light" />
+    <item android:state_checked="true"  android:state_focused="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_focused_holo_light" />
+    <item android:state_checked="true"
+         android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_holo_light" />
+
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_normal_holo_light" />
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_holo_light" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_pressed_holo_light" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_focused_holo_light" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_normal_holo_light" />
+    <item android:state_focused="true"
+        android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_focused_holo_light" />
+    <item
+         android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_holo_light" />
+</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
new file mode 100644
index 000000000..51b376345
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/keychaintheme_fastscroll_thumb_pressed_holo" />
+    <item android:drawable="@drawable/keychaintheme_fastscroll_thumb_default_holo" />
+</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
new file mode 100644
index 000000000..a3b3530ac
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/keychaintheme_scrubber_control_disabled_holo" />
+    <item android:state_pressed="true" android:drawable="@drawable/keychaintheme_scrubber_control_pressed_holo" />
+    <item android:state_selected="true" android:drawable="@drawable/keychaintheme_scrubber_control_focused_holo" />
+    <item android:drawable="@drawable/keychaintheme_scrubber_control_normal_holo" />
+</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
new file mode 100644
index 000000000..4ecf8a6c1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background"
+            android:drawable="@drawable/keychaintheme_scrubber_track_holo_light" />
+    <item android:id="@android:id/secondaryProgress">
+        <scale android:scaleWidth="100%"
+                android:drawable="@drawable/keychaintheme_scrubber_secondary_holo" />
+    </item>
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%"
+                android:drawable="@drawable/keychaintheme_scrubber_primary_holo" />
+    </item>
+</layer-list>
diff --git a/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml
deleted file mode 100644
index 0b6c4c4f5..000000000
--- a/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="ButtonKeychainTheme" parent="android:Widget.Holo.Light.Button">
-	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
-  </style>
-
-  <style name="ImageButtonKeychainTheme" parent="android:Widget.Holo.Light.ImageButton">
-	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
-  </style>
-
-  <style name="SpinnerKeychainTheme" parent="android:Widget.Holo.Light.Spinner">
-      <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item>
-      <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item>
-  </style>
-
-  <style name="ProgressBarKeychainTheme" parent="android:Widget.Holo.Light.ProgressBar.Horizontal">
-      <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item>
-      <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item>
-  </style>
-
-  <style name="SectionHeader">
-      <item name="android:drawableBottom">@drawable/section_header</item>
-      <item name="android:drawablePadding">4dp</item>
-      <item name="android:layout_marginTop">8dp</item>
-      <item name="android:paddingLeft">8dp</item>
-      <item name="android:textAllCaps">true</item>
-      <item name="android:textStyle">bold</item>
-      <item name="android:textColor">@color/emphasis</item>
-      <item name="android:textSize">14sp</item>
-  </style>
-
-</resources>
diff --git a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
deleted file mode 100644
index 6db455383..000000000
--- a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="KeychainThemeOLD" parent="@style/_KeychainTheme"/>
-
-  <style name="_KeychainTheme" parent="Theme.AppCompat.Light">
-
-    <item name="android:editTextBackground">@drawable/keychaintheme_edit_text_holo_light</item>
-
-    <item name="android:listChoiceIndicatorMultiple">@drawable/keychaintheme_btn_check_holo_light</item>
-
-    <item name="android:buttonStyle">@style/ButtonKeychainTheme</item>
-
-    <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item>
-
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerKeychainTheme</item>
-
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item>
-
-    <item name="android:listChoiceBackgroundIndicator">@drawable/keychaintheme_list_selector_holo_light</item>
-
-    <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item>
-
-    <item name="android:fastScrollThumbDrawable">@drawable/apptheme_fastscroll_thumb_holo</item>
-
-    <item name="android:selectableItemBackground">@drawable/keychaintheme_list_selector_holo_light</item>
-
-  </style>
-
-</resources>
diff --git a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
new file mode 100644
index 000000000..e9b8c9350
--- /dev/null
+++ b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="keychaintheme_color">#4caf50</color>
+</resources>
diff --git a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml
new file mode 100644
index 000000000..2913ad4c1
--- /dev/null
+++ b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Generated with http://android-holo-colors.com -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <style name="AutoCompleteTextViewKeychainTheme" parent="android:Widget.Holo.Light.AutoCompleteTextView">
+      <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item>
+	    <item name="android:background">@drawable/keychaintheme_edit_text_holo_light</item>
+  </style>
+
+  <style name="ButtonKeychainTheme" parent="android:Widget.Holo.Light.Button">
+	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
+  </style>
+
+  <style name="ImageButtonKeychainTheme" parent="android:Widget.Holo.Light.ImageButton">
+	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
+  </style>
+
+  <style name="SpinnerKeychainTheme" parent="android:Widget.Holo.Light.Spinner">
+      <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item>
+      <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item>
+  </style>
+
+  <style name="ProgressBarKeychainTheme" parent="android:Widget.Holo.Light.ProgressBar.Horizontal">
+      <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item>
+      <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item>
+  </style>
+
+  <style name="SeekBarKeychainTheme" parent="android:Widget.Holo.Light.SeekBar">
+      <item name="android:progressDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item>
+      <item name="android:indeterminateDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item>
+      <item name="android:thumb">@drawable/keychaintheme_scrubber_control_selector_holo_light</item>
+  </style>
+
+  <style name="ToggleKeychainTheme" parent="android:Widget.Holo.Light.Button.Toggle">
+      <item name="android:background">@drawable/keychaintheme_btn_toggle_holo_light</item>
+  </style>
+
+</resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 864e2805c..2f5577f00 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -3,7 +3,7 @@
 
     <style name="KeychainTheme" parent="KeychainTheme.Base" />
 
-    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
+    <style name="KeychainTheme.Base" parent="HoloKeychainTheme">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimary</item>
         <item name="android:windowNoTitle">true</item>
diff --git a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml
new file mode 100644
index 000000000..ce6922ba0
--- /dev/null
+++ b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Generated with http://android-holo-colors.com -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <style name="HoloKeychainTheme" parent="@style/_KeychainTheme"/>
+
+  <style name="_KeychainTheme" parent="Base.Theme.AppCompat.Light">
+
+    <item name="android:editTextBackground">@drawable/keychaintheme_edit_text_holo_light</item>
+
+    <item name="android:textColorHighlight">#994caf50</item>
+    <item name="android:textSelectHandleLeft">@drawable/keychaintheme_text_select_handle_left</item>
+    <item name="android:textSelectHandleRight">@drawable/keychaintheme_text_select_handle_right</item>
+    <item name="android:textSelectHandle">@drawable/keychaintheme_text_select_handle_middle</item>
+
+    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewKeychainTheme</item>
+
+    <item name="android:listChoiceIndicatorMultiple">@drawable/keychaintheme_btn_check_holo_light</item>
+
+    <item name="android:listChoiceIndicatorSingle">@drawable/keychaintheme_btn_radio_holo_light</item>
+
+    <item name="android:buttonStyle">@style/ButtonKeychainTheme</item>
+
+    <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item>
+
+    <item name="android:dropDownSpinnerStyle">@style/SpinnerKeychainTheme</item>
+
+    <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item>
+
+    <item name="android:seekBarStyle">@style/SeekBarKeychainTheme</item>
+
+    <item name="android:buttonStyleToggle">@style/ToggleKeychainTheme</item>
+
+    <item name="android:listChoiceBackgroundIndicator">@drawable/keychaintheme_list_selector_holo_light</item>
+
+    <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item>
+
+    <item name="android:fastScrollThumbDrawable">@drawable/keychaintheme_fastscroll_thumb_holo</item>
+
+  </style>
+
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d8ff737fc5392362707ad70fbe964ac9e299457f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 13 Jan 2015 23:15:13 +0100
Subject: Use Toolbar and new BaseActivity

---
 .../res/layout/api_account_settings_activity.xml   |  41 +-
 .../main/res/layout/api_app_settings_activity.xml  |  62 +--
 .../src/main/res/layout/api_apps_list_content.xml  |  18 +-
 .../main/res/layout/api_remote_create_account.xml  |  63 +--
 .../main/res/layout/api_remote_error_message.xml   |  37 +-
 .../main/res/layout/api_remote_register_app.xml    |  53 ++-
 .../main/res/layout/api_remote_select_pub_keys.xml |  45 ++-
 .../src/main/res/layout/certify_key_activity.xml   |  37 +-
 .../src/main/res/layout/create_key_activity.xml    |  27 +-
 .../src/main/res/layout/decrypt_content.xml        | 184 ++++-----
 .../src/main/res/layout/decrypt_text_activity.xml  |  26 +-
 .../src/main/res/layout/edit_key_activity.xml      |  26 +-
 .../res/layout/encrypt_content_adv_settings.xml    |  31 +-
 .../src/main/res/layout/encrypt_files_content.xml  |  42 +-
 .../src/main/res/layout/encrypt_text_content.xml   |  37 +-
 OpenKeychain/src/main/res/layout/help_activity.xml |  33 +-
 .../src/main/res/layout/import_keys_activity.xml   | 112 +++---
 .../src/main/res/layout/key_server_preference.xml  | 142 +++----
 .../src/main/res/layout/log_display_activity.xml   |  32 +-
 OpenKeychain/src/main/res/layout/nfc_activity.xml  |  49 ++-
 .../src/main/res/layout/qr_code_activity.xml       |  26 +-
 .../src/main/res/layout/safe_slinger_activity.xml  | 125 +++---
 .../main/res/layout/select_public_key_activity.xml |  20 +-
 .../src/main/res/layout/upload_key_activity.xml    | 112 +++---
 .../src/main/res/layout/view_cert_activity.xml     | 423 +++++++++++----------
 .../src/main/res/layout/view_key_activity.xml      |  94 +++--
 .../main/res/layout/view_key_advanced_activity.xml |  30 +-
 27 files changed, 1099 insertions(+), 828 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index b2a9c11f5..763504f54 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -1,28 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <ScrollView
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <include layout="@layout/notify_area" />
+
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-            <fragment
-                android:id="@+id/api_account_settings_fragment"
-                android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:orientation="vertical">
+
+                <fragment
+                    android:id="@+id/api_account_settings_fragment"
+                    android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index dae9de1f2..800e2eb87 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -1,41 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <ScrollView
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <include layout="@layout/notify_area" />
+
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-            <fragment
-                android:id="@+id/api_app_settings_fragment"
-                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/api_app_settings_fragment" />
+                android:padding="16dp"
+                android:orientation="vertical">
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/api_settings_accounts" />
+                <fragment
+                    android:id="@+id/api_app_settings_fragment"
+                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/api_app_settings_fragment" />
 
-            <FrameLayout
-                android:id="@+id/api_accounts_list_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" />
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/api_settings_accounts" />
+
+                <FrameLayout
+                    android:id="@+id/api_accounts_list_fragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical" />
 
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
index 9f9b99045..e1922079c 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <FrameLayout
+        android:layout_below="@id/toolbar"
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/content_frame"
         android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <fragment
+        <fragment
             android:id="@+id/crypto_consumers_list_fragment"
             android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
-</FrameLayout>
\ No newline at end of file
+            android:layout_height="match_parent" />
+    </FrameLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
index a6a39b1ad..7ae0a0e1e 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
@@ -1,37 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <ScrollView
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:orientation="vertical">
+        <include layout="@layout/notify_area" />
 
-            <TextView
-                android:id="@+id/api_remote_create_account_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingBottom="3dip"
-                android:text="@string/api_create_account_text"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-            <fragment
-                android:id="@+id/api_account_settings_fragment"
-                android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:layout="@layout/api_app_settings_fragment" />
+                android:padding="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/api_remote_create_account_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="3dip"
+                    android:text="@string/api_create_account_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <fragment
+                    android:id="@+id/api_account_settings_fragment"
+                    android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/api_app_settings_fragment" />
 
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
index 3d69a25b3..8483222ad 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/api_app_error_message_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:paddingBottom="0dip"
-        android:text="Set in-code!"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-</LinearLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/api_app_error_message_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:paddingBottom="0dip"
+            android:text="Set in-code!"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index f85f3b8f7..19981f59e 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-        <TextView
-            android:id="@+id/api_register_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="3dip"
-            android:text="@string/api_register_text"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+    <ScrollView
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <fragment
-            android:id="@+id/api_app_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:layout="@layout/api_app_settings_fragment" />
+            android:padding="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/api_register_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingBottom="3dip"
+                android:text="@string/api_register_text"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            <fragment
+                android:id="@+id/api_app_settings_fragment"
+                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/api_app_settings_fragment" />
 
-    </LinearLayout>
-</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index bf4d0a70d..db54e4a44 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/api_select_pub_keys_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/api_select_pub_keys_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/api_select_pub_keys_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <FrameLayout
+            android:id="@+id/api_select_pub_keys_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 2bf2c4197..3a4c343bb 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/content_frame"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <fragment
-            android:id="@+id/multi_certify_key_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.CertifyKeyFragment"
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/content_frame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
+            android:layout_height="match_parent">
+
+            <fragment
+                android:id="@+id/multi_certify_key_fragment"
+                android:name="org.sufficientlysecure.keychain.ui.CertifyKeyFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 0bd053c49..5225d4d77 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/create_key_fragment_container"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" />
+        android:layout_height="match_parent">
 
-</LinearLayout>
\ No newline at end of file
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/create_key_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml
index 5e7cda4f9..8944c821f 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml
@@ -1,109 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_frame"
-    android:layout_marginLeft="@dimen/drawer_content_padding"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
         android:orientation="vertical">
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/section_decrypt_files" />
-
-
-        <TextView
-            android:id="@+id/decrypt_files"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/btn_decrypt_files"
-            android:drawableRight="@drawable/ic_action_collection"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider"
-            android:layout_marginBottom="8dp" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:text="@string/section_decrypt_text" />
+        <include layout="@layout/notify_area" />
 
         <LinearLayout
-            android:id="@+id/decrypt_from_clipboard"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:paddingTop="4dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/section_decrypt_files" />
+
+
+            <TextView
+                android:id="@+id/decrypt_files"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
+                style="@style/SelectableItem"
+                android:text="@string/btn_decrypt_files"
+                android:drawableRight="@drawable/ic_action_collection"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="8dp" />
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:text="@string/section_decrypt_text" />
 
             <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:id="@+id/decrypt_from_clipboard"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
                 android:paddingRight="4dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical">
-
-                <TextView
-                    android:paddingLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/btn_decrypt_clipboard" />
-
-                <TextView
-                    android:paddingLeft="8dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/tertiary_text_light"
-                    android:text="@string/btn_decrypt_and_verify"
-                    android:gravity="center_vertical" />
+                style="@style/SelectableItem"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:paddingRight="4dp"
+                    android:gravity="center_vertical"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:paddingLeft="8dp"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/btn_decrypt_clipboard" />
+
+                    <TextView
+                        android:paddingLeft="8dp"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/tertiary_text_light"
+                        android:text="@string/btn_decrypt_and_verify"
+                        android:gravity="center_vertical" />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/clipboard_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="8dp"
+                    android:src="@drawable/ic_action_paste"
+                    android:layout_gravity="center_vertical" />
 
             </LinearLayout>
 
-            <ImageView
-                android:id="@+id/clipboard_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_paste"
-                android:layout_gravity="center_vertical" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+                android:layout_marginBottom="8dp" />
 
         </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider"
-            android:layout_marginBottom="8dp" />
-
     </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index e08ecb39e..5098d7ffa 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/decrypt_text_fragment_container"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/decrypt_text_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index 7e71ccf53..dfc12f328 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area"/>
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/edit_key_fragment_container"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical" />
+        android:layout_height="match_parent">
 
-</LinearLayout>
\ No newline at end of file
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/edit_key_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
index 67f7032c1..d14828ef7 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
 
         <TextView
-                android:id="@+id/label_fileCompression"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:paddingRight="10dip"
-                android:text="@string/label_file_compression"
-                android:textAppearance="?android:attr/textAppearanceSmall"/>
+            android:id="@+id/label_fileCompression"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:paddingRight="10dip"
+            android:text="@string/label_file_compression"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <Spinner
-                android:id="@+id/fileCompression"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"/>
+            android:id="@+id/fileCompression"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
     </LinearLayout>
 </merge>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
index b44a2bc4d..61c7e69c9 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_frame"
-    android:layout_marginLeft="@dimen/drawer_content_padding"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/encrypt_pager_mode"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:id="@+id/content_frame"
+        android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <fragment
-        android:id="@+id/encrypt_file_fragment"
-        android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <fragment
+            android:id="@+id/encrypt_file_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
index 809f00204..31ebef798 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
@@ -1,24 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:id="@+id/content_frame"
         android:layout_marginLeft="@dimen/drawer_content_padding"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <include layout="@layout/notify_area"/>
+        <include layout="@layout/notify_area" />
 
-    <FrameLayout
-        android:id="@+id/encrypt_pager_mode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+        <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            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"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <fragment
+            android:id="@+id/encrypt_text_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 3ad087da3..794964adb 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_height="match_parent">
 
-    <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
-        android:id="@+id/sliding_tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
+            android:id="@+id/sliding_tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 35818e4ea..78eaed02d 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -1,68 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/import_keys_top_container"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:orientation="vertical"
-        android:background="@android:color/white" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dip"
-        android:background="?android:attr/listDivider" />
+        <include layout="@layout/notify_area" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="2dip"
-        android:background="?android:attr/listDivider" />
+        <FrameLayout
+            android:id="@+id/import_keys_top_container"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:orientation="vertical"
+            android:background="@android:color/white" />
 
-    <FrameLayout
-        android:id="@+id/import_keys_list_container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:layout_weight="1"
-        android:background="@android:color/white" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dip"
+            android:background="?android:attr/listDivider" />
 
-    <LinearLayout
-        android:id="@+id/import_footer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:background="@android:color/white">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="16dp" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dip"
+            android:layout_height="2dip"
             android:background="?android:attr/listDivider" />
 
-        <TextView
-            android:id="@+id/import_import"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+        <FrameLayout
+            android:id="@+id/import_keys_list_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/import_import"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:clickable="true"
-            style="@style/SelectableItem" />
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:background="@android:color/white" />
+
+        <LinearLayout
+            android:id="@+id/import_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:background="@android:color/white">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/import_import"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/import_import"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:drawableRight="@drawable/ic_action_download"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:clickable="true"
+                style="@style/SelectableItem" />
 
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index 33866f746..259763e48 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -1,82 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <LinearLayout
-        android:id="@+id/text_layout"
+        android:layout_below="@id/toolbar"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:orientation="horizontal" >
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
 
         <LinearLayout
-            android:layout_width="0dip"
+            android:id="@+id/text_layout"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="6sp"
-            android:layout_marginLeft="16sp"
-            android:layout_marginRight="6sp"
-            android:layout_marginTop="6sp"
-            android:layout_weight="1"
-            android:background="@android:drawable/menuitem_background"
-            android:orientation="vertical"
-            android:focusable="true" >
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:focusable="true"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:layout_marginBottom="6sp"
+                android:layout_marginLeft="16sp"
+                android:layout_marginRight="6sp"
+                android:layout_marginTop="6sp"
+                android:layout_weight="1"
+                android:background="@android:drawable/menuitem_background"
+                android:orientation="vertical"
+                android:focusable="true">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:focusable="true"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+                <TextView
+                    android:id="@+id/summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/summary"
+            <Button
+                android:id="@+id/rotate"
+                android:layout_width="wrap_content"
+                android:layout_height="31dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="4dip"
+                android:layout_marginRight="6dip"
+                android:text="rotate"
+                android:textColor="#ffffffff"
+                android:textStyle="bold"
+                android:background="@drawable/button_rounded_blue" />
+
+            <ImageButton
+                android:id="@+id/add"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"
+                android:src="@drawable/plus"
+                android:background="@drawable/button_rounded_green" />
         </LinearLayout>
-        <Button
-            android:id="@+id/rotate"
-            android:layout_width="wrap_content"
-            android:layout_height="31dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="4dip"
-            android:layout_marginRight="6dip"
-            android:text="rotate"
-            android:textColor="#ffffffff"
-            android:textStyle="bold"
-            android:background="@drawable/button_rounded_blue"
-            />
-        <ImageButton
-            android:id="@+id/add"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="10dp"
-            android:src="@drawable/plus"
-            android:background="@drawable/button_rounded_green"/>
-    </LinearLayout>
 
-    <View
-        android:id="@+id/separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:orientation="vertical" >
+        <View
+            android:id="@+id/separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
 
-        <LinearLayout
-            android:id="@+id/editors"
+        <ScrollView
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-    </ScrollView>
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/editors"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
+        </ScrollView>
+
+    </LinearLayout>
 
-</LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml
index 518b56776..e5457043b 100644
--- a/OpenKeychain/src/main/res/layout/log_display_activity.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml
@@ -1,16 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp">
+    android:layout_height="match_parent">
 
-    <fragment
-        android:id="@+id/list"
-        android:name="org.sufficientlysecure.keychain.ui.LogDisplayFragment"
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.9" />
+        android:layout_height="match_parent"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp">
+
+        <fragment
+            android:id="@+id/list"
+            android:name="org.sufficientlysecure.keychain.ui.LogDisplayFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.9" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 034b74a35..5baaafc69 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -1,24 +1,35 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?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"
-    android:orientation="vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp">
+    android:layout_height="match_parent">
 
-    <TextView
-        android:text="@string/nfc_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@android:style/TextAppearance.Large"
-        android:id="@+id/nfc_text"
-        android:gravity="center"
-        android:layout_gravity="center" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <ImageView
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:src="@drawable/yubikey_phone" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
 
-</LinearLayout>
+        <TextView
+            android:text="@string/nfc_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@android:style/TextAppearance.Large"
+            android:id="@+id/nfc_text"
+            android:gravity="center"
+            android:layout_gravity="center" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/yubikey_phone" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 57c869db6..79aba346f 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/qr_code_image"
-        android:padding="32dp"
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        style="@style/SelectableItem" />
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/qr_code_image"
+            android:padding="32dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            style="@style/SelectableItem" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index 7e4410f85..c986325f1 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -1,75 +1,86 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<?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
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <ScrollView
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/exchange_description"
-                android:layout_weight="1"
-                android:gravity="center_vertical"/>
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
 
-            <NumberPicker
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/safe_slinger_picker"
-                />
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginTop="14dp"
+                    android:text="@string/exchange_description"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
+                <NumberPicker
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/safe_slinger_picker" />
 
-        <LinearLayout
-            android:id="@+id/safe_slinger_button"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
+            </LinearLayout>
 
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="Start exchange"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
 
-            <!-- separate ImageView required for recoloring -->
-            <ImageView
-                android:id="@+id/safe_slinger_button_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
-                android:layout_gravity="center_vertical" />
+            <LinearLayout
+                android:id="@+id/safe_slinger_button"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
+                android:paddingRight="4dp"
+                style="@style/SelectableItem"
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <TextView
+                    android:paddingLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:text="Start exchange"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_marginBottom="4dp"
-            android:background="?android:attr/listDivider" />
+                <!-- separate ImageView required for recoloring -->
+                <ImageView
+                    android:id="@+id/safe_slinger_button_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="8dp"
+                    android:src="@drawable/ic_action_safeslinger"
+                    android:layout_gravity="center_vertical" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:layout_marginBottom="4dp"
+                android:background="?android:attr/listDivider" />
+
+        </LinearLayout>
+    </ScrollView>
 
-    </LinearLayout>
-</ScrollView>
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
index a18ce46fc..86b0049c4 100644
--- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
@@ -1,12 +1,22 @@
 <?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"
-    android:layout_centerHorizontal="true" >
+    android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/select_public_key_fragment_container"
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <RelativeLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true">
+
+        <FrameLayout
+            android:id="@+id/select_public_key_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 736617ba5..f4d262f1d 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -1,62 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<?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">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <ScrollView
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
+        <include layout="@layout/notify_area" />
+
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_key_server" />
+            android:layout_height="match_parent">
 
-            <Spinner
-                android:id="@+id/upload_key_keyserver"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginTop="4dp" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_actions"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/upload_key_action_upload"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginBottom="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/btn_export_to_server"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_upload"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:clickable="true"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginTop="14dp"
+                    android:text="@string/section_key_server" />
+
+                <Spinner
+                    android:id="@+id/upload_key_keyserver"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginTop="4dp" />
+
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_marginTop="14dp"
+                    android:text="@string/section_actions"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/upload_key_action_upload"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/btn_export_to_server"
+                    android:minHeight="?android:attr/listPreferredItemHeight"
+                    android:drawableRight="@drawable/ic_action_upload"
+                    android:drawablePadding="8dp"
+                    android:gravity="center_vertical"
+                    android:clickable="true"
+                    style="@style/SelectableItem" />
+
+            </LinearLayout>
+
+        </ScrollView>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index bf65fe1cd..b0f40238d 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -1,213 +1,226 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<?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">
 
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
-    <LinearLayout
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <ScrollView
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_cert" />
+        android:layout_height="match_parent">
 
-        <TableLayout
+        <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="8dp"
-            android:layout_weight="1"
-            android:stretchColumns="1">
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_key_id" />
-
-                <TextView
-                    android:id="@+id/signee_key"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_user_id" />
-
-                <TextView
-                    android:id="@+id/signee_uid"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_algorithm" />
-
-                <TextView
-                    android:id="@+id/algorithm"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_cert_type" />
-
-                <TextView
-                    android:id="@+id/signature_type"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:id="@+id/row_reason">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_revocation" />
-
-                <TextView
-                    android:id="@+id/reason"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_creation" />
-
-                <TextView
-                    android:id="@+id/creation"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-        </TableLayout>
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_certifier_id" />
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:descendantFocusability="beforeDescendants"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_cert" />
+
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginLeft="8dp"
+                android:layout_weight="1"
+                android:stretchColumns="1">
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_key_id" />
+
+                    <TextView
+                        android:id="@+id/signee_key"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip"
+                        android:typeface="monospace" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_user_id" />
+
+                    <TextView
+                        android:id="@+id/signee_uid"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_algorithm" />
+
+                    <TextView
+                        android:id="@+id/algorithm"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_cert_type" />
+
+                    <TextView
+                        android:id="@+id/signature_type"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+                <TableRow
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:id="@+id/row_reason">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_revocation" />
+
+                    <TextView
+                        android:id="@+id/reason"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_creation" />
+
+                    <TextView
+                        android:id="@+id/creation"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+            </TableLayout>
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_certifier_id" />
+
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginBottom="4dp"
+                android:layout_weight="1"
+                android:stretchColumns="1">
+
+                <TableRow>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_key_id" />
+
+                    <TextView
+                        android:id="@+id/signer_key_id"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip"
+                        android:typeface="monospace" />
+                </TableRow>
+
+                <TableRow>
+
+                    <TextView
+                        android:id="@+id/label_algorithm"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="top"
+                        android:paddingRight="10dip"
+                        android:text="@string/label_user_id" />
+
+                    <TextView
+                        android:id="@+id/signer_uid"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="5dip" />
+                </TableRow>
+
+            </TableLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/view_cert_view_cert_key"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:layout_marginBottom="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
+                style="@style/SelectableItem"
+                android:text="@string/btn_view_cert_key"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_person"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</RelativeLayout>
 
-        <TableLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginBottom="4dp"
-            android:layout_weight="1"
-            android:stretchColumns="1">
-
-            <TableRow>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_key_id" />
-
-                <TextView
-                    android:id="@+id/signer_key_id"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="top"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_user_id" />
-
-                <TextView
-                    android:id="@+id/signer_uid"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip" />
-            </TableRow>
-
-        </TableLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_cert_view_cert_key"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/btn_view_cert_key"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_person"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 451eb30ee..10612f5a8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -1,52 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
     <LinearLayout
-        android:id="@+id/view_key_status_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/view_key_status_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+        android:layout_below="@id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/notify_area" />
 
-        <TextView
-            android:id="@+id/view_key_status_text"
+        <LinearLayout
+            android:id="@+id/view_key_status_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:visibility="gone"
-        android:id="@+id/view_key_status_divider" />
-
-    <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
-        android:id="@+id/view_key_sliding_tab_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/view_key_status_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/view_key_status_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:visibility="gone"
+            android:id="@+id/view_key_status_divider" />
+
+        <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
+            android:id="@+id/view_key_sliding_tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/view_key_pager"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
-        android:background="@android:color/white" />
+        <android.support.v4.view.ViewPager
+            android:id="@+id/view_key_pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:background="@android:color/white" />
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
index a581caa0e..e77e01bc7 100644
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
@@ -1,22 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/content_frame"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <include layout="@layout/notify_area" />
+
         <FrameLayout
-            android:id="@+id/view_key_advanced_fragment"
+            android:id="@+id/content_frame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" />
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/view_key_advanced_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
 
-    </FrameLayout>
+        </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From c57355b24a33200b1d6c35bfcac92d4c5bdfa908 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 14 Jan 2015 00:00:04 +0100
Subject: actually import user attributes (though they are not shown anywhere
 yet)

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

(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 6e2b84642..87de16f6a 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -683,6 +683,23 @@
     <string name="msg_ip_uid_reorder">"Re-ordering user IDs"</string>
     <string name="msg_ip_uid_processing">"Processing user ID %s"</string>
     <string name="msg_ip_uid_revoked">"User ID is revoked"</string>
+
+    <string name="msg_ip_uat_processing_image">"Processing user attribute of type image"</string>
+    <string name="msg_ip_uat_processing_unknown">"Processing user attribute of unknown type"</string>
+    <string name="msg_ip_uat_cert_bad">"Encountered bad certificate!"</string>
+    <string name="msg_ip_uat_cert_error">"Error processing certificate!"</string>
+    <string name="msg_ip_uat_cert_nonrevoke">"Already have a non-revokable certificate, skipping."</string>
+    <string name="msg_ip_uat_cert_old">"Certificate is older than previous, skipping."</string>
+    <string name="msg_ip_uat_cert_new">"Certificate is more recent, replacing previous."</string>
+    <string name="msg_ip_uat_cert_good">"Found good certificate by %1$s"</string>
+    <string name="msg_ip_uat_cert_good_revoke">"Found good certificate revocation by %1$s"</string>
+    <plurals name="msg_ip_uat_certs_unknown">
+        <item quantity="one">"Ignoring one certificate issued by an unknown public key"</item>
+        <item quantity="other">"Ignoring %s certificates issued by unknown public keys"</item>
+    </plurals>
+    <string name="msg_ip_uat_classifying">"Classifying user attributes"</string>
+    <string name="msg_ip_uat_revoked">"User attribute is revoked"</string>
+
     <string name="msg_is_bad_type_public">"Tried to import public keyring as secret. This is a bug, please file a report!"</string>
     <string name="msg_is_bad_type_uncanon">"Tried to import a keyring without canonicalization. This is a bug, please file a report!"</string>
 
-- 
cgit v1.2.3


From 5517b4f8cf471c29dd881baec58efd450f6cd5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 02:03:20 +0100
Subject: Launcher icon fixes

---
 .../src/main/res/drawable-hdpi/ic_launcher.png      | Bin 4563 -> 6885 bytes
 .../src/main/res/drawable-ldpi/ic_launcher.png      | Bin 1966 -> 0 bytes
 .../src/main/res/drawable-ldpi/uid_mail_bad.png     | Bin 531 -> 0 bytes
 .../src/main/res/drawable-ldpi/uid_mail_ok.png      | Bin 646 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_launcher.png      | Bin 2867 -> 4641 bytes
 .../src/main/res/drawable-xhdpi/ic_launcher.png     | Bin 6328 -> 8916 bytes
 .../src/main/res/drawable-xxhdpi/ic_launcher.png    | Bin 10207 -> 13548 bytes
 .../src/main/res/drawable-xxxhdpi/ic_launcher.png   | Bin 14135 -> 16742 bytes
 .../src/main/res/xml/preference_headers_legacy.xml  |  12 ------------
 9 files changed, 12 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
 delete mode 100644 OpenKeychain/src/main/res/xml/preference_headers_legacy.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
index 6b2be4bc3..6133816d2 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index c2b688424..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png
deleted file mode 100644
index 45467992f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_bad.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png
deleted file mode 100644
index c400a1820..000000000
Binary files a/OpenKeychain/src/main/res/drawable-ldpi/uid_mail_ok.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
index 6bb29efde..d945a01de 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
index 6188bbed9..825b18b38 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
index 765738881..4809acc39 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
index d85507fef..fab324e93 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
deleted file mode 100644
index 47b0a0920..000000000
--- a/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
-        android:title="@string/section_general" >
-        <intent
-            android:action="org.sufficientlysecure.keychain.ui.PREFS_GEN" />
-    </Preference>
-    <Preference
-        android:title="@string/section_advanced" >
-        <intent
-            android:action="org.sufficientlysecure.keychain.ui.PREFS_ADV" />
-    </Preference>
-</PreferenceScreen>
-- 
cgit v1.2.3


From d9e0f0a2719c948312ced8bcfe74f71ca9bb48c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 10:35:40 +0100
Subject: Fix Toolbars in decrypt activities

---
 .../src/main/res/layout/decrypt_files_activity.xml | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 0380787db..7cc2b35f3 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/notify_area" />
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:id="@+id/decrypt_files_fragment_container"
+    <LinearLayout
+        android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+        <include layout="@layout/notify_area" />
+
+        <FrameLayout
+            android:id="@+id/decrypt_files_fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 99361bdcffc4d1c6c492d767a34a8bdd80578ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 13:19:21 +0100
Subject: Better way to have dark toolbar and light theme

---
 OpenKeychain/src/main/res/layout/toolbar.xml |  5 +++--
 OpenKeychain/src/main/res/values/styles.xml  | 31 ----------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml
index d0c5e4f99..4c1ad4e54 100644
--- a/OpenKeychain/src/main/res/layout/toolbar.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar.xml
@@ -4,6 +4,7 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize"
     android:background="?attr/colorPrimaryDark"
-    app:theme="@style/KeychainToolbarOverflow"
-    app:popupTheme="@style/KeychainTheme" />
\ No newline at end of file
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 11d2bfde4..3844ccb29 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -34,35 +34,4 @@
         <item name="android:background">@drawable/selector_transparent_button</item>
     </style>
 
-    <!--
-        Make Toolbar with white text and white overflow menu
-        http://www.murrayc.com/permalink/2014/10/28/android-changing-the-toolbars-text-color-and-overflow-icon-color/
-    -->
-    <style name="KeychainToolbarOverflow" parent="KeychainTheme">
-        <!-- android:textColorPrimary is the  color of the title text
-             in the Toolbar, in the Theme.AppCompat theme:  -->
-        <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
-
-        <!-- android:textColorPrimaryInverse is the  color of the title
-             text in the Toolbar, in the Theme.AppCompat.Light theme:  -->
-        <!-- <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> -->
-
-        <!-- android:actionMenuTextColor is the color of the text of
-              action (menu) items in the Toolbar, at least in the
-              Theme.AppCompat theme.
-              For some reason, they already get the textColorPrimary
-              when running on API 21, but not on older versions of
-              Android, so this is only necessary to support older
-              Android versions.-->
-        <item name="actionMenuTextColor">@color/abc_primary_text_material_dark</item>
-        <!-- android:textColorSecondary is the color of the menu
-             overflow icon (three vertical dots) -->
-        <item name="android:textColorSecondary">@color/abc_primary_text_material_dark</item>
-
-        <!-- This would set the toolbar's background color,
-              but setting this also changes the popup menu's background,
-              even if we define popupTheme for our <Toolbar> -->
-        <!-- <item name="android:background">@color/color_primary</item> -->
-    </style>
-
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 73feaa974cc90c86ca63ba09b86b8a10eb1a7e18 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 14 Jan 2015 13:05:13 +0100
Subject: small fixes to user attribute 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 87de16f6a..561275b83 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -857,6 +857,7 @@
     <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
     <string name="msg_mf_uid_revoke">"Revoking user ID %s"</string>
     <string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string>
+    <string name="msg_mf_uat_error_empty">"User attribute must not be empty!"</string>
     <string name="msg_mf_uat_add_image">"Adding user attribute of type image"</string>
     <string name="msg_mf_uat_add_unknown">"Adding user attribute of unknown type"</string>
     <string name="msg_mf_unlock_error">"Error unlocking keyring!"</string>
-- 
cgit v1.2.3


From c94ef60c5d93d724dad9e4422fdcc3778ade7ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 14:02:51 +0100
Subject: Fix SearchView

---
 OpenKeychain/src/main/res/layout/toolbar.xml |  5 +++-
 OpenKeychain/src/main/res/menu/key_list.xml  | 36 ++++++++++++++--------------
 OpenKeychain/src/main/res/values/strings.xml |  1 +
 OpenKeychain/src/main/res/values/themes.xml  | 21 ++++++++++++++++
 4 files changed, 44 insertions(+), 19 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml
index 4c1ad4e54..5d83a2aa1 100644
--- a/OpenKeychain/src/main/res/layout/toolbar.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?attr/actionBarSize"
     android:background="?attr/colorPrimaryDark"
+    android:elevation="4dp"
     app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 716a426a0..aab6c2e60 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -11,53 +11,53 @@
 
     <item
         android:id="@+id/menu_key_list_search_cloud"
-        app:showAsAction="always|withText"
         android:icon="@drawable/ic_action_search_cloud"
-        android:title="@string/menu_add_keys" />
+        android:title="@string/menu_search_cloud"
+        app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_add"
-        app:showAsAction="always|withText"
         android:icon="@drawable/ic_action_qr_code"
-        android:title="@string/import_qr_code_button" />
+        android:title="@string/import_qr_code_button"
+        app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_all_keys" />
+        android:title="@string/menu_export_all_keys"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_create"
-        app:showAsAction="never"
-        android:title="@string/menu_create_key" />
+        android:title="@string/menu_create_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_import_existing_key"
-        app:showAsAction="never"
-        android:title="@string/menu_import_existing_key" />
+        android:title="@string/menu_import_existing_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_cons"
-        app:showAsAction="never"
         android:title="Debug / Consolidate"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_read"
-        app:showAsAction="never"
         android:title="Debug / DB restore"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_write"
-        app:showAsAction="never"
         android:title="Debug / DB backup"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_first_time"
-        app:showAsAction="never"
         android:title="Debug / Show first time screen"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 87de16f6a..deb2f05f3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="menu_encrypt_to">"Encrypt to…"</string>
     <string name="menu_select_all">"Select all"</string>
     <string name="menu_add_keys">"Add keys"</string>
+    <string name="menu_search_cloud">"Search cloud"</string>
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_advanced">"Show advanced info"</string>
 
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 2f5577f00..602c85247 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -8,5 +8,26 @@
         <item name="colorPrimaryDark">@color/colorPrimary</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
+        <item name="searchViewStyle">@style/MySearchViewStyle</item>
+    </style>
+
+    <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
+    <style name="MySearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <!-- Background for the search query section (e.g. EditText) -->
+        <!--<item name="queryBackground">...</item>-->
+        <!-- Background for the actions section (e.g. voice, submit) -->
+        <!--<item name="submitBackground">...</item>-->
+        <!-- Close button icon -->
+        <!--<item name="closeIcon">...</item>-->
+        <!-- Search button icon -->
+        <!--<item name="searchIcon">...</item>-->
+        <!-- Go/commit button icon -->
+        <!--<item name="goIcon">...</item>-->
+        <!-- Voice search button icon -->
+        <!--<item name="voiceIcon">...</item>-->
+        <!-- Commit icon shown in the query suggestion row -->
+        <!--<item name="commitIcon">...</item>-->
+        <!-- Layout for query suggestion rows -->
+        <!--<item name="suggestionRowLayout">...</item>-->
     </style>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From f397d4f995451850f25080d0f84c77ba2aaa4f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 14:52:23 +0100
Subject: Reorganize folders of graphics sources

---
 .../main/res/drawable-hdpi/ic_search_white_24dp.png   | Bin 0 -> 504 bytes
 .../main/res/drawable-hdpi/key_flag_authenticate.png  | Bin 1302 -> 0 bytes
 .../src/main/res/drawable-hdpi/key_flag_certify.png   | Bin 2289 -> 0 bytes
 .../src/main/res/drawable-hdpi/key_flag_encrypt.png   | Bin 1530 -> 0 bytes
 .../src/main/res/drawable-hdpi/key_flag_sign.png      | Bin 1751 -> 0 bytes
 .../main/res/drawable-mdpi/ic_search_white_24dp.png   | Bin 0 -> 346 bytes
 .../main/res/drawable-mdpi/key_flag_authenticate.png  | Bin 897 -> 3073 bytes
 .../src/main/res/drawable-mdpi/key_flag_certify.png   | Bin 1746 -> 5303 bytes
 .../src/main/res/drawable-mdpi/key_flag_encrypt.png   | Bin 1153 -> 3158 bytes
 .../src/main/res/drawable-mdpi/key_flag_sign.png      | Bin 1353 -> 3765 bytes
 .../src/main/res/drawable-mdpi/status_lock_closed.png | Bin 528 -> 1160 bytes
 .../src/main/res/drawable-mdpi/status_lock_error.png  | Bin 622 -> 1316 bytes
 .../src/main/res/drawable-mdpi/status_lock_open.png   | Bin 522 -> 1165 bytes
 .../res/drawable-mdpi/status_signature_expired.png    | Bin 601 -> 1429 bytes
 .../drawable-mdpi/status_signature_expired_cutout.png | Bin 643 -> 1590 bytes
 .../res/drawable-mdpi/status_signature_invalid.png    | Bin 463 -> 840 bytes
 .../drawable-mdpi/status_signature_invalid_cutout.png | Bin 410 -> 694 bytes
 .../res/drawable-mdpi/status_signature_revoked.png    | Bin 613 -> 1353 bytes
 .../drawable-mdpi/status_signature_revoked_cutout.png | Bin 685 -> 1660 bytes
 .../res/drawable-mdpi/status_signature_unknown.png    | Bin 517 -> 1231 bytes
 .../drawable-mdpi/status_signature_unknown_cutout.png | Bin 589 -> 1377 bytes
 .../res/drawable-mdpi/status_signature_unverified.png | Bin 469 -> 946 bytes
 .../status_signature_unverified_cutout.png            | Bin 667 -> 1555 bytes
 .../res/drawable-mdpi/status_signature_verified.png   | Bin 476 -> 1012 bytes
 .../status_signature_verified_cutout.png              | Bin 557 -> 1319 bytes
 .../main/res/drawable-xhdpi/ic_search_white_24dp.png  | Bin 0 -> 591 bytes
 .../main/res/drawable-xhdpi/key_flag_authenticate.png | Bin 2161 -> 0 bytes
 .../src/main/res/drawable-xhdpi/key_flag_certify.png  | Bin 3713 -> 0 bytes
 .../src/main/res/drawable-xhdpi/key_flag_encrypt.png  | Bin 2310 -> 0 bytes
 .../src/main/res/drawable-xhdpi/key_flag_sign.png     | Bin 2705 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_search_white_24dp.png | Bin 0 -> 871 bytes
 .../res/drawable-xxhdpi/key_flag_authenticate.png     | Bin 3073 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_certify.png | Bin 5303 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_encrypt.png | Bin 3158 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_sign.png    | Bin 3765 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_search_white_24dp.png     | Bin 0 -> 1090 bytes
 OpenKeychain/src/main/res/menu/key_list.xml           |   2 +-
 37 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..a2fc5b2e7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
deleted file mode 100644
index 9d4ed6e84..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
deleted file mode 100644
index e76393659..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
deleted file mode 100644
index 3c2f8c09c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
deleted file mode 100644
index 046424643..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..dff1e3a8a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
index ed1ba24d2..d786dc72f 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
index d54d461fa..4bb97f992 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
index 81c1b3dfa..fe0c8e41b 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
index 9afc43901..51ab367a9 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
index cfc39f0e7..5a9664d59 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
index 824dc2672..608f065af 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
index 9bca59ae3..ee34dd396 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
index 81a900147..f475c9d84 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
index bc91094b5..33a3efed1 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
index baa78f795..f21c2cf52 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
index bc2f56e2a..bc39d3496 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
index 7cf985274..be1a1d9dc 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
index 2d2593194..58929661f 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
index 3d4665320..841cfa958 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
index 0fc74d07e..3020357a4 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
index 8348b32b3..525d1cf6b 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
index 96a2d1413..3829bb3a0 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
index 02e53ac8a..54eee5ba0 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
index 9f7cf837c..3548ee2b6 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..043759acd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
deleted file mode 100644
index 8d36d7202..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
deleted file mode 100644
index 01a74bcc0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
deleted file mode 100644
index ff07bd0a4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
deleted file mode 100644
index b8002162a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..0bbeab150
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
deleted file mode 100644
index d786dc72f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
deleted file mode 100644
index 4bb97f992..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
deleted file mode 100644
index fe0c8e41b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
deleted file mode 100644
index 51ab367a9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..70c21baf7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index aab6c2e60..f61172a0a 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_key_list_search"
         android:title="@string/menu_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@drawable/ic_search_white_24dp"
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|always" />
 
-- 
cgit v1.2.3


From 85b6669625c9b94972fb03ec0de2da689c24d299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 19:14:30 +0100
Subject: Integrate QR Code library instead of requiring the app to be
 installed, also due to security reasons

---
 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 5163f16e6..7f38d40a1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -395,6 +395,7 @@
     <string name="import_qr_code_wrong">"QR Code malformed! Please try again!"</string>
     <string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (&lt; 16 characters)"</string>
     <string name="import_qr_code_button">"Scan QR Code"</string>
+    <string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
 
     <!-- Generic result toast -->
     <string name="view_log">"View Log"</string>
-- 
cgit v1.2.3


From 1516ebf26afdd10cab81da945251015af2aa819d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 20:18:03 +0100
Subject: Toolbar for settings

---
 .../main/res/drawable-hdpi/ic_arrow_back_white_24dp.png   | Bin 0 -> 287 bytes
 .../main/res/drawable-mdpi/ic_arrow_back_white_24dp.png   | Bin 0 -> 240 bytes
 .../main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png  | Bin 0 -> 336 bytes
 .../main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png | Bin 0 -> 410 bytes
 .../res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png     | Bin 0 -> 530 bytes
 .../src/main/res/layout/preference_toolbar_activity.xml   |  10 ++++++++++
 OpenKeychain/src/main/res/values/strings.xml              |   2 +-
 OpenKeychain/src/main/res/xml/preference_headers.xml      |   4 ++--
 8 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..5fa494878
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..9e662f6d4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..addbfc886
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..4057cc545
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 000000000..02f2f6fe8
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_arrow_back_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
new file mode 100644
index 000000000..a328d15c6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+</LinearLayout>
\ 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 7f38d40a1..5bc3c0601 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <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">"Preferences"</string>
+    <string name="title_preferences">"Settings"</string>
     <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string>
     <string name="title_api_registered_apps">"Apps"</string>
     <string name="title_key_server_preference">"Keyserver Preference"</string>
diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml
index dd7f1c3e6..347394b06 100644
--- a/OpenKeychain/src/main/res/xml/preference_headers.xml
+++ b/OpenKeychain/src/main/res/xml/preference_headers.xml
@@ -1,8 +1,8 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$CloudSearchPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment"
         android:title="@string/section_cloud_search" />
     <header
-        android:fragment="org.sufficientlysecure.keychain.ui.PreferencesActivity$AdvancedPrefsFragment"
+        android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment"
         android:title="@string/section_advanced" />
 </preference-headers>
-- 
cgit v1.2.3


From 0c74cc7c3d2b37b47b865d968e9c40b8b718d3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 14 Jan 2015 20:25:28 +0100
Subject: Fix drawable sizes

---
 .../main/res/drawable-mdpi/key_flag_authenticate.png  | Bin 3073 -> 897 bytes
 .../src/main/res/drawable-mdpi/key_flag_certify.png   | Bin 5303 -> 1746 bytes
 .../src/main/res/drawable-mdpi/key_flag_encrypt.png   | Bin 3158 -> 1153 bytes
 .../src/main/res/drawable-mdpi/key_flag_sign.png      | Bin 3765 -> 1353 bytes
 .../src/main/res/drawable-mdpi/status_lock_closed.png | Bin 1160 -> 528 bytes
 .../src/main/res/drawable-mdpi/status_lock_error.png  | Bin 1316 -> 622 bytes
 .../src/main/res/drawable-mdpi/status_lock_open.png   | Bin 1165 -> 522 bytes
 .../res/drawable-mdpi/status_signature_expired.png    | Bin 1429 -> 601 bytes
 .../drawable-mdpi/status_signature_expired_cutout.png | Bin 1590 -> 643 bytes
 .../res/drawable-mdpi/status_signature_invalid.png    | Bin 840 -> 463 bytes
 .../drawable-mdpi/status_signature_invalid_cutout.png | Bin 694 -> 410 bytes
 .../res/drawable-mdpi/status_signature_revoked.png    | Bin 1353 -> 613 bytes
 .../drawable-mdpi/status_signature_revoked_cutout.png | Bin 1660 -> 685 bytes
 .../res/drawable-mdpi/status_signature_unknown.png    | Bin 1231 -> 517 bytes
 .../drawable-mdpi/status_signature_unknown_cutout.png | Bin 1377 -> 589 bytes
 .../res/drawable-mdpi/status_signature_unverified.png | Bin 946 -> 469 bytes
 .../status_signature_unverified_cutout.png            | Bin 1555 -> 667 bytes
 .../res/drawable-mdpi/status_signature_verified.png   | Bin 1012 -> 476 bytes
 .../status_signature_verified_cutout.png              | Bin 1319 -> 557 bytes
 19 files changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
index d786dc72f..ed1ba24d2 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
index 4bb97f992..d54d461fa 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
index fe0c8e41b..81c1b3dfa 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
index 51ab367a9..9afc43901 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
index 5a9664d59..cfc39f0e7 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
index 608f065af..824dc2672 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
index ee34dd396..9bca59ae3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
index f475c9d84..81a900147 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
index 33a3efed1..bc91094b5 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
index f21c2cf52..baa78f795 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
index bc39d3496..bc2f56e2a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
index be1a1d9dc..7cf985274 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
index 58929661f..2d2593194 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
index 841cfa958..3d4665320 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
index 3020357a4..0fc74d07e 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
index 525d1cf6b..8348b32b3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
index 3829bb3a0..96a2d1413 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
index 54eee5ba0..02e53ac8a 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
index 3548ee2b6..9f7cf837c 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png differ
-- 
cgit v1.2.3


From 09e992081bbe9b4522b940177bd9bd08d692b94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 15 Jan 2015 14:48:13 +0100
Subject: Style tabs, add missing drawables

---
 .../src/main/res/drawable-hdpi/key_flag_authenticate.png | Bin 0 -> 1302 bytes
 .../src/main/res/drawable-hdpi/key_flag_certify.png      | Bin 0 -> 2289 bytes
 .../src/main/res/drawable-hdpi/key_flag_encrypt.png      | Bin 0 -> 1530 bytes
 .../src/main/res/drawable-hdpi/key_flag_sign.png         | Bin 0 -> 1751 bytes
 .../main/res/drawable-xhdpi/key_flag_authenticate.png    | Bin 0 -> 2161 bytes
 .../src/main/res/drawable-xhdpi/key_flag_certify.png     | Bin 0 -> 3713 bytes
 .../src/main/res/drawable-xhdpi/key_flag_encrypt.png     | Bin 0 -> 2310 bytes
 .../src/main/res/drawable-xhdpi/key_flag_sign.png        | Bin 0 -> 2705 bytes
 .../main/res/drawable-xxhdpi/key_flag_authenticate.png   | Bin 0 -> 3073 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_certify.png    | Bin 0 -> 5303 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_encrypt.png    | Bin 0 -> 3158 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_sign.png       | Bin 0 -> 3765 bytes
 OpenKeychain/src/main/res/layout/help_activity.xml       |   9 ++++++---
 OpenKeychain/src/main/res/layout/view_key_activity.xml   |   8 ++++++--
 OpenKeychain/src/main/res/raw/help_start.html            |   2 +-
 15 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..9d4ed6e84
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
new file mode 100644
index 000000000..e76393659
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..3c2f8c09c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
new file mode 100644
index 000000000..046424643
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..8d36d7202
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
new file mode 100644
index 000000000..01a74bcc0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..ff07bd0a4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
new file mode 100644
index 000000000..b8002162a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..d786dc72f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
new file mode 100644
index 000000000..4bb97f992
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..fe0c8e41b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
new file mode 100644
index 000000000..51ab367a9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png differ
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 794964adb..7d3e1834c 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -9,15 +10,17 @@
 
     <LinearLayout
         android:layout_below="@id/toolbar"
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
+        <com.astuetz.PagerSlidingTabStrip
             android:id="@+id/sliding_tab_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:textColor="#FFFFFF"
+            app:pstsIndicatorColor="#FFFFFF" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 10612f5a8..a2d104694 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -46,10 +47,13 @@
             android:visibility="gone"
             android:id="@+id/view_key_status_divider" />
 
-        <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
+        <com.astuetz.PagerSlidingTabStrip
             android:id="@+id/view_key_sliding_tab_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:textColor="#FFFFFF"
+            app:pstsIndicatorColor="#FFFFFF" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/view_key_pager"
diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html
index d54780491..75fe9de26 100644
--- a/OpenKeychain/src/main/res/raw/help_start.html
+++ b/OpenKeychain/src/main/res/raw/help_start.html
@@ -8,7 +8,7 @@ And don't add newlines before or after p tags because of transifex -->
 <h2>Getting started</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
-- 
cgit v1.2.3


From 198ddfeff7324533fb2daea778891def04f8e8c2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 19 Jan 2015 15:43:35 +0100
Subject: use Notify helper everywhere, replace supertoasts with snackbar
 library

---
 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 5bc3c0601..de2a77f62 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -398,7 +398,7 @@
     <string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
 
     <!-- Generic result toast -->
-    <string name="view_log">"View Log"</string>
+    <string name="view_log">"Details"</string>
     <string name="with_warnings">", with warnings"</string>
     <string name="with_cancelled">", until cancelled"</string>
 
-- 
cgit v1.2.3


From 1516f951b79381f839806bc3a5f1dc653b1a9b6a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 25 Jan 2015 01:57:58 +0100
Subject: work on divert-to-key and other keyring stuff

- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
---
 OpenKeychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(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 5bc3c0601..522013de3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -826,6 +826,7 @@
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">"Modifying keyring %s"</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>
     <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string>
@@ -833,6 +834,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_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_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string>
-- 
cgit v1.2.3


From 41aba69fad5b958cdd01cd4a1e8cbc9828086c2f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 25 Jan 2015 02:08:07 +0100
Subject: introduce PromoteKeyOperation to create dummy secret from public keys

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

(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 522013de3..95e224672 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -907,6 +907,13 @@
     <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string>
     <string name="msg_ed_success">"Key operation successful"</string>
 
+    <!-- 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>
+
     <!-- 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>
-- 
cgit v1.2.3


From e4e2d647c8cd8bf2d1e318c85d41173caf18adf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 26 Jan 2015 00:50:35 +0100
Subject: Material Design: Full screen dialogs

---
 .../main/res/drawable-hdpi/ic_action_collapse.png  | Bin 467 -> 0 bytes
 .../main/res/drawable-hdpi/ic_action_expand.png    | Bin 415 -> 0 bytes
 .../main/res/drawable-hdpi/ic_check_white_24dp.png | Bin 0 -> 309 bytes
 .../main/res/drawable-hdpi/ic_close_white_24dp.png | Bin 0 -> 324 bytes
 .../drawable-hdpi/ic_expand_less_black_24dp.png    | Bin 0 -> 234 bytes
 .../drawable-hdpi/ic_expand_more_black_24dp.png    | Bin 0 -> 244 bytes
 .../res/drawable-hdpi/ic_refresh_white_24dp.png    | Bin 0 -> 531 bytes
 .../main/res/drawable-mdpi/ic_action_collapse.png  | Bin 404 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_expand.png    | Bin 345 -> 0 bytes
 .../main/res/drawable-mdpi/ic_check_white_24dp.png | Bin 0 -> 243 bytes
 .../main/res/drawable-mdpi/ic_close_white_24dp.png | Bin 0 -> 279 bytes
 .../drawable-mdpi/ic_expand_less_black_24dp.png    | Bin 0 -> 206 bytes
 .../drawable-mdpi/ic_expand_more_black_24dp.png    | Bin 0 -> 206 bytes
 .../res/drawable-mdpi/ic_refresh_white_24dp.png    | Bin 0 -> 346 bytes
 .../main/res/drawable-xhdpi/ic_action_collapse.png | Bin 631 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_action_expand.png   | Bin 582 -> 0 bytes
 .../res/drawable-xhdpi/ic_check_white_24dp.png     | Bin 0 -> 363 bytes
 .../res/drawable-xhdpi/ic_close_white_24dp.png     | Bin 0 -> 402 bytes
 .../drawable-xhdpi/ic_expand_less_black_24dp.png   | Bin 0 -> 259 bytes
 .../drawable-xhdpi/ic_expand_more_black_24dp.png   | Bin 0 -> 272 bytes
 .../res/drawable-xhdpi/ic_refresh_white_24dp.png   | Bin 0 -> 637 bytes
 .../res/drawable-xxhdpi/ic_action_collapse.png     | Bin 901 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_action_expand.png  | Bin 974 -> 0 bytes
 .../res/drawable-xxhdpi/ic_check_white_24dp.png    | Bin 0 -> 460 bytes
 .../res/drawable-xxhdpi/ic_close_white_24dp.png    | Bin 0 -> 492 bytes
 .../drawable-xxhdpi/ic_expand_less_black_24dp.png  | Bin 0 -> 304 bytes
 .../drawable-xxhdpi/ic_expand_more_black_24dp.png  | Bin 0 -> 316 bytes
 .../res/drawable-xxhdpi/ic_refresh_white_24dp.png  | Bin 0 -> 875 bytes
 .../res/drawable-xxxhdpi/ic_check_white_24dp.png   | Bin 0 -> 587 bytes
 .../res/drawable-xxxhdpi/ic_close_white_24dp.png   | Bin 0 -> 662 bytes
 .../drawable-xxxhdpi/ic_expand_less_black_24dp.png | Bin 0 -> 360 bytes
 .../drawable-xxxhdpi/ic_expand_more_black_24dp.png | Bin 0 -> 379 bytes
 .../res/drawable-xxxhdpi/ic_refresh_white_24dp.png | Bin 0 -> 1148 bytes
 .../main/res/layout/actionbar_custom_view_done.xml |  26 -------------
 .../layout/actionbar_custom_view_done_cancel.xml   |  28 --------------
 .../res/layout/actionbar_include_cancel_button.xml |  41 ---------------------
 .../res/layout/actionbar_include_done_button.xml   |  41 ---------------------
 .../src/main/res/layout/foldable_linearlayout.xml  |   2 +-
 .../src/main/res/layout/full_screen_dialog.xml     |  10 +++++
 .../src/main/res/layout/full_screen_dialog_2.xml   |  12 ++++++
 .../layout/full_screen_dialog_2_cancel_button.xml  |  27 ++++++++++++++
 .../layout/full_screen_dialog_2_done_button.xml    |  27 ++++++++++++++
 .../res/layout/full_screen_dialog_done_button.xml  |  25 +++++++++++++
 .../src/main/res/layout/full_screen_dialog_old.xml |  10 +++++
 OpenKeychain/src/main/res/values/strings.xml       |   2 +-
 OpenKeychain/src/main/res/values/themes.xml        |   2 +-
 46 files changed, 114 insertions(+), 139 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
 create mode 100644 OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png
deleted file mode 100644
index e9d2dcb46..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png
deleted file mode 100644
index 29f4de211..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..f42a0e2d2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..0fd15563a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..35e3b426f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..ed993f35d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..cd16fdd50
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png
deleted file mode 100644
index 4ac28f270..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png
deleted file mode 100644
index bb46bb315..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..e91f9048b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..e80681aeb
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..a5ab2c5d3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..73fc3b422
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..235c84f1e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png
deleted file mode 100644
index 60ac6b066..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png
deleted file mode 100644
index 76937f57a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..e5024472a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..76e07f097
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..47c7b52a1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..45d30d999
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..5f89fc257
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png
deleted file mode 100644
index 76ec594dc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png
deleted file mode 100644
index 22003198b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..6e03d54cf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..0eb9d8b08
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..0470e3f02
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..aadd04af6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..72128fe69
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
new file mode 100644
index 000000000..87892840e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..7b2a480a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..08ae54533
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..228b2a982
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..d271d8e03
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
deleted file mode 100644
index b219038b2..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:orientation="horizontal"
-    android:showDividers="end" >
-
-    <include layout="@layout/actionbar_include_done_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
deleted file mode 100644
index e9047e759..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:dividerPadding="12dp"
-    android:orientation="horizontal"
-    android:showDividers="middle">
-
-    <include layout="@layout/actionbar_include_cancel_button" />
-
-    <include layout="@layout/actionbar_include_done_button" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
deleted file mode 100644
index ec27e394a..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_cancel"
-    style="@style/Widget.AppCompat.ActionButton"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="1">
-
-    <!--
-        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
-        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
-    -->
-    <TextView
-        android:id="@+id/actionbar_cancel_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_action_cancel"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:paddingRight="20dp"
-        android:filterTouchesWhenObscured="true"
-        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
-        android:text="Cancel (set in-code!)" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
deleted file mode 100644
index 2590f272c..000000000
--- a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-      Copyright 2013 The Android Open Source Project
-
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/actionbar_done"
-    style="@style/Widget.AppCompat.ActionButton"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="1">
-
-    <!--
-        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
-        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
-    -->
-    <TextView
-        android:id="@+id/actionbar_done_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_action_done"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical"
-        android:paddingRight="20dp"
-        android:filterTouchesWhenObscured="true"
-        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
-        android:text="Done (set in-code!)" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index 13cf7c225..d6165c1e0 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -17,7 +17,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
-                android:src="@drawable/ic_action_expand"/>
+                android:src="@drawable/ic_expand_more_black_24dp"/>
 
         <TextView
                 android:id="@+id/foldableText"
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml
new file mode 100644
index 000000000..5eb50da07
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle">
+
+    <include layout="@layout/full_screen_dialog_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
new file mode 100644
index 000000000..b1d5efe76
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml
@@ -0,0 +1,12 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="middle">
+
+    <include layout="@layout/full_screen_dialog_2_cancel_button" />
+
+    <include layout="@layout/full_screen_dialog_2_done_button" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
new file mode 100644
index 000000000..7c2c2a62d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
@@ -0,0 +1,27 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_cancel"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/actionbar_cancel_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_close_white_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:filterTouchesWhenObscured="true"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:text="Cancel (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
new file mode 100644
index 000000000..cd24a1e6d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
@@ -0,0 +1,27 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbar_done"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/actionbar_done_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawableLeft="@drawable/ic_check_white_24dp"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
+        android:paddingRight="20dp"
+        android:filterTouchesWhenObscured="true"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:text="Done (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
new file mode 100644
index 000000000..49018fee1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml
@@ -0,0 +1,25 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/full_screen_dialog_done"
+    style="@style/Widget.AppCompat.ActionButton"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <!--
+        android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
+        https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
+    -->
+    <TextView
+        android:id="@+id/full_screen_dialog_done_text"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center_vertical"
+        android:paddingRight="16dp"
+        android:paddingEnd="16dp"
+        style="@style/Widget.AppCompat.Light.ActionBar.TabText"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:filterTouchesWhenObscured="true"
+        android:text="Done (set in-code!)" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml
new file mode 100644
index 000000000..ed375094f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml
@@ -0,0 +1,10 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:dividerPadding="12dp"
+    android:orientation="horizontal"
+    android:showDividers="end" >
+
+    <include layout="@layout/full_screen_dialog_2_done_button" />
+
+</LinearLayout>
\ 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 95e224672..459bdf99c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="title_preferences">"Settings"</string>
     <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string>
     <string name="title_api_registered_apps">"Apps"</string>
-    <string name="title_key_server_preference">"Keyserver Preference"</string>
+    <string name="title_key_server_preference">"Keyservers"</string>
     <string name="title_change_passphrase">"Change Passphrase"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 602c85247..deab168d3 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -18,7 +18,7 @@
         <!-- Background for the actions section (e.g. voice, submit) -->
         <!--<item name="submitBackground">...</item>-->
         <!-- Close button icon -->
-        <!--<item name="closeIcon">...</item>-->
+        <item name="closeIcon">@drawable/ic_close_white_24dp</item>
         <!-- Search button icon -->
         <!--<item name="searchIcon">...</item>-->
         <!-- Go/commit button icon -->
-- 
cgit v1.2.3


From e049895b9f8f5f9996ac678acf6810768e859695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 26 Jan 2015 15:24:42 +0100
Subject: Material Design Drawer

---
 .../src/main/res/drawable-hdpi/ic_apps_black_24dp.png   | Bin 0 -> 182 bytes
 .../main/res/drawable-hdpi/ic_lock_open_black_24dp.png  | Bin 0 -> 393 bytes
 .../res/drawable-hdpi/ic_lock_outline_black_24dp.png    | Bin 0 -> 398 bytes
 .../main/res/drawable-hdpi/ic_settings_black_24dp.png   | Bin 0 -> 561 bytes
 .../main/res/drawable-hdpi/ic_vpn_key_black_24dp.png    | Bin 0 -> 381 bytes
 .../src/main/res/drawable-mdpi/ic_apps_black_24dp.png   | Bin 0 -> 173 bytes
 .../main/res/drawable-mdpi/ic_lock_open_black_24dp.png  | Bin 0 -> 295 bytes
 .../res/drawable-mdpi/ic_lock_outline_black_24dp.png    | Bin 0 -> 294 bytes
 .../main/res/drawable-mdpi/ic_settings_black_24dp.png   | Bin 0 -> 416 bytes
 .../main/res/drawable-mdpi/ic_vpn_key_black_24dp.png    | Bin 0 -> 293 bytes
 .../src/main/res/drawable-xhdpi/ic_apps_black_24dp.png  | Bin 0 -> 193 bytes
 .../main/res/drawable-xhdpi/ic_lock_open_black_24dp.png | Bin 0 -> 450 bytes
 .../res/drawable-xhdpi/ic_lock_outline_black_24dp.png   | Bin 0 -> 484 bytes
 .../main/res/drawable-xhdpi/ic_settings_black_24dp.png  | Bin 0 -> 691 bytes
 .../main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png   | Bin 0 -> 446 bytes
 .../src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png | Bin 0 -> 213 bytes
 .../res/drawable-xxhdpi/ic_lock_open_black_24dp.png     | Bin 0 -> 615 bytes
 .../res/drawable-xxhdpi/ic_lock_outline_black_24dp.png  | Bin 0 -> 675 bytes
 .../main/res/drawable-xxhdpi/ic_settings_black_24dp.png | Bin 0 -> 969 bytes
 .../main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png  | Bin 0 -> 622 bytes
 .../main/res/drawable-xxxhdpi/ic_apps_black_24dp.png    | Bin 0 -> 236 bytes
 .../res/drawable-xxxhdpi/ic_lock_open_black_24dp.png    | Bin 0 -> 881 bytes
 .../res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png | Bin 0 -> 883 bytes
 .../res/drawable-xxxhdpi/ic_settings_black_24dp.png     | Bin 0 -> 1257 bytes
 .../main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png | Bin 0 -> 789 bytes
 OpenKeychain/src/main/res/drawable/mat2.jpg             | Bin 0 -> 11737 bytes
 OpenKeychain/src/main/res/values/themes.xml             |   5 +++++
 27 files changed, 5 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable/mat2.jpg

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png
new file mode 100644
index 000000000..37931a0ad
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
new file mode 100644
index 000000000..8ac075245
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
new file mode 100644
index 000000000..fc019db72
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..b16209fc1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png
new file mode 100644
index 000000000..c900b8ec7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png
new file mode 100644
index 000000000..5b1fd7766
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
new file mode 100644
index 000000000..9e6d0f0ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
new file mode 100644
index 000000000..1df91994c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..3405c951d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png
new file mode 100644
index 000000000..5e8781731
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png
new file mode 100644
index 000000000..c8187799b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
new file mode 100644
index 000000000..9cd050100
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
new file mode 100644
index 000000000..ae48a3bf7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..2b775b646
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png
new file mode 100644
index 000000000..ccbdce4ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png
new file mode 100644
index 000000000..626543b47
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
new file mode 100644
index 000000000..529a7724b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
new file mode 100644
index 000000000..cf149aa37
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..47f0e0d82
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png
new file mode 100644
index 000000000..736bde37a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png
new file mode 100644
index 000000000..d12d2e796
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
new file mode 100644
index 000000000..a0fe0156f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
new file mode 100644
index 000000000..7460e0894
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..bce161d00
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png
new file mode 100644
index 000000000..3451d9855
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable/mat2.jpg b/OpenKeychain/src/main/res/drawable/mat2.jpg
new file mode 100644
index 000000000..e35902ec7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/mat2.jpg differ
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index deab168d3..5b9e43c3a 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -9,6 +9,11 @@
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
+        <item name="colorAccent">@color/accent</item>
+
+        <!-- Navigation Drawer library -->
+        <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
+        <item name="multipaneSupport">true</item>
     </style>
 
     <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
-- 
cgit v1.2.3


From 2bb7c3bcef695519c58d33253b74393caf7f14a0 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 25 Jan 2015 15:25:49 +0100
Subject: move last parts of import logic from kis into operation

---
 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 459bdf99c..b63ccec2d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1021,6 +1021,7 @@
     <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string>
     <string name="msg_import_merge">"Merging retrieved data"</string>
     <string name="msg_import_error">"Import operation failed!"</string>
+    <string name="msg_import_error_io">"Import operation failed due to i/o error!"</string>
     <string name="msg_import_partial">"Import operation successful, with errors!"</string>
     <string name="msg_import_success">"Import operation successful!"</string>
 
-- 
cgit v1.2.3


From 6c80025ead59b558ebb2d6a9f802ef046e673388 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 27 Jan 2015 09:17:23 +0100
Subject: backend support for charset in ascii-armored streams

---
 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 b63ccec2d..a51420ba1 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -923,6 +923,7 @@
     <string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string>
     <string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string>
     <string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string>
+    <string name="msg_dc_charset">"Found charset header: '%s'"</string>
     <string name="msg_dc_clear_data">"Processing literal data"</string>
     <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string>
     <string name="msg_dc_clear_meta_file">"Filename: %s"</string>
-- 
cgit v1.2.3


From fd29d27e61e531378f0c37c78028fb2e86989dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 27 Jan 2015 09:37:07 +0100
Subject: Temporary nav drawer fixes

---
 OpenKeychain/src/main/res/drawable/mat2.jpg        | Bin 11737 -> 0 bytes
 OpenKeychain/src/main/res/layout/custom_drawer.xml |  16 ++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |   1 +
 OpenKeychain/src/main/res/values/themes.xml        |  12 ++++++++++--
 4 files changed, 27 insertions(+), 2 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable/mat2.jpg
 create mode 100644 OpenKeychain/src/main/res/layout/custom_drawer.xml

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

diff --git a/OpenKeychain/src/main/res/drawable/mat2.jpg b/OpenKeychain/src/main/res/drawable/mat2.jpg
deleted file mode 100644
index e35902ec7..000000000
Binary files a/OpenKeychain/src/main/res/drawable/mat2.jpg and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/custom_drawer.xml b/OpenKeychain/src/main/res/layout/custom_drawer.xml
new file mode 100644
index 000000000..021226ba3
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/custom_drawer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="@color/colorPrimary">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/app_name"
+        android:textColor="@color/white"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>
\ 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 459bdf99c..6c4ba7b08 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="title_create_key">"Create Key"</string>
     <string name="title_exchange_keys">"Exchange Keys"</string>
     <string name="title_advanced_key_info">"Advanced Key Info"</string>
+    <string name="title_keys">"Keys"</string>
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 5b9e43c3a..3b7d66963 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -12,8 +12,16 @@
         <item name="colorAccent">@color/accent</item>
 
         <!-- Navigation Drawer library -->
-        <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
-        <item name="multipaneSupport">true</item>
+        <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</item>
+        <item name="drawerColor">#fafafa</item>
+        <item name="singleAccount">false</item>
+        <item name="sectionStyle">@style/MaterialSectionTheme.Light</item>
+        <item name="subheaderStyle">@style/MaterialSubheaderTheme.Light</item>
+        <item name="multipaneSupport">false</item>
+        <item name="rippleBackport">false</item>
+        <item name="uniqueToolbarColor">false</item>
     </style>
 
     <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html -->
-- 
cgit v1.2.3


From 81d4d31fd746db2d7707fb8bffb52406f431bef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 28 Jan 2015 18:11:08 +0100
Subject: Cloud search icon

---
 .../src/main/res/drawable-hdpi/ic_cloud_search_24px.png  | Bin 0 -> 1025 bytes
 .../src/main/res/drawable-mdpi/ic_cloud_search_24px.png  | Bin 0 -> 712 bytes
 .../src/main/res/drawable-xhdpi/ic_cloud_search_24px.png | Bin 0 -> 1428 bytes
 .../main/res/drawable-xxhdpi/ic_cloud_search_24px.png    | Bin 0 -> 2128 bytes
 OpenKeychain/src/main/res/menu/key_list.xml              |   3 +--
 5 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..6f9b343ad
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..7a69993fd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..1f0db264a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..852cdc2a6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index f61172a0a..8a682badc 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -11,13 +11,12 @@
 
     <item
         android:id="@+id/menu_key_list_search_cloud"
-        android:icon="@drawable/ic_action_search_cloud"
+        android:icon="@drawable/ic_cloud_search_24px"
         android:title="@string/menu_search_cloud"
         app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_add"
-        android:icon="@drawable/ic_action_qr_code"
         android:title="@string/import_qr_code_button"
         app:showAsAction="ifRoom|withText" />
 
-- 
cgit v1.2.3


From 43930ed8f2d890585b5b85cd963d4f564cdb736f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 10:10:07 +0100
Subject: Move key list logic into fragment, UI fixes for nav drawer

---
 .../main/res/drawable-hdpi/ic_help_black_24dp.png  | Bin 0 -> 559 bytes
 .../main/res/drawable-mdpi/ic_help_black_24dp.png  | Bin 0 -> 390 bytes
 .../main/res/drawable-xhdpi/ic_help_black_24dp.png | Bin 0 -> 700 bytes
 .../res/drawable-xxhdpi/ic_help_black_24dp.png     | Bin 0 -> 986 bytes
 .../res/drawable-xxxhdpi/ic_help_black_24dp.png    | Bin 0 -> 1323 bytes
 .../res/layout-large/api_apps_list_activity.xml    |  18 ----------------
 .../src/main/res/layout/api_apps_list_activity.xml |  11 ----------
 .../src/main/res/layout/api_apps_list_content.xml  |  24 ---------------------
 .../src/main/res/menu/api_account_settings.xml     |   4 ----
 9 files changed, 57 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/api_apps_list_content.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..05be749c3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f3743dc20
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..87095ef26
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f32d7e708
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..a4286b54c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
deleted file mode 100644
index af06614b9..000000000
--- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/api_apps_list_content" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
deleted file mode 100644
index df187e0a5..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <include layout="@layout/api_apps_list_content"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
deleted file mode 100644
index e1922079c..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
+++ /dev/null
@@ -1,24 +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">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <FrameLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <fragment
-            android:id="@+id/crypto_consumers_list_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/api_account_settings.xml b/OpenKeychain/src/main/res/menu/api_account_settings.xml
index d08fc7f42..713345ffc 100644
--- a/OpenKeychain/src/main/res/menu/api_account_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_account_settings.xml
@@ -6,9 +6,5 @@
         android:id="@+id/menu_account_settings_delete"
         android:title="@string/api_settings_delete_account"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/menu_account_settings_cancel"
-        android:title="@string/api_settings_cancel"
-        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 03a01dc7aec21e8502b1be9c0c5f00b73177125f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 11:03:19 +0100
Subject: White popup theme

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

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

diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 3b7d66963..1b6eebb6a 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -3,18 +3,22 @@
 
     <style name="KeychainTheme" parent="KeychainTheme.Base" />
 
-    <style name="KeychainTheme.Base" parent="HoloKeychainTheme">
+    <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
+    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorAccent">@color/accent</item>
+
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
-        <item name="colorAccent">@color/accent</item>
 
         <!-- Navigation Drawer library -->
         <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
+        <!-- dark action bar... -->
         <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
-        <item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</item>
+        <!-- ...but light popup menu (white background) -->
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="drawerColor">#fafafa</item>
         <item name="singleAccount">false</item>
         <item name="sectionStyle">@style/MaterialSectionTheme.Light</item>
-- 
cgit v1.2.3


From c4ef86b38a5c8b98e5ee2934e0a0c1184f2baf07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 12:03:00 +0100
Subject: Refactor DecryptActivity into DecryptOverviewFragment for nav drawer

---
 .../src/main/res/layout-large/decrypt_activity.xml |   2 +-
 .../src/main/res/layout/decrypt_activity.xml       |   2 +-
 .../src/main/res/layout/decrypt_content.xml        | 117 ---------------------
 .../main/res/layout/decrypt_overview_fragment.xml  |  96 +++++++++++++++++
 4 files changed, 98 insertions(+), 119 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_content.xml
 create mode 100644 OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
index 06487a982..97456301a 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
@@ -13,6 +13,6 @@
 
     </android.support.v4.widget.FixedDrawerLayout>
 
-    <include layout="@layout/decrypt_content" />
+    <include layout="@layout/decrypt_overview_fragment" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
index bb0e463b3..d2d2e75fe 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/decrypt_content"/>
+    <include layout="@layout/decrypt_overview_fragment"/>
 
     <include layout="@layout/drawer_list" />
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml
deleted file mode 100644
index 8944c821f..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_content.xml
+++ /dev/null
@@ -1,117 +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">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/notify_area" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="4dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/section_decrypt_files" />
-
-
-            <TextView
-                android:id="@+id/decrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:clickable="true"
-                style="@style/SelectableItem"
-                android:text="@string/btn_decrypt_files"
-                android:drawableRight="@drawable/ic_action_collection"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_marginBottom="8dp" />
-
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:text="@string/section_decrypt_text" />
-
-            <LinearLayout
-                android:id="@+id/decrypt_from_clipboard"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/listPreferredItemHeight"
-                android:clickable="true"
-                android:paddingRight="4dp"
-                style="@style/SelectableItem"
-                android:orientation="horizontal">
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:paddingRight="4dp"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:paddingLeft="8dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/btn_decrypt_clipboard" />
-
-                    <TextView
-                        android:paddingLeft="8dp"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="@color/tertiary_text_light"
-                        android:text="@string/btn_decrypt_and_verify"
-                        android:gravity="center_vertical" />
-
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/clipboard_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:padding="8dp"
-                    android:src="@drawable/ic_action_paste"
-                    android:layout_gravity="center_vertical" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_marginBottom="8dp" />
-
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
new file mode 100644
index 000000000..c3e31bf11
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingTop="4dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/section_decrypt_files" />
+
+    <TextView
+        android:id="@+id/decrypt_files"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_decrypt_files"
+        android:drawableRight="@drawable/ic_action_collection"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_marginBottom="8dp" />
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/section_decrypt_text" />
+
+    <LinearLayout
+        android:id="@+id/decrypt_from_clipboard"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        android:paddingRight="4dp"
+        style="@style/SelectableItem"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingRight="4dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_decrypt_clipboard" />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/tertiary_text_light"
+                android:text="@string/btn_decrypt_and_verify"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/clipboard_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:src="@drawable/ic_action_paste"
+            android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_marginBottom="8dp" />
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 6a7d33260625ee566ac8a4cc555239226c4bb521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 13:24:08 +0100
Subject: Fix item layout in apps list

---
 .../main/res/layout/api_apps_adapter_list_item.xml   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index b67da13a6..c4ea46d43 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -13,16 +13,6 @@
         android:layout_centerVertical="true"
         android:src="@drawable/ic_launcher" />
 
-    <TextView
-        android:id="@+id/api_apps_adapter_item_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:text="Application Name"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/api_apps_adapter_item_icon" />
-
     <ImageView
         android:id="@+id/api_apps_adapter_install_icon"
         android:layout_width="wrap_content"
@@ -33,5 +23,15 @@
         android:layout_alignParentEnd="true"
         android:padding="8dp" />
 
+    <TextView
+        android:id="@+id/api_apps_adapter_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:text="Application Name"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@+id/api_apps_adapter_install_icon"
+        android:layout_toRightOf="@+id/api_apps_adapter_item_icon" />
 
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 34b01e9f2b07eef512e5fb453891f7233a685ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 13:36:38 +0100
Subject: Remove files related to old nav drawer

---
 .../src/main/res/layout-large/decrypt_activity.xml | 18 ------------
 .../res/layout-large/encrypt_files_activity.xml    | 17 -----------
 .../res/layout-large/encrypt_text_activity.xml     | 17 -----------
 .../main/res/layout-large/key_list_activity.xml    | 18 ------------
 OpenKeychain/src/main/res/layout/custom_drawer.xml | 16 ----------
 .../src/main/res/layout/decrypt_activity.xml       | 11 -------
 .../src/main/res/layout/drawer_custom_header.xml   | 16 ++++++++++
 OpenKeychain/src/main/res/layout/drawer_list.xml   | 18 ------------
 .../src/main/res/layout/drawer_list_item.xml       | 31 --------------------
 .../src/main/res/layout/encrypt_files_activity.xml | 34 +++++++++++++++++-----
 .../src/main/res/layout/encrypt_files_content.xml  | 33 ---------------------
 .../src/main/res/layout/encrypt_text_activity.xml  | 34 +++++++++++++++++-----
 .../src/main/res/layout/encrypt_text_content.xml   | 33 ---------------------
 .../src/main/res/layout/key_list_activity.xml      | 11 -------
 .../src/main/res/layout/key_list_content.xml       |  1 -
 OpenKeychain/src/main/res/values-large/dimens.xml  |  1 -
 OpenKeychain/src/main/res/values/dimens.xml        |  2 --
 17 files changed, 68 insertions(+), 243 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout-large/key_list_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/custom_drawer.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/drawer_custom_header.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/drawer_list.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/drawer_list_item.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_files_content.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_text_content.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/key_list_activity.xml

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

diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
deleted file mode 100644
index 97456301a..000000000
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/decrypt_overview_fragment" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
deleted file mode 100644
index 4b277c331..000000000
--- a/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/encrypt_files_content" />
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
deleted file mode 100644
index 5cf838c46..000000000
--- a/OpenKeychain/src/main/res/layout-large/encrypt_text_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/encrypt_text_content" />
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
deleted file mode 100644
index 039081cd7..000000000
--- a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/key_list_content" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/custom_drawer.xml b/OpenKeychain/src/main/res/layout/custom_drawer.xml
deleted file mode 100644
index 021226ba3..000000000
--- a/OpenKeychain/src/main/res/layout/custom_drawer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:background="@color/colorPrimary">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/app_name"
-        android:textColor="@color/white"
-        android:layout_gravity="center_horizontal" />
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml
deleted file mode 100644
index d2d2e75fe..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/decrypt_overview_fragment"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
new file mode 100644
index 000000000..021226ba3
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="@color/colorPrimary">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/app_name"
+        android:textColor="@color/white"
+        android:layout_gravity="center_horizontal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/drawer_list.xml b/OpenKeychain/src/main/res/layout/drawer_list.xml
deleted file mode 100644
index ab00c0073..000000000
--- a/OpenKeychain/src/main/res/layout/drawer_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-         android:layout_gravity="start" tells DrawerLayout to treat
-         this as a sliding drawer on the left side for left-to-right
-         languages and on the right side for right-to-left languages.
-         The drawer is given a fixed width in dp and extends the full height of
-         the container. A solid background is used for contrast
-         with the content view.
--->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/left_drawer"
-    android:layout_width="@dimen/drawer_size"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    android:background="@color/white"
-    android:choiceMode="singleChoice"
-    android:divider="@color/bg_gray"
-    android:dividerHeight="1dp" />
diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml
deleted file mode 100644
index 4719483da..000000000
--- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/drawer_item_icon"
-        android:gravity="center_vertical"
-        android:layout_width="30dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true" />
-
-    <TextView
-        android:id="@+id/drawer_item_text"
-        android:text="Test"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:layout_marginLeft="8dp"
-        android:paddingBottom="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="16dp"
-        android:textAppearance="@android:style/TextAppearance.Medium"
-        android:textColor="#111"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@id/drawer_item_icon"/>
-
-</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index cdcf4fa43..401b1c36e 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.EncryptFileActivity">
+        android:orientation="vertical">
+
+        <include layout="@layout/notify_area" />
 
-    <include layout="@layout/encrypt_files_content"/>
+        <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
 
-    <include layout="@layout/drawer_list" />
+        <fragment
+            android:id="@+id/encrypt_file_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
deleted file mode 100644
index 61c7e69c9..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
+++ /dev/null
@@ -1,33 +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">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/notify_area" />
-
-        <FrameLayout
-            android:id="@+id/encrypt_pager_mode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-
-        <fragment
-            android:id="@+id/encrypt_file_fragment"
-            android:name="org.sufficientlysecure.keychain.ui.EncryptFilesFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 5d5e16131..0459fa3d7 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar"
+        android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.EncryptTextActivity">
+        android:orientation="vertical">
+
+        <include layout="@layout/notify_area" />
 
-    <include layout="@layout/encrypt_text_content"/>
+        <FrameLayout
+            android:id="@+id/encrypt_pager_mode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
 
-    <include layout="@layout/drawer_list" />
+        <fragment
+            android:id="@+id/encrypt_text_fragment"
+            android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
deleted file mode 100644
index 31ebef798..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml
+++ /dev/null
@@ -1,33 +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">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/notify_area" />
-
-        <FrameLayout
-            android:id="@+id/encrypt_pager_mode"
-            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"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml
deleted file mode 100644
index 03ef85381..000000000
--- a/OpenKeychain/src/main/res/layout/key_list_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/key_list_content" />
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index 7179793b5..293c45e1c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -17,7 +17,6 @@
 
         <LinearLayout
             android:id="@+id/content_frame"
-            android:layout_marginLeft="@dimen/drawer_content_padding"
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml
index 192a4bb99..045e125f3 100644
--- a/OpenKeychain/src/main/res/values-large/dimens.xml
+++ b/OpenKeychain/src/main/res/values-large/dimens.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="drawer_content_padding">240dp</dimen>
 </resources>
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index e1a7749f0..55344e519 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="drawer_size">240dp</dimen>
-    <dimen name="drawer_content_padding">0dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e0369a2f14864cc16bb46488cd25df294bec91c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 17:02:01 +0100
Subject: Header image tryout

---
 OpenKeychain/src/main/res/drawable/drawer_header.png | Bin 0 -> 47409 bytes
 OpenKeychain/src/main/res/values/colors.xml          |   3 +--
 OpenKeychain/src/main/res/values/themes.xml          |   2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/drawer_header.png

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

diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
new file mode 100644
index 000000000..614098bd7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 353e33058..fbbb89ed1 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -19,13 +19,12 @@
     <color name="primary">#4CAF50</color>
     <color name="primary_dark">#388E3C</color>
     <color name="primary_light">#C8E6C9</color>
-    <color name="accent">#536DFE</color>
+    <color name="accent">#00BCD4</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
 
-
     <!-- set to text colors -->
     <color name="emphasis">#212121</color>
     <color name="emphasis_dark">#727272</color>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 1b6eebb6a..075f538e6 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -14,7 +14,7 @@
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
 
         <!-- Navigation Drawer library -->
-        <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item>
+        <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
         <!-- dark action bar... -->
         <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <!-- ...but light popup menu (white background) -->
-- 
cgit v1.2.3


From 38f7950d90c49ff27dcf2afb651337c2f4f2b663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 29 Jan 2015 21:00:58 +0100
Subject: Saving of allowed keys

---
 .../src/main/res/layout/api_app_settings_activity.xml        | 12 ++++++++++++
 OpenKeychain/src/main/res/values/strings.xml                 |  1 +
 2 files changed, 13 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 800e2eb87..63fc060f4 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -33,6 +33,18 @@
                     android:layout_height="wrap_content"
                     tools:layout="@layout/api_app_settings_fragment" />
 
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/api_settings_allowed_keys" />
+
+                <FrameLayout
+                    android:id="@+id/api_allowed_keys_list_fragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical" />
+
                 <TextView
                     style="@style/SectionHeader"
                     android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 1151644d8..97054076c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -489,6 +489,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"</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>
     <string name="api_settings_accounts_empty">"No accounts attached to this app."</string>
-- 
cgit v1.2.3


From e651a392795caa395b060946b0cfaca5a5b41ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 30 Jan 2015 10:59:57 +0100
Subject: Rename app setting classes for consistency

---
 OpenKeychain/src/main/res/layout/api_app_settings_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/api_remote_register_app.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 63fc060f4..3da0d4e7d 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -28,7 +28,7 @@
 
                 <fragment
                     android:id="@+id/api_app_settings_fragment"
-                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:layout="@layout/api_app_settings_fragment" />
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 19981f59e..300fde420 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -30,7 +30,7 @@
 
             <fragment
                 android:id="@+id/api_app_settings_fragment"
-                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment"
+                android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:layout="@layout/api_app_settings_fragment" />
-- 
cgit v1.2.3


From 5466d1e9802815726d713bca2aeabaff2861519c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 31 Jan 2015 18:26:20 +0100
Subject: prevent recursive consolidate

---
 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 1151644d8..794de34f0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -886,6 +886,7 @@
     <string name="msg_con_error_public">"Error reimporting public keys!"</string>
     <string name="msg_con_error_secret">"Error reimporting secret keys!"</string>
     <string name="msg_con_recover">"Resuming consolidation process"</string>
+    <string name="msg_con_recursive">"Skipping recursive consolidation"</string>
     <string name="msg_con_recover_unknown">"Resuming consolidation process from unknown state"</string>
     <plurals name="msg_con_reimport_public">
         <item quantity="one">"Reimporting one public key"</item>
-- 
cgit v1.2.3


From 7b24ee7b55db99467dd63e631ba55a27d08587d5 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 1 Feb 2015 23:14:26 +0100
Subject: rewrite PgpSignEncrypt data flow

- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
---
 OpenKeychain/src/main/res/values/strings.xml | 60 +++++++++++++++++-----------
 1 file changed, 37 insertions(+), 23 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 ea2e02e1c..2fd74f5a4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -963,29 +963,43 @@
     <string name="msg_dc_unlocking">"Unlocking secret key"</string>
 
     <!-- Messages for SignEncrypt operation -->
-    <string name="msg_se_asymmetric">"Preparing public keys for encryption"</string>
-    <string name="msg_se_clearsign_only">"Signing of cleartext input not supported!"</string>
-    <string name="msg_se_compressing">"Preparing compression"</string>
-    <string name="msg_se_encrypting">"Encrypting data"</string>
-    <string name="msg_se_error_bad_passphrase">"Bad passphrase!"</string>
-    <string name="msg_se_error_io">"Encountered IO Exception during operation!"</string>
-    <string name="msg_se_error_key_sign">"Selected signing key cannot sign data!"</string>
-    <string name="msg_se_error_sign_key">"Error fetching signing key!"</string>
-    <string name="msg_se_error_nfc">"NFC data error!"</string>
-    <string name="msg_se_error_no_passphrase">"No passphrase provided!"</string>
-    <string name="msg_se_error_pgp">"Internal OpenPGP error!"</string>
-    <string name="msg_se_error_sig">"Encountered OpenPGP signature exception!"</string>
-    <string name="msg_se_error_unlock">"Unknown error unlocking key!"</string>
-    <string name="msg_se_key_ok">"Encrypting for key: %s"</string>
-    <string name="msg_se_key_unknown">"Missing key for encryption: %s"</string>
-    <string name="msg_se_key_warn">"Bad key for encryption: %s"</string>
-    <string name="msg_se_ok">"Sign/Encrypt operation successful!"</string>
-    <string name="msg_se_pending_nfc">"NFC token required, requesting user input…"</string>
-    <string name="msg_se_pending_passphrase">"Passphrase required, requesting user input…"</string>
-    <string name="msg_se_signing">"Signing data (without encryption)"</string>
-    <string name="msg_se_sigcrypting">"Encrypting data with signature"</string>
-    <string name="msg_se">"Starting sign and/or encrypt operation"</string>
-    <string name="msg_se_symmetric">"Preparing symmetric encryption"</string>
+    <string name="msg_se">"Starting sign/encrypt operation"</string>
+    <string name="msg_se_input_bytes">"Processing input from byte array"</string>
+    <string name="msg_se_input_uri">"Processing input from uri"</string>
+    <string name="msg_se_error_no_input">"No input given!"</string>
+    <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 -->
+    <string name="msg_pse_asymmetric">"Preparing public keys for encryption"</string>
+    <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_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_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>
+    <string name="msg_pse_key_ok">"Encrypting for key: %s"</string>
+    <string name="msg_pse_key_unknown">"Missing key for encryption: %s"</string>
+    <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_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>
+    <string name="msg_pse_sigcrypting">"Encrypting data with signature"</string>
+    <string name="msg_pse">"Starting sign and/or encrypt operation"</string>
+    <string name="msg_pse_symmetric">"Preparing symmetric encryption"</string>
 
     <string name="msg_crt_certifying">"Generating certifications"</string>
     <string name="msg_crt_certify_all">"Certifying all user IDs for key %s"</string>
-- 
cgit v1.2.3


From 95e534e1f5c8494d745b6fec016b21b754fa108e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Feb 2015 17:19:27 +0100
Subject: UI experiments for app settings

---
 .../main/res/layout/api_app_settings_activity.xml  | 16 +++----
 .../main/res/layout/api_app_settings_fragment.xml  | 12 +++--
 .../src/main/res/layout/foldable_linearlayout.xml  | 52 +++++++++++-----------
 3 files changed, 41 insertions(+), 39 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 3da0d4e7d..ac579d006 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -9,12 +10,16 @@
 
     <LinearLayout
         android:layout_below="@id/toolbar"
-        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/notify_area" />
+        <fragment
+            android:id="@+id/api_app_settings_fragment"
+            android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/api_app_settings_fragment" />
 
         <ScrollView
             android:layout_width="match_parent"
@@ -26,13 +31,6 @@
                 android:padding="16dp"
                 android:orientation="vertical">
 
-                <fragment
-                    android:id="@+id/api_app_settings_fragment"
-                    android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    tools:layout="@layout/api_app_settings_fragment" />
-
                 <TextView
                     style="@style/SectionHeader"
                     android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
index c5477adba..ed3e33aab 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/colorPrimaryDark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
+        android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:orientation="horizontal">
 
@@ -17,7 +16,6 @@
             android:id="@+id/api_app_settings_app_icon"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
             android:src="@drawable/ic_launcher" />
@@ -31,12 +29,14 @@
             android:gravity="center_vertical"
             android:orientation="vertical"
             android:text="Name (set in-code)"
+            android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </RelativeLayout>
 
     <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:textColor="@color/icons"
         custom:foldedLabel="@string/api_settings_show_info"
         custom:unFoldedLabel="@string/api_settings_hide_info">
 
@@ -44,6 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/api_settings_package_name"
+            android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
@@ -51,12 +52,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="com.example"
+            android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/api_settings_package_signature"
+            android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
@@ -64,6 +67,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Base64 encoded hash of signature"
+            android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index d6165c1e0..cddc98ac5 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <LinearLayout
-            android:id="@+id/foldableControl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:clickable="true">
+        android:id="@+id/foldableControl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:clickable="true">
 
         <ImageView
-                android:id="@+id/foldableIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:src="@drawable/ic_expand_more_black_24dp"/>
+            android:id="@+id/foldableIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="10dp"
+            android:src="@drawable/ic_expand_more_black_24dp" />
 
         <TextView
-                android:id="@+id/foldableText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/none"
-                android:layout_gravity="center_vertical"
-                android:textColor="@color/emphasis"/>
+            android:id="@+id/foldableText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/none"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/emphasis" />
     </LinearLayout>
 
     <LinearLayout
-            android:id="@+id/foldableContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:visibility="gone"/>
+        android:id="@+id/foldableContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From e2a8819385dab5c925cbc25f728a6491fea185e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 14:28:54 +0100
Subject: Floating Action Button added in app settings

---
 .../res/drawable-hdpi/ic_play_arrow_white_24dp.png | Bin 0 -> 282 bytes
 .../res/drawable-mdpi/ic_play_arrow_white_24dp.png | Bin 0 -> 257 bytes
 .../drawable-xhdpi/ic_play_arrow_white_24dp.png    | Bin 0 -> 318 bytes
 .../drawable-xxhdpi/ic_play_arrow_white_24dp.png   | Bin 0 -> 399 bytes
 .../drawable-xxxhdpi/ic_play_arrow_white_24dp.png  | Bin 0 -> 477 bytes
 .../src/main/res/drawable/drawer_header.png        | Bin 47409 -> 47902 bytes
 .../res/layout/api_account_settings_activity.xml   |   2 +-
 .../main/res/layout/api_app_settings_activity.xml  | 111 +++++++++++++++++++--
 .../main/res/layout/api_remote_create_account.xml  |   2 +-
 .../main/res/layout/api_remote_error_message.xml   |   2 +-
 .../main/res/layout/api_remote_register_app.xml    |   2 +-
 .../main/res/layout/api_remote_select_pub_keys.xml |   2 +-
 .../src/main/res/layout/certify_key_activity.xml   |   2 +-
 .../src/main/res/layout/create_key_activity.xml    |   2 +-
 .../src/main/res/layout/decrypt_files_activity.xml |   2 +-
 .../src/main/res/layout/decrypt_text_activity.xml  |   2 +-
 .../src/main/res/layout/edit_key_activity.xml      |   2 +-
 .../src/main/res/layout/encrypt_files_activity.xml |   2 +-
 .../src/main/res/layout/encrypt_text_activity.xml  |   2 +-
 OpenKeychain/src/main/res/layout/help_activity.xml |   5 +-
 .../src/main/res/layout/import_keys_activity.xml   |   2 +-
 .../src/main/res/layout/key_list_content.xml       |   2 +-
 .../src/main/res/layout/key_server_preference.xml  |   2 +-
 .../src/main/res/layout/log_display_activity.xml   |   2 +-
 OpenKeychain/src/main/res/layout/nfc_activity.xml  |   2 +-
 .../res/layout/preference_toolbar_activity.xml     |   2 +-
 .../src/main/res/layout/qr_code_activity.xml       |   2 +-
 .../src/main/res/layout/safe_slinger_activity.xml  |   2 +-
 .../main/res/layout/select_public_key_activity.xml |   2 +-
 OpenKeychain/src/main/res/layout/toolbar.xml       |  13 ---
 .../src/main/res/layout/toolbar_standalone.xml     |  13 +++
 .../src/main/res/layout/upload_key_activity.xml    |   2 +-
 .../src/main/res/layout/view_cert_activity.xml     |   2 +-
 .../src/main/res/layout/view_key_activity.xml      |   2 +-
 .../main/res/layout/view_key_advanced_activity.xml |   2 +-
 .../src/main/res/menu/api_app_settings.xml         |   5 +-
 OpenKeychain/src/main/res/values/colors.xml        |   2 +
 37 files changed, 145 insertions(+), 54 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/layout/toolbar.xml
 create mode 100644 OpenKeychain/src/main/res/layout/toolbar_standalone.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..164385d04
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..8d1e433a5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..a55d19922
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..043acd808
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
new file mode 100644
index 000000000..7cc008475
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index 614098bd7..373534722 100644
Binary files a/OpenKeychain/src/main/res/drawable/drawer_header.png and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index 763504f54..b12bfb080 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index ac579d006..cdf450f6e 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -1,26 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+    <RelativeLayout
+        android:id="@+id/toolbar_big"
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:elevation="4dp"
+        android:background="?attr/colorPrimaryDark"
+        android:orientation="horizontal">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimaryDark"
+            android:overScrollMode="always"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="UnusedAttribute"
+            android:transitionGroup="false"
+            android:touchscreenBlocksFocus="false" />
+
+        <LinearLayout
+            android:layout_below="@+id/toolbar"
+            android:paddingLeft="48dp"
+            android:paddingBottom="8dp"
+            android:paddingRight="72dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/api_app_settings_app_icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@drawable/ic_launcher" />
+
+            <TextView
+                android:id="@+id/api_app_settings_app_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Name (set in-code)longlong"
+                android:textColor="@color/icons"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:paddingLeft="8dp"
+                android:layout_gravity="center_vertical" />
+        </LinearLayout>
+    </RelativeLayout>
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:id="@+id/body"
+        android:layout_below="@id/toolbar_big"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <fragment
-            android:id="@+id/api_app_settings_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsHeaderFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@layout/api_app_settings_fragment" />
-
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -55,7 +95,56 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical" />
 
+                <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:textColor="@color/icons"
+                    custom:foldedLabel="@string/api_settings_show_info"
+                    custom:unFoldedLabel="@string/api_settings_hide_info">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/api_settings_package_name"
+                        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                    <TextView
+                        android:id="@+id/api_app_settings_package_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="com.example"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/api_settings_package_signature"
+                        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                    <TextView
+                        android:id="@+id/api_app_settings_package_signature"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Base64 encoded hash of signature"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
+
+    <com.getbase.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_alignBottom="@id/toolbar_big"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="-40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        fab:fab_icon="@drawable/ic_play_arrow_white_24dp"
+        fab:fab_colorNormal="@color/fab"
+        fab:fab_colorPressed="@color/fab_pressed" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
index 7ae0a0e1e..f57ec9ad1 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
index 8483222ad..293443f62 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 300fde420..903a92ea4 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <ScrollView
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index db54e4a44..fa0f73144 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 3a4c343bb..d36e9e141 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 5225d4d77..1d51e3818 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 7cc2b35f3..10dd7b1f9 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index 5098d7ffa..80b8b65fd 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index dfc12f328..a5c93ec77 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 401b1c36e..b8d2c2546 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 0459fa3d7..d5f6f9ee8 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 7d3e1834c..dab3c4f05 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -6,13 +6,14 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:elevation="4dp">
 
         <com.astuetz.PagerSlidingTabStrip
             android:id="@+id/sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 78eaed02d..637ea1e3f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index 293c45e1c..5760d0906 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index 259763e48..d3d1f6e88 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml
index e5457043b..8aa618280 100644
--- a/OpenKeychain/src/main/res/layout/log_display_activity.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 5baaafc69..64e239bc8 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
index a328d15c6..0d608fde2 100644
--- a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -5,6 +5,6 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 79aba346f..fd495608c 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index c986325f1..65d198eda 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <ScrollView
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
index 86b0049c4..e14acc17b 100644
--- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <RelativeLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/toolbar.xml b/OpenKeychain/src/main/res/layout/toolbar.xml
deleted file mode 100644
index 5d83a2aa1..000000000
--- a/OpenKeychain/src/main/res/layout/toolbar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?attr/actionBarSize"
-    android:background="?attr/colorPrimaryDark"
-    android:elevation="4dp"
-    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
new file mode 100644
index 000000000..5d83a2aa1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/actionBarSize"
+    android:background="?attr/colorPrimaryDark"
+    android:elevation="4dp"
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index f4d262f1d..342052bdd 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index b0f40238d..ddc42dd7e 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <ScrollView
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index a2d104694..7084627e8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -6,7 +6,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
index e77e01bc7..991d92ed3 100644
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
@@ -5,7 +5,7 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
+        layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:layout_below="@id/toolbar"
diff --git a/OpenKeychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml
index 1233e4f6e..4b4fc39e8 100644
--- a/OpenKeychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_app_settings.xml
@@ -3,9 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_api_settings_start"
-        android:title="@string/api_settings_start"
-        android:icon="@drawable/ic_action_play"
+        android:id="@+id/menu_api_save"
+        android:title="@string/api_settings_save"
         app:showAsAction="always" />
 
     <item
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index fbbb89ed1..e4dbbc968 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -20,6 +20,8 @@
     <color name="primary_dark">#388E3C</color>
     <color name="primary_light">#C8E6C9</color>
     <color name="accent">#00BCD4</color>
+    <color name="fab">#00BCD4</color>
+    <color name="fab_pressed">#0097A7</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
-- 
cgit v1.2.3


From 7914aa5c08d25306be0def7873fe850514e89cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 16:05:18 +0100
Subject: Toolbar fixes, Toolbar under status bar on Lollipop

---
 .../res/layout/api_account_settings_activity.xml   |  4 +--
 .../main/res/layout/api_app_settings_activity.xml  | 15 +++++++---
 .../main/res/layout/api_remote_create_account.xml  |  7 ++---
 .../main/res/layout/api_remote_error_message.xml   |  9 +++---
 .../main/res/layout/api_remote_register_app.xml    |  7 ++---
 .../main/res/layout/api_remote_select_pub_keys.xml |  5 ++--
 .../src/main/res/layout/certify_key_activity.xml   |  5 ++--
 .../src/main/res/layout/create_key_activity.xml    |  5 ++--
 .../src/main/res/layout/decrypt_files_activity.xml |  4 +--
 .../src/main/res/layout/decrypt_text_activity.xml  |  4 +--
 .../src/main/res/layout/edit_key_activity.xml      |  4 +--
 .../src/main/res/layout/encrypt_files_activity.xml |  4 +--
 .../src/main/res/layout/encrypt_text_activity.xml  |  4 +--
 OpenKeychain/src/main/res/layout/help_activity.xml |  4 +--
 .../src/main/res/layout/import_keys_activity.xml   |  4 +--
 .../src/main/res/layout/key_list_content.xml       |  4 +--
 .../src/main/res/layout/key_server_preference.xml  |  4 +--
 .../src/main/res/layout/log_display_activity.xml   |  4 +--
 OpenKeychain/src/main/res/layout/nfc_activity.xml  |  4 +--
 .../res/layout/preference_toolbar_activity.xml     |  2 +-
 .../src/main/res/layout/qr_code_activity.xml       |  4 +--
 .../src/main/res/layout/safe_slinger_activity.xml  |  4 +--
 .../main/res/layout/select_public_key_activity.xml |  4 +--
 .../src/main/res/layout/toolbar_standalone.xml     | 32 ++++++++++++++++------
 .../src/main/res/layout/upload_key_activity.xml    |  4 +--
 .../src/main/res/layout/view_cert_activity.xml     |  4 +--
 .../src/main/res/layout/view_key_activity.xml      |  4 +--
 .../main/res/layout/view_key_advanced_activity.xml |  4 +--
 OpenKeychain/src/main/res/values-v21/themes.xml    |  2 ++
 OpenKeychain/src/main/res/values/colors.xml        |  8 +++---
 OpenKeychain/src/main/res/values/strings.xml       |  3 +-
 OpenKeychain/src/main/res/values/themes.xml        |  3 +-
 32 files changed, 99 insertions(+), 80 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index b12bfb080..f88225a66 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index cdf450f6e..a59bca59b 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -30,11 +30,10 @@
 
         <LinearLayout
             android:layout_below="@+id/toolbar"
-            android:paddingLeft="48dp"
-            android:paddingBottom="8dp"
-            android:paddingRight="72dp"
+            android:layout_marginLeft="48dp"
+            android:layout_marginRight="72dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/api_app_settings_app_icon"
@@ -84,9 +83,11 @@
                     android:orientation="vertical" />
 
                 <TextView
+                    android:id="@+id/api_accounts_label"
                     style="@style/SectionHeader"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:visibility="gone"
                     android:text="@string/api_settings_accounts" />
 
                 <FrameLayout
@@ -95,6 +96,12 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical" />
 
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/api_settings_advanced" />
+
                 <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
index f57ec9ad1..7863f3c7f 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
index 293443f62..0bcf40407 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml
@@ -4,14 +4,13 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_below="@id/toolbar_include"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <TextView
diff --git a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
index 903a92ea4..7cb3666bf 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <ScrollView
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index fa0f73144..3d3d55f3c 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -4,12 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index d36e9e141..fab8bc2d2 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -4,12 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index 1d51e3818..e8422fb37 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -4,12 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 10dd7b1f9..608fce111 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index 80b8b65fd..b97fc9c8e 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index a5c93ec77..c8b0e3afc 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index b8d2c2546..d292b1a5b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         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 d5f6f9ee8..66abd03b1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index dab3c4f05..6a78aa273 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -5,11 +5,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 637ea1e3f..93d630437 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml
index 5760d0906..bd0239da7 100644
--- a/OpenKeychain/src/main/res/layout/key_list_content.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_content.xml
@@ -4,12 +4,12 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml
index d3d1f6e88..5319a3ec0 100644
--- a/OpenKeychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml
index 8aa618280..a243a9d2b 100644
--- a/OpenKeychain/src/main/res/layout/log_display_activity.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index 64e239bc8..9acd0676c 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
diff --git a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
index 0d608fde2..f17bc30bc 100644
--- a/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
+++ b/OpenKeychain/src/main/res/layout/preference_toolbar_activity.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index fd495608c..11b502b34 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index 65d198eda..c2a5b2f53 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <ScrollView
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
index e14acc17b..5a607e5ec 100644
--- a/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <RelativeLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerHorizontal="true">
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index 5d83a2aa1..ff1f99e03 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/toolbar"
+    android:id="@+id/header"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?attr/actionBarSize"
-    android:background="?attr/colorPrimaryDark"
-    android:elevation="4dp"
-    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/statusBar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/statusMargin"
+        android:background="?attr/colorPrimary" />
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_below="@+id/statusBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        tools:ignore="UnusedAttribute" />
+
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 342052bdd..19e37783b 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index ddc42dd7e..0a6b46a93 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <ScrollView
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 7084627e8..cb6456082 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -5,11 +5,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
index 991d92ed3..c7f0f50d9 100644
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <include
-        android:id="@+id/toolbar"
+        android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
     <LinearLayout
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/toolbar_include"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml
index 7ba601d79..93d534873 100644
--- a/OpenKeychain/src/main/res/values-v21/themes.xml
+++ b/OpenKeychain/src/main/res/values-v21/themes.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <style name="KeychainTheme" parent="KeychainTheme.Base">
+        <item name="android:windowTranslucentStatus">true</item>
+
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index e4dbbc968..48fe11798 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -12,12 +12,12 @@
     <color name="black_translucent">#80000000</color>
 
     <!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
-    <color name="colorPrimary">#4CAF50</color>
-    <color name="colorPrimaryDark">#388E3C</color>
+    <color name="colorPrimary">#8bc34a</color>
+    <color name="colorPrimaryDark">#558b2f</color>
 
     <!-- TODO: -->
-    <color name="primary">#4CAF50</color>
-    <color name="primary_dark">#388E3C</color>
+    <color name="primary">#8bc34a</color>
+    <color name="primary_dark">#558b2f</color>
     <color name="primary_light">#C8E6C9</color>
     <color name="accent">#00BCD4</color>
     <color name="fab">#00BCD4</color>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2fd74f5a4..23b549660 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -488,7 +488,8 @@
     <string name="api_settings_delete_account">"Delete account"</string>
     <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"</string>
+    <string name="api_settings_accounts">"Accounts (deprecated API)"</string>
+    <string name="api_settings_advanced">"Advanced 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>
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 075f538e6..f1d1ea490 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -6,10 +6,11 @@
     <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
     <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/accent</item>
 
         <item name="android:windowNoTitle">true</item>
+        <!-- remove actionbar, we use toolbar! -->
         <item name="windowActionBar">false</item>
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
 
-- 
cgit v1.2.3


From b77bbb60274bee815e1d5b62140adfe74e1002e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 16:10:54 +0100
Subject: App settings statusbar fix

---
 .../src/main/res/layout/api_account_settings_activity.xml        | 2 --
 OpenKeychain/src/main/res/layout/api_app_settings_activity.xml   | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
index f88225a66..d2fb291ea 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml
@@ -13,8 +13,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/notify_area" />
-
         <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index a59bca59b..f6bda3428 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -15,12 +15,19 @@
         android:background="?attr/colorPrimaryDark"
         android:orientation="horizontal">
 
+        <ImageView
+            android:id="@+id/statusBar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusMargin"
+            android:background="?attr/colorPrimary" />
+
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
+            android:layout_below="@+id/statusBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimaryDark"
+            android:background="?attr/colorPrimary"
             android:overScrollMode="always"
             app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-- 
cgit v1.2.3


From 9e011860c480d274d9a99bf32947eaea9229dcd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 18:10:13 +0100
Subject: More toolbar fixes

---
 .../src/main/res/layout/api_app_settings_activity.xml        | 10 +++++-----
 OpenKeychain/src/main/res/layout/toolbar_standalone.xml      | 12 ++++++------
 OpenKeychain/src/main/res/values-v21/dimens.xml              |  6 ++++++
 OpenKeychain/src/main/res/values/dimens.xml                  |  2 ++
 4 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/values-v21/dimens.xml

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index f6bda3428..c7b8c9b3a 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -10,20 +10,20 @@
     <RelativeLayout
         android:id="@+id/toolbar_big"
         android:layout_width="match_parent"
-        android:layout_height="120dp"
+        android:layout_height="@dimen/big_toolbar"
         android:elevation="4dp"
-        android:background="?attr/colorPrimaryDark"
+        android:background="?attr/colorPrimary"
         android:orientation="horizontal">
 
         <ImageView
-            android:id="@+id/statusBar"
+            android:id="@+id/status_bar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/statusMargin"
+            android:layout_height="@dimen/statusbar_margin"
             android:background="?attr/colorPrimary" />
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_below="@+id/statusBar"
+            android:layout_below="@+id/status_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index ff1f99e03..cef0b862d 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -2,24 +2,24 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/header"
+    android:id="@+id/toolbar_include"
+    android:elevation="4dp"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <ImageView
-        android:id="@+id/statusBar"
+        android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/statusMargin"
+        android:layout_height="@dimen/statusbar_margin"
         android:background="?attr/colorPrimary" />
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
-        android:layout_below="@+id/statusBar"
+        android:layout_below="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        android:elevation="4dp"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         tools:ignore="UnusedAttribute" />
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
new file mode 100644
index 000000000..d54327293
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="statusbar_margin">21dp</dimen>
+    <!-- 120dp + statusbar_margin -->
+    <dimen name="big_toolbar">141dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 55344e519..21ef110ea 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="statusbar_margin">0dp</dimen>
+    <dimen name="big_toolbar">120dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 18:39:07 +0100
Subject: Move encrypt decrypt operations in own starter activity

---
 .../main/res/drawable-hdpi/ic_lock_black_24dp.png  | Bin 0 -> 397 bytes
 .../res/drawable-hdpi/ic_lock_open_black_24dp.png  | Bin 393 -> 0 bytes
 .../drawable-hdpi/ic_lock_outline_black_24dp.png   | Bin 398 -> 0 bytes
 .../main/res/drawable-mdpi/ic_lock_black_24dp.png  | Bin 0 -> 291 bytes
 .../res/drawable-mdpi/ic_lock_open_black_24dp.png  | Bin 295 -> 0 bytes
 .../drawable-mdpi/ic_lock_outline_black_24dp.png   | Bin 294 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_lock_black_24dp.png | Bin 0 -> 498 bytes
 .../res/drawable-xhdpi/ic_lock_open_black_24dp.png | Bin 450 -> 0 bytes
 .../drawable-xhdpi/ic_lock_outline_black_24dp.png  | Bin 484 -> 0 bytes
 .../res/drawable-xxhdpi/ic_lock_black_24dp.png     | Bin 0 -> 636 bytes
 .../drawable-xxhdpi/ic_lock_open_black_24dp.png    | Bin 615 -> 0 bytes
 .../drawable-xxhdpi/ic_lock_outline_black_24dp.png | Bin 675 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_lock_black_24dp.png    | Bin 0 -> 830 bytes
 .../drawable-xxxhdpi/ic_lock_open_black_24dp.png   | Bin 881 -> 0 bytes
 .../ic_lock_outline_black_24dp.png                 | Bin 883 -> 0 bytes
 .../main/res/layout/decrypt_overview_fragment.xml  |  96 ----------------
 .../layout/encrypt_decrypt_overview_fragment.xml   | 125 +++++++++++++++++++++
 OpenKeychain/src/main/res/values/strings.xml       |  10 +-
 18 files changed, 131 insertions(+), 100 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..0888c6173
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 8ac075245..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index fc019db72..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..d18d4b667
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9e6d0f0ac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 1df91994c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..8856c70df
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9cd050100..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index ae48a3bf7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..c49d420e0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 529a7724b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index cf149aa37..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..db080df4e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index a0fe0156f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 7460e0894..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
deleted file mode 100644
index c3e31bf11..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingTop="4dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/section_decrypt_files" />
-
-    <TextView
-        android:id="@+id/decrypt_files"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?android:attr/listPreferredItemHeight"
-        android:clickable="true"
-        style="@style/SelectableItem"
-        android:text="@string/btn_decrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
-        android:drawablePadding="8dp"
-        android:gravity="center_vertical" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_marginBottom="8dp" />
-
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/section_decrypt_text" />
-
-    <LinearLayout
-        android:id="@+id/decrypt_from_clipboard"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:clickable="true"
-        android:paddingRight="4dp"
-        style="@style/SelectableItem"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:paddingRight="4dp"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/btn_decrypt_clipboard" />
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/tertiary_text_light"
-                android:text="@string/btn_decrypt_and_verify"
-                android:gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/clipboard_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
-            android:layout_gravity="center_vertical" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_marginBottom="8dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
new file mode 100644
index 000000000..465fd195e
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:paddingTop="4dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/section_encrypt" />
+
+    <TextView
+        android:id="@+id/encrypt_files"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_encrypt_files"
+        android:drawableRight="@drawable/ic_action_collection"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <TextView
+        android:id="@+id/encrypt_text"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_encrypt_text"
+        android:drawableRight="@drawable/ic_action_copy"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/section_decrypt" />
+
+    <TextView
+        android:id="@+id/decrypt_files"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_decrypt_files"
+        android:drawableRight="@drawable/ic_action_collection"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
+
+    <LinearLayout
+        android:id="@+id/decrypt_from_clipboard"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        android:paddingRight="4dp"
+        style="@style/SelectableItem"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:paddingRight="4dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_decrypt_clipboard" />
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/tertiary_text_light"
+                android:text="@string/btn_decrypt_and_verify"
+                android:gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/clipboard_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="8dp"
+            android:src="@drawable/ic_action_paste"
+            android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_marginBottom="8dp" />
+
+</LinearLayout>
\ 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 23b549660..e01f1c049 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -62,6 +62,8 @@
     <string name="section_decrypt_files">"Files"</string>
     <string name="section_decrypt_text">"Text"</string>
     <string name="section_certs">"Certificates"</string>
+    <string name="section_encrypt">"Encrypt"</string>
+    <string name="section_decrypt">"Decrypt"</string>
 
     <!-- button -->
     <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
@@ -82,9 +84,11 @@
     <string name="btn_create_key">"Create key"</string>
     <string name="btn_add_files">"Add file(s)"</string>
     <string name="btn_add_share_decrypted_text">"Share decrypted text"</string>
-    <string name="btn_decrypt_clipboard">"Decrypt from clipboard"</string>
+    <string name="btn_decrypt_clipboard">"Decrypt text from clipboard"</string>
     <string name="btn_decrypt_and_verify">"and verify signatures"</string>
     <string name="btn_decrypt_files">"Decrypt files"</string>
+    <string name="btn_encrypt_files">"Encrypt files"</string>
+    <string name="btn_encrypt_text">"Encrypt text"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
@@ -584,9 +588,7 @@
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">"Keys"</string>
-    <string name="nav_encrypt_text">"Encrypt text"</string>
-    <string name="nav_encrypt_files">"Encrypt files"</string>
-    <string name="nav_decrypt">"Decrypt"</string>
+    <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string>
     <string name="nav_apps">"Apps"</string>
     <string name="drawer_open">"Open navigation drawer"</string>
     <string name="drawer_close">"Close navigation drawer"</string>
-- 
cgit v1.2.3


From dfe92ceb24efad1bace9f519e0ae2059c0ac582a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 18:51:58 +0100
Subject: Add FAB to key list

---
 .../src/main/res/drawable/fab_label_background.xml |  11 ++
 .../src/main/res/layout/key_list_fragment.xml      | 113 ++++++++++++++-------
 OpenKeychain/src/main/res/values/colors.xml        |  10 ++
 OpenKeychain/src/main/res/values/styles.xml        |   5 +
 4 files changed, 104 insertions(+), 35 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/fab_label_background.xml

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

diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
new file mode 100644
index 000000000..0d8c05b11
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_semi_transparent"/>
+    <padding
+        android:left="16dp"
+        android:top="4dp"
+        android:right="16dp"
+        android:bottom="4dp"/>
+    <corners
+        android:radius="2dp"/>
+</shape>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 6529a88e0..2c4ab909e 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -1,41 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/key_list_swipe_container"
-    android:layout_width="match_parent"
+<RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:orientation="vertical">
-    <!--rebuild functionality of ListFragment -->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    android:layout_width="match_parent">
 
-        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-            android:id="@+id/key_list_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:drawSelectorOnTop="true"
-            android:fastScrollEnabled="true"
-            android:paddingBottom="16dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="32dp"
-            android:scrollbarStyle="outsideOverlay" />
-
-        <LinearLayout
-            android:id="@+id/key_list_empty"
+    <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/key_list_swipe_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <!--rebuild functionality of ListFragment -->
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:visibility="visible">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            android:layout_height="match_parent">
+
+            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+                android:id="@+id/key_list_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:drawSelectorOnTop="true"
+                android:fastScrollEnabled="true"
+                android:paddingBottom="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="32dp"
+                android:scrollbarStyle="outsideOverlay" />
+
+            <LinearLayout
+                android:id="@+id/key_list_empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="@string/key_list_empty_text1"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:orientation="vertical"
+                android:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/key_list_empty_text1"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
+
+            </LinearLayout>
+        </FrameLayout>
+    </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>
+
+    <com.getbase.floatingactionbutton.FloatingActionsMenu
+        android:id="@+id/fab_main"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        fab:fab_addButtonColorNormal="@color/fab"
+        fab:fab_addButtonColorPressed="@color/fab_pressed"
+        fab:fab_addButtonSize="normal"
+        fab:fab_addButtonPlusIconColor="@color/icons"
+        fab:fab_expandDirection="up"
+        fab:fab_labelStyle="@style/FabMenuStyle"
+        android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp">
+
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_add_cloud"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_colorNormal="@color/fab"
+            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_title="Scan QR Code"
+            fab:fab_size="mini" />
+
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_add_qr_code"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_colorNormal="@color/fab"
+            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_title="Search Cloud"
+            fab:fab_size="mini" />
 
-        </LinearLayout>
-    </FrameLayout>
-</org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>
\ No newline at end of file
+    </com.getbase.floatingactionbutton.FloatingActionsMenu>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 48fe11798..4bce321ec 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -38,6 +38,16 @@
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</color>
 
+
+    <!-- FAB -->
+    <color name="black_semi_transparent">#B2000000</color>
+    <color name="background">#e5e5e5</color>
+    <color name="half_black">#808080</color>
+    <color name="white">#fafafa</color>
+    <color name="white_pressed">#f1f1f1</color>
+    <color name="pink">#e91e63</color>
+    <color name="pink_pressed">#ec407a</color>
+
     <!--
         http://www.google.com/design/spec/style/color.html#color-color-palette
         light = normal color
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 3844ccb29..03ccce85e 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -34,4 +34,9 @@
         <item name="android:background">@drawable/selector_transparent_button</item>
     </style>
 
+    <style name="FabMenuStyle">
+        <item name="android:background">@drawable/fab_label_background</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e29ea517daeb660fd91582b53ae0e5e67d50efe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 19:13:02 +0100
Subject: Fix first time wizard design

---
 .../src/main/res/drawable-hdpi/create_key_robot.png | Bin 2259 -> 2299 bytes
 .../src/main/res/drawable-mdpi/create_key_robot.png | Bin 1766 -> 1767 bytes
 .../main/res/drawable-xhdpi/create_key_robot.png    | Bin 3176 -> 3153 bytes
 .../main/res/drawable-xxhdpi/create_key_robot.png   | Bin 4039 -> 4030 bytes
 OpenKeychain/src/main/res/drawable/first_time_1.png | Bin 43898 -> 40232 bytes
 .../layout/encrypt_decrypt_overview_fragment.xml    |  10 ++++++++++
 .../src/main/res/layout/first_time_activity.xml     |   9 +++++++--
 7 files changed, 17 insertions(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png
index acc198fc3..2d16b50cf 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png
index 58476bfc9..08168f357 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png
index 022f2dd2e..a7d43e3b7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png
index 5392deafd..0e3432635 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png differ
diff --git a/OpenKeychain/src/main/res/drawable/first_time_1.png b/OpenKeychain/src/main/res/drawable/first_time_1.png
index 1f340df5c..1f93f2deb 100644
Binary files a/OpenKeychain/src/main/res/drawable/first_time_1.png and b/OpenKeychain/src/main/res/drawable/first_time_1.png differ
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index 465fd195e..d62c9f32b 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -29,6 +29,11 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
+
     <TextView
         android:id="@+id/encrypt_text"
         android:paddingLeft="8dp"
@@ -44,6 +49,11 @@
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
+
     <TextView
         style="@style/SectionHeader"
         android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 2d750c1a7..61737e548 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -4,6 +4,11 @@
     android:layout_height="wrap_content"
     android:paddingTop="16dp">
 
+    <ImageView
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/statusbar_margin" />
+
     <LinearLayout
         android:id="@+id/first_time_buttons"
         android:layout_width="match_parent"
@@ -91,6 +96,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
+        android:layout_below="@+id/status_bar"
         android:layout_above="@+id/first_time_buttons">
 
         <TextView
@@ -99,7 +105,7 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/app_name"
             android:drawableLeft="@drawable/ic_launcher"
-            android:drawablePadding="16dp"
+            android:drawablePadding="8dp"
             android:gravity="center"
             android:layout_gravity="center_horizontal" />
 
@@ -128,5 +134,4 @@
 
     </LinearLayout>
 
-
 </RelativeLayout>
-- 
cgit v1.2.3


From e2cb1a90cdec23c3ec516ffe4bc27cac328060c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 19:26:40 +0100
Subject: Improve nav drawer drawable

---
 .../src/main/res/drawable/drawer_header.png         | Bin 47902 -> 46375 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index 373534722..c960402b2 100644
Binary files a/OpenKeychain/src/main/res/drawable/drawer_header.png and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
-- 
cgit v1.2.3


From a468c667bbe91aadc63b9bf72649e068675d6179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 19:47:50 +0100
Subject: Improve nav drawer drawable

---
 .../src/main/res/drawable/drawer_header.png         | Bin 46375 -> 45658 bytes
 .../src/main/res/layout/key_list_fragment.xml       |   9 +++++++++
 2 files changed, 9 insertions(+)

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

diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index c960402b2..927d818e6 100644
Binary files a/OpenKeychain/src/main/res/drawable/drawer_header.png and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 2c4ab909e..0c3c6404a 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -80,5 +80,14 @@
             fab:fab_title="Search Cloud"
             fab:fab_size="mini" />
 
+        <com.getbase.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_add_file"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            fab:fab_colorNormal="@color/fab"
+            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_title="Import from File"
+            fab:fab_size="mini" />
+
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 3efaac2175d5b971e83bf4322d221bcde80157dc Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 17 Feb 2015 18:08:45 +0100
Subject: determine correct filesize during decryption from LiteralData packet

---
 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 e01f1c049..c2a44f0f9 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -935,6 +935,7 @@
     <string name="msg_dc_clear_meta_file">"Filename: %s"</string>
     <string name="msg_dc_clear_meta_mime">"MIME type: %s"</string>
     <string name="msg_dc_clear_meta_size">"Filesize: %s"</string>
+    <string name="msg_dc_clear_meta_size_unknown">"Filesize is unknown"</string>
     <string name="msg_dc_clear_meta_time">"Modification time: %s"</string>
     <string name="msg_dc_clear_signature_bad">"Signature check NOT OK!"</string>
     <string name="msg_dc_clear_signature_check">"Verifying signature data"</string>
-- 
cgit v1.2.3


From 9d7e05c06ea485725389768c83eade445f5ecbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 20 Feb 2015 11:04:07 +0100
Subject: Screenshot for GSoC

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

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

diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 8a682badc..fef449463 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -13,12 +13,12 @@
         android:id="@+id/menu_key_list_search_cloud"
         android:icon="@drawable/ic_cloud_search_24px"
         android:title="@string/menu_search_cloud"
-        app:showAsAction="ifRoom|withText" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_add"
         android:title="@string/import_qr_code_button"
-        app:showAsAction="ifRoom|withText" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_export"
-- 
cgit v1.2.3


From 5b75985f959161307850e42a5259520d5aa8db7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 21 Feb 2015 20:01:19 +0100
Subject: Status bar height fix

---
 OpenKeychain/src/main/res/layout/api_app_settings_activity.xml | 2 +-
 OpenKeychain/src/main/res/layout/first_time_activity.xml       | 2 +-
 OpenKeychain/src/main/res/layout/toolbar_standalone.xml        | 6 +++++-
 OpenKeychain/src/main/res/values-v21/dimens.xml                | 8 ++++++--
 OpenKeychain/src/main/res/values/dimens.xml                    | 3 ++-
 OpenKeychain/src/main/res/values/themes.xml                    | 2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index c7b8c9b3a..253836080 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -18,7 +18,7 @@
         <ImageView
             android:id="@+id/status_bar"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/statusbar_margin"
+            android:layout_height="@dimen/statusbar_height"
             android:background="?attr/colorPrimary" />
 
         <android.support.v7.widget.Toolbar
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index 61737e548..ba80214a6 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -7,7 +7,7 @@
     <ImageView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_margin" />
+        android:layout_height="@dimen/statusbar_height" />
 
     <LinearLayout
         android:id="@+id/first_time_buttons"
diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
index cef0b862d..950c2f2ae 100644
--- a/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
+++ b/OpenKeychain/src/main/res/layout/toolbar_standalone.xml
@@ -7,10 +7,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <!--
+        We always have windowTranslucentStatus=true to get under the status bar.
+        Thus this ImageView is the part under the status bar!
+    -->
     <ImageView
         android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/statusbar_margin"
+        android:layout_height="@dimen/statusbar_height"
         android:background="?attr/colorPrimary" />
 
     <android.support.v7.widget.Toolbar
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index d54327293..3a85cca93 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="statusbar_margin">21dp</dimen>
-    <!-- 120dp + statusbar_margin -->
+    <!--
+        Status bar height according to
+        http://www.google.com/design/spec/layout/structure.html#structure-system-bars
+    -->
+    <dimen name="statusbar_height">24dp</dimen>
+    <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 21ef110ea..7e361a358 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="statusbar_margin">0dp</dimen>
+    <!-- on Android < 5, we do not color the status bar, thus 0dp! -->
+    <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index f1d1ea490..885d5e682 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -4,7 +4,7 @@
     <style name="KeychainTheme" parent="KeychainTheme.Base" />
 
     <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
-    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/accent</item>
-- 
cgit v1.2.3


From 32acd946982747a37b29a5e23ac313a49df31823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 21 Feb 2015 20:46:37 +0100
Subject: Floating action button icons and methods for key list

---
 .../src/main/res/drawable-hdpi/ic_folder_white_24dp.png | Bin 0 -> 224 bytes
 .../src/main/res/drawable-mdpi/ic_folder_white_24dp.png | Bin 0 -> 206 bytes
 .../main/res/drawable-xhdpi/ic_folder_white_24dp.png    | Bin 0 -> 273 bytes
 .../main/res/drawable-xxhdpi/ic_folder_white_24dp.png   | Bin 0 -> 342 bytes
 .../main/res/drawable-xxxhdpi/ic_folder_white_24dp.png  | Bin 0 -> 504 bytes
 OpenKeychain/src/main/res/drawable/qrcode.xml           |   8 ++++++++
 OpenKeychain/src/main/res/layout/key_list_fragment.xml  |   7 +++++--
 OpenKeychain/src/main/res/menu/key_list.xml             |  16 ----------------
 8 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable/qrcode.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png
new file mode 100644
index 000000000..9f5c75609
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png
new file mode 100644
index 000000000..1c5797c9e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
new file mode 100644
index 000000000..e5f54cef0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 000000000..0d1ac4876
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png
new file mode 100644
index 000000000..7a3c198ee
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_folder_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable/qrcode.xml b/OpenKeychain/src/main/res/drawable/qrcode.xml
new file mode 100644
index 000000000..87eb7d485
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/qrcode.xml
@@ -0,0 +1,8 @@
+<!-- drawable/qrcode.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M5,5H7V7H5V5M1,1H11V11H1V1M3,3V9H9V3H3M5,17H7V19H5V17M1,13H11V23H1V13M3,15V21H9V15H3M17,5H19V7H17V5M13,1H23V11H13V1M15,3V9H21V3H15M13,13H17V15H19V13H23V15H19V17H23V23H19V21H15V23H13V21H15V19H13V13M21,21V19H19V21H21M19,17H17V15H15V19H19V17Z" />
+</vector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 0c3c6404a..290e56872 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -63,18 +63,20 @@
         android:layout_marginEnd="16dp">
 
         <com.getbase.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_add_cloud"
+            android:id="@+id/fab_add_qr_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            fab:fab_icon="@drawable/qrcode"
             fab:fab_colorNormal="@color/fab"
             fab:fab_colorPressed="@color/fab_pressed"
             fab:fab_title="Scan QR Code"
             fab:fab_size="mini" />
 
         <com.getbase.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_add_qr_code"
+            android:id="@+id/fab_add_cloud"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            fab:fab_icon="@drawable/ic_cloud_search_24px"
             fab:fab_colorNormal="@color/fab"
             fab:fab_colorPressed="@color/fab_pressed"
             fab:fab_title="Search Cloud"
@@ -84,6 +86,7 @@
             android:id="@+id/fab_add_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            fab:fab_icon="@drawable/ic_folder_white_24dp"
             fab:fab_colorNormal="@color/fab"
             fab:fab_colorPressed="@color/fab_pressed"
             fab:fab_title="Import from File"
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index fef449463..386a9d46e 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -9,17 +9,6 @@
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|always" />
 
-    <item
-        android:id="@+id/menu_key_list_search_cloud"
-        android:icon="@drawable/ic_cloud_search_24px"
-        android:title="@string/menu_search_cloud"
-        app:showAsAction="never" />
-
-    <item
-        android:id="@+id/menu_key_list_add"
-        android:title="@string/import_qr_code_button"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_key_list_export"
         android:title="@string/menu_export_all_keys"
@@ -30,11 +19,6 @@
         android:title="@string/menu_create_key"
         app:showAsAction="never" />
 
-    <item
-        android:id="@+id/menu_key_list_import_existing_key"
-        android:title="@string/menu_import_existing_key"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/menu_key_list_debug_cons"
         android:title="Debug / Consolidate"
-- 
cgit v1.2.3


From db8ee77d564a254fcfd6810bee992334e4a5f49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <stlman@poczta.fm>
Date: Sat, 21 Feb 2015 22:29:09 +0100
Subject: move a string in the safe slinger activity to resources

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

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

diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index c2a5b2f53..8dbe1d62e 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -59,7 +59,7 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_width="0dip"
                     android:layout_height="match_parent"
-                    android:text="Start exchange"
+                    android:text="@string/btn_start_exchange"
                     android:layout_weight="1"
                     android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index fed8ac224..5ff28160d 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -682,6 +682,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="swipe_to_update">Pociągnij w dół, aby aktualizować z serwera kluczy</string>
   <string name="error_no_file_selected">Wybierz przynajmniej jeden plik, aby szyfrować!</string>
   <string name="key_colon">Klucz:</string>
+  <string name="btn_start_exchange">Rozpocznij wymianę</string>
   <!--First Time-->
   <string name="first_time_text1">Weź prywatność w swoje ręce używając OpenKeychain!</string>
   <string name="first_time_create_key">Utwórz mój klucz</string>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c2a44f0f9..97e6a9d71 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1140,6 +1140,7 @@
     <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string>
     <string name="key_colon">"Key:"</string>
     <string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string>
+    <string name="btn_start_exchange">"Start exchange"</string>
     <string name="user_id_none"><![CDATA[<none>]]></string>
 
     <!-- Passphrase wizard -->
-- 
cgit v1.2.3


From d720ac612451b84bcca1819c4338860f846fb14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <stlman@poczta.fm>
Date: Sat, 21 Feb 2015 23:06:20 +0100
Subject: some Polish translations

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

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

diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index 5ff28160d..ad1134d6e 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -34,6 +34,9 @@
   <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ń klucze</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>
@@ -52,6 +55,9 @@
   <string name="section_key_to_certify">Klucz do certyfikacji</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_decrypt_verify_message">Odszyfruj i weryfikuj wiadomość</string>
@@ -74,6 +80,8 @@
   <string name="btn_decrypt_clipboard">Odszyfruj ze schowka</string>
   <string name="btn_decrypt_and_verify">oraz weryfikuj podpisy</string>
   <string name="btn_decrypt_files">Odszyfruj pliki</string>
+  <string name="btn_encrypt_files">Zaszyfruj pliki</string>
+  <string name="btn_encrypt_text">Zaszyfruj tekst</string>
   <!--menu-->
   <string name="menu_preferences">Ustawienia</string>
   <string name="menu_help">Pomoc</string>
@@ -347,6 +355,8 @@
   <string name="import_import">Zaimportuj wybrane klucze</string>
   <string name="import_qr_code_wrong">Kod QR zniekształcony! Spróbuj jeszcze raz!</string>
   <string name="import_qr_code_too_short_fingerprint">Odcisk klucza jest za krótki (&lt; 16 znaków)</string>
+  <string name="import_qr_code_button">Skanuj kod QR</string>
+  <string name="import_qr_code_text">Umieść kamerę przed kodem QR!</string>
   <!--Generic result toast-->
   <string name="view_log">Pokaż logi</string>
   <string name="with_warnings">, z ostrzeżeniami</string>
@@ -533,9 +543,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="view_key_expired">Ten klucz stracił swoją ważność!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klucze</string>
-  <string name="nav_encrypt_text">Szyfruj tekst</string>
-  <string name="nav_encrypt_files">Szyfruj pliki</string>
-  <string name="nav_decrypt">Odszyfruj</string>
+  <string name="nav_encrypt_decrypt">"Zaszyfruj/Odszyfruj"</string>
   <string name="nav_apps">Aplikacje</string>
   <string name="drawer_open">Otwórz panel nawigacji</string>
   <string name="drawer_close">Zamknij panel nawigacji</string>
-- 
cgit v1.2.3


From d0be3bd7ea5ea2c3ef40aa9899c5255f037f6ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 21:16:40 +0100
Subject: Once again: Colors and header image

---
 .../src/main/res/drawable/drawer_header.png        | Bin 45658 -> 49186 bytes
 .../src/main/res/layout/drawer_custom_header.xml   |   2 +-
 .../src/main/res/layout/key_list_fragment.xml      |  16 ++++-----
 OpenKeychain/src/main/res/values/colors.xml        |  38 +++++++++------------
 OpenKeychain/src/main/res/values/themes.xml        |   4 +--
 5 files changed, 27 insertions(+), 33 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index 927d818e6..c8fdccf8d 100644
Binary files a/OpenKeychain/src/main/res/drawable/drawer_header.png and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
index 021226ba3..86465db98 100644
--- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:background="@color/colorPrimary">
+    android:background="@color/primary">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 290e56872..c918ace37 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -52,8 +52,8 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        fab:fab_addButtonColorNormal="@color/fab"
-        fab:fab_addButtonColorPressed="@color/fab_pressed"
+        fab:fab_addButtonColorNormal="@color/primary"
+        fab:fab_addButtonColorPressed="@color/primary_dark"
         fab:fab_addButtonSize="normal"
         fab:fab_addButtonPlusIconColor="@color/icons"
         fab:fab_expandDirection="up"
@@ -67,8 +67,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/qrcode"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Scan QR Code"
             fab:fab_size="mini" />
 
@@ -77,8 +77,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/ic_cloud_search_24px"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Search Cloud"
             fab:fab_size="mini" />
 
@@ -87,8 +87,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_icon="@drawable/ic_folder_white_24dp"
-            fab:fab_colorNormal="@color/fab"
-            fab:fab_colorPressed="@color/fab_pressed"
+            fab:fab_colorNormal="@color/primary"
+            fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Import from File"
             fab:fab_size="mini" />
 
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 4bce321ec..006b9b9b5 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!--<color name="colorPrimary">@color/material_deep_teal_500</color>-->
-    <!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>-->
+    <!-- Main theme colors -->
 
-    <!-- TODO: -->
+    <!-- green colors from OpenKeychain logo bottom right -->
+    <!-- your app branding color for the app bar -->
+    <color name="primary">#7bad45</color>
+    <!-- darker variant for the status bar and contextual app bars -->
+    <color name="primary_dark">#6c983d</color>
+    <!-- theme UI controls like checkboxes and text fields -->
+    <color name="accent">#2196F3</color>
 
-    <color name="colorSecondary">@color/material_deep_teal_200</color>
-    <color name="colorSecondaryDark">@color/material_deep_teal_500</color>
-    <!--<color name="windowBackgroundColor">#333333</color>-->
-    <color name="black_translucent">#80000000</color>
+    <!-- Other colors -->
 
-    <!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
-    <color name="colorPrimary">#8bc34a</color>
-    <color name="colorPrimaryDark">#558b2f</color>
-
-    <!-- TODO: -->
-    <color name="primary">#8bc34a</color>
-    <color name="primary_dark">#558b2f</color>
     <color name="primary_light">#C8E6C9</color>
-    <color name="accent">#00BCD4</color>
-    <color name="fab">#00BCD4</color>
-    <color name="fab_pressed">#0097A7</color>
+    <color name="fab">#2196F3</color>
+    <color name="fab_pressed">#1976D2</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
@@ -39,26 +33,26 @@
     <color name="holo_gray_bright">#33CCCCCC</color>
 
 
-    <!-- FAB -->
+    <!-- floating action buttons -->
     <color name="black_semi_transparent">#B2000000</color>
     <color name="background">#e5e5e5</color>
     <color name="half_black">#808080</color>
     <color name="white">#fafafa</color>
     <color name="white_pressed">#f1f1f1</color>
-    <color name="pink">#e91e63</color>
-    <color name="pink_pressed">#ec407a</color>
 
     <!--
         http://www.google.com/design/spec/style/color.html#color-color-palette
         light = normal color
         dark = 900
+
+        exception: green
     -->
     <color name="android_red_light">#f44336</color>
     <color name="android_red_dark">#b71c1c</color>
     <color name="android_orange_light">#ff9800</color>
     <color name="android_orange_dark">#e65100</color>
-    <color name="android_green_light">#4caf50</color>
-    <color name="android_green_dark">#1b5e20</color>
+    <color name="android_green_light">@color/primary</color>
+    <color name="android_green_dark">@color/primary_dark</color>
     <color name="android_purple_light">#673ab7</color>
     <color name="android_purple_dark">#311b92</color>
 
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 885d5e682..147bd8d4c 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -5,8 +5,8 @@
 
     <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
     <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
 
         <item name="android:windowNoTitle">true</item>
-- 
cgit v1.2.3


From 0cdd68e763fc5a345e10d0cdbce65f4348fd2057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 21:30:27 +0100
Subject: Color for holo

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

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

diff --git a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
index e9b8c9350..26386e80b 100644
--- a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
+++ b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="keychaintheme_color">#4caf50</color>
+    <color name="keychaintheme_color">#7bad45</color>
 </resources>
-- 
cgit v1.2.3


From df7009669ba983a1694b4a0e7d0ee64d7bc56dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 21:39:34 +0100
Subject: Pull from transifex

---
 OpenKeychain/src/main/res/raw-bg/help_about.html   |  57 ++
 .../src/main/res/raw-bg/help_changelog.html        | 232 ++++++
 .../src/main/res/raw-bg/help_nfc_beam.html         |  12 +
 OpenKeychain/src/main/res/raw-bg/help_start.html   |  19 +
 OpenKeychain/src/main/res/raw-bg/help_wot.html     |  17 +
 .../src/main/res/raw-bg/nfc_beam_share.html        |  11 +
 .../src/main/res/raw-cs/help_changelog.html        |   8 +-
 OpenKeychain/src/main/res/raw-cs/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-cs/help_wot.html     |   2 +-
 .../src/main/res/raw-de/help_changelog.html        |   6 +-
 OpenKeychain/src/main/res/raw-de/help_start.html   |   2 +-
 .../src/main/res/raw-es/help_changelog.html        |   4 +-
 OpenKeychain/src/main/res/raw-es/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-es/help_wot.html     |   6 +-
 .../src/main/res/raw-et/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-et/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-et/help_wot.html     |   2 +-
 .../src/main/res/raw-fi/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-fi/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-fi/help_wot.html     |   2 +-
 .../src/main/res/raw-fr/help_changelog.html        |  12 +-
 OpenKeychain/src/main/res/raw-fr/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-fr/help_wot.html     |   8 +-
 .../src/main/res/raw-is/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-is/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-is/help_wot.html     |   2 +-
 .../src/main/res/raw-it/help_changelog.html        |  24 +-
 OpenKeychain/src/main/res/raw-it/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-it/help_wot.html     |   2 +-
 .../src/main/res/raw-ja/help_changelog.html        |   6 +-
 OpenKeychain/src/main/res/raw-ja/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-ja/help_wot.html     |   4 +-
 OpenKeychain/src/main/res/raw-nl/help_about.html   |  14 +-
 .../src/main/res/raw-nl/help_changelog.html        | 270 +++----
 .../src/main/res/raw-nl/help_nfc_beam.html         |   8 +-
 OpenKeychain/src/main/res/raw-nl/help_start.html   |   6 +-
 OpenKeychain/src/main/res/raw-nl/help_wot.html     |  14 +-
 .../src/main/res/raw-pl/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-pl/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-pl/help_wot.html     |   2 +-
 .../src/main/res/raw-pt/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-pt/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-pt/help_wot.html     |   2 +-
 OpenKeychain/src/main/res/raw-ro/help_about.html   |  57 ++
 .../src/main/res/raw-ro/help_changelog.html        | 232 ++++++
 .../src/main/res/raw-ro/help_nfc_beam.html         |  12 +
 OpenKeychain/src/main/res/raw-ro/help_start.html   |  19 +
 OpenKeychain/src/main/res/raw-ro/help_wot.html     |  17 +
 .../src/main/res/raw-ro/nfc_beam_share.html        |  11 +
 .../src/main/res/raw-ru/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-ru/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-ru/help_wot.html     |   2 +-
 .../src/main/res/raw-sl/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-sl/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-sl/help_wot.html     |   2 +-
 .../src/main/res/raw-sr/help_changelog.html        |   4 +-
 OpenKeychain/src/main/res/raw-sr/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-sr/help_wot.html     |   2 +-
 .../src/main/res/raw-sv/help_changelog.html        |  58 +-
 .../src/main/res/raw-sv/help_nfc_beam.html         |   8 +-
 OpenKeychain/src/main/res/raw-sv/help_start.html   |   8 +-
 OpenKeychain/src/main/res/raw-sv/help_wot.html     |   2 +-
 .../src/main/res/raw-sv/nfc_beam_share.html        |   8 +-
 .../src/main/res/raw-tr/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-tr/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-tr/help_wot.html     |   2 +-
 .../src/main/res/raw-uk/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-uk/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-uk/help_wot.html     |   2 +-
 .../src/main/res/raw-zh-rTW/help_about.html        |  24 +-
 .../src/main/res/raw-zh-rTW/help_changelog.html    |  18 +-
 .../src/main/res/raw-zh-rTW/help_start.html        |   2 +-
 OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html |   2 +-
 .../src/main/res/raw-zh/help_changelog.html        |   2 +-
 OpenKeychain/src/main/res/raw-zh/help_start.html   |   2 +-
 OpenKeychain/src/main/res/raw-zh/help_wot.html     |   2 +-
 OpenKeychain/src/main/res/values-bg/strings.xml    |  66 ++
 OpenKeychain/src/main/res/values-cs/strings.xml    |  84 ++-
 OpenKeychain/src/main/res/values-de/strings.xml    | 326 ++++++--
 OpenKeychain/src/main/res/values-es/strings.xml    | 216 ++++--
 OpenKeychain/src/main/res/values-et/strings.xml    |  12 +-
 OpenKeychain/src/main/res/values-fi/strings.xml    | 187 ++++-
 OpenKeychain/src/main/res/values-fr/strings.xml    | 277 +++++--
 OpenKeychain/src/main/res/values-is/strings.xml    |   9 +-
 OpenKeychain/src/main/res/values-it/strings.xml    |  59 +-
 OpenKeychain/src/main/res/values-ja/strings.xml    | 304 ++++++--
 OpenKeychain/src/main/res/values-nl/strings.xml    | 834 ++++++++++++++++++++-
 OpenKeychain/src/main/res/values-pl/strings.xml    |  64 +-
 OpenKeychain/src/main/res/values-pt/strings.xml    |   9 +-
 OpenKeychain/src/main/res/values-ro/strings.xml    |  66 ++
 OpenKeychain/src/main/res/values-ru/strings.xml    | 297 +++++++-
 OpenKeychain/src/main/res/values-sl/strings.xml    |  32 +-
 OpenKeychain/src/main/res/values-sr/strings.xml    | 211 ++++--
 OpenKeychain/src/main/res/values-sv/strings.xml    | 261 ++++++-
 OpenKeychain/src/main/res/values-tr/strings.xml    | 253 ++++---
 OpenKeychain/src/main/res/values-uk/strings.xml    | 129 +++-
 .../src/main/res/values-zh-rTW/strings.xml         | 250 +++++-
 OpenKeychain/src/main/res/values-zh/strings.xml    |  13 +-
 98 files changed, 4356 insertions(+), 903 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/raw-bg/help_about.html
 create mode 100644 OpenKeychain/src/main/res/raw-bg/help_changelog.html
 create mode 100644 OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html
 create mode 100644 OpenKeychain/src/main/res/raw-bg/help_start.html
 create mode 100644 OpenKeychain/src/main/res/raw-bg/help_wot.html
 create mode 100644 OpenKeychain/src/main/res/raw-bg/nfc_beam_share.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/help_about.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/help_changelog.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/help_start.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/help_wot.html
 create mode 100644 OpenKeychain/src/main/res/raw-ro/nfc_beam_share.html
 create mode 100644 OpenKeychain/src/main/res/values-bg/strings.xml
 create mode 100644 OpenKeychain/src/main/res/values-ro/strings.xml

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

diff --git a/OpenKeychain/src/main/res/raw-bg/help_about.html b/OpenKeychain/src/main/res/raw-bg/help_about.html
new file mode 100644
index 000000000..2c6c5b3c4
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/help_about.html
@@ -0,0 +1,57 @@
+<html>
+<head></head>
+<body>
+<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
+<p>License: GPLv3+</p>
+
+<h2>Developers</h2>
+<ul>
+<li>Dominik Schürmann (Maintainer)</li>
+<li>Art O Cathain</li>
+<li>Ash Hughes</li>
+<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Daniel Albert</li>
+<li>Daniel Hammann</li>
+<li>Daniel Haß</li>
+<li>Greg Witczak</li>
+<li>'mar-v-in'</li>
+<li>Markus Doits</li>
+<li>Miroojin Bakshi</li>
+<li>Nikhil Peter Raj</li>
+<li>Paul Sarbinowski</li>
+<li>'Senecaso'</li>
+<li>Signe Rüsch</li>
+<li>Sreeram Boyapati</li>
+<li>Thialfihar (APG 1.x)</li>
+<li>Tim Bray</li>
+<li>Vincent Breitmoser</li>
+</ul>
+<h2>Libraries</h2>
+<ul>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_changelog.html b/OpenKeychain/src/main/res/raw-bg/help_changelog.html
new file mode 100644
index 000000000..0cb7d5210
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/help_changelog.html
@@ -0,0 +1,232 @@
+<html>
+<head></head>
+<body>
+
+<h2>3.1.2</h2>
+<ul>
+<li>Fix key export to files (now for real)</li>
+</ul>
+<h2>3.1.1</h2>
+<ul>
+<li>Fix key export to files (they were written partially)</li>
+<li>Fix crash on Android 2.3</li>
+</ul>
+<h2>3.1</h2>
+<ul>
+<li>Fix crash on Android 5</li>
+<li>New certify screen</li>
+<li>Secure Exchange directly from key list (SafeSlinger library)</li>
+<li>New QR Code program flow</li>
+<li>Redesigned decrypt screen</li>
+<li>New icon usage and colors</li>
+<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>Subkey IDs on Yubikeys are now checked correctly</li>
+</ul>
+<h2>3.0.1</h2>
+<ul>
+<li>Better handling of large key imports</li>
+<li>Improved subkey selection</li>
+</ul>
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
+<h2>2.9.2</h2>
+<ul>
+<li>Fix keys broken in 2.9.1</li>
+<li>Yubikey decryption now working via API</li>
+</ul>
+<h2>2.9.1</h2>
+<ul>
+<li>Split encrypt screen into two</li>
+<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
+<li>Improved passphrase handling</li>
+<li>Key sharing via SafeSlinger</li>
+<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
+<li>Fix usage of stripped keys</li>
+<li>SHA256 as default for compatibility</li>
+<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+</ul>
+<h2>2.9</h2>
+<ul>
+<li>Fixing crashes introduced in v2.8</li>
+<li>Experimental ECC support</li>
+<li>Experimental Yubikey support (signing-only with imported keys)</li>
+</ul>
+<h2>2.8</h2>
+<ul>
+<li>So many bugs have been fixed in this release that we focus on the main new features</li>
+<li>Key edit: awesome new design, key revocation</li>
+<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
+<li>New first time screen</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>File encryption: awesome new design, support for encrypting multiple files</li>
+<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Important bug fix: Importing of large key collections from a file is now possible</li>
+<li>Notification showing cached passphrases</li>
+<li>Keys are connected to Android's contacts</li>
+</ul>
+<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>
+
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+<h2>2.6.1</h2>
+<ul>
+<li>Some fixes for regression bugs</li>
+</ul>
+<h2>2.6</h2>
+<ul>
+<li>Key certifications (thanks to Vincent Breitmoser)</li>
+<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>New design for signature verification</li>
+<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Fix share-functionality from other apps</li>
+</ul>
+<h2>2.5</h2>
+<ul>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
+<li>Refactored key edit screen (thanks to Ash Hughes)</li>
+<li>New modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+</ul>
+<h2>2.4</h2>
+<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>
+<ul>
+<li>New unified key list</li>
+<li>Colorized key fingerprint</li>
+<li>Support for keyserver ports</li>
+<li>Deactivate possibility to generate weak keys</li>
+<li>Much more internal work on the API</li>
+<li>Certify user ids</li>
+<li>Keyserver query based on machine-readable output</li>
+<li>Lock navigation drawer on tablets</li>
+<li>Suggestions for emails on creation of keys</li>
+<li>Search in public key lists</li>
+<li>And much more improvements and fixes…</li>
+</ul>
+<h2>2.3.1</h2>
+<ul>
+<li>Hotfix for crash when upgrading from old versions</li>
+</ul>
+<h2>2.3</h2>
+<ul>
+<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>Querying keyservers directly from the import screen</li>
+<li>Fix layout and dialog style on Android 2.2-3.0</li>
+<li>Fix crash on keys with empty user ids</li>
+<li>Fix crash and empty lists when coming back from signing screen</li>
+<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
+<li>Fix upload of key from signing screen</li>
+</ul>
+<h2>2.2</h2>
+<ul>
+<li>New design with navigation drawer</li>
+<li>New public key list design</li>
+<li>New public key view</li>
+<li>Bug fixes for importing of keys</li>
+<li>Key cross-certification (thanks to Ash Hughes)</li>
+<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>First version with new languages (thanks to the contributors on Transifex)</li>
+<li>Sharing of keys via QR Codes fixed and improved</li>
+<li>Package signature verification for API</li>
+</ul>
+<h2>2.1.1</h2>
+<ul>
+<li>API Updates, preparation for K-9 Mail integration</li>
+</ul>
+<h2>2.1</h2>
+<ul>
+<li>Lots of bug fixes</li>
+<li>New API for developers</li>
+<li>PRNG bug fix by Google</li>
+</ul>
+<h2>2.0</h2>
+<ul>
+<li>Complete redesign</li>
+<li>Share public keys via QR codes, NFC beam</li>
+<li>Sign keys</li>
+<li>Upload keys to server</li>
+<li>Fixes import issues</li>
+<li>New AIDL API</li>
+</ul>
+<h2>1.0.8</h2>
+<ul>
+<li>Basic keyserver support</li>
+<li>App2sd</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
+<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>Bugfixes</li>
+<li>Optimizations</li>
+</ul>
+<h2>1.0.7</h2>
+<ul>
+<li>Fixed problem with signature verification of texts with trailing newline</li>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+</ul>
+<h2>1.0.6</h2>
+<ul>
+<li>Account adding crash on Froyo fixed</li>
+<li>Secure file deletion</li>
+<li>Option to delete key file after import</li>
+<li>Stream encryption/decryption (gallery, etc.)</li>
+<li>New options (language, force v3 signatures)</li>
+<li>Interface changes</li>
+<li>Bugfixes</li>
+</ul>
+<h2>1.0.5</h2>
+<ul>
+<li>German and Italian translation</li>
+<li>Much smaller package, due to reduced BC sources</li>
+<li>New preferences GUI</li>
+<li>Layout adjustment for localization</li>
+<li>Signature bugfix</li>
+</ul>
+<h2>1.0.4</h2>
+<ul>
+<li>Fixed another crash caused by some SDK bug with query builder</li>
+</ul>
+<h2>1.0.3</h2>
+<ul>
+<li>Fixed crashes during encryption/signing and possibly key export</li>
+</ul>
+<h2>1.0.2</h2>
+<ul>
+<li>Filterable key lists</li>
+<li>Smarter pre-selection of encryption keys</li>
+<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
+<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+</ul>
+<h2>1.0.1</h2>
+<ul>
+<li>GMail account listing was broken in 1.0.0, fixed again</li>
+</ul>
+<h2>1.0.0</h2>
+<ul>
+<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>Support of more file managers (including ASTRO)</li>
+<li>Slovenian translation</li>
+<li>New database, much faster, less memory usage</li>
+<li>Defined Intents and content provider for other apps</li>
+<li>Bugfixes</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html
new file mode 100644
index 000000000..966fb554a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/help_nfc_beam.html
@@ -0,0 +1,12 @@
+<html>
+<head></head>
+<body>
+<h2>How to receive keys</h2>
+<ol>
+<li>Go to your partners keys and open the key you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the your device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_start.html b/OpenKeychain/src/main/res/raw-bg/help_start.html
new file mode 100644
index 000000000..92fd4a92a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/help_start.html
@@ -0,0 +1,19 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
+
+<h2>I found a bug in OpenKeychain!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+
+<h2>Contribute</h2>
+<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Translations</h2>
+<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/help_wot.html b/OpenKeychain/src/main/res/raw-bg/help_wot.html
new file mode 100644
index 000000000..2a551f79c
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/help_wot.html
@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Web of Trust</h2>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+
+<h2>Support in OpenKeychain</h2>
+<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+
+<h2>Trust Model</h2>
+<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+
+<h2>Certifying keys</h2>
+<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-bg/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-bg/nfc_beam_share.html
new file mode 100644
index 000000000..083e055c7
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-bg/nfc_beam_share.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.html b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
index f90af31f0..af9e49137 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.html
@@ -14,7 +14,7 @@
 <h2>3.1</h2>
 <ul>
 <li>Fix crash on Android 5</li>
-<li>New certify screen</li>
+<li>Nová obrazovka certifikace</li>
 <li>Secure Exchange directly from key list (SafeSlinger library)</li>
 <li>New QR Code program flow</li>
 <li>Redesigned decrypt screen</li>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
@@ -110,11 +110,11 @@ Besides several small patches, a notable number of patches are made by the follo
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
 <ul>
 <li>New unified key list</li>
-<li>Colorized key fingerprint</li>
+<li>Obarvit otisk klíče</li>
 <li>Support for keyserver ports</li>
 <li>Deactivate possibility to generate weak keys</li>
 <li>Much more internal work on the API</li>
-<li>Certify user ids</li>
+<li>Certifikovat uživatelská ID</li>
 <li>Keyserver query based on machine-readable output</li>
 <li>Lock navigation drawer on tablets</li>
 <li>Suggestions for emails on creation of keys</li>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_start.html b/OpenKeychain/src/main/res/raw-cs/help_start.html
index 58639f43a..5a665ea24 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_start.html
@@ -4,7 +4,7 @@
 <h2>Začínáme</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Našel jsem chybu v OpenKeychain!</h2>
 <p>Nahlašte prosím chybu na <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">bug trackeru OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-cs/help_wot.html b/OpenKeychain/src/main/res/raw-cs/help_wot.html
index 5b8186009..29b4fc420 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Síť důvěry</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Podpora v OpenKeychain</h2>
 <p>Podpora pro síť důvěry v OpenKeychain je teprve ve svých začátcích. Tento stav se bude velmi měnit v dalších verzích aplikace.</p>
diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html
index 0979684ac..aae29a2a6 100644
--- a/OpenKeychain/src/main/res/raw-de/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-de/help_changelog.html
@@ -4,11 +4,11 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Behoben: Schlüsselexport in Datei (Jetzt wirklich)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
+<li>Behoben: Schlüsselexport in Datei (wurde nur teilweise geschrieben)</li>
 <li>Absturz auf Android 2.3 behoben</li>
 </ul>
 <h2>3.1</h2>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fehler bei der Entschlüsselung symmetrischer PGP Nachrichten/Dateien behoben</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refaktorisierter Schlüsselbearbeitungsbildschirm (Dank an Ash Hughes)</li>
 <li>Neues modernes Design für Verschlüsselungs-/Entschlüsselungs-Bildschirme</li>
 <li>OpenPGP API Version 3 (mehrfache API-Konten, interne Fehlerbehebungen, Schlüsselsuche)</li>
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
index 735961dc9..9d37a4cc6 100644
--- a/OpenKeychain/src/main/res/raw-de/help_start.html
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
@@ -4,7 +4,7 @@
 <h2>Los geht's</h2>
 <p>Zuerst wird ein geheimer Schlüssel benötigt. Erstelle einen über das Menü "Keys" oder importiere einen bereits existierenden geheimen Schlüssel. Anschließend kannst du die Schlüssel deiner Freunde herunterladen oder über QR-Codes oder NFC austauschen.</p>
 
-<p>Auf Android-Geräte mit einer kleineren Versionsnummer als 4.4 wird empfohlen den Datei-Browser <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> zu installieren. Um QR-Codes zu scannen, wird der <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> benötigt. Ein Klick auf die Links öffnet den Google Play Store oder F-Droid, von wo die Programme installiert werden können.</p>
+<p>Auf Android-Geräte mit einer kleineren Versionsnummer als 4.4 wird empfohlen den Datei-Browser <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> zu installieren.</p>
 
 <h2>Ich habe einen Fehler in OpenKeychain gefunden!</h2>
 <p>Bitte berichten Sie Bugs mithilfe des <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Issue Trackers der OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index 1c9680230..e404fecf1 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -4,7 +4,7 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Repara la exportación de claves hacia ficheros (ahora de verdad)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Repara descifrado de mensajes/ficheros pgp simétricos</li>
+<li>Repara el descifrado de ficheros/mensajes OpenPGP simétricos</li>
 <li>Pantalla de edición de clave refactorizada (gracias a Ash Hughes)</li>
 <li>Nuevo diseño moderno para pantallas de cifrado/descifrado</li>
 <li>API de OpenPGP version 3 (múltiples cuentas api, reparaciones internas, búsqueda de clave)</li>
diff --git a/OpenKeychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html
index eb56fe3f4..c3755f014 100644
--- a/OpenKeychain/src/main/res/raw-es/help_start.html
+++ b/OpenKeychain/src/main/res/raw-es/help_start.html
@@ -4,7 +4,7 @@
 <h2>Primeros pasos</h2>
 <p>Primero, necesita una clave personal. Cree una a través del menú en "Claves" o importe claves secretas (privadas) existentes. Después, puede descargar las claves de sus amigos o intercambiarlas mediante códigos QR o transmisión NFC.</p>
 
-<p>Sobre un Android inferior a la 4.4, se recomienda que instale <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> para una selección de ficheros mejorada. Para compartir mediante códigos QR instale <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Haga clic en los enlaces para abrir la Google Play Store o F-Droid para instalarlos.</p>
+<p>En Android inferior a 4.4, se recomienda que instale <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> para una selección de ficheros mejorada.</p>
 
 <h2>¡He encontrado un bug en OpenKeychain!</h2>
 <p>Por favor, informa de errores usando el <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">seguimiento de incidencias de OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-es/help_wot.html b/OpenKeychain/src/main/res/raw-es/help_wot.html
index b3b65d4b2..3af2cae10 100644
--- a/OpenKeychain/src/main/res/raw-es/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-es/help_wot.html
@@ -1,11 +1,11 @@
 <html>
 <head></head>
 <body>
-<h2>Web of Trust</h2>
-<p>El Web of Trust (web de confianza) describe la parte de PGP que trata con la creación y catalogación de certificaciones. Proporciona mecanismos para ayudar al usuario a llevar un seguimiento de a quién pertenece una clave pública, y comparte esta información con otros. Para asegurar la privacidad de las comunicaciones cifradas, es esencial saber que la clave pública que usted cifra pertenece a la misma persona que usted piensa.</p>
+<h2>Anillo de confianza</h2>
+<p>El anillo de confianza (web of trust) describe la parte de OpenPGP que se encarga de la creación y registro de las certificaciones. Proporciona mecanismos para ayudar al usuario a llevar un seguimiento de a quién pertenece una clave pública, y compartir esta información con otros. Para asegurar la privacidad de la comunicación cifrada, es esencial saber que la clave pública con la que usted la cifra pertenece a la persona que usted cree.</p>
 
 <h2>Soporte en OpenKeychain</h2>
-<p>Sólo hay soporte básico para Web of Trust (web de confianza) en OpenKeychain. Este es un duro trabajo que tenemos en marcha sujeto a cambios en versiones posteriores.</p>
+<p>Sólo hay soporte básico para el anillo de confianza (web of trust) en OpenKeychain. Esta es una pesada tarea que tenemos en marcha sujeta a cambios en versiones posteriores.</p>
 
 <h2>Modelo de confianza</h2>
 <p>La evaluación de la confianza está basada en la simple asunción de que todas las claves que tienen disponibles claves privadas (secretas) son de confianza. Las claves públicas que contienen al menos una identificación de usuario certificada por una clave de confianza serán marcadas con un punto verde en los listados de claves. No es posible (aún) especificar niveles de confianza para certificados de otras claves públicas conocidas.</p>
diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-et/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-et/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html
index 4f029ab37..92fd4a92a 100644
--- a/OpenKeychain/src/main/res/raw-et/help_start.html
+++ b/OpenKeychain/src/main/res/raw-et/help_start.html
@@ -4,7 +4,7 @@
 <h2>Getting started</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-et/help_wot.html b/OpenKeychain/src/main/res/raw-et/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-et/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-et/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.html b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_start.html b/OpenKeychain/src/main/res/raw-fi/help_start.html
index 4f029ab37..92fd4a92a 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_start.html
@@ -4,7 +4,7 @@
 <h2>Getting started</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fi/help_wot.html b/OpenKeychain/src/main/res/raw-fi/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-fi/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-fi/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
index da2d7eada..97b42c6a6 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.html
@@ -4,7 +4,7 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Correctif - Exportation des clefs vers des fichiers (vraiment, maintenant)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
@@ -54,7 +54,7 @@
 <li>Correctif - Utilisation de clefs dépouillées</li>
 <li>SHA256 par défaut pour la compatibilité</li>
 <li>L'API des intentions a changé, voir https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>L'API d'OpenPGP gère maintenant les clefs révoquées/expirées et retourne tous les ID d'utilisateurs</li>
+<li>L'API d'OpenPGP gère maintenant les clefs révoquées/expirées et retourne tous les ID utilisateurs</li>
 </ul>
 <h2>2.9</h2>
 <ul>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Correctif -Déchiffrement de messages/fichiers pgp symétriques</li>
+<li>Correctif - Déchiffrement des messages/fichiers symétriques OpenPGP</li>
 <li>Écran de modification des clefs remanié (merci à Ash Hughes)</li>
 <li>Nouvelle conception moderne pour les écrans de chiffrement/déchiffrement</li>
 <li>API OpenPGP version 3 (comptes multiples d'api, correctifs internes, recherche de clefs)</li>
@@ -114,7 +114,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>Prise en charge des ports des serveurs de clefs</li>
 <li>Désactiver la possibilité de générer des clefs faibles</li>
 <li>Encore plus de travail interne dans l'API</li>
-<li>Certifier les ID d'utilisateurs</li>
+<li>Certifier les ID utilisateurs</li>
 <li>Requêtes des serveurs de clefs basées sur des sorties assimilables par la machine</li>
 <li>Verrouiller les tiroirs de navigation sur les tablettes</li>
 <li>Suggestion de courriels à la création de clefs</li>
@@ -132,7 +132,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>Plus de correctifs internes affectant la modifications des clefs (merci à Ash hughes)</li>
 <li>Interrogation des serveurs de clefs directement depuis l'écran d'importation</li>
 <li>Correctif - Mise en page et du style des fenêtres de dialogue sur Android 2.2-3.0</li>
-<li>Correctif - Plantage pour les clefs avec des ID d'utilisateur vides</li>
+<li>Correctif - Plantage pour les clefs avec des ID utilisateur vides</li>
 <li>Correctif - Plantage et listes vides en revenant de l'écran de signature</li>
 <li>Bouncy Castle (bibliothèque cryptographique) mise à jour de 1.47 à 1.50 et compilée depuis la source</li>
 <li>Correctif - Téléversement d'une clef depuis l'écran de signature</li>
@@ -213,7 +213,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>Listes de clefs filtrables</li>
 <li>Présélection plus intelligente des clefs de chiffrement</li>
 <li>Nouvelle gestion des intentions pour VIEW et SEND, permet le chiffrement/déchiffrement des fichiers depuis les gestionnaires de fichiers</li>
-<li>Correctifs et fonctions additionnelles (présélection des clefs) pour K-9-Mail, nouvelle version bêta disponible</li>
+<li>Correctifs et fonctions additionnelles (présélection des clefs) pour K-9-Mail, nouvelle version bêta proposée</li>
 </ul>
 <h2>1.0.1</h2>
 <ul>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html
index 5440125ea..030a429e0 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_start.html
@@ -4,7 +4,7 @@
 <h2>Commencer</h2>
 <p>Vous avez d'abord besoin d'une clef personnelle. Créez-en une avec l'option du menu « Clefs » ou importez des clefs secrètes existantes. Ensuite vous pourrez télécharger les clefs de vos amis, ou les échanger par codes QR ou NFC.</p>
 
-<p>Sur les versions d'Android antérieures à 4.4, il vous est recommandé d'installer le<a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour une sélection améliorée des fichiers. Pour le partage par codes QR, installez le <a href="market://details?id=com.google.zxing.client.android">lecteur de codes à barres</a>. Cliquer sur les liens ouvrira Google Play Store ou F-Droid pour l'installation</p>
+<p>Sur les versions d'Android antérieures à 4.4, il vous est recommandé d'installer le<a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour une sélection améliorée des fichiers.</p>
 
 <h2>J'ai trouvé un bogue dans OpenKeychain !</h2>
 <p>Veuillez rapporter le bogue en utilisant le <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">gestionnaire de bogue d'OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-fr/help_wot.html b/OpenKeychain/src/main/res/raw-fr/help_wot.html
index c15e6eefd..6763b8969 100644
--- a/OpenKeychain/src/main/res/raw-fr/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-fr/help_wot.html
@@ -1,17 +1,17 @@
 <html>
 <head></head>
 <body>
-<h2>Toile confiance</h2>
-<p>La toile de confiance décrit la partie de PGP qui s'occupe de la création et du suivi des certifications. Elle fournit des mécanismes pour aider l'utilisateur à suivre à qui appartient une clef publique, et partager cette information avec les autres. Pour assurer la confidentialité d'une communication chiffrée, il est essentiel de savoir que la clef publique vers laquelle vous chiffrez appartient à la personne à qui vous croyez qu'elle appartient.</p>
+<h2>Toile de confiance</h2>
+<p>La toile de confiance décrit la partie d'OpenPGP qui s'occupe de la création et du suivi des certifications. Elle fournit des mécanismes pour aider l'utilisateur à suivre à qui appartient une clef publique, et partager cette information avec d'autres. Pour assurer la confidentialité d'une communication chiffrée, il est essentiel de savoir que la clef publique vers laquelle vous chiffrez appartient à la personne à qui vous croyez qu'elle appartient.</p>
 
 <h2>Prise en charge dans OpenKeychain</h2>
 <p>OpenKeychain offre seulement une prise en charge de base de la toile de confiance. Un travail important est en cours et ceci pourrait changer dans les versions à venir.</p>
 
 <h2>Modèle de confiance</h2>
-<p>L'évaluation de la confiance est fondée sur la simple supposition que toutes les clefs ayant des clefs secrètes disponibles sont de confiance. Les clefs publiques contenant au moins un ID d'utilisateur certifié par une clef de confiance seront marquées par un point vert dans le listage des clefs. Il n'est pas (encore) possible de spécifier les niveaux de confiance pour les certificats d'autres clefs publiques inconnues.</p>
+<p>L'évaluation de la confiance est fondée sur la simple supposition que toutes les clefs proposant des clefs secrètes sont de confiance. Les clefs publiques contenant au moins un ID utilisateur certifié par une clef de confiance seront marquées par un point vert dans le listage des clefs. Il n'est pas (encore) possible de spécifier les niveaux de confiance pour les certificats d'autres clefs publiques inconnues.</p>
 
 <h2>Certifications des clefs</h2>
-<p>La prise en charge de la certification des clefs est disponible et les ID d'utilisateurs peuvent être certifiées individuellement. Il n'est pas encore possible de spécifier le niveau de confiance ou de créer des certificats locaux et d'autres types spéciaux.</p>
+<p>La prise en charge de la certification des clefs est proposée et les ID utilisateurs peuvent être certifiées individuellement. Il n'est pas encore possible de spécifier le niveau de confiance ou de créer des certificats locaux et d'autres types spéciaux.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.html b/OpenKeychain/src/main/res/raw-is/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-is/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-is/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-is/help_start.html b/OpenKeychain/src/main/res/raw-is/help_start.html
index 4f029ab37..92fd4a92a 100644
--- a/OpenKeychain/src/main/res/raw-is/help_start.html
+++ b/OpenKeychain/src/main/res/raw-is/help_start.html
@@ -4,7 +4,7 @@
 <h2>Getting started</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-is/help_wot.html b/OpenKeychain/src/main/res/raw-is/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-is/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-is/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.html b/OpenKeychain/src/main/res/raw-it/help_changelog.html
index f56362c11..bbb765bc3 100644
--- a/OpenKeychain/src/main/res/raw-it/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-it/help_changelog.html
@@ -4,23 +4,23 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Corretta esportazione chiavi su file (ora per davvero)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>Corretta esportazione chiavi su file (la scrittura era parziale)</li>
+<li>Corretto crash su Android 2.3</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
+<li>Corretto crash su Android 5</li>
+<li>Nuova schermata di certificazione</li>
+<li>Scambio sicuro direttamente dalla lista delle chiavi (libreria SafeSlinger)</li>
+<li>Nuovo programma di flusso QR Code</li>
+<li>Schermata di decodifica ridisegnata</li>
+<li>Nuove icone e colori</li>
+<li>Corretta importazione di chiavi segrete da Symantec Encryption Desktop</li>
+<li>ID delle sottochiavi Yubikey sono controllati correttamente</li>
 </ul>
 <h2>3.0.1</h2>
 <ul>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Corretta la decodifica di messaggi PGP / file simmetrici</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactoring della schermata di modifica chiave (grazie a Ash Hughes)</li>
 <li>Nuovo design moderno per le schermate di codifica / decodifica</li>
 <li>OpenPGP API versione 3 (api account multipli, correzioni interne, ricerca chiavi)</li>
diff --git a/OpenKeychain/src/main/res/raw-it/help_start.html b/OpenKeychain/src/main/res/raw-it/help_start.html
index e75b209ff..ecf52eadd 100644
--- a/OpenKeychain/src/main/res/raw-it/help_start.html
+++ b/OpenKeychain/src/main/res/raw-it/help_start.html
@@ -4,7 +4,7 @@
 <h2>Per iniziare</h2>
 <p>In primo luogo è necessaria una chiave segreta personale. Creane una tramite il menu opzioni sotto la voce "Chiavi" o importa chiavi segrete già esistenti. Successivamente, è possibile scaricare le chiavi dei vostri amici o scambiarle con i codici QR o NFC.</p>
 
-<p>In Android precedente 4.4, si raccomanda di installare <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> per una migliore selezione dei file. Per condividere via Codici QR <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. I collegamenti verranno aperti in Google Play Store o F-Droid per l'installazione.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Ho trovato un bug in OpenKeychain!</h2>
 <p>Per favore riporta i bug usando il <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker di OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-it/help_wot.html b/OpenKeychain/src/main/res/raw-it/help_wot.html
index 98e3aafea..09b38199b 100644
--- a/OpenKeychain/src/main/res/raw-it/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-it/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Rete di Fiducia</h2>
-<p>La Rete di Fiducia descrive la parte del PGP che si occupa di creazione e gestione delle certificazioni. Essa fornisce meccanismi per aiutare l'utente a tenere traccia di chi appartiene una chiave pubblica, e condividere queste informazioni con gli altri; Per garantire la privacy della comunicazione crittografata, è essenziale sapere che la chiave pubblica per crittografare appartiene alla persona che si pensa.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Supporto in OpenKeychain</h2>
 <p>Esiste solo un supporto di base per le Reti di Fiducia in OpenKeychain. Questo è un grosso lavoro in corso e soggetto a modifiche nei prossimi rilasci.</p>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
index c682d870b..f6ceaa427 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.html
@@ -4,11 +4,11 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>鍵のファイルへのエクスポートの修正 (現実的になりました)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>鍵のファイルへのエクスポートの修正 (私たちは部分的に作成)</li>
+<li>鍵のファイルへのエクスポートの修正 (部分的に修正)</li>
 <li>Android 2.3でのクラッシュ修正</li>
 </ul>
 <h2>3.1</h2>
@@ -106,7 +106,7 @@
 </ul>
 <h2>2.4</h2>
 <p>このリリースにおいて適用したリッチでバグのない機能を作ってくれたGoogle Summer of Code 2014の参加者たちに感謝を!
-また、以下の人達(アルファベット順)の作ってくれたいくつもののさなパッチや相当数のパッチにも:
+また、以下の人達(アルファベット順)の作ってくれたいくつもの小さなパッチや相当数のパッチにも:
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
 <ul>
 <li>新しい統合キーリスト</li>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html
index db9841568..d9f73428a 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_start.html
@@ -4,7 +4,7 @@
 <h2>入門</h2>
 <p>最初にあなたの個人用鍵ペアが必要になります。メニューの"鍵"で生成するか、既存の鍵ペアをインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p>
 
-<p>Android 4.4 以下の場合、拡張したファイルの選択のためには<a href="market://details?id=org.openintents.filemanager">OI File Manager</a>のインストールを推奨します。QRコードの共有には<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>です。このリンクをクリックすると Google Play ストアか F-Droid が開きます。</p>
+<p>Android 4.4 未満の場合、拡張したファイルの選択のためには<a href="market://details?id=org.openintents.filemanager">OI File Manager</a>のインストールを推奨します。</p>
 
 <h2>OpenKeychainでバグを見付けた!</h2>
 <p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p>
diff --git a/OpenKeychain/src/main/res/raw-ja/help_wot.html b/OpenKeychain/src/main/res/raw-ja/help_wot.html
index 01b523d76..e4db99bb8 100644
--- a/OpenKeychain/src/main/res/raw-ja/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-ja/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>信頼の輪</h2>
-<p>信頼の輪はPGPが証明の作成と維持する一面を説明します。ユーザが公開鍵が属する者の追跡を維持し、他のユーザとその情報を共有する手助けになるメカニズムを提供します。暗号化通信のプライバシーを確保するためには、あなたが暗号化したいという相手の公開鍵が必要な要素となります</p>
+<p>信頼の輪はOpenPGPの一面で証明の作成とその維持の一面を説明します。ユーザが公開鍵に属する者の追跡を維持し、他のユーザーとその情報を共有する手助けになるメカニズムを提供します。暗号化通信のプライバシーを確保するためには、あなたが暗号化したいという相手の公開鍵が必要な要素となります。</p>
 
 <h2>OpenKeychainでサポート</h2>
 <p>OpenKeychainで信頼の輪の基本のみサポートされます。とても重い作業を進めており今後やってくるリリースにおいて状態が変更されていきます。</p>
@@ -11,7 +11,7 @@
 <p>信頼の評価はシンプルな仮定に基づいています、それはすべての鍵は秘密鍵が信頼できるというものです。公開鍵は信頼された鍵で検証された最低1つのユーザIDを含んでおり、それは鍵リストにおいて、緑でマークされます。ただしそれは他の既知の公開鍵の信頼レベルを特別なものには(まだ)しません。</p>
 
 <h2>鍵の検証</h2>
-<p>鍵検証のサポートが提供されており、ユーザIDは個別に検証できます。ただしそれは他の既知の公開鍵の信頼レベルを特別なものにはまだしないか他の特別なタイプの証明です。</p>
+<p>鍵検証のサポートが提供されており、またユーザIDは個別に検証できます。ただしそれは他の既知の公開鍵の信頼レベルを特別なものにはしないローカルもしくは他の特別なタイプの証明です。</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_about.html b/OpenKeychain/src/main/res/raw-nl/help_about.html
index 0bc9f6f70..33622b7c5 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_about.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_about.html
@@ -5,9 +5,9 @@
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> is een OpenPGP implementatie voor Android.</p>
 <p>Licentie: GPLv3+</p>
 
-<h2>Developers</h2>
+<h2>Ontwikkelaars</h2>
 <ul>
-<li>Dominik Schürmann (Maintainer)</li>
+<li>Dominik Schürmann (beheerder)</li>
 <li>Art O Cathain</li>
 <li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
@@ -35,13 +35,13 @@
 <li>
 <a href="http://developer.android.com/tools/support-library/index.html">Android Support Bibliotheek v7 'appcompat'</a> (Apache Licentie v2)</li>
 <li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache-licentie v2)</li>
 <li>
-<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache-licentie v2)</li>
 <li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache-licentie v2)</li>
 <li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache-licentie v2)</li>
 <li>
 <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Licentie v2)</li>
 <li>
@@ -51,7 +51,7 @@
 <li>
 <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache Licentie v2)</li>
 <li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT-licentie)</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.html b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
index 4d3d293ac..809ffa6e6 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.html
@@ -4,228 +4,228 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Oplossing voor exporteren van sleutels naar bestanden (deze keer echt)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>Oplossing voor exporteren van sleutels naar bestanden (ze werden maar gedeeltelijk geschreven)</li>
+<li>Oplossing voor crash op Android 2.3</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
+<li>Oplossing voor crash op Android 5</li>
+<li>Nieuw certificeerscherm</li>
+<li>Veilig uitwisselen vanuit sleutellijst (SafeSlinger bibliotheek)</li>
+<li>Nieuwe QR code programma flow</li>
+<li>Nieuw design voor ontcijferingsscherm</li>
+<li>Nieuw icoon en kleuren</li>
+<li>Oplossing voor importeren van geheime sleutels van Symantec Encryption Desktop</li>
+<li>Subsleutel-ID's op Yubikeys worden nu currect gecontroleerd</li>
 </ul>
 <h2>3.0.1</h2>
 <ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
+<li>Grote sleutelimportaties worden beter behandeld</li>
+<li>Subsleutelselectie verbeterd</li>
 </ul>
 <h2>3.0</h2>
 <ul>
-<li>Full support for Yubikey signature generation and decryption!</li>
-<li>Propose installable compatible apps in apps list</li>
-<li>New design for decryption screens</li>
-<li>Many fixes for key import, also fixes stripped keys</li>
-<li>Honor and display key authenticate flags</li>
-<li>User interface to generate custom keys</li>
-<li>Fixing user id revocation certificates</li>
-<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
-<li>Support for stripping keys inside OpenKeychain</li>
+<li>Volledige ondersteuning voor Yubikey ondertekeningsgeneratie en ontcijfering!</li>
+<li>Stel installeerbare compatibele apps voor in apps-lijst</li>
+<li>Nieuw design voor ontcijferingsschermen</li>
+<li>Veel oplossingen voor sleutelimporteren, lost ook gestripte sleutels op</li>
+<li>Eer en toon sleutelauthenticatievlaggen</li>
+<li>Gebruikersinterface om eigen sleutels aan te maken</li>
+<li>Oplossing voor gebruikers-ID-intrekkingscertificaten</li>
+<li>Nieuwe cloud search (zoekt op traditionele sleutelservers en keybase.io)</li>
+<li>Ondersteuning voor strippen van sleutels in OpenKeychain</li>
 </ul>
 <h2>2.9.2</h2>
 <ul>
-<li>Fix keys broken in 2.9.1</li>
-<li>Yubikey decryption now working via API</li>
+<li>Oplossing voor gebroken sleutels in 2.9.1</li>
+<li>Yubikey ontsleuteling werkt nu via API</li>
 </ul>
 <h2>2.9.1</h2>
 <ul>
-<li>Split encrypt screen into two</li>
-<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
-<li>Improved passphrase handling</li>
-<li>Key sharing via SafeSlinger</li>
-<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
-<li>Fix usage of stripped keys</li>
-<li>SHA256 as default for compatibility</li>
-<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+<li>Deel versleutelingsscherm in twee</li>
+<li>Oplossing voor sleutelvlaggen (ondersteunt nu Mailvelope 0.7 sleutels)</li>
+<li>Verbeterde behandeling van wachtwoorden</li>
+<li>Sleutels delen via SafeSlinger</li>
+<li>Yubikey: optie om andere PINs toe te staan, momenteel werkt enkel ondertekenen via de OpenPGP API, niet in OpenKeychain zelf</li>
+<li>Oplossing voor gestripte sleutels</li>
+<li>SHA256 als standaard voor compatibiliteit</li>
+<li>Intent API is veranderd, zie https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API behandelt nu ingetrokken/verlopen sleutels en geeft alle gebruikers-ID's weer</li>
 </ul>
 <h2>2.9</h2>
 <ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimental ECC support</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</li>
+<li>Oplossing voor crashes geïntroduceerd in v2.8</li>
+<li>Experimentele ondersteuning voor ECC</li>
+<li>Experimentele ondersteuning voor Yubikey (alleen ondertekenen met geïmporteerde sleutels)</li>
 </ul>
 <h2>2.8</h2>
 <ul>
-<li>So many bugs have been fixed in this release that we focus on the main new features</li>
-<li>Key edit: awesome new design, key revocation</li>
-<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>New first time screen</li>
-<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>File encryption: awesome new design, support for encrypting multiple files</li>
-<li>New icons to show status of key (by Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notification showing cached passphrases</li>
-<li>Keys are connected to Android's contacts</li>
-</ul>
-<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>
+<li>Er zijn zoveel bugs opgelost in deze release dat we kunnen focussen op de belangrijke nieuwe mogelijkheden</li>
+<li>Sleutels wijzigen: nieuw design, sleutels intrekken</li>
+<li>Sleutels importeren: nieuw design, veilige verbindingen met sleutelservers via hkps, sleutelserver resolving via DNS SRV records</li>
+<li>Nieuw eerste gebruiksscherm</li>
+<li>Nieuw scherm voor sleutels aanmaken: automatisch aanvullen van naam en e-mailadres gebaseerd op persoonlijke Android-accounts</li>
+<li>Bestandsversleuteling: nieuw design, ondersteuning voor versleutelen van meerdere bestanden</li>
+<li>Nieuwe iconen om sleutelstatus weer te geven (door Brennan Novak)</li>
+<li>Belangrijke bugfix: importeren van grote sleutelbossen uit een bestand is nu mogelijk</li>
+<li>Melding om gecachete wachtwoorden weer te geven</li>
+<li>Sleutels worden verbonden aan Android's contacten</li>
+</ul>
+<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</p>
 
 <h2>2.7</h2>
 <ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>New key view design (Dominik, Vincent)</li>
-<li>New flat Android buttons (Dominik, Vincent)</li>
-<li>API fixes (Dominik)</li>
-<li>Keybase.io import (Tim Bray)</li>
+<li>Paars! (Dominik, Vincent)</li>
+<li>Nieuw design voor bekijken van sleutels (Dominik, Vincent)</li>
+<li>Nieuwe platte Android-knoppen (Dominik, Vincent)</li>
+<li>API-oplossingen (Dominik)</li>
+<li>Importeren uit keybase.io (Tim Bray)</li>
 </ul>
 <h2>2.6.1</h2>
 <ul>
-<li>Some fixes for regression bugs</li>
+<li>Enkele oplossingen voor regressies</li>
 </ul>
 <h2>2.6</h2>
 <ul>
-<li>Key certifications (thanks to Vincent Breitmoser)</li>
-<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>New design for signature verification</li>
-<li>Custom key length (thanks to Greg Witczak)</li>
-<li>Fix share-functionality from other apps</li>
+<li>Sleutelcertificaties (dank aan Vincent Breitmoser)</li>
+<li>Ondersteuning voor GnuPG gedeeltelijke geheime sleutels (dank aan Vincent Breitmoser)</li>
+<li>Nieuw design voor ondertekeningsverificatie</li>
+<li>Aangepaste sleutellengte (dank aan Greg Witczak)</li>
+<li>Oplossing voor delen vanuit andere apps</li>
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
-<li>Refactored key edit screen (thanks to Ash Hughes)</li>
-<li>New modern design for encrypt/decrypt screens</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+<li>Oplossing voor ontcijfering van symmetrische OpenPGP berichten/bestanden</li>
+<li>Nieuw ontwerp voor sleutelbewerkingsscherm (dank aan Ash Hughes)</li>
+<li>Nieuw modern design voor versleutelings/ontcijferingsschermen</li>
+<li>OpenPGP API versie 3 (meerdere API accounts, interne fixes, zoeken naar sleutels)</li>
 </ul>
 <h2>2.4</h2>
-<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):
+<p>Dank aan alle deelnemers aan Google Summer of Code 2014 die deze release zo vol mogelijkheden en zonder bugs hebben gemaakt!
+Buiten verschillende kleine patches, werden een groot aantal patches gemaakt door volgende personen (alfabetisch gerangschikt):
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
 <ul>
-<li>New unified key list</li>
-<li>Colorized key fingerprint</li>
-<li>Support for keyserver ports</li>
-<li>Deactivate possibility to generate weak keys</li>
-<li>Much more internal work on the API</li>
-<li>Certify user ids</li>
-<li>Keyserver query based on machine-readable output</li>
-<li>Lock navigation drawer on tablets</li>
-<li>Suggestions for emails on creation of keys</li>
-<li>Search in public key lists</li>
-<li>And much more improvements and fixes…</li>
+<li>Nieuwe geünificeerde sleutellijst</li>
+<li>Gekleurde sleutelvingerafdruk</li>
+<li>Ondersteuning voor sleutelserver-poorten</li>
+<li>Zet mogelijkheid om zwakke sleutels aan te maken uit</li>
+<li>Veel meer intern werk aan API</li>
+<li>Certificeer gebruikers-ID's</li>
+<li>Sleutelserverzoekopdracht gebaseerd op machine-leesbare output</li>
+<li>Zet navigatiedrawer op tablets vast</li>
+<li>Suggesties voor e-mailadress bij aanmaken van sleutels</li>
+<li>Zoeken in publieke sleutellijsten</li>
+<li>En veel more verbeteringen en fixes...</li>
 </ul>
 <h2>2.3.1</h2>
 <ul>
-<li>Hotfix for crash when upgrading from old versions</li>
+<li>Hotfix voor crash bij upgraden van oude versies</li>
 </ul>
 <h2>2.3</h2>
 <ul>
-<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
-<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
-<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>Querying keyservers directly from the import screen</li>
-<li>Fix layout and dialog style on Android 2.2-3.0</li>
-<li>Fix crash on keys with empty user ids</li>
-<li>Fix crash and empty lists when coming back from signing screen</li>
-<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
-<li>Fix upload of key from signing screen</li>
+<li>Verwijder onnodige export van publieke sleutels bij exporteren van geheime sleutel (dank aan Ash Hughes)</li>
+<li>Oplossing voor verloopdata op sleutels (dank aan Ash Hughes)</li>
+<li>Meer interne fixes by bewerken van sleutels (dank aan Ash Hughes)</li>
+<li>Zoeken op sleutelservers rechtstreeks van importscherm</li>
+<li>Oplossing voor layout en dialoogstijl op Android 2.2-3.0</li>
+<li>Oplossing voor crash op sleutels met lege gebruikers-ID's</li>
+<li>Oplossing voor crash en lege lijsten bij terugkeren van ondertekeningsscherm</li>
+<li>Bouncy Castle (cryptografie-bibliotheek) geüpdatet van 1.47 naar 1.50 en built from source</li>
+<li>Oplossing voor uploaden van sleutel van ondertekeningsscherm</li>
 </ul>
 <h2>2.2</h2>
 <ul>
-<li>New design with navigation drawer</li>
-<li>New public key list design</li>
-<li>New public key view</li>
-<li>Bug fixes for importing of keys</li>
-<li>Key cross-certification (thanks to Ash Hughes)</li>
-<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
-<li>First version with new languages (thanks to the contributors on Transifex)</li>
-<li>Sharing of keys via QR Codes fixed and improved</li>
-<li>Package signature verification for API</li>
+<li>Nieuw design met navigatiebalk</li>
+<li>Nieuw publieke sleutellijst design</li>
+<li>Nieuwe publieke sleutel view</li>
+<li>Bugfixes voor importeren van sleutels</li>
+<li>Sleutel certificatie (dank aan Ash Hughes)</li>
+<li>Behandel UTF-8 wachtwoorden correct (dank aan Ash Hughes)</li>
+<li>Eerste versie met nieuwe talen (dank aan de medewerkers op Transifex)</li>
+<li>Delen van sleutels via QR codes opgelost en verbeterd</li>
+<li>Pakketondertekeningsverificatie voor API</li>
 </ul>
 <h2>2.1.1</h2>
 <ul>
-<li>API Updates, preparation for K-9 Mail integration</li>
+<li>API updates, voorbereiding voor K-9 Mail integratie</li>
 </ul>
 <h2>2.1</h2>
 <ul>
-<li>Lots of bug fixes</li>
-<li>New API for developers</li>
-<li>PRNG bug fix by Google</li>
+<li>Veel bugfixes</li>
+<li>Nieuwe API voor ontwikkelaars</li>
+<li>PRNG bug fix door Google</li>
 </ul>
 <h2>2.0</h2>
 <ul>
-<li>Complete redesign</li>
-<li>Share public keys via QR codes, NFC beam</li>
-<li>Sign keys</li>
-<li>Upload keys to server</li>
-<li>Fixes import issues</li>
-<li>New AIDL API</li>
+<li>Volledig nieuw design</li>
+<li>Publieke sleutels delen via QR codes, NFC beam</li>
+<li>Sleutels ondertekenen</li>
+<li>Upload sleutels naar server</li>
+<li>Importeerproblemen opgelost</li>
+<li>Nieuwe AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>Basic keyserver support</li>
-<li>App2sd</li>
-<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
-<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>Basisondersteuning voor sleutelservers</li>
+<li>App2SD</li>
+<li>Meer keuzes voor wachtwoordcache: 1, 2, 4, 8 uur</li>
+<li>Vertalingen: Noors (bedankt, Sander Danielsen), Chinees (bedankt, Zhang Fredrick)</li>
 <li>Bugfixes</li>
-<li>Optimizations</li>
+<li>Optimalisaties</li>
 </ul>
 <h2>1.0.7</h2>
 <ul>
-<li>Fixed problem with signature verification of texts with trailing newline</li>
-<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+<li>Probleem met ondertekeningsverificatie van text met achterlopende newline opgelost</li>
+<li>Meer opties voor wachtwoord cachetijd (20, 40, 60 min.)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
-<li>Account adding crash on Froyo fixed</li>
-<li>Secure file deletion</li>
-<li>Option to delete key file after import</li>
-<li>Stream encryption/decryption (gallery, etc.)</li>
-<li>New options (language, force v3 signatures)</li>
-<li>Interface changes</li>
+<li>Crash bij toevoegen van account op Froyo opgelost</li>
+<li>Veilige bestandsverwijdering</li>
+<li>Optie om sleutelbestand na importeren te verwijderen</li>
+<li>Stream versleuteling/ontcijfering (galerij, enz.)</li>
+<li>Nieuwe opties (taal, forceer v3 ondertekeningen)</li>
+<li>Wijzigingen in interface</li>
 <li>Bugfixes</li>
 </ul>
 <h2>1.0.5</h2>
 <ul>
-<li>German and Italian translation</li>
-<li>Much smaller package, due to reduced BC sources</li>
-<li>New preferences GUI</li>
-<li>Layout adjustment for localization</li>
-<li>Signature bugfix</li>
+<li>Duitse en Italiaanse vertaling</li>
+<li>Veel kleiner pakket, door verminderde BC bronnen</li>
+<li>Nieuwe GUI voor voorkeuren</li>
+<li>Layout wijzigingen voor localisatie</li>
+<li>Bugfix voor ondertekeningen</li>
 </ul>
 <h2>1.0.4</h2>
 <ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
+<li>Een andere crash veroorzaakt door een SDK bug met de query builder opgelost</li>
 </ul>
 <h2>1.0.3</h2>
 <ul>
-<li>Fixed crashes during encryption/signing and possibly key export</li>
+<li>Crashes tijdens versleuteling/ondertekenen en mogelijk sleutelexportatie opgelost</li>
 </ul>
 <h2>1.0.2</h2>
 <ul>
-<li>Filterable key lists</li>
-<li>Smarter pre-selection of encryption keys</li>
-<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
-<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+<li>Filterbare sleutellijsten</li>
+<li>Slimmere preselectie van cryptosleutels</li>
+<li>Nieuwe Intents voor VIEW en SEND, laat toe bestanden te versleutelen/ontcijferen vanuit bestandsbeheerders</li>
+<li>Oplossingen en nieuwe functies (sleutel preselectie) voor K-9 Mail, nieuwe beta build beschikbaar</li>
 </ul>
 <h2>1.0.1</h2>
 <ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</li>
+<li>Oplijsten van GMail accounts werkte niet in 1.0.0, opgelost</li>
 </ul>
 <h2>1.0.0</h2>
 <ul>
-<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
-<li>Support of more file managers (including ASTRO)</li>
-<li>Slovenian translation</li>
-<li>New database, much faster, less memory usage</li>
-<li>Defined Intents and content provider for other apps</li>
+<li>K-9 Mail integratie, APG ondersteuning voor beta build van K-9 Mail</li>
+<li>Ondersteuning voor meer bestandsbeheerders (waaronder ASTRO)</li>
+<li>Sloveense vertaling</li>
+<li>Nieuwe database, veel sneller, minder geheugengebruik</li>
+<li>Intents en content provider voor andere apps gedefinieerd</li>
 <li>Bugfixes</li>
 </ul>
 </body>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
index 7ba0a2d1a..4caf75748 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_nfc_beam.html
@@ -3,10 +3,10 @@
 <body>
 <h2>Hoe sleutels te ontvangen</h2>
 <ol>
-<li>Go to your partners keys and open the key you want to share.</li>
-<li>Houd de twee apparaten met de achterkant tegen elkaar (ze moeten elkaar bijna aanraken) en u zult een trilling voelen.</li>
-<li>Nadat het trilt zult u de inhoud op uw partners apparaat in een soort kaart zien veranderen met Star Trek warp snelheid-eruitziende animatie op de achtergrond.</li>
-<li>Druk op de kaart en de inhoud zal dan laden op het apparaat.</li>
+<li>Ga naar je partner's sleutels en open de sleutel die je wil delen.</li>
+<li>Houd de twee toestellen met de achterkant tegen elkaar (ze moeten elkaar bijna aanraken) en je zal een trilling voelen.</li>
+<li>Nadat het trilt zal je de inhoud op je partner's toestel in een soort kaart zien veranderen met Star Trek warp snelheid-eruitziende animatie op de achtergrond.</li>
+<li>Druk op de kaart en de inhoud zal dan laden op het toestel.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_start.html b/OpenKeychain/src/main/res/raw-nl/help_start.html
index d159c4cf0..fda3c97b1 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_start.html
@@ -2,15 +2,15 @@
 <head></head>
 <body>
 <h2>Aan de slag</h2>
-<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>Eerst heb je een persoonlijke sleutel nodig. Maak er een aan via het menu in 'Sleutels' of importeer bestaande geheime sleutels. Nadien kan je de sleutels van je vrienden downloaden of ze uitwisselen via QR codes of NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>Op Android-versies lager dan 4.4 raden we aan dat je <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> installeert voor een verbeterde bestandsselectie.</p>
 
 <h2>Ik heb een bug in OpenKeychain gevonden!</h2>
 <p>Rapporteer de bug met de <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">problemen tracker van OpenKeychain</a>.</p>
 
 <h2>Bijdragen</h2>
-<p>Als u ons wilt helpen om OpenKeychain te ontwikkelen door code bij te dragen, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">volg onze kleine gids op Github</a>.</p>
+<p>Als je ons wil helpen om OpenKeychain te ontwikkelen door code bij te dragen, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">volg onze kleine gids op Github</a>.</p>
 
 <h2>Vertalingen</h2>
 <p>Help OpenKeychain te vertalen! Iedereen kan deelnemen op <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain op Transifex</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-nl/help_wot.html b/OpenKeychain/src/main/res/raw-nl/help_wot.html
index efaac3c1e..4c72a875c 100644
--- a/OpenKeychain/src/main/res/raw-nl/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-nl/help_wot.html
@@ -2,16 +2,16 @@
 <head></head>
 <body>
 <h2>Web van Vertrouwen</h2>
-<p>het Web of Trust beschrijft het deel van PGP dat te maken heeft met aanmaken en boekhouden van certificaten. Het voorziet van mechanismes zodat de gebruiker bij kan houden van aan wie een publieke sleutel toebehoort, en deze informatie met anderen kan delen; om de privacy van versleutelde communicatie te verzekeren, is het essentiëel om te weten dat de publieke sleutel die u versleutelt, toebehoort aan de persoon aan wie u denkt dat het toebehoort.</p>
+<p>Het Web van Vertrouwen beschrijft het deel van OpenPGP dat te maken heeft met aanmaken en boekhouden van certificaten. Het voorziet van mechanismes zodat de gebruiker bij kan houden van aan wie een publieke sleutel toebehoort, en deze informatie met anderen kan delen; om de privacy van versleutelde communicatie te verzekeren, is het essentiëel om te weten dat de publieke sleutel die je versleutelt, toebehoort aan de persoon aan wie je denkt dat het toebehoort.</p>
 
-<h2>Support in OpenKeychain</h2>
-<p>Er is alleen basissupport voor Web van Vertrouwen in OpenKeychain. Dit is een zware 'werk in uitvoering' en onderwerp voor veranderingen in toekomstige releases.</p>
+<h2>Ondersteuning in OpenKeychain</h2>
+<p>Er is alleen basisondersteuning voor Web van Vertrouwen in OpenKeychain. Dit is een zware 'werk in uitvoering' en onderwerp voor veranderingen in toekomstige releases.</p>
 
-<h2>Vertrouwen Model</h2>
-<p>Vertrouwen evaluatie is gebaseerd om de simpele aanname dat alle sleutels die beschikbare geheime sleutels hebben, vertrouwd zijn. Publieke sleutels die minstens een gebruikers-id bevatten, gecertificeerd door een vertrouwde sleutel, zullen gemarkeerd worden met een groene stip in de sleutel lijsten. Het is (nog) niet mogelijk om vertrouwen niveaus voor certificaten van andere bekende publieke sleutels te specifiëren.</p>
+<h2>Vertrouwensmodel</h2>
+<p>Vertrouwensevaluatie is gebaseerd om de simpele aanname dat alle sleutels die beschikbare geheime sleutels hebben, vertrouwd zijn. Publieke sleutels die minstens een gebruikers-ID bevatten, gecertificeerd door een vertrouwde sleutel, zullen gemarkeerd worden met een groene stip in de sleutel lijsten. Het is (nog) niet mogelijk om vertrouwen niveaus voor certificaten van andere bekende publieke sleutels te specifiëren.</p>
 
-<h2>Sleutels certificeren</h2>
-<p>Support voor sleutelcertificatie is beschikbaar, en gebruikers-id's kunnen individueel gecertificeerd worden. Het is nog niet mogelijk om het niveau van vertrouwen te specifiëren om locale en andere speciale typen van certificaten te maken.</p>
+<h2>Bezig met certificeren van sleutels&lt;br&gt;</h2>
+<p>Ondersteuning voor sleutelcertificatie is beschikbaar, en gebruikers-ID's kunnen individueel gecertificeerd worden. Het is nog niet mogelijk om het niveau van vertrouwen te specifiëren om locale en andere speciale typen van certificaten te maken.</p>
 
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
index 715e1aee6..07dcd04e2 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html
index 967042b53..400a89e60 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_start.html
@@ -4,7 +4,7 @@
 <h2>Pierwsze kroki</h2>
 <p>Najpierw będziesz potrzebował osobistego klucza. Stwórz go wybierając z menu "Klucze" lub zaimportuj istniejące tajne klucze. Później możesz pobrać klucze swoich znajomych lub wymienić się używając kodów QR lub NFC.</p>
 
-<p>Na Androidzie niższym od wersji 4.4, zalecane jest zainstalowanie <a href="market://details?id=org.openintents.filemanager">OI File Manager</a>  w celu zapewnienia wygodniejszego wyboru plików. Aby dzielić się używając kodów QR zainstaluj <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Kliknięcie na powyższe linki przekieruje Cię do sklepu Google Play lub F-Droid w celu instalacji tych aplikacji.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Znalazłem błąd w OpenKeychain!</h2>
 <p>Zgłoś błąd korzystając z <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">systemu śledzenia błędów OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-pl/help_wot.html b/OpenKeychain/src/main/res/raw-pl/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-pl/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-pl/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.html b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_start.html b/OpenKeychain/src/main/res/raw-pt/help_start.html
index 4f029ab37..92fd4a92a 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_start.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_start.html
@@ -4,7 +4,7 @@
 <h2>Getting started</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>I found a bug in OpenKeychain!</h2>
 <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-pt/help_wot.html b/OpenKeychain/src/main/res/raw-pt/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-pt/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-pt/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_about.html b/OpenKeychain/src/main/res/raw-ro/help_about.html
new file mode 100644
index 000000000..2c6c5b3c4
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/help_about.html
@@ -0,0 +1,57 @@
+<html>
+<head></head>
+<body>
+<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
+<p>License: GPLv3+</p>
+
+<h2>Developers</h2>
+<ul>
+<li>Dominik Schürmann (Maintainer)</li>
+<li>Art O Cathain</li>
+<li>Ash Hughes</li>
+<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Daniel Albert</li>
+<li>Daniel Hammann</li>
+<li>Daniel Haß</li>
+<li>Greg Witczak</li>
+<li>'mar-v-in'</li>
+<li>Markus Doits</li>
+<li>Miroojin Bakshi</li>
+<li>Nikhil Peter Raj</li>
+<li>Paul Sarbinowski</li>
+<li>'Senecaso'</li>
+<li>Signe Rüsch</li>
+<li>Sreeram Boyapati</li>
+<li>Thialfihar (APG 1.x)</li>
+<li>Tim Bray</li>
+<li>Vincent Breitmoser</li>
+</ul>
+<h2>Libraries</h2>
+<ul>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.html b/OpenKeychain/src/main/res/raw-ro/help_changelog.html
new file mode 100644
index 000000000..0cb7d5210
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/help_changelog.html
@@ -0,0 +1,232 @@
+<html>
+<head></head>
+<body>
+
+<h2>3.1.2</h2>
+<ul>
+<li>Fix key export to files (now for real)</li>
+</ul>
+<h2>3.1.1</h2>
+<ul>
+<li>Fix key export to files (they were written partially)</li>
+<li>Fix crash on Android 2.3</li>
+</ul>
+<h2>3.1</h2>
+<ul>
+<li>Fix crash on Android 5</li>
+<li>New certify screen</li>
+<li>Secure Exchange directly from key list (SafeSlinger library)</li>
+<li>New QR Code program flow</li>
+<li>Redesigned decrypt screen</li>
+<li>New icon usage and colors</li>
+<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>Subkey IDs on Yubikeys are now checked correctly</li>
+</ul>
+<h2>3.0.1</h2>
+<ul>
+<li>Better handling of large key imports</li>
+<li>Improved subkey selection</li>
+</ul>
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
+<h2>2.9.2</h2>
+<ul>
+<li>Fix keys broken in 2.9.1</li>
+<li>Yubikey decryption now working via API</li>
+</ul>
+<h2>2.9.1</h2>
+<ul>
+<li>Split encrypt screen into two</li>
+<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
+<li>Improved passphrase handling</li>
+<li>Key sharing via SafeSlinger</li>
+<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
+<li>Fix usage of stripped keys</li>
+<li>SHA256 as default for compatibility</li>
+<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+</ul>
+<h2>2.9</h2>
+<ul>
+<li>Fixing crashes introduced in v2.8</li>
+<li>Experimental ECC support</li>
+<li>Experimental Yubikey support (signing-only with imported keys)</li>
+</ul>
+<h2>2.8</h2>
+<ul>
+<li>So many bugs have been fixed in this release that we focus on the main new features</li>
+<li>Key edit: awesome new design, key revocation</li>
+<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
+<li>New first time screen</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>File encryption: awesome new design, support for encrypting multiple files</li>
+<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Important bug fix: Importing of large key collections from a file is now possible</li>
+<li>Notification showing cached passphrases</li>
+<li>Keys are connected to Android's contacts</li>
+</ul>
+<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>
+
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+<h2>2.6.1</h2>
+<ul>
+<li>Some fixes for regression bugs</li>
+</ul>
+<h2>2.6</h2>
+<ul>
+<li>Key certifications (thanks to Vincent Breitmoser)</li>
+<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>New design for signature verification</li>
+<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Fix share-functionality from other apps</li>
+</ul>
+<h2>2.5</h2>
+<ul>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
+<li>Refactored key edit screen (thanks to Ash Hughes)</li>
+<li>New modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+</ul>
+<h2>2.4</h2>
+<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>
+<ul>
+<li>New unified key list</li>
+<li>Colorized key fingerprint</li>
+<li>Support for keyserver ports</li>
+<li>Deactivate possibility to generate weak keys</li>
+<li>Much more internal work on the API</li>
+<li>Certify user ids</li>
+<li>Keyserver query based on machine-readable output</li>
+<li>Lock navigation drawer on tablets</li>
+<li>Suggestions for emails on creation of keys</li>
+<li>Search in public key lists</li>
+<li>And much more improvements and fixes…</li>
+</ul>
+<h2>2.3.1</h2>
+<ul>
+<li>Hotfix for crash when upgrading from old versions</li>
+</ul>
+<h2>2.3</h2>
+<ul>
+<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>Querying keyservers directly from the import screen</li>
+<li>Fix layout and dialog style on Android 2.2-3.0</li>
+<li>Fix crash on keys with empty user ids</li>
+<li>Fix crash and empty lists when coming back from signing screen</li>
+<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
+<li>Fix upload of key from signing screen</li>
+</ul>
+<h2>2.2</h2>
+<ul>
+<li>New design with navigation drawer</li>
+<li>New public key list design</li>
+<li>New public key view</li>
+<li>Bug fixes for importing of keys</li>
+<li>Key cross-certification (thanks to Ash Hughes)</li>
+<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>First version with new languages (thanks to the contributors on Transifex)</li>
+<li>Sharing of keys via QR Codes fixed and improved</li>
+<li>Package signature verification for API</li>
+</ul>
+<h2>2.1.1</h2>
+<ul>
+<li>API Updates, preparation for K-9 Mail integration</li>
+</ul>
+<h2>2.1</h2>
+<ul>
+<li>Lots of bug fixes</li>
+<li>New API for developers</li>
+<li>PRNG bug fix by Google</li>
+</ul>
+<h2>2.0</h2>
+<ul>
+<li>Complete redesign</li>
+<li>Share public keys via QR codes, NFC beam</li>
+<li>Sign keys</li>
+<li>Upload keys to server</li>
+<li>Fixes import issues</li>
+<li>New AIDL API</li>
+</ul>
+<h2>1.0.8</h2>
+<ul>
+<li>Basic keyserver support</li>
+<li>App2sd</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
+<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>Bugfixes</li>
+<li>Optimizations</li>
+</ul>
+<h2>1.0.7</h2>
+<ul>
+<li>Fixed problem with signature verification of texts with trailing newline</li>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+</ul>
+<h2>1.0.6</h2>
+<ul>
+<li>Account adding crash on Froyo fixed</li>
+<li>Secure file deletion</li>
+<li>Option to delete key file after import</li>
+<li>Stream encryption/decryption (gallery, etc.)</li>
+<li>New options (language, force v3 signatures)</li>
+<li>Interface changes</li>
+<li>Bugfixes</li>
+</ul>
+<h2>1.0.5</h2>
+<ul>
+<li>German and Italian translation</li>
+<li>Much smaller package, due to reduced BC sources</li>
+<li>New preferences GUI</li>
+<li>Layout adjustment for localization</li>
+<li>Signature bugfix</li>
+</ul>
+<h2>1.0.4</h2>
+<ul>
+<li>Fixed another crash caused by some SDK bug with query builder</li>
+</ul>
+<h2>1.0.3</h2>
+<ul>
+<li>Fixed crashes during encryption/signing and possibly key export</li>
+</ul>
+<h2>1.0.2</h2>
+<ul>
+<li>Filterable key lists</li>
+<li>Smarter pre-selection of encryption keys</li>
+<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
+<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+</ul>
+<h2>1.0.1</h2>
+<ul>
+<li>GMail account listing was broken in 1.0.0, fixed again</li>
+</ul>
+<h2>1.0.0</h2>
+<ul>
+<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>Support of more file managers (including ASTRO)</li>
+<li>Slovenian translation</li>
+<li>New database, much faster, less memory usage</li>
+<li>Defined Intents and content provider for other apps</li>
+<li>Bugfixes</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html
new file mode 100644
index 000000000..966fb554a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/help_nfc_beam.html
@@ -0,0 +1,12 @@
+<html>
+<head></head>
+<body>
+<h2>How to receive keys</h2>
+<ol>
+<li>Go to your partners keys and open the key you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the your device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_start.html b/OpenKeychain/src/main/res/raw-ro/help_start.html
new file mode 100644
index 000000000..92fd4a92a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/help_start.html
@@ -0,0 +1,19 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
+
+<h2>I found a bug in OpenKeychain!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+
+<h2>Contribute</h2>
+<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Translations</h2>
+<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/help_wot.html b/OpenKeychain/src/main/res/raw-ro/help_wot.html
new file mode 100644
index 000000000..2a551f79c
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/help_wot.html
@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Web of Trust</h2>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+
+<h2>Support in OpenKeychain</h2>
+<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+
+<h2>Trust Model</h2>
+<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+
+<h2>Certifying keys</h2>
+<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ro/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-ro/nfc_beam_share.html
new file mode 100644
index 000000000..083e055c7
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-ro/nfc_beam_share.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index a9c200abb..ef91a4131 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
@@ -4,7 +4,7 @@
 <h2>Приступая</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Я нашел ошибку в OpenKeychain!</h2>
 <p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_wot.html b/OpenKeychain/src/main/res/raw-ru/help_wot.html
index 53c862cbc..4da6c9a82 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Сеть доверия (WoT)</h2>
-<p>Сеть доверия (The Web of Trust) предоставляет механизм, определения принадлежности ключа именно тому пользователю, который в нём указан. Основа этой модели строится на знакомстве людей и сертификации своей подписью ключей своих знакомых. Не менее важно распространение этой информации среди других пользователей WoT.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Поддержка в OpenKeychain</h2>
 <p>В настоящее время реализованы только базовые возможности WoT. Работа в самом разгаре и в будущих версиях OpenKeychain будут появляться дополнительные возможности.</p>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.html b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
index ed1f88cad..943ba79f1 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Popravek dešifriranja simetrično šifriranih sporočil pgp</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Popravki kode za okno 'uredi ključ' (hvala, Ash Hughes)</li>
 <li>Nova, sodobna podoba za okno 'šifriranje/dešifriranje'</li>
 <li>API OpenPGP, verzija 3 (podpora za več api računov, interni popravki, iskanje ključev)</li>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_start.html b/OpenKeychain/src/main/res/raw-sl/help_start.html
index 276377723..2d0b763e0 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_start.html
@@ -4,7 +4,7 @@
 <h2>Kako začeti</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Našel sem 'hrošča' v aplikaciji OpenKeychain!</h2>
 <p>Za poročanje o 'hroščih' uporabite <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">sledilnik težav za OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sl/help_wot.html b/OpenKeychain/src/main/res/raw-sl/help_wot.html
index 62cdf8094..224110e18 100644
--- a/OpenKeychain/src/main/res/raw-sl/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-sl/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Omrežje zaupanja</h2>
-<p>Omrežje zaupanja je del PGP-ja, ki se dotika ustvarjanja, urejanja in hranjenja ključev. Ponuja nam orodja za vodenje evidence ključev in njihovih lastnikov, ter deljenje teh informacij z drugimi. Za zagotavljanje zasebnosti šifrirane komunikacije je bistvenega pomena, da vemo, da ključ s katerim šifriramo določeno vsebino resnično pripada osebi, ki ji je ta vsebina namenjena.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Podpora v OpenKeychain</h2>
 <p>OpenKeychain ponuja zgolj osnovno podporo za 'Omrežje zaupanja'. V prihodnjih različicah bomo to podporo še nadgrajevali in izboljševali.</p>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_changelog.html b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
index 5cd99d2fd..599498336 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_changelog.html
@@ -4,7 +4,7 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Поправка извоза кључева у фајлове (сада заиста)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Поправка дешифровања симетричних пгп порука/фајлова</li>
+<li>Поправка дешифровања симетричних ОпенПГП порука/фајлова</li>
 <li>Прерађен екран уређивања кључа (захваљујући Ешу Хјуџесу)</li>
 <li>Нови модерни дизајн за екране шифровања/дешифровања</li>
 <li>ОпенПГП АПИ издање 3 (вишеструки АПИ налози, унутрашње поправке, потрага кључа)</li>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_start.html b/OpenKeychain/src/main/res/raw-sr/help_start.html
index 020f21137..a2f337a2f 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_start.html
@@ -4,7 +4,7 @@
 <h2>Први кораци</h2>
 <p>Најпре требате лични кључ. Направите један преко менија у „Кључеви“ или увезите постојеће тајне кључеве. Након тога, можете да преузмете пријатељеве кључеве или да их размените преко бар-кодова или НФЦ-а.</p>
 
-<p>За Андроид старији од 4.4 препоручује се да инсталирате <a href="market://details?id=org.openintents.filemanager">ОИ Менаџер фајлова</a> за побољшани избор фаjлова. Да бисте делили преко бар-кодова инсталирајте <a href="market://details?id=com.google.zxing.client.android">Скенер бар-кода</a>. Кликом на везе отворићете Гуглову Продавницу или Ф-Дроид за инсталацију.</p>
+<p>За Андроид старији од 4.4 препоручује се да инсталирате <a href="market://details?id=org.openintents.filemanager">ОИ Менаџер фајлова</a> за побољшани избор фаjлова.</p>
 
 <h2>Пронађох грешку у Отвореном кључарнику!</h2>
 <p>Пријавите грешку на <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">пратиоцу проблема за Отворени кључарник</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sr/help_wot.html b/OpenKeychain/src/main/res/raw-sr/help_wot.html
index 91a75bd3c..713b3e331 100644
--- a/OpenKeychain/src/main/res/raw-sr/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-sr/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Веб Поверења</h2>
-<p>Веб поверења описује део ПГП-а који се бави прављењем и књиговодством сертификата. Пружа механизме који помажу кориснику у праћењу коме јавни кључ припада и дељењу ове информације са осталима; да би се осигурала приватност шифроване комуникације, нужно је знати да јавни кључ на који шифрујете припада особи којој и мислите да припада.</p>
+<p>Веб Поверења описује део ОпенПГП-а који се бави прављењем и спремањем сертификата. Пружа механизме који помажу кориснику у праћењу коме јавни кључ припада и дељењу ове информације са осталима; да би се осигурала приватност шифроване комуникације, нужно је знати да јавни кључ на који шифрујете припада особи којој и мислите да припада.</p>
 
 <h2>Подршка у Отвореном кључарнику</h2>
 <p>Постоји само основна подршка за Веб поверења у Отвореном кључарнику. Ово је велики посао у току и подложан променама у наредним издањима.</p>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.html b/OpenKeychain/src/main/res/raw-sv/help_changelog.html
index 4d3d293ac..30ab97733 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.html
@@ -4,28 +4,28 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Fixade nyckelexport till filer (nu på riktigt)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
 <li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>Fixade krasch på Android 2.3</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
+<li>Fixade krasch på Android 5</li>
+<li>Ny certifieringsskärm</li>
 <li>Secure Exchange directly from key list (SafeSlinger library)</li>
 <li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>Omdesignad dekrypteringsskärm</li>
+<li>Nya ikoner och färger</li>
+<li>Fixade import av privata nycklar från Symantec Encryption Desktop</li>
 <li>Subkey IDs on Yubikeys are now checked correctly</li>
 </ul>
 <h2>3.0.1</h2>
 <ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
+<li>Bättre hantering av import av stora nycklar</li>
+<li>Förbättade markeringen av undernycklar</li>
 </ul>
 <h2>3.0</h2>
 <ul>
@@ -58,32 +58,32 @@
 </ul>
 <h2>2.9</h2>
 <ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimental ECC support</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</li>
+<li>Fixar krascher som uppstod i v2.8</li>
+<li>Experimentellt stöd för ECC</li>
+<li>Experimentellt stöd för Yubikey (endast signering med importerade nycklar)</li>
 </ul>
 <h2>2.8</h2>
 <ul>
 <li>So many bugs have been fixed in this release that we focus on the main new features</li>
-<li>Key edit: awesome new design, key revocation</li>
+<li>Nyckelredigering: ny design, nyckelåterkallelse</li>
 <li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>New first time screen</li>
+<li>Ny första gången-skärm</li>
 <li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>File encryption: awesome new design, support for encrypting multiple files</li>
-<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Filkryptering: ny design, stöd för att kryptera flera filer</li>
+<li>Nya ikoner för att visa nyckelstatus (av Brennan Novak)</li>
 <li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notification showing cached passphrases</li>
-<li>Keys are connected to Android's contacts</li>
+<li>Notis visar cachace lösenordsfraser</li>
+<li>Nycklar är anslutna till Androids kontakter</li>
 </ul>
 <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>
 
 <h2>2.7</h2>
 <ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>New key view design (Dominik, Vincent)</li>
-<li>New flat Android buttons (Dominik, Vincent)</li>
-<li>API fixes (Dominik)</li>
-<li>Keybase.io import (Tim Bray)</li>
+<li>Lila! (Dominik, Vincent)</li>
+<li>Ny design av nyckelvy (Dominik, Vincent)</li>
+<li>Nya platta Android-knappar (Dominik, Vincent)</li>
+<li>API-fixar (Dominik)</li>
+<li>Import från Keybase.io (Tim Bray)</li>
 </ul>
 <h2>2.6.1</h2>
 <ul>
@@ -93,15 +93,15 @@
 <ul>
 <li>Key certifications (thanks to Vincent Breitmoser)</li>
 <li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>New design for signature verification</li>
-<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Ny design för verifiering av signaturer</li>
+<li>Anpassad nyckellängd (tack vare Greg Witczak)</li>
 <li>Fix share-functionality from other apps</li>
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
-<li>New modern design for encrypt/decrypt screens</li>
+<li>Ny modern design för kryptera-/dekryptera-skärmar</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 <h2>2.4</h2>
@@ -110,11 +110,11 @@ Besides several small patches, a notable number of patches are made by the follo
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
 <ul>
 <li>New unified key list</li>
-<li>Colorized key fingerprint</li>
+<li>Färglagda nyckelfingeravtryck</li>
 <li>Support for keyserver ports</li>
 <li>Deactivate possibility to generate weak keys</li>
 <li>Much more internal work on the API</li>
-<li>Certify user ids</li>
+<li>Certifiera användar-ID:n</li>
 <li>Keyserver query based on machine-readable output</li>
 <li>Lock navigation drawer on tablets</li>
 <li>Suggestions for emails on creation of keys</li>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html
index 966fb554a..4e940a398 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-sv/help_nfc_beam.html
@@ -1,12 +1,12 @@
 <html>
 <head></head>
 <body>
-<h2>How to receive keys</h2>
+<h2>Hur man tar emot nycklar</h2>
 <ol>
 <li>Go to your partners keys and open the key you want to share.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
-<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the your device.</li>
+<li>Håll de två enheternas baksidor mot varandra (de måste nästan vidröras) och du känner av en vibration.</li>
+<li>Efter vibrationen kommer du att se innehållet på din partners enhet omvandlas till ett kortliknande föremål och en animation i bakgrunden som ser ut som Star Treks warp speed.</li>
+<li>Tryck på kortet och innehållet kommer att laddas på den andra personens enhet.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_start.html b/OpenKeychain/src/main/res/raw-sv/help_start.html
index e7220f5e1..da1d90308 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_start.html
+++ b/OpenKeychain/src/main/res/raw-sv/help_start.html
@@ -2,15 +2,15 @@
 <head></head>
 <body>
 <h2>Kom igång</h2>
-<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>Först behöver du en personlig nyckel. Skapa en via menyn i "Nycklar" eller importera en befintlig privat nyckel. Efteråt så kan du ladda ner dina vänners nycklar eller utbyta dem via QR-koder eller NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>I Android lägre än 4.4 rekommenderas det att du installerar <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> för förbättrad filurval.</p>
 
 <h2>Jag hittade en bugg i OpenKeychain!</h2>
-<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+<p>Rapporterar buggen med <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">felrapporteringssystemen av OpenKeychain</a>.</p>
 
 <h2>Bidra</h2>
-<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+<p>Om du vill hjälpa oss att utveckla OpenKeychain genom att bidra med kod <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">, följ vår korta guide på Github</a>.</p>
 
 <h2>Översättningar</h2>
 <p>Hjälp till med att översätta OpenKeychain! Alla kan delta i <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain på Transifex</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-sv/help_wot.html b/OpenKeychain/src/main/res/raw-sv/help_wot.html
index efada7bd8..68a2e3997 100644
--- a/OpenKeychain/src/main/res/raw-sv/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-sv/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Tillitsnät</h2>
-<p>Tillitsnätet beskriver den del av PGP som handlar om hur man skapar och bokför certifieringar. Det gör det möjligt för användaren att hålla reda på vem en publik nyckel tillhör, och dela denna information med andra; för att försäkra sig om integriteten i  krypterad kommunikation är det avgörande att veta att den publika nyckel du krypterar till tillhör den person du tror att den gör.</p>
+<p>Tillitsnätet beskriver den del av OpenPGP som handlar om hur man skapar och bokför certifieringar. Det gör det möjligt för användaren att hålla reda på vem en publik nyckel tillhör, och dela denna information med andra; för att försäkra sig om integriteten i  krypterad kommunikation är det avgörande att veta att den publika nyckel du krypterar till tillhör den person du tror att den gör.</p>
 
 <h2>Stöd i OpenKeychain</h2>
 <p>Endast grundläggande stöd för tillitsnät finns i OpenKeychain. Arbetet med funktionen pågår och den kan komma att ändras i kommande versioner.</p>
diff --git a/OpenKeychain/src/main/res/raw-sv/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sv/nfc_beam_share.html
index 083e055c7..b88771e70 100644
--- a/OpenKeychain/src/main/res/raw-sv/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-sv/nfc_beam_share.html
@@ -2,10 +2,10 @@
 <head></head>
 <body>
 <ol>
-<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
-<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
-<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
-<li>Tap the card and the content will then load on the other person’s device.</li>
+<li>Se till att NFC är påslaget i Inställningar &gt; Mer &gt; NFC och se även till att Android Beam är på i samma avdelning.</li>
+<li>Håll de två enheternas baksidor mot varandra (de måste nästan vidröras) och du känner av en vibration.</li>
+<li>Efter vibrationen kommer du att se innehållet på din enhet omvandlas till ett kortliknande föremål och en animation i bakgrunden som ser ut som Star Treks warp speed.</li>
+<li>Tryck på kortet och innehållet kommer att laddas på den andra personens enhet.</li>
 </ol>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
index a7a8030c8..cb5cdaf36 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html
index 93674e794..bbcd0326c 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_start.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_start.html
@@ -4,7 +4,7 @@
 <h2>Başlarken</h2>
 <p>Öncelikle kişisel bir anahtara ihtiyacınız var. "Anahtarlar" içindeki menüden bir tane oluşturabilir veya var olan gizli anahtarınızı içe aktarabilirsiniz. Daha sonra arkadaşlarınızın anahtarlarını indirebilir ya da QR Kodları veya NFC aracılığıyla değiş tokuş edebilirsiniz.</p>
 
-<p>Android 4.4 altındaki sürümlere gelişmiş dosya seçimi için <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> yüklenmesi önerilir. QR Kodları ile paylaşmak için <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> yükleyin. Bağlantılara tıkladığınızda yükleme için Google Play Store veya F-Droid açılır.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>OpenKeychain'de bir bug buldum!</h2>
 <p>Lütfen bulduğunuz hataları <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain sorun izleyici</a> kullanarak rapor edin.</p>
diff --git a/OpenKeychain/src/main/res/raw-tr/help_wot.html b/OpenKeychain/src/main/res/raw-tr/help_wot.html
index f80c1274f..f2282908b 100644
--- a/OpenKeychain/src/main/res/raw-tr/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-tr/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>OpenKeychain Desteği</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
index 4d3d293ac..0cb7d5210 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html
index f2d2fe6f7..19197f6df 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_start.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_start.html
@@ -4,7 +4,7 @@
 <h2>Приступаючи до роботи</h2>
 <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>Я знайшов помилку в OpenPGP Keychain!</h2>
 <p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-uk/help_wot.html b/OpenKeychain/src/main/res/raw-uk/help_wot.html
index e1296472e..669aa0649 100644
--- a/OpenKeychain/src/main/res/raw-uk/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-uk/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Мережа довіри</h2>
-<p>Мережа довіри - The Web of Trust - надає механізм визначення приналежності ключа саме тому користувачеві, який в ньому зазначений. Основа цієї моделі будується на знайомстві людей та сертифікації своїм підписом ключів своїх знайомих. Не менш важливо поширення цієї інформації серед інших користувачів WoT.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Підтримка у OpenKeychain</h2>
 <p>Наразі реалізовані тільки базові можливості WoT. Робота в самому розпалі, і в майбутніх версіях OpenKeychain будуть з'являтися додаткові можливості.</p>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
index 6c95c4afe..37b3a2ec6 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html
@@ -7,7 +7,7 @@
 
 <h2>銘謝</h2>
 <ul>
-<li>Dominik Schürmann (Maintainer)</li>
+<li>Dominik Schürmann (維護人)</li>
 <li>Art O Cathain</li>
 <li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
@@ -31,27 +31,27 @@
 <h2>函式庫</h2>
 <ul>
 <li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache授權條款 v2)</li>
 <li>
-<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11授權條款)</li>
 <li>
-<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache授權條款 v2)</li>
 <li>
-<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT授權條款)</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
index 4d3d293ac..bf28ea2e0 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html
@@ -4,22 +4,22 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>修正〝匯出金鑰到檔案〞功能(這次是真的了)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>修正〝匯出金鑰到檔案〞功能(部分完成)</li>
+<li>修正在Android 2.3上的崩潰</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
+<li>修正在Android 5上的崩潰</li>
+<li>新的認證畫面</li>
+<li>直接在金鑰清單進行安全的金鑰交換 (使用SafeSlinger程式庫)</li>
 <li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
+<li>重新設計的解密畫面</li>
 <li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>修正從Symantec Encryption Desktop匯入密鑰的問題</li>
 <li>Subkey IDs on Yubikeys are now checked correctly</li>
 </ul>
 <h2>3.0.1</h2>
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
index ce6e388a8..44835cc46 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html
@@ -4,7 +4,7 @@
 <h2>快速上手</h2>
 <p>首先你需要一支個人金鑰，通過選單來建立一支金鑰或是匯入現有私鑰。接下來，你可以下載你朋友的金鑰，或是通過QR條碼和NFC進行交換。</p>
 
-<p>Android 4.4以下的裝置可以下載<a href="market://details?id=org.openintents.filemanager">OI File Manager檔案總管</a>來選擇和加密檔案，要通過QR條碼分享需要先安裝<a href="market://details?id=com.google.zxing.client.android">條碼掃描器</a>。點選連結開啟Google Play商店或F-Droid進行安裝。</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>我在OpenKeychain發現問題！</h2>
 <p>請通過<a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain問題追蹤</a>回報問題。</p>
diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
index 3674f22c2..0db0d354f 100644
--- a/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>信任網</h2>
-<p>信任網描述了PGP建立與紀錄認證的部分，它提供使用者追蹤公鑰所有人並與他人分享此一資訊的機制。為了確保加密通訊的隱私，你必須確認用來加密的公鑰屬於你所期望的對象。</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>OpenKeychain的支援狀況</h2>
 <p>目前OpenKeychain對信任網只有基本程度的支援。這是一件大工程，有任何進展將隨時發佈。</p>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
index 728d85c11..7bba18be8 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.html
@@ -99,7 +99,7 @@
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
 <li>Refactored key edit screen (thanks to Ash Hughes)</li>
 <li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html
index 357f937c9..1290e109a 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_start.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_start.html
@@ -4,7 +4,7 @@
 <h2>快速上手指南</h2>
 <p>首先你需要一个个人密钥。可以通过菜单创建一个密钥或者导入已有密钥。之后你就可以从网络下载朋友的密钥或者通过二维码和NFC功能交换密钥。</p>
 
-<p>安卓4.4一下版本可以通过该链接<a href="market://details?id=org.openintents.filemanager">下载OI File Manager文件管理器</a> 来选择和加密文件。使用二维码功能可以下载<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. 点击链接可以从谷歌商店下载安装.</p>
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
 
 <h2>我在OpenKeychain發現問題！</h2>
 <p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p>
diff --git a/OpenKeychain/src/main/res/raw-zh/help_wot.html b/OpenKeychain/src/main/res/raw-zh/help_wot.html
index 29790139b..2a551f79c 100644
--- a/OpenKeychain/src/main/res/raw-zh/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-zh/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Web of Trust</h2>
-<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
 
 <h2>Support in OpenKeychain</h2>
 <p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
diff --git a/OpenKeychain/src/main/res/values-bg/strings.xml b/OpenKeychain/src/main/res/values-bg/strings.xml
new file mode 100644
index 000000000..ef0a0ce94
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-bg/strings.xml
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--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-->
+  <!--section-->
+  <!--button-->
+  <!--menu-->
+  <!--label-->
+  <!--choice-->
+  <!--key flags-->
+  <!--sentences-->
+  <!--errors
+         no punctuation, all lowercase,
+         they will be put after "error_message", e.g. "Error: file not found"-->
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
+  <!--Add keys-->
+  <!--progress dialogs, usually ending in '…'-->
+  <!--action strings-->
+  <!--key bit length selections-->
+  <!--elliptic curve names-->
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">"Brainpool P-256"</string>
+    <string name="key_curve_bp_p384">"Brainpool P-384"</string>
+    <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
+  <!--compression-->
+  <!--Help-->
+  <!--Import-->
+  <!--Generic result toast-->
+  <!--Import result toast-->
+  <!--Delete result toast-->
+  <!--Certify result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <!--Share-->
+  <!--Key list-->
+  <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
+  <!--Navigation Drawer-->
+  <!--hints-->
+  <!--certs-->
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <!--Import Public log entries-->
+  <!--Import Secret log entries-->
+  <!--Keyring Canonicalization log entries-->
+  <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
+  <!--modifySecretKeyRing-->
+  <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <!--PassphraseCache-->
+  <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+</resources>
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 301f4a92a..cbf0eb0b8 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -9,12 +9,12 @@
   <string name="title_encrypt_text">Zašifrovat text</string>
   <string name="title_encrypt_files">Zašifrovat soubory</string>
   <string name="title_decrypt">Rozšifrovat</string>
-  <string name="title_unlock">Heslo</string>
+  <string name="title_unlock">Odemknout klíč</string>
   <string name="title_add_subkey">Přidat podklíč</string>
   <string name="title_edit_key">Editovat klíč</string>
-  <string name="title_preferences">Možnosti</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_key_server_preference">Nastavení keyservrů</string>
   <string name="title_change_passphrase">Změnit heslo</string>
   <string name="title_share_fingerprint_with">Sdílet otisk s...</string>
   <string name="title_share_key">Sdílet klíč s...</string>
@@ -33,6 +33,7 @@
   <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>
   <!--section-->
   <string name="section_user_ids">Identity</string>
@@ -41,6 +42,8 @@
   <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">Certifikovat</string>
   <string name="section_actions">Akce</string>
   <string name="section_share_key">Klíč</string>
   <string name="section_certification_key">Klíč použitý pro certifikaci</string>
@@ -70,7 +73,6 @@
   <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 ze schránky</string>
   <string name="btn_decrypt_and_verify">a ověřit podpisy</string>
   <string name="btn_decrypt_files">Dešifrovat soubory</string>
   <!--menu-->
@@ -102,8 +104,9 @@
   <string name="label_file_ascii_armor">Povolit ASCII armor</string>
   <string name="label_write_version_header">Dát ostatním vědět, že používáte OpenKeychain</string>
   <string name="label_write_version_header_summary">Zapisovat \'OpenKeychain v2.7\' do OpenPGP podpisů, šifrovaného textu a exportovaných klíčů</string>
-  <string name="label_use_default_yubikey_pin">Použít výchozí Yubikey PIN</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Používá základní PIN (123456) pro přístup k Yubikey přes NFC</string>
+  <string name="label_use_default_yubikey_pin">Použít výchozí YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Použít numerickou klávesnici pro YubiKey PIN</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Používá základní PIN (123456) pro přístup k YubiKey přes NFC</string>
   <string name="label_asymmetric_from">Podepsáno:</string>
   <string name="label_to">Zašifrovat pro:</string>
   <string name="label_delete_after_encryption">Smazat soubor po zašifrování</string>
@@ -111,6 +114,8 @@
   <string name="label_encryption_algorithm">Šifrovací algoritmus</string>
   <string name="label_hash_algorithm">Hashovací algoritmus</string>
   <string name="label_symmetric">Zašifrovat heslem</string>
+  <string name="label_passphrase_cache_ttl">Čas vypršení pro cache</string>
+  <string name="label_passphrase_cache_subs">Pamatovat si heslo podle podklíče</string>
   <string name="label_message_compression">Komprimovat zprávu</string>
   <string name="label_file_compression">Komprimovat soubor</string>
   <string name="label_keyservers">Keyservery</string>
@@ -127,6 +132,7 @@
   <string name="label_send_key">Synchronizovat s cloudem</string>
   <string name="label_fingerprint">Otisk</string>
   <string name="expiry_date_dialog_title">Nastavit datum expirace</string>
+  <string name="label_first_keyserver_is_used">(Výchozí je první keyserver)</string>
   <string name="label_preferred">upřednostněno</string>
   <string name="user_id_no_name">&lt;beze jména&gt;</string>
   <string name="none">&lt;žádný&gt;</string>
@@ -183,7 +189,9 @@
   <string name="passphrase_must_not_be_empty">Prosím zadejte heslo.</string>
   <string name="passphrase_for_symmetric_encryption">Symetrická šifra.</string>
   <string name="passphrase_for">Zadejte heslo pro \'%s\'</string>
-  <string name="yubikey_pin_for">Zadejte PIN pro přístup k Yubikey pro \'%s\'</string>
+  <string name="pin_for">Zadat PIN pro \'%s\'</string>
+  <string name="yubikey_pin_for">Zadejte PIN pro přístup k YubiKey pro \'%s\'</string>
+  <string name="nfc_text">Přidržte YubiKey u zadní strany vašeho přístroje.</string>
   <string name="file_delete_confirmation">Chcete opravdu smazat\n%s?</string>
   <string name="file_delete_successful">Úspěšně smazáno.</string>
   <string name="no_file_selected">Nejprve vyberte soubor.</string>
@@ -192,7 +200,14 @@
   <string name="enter_passphrase_twice">Heslo zadejte dvakrát.</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="key_deletion_confirmation_multi">Opravdu si přejete smazat všechny vybrané veřejné klíče?\nToto nebude možné vzít zpět!</string>
+  <string name="secret_key_deletion_confirmation">Opravdu chcete smazat TAJNÝ klíč \'%s\'?\nTuto operaci nelze vzít zpět!</string>
+  <string name="public_key_deletetion_confirmation">Opravdu chcete smazat veřejný klíč \'%s\'?\nToto nelze vzít zpět!</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>
   <string name="keys_exported">Úspěšně exportován %d klíč.</string>
   <string name="no_keys_exported">Žádný kláč pro export.</string>
@@ -225,16 +240,22 @@
   <string name="error_jelly_bean_needed">Musíte mít Android 4.1 abyste mohli používat Androidí NFC Beam technologii!</string>
   <string name="error_nfc_needed">NFC není na vašem zařízení k dispozici!</string>
   <string name="error_nothing_import">Žádný klíč nenalezen!</string>
+  <string name="error_contacts_key_id_missing">Příjem ID klíče od kontatktu selhal!</string>
   <string name="error_generic_report_bug">Nastala obecná chyba, prosím vytvořte nový bug report pro OpenKeychain.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">Nepodepsáno</string>
   <string name="decrypt_result_invalid_signature">Špatný podpis!</string>
+  <string name="decrypt_result_signature_uncertified">Kým podepsáno (neověřen!)</string>
   <string name="decrypt_result_signature_certified">Podepsáno</string>
+  <string name="decrypt_result_signature_expired_key">Klíč neplatný!</string>
+  <string name="decrypt_result_signature_revoked_key">Klíč byl revokován!</string>
   <string name="decrypt_result_signature_missing_key">Neznámý veřejný klíč</string>
   <string name="decrypt_result_encrypted">Zašifrováno</string>
   <string name="decrypt_result_not_encrypted">Nezašifrováno</string>
   <string name="decrypt_result_action_show">Zobrazit</string>
   <string name="decrypt_result_action_Lookup">Vyhledat</string>
+  <string name="decrypt_invalid_text">Podpis neplatný, platnost klíče vypršela nebo byl zrušen. Nemůžete si být jistí tím, kdo text napsal. Jste si jistí, že chcete i přesto zprávu zobrazit?</string>
+  <string name="decrypt_invalid_button">Beru na vědomí, zobraz to!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Můj klíč:</string>
   <!--progress dialogs, usually ending in '…'-->
@@ -255,6 +276,7 @@
   <string name="progress_modify">modifikuji klíčenku...</string>
   <string name="progress_modify_unlock">odemykám klíčenku...</string>
   <string name="progress_modify_adduid">přidávám uživatelské IDčka...</string>
+  <string name="progress_modify_adduat">přidávám uživatelovy atributy...</string>
   <string name="progress_modify_revokeuid">revokuji uživatelská IDčka...</string>
   <string name="progress_modify_primaryuid">měním primární uživatelské ID...</string>
   <string name="progress_modify_subkeychange">modifikuji podklíče...</string>
@@ -285,6 +307,7 @@
   <string name="progress_deleting">mažu klíče...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Jméno/Email/ID klíče</string>
+  <string name="hint_cloud_search_hint">Jméno/Email/Důkaz/Klíč...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -327,8 +350,12 @@
   <string name="import_qr_code_too_short_fingerprint">Fingerprint je příliš krátký (&lt; 16 znaků)</string>
   <string name="import_qr_code_button">Naskenovat QR kód</string>
   <!--Generic result toast-->
-  <string name="view_log">Zobrazit log</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">Klíč úspěšně importován</item>
+    <item quantity="few">Úspěšně importováno %1$d klíče</item>
+    <item quantity="other">Úspěšně importováno %1$d klíčů</item>
+  </plurals>
   <plurals name="import_error">
     <item quantity="one">Import selhal!</item>
     <item quantity="few">Import %d klíčů selhal!</item>
@@ -337,6 +364,8 @@
   <string name="import_error_nothing">Nic k importu</string>
   <string name="import_error_nothing_cancelled">Import zrušen.</string>
   <!--Delete result toast-->
+  <string name="delete_nothing">Nic ke smazání.</string>
+  <string name="delete_cancelled">Operace smazání zrušena.</string>
   <!--Certify result toast-->
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dešifrovat soubor pomocí OpenKeychain</string>
@@ -359,7 +388,6 @@
   <string name="api_settings_delete_account">Smazat účet</string>
   <string name="api_settings_package_name">Jméno balíčku</string>
   <string name="api_settings_package_signature">SHA-256 z podpisu balíčku</string>
-  <string name="api_settings_accounts">Účty</string>
   <string name="api_settings_settings">Nastavení</string>
   <string name="api_settings_key">Klíč účtu:</string>
   <string name="api_settings_accounts_empty">Žádné účty nejsou specifikovány pro tuto appku.</string>
@@ -380,6 +408,9 @@
     <item quantity="few">%d klíče vybrány.</item>
     <item quantity="other">%d klíčů vybráno.</item>
   </plurals>
+  <string name="key_list_empty_text1">Žádný klíč nenalezen!</string>
+  <string name="key_list_filter_show_all">Zobrazit všechny klíče</string>
+  <string name="key_list_filter_show_certified">Zobrazit puze ověřené klíče</string>
   <!--Key view-->
   <string name="key_view_action_edit">Editovat klíč</string>
   <string name="key_view_action_encrypt">Zašifrovat text</string>
@@ -395,6 +426,10 @@
   <string name="key_view_tab_certs">Certifikáty</string>
   <string name="user_id_info_revoked_title">Zneplatněno</string>
   <string name="user_id_info_revoked_text">Tato identity byla zneplatněna vlastníkem klíče. Klíč již není platný.</string>
+  <string name="user_id_info_certified_title">Ověřeno</string>
+  <string name="user_id_info_certified_text">Tato identita byla vámi ověřena</string>
+  <string name="user_id_info_uncertified_title">Neověřeno</string>
+  <string name="user_id_info_uncertified_text">Tato identita nebyla ještě ověřena. Nemůžete si být jisti, že identita skutečně odpovídá konkrétní osobě.</string>
   <string name="user_id_info_invalid_title">Neplatná</string>
   <string name="user_id_info_invalid_text">S touto identitou je něco v nepořádku!</string>
   <!--Edit key-->
@@ -411,22 +446,31 @@
   </string-array>
   <string name="edit_key_edit_user_id_revoked">Tato identity byla zneplatněna. Toto není možné vzít zpět.</string>
   <string name="edit_key_edit_subkey_title">Vyberte akci!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Změnit expiraci</item>
+    <item>Zneplatnit podklíč</item>
+    <item>Strip podklíč</item>
+  </string-array>
   <string name="edit_key_new_subkey">nový podklíč</string>
+  <string name="edit_key_select_flag">Prosím vyberte alespoň jeden příznak!</string>
+  <string name="edit_key_error_add_identity">Přidejte alespoň jednu identitu!</string>
+  <string name="edit_key_error_add_subkey">Přidejte alespoň jeden podklíč!</string>
   <!--Create key-->
   <string name="create_key_upload">Aktualizovat klíč na keyserver</string>
   <string name="create_key_empty">Toto pole je vyžadováno</string>
   <string name="create_key_passphrases_not_equal">Heslo nesouhlasí</string>
   <string name="create_key_final_text">Zadali jste následující identitu:</string>
+  <string name="create_key_final_robot_text">Vytvoření klíče může chvíli trvat, mezitím si dejte třeba šálek dobré kávy...</string>
+  <string name="create_key_rsa">(3 podklíče, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(uživatelská konfigurace klíče)</string>
   <string name="create_key_text">Zadejte své celé jméno, emailovou adresu a zvolte heslo.</string>
   <string name="create_key_hint_full_name">Celé jméno, např. Jan Novák</string>
+  <string name="create_key_edit">Změnit konfiguraci klíče</string>
   <!--View key-->
   <string name="view_key_revoked">Tento klíč byl zneplatněn!</string>
   <string name="view_key_expired">Tento klíč vyexpiroval!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klíče</string>
-  <string name="nav_encrypt_text">Zašifrovat text</string>
-  <string name="nav_encrypt_files">Zašifrovat soubory</string>
-  <string name="nav_decrypt">Rozšifrovat</string>
   <string name="nav_apps">Aplikace</string>
   <string name="drawer_open">Otevřít navigační panel</string>
   <string name="drawer_close">Zavří navigační panel</string>
@@ -456,21 +500,27 @@
   <!--createSecretKeyRing-->
   <string name="msg_cr">Generuji nový hlavní klíč</string>
   <string name="msg_cr_error_no_keysize">Nebyla specifikována eliptická křivka! Toto je chyba v programování a je třeba ji nahlásit!</string>
-  <string name="msg_cr_error_internal_pgp">Vnitřní chyba PGP!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Upravuji klíčenku %s</string>
   <string name="msg_mf_uid_error_empty">Uživatelské ID nesmí být prázdné!</string>
   <!--Consolidate-->
   <string name="msg_con_error_db">Chyba otevírání databáze!</string>
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Klíč nenalezen!</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_acc_saved">Účet uložen</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">Kliknout pro vymazání načtených hesel</string>
   <string name="passp_cache_notif_clear">Smazat cache</string>
   <string name="passp_cache_notif_pwd">Heslo</string>
+  <!--First Time-->
+  <string name="first_time_text1">Převezměte opět kontrolu nad svým soukromím s OpenKeychain!</string>
+  <string name="first_time_create_key">Vytvořit vlastní klíč</string>
+  <string name="first_time_skip">Přeskočit nastavení</string>
   <!--unsorted-->
   <string name="section_cert">Detaily certifikátu</string>
   <string name="label_user_id">Identita</string>
@@ -490,8 +540,8 @@
   <string name="error_no_encrypt_subkey">Není dostupný šifrovací podklíč!</string>
   <string name="contact_show_key">Zobrazit klíč (%s)</string>
   <string name="swipe_to_update">Potáhnout dolů pro aktualizaci z keyserveru</string>
-  <!--First Time-->
-  <string name="first_time_text1">Převezměte opět kontrolu nad svým soukromím s OpenKeychain!</string>
-  <string name="first_time_create_key">Vytvořit vlastní klíč</string>
-  <string name="first_time_skip">Přeskočit nastavení</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 52d979983..b5ca0687b 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
   <string name="title_encrypt_text">Text Verschlüsseln</string>
   <string name="title_encrypt_files">Dateien verschlüsseln</string>
   <string name="title_decrypt">Entschlüsseln</string>
-  <string name="title_unlock">Passwort</string>
+  <string name="title_unlock">Schlüssel entsperren</string>
   <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>
@@ -36,6 +36,7 @@
   <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>
   <!--section-->
   <string name="section_user_ids">Identitäten</string>
   <string name="section_keys">Unterschlüssel</string>
@@ -55,6 +56,8 @@
   <string name="section_decrypt_files">Dateien</string>
   <string name="section_decrypt_text">Text</string>
   <string name="section_certs">Zertifikate</string>
+  <string name="section_encrypt">Verschlüsseln</string>
+  <string name="section_decrypt">Entschlüsseln</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Datei entschlüsseln, verifizieren und speichern</string>
   <string name="btn_decrypt_verify_message">Entschlüsseln und verifizieren</string>
@@ -74,9 +77,11 @@
   <string name="btn_create_key">Schlüssel erzeugen</string>
   <string name="btn_add_files">Datei(en) hinzufügen</string>
   <string name="btn_add_share_decrypted_text">Entschlüsselten Text teilen</string>
-  <string name="btn_decrypt_clipboard">Aus Zwischenablage entschlüsseln</string>
+  <string name="btn_decrypt_clipboard">Text aus Zwischenablage entschlüsseln</string>
   <string name="btn_decrypt_and_verify">und Signaturen überprüfen</string>
   <string name="btn_decrypt_files">Dateien entschlüsseln</string>
+  <string name="btn_encrypt_files">Dateien verschlüsseln</string>
+  <string name="btn_encrypt_text">Text verschlüsseln</string>
   <!--menu-->
   <string name="menu_preferences">Einstellungen</string>
   <string name="menu_help">Hilfe</string>
@@ -90,6 +95,7 @@
   <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_advanced">Erweiterte Infos anzeigen</string>
   <!--label-->
@@ -106,9 +112,9 @@
   <string name="label_file_ascii_armor">Aktiviere ASCII Armor</string>
   <string name="label_write_version_header">Lass andere wissen dass du OpenKeychain nutzt</string>
   <string name="label_write_version_header_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP-Signaturen, Daten und exportierten Schlüsseln hinzu</string>
-  <string name="label_use_default_yubikey_pin">Standard Yubikey PIN verwenden</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Zifferntastatur für Yubikey PIN verwenden</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Verwendet Standard PIN (123456) um auf Yubikeys via NFC zuzugreifen</string>
+  <string name="label_use_default_yubikey_pin">Standard-YubiKey-PIN verwenden</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Zifferntastatur für YubiKey PIN verwenden</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Verwendet Standard-PIN (123456) zum Zugriff auf YubiKeys über NFC</string>
   <string name="label_asymmetric_from">Signiert von:</string>
   <string name="label_to">Verschlüsselt an:</string>
   <string name="label_delete_after_encryption">Datei nach Verschlüsselung löschen</string>
@@ -189,7 +195,9 @@
   <string name="passphrase_must_not_be_empty">Bitte ein Passwort eingeben.</string>
   <string name="passphrase_for_symmetric_encryption">Symmetrische Verschlüsselung.</string>
   <string name="passphrase_for">Passwort für \'%s\' eingeben</string>
+  <string name="pin_for">PIN für \'%s\' eingeben</string>
   <string name="yubikey_pin_for">PIN für Zugriff auf Yubikey für \'%s\' eingeben</string>
+  <string name="nfc_text">Halten Sie den YubiKey gegen die Rückseite Ihres Geräts.</string>
   <string name="file_delete_confirmation">%s wirklich löschen?</string>
   <string name="file_delete_successful">Erfolgreich gelöscht.</string>
   <string name="no_file_selected">Zuerst eine Datei auswählen.</string>
@@ -257,6 +265,7 @@
   <string name="decrypt_result_not_encrypted">Nicht Verschlüsselt</string>
   <string name="decrypt_result_action_show">Anzeigen</string>
   <string name="decrypt_result_action_Lookup">Nachschlagen</string>
+  <string name="decrypt_invalid_text">Der Schlüssel ist entweder ungültig oder wurde zurückgezogen/ist abgelaufen. Sie können den Verfasser der Nachricht nicht eindeutig identifizieren. Wollen Sie die Nachricht trotzdem anzeigen?</string>
   <string name="decrypt_invalid_button">Ich verstehe das Risiko, Nachricht anzeigen!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Mein Schlüssel:</string>
@@ -278,6 +287,7 @@
   <string name="progress_modify">Schlüsselbund wird verändert...</string>
   <string name="progress_modify_unlock">Schlüsselbund wird entsperrt...</string>
   <string name="progress_modify_adduid">User-ID wird hinzugefügt...</string>
+  <string name="progress_modify_adduat">Benutzerattribute werden hinzugefügt...</string>
   <string name="progress_modify_revokeuid">User-IDs werden widerrufen...</string>
   <string name="progress_modify_primaryuid">Primäre User-ID wird geändert...</string>
   <string name="progress_modify_subkeychange">Unterschlüssel werden verändert...</string>
@@ -306,8 +316,8 @@
   <string name="progress_verifying_integrity">Integrität wird überprüft…</string>
   <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string>
   <string name="progress_deleting">Lösche Schlüssel</string>
-  <string name="progress_con_saving">Zusammenführung: Speiche in Cache...</string>
-  <string name="progress_con_reimport">Zusammenführung: Reimportiere...</string>
+  <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_keyserver_search_hint">Name/Email/Schlüssel ID...</string>
   <string name="hint_cloud_search_hint">Name/Email/Nachweis/Schlüssel...</string>
@@ -352,8 +362,9 @@
   <string name="import_qr_code_wrong">Falsch formatierter QR-Code! Bitte erneut versuchen!</string>
   <string name="import_qr_code_too_short_fingerprint">Der Fingerabdruck ist zu kurz (&lt; 16 Zeichen)</string>
   <string name="import_qr_code_button">QR-Code scannen</string>
+  <string name="import_qr_code_text">Plazieren sie ihre Kamera über dem QR Code!</string>
   <!--Generic result toast-->
-  <string name="view_log">Log ansehen</string>
+  <string name="view_log">Details</string>
   <string name="with_warnings">, mit Warnungen</string>
   <string name="with_cancelled">. bis abgebrochen wurde</string>
   <!--Import result toast-->
@@ -388,9 +399,33 @@
     <item quantity="one">Der Schlüssel wurde erfolgreich gelöscht.</item>
     <item quantity="other">%1$d Schlüssel wurden erfolgreich gelöscht</item>
   </plurals>
+  <plurals name="delete_ok_but_fail_2">
+    <item quantity="one">, aber das Löschen eines Schlüssels%2$s ist fehlgeschlagen.</item>
+    <item quantity="other">, aber das Löschen von %1$d Schlüsseln%2$s ist fehlgeschlagen.</item>
+  </plurals>
+  <plurals name="delete_ok">
+    <item quantity="one">Erfolgreich gelöscht key%2$s.</item>
+    <item quantity="other">Erfolgreich gelöscht %1$d keys%2$s.</item>
+  </plurals>
+  <plurals name="delete_fail">
+    <item quantity="one">Fehler beim Löschen eines Schlüssels%2$s.</item>
+    <item quantity="other">Fehler beim Löschen von %1$d Schlüsseln.</item>
+  </plurals>
   <string name="delete_nothing">Nichts zu löschen.</string>
   <string name="delete_cancelled">Löschen abgebrochen.</string>
   <!--Certify result toast-->
+  <plurals name="certify_keys_ok">
+    <item quantity="one">Schlüssel%2$s erfolgreich beglaubigt.</item>
+    <item quantity="other">%1$d Schlüssel%2$s erfolgreich beglaubigt.</item>
+  </plurals>
+  <plurals name="certify_keys_with_errors">
+    <item quantity="one">Beglaubigung fehlgeschlagen!</item>
+    <item quantity="other">Beglaubigung für %d Schlüssel fehlgeschlagen!</item>
+  </plurals>
+  <plurals name="certify_error">
+    <item quantity="one">Beglaubigung fehlgeschlagen!</item>
+    <item quantity="other">Beglaubigung von %d Schlüsseln ist fehlgeschlagen!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Datei entschlüsseln mit OpenKeychain</string>
   <string name="intent_import_key">Schlüssel importieren mit OpenKeychain</string>
@@ -413,10 +448,14 @@
   <string name="api_settings_delete_account">Account löschen</string>
   <string name="api_settings_package_name">Paketname</string>
   <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string>
-  <string name="api_settings_accounts">Konten</string>
+  <string name="api_settings_accounts">Konten (veraltete API)</string>
+  <string name="api_settings_advanced">Erweiterte Informationen</string>
+  <string name="api_settings_allowed_keys">Erlaubte Schlüssel</string>
   <string name="api_settings_settings">Einstellungen</string>
   <string name="api_settings_key">Account Schlüssel:</string>
   <string name="api_settings_accounts_empty">Keine Konten mit dieser Anwendung verknüpft.</string>
+  <string name="api_create_account_text">Für diesen Account ist kein Schlüssel hinterlegt. Bitte wähle einen deiner existierenden Schlüssel aus oder erstelle einen neuen.\nApps können nur hier ausgewählte Schlüssel nutzen.</string>
+  <string name="api_update_account_text">Der Schlüssel für diesen Account wurde gelöscht. Bitte wähle einen anderen aus!\nApps können nur hier ausgewählte Schlüssel nutzen.</string>
   <string name="api_register_text">Folgende Anwendung möchte Nachrichten ver-/entschlüsseln und in Ihrem Namen signieren. Zugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen warum dieses Fenster erscheint, sollten Sie den Zugriff verbieten! Sie können Zugriffe später über das Menü \'Apps\' widerrufen.</string>
   <string name="api_register_allow">Zugriff erlauben</string>
   <string name="api_register_disallow">Zugriff verbieten</string>
@@ -455,6 +494,7 @@
   <string name="user_id_info_certified_title">Beglaubigt</string>
   <string name="user_id_info_certified_text">Diese Identität wurde von Ihnen beglaubigt.</string>
   <string name="user_id_info_uncertified_title">Nicht beglaubigt</string>
+  <string name="user_id_info_uncertified_text">Diese Identität wurde noch nicht beglaubigt. Sie können nicht sicher sein, ob diese Identität wirklich zu einer bestimmten Person gehört.</string>
   <string name="user_id_info_invalid_title">Ungültig</string>
   <string name="user_id_info_invalid_text">Irgend etwas ist mit dieser Identität nicht in Ordnung!</string>
   <!--Edit key-->
@@ -496,9 +536,7 @@
   <string name="view_key_expired">Dieser Schlüssel ist nicht mehr gültig!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
-  <string name="nav_encrypt_text">Text Verschlüsseln</string>
-  <string name="nav_encrypt_files">Dateien Verschlüsseln</string>
-  <string name="nav_decrypt">Entschlüsseln</string>
+  <string name="nav_encrypt_decrypt">Veschlüsseln/Entschlüsseln</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Menü öffnen</string>
   <string name="drawer_close">Menü schließen</string>
@@ -519,6 +557,7 @@
   <string name="msg_internal_error">Interner Fehler!</string>
   <string name="msg_cancelled">Vorgang abgebrochen.</string>
   <!--Import Public log entries-->
+  <string name="msg_ip_apply_batch">Eingabeoperationen werden angewendet.</string>
   <string name="msg_ip_bad_type_secret">Es wurde versucht einen geheimen Schlüsselbund als Öffentlich zu importieren. Das ist ein Fehler, bitte reiche einen Bericht ein.</string>
   <string name="msg_ip_delete_old_fail">Kein alter Schlüssel gelöscht (Einen neuen erzeugen?)</string>
   <string name="msg_ip_delete_old_ok">Alte Schlüssel aus der Datenbank löschen</string>
@@ -551,6 +590,7 @@
   <string name="msg_ip_master_flags_xxxa">Haupt-Attribute: authentifizieren</string>
   <string name="msg_ip_master_flags_xxxx">Haupt-Attribute: Keine</string>
   <string name="msg_ip_merge_public">Füge importierte Daten in existierend öffentlichen Schlüsselbund ein</string>
+  <string name="msg_ip_merge_secret">Importierte Daten werden in vorhandenen öffentlichen Schlüsselbund eingefügt</string>
   <string name="msg_ip_subkey">Unterschlüssel %s wird bearbeitet</string>
   <string name="msg_ip_subkey_expired">Unterschlüssel am %s abgelaufen</string>
   <string name="msg_ip_subkey_expires">Unterschlüssel läuft am %s ab</string>
@@ -585,30 +625,63 @@
     <item quantity="one">Ignoriere eine Beglaubigung, ausgestellt von unbekanntm öffentlichen Schlüssel</item>
     <item quantity="other">Ignoriere %s Beglaubigungen, ausgestellt von unbekannten öffentlichen Schlüsseln</item>
   </plurals>
+  <string name="msg_ip_uid_classifying_zero">Benutzerkennungen werden klassifiziert (keine vertrauenswürdigen Schlüssel verfügbar)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Benutzerkennungen werden klassifiziert (ein vertrauenswürdiger Schlüssel wird verwendet)</item>
+    <item quantity="other">Benutzerkennungen werden klassifiziert (%s vertrauenswürdige Schlüssel werden verwendet)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Benutzerkennungen werden neu geordnet</string>
+  <string name="msg_ip_uid_processing">Benutzerkennung %s wird verarbeitet</string>
+  <string name="msg_ip_uid_revoked">Nutzer ID wiederrufen</string>
+  <string name="msg_ip_uat_processing_image">Bilder werden verarbeitet</string>
+  <string name="msg_ip_uat_processing_unknown">Unbekannte Benutzerattribute werden verarbeitet</string>
+  <string name="msg_ip_uat_cert_bad">Ungültiges Zertifikat gefunden!</string>
+  <string name="msg_ip_uat_cert_error">Fehler beim Verarbeiten des Zertifikates!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Besitzt bereits eine nicht widerrufbare Beglaubigung, überspringe.</string>
+  <string name="msg_ip_uat_cert_old">Beglaubgigung ist älter als Vorherige, überspringe.</string>
+  <string name="msg_ip_uat_cert_new">Beglaubigung ist aktueller, ersetze Vorherhige.</string>
+  <string name="msg_ip_uat_cert_good">Korrekte Beglaubigung von %1$s gefunden</string>
+  <string name="msg_ip_uat_cert_good_revoke">Korrekten Zertifikatswiderruf von %1$s gefunden</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Ignoriere eine Beglaubigung, ausgestellt von einem unbekannten Schlüssel</item>
+    <item quantity="other">Ignoriere %s Beglaubigungen, ausgestellt von unbekannten öffentlichen Schlüsseln</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Klassifiziere Benutzerattribute</string>
+  <string name="msg_ip_uat_revoked">Benutzerattribut wurde widerrufen</string>
   <string name="msg_is_bad_type_public">Es wurde versucht einen öffentlichen Schlüsselbund als Geheim zu importieren. Das ist ein Fehler, bitte reiche einen Bericht ein.</string>
+  <string name="msg_is_bad_type_uncanon">Es wurde versucht, einen Schlüsselbund ohne Anpassung zu importieren. Dies ist ein Fehler, bitte reiche einen Bericht ein.</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importiere geheimen Schlüssel %s</string>
   <string name="msg_is_db_exception">Datenbankfehler!</string>
   <string name="msg_is_importing_subkeys">Geheime Unterschlüssel werden bearbeitet</string>
   <string name="msg_is_error_io_exc">Fehler bei Kordierung des Schlüsselbunds</string>
+  <string name="msg_is_merge_public">Importierte Daten werden in vorhandenen öffentlichen Schlüsselbund eingefügt</string>
+  <string name="msg_is_merge_secret">Importierte Daten werden in vorhandenen öffentlichen Schlüsselbund eingefügt</string>
+  <string name="msg_is_merge_special">Eigenbeglaubigungsdaten aus öffentlichem Schlüsselbund werden eingefügt</string>
   <string name="msg_is_pubring_generate">Generiere öffentlichen Schlüsselbund aus geheimem Schlüsselbund</string>
   <string name="msg_is_subkey_nonexistent">Unterschlüssel %s in privatem Schlüssel nicht verfügbar.</string>
   <string name="msg_is_subkey_ok">Geheimen Unterschlüssel %s als verfügbar markiert</string>
   <string name="msg_is_subkey_empty">Geheimen Unterschlüssel %s als verfügbar markiert, ohne Passphrase</string>
+  <string name="msg_is_subkey_pin">Geheimen Unterschlüssel %s als verfügbar markiert, mit PIN</string>
   <string name="msg_is_subkey_stripped">Privater Unterschlüssel %s als gekürzt markiert</string>
   <string name="msg_is_subkey_divert">Privater Unterschlüssel %s als \'Umleiten zu Smartcard/NFC\' markiert</string>
   <string name="msg_is_success_identical">Schlüsselbund enthält keine neuen Daten, es gibt nichts zu tun.</string>
   <string name="msg_is_success">Geheimer Schlüsselbund erfolgreich importiert</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_public">Öffentlicher Schlüsselbund %s wird in vorschriftsgemäße Form gebracht</string>
+  <string name="msg_kc_secret">Geheimer Schlüsselbund %s wird in vorschriftsgemäße Form gebracht</string>
   <string name="msg_kc_error_v3">Dies ist ein OpenPGP Schlüssel der Version 3, welche hinfällig sind und nicht weiter unterstützt werden!</string>
   <string name="msg_kc_error_no_uid">Schlüsselbund hat keine gültigen Benutzerkennungen!</string>
   <string name="msg_kc_error_master_algo">Der Hauptschlüssel verwendet einen unbekannten (%s) Algorithmus!</string>
+  <string name="msg_kc_error_dup_key">Unterschlüssel %s kommt zweimal im Schlüsselbund vor. Schlüsselbund ist fehlerhaft, wird nicht importiert!</string>
   <string name="msg_kc_master">Verarbeite Hauptschlüssel</string>
-  <string name="msg_kc_master_bad_err">Entferne fehlerhaftes Schlüsselbund Widerrufszertifikat</string>
-  <string name="msg_kc_master_bad_local">Entferne Schlüsselbund Widerrufszertifikat mit \"Lokal\" Attribut</string>
-  <string name="msg_kc_master_bad_time">Entferne Schlüsselbund Widerrufszertifikat mit zukünftigem Zeitstempel</string>
-  <string name="msg_kc_master_bad_type">Entferne Hauptschlüsselbeglaubigung unbekannter Art (%s)</string>
-  <string name="msg_kc_master_bad">Entferne fehlerhaftes Schlüsselbund Widerrufszertifikat</string>
+  <string name="msg_kc_master_bad_type">Hauptschlüsselbeglaubigung unbekannter Art wird entfernt (%s)</string>
+  <string name="msg_kc_master_bad_local">Hauptschlüsselbeglaubigung mit \'Lokal\'-Attribut wird entfernt</string>
+  <string name="msg_kc_master_bad_err">Fehlerhafte Hauptschlüsselbeglaubigung wird entfernt</string>
+  <string name="msg_kc_master_bad_time">Schlüsselbund-Widerrufszertifikat mit zukünftigem Zeitstempel wird entfernt</string>
+  <string name="msg_kc_master_bad_type_uid"> Benutzerkennungsbeglaubigung an falscher Position wird entfernt</string>
+  <string name="msg_kc_master_bad">Fehlerhafte Hauptschlüsselbeglaubigung wird entfernt</string>
+  <string name="msg_kc_master_local">Hauptschlüsselbeglaubigung mit \'Lokal\'-Attribut wird entfernt</string>
   <string name="msg_kc_revoke_dup">Entferne redundantes Schlüsselbund Widerrufszertifikat</string>
   <string name="msg_kc_sub">Verarbeite Unterschlüssel %s</string>
   <string name="msg_kc_sub_bad">Entferne ungültige Unterschlüssel Zwischenbeglaubigung</string>
@@ -626,25 +699,64 @@
   <string name="msg_kc_sub_revoke_bad">Entferne fehlerhaftes Unterschlüssel Widerrufszertifikat</string>
   <string name="msg_kc_sub_revoke_dup">Entferne redundantes Unterschlüssel Widerrufszertifikat</string>
   <string name="msg_kc_sub_unknown_algo">Unterschlüssel verwendet unbekannten Algorithmus, wird nicht importiert...</string>
+  <string name="msg_kc_sub_algo_bad_encrpyt">Der Unterschlüssel soll für die Verschlüsselung genutzt werden, der zu verwendende Algorithmus unterstützt dies jedoch nicht.</string>
+  <string name="msg_kc_sub_algo_bad_sign">Der Unterschlüssel soll zum Unterschreiben genutzt werden, der zu verwendende Algorithmus unterstützt dies jedoch nicht.</string>
+  <string name="msg_kc_success">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, keine Änderungen</string>
+  <plurals name="msg_kc_success_bad">
+    <item quantity="one">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, eine fehlerhafte Beglaubigung entfernt</item>
+    <item quantity="other">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, %d fehlerhafte Beglaubigungen entfernt</item>
+  </plurals>
+  <string name="msg_kc_success_bad_and_red">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, %1$s fehlerhafte und %2$s redundante Beglaubigungen entfernt</string>
+  <plurals name="msg_kc_success_redundant">
+    <item quantity="one">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, eine redundante Beglaubigung entfernt</item>
+    <item quantity="other">Schlüsselbund wurde erfolgreich in vorschriftsgemäße Form gebracht, %d redundante Beglaubigungen entfernt</item>
+  </plurals>
+  <string name="msg_kc_uid_bad_err">Fehlerhafte Eigenbeglaubigung für Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_bad_local">Benutzerkennungsbeglaubigung mit \'Lokal\'-Attribut wird entfernt</string>
+  <string name="msg_kc_uid_bad_time">Benutzerkennung mit zukünftigem Zeitstempel wird entfernt</string>
+  <string name="msg_kc_uid_bad_type">Benutzerkennungsbeglaubigung unbekannter Art wird entfernt (%s)</string>
+  <string name="msg_kc_uid_bad">Fehlerhafte Eigenbeglaubigung für Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_cert_dup">Abgelaufene Eigenbeglaubigung für Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_foreign">Fremde Benutzerkennungsbeglaubigung von \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_revoke_dup">Redundantes Widerrufszertifikat für Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_revoke_old">Abgelaufenes Widerrufszertifikat für Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_no_cert">Keine gültige Eigenbeglaubigung für Benutzerkennung \'%s\' gefunden, wird vom Bund entfernt</string>
+  <string name="msg_kc_uid_remove">Ungültige Benutzerkennung \'%s\' wird entfernt</string>
+  <string name="msg_kc_uid_dup">Doppelte Benutzerkennung \'%s\' wird entfernt. Der geheime Schlüssel enthielt zwei davon. Hieraus könnten fehlende Beglaubigungen resultieren!</string>
   <string name="msg_kc_uid_warn_encoding">Benutzerkennung nicht als UTF-8 bestätigt!</string>
+  <string name="msg_kc_uat_jpeg">Das Benutzerattribut JPEG wird verarbeitet</string>
+  <string name="msg_kc_uat_unknown">Ein unbekanntes Benutzerattribut wird verarbeitet</string>
+  <string name="msg_kc_uat_bad_err">Entferne fehlerhafte Eigenbeglaubigung für Benutzerattribut</string>
+  <string name="msg_kc_uat_bad_local">Entferne Benutzerattributsbeglaubigung mit \'Lokal\'-Attribut</string>
+  <string name="msg_kc_uat_bad_time">Entferne fehlerhaftes Benutzerattribute mit zukünftigem Zeitstempel</string>
+  <string name="msg_kc_uat_bad_type">Entferne Benutzerattributbeglaubigung unbekannter Art (%s)</string>
+  <string name="msg_kc_uat_bad">Entferne fehlerhafte Eigenbeglaubigung für Benutzerattribut</string>
+  <string name="msg_kc_uat_cert_dup">Entferne abgelaufene Eigenbeglaubigung für Benutzerattribut</string>
+  <string name="msg_kc_uat_foreign">Entferne fremdes Benutzerattributszertifikat von</string>
+  <string name="msg_kc_uat_revoke_dup">Entferne redundantes Widerrufszertifikat für Benutzerkennung</string>
+  <string name="msg_kc_uat_revoke_old">Entferne abgelaufenes Widerrufszertifikat für Benutzerkennung</string>
+  <string name="msg_kc_uat_no_cert">Keine gültigen Eigenbeglaubigungen für das Benutzerattribut gefunden, entferne vom Ring</string>
+  <string name="msg_kc_uat_remove">Ungültiges Benutzerattribut wird entfernt</string>
+  <string name="msg_kc_uat_warn_encoding">Benutzerkennung nicht als UTF-8 bestätigt!</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">Neuer öffentlicher Unterschlüssel gefunden, aber Erstellung von geheimen Unterschlüsseldummys wird nicht unterstützt!</string>
   <string name="msg_mg_error_heterogeneous">Versucht Schlüsselbunde mit unterschiedlichen Fingerabdrücken zusammenzufügen!</string>
   <string name="msg_mg_error_encode">Schwerer Fehler bei Kodierung der Signatur!</string>
   <string name="msg_mg_public">Vereine in öffentlichen Schlüsselbund %s </string>
-  <string name="msg_mg_secret">Vereine in geheimen Schlüsselring %s</string>
+  <string name="msg_mg_secret">Wird in geheimen Schlüsselbund %s eingefügt</string>
   <string name="msg_mg_new_subkey">Neuer Unterschlüssel %s wird hinzugefügt</string>
   <string name="msg_mg_found_new">%s neue Beglaubigungen in Schlüsselbund gefunden</string>
   <string name="msg_mg_unchanged">Nichts zum zusammenführen</string>
   <!--createSecretKeyRing-->
   <string name="msg_cr">Neuer Masterschlüssel wird erzeugt</string>
   <string name="msg_cr_error_no_master">Keine Hauptschlüsseloptionen definiert!</string>
+  <string name="msg_cr_error_no_user_id">Schlüsselbund muss mit mindestens einer Benutzerkennung erstellt werden!</string>
   <string name="msg_cr_error_no_certify">Hauptschlüssel benötigt das Attribut beglaubigen!</string>
   <string name="msg_cr_error_null_expiry">Ablaufdatum kann bei Schlüsselerstellung nicht \'gleiche wie vorher\' sein. Das ist ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
   <string name="msg_cr_error_keysize_512">Schlüsselgröße muss größer/gleich 512 sein!</string>
   <string name="msg_cr_error_no_curve">Keine Schlüsselgröße angegeben. Das ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string>
   <string name="msg_cr_error_no_keysize">Keine Elliptische Kurve angegeben. Das ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string>
-  <string name="msg_cr_error_internal_pgp">Interner PGP Fehler!</string>
+  <string name="msg_cr_error_internal_pgp">Interner OpenPGP Fehler!</string>
   <string name="msg_cr_error_unknown_algo">Unbekannter Algorithmus ausgewählt. Das ist ein Progammierfehler, bitte reiche einen Fehlerbericht ein!</string>
   <string name="msg_cr_error_flags_dsa">Falsche Schlüsselattribute gewählt, DSA kann nicht zum verschlüsseln verwendet werden!</string>
   <string name="msg_cr_error_flags_elgamal">Falsche Schlüsselattribute gewählt, ElGamal kann nicht zum signieren verwendet werden!</string>
@@ -658,15 +770,19 @@
   <string name="msg_mf_error_integrity">Interner Fehler, Integritätsprüfung fehlgeschlagen!</string>
   <string name="msg_mf_error_master_none">Keine Hauptbeglaubigung zum arbeiten gefunden! (Alle widerrufen?)</string>
   <string name="msg_mf_error_noexist_primary">Falsche primäre Benutzerkennung festgelegt!</string>
+  <string name="msg_mf_error_noexist_revoke">Falsche Benutzerkennung für Widerruf definiert!</string>
+  <string name="msg_mf_error_revoked_primary">Widerrufene Benutzerkennungen können keine Primäre sein!</string>
   <string name="msg_mf_error_null_expiry">Ablaufdatum kann bei Unterschlüsselerstellung nicht \'gleiche wie vorher\' sein. Das ist ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
   <string name="msg_mf_error_passphrase_master">Schwerer Fehler beim Entschlüsseln des Hauptschlüssels! Dies ist wahrscheinlich ein Programmierfehler, bitte reiche einen Fehlerbericht ein.</string>
-  <string name="msg_mf_error_pgp">Interner PGP-Fehler!</string>
+  <string name="msg_mf_error_pgp">Interner OpenPGP Fehler!</string>
   <string name="msg_mf_error_sig">Signaturfehler!</string>
   <string name="msg_mf_master">Verändere Hauptbeglaubigungen</string>
-  <string name="msg_mf_passphrase">Speichere Passwort für Schlüsselbund zwischen...</string>
+  <string name="msg_mf_passphrase">Passwort für Schlüsselbund wird geändert</string>
   <string name="msg_mf_passphrase_key">Erneute Verschlüsselung des Unterschlüssels %s mit neuem Passwort</string>
   <string name="msg_mf_passphrase_empty_retry">Setzen des neuen Passworts fehlgeschlagen, versuche es nochmal mit leerem altem Passwort</string>
   <string name="msg_mf_passphrase_fail">Passwort für Unterschlüssel konnte nicht geändert werden! (Hat er ein anderes als die anderen Schlüssel?)</string>
+  <string name="msg_mf_primary_replace_old">Beglaubigung von vorheriger primärer Benutzerkennung wird ersetzt</string>
+  <string name="msg_mf_primary_new">Neue Beglaubigung für neue primäre Benutzerkennung wird erzeugt</string>
   <string name="msg_mf_subkey_change">Unterschlüssel %s wird geändert</string>
   <string name="msg_mf_error_subkey_missing">Versuch mit fehlendem Unterschlüssel %s zu arbeiten!</string>
   <string name="msg_mf_subkey_new">Füge neuen Unterschlüssel vom Typ %s hinzu</string>
@@ -676,15 +792,20 @@
   <string name="msg_mf_subkey_strip">Kürze Unterschlüssel %s</string>
   <string name="msg_mf_success">Schlüsselbund erfolgreich verändert</string>
   <string name="msg_mf_uid_add">Benutzerkennung %s wird hinzugefügt</string>
+  <string name="msg_mf_uid_primary">Primäre Benutzerkenung wird auf %s geändert</string>
+  <string name="msg_mf_uid_revoke">Benutzerkennung %s wird widerrufen</string>
   <string name="msg_mf_uid_error_empty">Benutzerkennung darf nicht leer sein!</string>
+  <string name="msg_mf_uat_error_empty">Benutzerattribut darf nicht leer sein!</string>
+  <string name="msg_mf_uat_add_image">Benutzerattribut vom Typ Bild wird hinzugefügt</string>
+  <string name="msg_mf_uat_add_unknown">Benutzerattribut unbekannter Art wird hinzugefügt</string>
   <string name="msg_mf_unlock_error">Fehler beim entsperren des Schlüsselbunds</string>
   <string name="msg_mf_unlock">Schlüsselbund wird entsperrt</string>
   <!--Consolidate-->
-  <string name="msg_con">Führe Datenbank zusammen</string>
-  <string name="msg_con_error_bad_state">Zusammenführung wurde gestartet, während keine Datenbank zwischengespeichert war! Dies ist wahrscheinlich ein Programmierfehler, bitte reiche einen Fehlerbericht ein!</string>
-  <string name="msg_con_error_concurrent">Zusammenführung abgebrochen, läuft bereits in einem anderen Prozess!</string>
-  <string name="msg_con_save_secret">Geheime Schlüsselringe werden gespeichert</string>
-  <string name="msg_con_save_public">Öffentliche Schlüsselringe werden gespeichert</string>
+  <string name="msg_con">Datenbank wird zusammengeführt</string>
+  <string name="msg_con_error_bad_state">Zusammenführung wurde gestartet während keine Datenbank zwischengespeichert war! Dies ist wahrscheinlich ein Programmierfehler, bitte reichen Sie einen Fehlerbericht ein!</string>
+  <string name="msg_con_error_concurrent">Zusammenführung abgebrochen, läuft bereits auf einem anderen Thread!</string>
+  <string name="msg_con_save_secret">Geheime Schlüsselbünde werden gespeichert</string>
+  <string name="msg_con_save_public">Öffentliche Schlüsselbünde werden gespeichert</string>
   <string name="msg_con_db_clear">Datenbank wird geleert</string>
   <string name="msg_con_success">Datenbank erfolgreich zusammengeführt!</string>
   <string name="msg_con_critical_in">Beginne kritische Phase!</string>
@@ -696,6 +817,8 @@
   <string name="msg_con_error_io_secret">Ein-/Ausgabefehler beim Schreiben von geheimen Schlüsseln in den Cache!</string>
   <string name="msg_con_error_public">Fehler beim reimportieren der öffentlichen Schlüssel!</string>
   <string name="msg_con_error_secret">Fehler beim reimportieren der geheimen Schlüssel!</string>
+  <string name="msg_con_recover">Zusammenführungsvorgang wird fortgesetzt</string>
+  <string name="msg_con_recover_unknown">Zusammenführungsvorgang aus unbekanntem Zustand wird fortgesetzt</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Wiederimport eines öffentlichen Schlüssels </item>
     <item quantity="other">Reimport von %d öffentlichen Schlüsseln</item>
@@ -708,6 +831,17 @@
   <string name="msg_con_reimport_secret_skip">Keine geheimen Schlüssel für reimport, überspringe...</string>
   <string name="msg_con_warn_delete_public">Fehler beim Löschen der Öffentlichen Cache-Datei</string>
   <string name="msg_con_warn_delete_secret">Fehler beim Löschen der Geheimen Cache-Datei</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Schlüsselvorgang wird durchgeführt</string>
+  <string name="msg_ed_caching_new">Neues Passwort wird zwischengespeichert</string>
+  <string name="msg_ed_error_key_not_found">Schlüssel nicht gefunden!</string>
+  <string name="msg_ed_fetching">Zu ändernder Schlüssel wird abgerufen (%s)</string>
+  <string name="msg_ed_success">Schlüsselvorgang erfolgreich</string>
+  <!--Promote key-->
+  <string name="msg_pr_error_already_secret">Der Schlüssel ist bereits ein geheimer Schlüssel!</string>
+  <string name="msg_pr_error_key_not_found">Schlüssel nicht gefunden!</string>
+  <string name="msg_pr_fetching">Zu ändernder Schlüssel wird abgerufen (%s)</string>
+  <string name="msg_pr_success">Schlüssel erfolgreich eingebracht</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">Bearbeiten von NFC Schlüsseln wird (noch) nicht unterstützt!</string>
   <string name="msg_ek_error_dummy">Kann Schlüsselbund nicht mit gekürztem Hauptschlüssel bearbeiten!</string>
@@ -716,11 +850,13 @@
   <string name="msg_dc_askip_no_key">Daten mit unbekanntem Schlüssel verschlüsselt, überspringe...</string>
   <string name="msg_dc_askip_not_allowed">Daten mit nicht zugelassenem Schlüssel verschlüsselt, überspringe...</string>
   <string name="msg_dc_asym">Block asymmetrisch verschlüsselter Daten für Schlüssel %s gefunden</string>
+  <string name="msg_dc_charset">Ein Zeichensatz-Header wurde gefunden: \'%s\'</string>
   <string name="msg_dc_clear_data">Verarbeite Klartextdaten</string>
   <string name="msg_dc_clear_decompress">Entpacke komprimierte Daten</string>
   <string name="msg_dc_clear_meta_file">Dateiname: %s</string>
   <string name="msg_dc_clear_meta_mime">MIME-Typ: %s</string>
   <string name="msg_dc_clear_meta_size">Dateigröße: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">Dateigröße ist unbekannt</string>
   <string name="msg_dc_clear_meta_time">Änderungszeit: %s</string>
   <string name="msg_dc_clear_signature_bad">Signaturprüfung NICHT OK!</string>
   <string name="msg_dc_clear_signature_check">Überprüfe Signaturdaten</string>
@@ -734,7 +870,7 @@
   <string name="msg_dc_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string>
   <string name="msg_dc_error_no_data">Keine verschlüsselten Daten in Datenstrom gefunden!</string>
   <string name="msg_dc_error_no_key">Keine verschlüsselten Daten mit bekanntem geheimen Schlüssel in Datenstrom gefunden!</string>
-  <string name="msg_dc_error_pgp_exception">PGP Ausnahme während des Vorgangs aufgetreten!</string>
+  <string name="msg_dc_error_pgp_exception">Es ist ein OpenPGP-Ausnahmefehler während des Vorgangs aufgetreten!</string>
   <string name="msg_dc_integrity_check_ok">Integritätsprüfung OK!</string>
   <string name="msg_dc_ok_meta_only">Es wurden nur Metadaten angefragt, überspringe Entschlüsselung</string>
   <string name="msg_dc_ok">OK</string>
@@ -745,36 +881,58 @@
   <string name="msg_dc">Starte Entschlüsselungsvorgang...</string>
   <string name="msg_dc_sym_skip">Symmetrische Daten nicht erlaubt, überspringe...</string>
   <string name="msg_dc_sym">Block symmetrisch verschlüsselter Daten gefunden</string>
+  <string name="msg_dc_trail_asym">Anhängende, asymmetrisch verschlüsselte Daten für Schlüssel %s gefunden</string>
+  <string name="msg_dc_trail_sym">Anhang gefunden, symmetrisch verschlüsselte Daten</string>
+  <string name="msg_dc_trail_unknown">Anhängende Daten unbekannter Art gefunden</string>
   <string name="msg_dc_unlocking">Geheimer Schlüssel wird entsperrt</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Bereite öffentliche Schlüssel für Verschlüsselung vor</string>
-  <string name="msg_se_clearsign_only">Signieren von Klartexteingaben wird nicht Unterstützt!</string>
-  <string name="msg_se_compressing">Bereite Kompression vor</string>
-  <string name="msg_se_encrypting">Daten werden verschlüsselt</string>
-  <string name="msg_se_error_bad_passphrase">Falsches Passwort!</string>
-  <string name="msg_se_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string>
-  <string name="msg_se_error_key_sign">Gewählter Signaturschlüssel kann keine Daten signieren!</string>
-  <string name="msg_se_error_sign_key">Fehler bei Abruf des Signaturschlüssels!</string>
-  <string name="msg_se_error_nfc">NFC-Datenfehler!</string>
-  <string name="msg_se_error_no_passphrase">Kein Passwort bereitgestellt!</string>
-  <string name="msg_se_error_pgp">Interner PGP-Fehler!</string>
-  <string name="msg_se_error_sig">PGP Signaturausnahme aufgetreten!</string>
-  <string name="msg_se_error_unlock">Unbekannter Fehler bei Schlüsselentsperrung!</string>
-  <string name="msg_se_key_ok">Verschlüssele für Schlüssel: %s</string>
-  <string name="msg_se_key_unknown">Fehlender Schlüssel für Verschlüsselung: %s</string>
-  <string name="msg_se_key_warn">Falscher Schlüssel für Verschlüsselung: %s</string>
-  <string name="msg_se_ok">Signierungs-/Verschlüsselungsvorgang erfolgreich!</string>
-  <string name="msg_se_pending_nfc">NFC Token benötigt, verlange Benutzereingabe...</string>
-  <string name="msg_se_pending_passphrase">Passwort benötigt, verlange Benutezreingabe...</string>
-  <string name="msg_se_signing">Signiere Daten (ohne Verschlüsselung)</string>
-  <string name="msg_se_sigcrypting">Verschlüssele Daten mit Signatur</string>
-  <string name="msg_se">Starte Signier- und/oder Verschlüsselungsvorgang</string>
-  <string name="msg_se_symmetric">Bereite symmetrische Verschlüsselung vor</string>
+  <string name="msg_se">Starte Signier-/Verschlüsselungsvorgang</string>
+  <string name="msg_se_error_no_input">Keine Eingabe gegeben!</string>
+  <string name="msg_se_error_input_uri_not_found">Fehler beim öffnen der Uri zum lesen!</string>
+  <string name="msg_se_success">Signier-/Verschlüsselungsvorgang erfolgreich!</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Bereite öffentliche Schlüssel für Verschlüsselung vor</string>
+  <string name="msg_pse_clearsign_only">Signieren von Klartexteingaben wird nicht unterstützt!</string>
+  <string name="msg_pse_compressing">Bereite Kompression vor</string>
+  <string name="msg_pse_encrypting">Daten werden verschlüsselt</string>
+  <string name="msg_pse_error_bad_passphrase">Falsches Passwort!</string>
+  <string name="msg_pse_error_hash_algo">Angeforderter Hash-Algorithmus wird von diesem Schlüssel nicht unterstützt!</string>
+  <string name="msg_pse_error_io">Ein-/Ausgabefehler während Vorgang aufgetreten!</string>
+  <string name="msg_pse_error_key_sign">Gewählter Signaturschlüssel kann keine Daten signieren!</string>
+  <string name="msg_pse_error_sign_key">Fehler bei Abruf des Signaturschlüssels!</string>
+  <string name="msg_pse_error_nfc">NFC-Datenfehler!</string>
+  <string name="msg_pse_error_no_passphrase">Kein Passwort bereitgestellt!</string>
+  <string name="msg_pse_error_pgp">Interner OpenPGP Fehler!</string>
+  <string name="msg_pse_error_sig">OpenPGP-Signaturfehler aufgetreten!</string>
+  <string name="msg_pse_error_unlock">Unbekannter Fehler bei Schlüsselentsperrung!</string>
+  <string name="msg_pse_key_ok">Verschlüssele für Schlüssel: %s</string>
+  <string name="msg_pse_key_unknown">Fehlender Schlüssel für Verschlüsselung: %s</string>
+  <string name="msg_pse_key_warn">Falscher Schlüssel für Verschlüsselung: %s</string>
+  <string name="msg_pse_ok">Signierungs-/Verschlüsselungsvorgang erfolgreich!</string>
+  <string name="msg_pse_pending_nfc">NFC Token benötigt, verlange Benutzereingabe...</string>
+  <string name="msg_pse_pending_passphrase">Passwort benötigt, verlange Benutzereingabe...</string>
+  <string name="msg_pse_signing">Signiere Daten (ohne Verschlüsselung)</string>
+  <string name="msg_pse_signing_cleartext">Erstelle Klartextsignatur</string>
+  <string name="msg_pse_signing_detached">Separate Signatur wird erstellt</string>
+  <string name="msg_pse_sigcrypting">Verschlüssele Daten mit Signatur</string>
+  <string name="msg_pse">Starte Signier- und/oder Verschlüsselungsvorgang</string>
+  <string name="msg_pse_symmetric">Bereite symmetrische Verschlüsselung vor</string>
   <string name="msg_crt_certifying">Zertifizierungen werden erzeugt</string>
+  <string name="msg_crt_certify_all">Alle Benutzerkennungen für Schlüssel %s werden beglaubigt</string>
+  <plurals name="msg_crt_certify_some">
+    <item quantity="one">Eine Benutzerkennung für Schlüssel %2$s wird beglaubigt</item>
+    <item quantity="other">%1$d Benutzerkennungen für Schlüssel %2$s werden beglaubigt</item>
+  </plurals>
+  <string name="msg_crt_error_self">Auf diese Art und Weise kann keine Eigenbeglaubigung ausgestellt werden!</string>
   <string name="msg_crt_error_master_not_found">Hauptschlüssel nicht gefunden!</string>
   <string name="msg_crt_error_nothing">Keine beglaubigten Schlüssel!</string>
+  <string name="msg_crt_error_unlock">Fehler beim Entsperren des Hauptschlüssels!</string>
+  <string name="msg_crt_error_divert">Beglaubigung mit NFC wird (noch) nicht unterstützt!</string>
   <string name="msg_crt">Schlüsselbund wird beglaubigt</string>
+  <string name="msg_crt_master_fetch">Beglaubigender Hauptschlüssel wird abgerfufen</string>
+  <string name="msg_crt_save">Beglaubigter Schlüssel %s wird gespeichert</string>
   <string name="msg_crt_saving">Schlüsselbunde werden gespeichert</string>
+  <string name="msg_crt_unlock">Hauptschlüssel wird entsperrt</string>
   <string name="msg_crt_success">Identitäten erfolgreich beglaubigt</string>
   <string name="msg_crt_warn_not_found">Schlüssel nicht gefunden!</string>
   <string name="msg_crt_warn_cert_failed">Erzeugen des Zertifikates fehlgeschlagen!</string>
@@ -784,15 +942,35 @@
     <item quantity="one">Schlüssel wird importiert</item>
     <item quantity="other">%d Schlüssel werden importiert</item>
   </plurals>
+  <string name="msg_import_fetch_error_decode">Fehler beim Dekodieren des abgerufenen Schlüsselbundes!</string>
+  <string name="msg_import_fetch_error">Schlüssel konnte nicht abgerufen werden! (Netzwerkprobleme?)</string>
+  <string name="msg_import_fetch_keybase">Empfange von keybase.io: %s</string>
+  <string name="msg_import_fetch_keyserver_error">Konnte Schlüssel nicht von Keybase empfangen!</string>
+  <string name="msg_import_fetch_keyserver">Von einem Schlüsselserver abrufen: %s</string>
+  <string name="msg_import_fetch_keyserver_ok">Schlüsselabruf erfolgreich</string>
   <string name="msg_import_keyserver">Schlüsselserver %s wird verwendet</string>
+  <string name="msg_import_fingerprint_error">Fingerabdruck des abgerufenen Schlüssels entspricht nicht dem Erwarteten!</string>
+  <string name="msg_import_fingerprint_ok">Fingerabdrucktest in Ordnung</string>
+  <string name="msg_import_merge">Abgerufene Daten werden eingefügt</string>
   <string name="msg_import_error">Importieren fehlgeschlagen!</string>
+  <string name="msg_import_error_io">Der Import ist aufgrund eines Eingabe/Ausgabe-Fehlers fehlgeschlagen!</string>
   <string name="msg_import_partial">Importvorgang erfolgreich, mit Fehlern!</string>
+  <string name="msg_import_success">Importvorgang erfolgreich!</string>
+  <plurals name="msg_export">
+    <item quantity="one">Ein Schlüssel wird exportiert</item>
+    <item quantity="other">%d Schlüssel werden exportiert</item>
+  </plurals>
   <string name="msg_export_all">Exportiere alle Schlüssel</string>
   <string name="msg_export_public">Exportiere öffentlichen Schlüssel %s</string>
   <string name="msg_export_secret">Exportiere privaten Schlüssel %s</string>
   <string name="msg_export_error_no_file">Kein Dateiname angegeben!</string>
+  <string name="msg_export_error_fopen">Fehler beim Öffnen der Datei !</string>
+  <string name="msg_export_error_no_uri">Keine URI angegeben!</string>
+  <string name="msg_export_error_uri_open">Fehler beim Öffnen des URI-Streams!</string>
+  <string name="msg_export_error_storage">Speicher ist nicht Schreibbereit !</string>
   <string name="msg_export_error_db">Datenbankfehler!</string>
   <string name="msg_export_error_io">Eingabe/Ausgabe Fehler!</string>
+  <string name="msg_export_error_key">Fehlber bei der Vorverarbeitung der Schlüsseldaten!</string>
   <string name="msg_export_success">Exportvorgang erfolgreich!</string>
   <string name="msg_del_error_empty">Nichts zu löschen!</string>
   <string name="msg_del_error_multi_secret">Geheime Schlüssel können nur einzeln gelöscht werden!</string>
@@ -802,16 +980,26 @@
   </plurals>
   <string name="msg_del_key">Lösche Schlüssel %s</string>
   <string name="msg_del_key_fail">Fehler beim Löschen von Schlüssel %s</string>
+  <string name="msg_del_consolidate">Datenbank wird nach Löschung des geheimen Schlüssels zusammengeführt</string>
   <plurals name="msg_del_ok">
     <item quantity="one">Schlüssel erfolgreich gelöscht</item>
     <item quantity="other">%d Schlüssel erfolgreich gelöscht</item>
   </plurals>
+  <plurals name="msg_del_fail">
+    <item quantity="one">Fehler beim Löschen eines Schlüssels</item>
+    <item quantity="other">Fehler beim Löschen von %d Schlüsseln</item>
+  </plurals>
   <string name="msg_acc_saved">Konto gespeichert</string>
   <string name="msg_download_success">Erfolgreich heruntergeladen!</string>
+  <string name="msg_download_no_valid_keys">Keine gültigen Schlüssel in der Datei/Zwischenablage gefunden!</string>
+  <string name="msg_download_no_pgp_parts">NOCH ZU MACHEN: Plurale!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Ein Teil der geladenen Datei ist ein gültiges OpenPGP Objekt aber kein OpenPGP Schlüssel</item>
     <item quantity="other">Teile der geladenen Dateien sind gültige OpenPGP Objekte aber keine OpenPGP Schlüssel</item>
   </plurals>
+  <string name="msg_download_query_too_short">Suchanfrage zu kurz. Bitte verfeinern Sie Ihre Suchanfrage!</string>
+  <string name="msg_download_too_many_responses">Schlüsselsuchanfrage lieferte zu viele Kandidaten. Bitte verfeinern Sie Ihre Anfrage!</string>
+  <string name="msg_download_query_too_short_or_too_many_responses">Entweder keine oder zu viele Schlüssel wurden gefunden. Bitte verbessern Sie Ihre Anfrage!</string>
   <string name="msg_download_query_failed">Beim suchen der Schlüssel ist ein Fehler aufgetreten.</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">Klicken um Passworte aus Zwischenspeicher zu leeren</string>
@@ -819,6 +1007,11 @@
   <string name="passp_cache_notif_keys">Zwischengespeicherte Passworte:</string>
   <string name="passp_cache_notif_clear">Cache löschen</string>
   <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">Erzeuge meinen Schlüssel</string>
+  <string name="first_time_import_key">Von Datei importieren</string>
+  <string name="first_time_skip">Setup überspringen</string>
   <!--unsorted-->
   <string name="section_certifier_id">Beglaubiger</string>
   <string name="section_cert">Zertifikatdetails</string>
@@ -847,9 +1040,32 @@
   <string name="error_no_file_selected">Mindestens eine Datei zum Verschlüsseln auswählen!</string>
   <string name="error_multi_not_supported">Das speichern von mehreren Dateien wird nicht unterstützt. Dies ist eine Einschränkung der aktuellen Android Version.</string>
   <string name="key_colon">Schlüssel:</string>
-  <!--First Time-->
-  <string name="first_time_text1">Hol dir deine Privatsphäre mit OpenKeychain zurück!</string>
-  <string name="first_time_create_key">Erzeuge meinen Schlüssel</string>
-  <string name="first_time_import_key">Von Datei importieren</string>
-  <string name="first_time_skip">Setup überspringen</string>
+  <string name="btn_start_exchange">Austausch starten</string>
+  <string name="user_id_none"><![CDATA[<kein>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Wähle eine Entsperrmethode</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Passwort eingeben</string>
+  <string name="passphrase">Passwort</string>
+  <string name="noPassphrase">Kein Passwort</string>
+  <string name="no_passphrase_set">Kein Passwort gesetzt</string>
+  <string name="passphrases_match">Die Passwörter stimmten nicht überein.</string>
+  <string name="passphrase_saved">Passwort gespeichert</string>
+  <string name="passphrase_invalid">Falsches Passwort</string>
+  <string name="missing_passphrase">Fehlendes Passwort</string>
+  <string name="passphrase_again">Wiederholen</string>
+  <string name="lockpattern">Entsperrcode</string>
+  <string name="lockpatternNFC">NFc + Entsperrcode</string>
+  <string name="unlock_method">Entsperrmethode</string>
+  <string name="set_passphrase">Passwort setzen</string>
+  <string name="draw_lockpattern">Zeichne Entsperrcode</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">Falscher Tag. Bitte versuche es erneut.</string>
+  <string name="enable_nfc">Aktiviere NFC in deinen Einstellungen.</string>
+  <string name="no_nfc_support">Dieses Gerät unterstützt kein NFC</string>
+  <string name="nfc_write_succesful">Erfolgreich auf den NFC Tag geschrieben</string>
+  <string name="unlocked">Entsperrt</string>
+  <string name="nfc_settings">Einstellungen</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index bf532a2aa..e2c657f3e 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -9,13 +9,13 @@
   <string name="title_encrypt_text">Cifrar texto</string>
   <string name="title_encrypt_files">Cifrar ficheros</string>
   <string name="title_decrypt">Descifrar</string>
-  <string name="title_unlock">Frase de contraseña</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"> Preferencias</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">Prioridad del servidor de claves</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_key">Compartir clave con...</string>
@@ -36,6 +36,7 @@
   <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>
   <!--section-->
   <string name="section_user_ids">Identificaciones</string>
   <string name="section_keys">Subclaves</string>
@@ -55,6 +56,8 @@
   <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>
   <!--button-->
   <string name="btn_decrypt_verify_file">Descifrar, verificar, y guardar fichero</string>
   <string name="btn_decrypt_verify_message">Descifrar y verificar mensaje</string>
@@ -74,9 +77,11 @@
   <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_decrypt_clipboard">Descifrar desde el portapapeles</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>
   <!--menu-->
   <string name="menu_preferences">Ajustes</string>
   <string name="menu_help">Ayuda</string>
@@ -90,6 +95,7 @@
   <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_advanced">Mostrar información avanzada</string>
   <!--label-->
@@ -106,9 +112,9 @@
   <string name="label_file_ascii_armor">Habilitar armadura ASCII</string>
   <string name="label_write_version_header">Permitir conocer a otros que usted está usando OpenKeychain</string>
   <string name="label_write_version_header_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, texto cifrado, y claves exportadas</string>
-  <string name="label_use_default_yubikey_pin">Usar el PIN por defecto de Yubikey</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Usar el teclado numérico para el PIN de Yubikey</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Usa el PIN predeterminado (123456) para acceder a las Yubikeys sobre NFC</string>
+  <string name="label_use_default_yubikey_pin">Utilizar PIN predeterminado de la YubiKey</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Utilizar teclado numérico para el PIN de la YubiKey</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Utiliza el PIN predeterminado (123456) para acceder a las YubiKeys sobre NFC</string>
   <string name="label_asymmetric_from">Firmado por:</string>
   <string name="label_to">Cifrar hacia:</string>
   <string name="label_delete_after_encryption">Eliminar fichero después del cifrado</string>
@@ -189,7 +195,9 @@
   <string name="passphrase_must_not_be_empty">Por favor, introduce una frase de contraseña.</string>
   <string name="passphrase_for_symmetric_encryption">Cifrado simétrico.</string>
   <string name="passphrase_for">Introducir la frase de contraseña para \'%s\'</string>
-  <string name="yubikey_pin_for">Introduzca el PIN de acceso a Yubikey para \'%s\'</string>
+  <string name="pin_for">Introduzca el PIN para \'%s\'</string>
+  <string name="yubikey_pin_for">Introduzca el PIN para acceder a la YubiKey para \'%s\'</string>
+  <string name="nfc_text">Sostenga la YubiKey contra el reverso de su dispositivo.</string>
   <string name="file_delete_confirmation">¿Está seguro de que quiere eliminar\n%s?</string>
   <string name="file_delete_successful">Borrado satisfactoriamente.</string>
   <string name="no_file_selected">Selecciona un archivo antes.</string>
@@ -279,6 +287,7 @@
   <string name="progress_modify">modificando juego de claves...</string>
   <string name="progress_modify_unlock">desbloqueando juego de claves...</string>
   <string name="progress_modify_adduid">añadiendo identificaciones de usuario...</string>
+  <string name="progress_modify_adduat">añadiendo atributos de usuario...</string>
   <string name="progress_modify_revokeuid">revocando identificaciones de usuario...</string>
   <string name="progress_modify_primaryuid">cambiando identificación principal de usuario...</string>
   <string name="progress_modify_subkeychange">modificando subclaves...</string>
@@ -339,7 +348,7 @@
   <!--Help-->
   <string name="help_tab_start">Comenzar</string>
   <string name="help_tab_faq">FAQ</string>
-  <string name="help_tab_wot">Web of Trust</string>
+  <string name="help_tab_wot">Anillo de confianza</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Registro de cambios</string>
   <string name="help_tab_about">A cerca de</string>
@@ -353,8 +362,9 @@
   <string name="import_qr_code_wrong">¡El código QR está deformado! ¡Por favor, prueba de nuevo!</string>
   <string name="import_qr_code_too_short_fingerprint">La huella de validación (fingerprint) de clave es demasiado corta (&lt; 16 caracteres)</string>
   <string name="import_qr_code_button">Escanear código QR</string>
+  <string name="import_qr_code_text">¡Sitúe su cámara sobre el código QR!</string>
   <!--Generic result toast-->
-  <string name="view_log">Ver registro (log)</string>
+  <string name="view_log">Detalles</string>
   <string name="with_warnings">, con advertencias</string>
   <string name="with_cancelled">, hasta que sea cancelado</string>
   <!--Import result toast-->
@@ -438,7 +448,9 @@
   <string name="api_settings_delete_account">Borrar cuenta</string>
   <string name="api_settings_package_name">Nombre de paquete</string>
   <string name="api_settings_package_signature">SHA-256 de firma de paquete</string>
-  <string name="api_settings_accounts">Cuentas</string>
+  <string name="api_settings_accounts">Cuentas (API desechada)</string>
+  <string name="api_settings_advanced">Información avanzada</string>
+  <string name="api_settings_allowed_keys">Claves permitidas</string>
   <string name="api_settings_settings">Configuración</string>
   <string name="api_settings_key">Clave de la cuenta:</string>
   <string name="api_settings_accounts_empty">No hay cuentas adjuntas a esta aplicación</string>
@@ -524,9 +536,7 @@
   <string name="view_key_expired">¡Esta clave ha expirado!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Claves</string>
-  <string name="nav_encrypt_text">Cifrar texto</string>
-  <string name="nav_encrypt_files">Cifrar ficheros</string>
-  <string name="nav_decrypt">Descifrar</string>
+  <string name="nav_encrypt_decrypt">Cifrar/Descifrar</string>
   <string name="nav_apps">Aplicaciones</string>
   <string name="drawer_open">Abrir el Navigation Drawer</string>
   <string name="drawer_close">Cerrar el Navigation Drawer</string>
@@ -623,6 +633,21 @@
   <string name="msg_ip_uid_reorder">Re-ordenando identificaciones de usuario</string>
   <string name="msg_ip_uid_processing">Procesando identificación de usuario %s</string>
   <string name="msg_ip_uid_revoked">La identificación de usuario está revocada</string>
+  <string name="msg_ip_uat_processing_image">Procesando atributo de usuario de tipo imagen</string>
+  <string name="msg_ip_uat_processing_unknown">Procesando atributo de usuario de tipo desconocido</string>
+  <string name="msg_ip_uat_cert_bad">¡Se encontró un certificado defectuoso!</string>
+  <string name="msg_ip_uat_cert_error">¡Error procesando certificado!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Ya tiene un certificado no revocable, omitiendo.</string>
+  <string name="msg_ip_uat_cert_old">El certificado es más antiguo que el anterior, omitiendo.</string>
+  <string name="msg_ip_uat_cert_new">El certificado es más reciente, reemplazando el anterior.</string>
+  <string name="msg_ip_uat_cert_good">Hallado certificado correcto por %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Hallada revocación de certificado correcta por %1$s </string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Ignorando un certificado publicado por una clave pública desconocida</item>
+    <item quantity="other">Ignorando %s certificados publicados por claves públicas desconocidas</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Clasificando atributos de usuario</string>
+  <string name="msg_ip_uat_revoked">El atributo de usuario está revocado</string>
   <string name="msg_is_bad_type_public">Se intentó importar un juego de claves (keyring) público como secreto. Esto es un fallo, por favor ¡consigne un informe!</string>
   <string name="msg_is_bad_type_uncanon">Se intentó importar un juego de claves sin canonicalización. ¡Esto es un fallo, por favor rellene un informe!</string>
   <!--Import Secret log entries-->
@@ -637,6 +662,7 @@
   <string name="msg_is_subkey_nonexistent">La subclave %s no está disponible en la clave secreta (privada)</string>
   <string name="msg_is_subkey_ok">Subclave secreta (privada) %s marcada como disponible</string>
   <string name="msg_is_subkey_empty">Subclave secreta (privada) %s marcada como disponible, con frase-contraseña vacía</string>
+  <string name="msg_is_subkey_pin">Subclave secreta %s marcada como disponible, con PIN</string>
   <string name="msg_is_subkey_stripped">Subclave secreta (privada) %s marcada como desnuda</string>
   <string name="msg_is_subkey_divert">Se marcó la subclave secreta (privada) %s como \'desviar a smartcard/NFC\'</string>
   <string name="msg_is_success_identical">El juego de claves no contiene nuevos datos, no hay nada que hacer</string>
@@ -649,13 +675,16 @@
   <string name="msg_kc_error_master_algo">¡La clave maestra usa un algoritmo (%s) desconocido!</string>
   <string name="msg_kc_error_dup_key">La subclave %s aparece dos veces en el juego de claves (keyring). El juego de claves está mal formado, ¡no se va a importar!</string>
   <string name="msg_kc_master">Procesando clave maestra</string>
-  <string name="msg_kc_master_bad_err">Eliminando certificado defectuoso de revocación de juego de claves</string>
-  <string name="msg_kc_master_bad_local">Eliminando certificado de revocación de juego de claves, con distintivo \"local\"</string>
-  <string name="msg_kc_master_bad_time">Eliminando certificado de revocación de juego de claves, con marca de tiempo futura</string>
-  <string name="msg_kc_master_bad_type">Eliminando certificado de clave maestra, de tipo desconocido (%s)</string>
+  <string name="msg_kc_master_bad_type">Eliminando certificado de clave maestra de tipo desconocido (%s)</string>
+  <string name="msg_kc_master_bad_local">Eliminando certificado de clave maestra con distintivo \"local\"</string>
+  <string name="msg_kc_master_bad_err">Eliminando certificado de clave maestra defectuoso</string>
+  <string name="msg_kc_master_bad_time">Eliminando certificado de revocación de juego de claves con marca de tiempo en el futuro</string>
   <string name="msg_kc_master_bad_type_uid">Eliminando certificado de identificación de usuario en posición incorrecta</string>
-  <string name="msg_kc_master_bad">Eliminando certificado defectuoso de revocación de juego de claves</string>
+  <string name="msg_kc_master_bad">Eliminando certificado de clave maestra defectuoso</string>
+  <string name="msg_kc_master_local">Eliminando certificado de clave maestra con distitivo \"local\"</string>
   <string name="msg_kc_revoke_dup">Eliminando certificado redundante de revocación de juego de claves </string>
+  <string name="msg_kc_notation_dup">Eliminando certificado de notación redundante</string>
+  <string name="msg_kc_notation_empty">Eliminando certificado de notación vacía</string>
   <string name="msg_kc_sub">Procesando subclave %s</string>
   <string name="msg_kc_sub_bad">Eliminando certificado no válido de vinculación de subclave</string>
   <string name="msg_kc_sub_bad_err">Eliminando certificado defectuoso de vinculación de subclave</string>
@@ -695,8 +724,23 @@
   <string name="msg_kc_uid_revoke_old">Eliminando certificado de revocación caducado para la identificación de usuario \'%s\'</string>
   <string name="msg_kc_uid_no_cert">No se encontró auto-certificado válido para la identificación de usuario \'%s\', eliminándola del juego de claves</string>
   <string name="msg_kc_uid_remove">Eliminando identificación de usuario \'%s\' no válida</string>
-  <string name="msg_kc_uid_dup">Eliminando identificación de usuario duplicada \'%s\'. La clave secreta (privada) contenía dos de ellas. ¡Esto puede dar lugar a certificados perdidos!</string>
+  <string name="msg_kc_uid_dup">Eliminando identificaciones de usuario duplicadas \'%s\'. El juego de claves contenía dos de ellas. ¡Esto puede resultar en certificados perdidos!</string>
   <string name="msg_kc_uid_warn_encoding">¡La identificación de usuario no se verifica como UTF-8!</string>
+  <string name="msg_kc_uat_jpeg">Procesando atributo de usuario del tipo JPEG</string>
+  <string name="msg_kc_uat_unknown">Procesando atributo de usuario de tipo desconocido</string>
+  <string name="msg_kc_uat_bad_err">Eliminando auto certificados defectuosos para el atributo de usuario</string>
+  <string name="msg_kc_uat_bad_local">Eliminando certificado de atributo de usuario con indicativo \'local\'</string>
+  <string name="msg_kc_uat_bad_time">Eliminando atributo de usuario con marca de tiempo futura</string>
+  <string name="msg_kc_uat_bad_type">Eliminando certificado de atributo de usuario de tipo desconocido (%s)</string>
+  <string name="msg_kc_uat_bad">Eliminando auto certificado defectuoso para el atributo de usuario</string>
+  <string name="msg_kc_uat_cert_dup">Eliminando auto certificado desactualizado para el atributo de usuario</string>
+  <string name="msg_kc_uat_dup">Eliminando atributo de usuario duplicado. El juego de claves contenía dos de ellos. ¡Esto puede resultar en certificados perdidos!</string>
+  <string name="msg_kc_uat_foreign">Eliminando atributo de usuario ajeno certificado por</string>
+  <string name="msg_kc_uat_revoke_dup">Eliminando certificado de revocación redundante para el atributo de usuario</string>
+  <string name="msg_kc_uat_revoke_old">Eliminando certificado de revocación desactualizado para el atributo de usuario</string>
+  <string name="msg_kc_uat_no_cert">No se encontró auto certificado válido para el atributo de usuario, eliminándolo del juego de claves</string>
+  <string name="msg_kc_uat_remove">Eliminando atributo de usuario no válido</string>
+  <string name="msg_kc_uat_warn_encoding">¡La identificación de usuario no se verifica con formato UTF-8!</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">Nueva subclave pública encontrada, ¡pero la generación de subclaves secretas (privadas) ficticias no está soportada!</string>
   <string name="msg_mg_error_heterogeneous">¡Se intentaron fusionar juegos de claves con diferentes huellas de validación!</string>
@@ -715,7 +759,7 @@
   <string name="msg_cr_error_keysize_512">¡El tamaño de la clave debe ser mayor o igual de 512!</string>
   <string name="msg_cr_error_no_curve">¡No se especificó tamaño de clave! ¡Esto es un error de programación, por favor consigne un informe de fallo!</string>
   <string name="msg_cr_error_no_keysize">¡No se especificó curva elíptica! ¡Esto es un error de programación, por favor consigne un informe de fallo!</string>
-  <string name="msg_cr_error_internal_pgp">¡Error PGP interno!</string>
+  <string name="msg_cr_error_internal_pgp">¡Error OpenPGP interno!</string>
   <string name="msg_cr_error_unknown_algo">¡Se seleccionó un algoritmo desconocido! ¡Esto es un error de programación, por favor consigne un informe de errores!</string>
   <string name="msg_cr_error_flags_dsa">¡Se seleccionaron indicativos de clave defectuosa, DSA no puede usarse para cifrado!</string>
   <string name="msg_cr_error_flags_elgamal">¡Se seleccionaron indicativos de clave defectuosa, ElGamal no puede usarse para firmado!</string>
@@ -723,6 +767,7 @@
   <string name="msg_cr_error_flags_ecdh">¡Seleccionados indicativos de clave defectuosa, ECDH no puede usarse para firmado!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modificando el juego de claves %s</string>
+  <string name="msg_mf_error_divert_serial">¡El número de serie de una clave con indicativo desviar-a-tarjeta debe ser de 16 bytes! ¡Esto es un error de programación, por favor consigne un informe de error!</string>
   <string name="msg_mf_error_encode">¡Excepción en la codificación!</string>
   <string name="msg_mf_error_fingerprint">¡La actual huella de validación de clave no coincide con la esperada!</string>
   <string name="msg_mf_error_keyid">No hay identificación de clave. Esto es un error interno, por favor ¡consigne un informe de error!</string>
@@ -730,13 +775,16 @@
   <string name="msg_mf_error_master_none">¡No se encontró certificado maestro sobre el que operar! (¿Todos revocados?)</string>
   <string name="msg_mf_error_noexist_primary">¡Se especificó una identificación de usuario principal errónea!</string>
   <string name="msg_mf_error_noexist_revoke">¡Se especificó una identificación de usuario errónea para revocación!</string>
+  <string name="msg_mf_error_restricted">¡Se intentó efectuar una operación restringida sin frase-contraseña! ¡Este es un error de programación, por favor consigne un informe de error!</string>
   <string name="msg_mf_error_revoked_primary">¡Las identificaciones de usuario revocadas no pueden ser las principales!</string>
   <string name="msg_mf_error_null_expiry">El periodo hasta la expiración no puede ser \"el mismo que antes\" al crear subclave. Esto es un error de programación, por favor ¡rellene un informe de fallo!</string>
   <string name="msg_mf_error_passphrase_master">¡Error fatal descrifrando la clave maestra! Probablemente esto se daba a un error de programación, por favor ¡rellene un informe de fallo!</string>
-  <string name="msg_mf_error_pgp">¡Error interno de PGP!</string>
+  <string name="msg_mf_error_pgp">¡Error OpenPGP interno!</string>
   <string name="msg_mf_error_sig">¡Excepción con la firma!</string>
   <string name="msg_mf_master">Modificando certificaciones maestras</string>
-  <string name="msg_mf_passphrase">Cambiando frase-contraseña para el juego de claves (keyring)...</string>
+  <string name="msg_mf_notation_empty">Añadiendo paquete de notación vacío</string>
+  <string name="msg_mf_notation_pin">Añadiendo paquete de notación de PIN</string>
+  <string name="msg_mf_passphrase">Cambiando la frase-contraseña para el juego de claves</string>
   <string name="msg_mf_passphrase_key">Re-cifrando subclave %s con nueva frase-contraseña</string>
   <string name="msg_mf_passphrase_empty_retry">Fallo al establecer nueva frase-contraseña, intentándolo de nuevo con una antigua frase-contraseña vacía</string>
   <string name="msg_mf_passphrase_fail">¡La frase contraseña para la subclave no pudo cambiarse! (¿Tiene la subclave una diferente de la de las otras claves?)</string>
@@ -754,6 +802,9 @@
   <string name="msg_mf_uid_primary">Cambiando identificación de usuario primaria a %s</string>
   <string name="msg_mf_uid_revoke">Revocando la identificación de usuario %s</string>
   <string name="msg_mf_uid_error_empty">¡La identificación de usuario no debe estar vacía!</string>
+  <string name="msg_mf_uat_error_empty">¡El atributo de usuario no debe estar vacío!</string>
+  <string name="msg_mf_uat_add_image">Añadiendo atributo de usuario de tipo imagen</string>
+  <string name="msg_mf_uat_add_unknown">Añadiendo atributo de usuario de tipo desconocido</string>
   <string name="msg_mf_unlock_error">¡Error desbloqueando juego de claves!</string>
   <string name="msg_mf_unlock">Desbloqueando juego de claves (keyring)</string>
   <!--Consolidate-->
@@ -774,6 +825,7 @@
   <string name="msg_con_error_public">¡Error al reimportar claves públicas!</string>
   <string name="msg_con_error_secret">¡Error reimportando claves secretas (privadas)!</string>
   <string name="msg_con_recover">Retomando el proceso de consolidación</string>
+  <string name="msg_con_recursive">Omitiendo consolidación recursiva</string>
   <string name="msg_con_recover_unknown">Retomando el proceso de consolidación desde un estado desconocido</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Reimportando una clave pública</item>
@@ -787,6 +839,19 @@
   <string name="msg_con_reimport_secret_skip">No hay claves públicas a reimportar, omitiendo...</string>
   <string name="msg_con_warn_delete_public">Excepción borrando fichero de caché de claves públicas</string>
   <string name="msg_con_warn_delete_secret">Excepción al borrar fichero de caché de claves secretas (privadas)</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Realizando operación en la clave</string>
+  <string name="msg_ed_caching_new">Guardar en caché nueva frase-contraseña</string>
+  <string name="msg_ed_error_no_parcel">¡SaveKeyringParcel ausente! (esto es un fallo, por favor notifíquelo)</string>
+  <string name="msg_ed_error_key_not_found">¡Clave no encontrada!</string>
+  <string name="msg_ed_fetching">Descargando clave a modificar (%s)</string>
+  <string name="msg_ed_success">Operación en la clave completada</string>
+  <!--Promote key-->
+  <string name="msg_pr">Promover clave pública a clave secreta (privada)</string>
+  <string name="msg_pr_error_already_secret">¡La clave ya es una clave secreta (privada)!</string>
+  <string name="msg_pr_error_key_not_found">¡Clave no encontrada!</string>
+  <string name="msg_pr_fetching">Descargar clave para modificar (%s)</string>
+  <string name="msg_pr_success">La clave se promovió con éxito</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">¡La edición de claves NFC (aún) no está soportada!</string>
   <string name="msg_ek_error_dummy">¡No se pudo editar el juego de claves (keyring) con la clave maestra desnuda!</string>
@@ -795,11 +860,13 @@
   <string name="msg_dc_askip_no_key">Datos no cifrados con clave conocida, omitiendo...</string>
   <string name="msg_dc_askip_not_allowed">Datos no cifrados con clave permitida, omitiendo...</string>
   <string name="msg_dc_asym">Se encontró un bloque de datos cifrados asimétricamente para la clave %s</string>
+  <string name="msg_dc_charset">Se encontró cabecera de juego de caracteres: \'%s\'</string>
   <string name="msg_dc_clear_data">Procesando datos literales</string>
   <string name="msg_dc_clear_decompress">Desempaquetando datos comprimidos</string>
   <string name="msg_dc_clear_meta_file">Nombre de fichero: %s</string>
   <string name="msg_dc_clear_meta_mime">Tipo MIME: %s</string>
   <string name="msg_dc_clear_meta_size">Tamaño de fichero: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">Tamaño de fichero desconocido</string>
   <string name="msg_dc_clear_meta_time">Hora de la modificación: %s</string>
   <string name="msg_dc_clear_signature_bad">¡Comprobación de firma NO CORRECTA!</string>
   <string name="msg_dc_clear_signature_check">Verificando datos de firma</string>
@@ -809,11 +876,12 @@
   <string name="msg_dc_error_bad_passphrase">Error al desbloquear clave, ¡frase-contraseña errónea!</string>
   <string name="msg_dc_error_extract_key">¡Error desconocido al desbloquear clave!</string>
   <string name="msg_dc_error_integrity_check">¡Error de comprobación de integridad!</string>
+  <string name="msg_dc_error_integrity_missing">¡Verificación de integridad ausente! Esto puede ocurrir porque la aplicación de cifrado no está actualizada, o debido a un ataque desactualización.</string>
   <string name="msg_dc_error_invalid_siglist">¡No se encontraron datos de firma válidos!</string>
   <string name="msg_dc_error_io">¡Se encontró Excepción de E/S durante la operación!</string>
   <string name="msg_dc_error_no_data">¡No se encontraron datos cifrados en el flujo de datos (`stream`)!</string>
   <string name="msg_dc_error_no_key">¡No se encontraron datos cifrados con clave secreta (privada) conocida en el flujo de datos (`stream`)!</string>
-  <string name="msg_dc_error_pgp_exception">¡Se encontró una Excepción PGP durante la operación!</string>
+  <string name="msg_dc_error_pgp_exception">¡Se encontró una excepción OpenPGP durante la operación!</string>
   <string name="msg_dc_integrity_check_ok">¡Comprobación de integridad CORRECTA!</string>
   <string name="msg_dc_ok_meta_only">Sólo fueron solicitados los metadatos, omitiendo descifrado</string>
   <string name="msg_dc_ok">CORRECTO</string>
@@ -829,35 +897,49 @@
   <string name="msg_dc_trail_unknown">Se encontró huella, datos de tipo desconocido</string>
   <string name="msg_dc_unlocking">Desbloqueando clave secreta (privada)</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Preparando claves públicas para cifrado</string>
-  <string name="msg_se_clearsign_only">¡No está soportado el firmado de la entrada de texto no cifrado (`cleartext`)!</string>
-  <string name="msg_se_compressing">Preparando compresión</string>
-  <string name="msg_se_encrypting">Cifrando datos</string>
-  <string name="msg_se_error_bad_passphrase">¡Frase-contraseña errónea!</string>
-  <string name="msg_se_error_io">¡Se encontró Excepción de E/S durante la operación!</string>
-  <string name="msg_se_error_key_sign">¡La clave de firmado seleccionada no puede firmar datos!</string>
-  <string name="msg_se_error_sign_key">¡Error descargando clave de firmado!</string>
-  <string name="msg_se_error_nfc">¡Error de datos NFC!</string>
-  <string name="msg_se_error_no_passphrase">¡No se proporcionó frase-contraseña!</string>
-  <string name="msg_se_error_pgp">¡Error interno de PGP!</string>
-  <string name="msg_se_error_sig">¡Se encontró excepción de firma PGP!</string>
-  <string name="msg_se_error_unlock">¡Error desconocido desbloqueando clave!</string>
-  <string name="msg_se_key_ok">Cifrando para la clave: %s</string>
-  <string name="msg_se_key_unknown">Clave para cifrado perdida: %s</string>
-  <string name="msg_se_key_warn">Clave para cifrado errónea: %s</string>
-  <string name="msg_se_ok">¡Operación de firmado/cifrado completada!</string>
-  <string name="msg_se_pending_nfc">Se requiere credencial NFC, solicitando su introducción por el usuario...</string>
-  <string name="msg_se_pending_passphrase">Se requiere frase-contraseña, solicitando que el usuario la introduzca...</string>
-  <string name="msg_se_signing">Firmando datos (sin cifrado)</string>
-  <string name="msg_se_sigcrypting">Cifrando datos con firma</string>
-  <string name="msg_se">Iniciando operación de firmado y/o cifrado</string>
-  <string name="msg_se_symmetric">Preparando cifrado simétrico</string>
+  <string name="msg_se">Iniciando operación de firmado/cifrado</string>
+  <string name="msg_se_input_bytes">Procesando entrada de matriz de bytes</string>
+  <string name="msg_se_input_uri">Procesando entrada de URI</string>
+  <string name="msg_se_error_no_input">¡No se proporcionó entrada!</string>
+  <string name="msg_se_error_input_uri_not_found">¡Error al abrir URI para lectura!</string>
+  <string name="msg_se_error_output_uri_not_found">¡Error al abrir URI para escritura!</string>
+  <string name="msg_se_error_too_many_inputs">¡Se especificaron más entradas que salidas! Probablemente esto es un error de programación, ¡por favor informe!</string>
+  <string name="msg_se_warn_output_left">Se dejaron las salidas pero no las entradas. Probablemente esto es un error de programación, ¡por favor informe!</string>
+  <string name="msg_se_success">Operación de firmado/cifrado completada</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Preparando claves públicas para cifrado</string>
+  <string name="msg_pse_clearsign_only">¡El fimado de texto sin cifrar (cleartext) no está soportado!</string>
+  <string name="msg_pse_compressing">Preparando compresión</string>
+  <string name="msg_pse_encrypting">Cifrando datos</string>
+  <string name="msg_pse_error_bad_passphrase">¡Frase-contraseña errónea!</string>
+  <string name="msg_pse_error_hash_algo">¡El algoritmo de identificación criptográfica (hash) solicitado no está soportado por esta clave!</string>
+  <string name="msg_pse_error_io">¡Se encontró una excepción de E/S durante la operación!</string>
+  <string name="msg_pse_error_key_sign">¡La clave de firmado seleccionada no puede firmar datos!</string>
+  <string name="msg_pse_error_sign_key">¡Error al descargar clave de firmado!</string>
+  <string name="msg_pse_error_nfc">¡Error de datos NFC!</string>
+  <string name="msg_pse_error_no_passphrase">¡No se proporcionó frase-contraseña!</string>
+  <string name="msg_pse_error_pgp">¡Error interno de OpenPGP!</string>
+  <string name="msg_pse_error_sig">¡Se encontró una excepción de firma OpenPGP!</string>
+  <string name="msg_pse_error_unlock">¡Error desconocido al desbloquear clave!</string>
+  <string name="msg_pse_key_ok">Cifrando para la clave: %s</string>
+  <string name="msg_pse_key_unknown">Clave para cifrado ausente: %s</string>
+  <string name="msg_pse_key_warn">Clave para cifrado errónea: %s</string>
+  <string name="msg_pse_ok">¡Operación de firmado/cifrado completada!</string>
+  <string name="msg_pse_pending_nfc">Se requiere credencial NFC, solicitando su introducción al usuario...</string>
+  <string name="msg_pse_pending_passphrase">Se requiere frase-contraseña, solicitando su introducción al usuario.</string>
+  <string name="msg_pse_signing">Firmando datos (sin cifrado)</string>
+  <string name="msg_pse_signing_cleartext">Creando firma de texto sin cifrar (cleartext)</string>
+  <string name="msg_pse_signing_detached">Creando firma desacoplada</string>
+  <string name="msg_pse_sigcrypting">Cifrando datos con firma</string>
+  <string name="msg_pse">Iniciando operación de firmado y/o cifrado</string>
+  <string name="msg_pse_symmetric">Preparando cifrado simétrico</string>
   <string name="msg_crt_certifying">Generando certificaciones</string>
   <string name="msg_crt_certify_all">Certificando todas las identificaciones de usuario para la clave %s</string>
   <plurals name="msg_crt_certify_some">
     <item quantity="one">Certificando una identificación de usuario para la clave %2$s</item>
     <item quantity="other">Certificando %1$d identificaciones de usuario para la clave %2$s</item>
   </plurals>
+  <string name="msg_crt_error_self">¡No se puede emitir un auto-certificado como este!</string>
   <string name="msg_crt_error_master_not_found">¡Clave maestra no encontrada!</string>
   <string name="msg_crt_error_nothing">¡No se certificaron claves!</string>
   <string name="msg_crt_error_unlock">¡Error desbloqueando clave maestra!</string>
@@ -887,6 +969,7 @@
   <string name="msg_import_fingerprint_ok">Comprobación de la huella de validación correcta</string>
   <string name="msg_import_merge">Incorporando datos descargados</string>
   <string name="msg_import_error">¡La operación de importación falló!</string>
+  <string name="msg_import_error_io">¡Fallo en la operación de importación debido a un error de e/s!</string>
   <string name="msg_import_partial">¡Operación de importado completada, con errores!</string>
   <string name="msg_import_success">¡Operación de importado exitosa!</string>
   <plurals name="msg_export">
@@ -903,6 +986,7 @@
   <string name="msg_export_error_storage">¡El almacenamiento no está listo para escritura!</string>
   <string name="msg_export_error_db">¡Error de base de datos!</string>
   <string name="msg_export_error_io">¡Error de entrada/salida!</string>
+  <string name="msg_export_error_key">¡Error al preprocesar los datos de la clave!</string>
   <string name="msg_export_success">Operación de exportado exitosa</string>
   <string name="msg_del_error_empty">¡No hay nada que borrar!</string>
   <string name="msg_del_error_multi_secret">¡Las claves secretas (privadas) sólo se pueden borrar individualmente!</string>
@@ -939,6 +1023,11 @@
   <string name="passp_cache_notif_keys">Frases-contraseña almacenadas en caché:</string>
   <string name="passp_cache_notif_clear">Limpiar caché</string>
   <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</string>
+  <string name="first_time_import_key">Importar desde fichero</string>
+  <string name="first_time_skip">Omitir configuración</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificador</string>
   <string name="section_cert">Detalles del certificado</string>
@@ -969,9 +1058,32 @@
   <string name="error_multi_not_supported">El guardado de múltiples ficheros no está soportado. Esto es una limitación de su Android actual.</string>
   <string name="key_colon">Clave:</string>
   <string name="exchange_description">Para iniciar un intercambio de claves, en el lado derecho elija el número de participantes, y luego pulse el botón \"Iniciar intercambio\".\n\nSe le formularán dos preguntas más para asegurar que sólo están en el intercambio los participantes debidos, y que sus huellas de validación son correctas.</string>
-  <!--First Time-->
-  <string name="first_time_text1">¡Recupere su privacidad con OpenKeychain!</string>
-  <string name="first_time_create_key">Crear mi clave</string>
-  <string name="first_time_import_key">Importar desde fichero</string>
-  <string name="first_time_skip">Omitir configuración</string>
+  <string name="btn_start_exchange">Comenzar intercambio</string>
+  <string name="user_id_none"><![CDATA[<ninguno>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Escoja un método de desbloqueo</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Introduzca frase-contraseña</string>
+  <string name="passphrase">Frase-contraseña</string>
+  <string name="noPassphrase">Sin frase-contraseña</string>
+  <string name="no_passphrase_set">No se estableció frase-contraseña</string>
+  <string name="passphrases_match">Las frases-contraseña no coinciden</string>
+  <string name="passphrase_saved">Frase-contraseña guardada</string>
+  <string name="passphrase_invalid">Frase-contraseña no válida</string>
+  <string name="missing_passphrase">Frase-contraseña ausente</string>
+  <string name="passphrase_again">De nuevo</string>
+  <string name="lockpattern">Patrón de bloqueo</string>
+  <string name="lockpatternNFC">NFC + patrón de bloqueo</string>
+  <string name="unlock_method">Método de desbloqueo</string>
+  <string name="set_passphrase">Establecer frase-contraseña</string>
+  <string name="draw_lockpattern">Dibujar patrón de bloqueo</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">Etiqueta incorrecta. Por favor inténtelo de nuevo.</string>
+  <string name="enable_nfc">Por favor active NFC en su configuración</string>
+  <string name="no_nfc_support">Este dispositivo no soporta NFC</string>
+  <string name="nfc_write_succesful">Se escribió con éxito en la etiqueta NFC</string>
+  <string name="unlocked">Desbloqueado</string>
+  <string name="nfc_settings">Configuración</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index c811a12f0..992d1db91 100644
--- a/OpenKeychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
@@ -4,10 +4,7 @@
     http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to "Escaping apostrophes and quotes").-->
   <!--title-->
   <string name="title_decrypt">Dekrüpteeri</string>
-  <string name="title_unlock">Salasõne</string>
   <string name="title_edit_key">Muuda võtit</string>
-  <string name="title_preferences">Seaded</string>
-  <string name="title_key_server_preference">Võtmeserveri seaded</string>
   <string name="title_import_keys">Impordi võtmeid</string>
   <string name="title_export_key">Ekspordi võti</string>
   <string name="title_export_keys">Ekspordi võtmed</string>
@@ -107,10 +104,17 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-  <!--unsorted-->
   <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index 460c5462e..468d7b835 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -3,13 +3,191 @@
   <!--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_encrypt_text">Salaa Tekstiä</string>
+  <string name="title_encrypt_files">Salaa Tiedostoja</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>
+  <string name="title_share_key">Jaa avain...</string>
+  <string name="title_share_file">Jaa tiedosto...</string>
+  <string name="title_share_message">Jaa viesti...</string>
+  <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>
+  <string name="title_send_key">Lähetä Avainpalvelimelle</string>
+  <string name="title_certify_key">Varmenna Identiteetit</string>
+  <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_certify">Varmenna</string>
+  <string name="section_actions">Toiminteet</string>
+  <string name="section_share_key">Avain</string>
+  <string name="section_certification_key">Varmentamiseen käytetty Avaimesi</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_key_to_certify">Varmennettava avain</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_decrypt_verify_message">Pura ja todenna viesti</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>
+  <string name="btn_delete">Poista</string>
+  <string name="btn_no_date">Ei umpeutumisaikaa</string>
+  <string name="btn_okay">OK</string>
+  <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_share_encrypted_signed">Salaa ja jaa viesti</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>
+  <string name="btn_add_share_decrypted_text">Jaa purettu teksti</string>
+  <string name="btn_decrypt_and_verify">ja varmenna allekirjoitukset</string>
+  <string name="btn_decrypt_files">Pura tiedostoja</string>
   <!--menu-->
+  <string name="menu_preferences">Asetukset</string>
+  <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_create_key">Luo minun avaimeni</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-->
+  <string name="label_message">Viesti</string>
+  <string name="label_file">Tiedosto</string>
+  <string name="label_files">Tiedosto(t)</string>
+  <string name="label_file_colon">Tiedosto:</string>
+  <string name="label_no_passphrase">Ei salasanaa</string>
+  <string name="label_passphrase">Salasana</string>
+  <string name="label_unlock">Avataan...</string>
+  <string name="label_passphrase_again">Toista salasana</string>
+  <string name="label_algorithm">Algoritmi</string>
+  <string name="label_ascii_armor">Tiedosto ASCII Armor</string>
+  <string name="label_file_ascii_armor">Käytä ASCII Armoria</string>
+  <string name="label_write_version_header">Anna muiden tietää että käytät OpenKeychainia</string>
+  <string name="label_write_version_header_summary">Kirjoittaa \'OpenKeychain v2.7\' OpenPGP-allekirjoituksiin, kryptattuun tekstiin sekä vietyihin avaimiin</string>
+  <string name="label_use_default_yubikey_pin">Käytä vakiota YubiKey PIN:iä</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Käytä numeerista näppäimistöä YuniKey PIN:iin</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Käyttää vakio-PIN:iä (123456) käyttääkseen YubiKeyssejä NFC kautta</string>
+  <string name="label_asymmetric_from">Allekirjoittaja:</string>
+  <string name="label_to">Salaa:</string>
+  <string name="label_delete_after_encryption">Poista tiedosto salauksen jälkeen</string>
+  <string name="label_delete_after_decryption">Poista salauksen purkamisen jälkeen</string>
+  <string name="label_encryption_algorithm">Salausalgoritmi</string>
+  <string name="label_hash_algorithm">Tiivistealgoritmi</string>
+  <string name="label_symmetric">Salaa salasanalla</string>
+  <string name="label_passphrase_cache_ttl">Välimuistiaika</string>
+  <string name="label_passphrase_cache_subs">Väliaikaistalleta salasanat aliavaimen mukaan</string>
+  <string name="label_message_compression">Viestin pakkaus</string>
+  <string name="label_file_compression">Tiedoston pakkaus</string>
+  <string name="label_keyservers">Avainpalvelimet</string>
+  <string name="label_key_id">Avaimen ID</string>
+  <string name="label_creation">Luontiaika</string>
+  <string name="label_expiry">Umpeutumisaika</string>
+  <string name="label_usage">Käyttö</string>
+  <string name="label_key_size">Avaimen Koko</string>
+  <string name="label_ecc_curve">Elliptinen Käyrä</string>
+  <string name="label_main_user_id">Pääidentiteetti</string>
+  <string name="label_name">Nimi</string>
+  <string name="label_comment">Kommentti</string>
+  <string name="label_email">Email</string>
+  <string name="label_send_key">Synkronoi pilveen</string>
+  <string name="label_fingerprint">Sormenjälki</string>
+  <string name="expiry_date_dialog_title">Aseta umpeutumispäivämäärä</string>
+  <string name="label_first_keyserver_is_used">(Ensimmäinen avainpalvelin listalla on ensisijainen)</string>
+  <string name="label_preferred">ensisijainen</string>
+  <string name="user_id_no_name">&lt;ei nimeä&gt;</string>
+  <string name="none">&lt;ei mitään&gt;</string>
+  <string name="no_key">&lt;ei avainta&gt;</string>
+  <string name="can_encrypt">voi salata</string>
+  <string name="can_sign">voi allekirjoittaa</string>
+  <string name="can_certify">voi varmentaa</string>
+  <string name="can_certify_not">ei voi varmentaa</string>
+  <string name="expired">umpeutunut</string>
+  <string name="revoked">peruutettu</string>
+  <plurals name="n_keys">
+    <item quantity="one">1 avain</item>
+    <item quantity="other">%d avainta</item>
+  </plurals>
+  <plurals name="n_keyservers">
+    <item quantity="one">%d avainpalvelin</item>
+    <item quantity="other">%d avainpalvelinta</item>
+  </plurals>
+  <string name="secret_key">Salainen Avain:</string>
   <!--choice-->
+  <string name="choice_none">Ei mitään</string>
+  <string name="choice_15secs">15 sek.</string>
+  <string name="choice_1min">1 min</string>
+  <string name="choice_3mins">3 min.</string>
+  <string name="choice_5mins">5 min.</string>
+  <string name="choice_10mins">10 min.</string>
+  <string name="choice_20mins">20 min.</string>
+  <string name="choice_40mins">40 min.</string>
+  <string name="choice_1hour">1 tunti</string>
+  <string name="choice_2hours">2 tuntia</string>
+  <string name="choice_4hours">4 tuntia</string>
+  <string name="choice_8hours">8 tuntia</string>
+  <string name="choice_forever">aina</string>
+  <string name="dsa">DSA</string>
+  <string name="elgamal">ElGamal</string>
+  <string name="rsa">RSA</string>
+  <string name="ecdh">ECDH</string>
+  <string name="ecdsa">ECDSA</string>
+  <string name="filemanager_title_open">Avaa...</string>
+  <string name="warning">Varoitus</string>
+  <string name="error">Virhe</string>
+  <string name="error_message">Virhe: %s</string>
   <!--key flags-->
+  <string name="flag_certify">Varmenna</string>
+  <string name="flag_sign">Allekirjoita</string>
+  <string name="flag_encrypt">Salaa</string>
+  <string name="flag_authenticate">Autentikoi</string>
   <!--sentences-->
+  <string name="wrong_passphrase">Väärä salasana.</string>
+  <string name="no_filemanager_installed">Yhteensopivaa tiedostonhallintaa ei ole asennettu.</string>
+  <string name="passphrases_do_not_match">Salasanat eivät vastaa toisiaan.</string>
+  <string name="passphrase_must_not_be_empty">Syötä salasana.</string>
+  <string name="passphrase_for_symmetric_encryption">Symmetrinen salaus.</string>
+  <string name="passphrase_for">Syötä salasana \'%s\':lle</string>
+  <string name="pin_for">Syötä PIN \'%s\':lle</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -50,10 +228,17 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-  <!--unsorted-->
   <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index b252dc9e0..6d0733625 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -9,13 +9,13 @@
   <string name="title_encrypt_text">Chiffrer un texte</string>
   <string name="title_encrypt_files">Chiffrer des fichiers</string>
   <string name="title_decrypt">Déchiffrer</string>
-  <string name="title_unlock">Phrase de passe</string>
+  <string name="title_unlock">Déverrouiller la clef</string>
   <string name="title_add_subkey">Ajouter une sous-clef</string>
   <string name="title_edit_key">Modifier une clef</string>
-  <string name="title_preferences">Préférences</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">Préférences du serveur de clefs</string>
+  <string name="title_key_server_preference">Serveurs de clefs</string>
   <string name="title_change_passphrase">Modifier la phrase de passe</string>
   <string name="title_share_fingerprint_with">Partager l\'empreinte avec...</string>
   <string name="title_share_key">Partager la clef avec...</string>
@@ -36,6 +36,7 @@
   <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>
   <!--section-->
   <string name="section_user_ids">identités</string>
   <string name="section_keys">Sous-clefs</string>
@@ -55,6 +56,8 @@
   <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>
   <!--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 enregistrer le message</string>
@@ -74,9 +77,11 @@
   <string name="btn_create_key">Créer la clef</string>
   <string name="btn_add_files">Ajouter un/des fichier(s)</string>
   <string name="btn_add_share_decrypted_text">Partager le texte déchiffrer</string>
-  <string name="btn_decrypt_clipboard">Déchiffrer à partir du presse-papiers</string>
+  <string name="btn_decrypt_clipboard">Déchiffrer du texte à partir du presse-papiers</string>
   <string name="btn_decrypt_and_verify">et vérifier les signatures</string>
   <string name="btn_decrypt_files">Déchiffrer les fichiers</string>
+  <string name="btn_encrypt_files">Chiffrer des fichiers</string>
+  <string name="btn_encrypt_text">Chiffrer du texte</string>
   <!--menu-->
   <string name="menu_preferences">Paramètres</string>
   <string name="menu_help">Aide</string>
@@ -90,6 +95,7 @@
   <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_advanced">Afficher les infos avancées</string>
   <!--label-->
@@ -189,7 +195,9 @@
   <string name="passphrase_must_not_be_empty">Veuillez saisir une phrase de passe</string>
   <string name="passphrase_for_symmetric_encryption">Chriffrement symétrique.</string>
   <string name="passphrase_for">Saisir une phrase de passe pour « %s »</string>
+  <string name="pin_for">Saisir le NIP pour « %s »</string>
   <string name="yubikey_pin_for">Saisir le NIP pour accéder à la Yubikey pour « %s »</string>
+  <string name="nfc_text">Tenez la YubiKey contre le dos de votre appareil.</string>
   <string name="file_delete_confirmation">Êtes-vous certain de vouloir supprimer\n%s?</string>
   <string name="file_delete_successful">Supprimé avec succès.</string>
   <string name="no_file_selected">Choisir d\'abord un fichier.</string>
@@ -241,7 +249,7 @@
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
-  <string name="error_nfc_needed">La NFC n\'est pas disponible sur votre appareil !</string>
+  <string name="error_nfc_needed">La NFC n\'est pas proposée sur votre appareil !</string>
   <string name="error_nothing_import">Aucune clef trouvée !</string>
   <string name="error_contacts_key_id_missing">Échec lors de la récupération de l\'ID de clef à partir des contacts !</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
@@ -278,9 +286,10 @@
   <string name="progress_generating_ecdh">génération d\'une nouvelle clef ECDH... </string>
   <string name="progress_modify">modification du trousseau...</string>
   <string name="progress_modify_unlock">déverrouillage du trousseau...</string>
-  <string name="progress_modify_adduid">ajout des ID d\'utilisateur...</string>
-  <string name="progress_modify_revokeuid">révocation des ID d\'utilisateur...</string>
-  <string name="progress_modify_primaryuid">changement de l\'ID d\'utilisateur principal...</string>
+  <string name="progress_modify_adduid">ajout des ID utilisateurs...</string>
+  <string name="progress_modify_adduat">ajout des attributs utilisateur...</string>
+  <string name="progress_modify_revokeuid">révocation des ID utilisateurs...</string>
+  <string name="progress_modify_primaryuid">changement de l\'ID utilisateur principal...</string>
   <string name="progress_modify_subkeychange">modification des sous-clefs...</string>
   <string name="progress_modify_subkeyrevoke">révocation des sous-clefs...</string>
   <string name="progress_modify_subkeystrip">dépouillement des sous-clefs...</string>
@@ -353,8 +362,9 @@
   <string name="import_qr_code_wrong">Code QR incorrecte ! Veuillez réessayer !</string>
   <string name="import_qr_code_too_short_fingerprint">L\'empreinte est trop courte (&lt; 16 caractères)</string>
   <string name="import_qr_code_button">Balayer le code QR</string>
+  <string name="import_qr_code_text">Placez votre appareil photo au-dessus du code QR !</string>
   <!--Generic result toast-->
-  <string name="view_log">Consulter le journal</string>
+  <string name="view_log">Détails</string>
   <string name="with_warnings">, avec des avertissements</string>
   <string name="with_cancelled">, jusqu\'à l\'annulation</string>
   <!--Import result toast-->
@@ -438,7 +448,9 @@
   <string name="api_settings_delete_account">Supprimer le compte</string>
   <string name="api_settings_package_name">Nom du paquet</string>
   <string name="api_settings_package_signature">SHA-256 de la signature du paquet</string>
-  <string name="api_settings_accounts">Comptes</string>
+  <string name="api_settings_accounts">Comptes (API dépréciée)</string>
+  <string name="api_settings_advanced">Informations avancées</string>
+  <string name="api_settings_allowed_keys">Clefs autorisées</string>
   <string name="api_settings_settings">Paramètres</string>
   <string name="api_settings_key">Clef du compte :</string>
   <string name="api_settings_accounts_empty">Aucun compte n\'est attaché à cette appli.</string>
@@ -524,9 +536,7 @@
   <string name="view_key_expired">Cette clef est expirée !</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Clefs</string>
-  <string name="nav_encrypt_text">Chiffrer un texte</string>
-  <string name="nav_encrypt_files">Chiffrer des fichiers</string>
-  <string name="nav_decrypt">Déchiffrer</string>
+  <string name="nav_encrypt_decrypt">Chiffrer/déchiffrer</string>
   <string name="nav_apps">Applis</string>
   <string name="drawer_open">Ouvrir le tiroir de navigation</string>
   <string name="drawer_close">Fermer le tiroir de navigation</string>
@@ -552,7 +562,7 @@
   <string name="msg_ip_delete_old_fail">Aucune ancienne clef de supprimée (création d\'une nouvelle ?)</string>
   <string name="msg_ip_delete_old_ok">L\'ancienne clef a été supprimée de la base de données</string>
   <string name="msg_ip_encode_fail">Échec de l\'opération causé par une erreur d\'encodage</string>
-  <string name="msg_ip_error_io_exc">Échec de l\'opération causé par une erreur d\'e/s</string>
+  <string name="msg_ip_error_io_exc">Échec de l\'opération causé par une erreur d\'E/S</string>
   <string name="msg_ip_error_op_exc">Échec de l\'opération causé par une erreur de base de données</string>
   <string name="msg_ip_error_remote_ex">Échec de l\'opération causé par une erreur interne</string>
   <string name="msg_ip">Importation du trousseau public %s</string>
@@ -615,14 +625,29 @@
     <item quantity="one">Un certificat ignoré provenant d\'une clef publique inconnue</item>
     <item quantity="other">%s certificats ignorés provenant de clefs publiques inconnues</item>
   </plurals>
-  <string name="msg_ip_uid_classifying_zero">Classification des ID d\'utilisateurs (aucune clef de confiance disponible)</string>
+  <string name="msg_ip_uid_classifying_zero">Classification des ID utilisateurs (aucune clef de confiance proposée)</string>
   <plurals name="msg_ip_uid_classifying">
-    <item quantity="one">Classification des ID d\'utilisateurs (en utilisant une clef de confiance)</item>
-    <item quantity="other">Classification des ID d\'utilisateurs (en utilisant %s clefs de confiance)</item>
+    <item quantity="one">Classification des ID utilisateurs (en utilisant une clef de confiance)</item>
+    <item quantity="other">Classification des ID utilisateurs (en utilisant %s clefs de confiance)</item>
   </plurals>
-  <string name="msg_ip_uid_reorder">Réorganisation des ID d\'utilisateurs</string>
-  <string name="msg_ip_uid_processing">Traitement de l\'ID d\'utilisateur %s</string>
-  <string name="msg_ip_uid_revoked">L\'ID d\'utilisateur est révoqué</string>
+  <string name="msg_ip_uid_reorder">Réorganisation des ID utilisateurs</string>
+  <string name="msg_ip_uid_processing">Traitement de l\'ID utilisateur %s</string>
+  <string name="msg_ip_uid_revoked">L\'ID utilisateur est révoqué</string>
+  <string name="msg_ip_uat_processing_image">Traitement de l\'attribut utilisateur de type image</string>
+  <string name="msg_ip_uat_processing_unknown">Traitement de l\'attribut utilisateur de type inconnu</string>
+  <string name="msg_ip_uat_cert_bad">Mauvais certificat rencontré !</string>
+  <string name="msg_ip_uat_cert_error">Erreur lors du traitement du certificat !</string>
+  <string name="msg_ip_uat_cert_nonrevoke">A déjà un certificat non-révocable, étape ignorée.</string>
+  <string name="msg_ip_uat_cert_old">Le certificat est plus ancien que le précédent, étape ignorée.</string>
+  <string name="msg_ip_uat_cert_new">Le certificat est plus récent, remplacement du précédent.</string>
+  <string name="msg_ip_uat_cert_good">Un bon certificat par %1$s a été trouvé</string>
+  <string name="msg_ip_uat_cert_good_revoke">Une révocation d\'un bon certificat par %1$s a été trouvée</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Un certificat provenant d\'une clef publique inconnue est ignoré</item>
+    <item quantity="other">%s certificats provenant de clefs publiques inconnues sont ignorés</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Organisation des attributs utilisateur</string>
+  <string name="msg_ip_uat_revoked">L\'attribut utilisateur est révoqué</string>
   <string name="msg_is_bad_type_public">Tentative d\'importer le trousseau public comme secret. Ceci est un bogue, veuillez remplir un rapport !</string>
   <string name="msg_is_bad_type_uncanon">Tentative d\'importer un trousseau sans canonicalisation. Ceci est un bogue, veuillez remplir un rapport !</string>
   <!--Import Secret log entries-->
@@ -637,6 +662,7 @@
   <string name="msg_is_subkey_nonexistent">La sous-clef %s n\'est pas disponible dans la clef secrète</string>
   <string name="msg_is_subkey_ok">Marquer la sous-clef secrète %s comme disponible</string>
   <string name="msg_is_subkey_empty">Marquer la sous-clef secrète %s comme disponible, avec une phrase de passe vide</string>
+  <string name="msg_is_subkey_pin">La sous-clef secrète %s a été marquée comme disponible, avec un NIP</string>
   <string name="msg_is_subkey_stripped">Marquer la sous-clef secrète %s comme dépouillée</string>
   <string name="msg_is_subkey_divert">Marquer la sous-clef secrète %s comme « dévier vers la carte intelligente/la NFC »</string>
   <string name="msg_is_success_identical">Le trousseau ne contient pas de nouvelle donnée, rien à faire</string>
@@ -645,17 +671,20 @@
   <string name="msg_kc_public">Canonicalisation du trousseau public %s</string>
   <string name="msg_kc_secret">Canonicalisation du trousseau secret %s</string>
   <string name="msg_kc_error_v3">Ceci est une clef OpenPGP version 3, qui a été déprécié et n\'est plus pris en charge !</string>
-  <string name="msg_kc_error_no_uid">Le trousseau n\'a pas d\'ID d\'utilisateur valide !</string>
+  <string name="msg_kc_error_no_uid">Le trousseau n\'a pas d\'ID utilisateur valide !</string>
   <string name="msg_kc_error_master_algo">La clef maîtresse utilise un algorithme (%s) inconnu ! </string>
   <string name="msg_kc_error_dup_key">La sous-clef %s se présente deux fois dans le trousseau. Le trousseau est mal formé, pas d\'importation ! </string>
   <string name="msg_kc_master">Traitement de la clef maîtresse</string>
-  <string name="msg_kc_master_bad_err">Suppression du mauvais certificat de révocation du trousseau</string>
-  <string name="msg_kc_master_bad_local">Suppression du certificat de révocation du trousseau ayant le drapeau « local »</string>
-  <string name="msg_kc_master_bad_time">Suppression du certificat de révocation du trousseau ayant une estampille temporelle dans le futur</string>
   <string name="msg_kc_master_bad_type">Suppression du certificat de clef maîtresse de type inconnu (%s)</string>
-  <string name="msg_kc_master_bad_type_uid">Suppression du certificat de l\'ID d\'utilisateur en mauvaise position</string>
-  <string name="msg_kc_master_bad">Suppression du mauvais certificat de révocation du trousseau</string>
+  <string name="msg_kc_master_bad_local">Suppression du certificat clef maîtresse ayant le drapeau « local »</string>
+  <string name="msg_kc_master_bad_err">Suppression du mauvais certificat de clef maîtresse</string>
+  <string name="msg_kc_master_bad_time">Suppression du certificat de révocation du trousseau ayant une estampille temporelle dans le futur</string>
+  <string name="msg_kc_master_bad_type_uid">Suppression du certificat de l\'ID utilisateur en mauvaise position</string>
+  <string name="msg_kc_master_bad">Suppression du mauvais certificat de clef maîtresse</string>
+  <string name="msg_kc_master_local">Suppression du certificat de clef maîtresse ayant le drapeau « local »</string>
   <string name="msg_kc_revoke_dup"> Suppression du certificat redondant de révocation du trousseau</string>
+  <string name="msg_kc_notation_dup">Suppression du certificat de notation redondant</string>
+  <string name="msg_kc_notation_empty">Suppression du certificat de notation vide</string>
   <string name="msg_kc_sub">Traitement de la sous-clef %s</string>
   <string name="msg_kc_sub_bad">Suppression du certificat invalide de liaison de la sous-clef</string>
   <string name="msg_kc_sub_bad_err">Suppression du mauvais certificat de liaison de la sous-clef</string>
@@ -685,18 +714,33 @@
     <item quantity="other">Canonicalisation du trousseau réussie, %d certificats redondants supprimés</item>
   </plurals>
   <string name="msg_kc_uid_bad_err">Suppression du mauvais auto-certificat pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_bad_local">Suppression du certificat d\'ID d\'utilisateur ayant le drapeau « local »</string>
-  <string name="msg_kc_uid_bad_time">Suppression de l\'ID d\'utilisateur ayant une estampille temporelle dans le futur</string>
-  <string name="msg_kc_uid_bad_type">Suppression du certificat d\'ID d\'utilisateur de type inconnu (%s)</string>
+  <string name="msg_kc_uid_bad_local">Suppression du certificat d\'ID utilisateur ayant le drapeau « local »</string>
+  <string name="msg_kc_uid_bad_time">Suppression de l\'ID utilisateur ayant une estampille temporelle dans le futur</string>
+  <string name="msg_kc_uid_bad_type">Suppression du certificat d\'ID utilisateur de type inconnu (%s)</string>
   <string name="msg_kc_uid_bad">Suppression du mauvais auto-certificat pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_cert_dup">Suppression de l\'auto-certificat périmé pour l\'ID d\'utilisateur « %s »</string>
-  <string name="msg_kc_uid_foreign">Suppression du certificat d\'ID d\'utilisateur étranger par « %s »</string>
-  <string name="msg_kc_uid_revoke_dup">Suppression du certificat de révocation redondant pour l\'ID d\'utilisateur « %s »</string>
-  <string name="msg_kc_uid_revoke_old">Suppression du certificat de révocation périmé pour l\'ID d\'utilisateur « %s »</string>
-  <string name="msg_kc_uid_no_cert">Aucun auto-certificat valide trouvé pour l\'ID d\'utilisateur « %s », qui est maintenant enlevé du trousseau</string>
-  <string name="msg_kc_uid_remove">Suppression de l\'ID d\'utilisateur invalide « %s »</string>
-  <string name="msg_kc_uid_dup">Suppression de l\'ID d\'utilisateur en double « %s ». La clef secrète en contenait deux. Ceci pourrait entraîner des certificats manquants !</string>
-  <string name="msg_kc_uid_warn_encoding">L\'ID d\'utilisateur ne passe pas le test UTF-8 !</string>
+  <string name="msg_kc_uid_cert_dup">Suppression de l\'auto-certificat périmé pour l\'ID utilisateur « %s »</string>
+  <string name="msg_kc_uid_foreign">Suppression du certificat d\'ID utilisateur étranger par « %s »</string>
+  <string name="msg_kc_uid_revoke_dup">Suppression du certificat de révocation redondant pour l\'ID utilisateur « %s »</string>
+  <string name="msg_kc_uid_revoke_old">Suppression du certificat de révocation périmé pour l\'ID utilisateur « %s »</string>
+  <string name="msg_kc_uid_no_cert">Aucun auto-certificat valide trouvé pour l\'ID utilisateur « %s », qui est maintenant enlevé du trousseau</string>
+  <string name="msg_kc_uid_remove">Suppression de l\'ID utilisateur invalide « %s »</string>
+  <string name="msg_kc_uid_dup">Suppression de l\'ID d\'utilisateur en double « %s ». Le trousseau en contenait deux. Ceci pourrait entraîner des certificats manquants !</string>
+  <string name="msg_kc_uid_warn_encoding">L\'ID utilisateur ne passe pas le test UTF-8 !</string>
+  <string name="msg_kc_uat_jpeg">Traitement de l\'attribut utilisateur de type JPEG</string>
+  <string name="msg_kc_uat_unknown">Traitement de l\'attribut utilisateur de type inconnu</string>
+  <string name="msg_kc_uat_bad_err">Suppression du mauvais auto-certificat pour l\'attribut utilisateur</string>
+  <string name="msg_kc_uat_bad_local">Suppression de l\'attribut utilisateur ayant le drapeau « local »</string>
+  <string name="msg_kc_uat_bad_time">Suppression de l\'attribut utilisateur ayant une estampille temporelle dans le futur</string>
+  <string name="msg_kc_uat_bad_type">Suppression du certificat d\'attribut utilisateur de type inconnu (%s)</string>
+  <string name="msg_kc_uat_bad">Suppression du mauvais auto-certificat pour l\'attribut utilisateur</string>
+  <string name="msg_kc_uat_cert_dup">Suppression de l\'auto-certificat périmé pour l\'attribut utilisateur</string>
+  <string name="msg_kc_uat_dup">Suppression de l\'attribut utilisateur en double. Le trousseau en contenait deux. Ceci pourrait entraîner des certificats manquants !</string>
+  <string name="msg_kc_uat_foreign">Suppression du certificat étranger d\'attribut utilisateur par</string>
+  <string name="msg_kc_uat_revoke_dup">Suppression du certificat de révocation redondant pour l\'attribut utilisateur</string>
+  <string name="msg_kc_uat_revoke_old">Suppression de l\'auto-certificat périmé pour l\'attribut utilisateur</string>
+  <string name="msg_kc_uat_no_cert">Aucun auto-certificat valide trouvé pour l\'attribut utilisateur, qui est maintenant enlevé du trousseau</string>
+  <string name="msg_kc_uat_remove">Suppression de l\'attribut utilisateur invalide</string>
+  <string name="msg_kc_uat_warn_encoding">L\'ID utilisateur ne passe pas le test UTF-8 !</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">Une nouvelle sous-clef publique a été trouvée, mais la génération de sous-clef secrète factice n\'est pas prise en charge !</string>
   <string name="msg_mg_error_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string>
@@ -709,13 +753,13 @@
   <!--createSecretKeyRing-->
   <string name="msg_cr">Génération d\'une nouvelle clef maîtresse</string>
   <string name="msg_cr_error_no_master">Aucune option de clef maîtresse n\'a été spécifiée !</string>
-  <string name="msg_cr_error_no_user_id">Les trousseaux doivent être créés avec au moins un ID d\'utilisateur !</string>
+  <string name="msg_cr_error_no_user_id">Les trousseaux doivent être créés avec au moins un ID utilisateur !</string>
   <string name="msg_cr_error_no_certify">La clef maîtresse doit avoir le drapeau « certifié » !</string>
   <string name="msg_cr_error_null_expiry">L\'expiration ne peut pas être « pareille qu\'avant » à la création de la clef. Ceci est une erreur du programme, veuillez remplir un rapport de bogue !</string>
   <string name="msg_cr_error_keysize_512">La taille de la clef doit être supérieure ou égale à 512 !</string>
   <string name="msg_cr_error_no_curve">Aucune taille de clef n\'a été spécifiée ! Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_cr_error_no_keysize">Aucune courbe elliptique n\'a été spécifiée ! Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
-  <string name="msg_cr_error_internal_pgp">Erreur interne PGP !</string>
+  <string name="msg_cr_error_internal_pgp">Erreur interne OpenPGP !</string>
   <string name="msg_cr_error_unknown_algo">L\'algorithme choisi est inconnu ! Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_cr_error_flags_dsa">Les drapeaux de clef choisis sont incorrects, DSA ne peut pas être utilisé pour le chiffrement ! </string>
   <string name="msg_cr_error_flags_elgamal">Les drapeaux de clef choisis sont incorrects, ElGamal ne peut pas être utilisé pour le chiffrement ! </string>
@@ -723,25 +767,29 @@
   <string name="msg_cr_error_flags_ecdh">Les drapeaux de clef choisis sont incorrects, ECDH ne peut pas être utilisé pour le chiffrement ! </string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modification du trousseau %s</string>
+  <string name="msg_mf_error_divert_serial">Le numéro de série d\'une clef diriger-vers-la-carte doit avoir 16 bytes ! Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_mf_error_encode">Exception d\'encodage !</string>
   <string name="msg_mf_error_fingerprint">L\'empreinte de clef effective ne correspond pas à celle attendue !</string>
   <string name="msg_mf_error_keyid">Aucune ID de clef. Ceci est une erreur interne, veuillez remplir un rapport de bogue !</string>
   <string name="msg_mf_error_integrity">Erreur interne, le contrôle d\'intégrité a échoué !</string>
   <string name="msg_mf_error_master_none">Aucun certificat maître sur lequel se basé n\'a été trouvé ! (Tous révoqués ?)</string>
-  <string name="msg_mf_error_noexist_primary">Mauvais ID d\'utilisateur principal spécifié !</string>
-  <string name="msg_mf_error_noexist_revoke">Mauvais ID d\'utilisateur spécifié pour la révocation !</string>
-  <string name="msg_mf_error_revoked_primary">Les ID d\'utilisateurs révoqués ne peuvent pas être principaux !</string>
+  <string name="msg_mf_error_noexist_primary">Mauvais ID utilisateur principal spécifié !</string>
+  <string name="msg_mf_error_noexist_revoke">Mauvais ID utilisateur spécifié pour la révocation !</string>
+  <string name="msg_mf_error_restricted">Tentative d\'exécution d\'une opération restreinte sans phrase de passe ! Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_mf_error_revoked_primary">Les ID utilisateurs révoqués ne peuvent pas être principaux !</string>
   <string name="msg_mf_error_null_expiry">L\'expiration ne peut pas être « pareille qu\'avant » lors de la création de sous-clefs. Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
   <string name="msg_mf_error_passphrase_master">Erreur fatale lors du déchiffrement de la clef maîtresse ! Ceci est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
-  <string name="msg_mf_error_pgp">Erreur interne de PGP !</string>
+  <string name="msg_mf_error_pgp">Erreur interne OpenPGP !</string>
   <string name="msg_mf_error_sig">Exception de signature !</string>
   <string name="msg_mf_master">Modification des certifications maîtresses</string>
-  <string name="msg_mf_passphrase">Changement de la phrase de passe pour le trousseau...</string>
+  <string name="msg_mf_notation_empty">Ajout d\'un paquet de notation vide</string>
+  <string name="msg_mf_notation_pin">Ajout d\'un paquet de notation NIP</string>
+  <string name="msg_mf_passphrase">Changement de la phrase de passe pour le trousseau</string>
   <string name="msg_mf_passphrase_key">Rechiffrement de la sous-clef %s avec la nouvelle phrase de passe</string>
   <string name="msg_mf_passphrase_empty_retry">Échec lors de la définition de la nouvelle phrase de passe, nouvel essai avec une ancienne phrase de passe vide</string>
   <string name="msg_mf_passphrase_fail">La phrase de passe de la sous-clef n\'a pas pu être changée ! (Est-elle différente des autres clefs ?)</string>
-  <string name="msg_mf_primary_replace_old">Remplacement du certificat de l\'ID d\'utilisateur principal précédent</string>
-  <string name="msg_mf_primary_new">Génération d\'un nouveau certificat pour le nouvel ID d\'utilisateur principal</string>
+  <string name="msg_mf_primary_replace_old">Remplacement du certificat de l\'ID utilisateur principal précédent</string>
+  <string name="msg_mf_primary_new">Génération d\'un nouveau certificat pour le nouvel ID utilisateur principal</string>
   <string name="msg_mf_subkey_change">Modification de la sous-clef %s</string>
   <string name="msg_mf_error_subkey_missing">Une action a été tentée sur la sous-clef manquante %s !</string>
   <string name="msg_mf_subkey_new">Ajout d\'une nouvelle sous-clef de type %s</string>
@@ -750,10 +798,13 @@
   <string name="msg_mf_subkey_revoke">Révocation de la sous-clef %s</string>
   <string name="msg_mf_subkey_strip">Dépouillement de la sous-clef %s</string>
   <string name="msg_mf_success">Trousseau modifié avec succès</string>
-  <string name="msg_mf_uid_add">Ajout de l\'ID d\'utilisateur %s</string>
-  <string name="msg_mf_uid_primary">Changement de l\'ID d\'utilisateur principal en %s</string>
-  <string name="msg_mf_uid_revoke">Révocation de l\'ID d\'utilisateur %s</string>
-  <string name="msg_mf_uid_error_empty">L\'ID d\'utilisateur ne peut pas être vide !</string>
+  <string name="msg_mf_uid_add">Ajout de l\'ID utilisateur %s</string>
+  <string name="msg_mf_uid_primary">Changement de l\'ID utilisateur principal en %s</string>
+  <string name="msg_mf_uid_revoke">Révocation de l\'ID utilisateur %s</string>
+  <string name="msg_mf_uid_error_empty">L\'ID utilisateur ne peut pas être vide !</string>
+  <string name="msg_mf_uat_error_empty">L\'attribut utilisateur ne peut pas être vide !</string>
+  <string name="msg_mf_uat_add_image">Ajout de l\'attribut utilisateur de type image</string>
+  <string name="msg_mf_uat_add_unknown">Ajout de l\'attribut utilisateur de type inconnu</string>
   <string name="msg_mf_unlock_error">Erreur lors du déverrouillage du trousseau !</string>
   <string name="msg_mf_unlock">Déverrouillage du trousseau</string>
   <!--Consolidate-->
@@ -774,6 +825,7 @@
   <string name="msg_con_error_public">Erreur lors de la réimportation des clefs publiques !</string>
   <string name="msg_con_error_secret">Erreur lors de la réimportation des clefs secrètes !</string>
   <string name="msg_con_recover">Reprise du processus de consolidation</string>
+  <string name="msg_con_recursive">Consolidation récursive ignorée</string>
   <string name="msg_con_recover_unknown">Reprise du processus de consolidation à partir d\'un état inconnu</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Réimportation d\'une clef publique</item>
@@ -787,6 +839,19 @@
   <string name="msg_con_reimport_secret_skip">Aucune clef secrète à réimporter, étape ignorée...</string>
   <string name="msg_con_warn_delete_public">Une exception a eu lieu lors de la suppression du fichier de cache public</string>
   <string name="msg_con_warn_delete_secret">Une exception a eu lieu lors de la suppression du fichier de cache secret</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Exécution de l\'opération sur la clef</string>
+  <string name="msg_ed_caching_new">Mise en cache de la nouvelle phrase de passe</string>
+  <string name="msg_ed_error_no_parcel">SaveKeyringParcel absent ! (Ceci est un bogue, veuillez le rapporter)</string>
+  <string name="msg_ed_error_key_not_found">Clef introuvable !</string>
+  <string name="msg_ed_fetching">Obtention de la clef à modifier (%s)</string>
+  <string name="msg_ed_success">Opération sur la clef réussie</string>
+  <!--Promote key-->
+  <string name="msg_pr">Promotion de la clef publique en clef secrète</string>
+  <string name="msg_pr_error_already_secret">La clef est déjà une clef secrète !</string>
+  <string name="msg_pr_error_key_not_found">Clef introuvable !</string>
+  <string name="msg_pr_fetching">Obtention de la clef à modifier (%s)</string>
+  <string name="msg_pr_success">Clef promue avec succès</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">La modification des clefs NFC n\'est pas (encore) prise en charge !</string>
   <string name="msg_ek_error_dummy">Impossible de modifier un trousseau avec une clef maîtresse dépouillée !</string>
@@ -795,11 +860,13 @@
   <string name="msg_dc_askip_no_key">Les données ne sont pas chiffrées avec un clef connue, étape ignorée...</string>
   <string name="msg_dc_askip_not_allowed">Les données ne sont pas chiffrées avec un clef autorisée, étape ignorée...</string>
   <string name="msg_dc_asym">Un bloc de données chiffrées asymétriquement a été trouvé pour la clef %s</string>
+  <string name="msg_dc_charset">En-tête de jeu de caractère trouvé : « %s »</string>
   <string name="msg_dc_clear_data">Traitement des données littérales</string>
   <string name="msg_dc_clear_decompress">Extraction des données compressées</string>
   <string name="msg_dc_clear_meta_file">Nom de fichier : %s</string>
   <string name="msg_dc_clear_meta_mime">Type MIME : %s</string>
   <string name="msg_dc_clear_meta_size">Taille de fichier : %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">La taille de fichier est inconnue</string>
   <string name="msg_dc_clear_meta_time">Heure de modification : %s</string>
   <string name="msg_dc_clear_signature_bad">La vérification de la signature n\'est PAS CORRECTE !</string>
   <string name="msg_dc_clear_signature_check">Vérification des données de signature</string>
@@ -809,11 +876,12 @@
   <string name="msg_dc_error_bad_passphrase">Erreur lors du déverrouillage de la clef, phrase de passe erronée !</string>
   <string name="msg_dc_error_extract_key">Erreur inconnue lors du déverrouillage de la clef !</string>
   <string name="msg_dc_error_integrity_check">Erreur de vérification de l\'intégrité !</string>
+  <string name="msg_dc_error_integrity_missing">Vérification de l\'intégrité absente ! Ceci peut arriver car l\'application n\'est pas à jour, ou à cause d\'une attaque par mise à niveau inférieur.</string>
   <string name="msg_dc_error_invalid_siglist">Aucune donnée de signature valide trouvée !</string>
   <string name="msg_dc_error_io">Une exception E/S a été rencontrée durant l\'opération !</string>
   <string name="msg_dc_error_no_data">Aucune donnée chiffrée n\'a été trouvée dans le flux !</string>
   <string name="msg_dc_error_no_key">Aucune donnée chiffrée avec une clef secrète connue n\'a été trouvée dans le flux !</string>
-  <string name="msg_dc_error_pgp_exception">Une exception PGP a été rencontrée durant l\'opération !</string>
+  <string name="msg_dc_error_pgp_exception">Une exception OpenPGP a été rencontrée durant l\'opération !</string>
   <string name="msg_dc_integrity_check_ok">Vérification de l\'intégrité OK !</string>
   <string name="msg_dc_ok_meta_only">Seules les métadonnées ont été demandées, déchiffrement ignoré</string>
   <string name="msg_dc_ok">OK</string>
@@ -829,35 +897,49 @@
   <string name="msg_dc_trail_unknown">Des données traînantes de type inconnu ont été rencontrées</string>
   <string name="msg_dc_unlocking">Déverrouillage de la clef secrète</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Préparation de la clef secrète pour le chiffrement</string>
-  <string name="msg_se_clearsign_only">La signature d\'entrée de texte en clair n\'est pas prise en charge !</string>
-  <string name="msg_se_compressing">Préparation de la compression</string>
-  <string name="msg_se_encrypting">Chiffrement des données</string>
-  <string name="msg_se_error_bad_passphrase">Phrase de passe erronée !</string>
-  <string name="msg_se_error_io">Exception E/S rencontrée durant l\'opération !</string>
-  <string name="msg_se_error_key_sign">La clef de signature choisie ne peut pas signer les données !</string>
-  <string name="msg_se_error_sign_key">Erreur lors de la récupération de la clef de signature !</string>
-  <string name="msg_se_error_nfc">Erreur de données NFC !</string>
-  <string name="msg_se_error_no_passphrase">Aucune phrase de passe fournie !</string>
-  <string name="msg_se_error_pgp">Erreur interne PGP !</string>
-  <string name="msg_se_error_sig">Une exception de signature PGP a été rencontrée !</string>
-  <string name="msg_se_error_unlock">Erreur inconnue lors du déverrouillage de la clef !</string>
-  <string name="msg_se_key_ok">Chiffrement pour la clef : %s</string>
-  <string name="msg_se_key_unknown">Clef manquante pour le chiffrement : %s</string>
-  <string name="msg_se_key_warn">Clef erronée pour le chiffrement : %s</string>
-  <string name="msg_se_ok">Opération de signature/chiffrement réussie !</string>
-  <string name="msg_se_pending_nfc">Jeton NFC exigé, demande de saisie à l\'utilisateur...</string>
-  <string name="msg_se_pending_passphrase">Phrase de passe exigée, demande de saisie à l\'utilisateur...</string>
-  <string name="msg_se_signing">Signature des données (sans chiffrement)</string>
-  <string name="msg_se_sigcrypting">Chiffrement des données avec signature</string>
-  <string name="msg_se">Début de l\'opération de signature et/ou de chiffrement</string>
-  <string name="msg_se_symmetric">Préparation du chiffrement symétrique</string>
+  <string name="msg_se">Début de l\'opération de signature/chiffrement</string>
+  <string name="msg_se_input_bytes">Traitement de l\'entrée du tableau de bytes</string>
+  <string name="msg_se_input_uri">Traitement de l\'entrée de l\'URI</string>
+  <string name="msg_se_error_no_input">Aucune entrée donnée !</string>
+  <string name="msg_se_error_input_uri_not_found">Erreur lors de l\'ouverture de l\'URI en lecture !</string>
+  <string name="msg_se_error_output_uri_not_found">Erreur lors de l\'ouverture de l\'URI en écriture !</string>
+  <string name="msg_se_error_too_many_inputs">Plus d\'entrées spécifiées que de sorties ! Ceci est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_se_warn_output_left">Il reste des sorties mais pas d\'entrée. Ceci est probablement une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_se_success">Opération de signature/chiffrement réussie</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Préparation des clefs publiques pour le chiffrement</string>
+  <string name="msg_pse_clearsign_only">La signature de texte en clair n\'est pas prise en charge !</string>
+  <string name="msg_pse_compressing">Préparation de la compression</string>
+  <string name="msg_pse_encrypting">Chiffrement des données</string>
+  <string name="msg_pse_error_bad_passphrase">Phrase de passe erronée !</string>
+  <string name="msg_pse_error_hash_algo">L’algorithme de hachage demandé n\'est pas pris en charge par cette clef ! </string>
+  <string name="msg_pse_error_io">Une exception E/S a été rencontrée durant l\'opération !</string>
+  <string name="msg_pse_error_key_sign">La clef de signature choisie ne peut pas signer les données !</string>
+  <string name="msg_pse_error_sign_key">Erreur lors de la récupération de la clef de signature !</string>
+  <string name="msg_pse_error_nfc">Erreur de données NFC !</string>
+  <string name="msg_pse_error_no_passphrase">Aucune phrase de passe fournie !</string>
+  <string name="msg_pse_error_pgp">Erreur interne OpenPGP !</string>
+  <string name="msg_pse_error_sig">Une exception de signature OpenPGP a été rencontrée !</string>
+  <string name="msg_pse_error_unlock">Erreur inconnue lors du déverrouillage de la clef !</string>
+  <string name="msg_pse_key_ok">Chiffrement pour la clef : %s</string>
+  <string name="msg_pse_key_unknown">Clef manquante pour le chiffrement : %s</string>
+  <string name="msg_pse_key_warn">Clef erronée pour le chiffrement : %s</string>
+  <string name="msg_pse_ok">Opération de signature/chiffrement réussie !</string>
+  <string name="msg_pse_pending_nfc">Jeton NFC exigé, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_pse_pending_passphrase">Phrase de passe exigée, demande de saisie à l\'utilisateur...</string>
+  <string name="msg_pse_signing">Signature des données (sans chiffrement)</string>
+  <string name="msg_pse_signing_cleartext">Création d\'une signature de texte en clair</string>
+  <string name="msg_pse_signing_detached">Création d\'une signature détachée</string>
+  <string name="msg_pse_sigcrypting">Chiffrement des données avec signature</string>
+  <string name="msg_pse">Début de l\'opération de signature et/ou de chiffrement</string>
+  <string name="msg_pse_symmetric">Préparation du chiffrement symétrique</string>
   <string name="msg_crt_certifying">Générations des certifications</string>
-  <string name="msg_crt_certify_all">Certification de tous les ID d\'utilisateurs pour la clef %s</string>
+  <string name="msg_crt_certify_all">Certification de tous les ID utilisateurs pour la clef %s</string>
   <plurals name="msg_crt_certify_some">
-    <item quantity="one">Certification d\'un ID d\'utilisateur pour la clef %2$s</item>
-    <item quantity="other">Certification de %1$d ID d\'utilisateurs pour la clef %2$s</item>
+    <item quantity="one">Certification d\'un ID utilisateur pour la clef %2$s</item>
+    <item quantity="other">Certification de %1$d ID utilisateurs pour la clef %2$s</item>
   </plurals>
+  <string name="msg_crt_error_self">Un auto-certificat ne peut pas être délivré ainsi !</string>
   <string name="msg_crt_error_master_not_found">Clef maîtresse introuvable !</string>
   <string name="msg_crt_error_nothing">Aucune clef certifiée !</string>
   <string name="msg_crt_error_unlock">Erreur lors du déverrouillage de la clef maîtresse !</string>
@@ -887,6 +969,7 @@
   <string name="msg_import_fingerprint_ok">Vérification de l\'empreinte OK !</string>
   <string name="msg_import_merge">Fusion des données récupérées</string>
   <string name="msg_import_error">Échec lors de l\'opération d\'importation !</string>
+  <string name="msg_import_error_io">Échec de l\'opération causé par une erreur d\'E/S !</string>
   <string name="msg_import_partial">Opération d\'importation réussie, avec des erreurs !</string>
   <string name="msg_import_success">Opération d\'importation réussie !</string>
   <plurals name="msg_export">
@@ -903,6 +986,7 @@
   <string name="msg_export_error_storage">Le stockage n\'est pas prêt pour l\'écriture !</string>
   <string name="msg_export_error_db">Erreur de base de données !</string>
   <string name="msg_export_error_io">Erreur d\'entrée/sortie !</string>
+  <string name="msg_export_error_key">Erreur lors du prétraitement des données de la clef !</string>
   <string name="msg_export_success">Opération d\'exportation réussie !</string>
   <string name="msg_del_error_empty">Rien à supprimer !</string>
   <string name="msg_del_error_multi_secret">Les clefs secrètes ne peuvent être supprimées qu\'individuellement !</string>
@@ -939,6 +1023,11 @@
   <string name="passp_cache_notif_keys">Phrases de passe mises en cache :</string>
   <string name="passp_cache_notif_clear">Effacer le cache</string>
   <string name="passp_cache_notif_pwd">Phrase de passe</string>
+  <!--First Time-->
+  <string name="first_time_text1">Reprenez le contrôle de votre confidentialité avec OpenKeychain |</string>
+  <string name="first_time_create_key">Créer ma clef</string>
+  <string name="first_time_import_key">Importer depuis un fichier</string>
+  <string name="first_time_skip">Ignorer le paramétrage</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificateur</string>
   <string name="section_cert">Détails du certificat</string>
@@ -961,7 +1050,7 @@
   <string name="title_view_cert">Voir les détails du certificat</string>
   <string name="unknown_algorithm">inconnu</string>
   <string name="can_sign_not">impossible de signer</string>
-  <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est disponible !</string>
+  <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est proposée !</string>
   <string name="info_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'Aide.</string>
   <string name="contact_show_key">Montrer la clef (%s)</string>
   <string name="swipe_to_update">Glisser vers le bas pour mettre à jour à partir du serveur de clefs</string>
@@ -969,9 +1058,31 @@
   <string name="error_multi_not_supported">L\'enregistrement des fichiers multiples n\'est pas pris en charge. Ceci est actuellement une limitation d\'Android.</string>
   <string name="key_colon">Clef :</string>
   <string name="exchange_description">Pour démarrer un échange de clef, choisir le nombre de participants du côté droit, puis cliquer sur le bouton « Démarrer l\'échange ».\n\Deux questions de plus seront posées pour s\'assurer que seuls les bons participants sont dans l\'échange et que les empreintes sont correctes.</string>
-  <!--First Time-->
-  <string name="first_time_text1">Reprenez le contrôle de votre confidentialité avec OpenKeychain |</string>
-  <string name="first_time_create_key">Créer ma clef</string>
-  <string name="first_time_import_key">Importer depuis un fichier</string>
-  <string name="first_time_skip">Ignorer le paramétrage</string>
+  <string name="user_id_none"><![CDATA[<none>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Choisir une méthode de déverrouillage</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Saisir la phrase de passe</string>
+  <string name="passphrase">Phrase de passe</string>
+  <string name="noPassphrase">Aucune phrase de passe</string>
+  <string name="no_passphrase_set">Aucune phrase de passe définie</string>
+  <string name="passphrases_match">Les phrases de passe ne correspondent pas</string>
+  <string name="passphrase_saved">Phrase de passe enregistrée</string>
+  <string name="passphrase_invalid">Phrase de passe invalide</string>
+  <string name="missing_passphrase">Phrase de passe manquante</string>
+  <string name="passphrase_again">De nouveau</string>
+  <string name="lockpattern">Schéma de verrouillage</string>
+  <string name="lockpatternNFC">NFC + schéma de verrouillage</string>
+  <string name="unlock_method">Méthode de déverrouillage</string>
+  <string name="set_passphrase">Définir la phrase de passe</string>
+  <string name="draw_lockpattern">Dessiner le schéma de verrouillage</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">Mauvaise balise. Veuillez ressayer.</string>
+  <string name="enable_nfc">Veuillez activer la NFC dans vos paramètres</string>
+  <string name="no_nfc_support">Cet appareil ne prends pas en charge la NFC</string>
+  <string name="nfc_write_succesful">Écrit avec succès sur la balise NFC</string>
+  <string name="unlocked">Déverrouillé</string>
+  <string name="nfc_settings">Paramètres</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-is/strings.xml b/OpenKeychain/src/main/res/values-is/strings.xml
index 460c5462e..ef0a0ce94 100644
--- a/OpenKeychain/src/main/res/values-is/strings.xml
+++ b/OpenKeychain/src/main/res/values-is/strings.xml
@@ -50,10 +50,17 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-  <!--unsorted-->
   <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index f5a6696ae..4c73ebc72 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -5,17 +5,14 @@
   <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_encrypt_text">Testo Cifrato</string>
-  <string name="title_encrypt_files">File Cifrati</string>
+  <string name="title_select_secret_key">Seleziona la tua chiave</string>
+  <string name="title_encrypt_text">Testo cifrato</string>
+  <string name="title_encrypt_files">File cifrati</string>
   <string name="title_decrypt">Decodifica</string>
-  <string name="title_unlock">Frase di accesso</string>
   <string name="title_add_subkey">Aggiungi Sottochiave</string>
   <string name="title_edit_key">Modifica Chiave</string>
-  <string name="title_preferences">Preferenze</string>
   <string name="title_cloud_search_preferences">Preferenze di ricerca</string>
   <string name="title_api_registered_apps">Apps</string>
-  <string name="title_key_server_preference">Preferenze Server delle Chiavi</string>
   <string name="title_change_passphrase">Cambia Frase Di Accesso</string>
   <string name="title_share_fingerprint_with">Condivi impronta con...</string>
   <string name="title_share_key">Condividi chiave con...</string>
@@ -34,6 +31,8 @@
   <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>
@@ -52,6 +51,7 @@
   <string name="section_key_to_certify">Chiave da certificare</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_decrypt_verify_message">Decodifica e verifica messaggio</string>
@@ -71,7 +71,6 @@
   <string name="btn_create_key">Crea chiave</string>
   <string name="btn_add_files">Aggiungi file(s)</string>
   <string name="btn_add_share_decrypted_text">Condividi testo decifrato</string>
-  <string name="btn_decrypt_clipboard">Decifra dalla lavagna</string>
   <string name="btn_decrypt_and_verify">e verifica le firme</string>
   <string name="btn_decrypt_files">Decifra files</string>
   <!--menu-->
@@ -80,6 +79,7 @@
   <string name="menu_export_key">Esporta su un file</string>
   <string name="menu_delete_key">Cancella chiave</string>
   <string name="menu_create_key">Crea mia 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>
@@ -102,9 +102,8 @@
   <string name="label_file_ascii_armor">Abilita Armatura ASCII</string>
   <string name="label_write_version_header">Fai sapere agli altri che utilizzi OpenKeychain</string>
   <string name="label_write_version_header_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</string>
-  <string name="label_use_default_yubikey_pin">Utilizza PIN Yubikey</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Usa tastierino numerico per PIN Yubikey</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Utilizza il PIN base (123456) per accedere a Yubikeys tramite NFC</string>
+  <string name="label_use_default_yubikey_pin">Utilizza il PIN predefinito di YubiKey</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Utilizza la tastiera numerica per il PIN di YubiKey</string>
   <string name="label_asymmetric_from">Firmato da:</string>
   <string name="label_to">Codifica per:</string>
   <string name="label_delete_after_encryption">Elimina file dopo la codifica</string>
@@ -126,6 +125,7 @@
   <string name="label_name">Nome</string>
   <string name="label_comment">Commento</string>
   <string name="label_email">Email</string>
+  <string name="label_send_key">Sincronizza con il cloud</string>
   <string name="label_fingerprint">Impronta</string>
   <string name="expiry_date_dialog_title">Impostare la data di scadenza</string>
   <string name="label_first_keyserver_is_used">(Primo server delle chiavi elencato è il preferito)</string>
@@ -183,7 +183,6 @@
   <string name="passphrase_must_not_be_empty">Si prega di inserire una frase di accesso.</string>
   <string name="passphrase_for_symmetric_encryption">Codifica Simmetrica.</string>
   <string name="passphrase_for">Inserisci la frase di accesso per \'%s\'</string>
-  <string name="yubikey_pin_for">Inserisci il PIN per accedere a Yubikey con \'%s\'</string>
   <string name="file_delete_confirmation">Sei sicuro di voler eliminare\n%s?</string>
   <string name="file_delete_successful">Eliminato correttamente.</string>
   <string name="no_file_selected">Seleziona un file prima.</string>
@@ -350,7 +349,6 @@ Non potrai annullare!</string>
   <string name="import_qr_code_wrong">Codica QR deformato! Prova di nuovo!</string>
   <string name="import_qr_code_too_short_fingerprint">Impronta troppo corta (&lt; 16 caratteri)</string>
   <!--Generic result toast-->
-  <string name="view_log">Mostra registro</string>
   <string name="with_warnings">, con avvisi</string>
   <string name="with_cancelled">, fino all\'annullamento</string>
   <!--Import result toast-->
@@ -406,7 +404,6 @@ Non potrai annullare!</string>
   <string name="api_settings_delete_account">Cancella account</string>
   <string name="api_settings_package_name">Nome Pacchetto</string>
   <string name="api_settings_package_signature">SHA-256 della Firma del Pacchetto</string>
-  <string name="api_settings_accounts">Account</string>
   <string name="api_settings_settings">Impostazioni</string>
   <string name="api_settings_key">Chiave account:</string>
   <string name="api_settings_accounts_empty">Nessun account collegato a questa applicazione</string>
@@ -430,6 +427,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
     <item quantity="one">1 chiave selezionata.</item>
     <item quantity="other">%d chiavi selezionate.</item>
   </plurals>
+  <string name="key_list_empty_text1">Nessuna chiave trovata!</string>
   <string name="key_list_filter_show_all">Mostra tutte le chiavi</string>
   <string name="key_list_filter_show_certified">Mostra solo le chiavi certificate</string>
   <!--Key view-->
@@ -450,6 +448,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="user_id_info_certified_title">Certificato</string>
   <string name="user_id_info_certified_text">Questa identità è stata certificata da te.</string>
   <string name="user_id_info_uncertified_title">Non certificato</string>
+  <string name="user_id_info_uncertified_text">Questa identità non è stata ancora certificata. Non puoi esser sicuro che l\'identità corrisponda veramente ad una specifica persona.</string>
   <string name="user_id_info_invalid_title">Non valido</string>
   <string name="user_id_info_invalid_text">C\'è qualcosa che non va con questa identità!</string>
   <!--Edit key-->
@@ -491,9 +490,6 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="view_key_expired">Questa chiave è scaduta</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
-  <string name="nav_encrypt_text">Codifica Testo</string>
-  <string name="nav_encrypt_files">Codifica documenti</string>
-  <string name="nav_decrypt">Decodifica</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Apri drawer di navigazione</string>
   <string name="drawer_close">Chiudi drawer di navigazione</string>
@@ -599,11 +595,6 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_kc_secret">Canonicalizzazione portachiavi segreto %s</string>
   <string name="msg_kc_error_v3">Questa è una chiave OpenPGP versione 3, è deprecata e non più supportata!</string>
   <string name="msg_kc_master">Elaborazione chiave principale</string>
-  <string name="msg_kc_master_bad_err">Rimozione di certificato di revoca del portachiavi corrotto</string>
-  <string name="msg_kc_master_bad_local">Rimozione certificato di revoca del portachiavi con caratteristica \"locale\"</string>
-  <string name="msg_kc_master_bad_time">Rimozione certificato di revoca del portachiavi con marca temporale futura</string>
-  <string name="msg_kc_master_bad_type">Rimozione certificato della chiave principale di tipo sconosciuto (%s)</string>
-  <string name="msg_kc_master_bad">Rimozione certificato di revoca del portachiavi corrotto</string>
   <string name="msg_kc_revoke_dup">Rimozione certificato di revoca del portachiavi ridondante</string>
   <string name="msg_kc_sub">Elaborazione sottochiave %s</string>
   <string name="msg_kc_sub_bad">Rimozione certificato vincolante di sottochiave non valido</string>
@@ -637,6 +628,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_mg_secret">Fusione nel portachiavi privato %s</string>
   <string name="msg_mg_new_subkey">Aggiunta nuova sottochiave %s</string>
   <string name="msg_mg_found_new">Trovati %s nuovi certificati nel portachiavi</string>
+  <string name="msg_mg_unchanged">Nulla da unire</string>
   <!--createSecretKeyRing-->
   <string name="msg_cr">Generazione nuova chiave principale</string>
   <string name="msg_cr_error_no_master">Nessuna opzione della chiave principale specificata!</string>
@@ -644,7 +636,6 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_cr_error_null_expiry">La data di scadenza non può essere \'come prima\' sulla creazione di chiavi. Questo è un errore di programmazione, si prega di inviare una segnalazione di bug!</string>
   <string name="msg_cr_error_keysize_512">La grandezza della chiave deve essere di 512bit o maggiore</string>
   <string name="msg_cr_error_no_keysize">Nessuna curva ellittica specificata! Questo è un errore di programmazione, per favore invia una segnalazione!</string>
-  <string name="msg_cr_error_internal_pgp">Errore PGP interno!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modifica del portachiavi %s</string>
   <string name="msg_mf_error_encode">Eccezione di codifica!</string>
@@ -654,10 +645,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_mf_error_master_none">Nessun certificato principale trovato su cui operare! (Tutti revocati?)</string>
   <string name="msg_mf_error_null_expiry">La data di scadenza non può essere \"come prima\" sulla creazione di sottochiavi. Questo è un errore di programmazione, si prega di inviare una segnalazione di bug!</string>
   <string name="msg_mf_error_passphrase_master">Errore irreversibile nella decodifica della chiave principale! Questo è probabilmente un errore di programmazione, si prega di inviare una segnalazione di bug!</string>
-  <string name="msg_mf_error_pgp">Errore PGP interno!</string>
   <string name="msg_mf_error_sig">Eccezione di firma!</string>
   <string name="msg_mf_master">Modifica delle certificazioni principali</string>
-  <string name="msg_mf_passphrase">Cambio frase di accesso del portachiavi...</string>
   <string name="msg_mf_passphrase_key">Ri-codifica sottochiave %s con nuova frase di accesso</string>
   <string name="msg_mf_passphrase_empty_retry">Impostazione nuova frase di accesso fallita, provo di nuovo con frase precedente di accesso vuota</string>
   <string name="msg_mf_passphrase_fail">La frase di accesso per la sottochiave non può essere modificata! (Ne ha una diversa dalle altre chiavi?)</string>
@@ -700,6 +689,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_con_reimport_secret_skip">Nessuna chiave privata da reimportare, proseguo...</string>
   <string name="msg_con_warn_delete_public">Eccezione durante la eliminazione del file di cache pubblico</string>
   <string name="msg_con_warn_delete_secret">Eccezione durante la eliminazione del file di cache privato</string>
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">La Modifica delle chiavi NFC non è (ancora) supportata!</string>
   <string name="msg_ek_error_not_found">Chiave non trovata!</string>
@@ -719,13 +710,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_dc_sym_skip">Dati simmetrici non permessi, proseguo...</string>
   <string name="msg_dc_unlocking">Sblocco chiave segreta</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Preparazione chiavi pubbliche per la codifica</string>
-  <string name="msg_se_compressing">Preparazione compressione</string>
-  <string name="msg_se_encrypting">Codifica dati</string>
-  <string name="msg_se_error_bad_passphrase">Frase di Accesso errata</string>
-  <string name="msg_se_error_nfc">Errore Dati NFC!</string>
-  <string name="msg_se_error_no_passphrase">Nessuna frase di accesso disponibile!</string>
-  <string name="msg_se_error_pgp">Errore PGP interno!</string>
+  <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_success">Identità certificata correttamente</string>
   <string name="msg_crt_warn_not_found">Chiave non trovata!</string>
   <string name="msg_crt_upload_success">Chiave caricata con successo sul server</string>
@@ -742,6 +727,10 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="passp_cache_notif_keys">Frasi di accesso memorizzate:</string>
   <string name="passp_cache_notif_clear">Pulisci Cache</string>
   <string name="passp_cache_notif_pwd">Frase di Accesso</string>
+  <!--First Time-->
+  <string name="first_time_text1">Riappropriati della tua privacy con OpenKeychain!</string>
+  <string name="first_time_create_key">Crea mia chiave</string>
+  <string name="first_time_skip">Salta Installazione</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificatore</string>
   <string name="section_cert">Dettagli Certificato</string>
@@ -766,8 +755,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="error_no_file_selected">Seleziona almeno un file da codificare!</string>
   <string name="error_multi_not_supported">Il salvataggio di più file non è supportato. Questa è una limitazione corrente di Android.</string>
   <string name="key_colon">Chiave:</string>
-  <!--First Time-->
-  <string name="first_time_text1">Riappropriati della tua privacy con OpenKeychain!</string>
-  <string name="first_time_create_key">Crea mia chiave</string>
-  <string name="first_time_skip">Salta Installazione</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 815a77431..936440893 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -9,13 +9,13 @@
   <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_unlock">鍵のロック解除</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_key_server_preference">鍵サーバ</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
   <string name="title_share_fingerprint_with">...で指紋の共有</string>
   <string name="title_share_key">...で鍵の共有</string>
@@ -36,6 +36,7 @@
   <string name="title_create_key">鍵の生成</string>
   <string name="title_exchange_keys">鍵の交換</string>
   <string name="title_advanced_key_info">鍵の詳細情報</string>
+  <string name="title_keys">鍵</string>
   <!--section-->
   <string name="section_user_ids">ユーザID</string>
   <string name="section_keys">副鍵</string>
@@ -55,6 +56,8 @@
   <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>
   <!--button-->
   <string name="btn_decrypt_verify_file">復号化と検証、そしてファイルの保存</string>
   <string name="btn_decrypt_verify_message">メッセージの復号化と検証</string>
@@ -74,9 +77,11 @@
   <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_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>
   <!--menu-->
   <string name="menu_preferences">設定</string>
   <string name="menu_help">ヘルプ</string>
@@ -90,6 +95,7 @@
   <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-->
@@ -104,9 +110,9 @@
   <string name="label_algorithm">アルゴリズム</string>
   <string name="label_ascii_armor">アスキー形式ファイル</string>
   <string name="label_file_ascii_armor">アスキー形式ファイルを有効</string>
-  <string name="label_write_version_header">他の人にあなたがOpenKeychain使用していることを知ってもらいましょう</string>
+  <string name="label_write_version_header">OpenKeychainの利用を通知する</string>
   <string name="label_write_version_header_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に  \'OpenKeychain v2.7\' と書くようになりました</string>
-  <string name="label_use_default_yubikey_pin">Yubikey PINをデフォルトで使用する</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"> NFC越しにYubikeyにアクセスするためデフォルトのPIN (123456) を使用する</string>
   <string name="label_asymmetric_from">署名:</string>
@@ -187,7 +193,9 @@
   <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">\'%s\' の Yubikey にアクセスするためのPINを入力してください</string>
+  <string name="nfc_text">あなたのデバイスの背面にYubiKeyを固定してください。</string>
   <string name="file_delete_confirmation">%s
 を削除してもかまいませんか?</string>
   <string name="file_delete_successful">削除に成功しました。</string>
@@ -255,7 +263,7 @@
   <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_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>
@@ -265,6 +273,8 @@
   <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 '…'-->
@@ -285,6 +295,7 @@
   <string name="progress_modify">鍵輪を変更中...</string>
   <string name="progress_modify_unlock">鍵輪のロック解除中...</string>
   <string name="progress_modify_adduid">ユーザIDを追加中...</string>
+  <string name="progress_modify_adduat">ユーザ属性を追加...</string>
   <string name="progress_modify_revokeuid">ユーザIDを破棄中...</string>
   <string name="progress_modify_primaryuid">主ユーザIDを変更中...</string>
   <string name="progress_modify_subkeychange">副鍵の変更中...</string>
@@ -358,8 +369,9 @@
   <string name="import_qr_code_wrong">不適QRコード! もう一度!</string>
   <string name="import_qr_code_too_short_fingerprint">指紋が短かすぎます (&lt; 16 文字)</string>
   <string name="import_qr_code_button">QCコードのスキャン</string>
+  <string name="import_qr_code_text">カメラをQRコードにかざしてください!</string>
   <!--Generic result toast-->
-  <string name="view_log">ログを見る</string>
+  <string name="view_log">概要</string>
   <string name="with_warnings">、とワーニング</string>
   <string name="with_cancelled">、キャンセルされるまで</string>
   <!--Import result toast-->
@@ -384,7 +396,30 @@
   <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>
@@ -409,7 +444,9 @@
   <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_accounts">アカウント</string>
+  <string name="api_settings_accounts">アカウント(deprecated API)</string>
+  <string name="api_settings_advanced">詳細情報</string>
+  <string name="api_settings_allowed_keys">受け入れる鍵</string>
   <string name="api_settings_settings">設定</string>
   <string name="api_settings_key">アカウント鍵:</string>
   <string name="api_settings_accounts_empty">このアプリに接続されてるアカウントはありません。</string>
@@ -436,6 +473,7 @@
   <plurals name="key_list_selected_keys">
     <item quantity="other">%d の鍵を選択。</item>
   </plurals>
+  <string name="key_list_empty_text1">鍵が見当りません!</string>
   <string name="key_list_filter_show_all">すべての鍵を表示</string>
   <string name="key_list_filter_show_certified">検証済みの鍵のみ表示</string>
   <!--Key view-->
@@ -454,8 +492,10 @@
   <string name="user_id_info_revoked_title">破棄</string>
   <string name="user_id_info_revoked_text">このIDは鍵の所有者により破棄されています。もう適正ではありません。</string>
   <string name="user_id_info_certified_title">検証済み</string>
+  <string name="user_id_info_certified_text">このIDは貴方によって証明されています。</string>
   <string name="user_id_info_uncertified_title">未検証</string>
-  <string name="user_id_info_invalid_title">不適正</string>
+  <string name="user_id_info_uncertified_text">このIDはまだ検証されていません。IDが本当に特定の人に対応している場合を、あなたは確認することができません。</string>
+  <string name="user_id_info_invalid_title">無効</string>
   <string name="user_id_info_invalid_text">このIDではなにかしら問題があります!</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">パスフレーズの変更</string>
@@ -496,9 +536,7 @@
   <string name="view_key_expired">この鍵は期限切れです!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">鍵</string>
-  <string name="nav_encrypt_text">テキスト暗号化</string>
-  <string name="nav_encrypt_files">ファイル暗号化</string>
-  <string name="nav_decrypt">復号化</string>
+  <string name="nav_encrypt_decrypt">暗号化/復号化</string>
   <string name="nav_apps">アプリ</string>
   <string name="drawer_open">ナビゲーションドロワーを開く</string>
   <string name="drawer_close">ナビゲーションドロワーを閉める</string>
@@ -586,9 +624,27 @@
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="other">不明な公開鍵から %s の検証を無視</item>
   </plurals>
+  <string name="msg_ip_uid_classifying_zero">ユーザIDを検証 (信頼された鍵がありません)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="other">ユーザIDを検証 ( %s の信頼された鍵を使いました)</item>
+  </plurals>
   <string name="msg_ip_uid_reorder">ユーザIDの並べ直し</string>
   <string name="msg_ip_uid_processing">ユーザID %s の処理中</string>
   <string name="msg_ip_uid_revoked">ユーザIDは破棄されました</string>
+  <string name="msg_ip_uat_processing_image">画像型のユーザー属性の処理中</string>
+  <string name="msg_ip_uat_processing_unknown">不明な型のユーザー属性の処理中</string>
+  <string name="msg_ip_uat_cert_bad">問題のある検証を検出しました!</string>
+  <string name="msg_ip_uat_cert_error">検証の処理でエラーしました!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">すでに持っている破棄不能な証明です、スキップします。</string>
+  <string name="msg_ip_uat_cert_old">証明が前出のものより古いです、スキップします。</string>
+  <string name="msg_ip_uat_cert_new">証明がより新しいです、以前のものを置き換えます。</string>
+  <string name="msg_ip_uat_cert_good">%1$s にて良好な証明を見付けました</string>
+  <string name="msg_ip_uat_cert_good_revoke">%1$s にて良好な破棄証明を見付けました</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="other">不明な公開鍵なので %s の検証を無視</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">ユーザ属性の検査</string>
+  <string name="msg_ip_uat_revoked">ユーザ属性は破棄されました</string>
   <string name="msg_is_bad_type_public">公開鍵の鍵輪を秘密鍵としてインポートを試行しました。これはバグで、ファイルをレポートしてください\"</string>
   <string name="msg_is_bad_type_uncanon">正規化せずに鍵輪へインポートを試行した。これはバグで、ファイルをレポートしてください!</string>
   <!--Import Secret log entries-->
@@ -603,6 +659,7 @@
   <string name="msg_is_subkey_nonexistent">秘密鍵の副鍵 %s が利用不可能</string>
   <string name="msg_is_subkey_ok">秘密鍵の副鍵 %s を利用可能としてマーク</string>
   <string name="msg_is_subkey_empty">秘密鍵の副鍵 %s を利用可能としてマーク、空のパスフレーズで</string>
+  <string name="msg_is_subkey_pin">秘密鍵の副鍵 %s をPINとして利用可能とマーク</string>
   <string name="msg_is_subkey_stripped">秘密鍵の副鍵 %s をストリップとしてマーク</string>
   <string name="msg_is_subkey_divert">秘密鍵の副鍵 %s を\'スマートカード/NFCへ迂回\'としてマーク</string>
   <string name="msg_is_success_identical">鍵輪にデータがないため、なにもしません</string>
@@ -615,22 +672,25 @@
   <string name="msg_kc_error_master_algo">主鍵で不明なアルゴリズム(%s)を利用しています!</string>
   <string name="msg_kc_error_dup_key">鍵輪の中に副鍵 %s が2度出現しました。鍵輪が不整形となっており、インポートできあせん!</string>
   <string name="msg_kc_master">主鍵処理中</string>
-  <string name="msg_kc_master_bad_err">問題のある鍵輪の破棄証明を破棄中</string>
-  <string name="msg_kc_master_bad_local">鍵輪のローカルフラグ付き破棄証明を破棄中</string>
+  <string name="msg_kc_master_bad_type">主鍵の不明な型 (%s) の証明を破棄中</string>
+  <string name="msg_kc_master_bad_local">ローカルフラグ付きの主鍵検証を破棄中</string>
+  <string name="msg_kc_master_bad_err">証明が付随する問題のある主鍵を破棄中</string>
   <string name="msg_kc_master_bad_time">鍵輪の未来にタイムスタンプがある破棄証明を破棄中</string>
-  <string name="msg_kc_master_bad_type">問題のある主鍵の不明な型 (%s) の証明を破棄中</string>
   <string name="msg_kc_master_bad_type_uid">不正な位置のユーザID検証を破棄中</string>
-  <string name="msg_kc_master_bad">問題のある鍵輪の破棄証明を破棄中</string>
+  <string name="msg_kc_master_bad">証明が付随する問題のある主鍵を破棄中</string>
+  <string name="msg_kc_master_local">ローカルフラグ付きの主鍵検証を破棄中</string>
   <string name="msg_kc_revoke_dup">重複している鍵輪の破棄証明を破棄中</string>
+  <string name="msg_kc_notation_dup">重複しているノーテーション証明を破棄中</string>
+  <string name="msg_kc_notation_empty">空のノーテーション証明を破棄中</string>
   <string name="msg_kc_sub">副鍵 %s の処理中</string>
-  <string name="msg_kc_sub_bad">証明が付随する不正な副鍵を破棄中</string>
+  <string name="msg_kc_sub_bad">証明が付随する無効な副鍵を破棄中</string>
   <string name="msg_kc_sub_bad_err">証明が付随する問題のある副鍵を破棄中</string>
   <string name="msg_kc_sub_bad_local">ローカルフラグ付きの証明が付随する副鍵を破棄中</string>
   <string name="msg_kc_sub_bad_keyid">副鍵の発行者のIDと付随するIDがミスマッチ</string>
   <string name="msg_kc_sub_bad_time">未来にタイムスタンプがある証明が付随する副鍵を破棄中</string>
   <string name="msg_kc_sub_bad_type">不明な検証のタイプ: %sの副鍵</string>
   <string name="msg_kc_sub_dup">証明が付随する重複する副鍵を破棄中</string>
-  <string name="msg_kc_sub_primary_bad">付随する主たる証明が正しくない証明が付随する副鍵を破棄中</string>
+  <string name="msg_kc_sub_primary_bad">付随する主たる証明が無効であるものが付随する副鍵を破棄中</string>
   <string name="msg_kc_sub_primary_bad_err">付随する主たる証明に問題がある証明が付随する副鍵を破棄中</string>
   <string name="msg_kc_sub_primary_none">付随する主たる証明が失なわれている証明が付随する副鍵を破棄中</string>
   <string name="msg_kc_sub_no_cert">%s から正常な検証が見付かりません、鍵輪から除外します</string>
@@ -648,7 +708,34 @@
   <plurals name="msg_kc_success_redundant">
     <item quantity="other">鍵輪の認可に成功、 %d 個の重複を除去</item>
   </plurals>
+  <string name="msg_kc_uid_bad_err">ユーザID \'%s\' による問題のある自己検証を破棄中</string>
+  <string name="msg_kc_uid_bad_local">\'ローカル\'フラグ付きのユーザID検証を破棄中</string>
+  <string name="msg_kc_uid_bad_time">未来のタイムスタンプになっているユーザIDを破棄中</string>
+  <string name="msg_kc_uid_bad_type">不明な型 (%s) でのユーザID検証を破棄中</string>
+  <string name="msg_kc_uid_bad">ユーザID \'%s\' による問題のある自己検証を破棄中</string>
+  <string name="msg_kc_uid_cert_dup">期限の切れたユーザID \'%s\' による自己検証を破棄中</string>
+  <string name="msg_kc_uid_foreign">\'%s\' によって検証されている外部ユーザIDを破棄中</string>
+  <string name="msg_kc_uid_revoke_dup">ユーザID \'%s\' による重複した破棄証明を破棄中</string>
+  <string name="msg_kc_uid_revoke_old">ユーザID \'%s\' による期限切れ破棄証明を破棄中</string>
+  <string name="msg_kc_uid_no_cert">ユーザID \'%s\' の正常な自己署名が見付かりませんでした、鍵輪から除去しました</string>
+  <string name="msg_kc_uid_remove">無効なユーザID \'%s\' を破棄中</string>
+  <string name="msg_kc_uid_dup">重複したユーザID \'%s\' を削除中。IDを二つもっています。この結果は署名を失っているためかもしれません!</string>
   <string name="msg_kc_uid_warn_encoding">ユーザIDがUTF-8で検証できませんでした!</string>
+  <string name="msg_kc_uat_jpeg">JPEG型のユーザー属性の処理中</string>
+  <string name="msg_kc_uat_unknown">不明な型のユーザー属性の処理中</string>
+  <string name="msg_kc_uat_bad_err">ユーザ属性で問題のある自己検証を破棄中</string>
+  <string name="msg_kc_uat_bad_local">\'ローカル\'フラグ付きのユーザ属性検証を破棄中</string>
+  <string name="msg_kc_uat_bad_time">タイムスタンプが未来のユーザ属性を破棄中</string>
+  <string name="msg_kc_uat_bad_type">不明な型 (%s) でのユーザ属性検証を破棄中</string>
+  <string name="msg_kc_uat_bad">ユーザ属性で問題のある自己検証を破棄中</string>
+  <string name="msg_kc_uat_cert_dup">期限の切れたユーザ属性の自己検証を破棄中</string>
+  <string name="msg_kc_uat_dup">重複したユーザ属性を削除中。属性を二つもっています。この結果は署名を失っているためかもしれません!</string>
+  <string name="msg_kc_uat_foreign">これによって検証されている外部ユーザ属性を破棄中</string>
+  <string name="msg_kc_uat_revoke_dup">ユーザ属性の重複した破棄証明を破棄中</string>
+  <string name="msg_kc_uat_revoke_old">ユーザ属性の期限の切れた破棄証明を破棄中</string>
+  <string name="msg_kc_uat_no_cert">ユーザー属性として正常な自己署名が見付かりませんでした、鍵輪から除去しました</string>
+  <string name="msg_kc_uat_remove">無効なユーザ属性を破棄中</string>
+  <string name="msg_kc_uat_warn_encoding">ユーザIDがUTF-8として検証できませんでした!</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">新しい公開鍵の副鍵を見付けました、しかしダミー生成の秘密鍵の副鍵でサポートされません。!</string>
   <string name="msg_mg_error_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
@@ -663,32 +750,36 @@
   <string name="msg_cr_error_no_master">主鍵オプション特有ではありません!</string>
   <string name="msg_cr_error_no_user_id">鍵輪は最低でも1つのユーザIDの生成が必要です!</string>
   <string name="msg_cr_error_no_certify">主鍵は検証フラグが必須です!</string>
-  <string name="msg_cr_error_null_expiry">鍵の生成時に期限を\'過去\'とすることはできません。これはプログラムエラーで、バグレポートとしてファイルを送ってください!</string>
+  <string name="msg_cr_error_null_expiry">鍵の生成時に期限を\'過去\'とすることはできません。これはプログラムエラーで、バグレポートでファイルを送ってください!</string>
   <string name="msg_cr_error_keysize_512">鍵サイズは512かそれ以上が必須です!</string>
-  <string name="msg_cr_error_no_curve">鍵サイズが不明です! これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
-  <string name="msg_cr_error_no_keysize">楕円暗号が不明です! これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_cr_error_no_curve">鍵サイズが不明です! これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string>
+  <string name="msg_cr_error_no_keysize">楕円暗号が不明です! これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_cr_error_internal_pgp">PGP内部エラー!</string>
-  <string name="msg_cr_error_unknown_algo">不明なアルゴリズムが選択されています! これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_cr_error_unknown_algo">不明なアルゴリズムが選択されています! これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_cr_error_flags_dsa">問題のある鍵フラグが選択されています、DSAは暗号化に使えません!</string>
   <string name="msg_cr_error_flags_elgamal">問題のある鍵フラグが選択されています、ElGamalは署名に使えません!</string>
   <string name="msg_cr_error_flags_ecdsa">問題のある鍵フラグが選択されています、楕円曲線DSAは暗号化に使えません!</string>
   <string name="msg_cr_error_flags_ecdh">問題のある鍵フラグが選択されています、楕円曲線DHは署名に使えません!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">鍵輪 %s を変更中</string>
+  <string name="msg_mf_error_divert_serial">カードに対比した鍵のシリアル番号には16バイトは必要です!これはプロラグラムエラーで、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_mf_error_encode">エンコード例外!</string>
   <string name="msg_mf_error_fingerprint">現実の鍵指紋が想定の1つと合致しませんでした!</string>
-  <string name="msg_mf_error_keyid">鍵IDがない。 これは内部エラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_mf_error_keyid">鍵IDがありません。 これは内部エラーで、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_mf_error_integrity">内部エラー、完全性チェックが失敗!</string>
   <string name="msg_mf_error_master_none">マスター認証が操作で見付かりませんでした(すべて破棄しましたか?)</string>
   <string name="msg_mf_error_noexist_primary">問題のある主ユーザIDが指定された!</string>
   <string name="msg_mf_error_noexist_revoke">破棄において問題のあるユーザIDが指定された!</string>
+  <string name="msg_mf_error_restricted">パスフレーズのない厳密な捜査を実行してみてください!それはプロラミングエラーで、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_mf_error_revoked_primary">主ユーザIDの破棄はできません!</string>
-  <string name="msg_mf_error_null_expiry">副鍵の生成時に期限を\"過去\"とすることはできません。これはプログラムエラーで、バグレポートとしてファイルを送ってください!</string>
-  <string name="msg_mf_error_passphrase_master">主鍵の復号で致命的な失敗! これはプログラミングのエラーの場合がありますので、バグレポートの提出をお願いします!</string>
+  <string name="msg_mf_error_null_expiry">副鍵の生成時に期限を\"過去\"とすることはできません。これはプログラムエラーで、バグレポートでファイルの提出をお願いします!</string>
+  <string name="msg_mf_error_passphrase_master">主鍵の復号で致命的な失敗! これはプログラムエラーの場合がありますので、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_mf_error_pgp">PGP内部エラー!</string>
   <string name="msg_mf_error_sig">署名例外!</string>
   <string name="msg_mf_master">マスター認証を変更</string>
-  <string name="msg_mf_passphrase">鍵輪のパスフレーズの変更中...</string>
+  <string name="msg_mf_notation_empty">空のノーテーションパケットを追加</string>
+  <string name="msg_mf_notation_pin">PINノーテーションパケットを追加</string>
+  <string name="msg_mf_passphrase">鍵輪のパスフレーズの変更中</string>
   <string name="msg_mf_passphrase_key">副鍵 %s を新しいパスフレーズで再暗号化</string>
   <string name="msg_mf_passphrase_empty_retry">新しいパスフレーズの設定に失敗しました、空の古いパスフレーズで再度試してください</string>
   <string name="msg_mf_passphrase_fail">副鍵のパスフレーズは変更されていません! (他の鍵とは異なるになっていませんか?)</string>
@@ -703,12 +794,17 @@
   <string name="msg_mf_subkey_strip">副鍵 %s のストリップ中</string>
   <string name="msg_mf_success">鍵輪の変更に成功</string>
   <string name="msg_mf_uid_add">ユーザID %s を追加中</string>
+  <string name="msg_mf_uid_primary">主UIDを %s に変更中</string>
+  <string name="msg_mf_uid_revoke">ユーザID %s を破棄中</string>
   <string name="msg_mf_uid_error_empty">ユーザIDは空にすることはできません!</string>
+  <string name="msg_mf_uat_error_empty">ユーザ属性は空にすることはできません!</string>
+  <string name="msg_mf_uat_add_image">画像型のユーザー属性の追加中</string>
+  <string name="msg_mf_uat_add_unknown">不明な型のユーザー属性の追加中</string>
   <string name="msg_mf_unlock_error">鍵輪のロック解除エラー!</string>
   <string name="msg_mf_unlock">鍵輪のロック解除中</string>
   <!--Consolidate-->
   <string name="msg_con">データベースの統合中</string>
-  <string name="msg_con_error_bad_state">データベースでキャッシュせずに統合が開始されています! これはおそらくプログラミングのエラーなので、バグレポートの提出をお願いします!</string>
+  <string name="msg_con_error_bad_state">データベースでキャッシュせずに統合が開始されています! これはおそらくプログラムエラーなので、バグレポートでファイルの提出をお願いします!</string>
   <string name="msg_con_error_concurrent">統合を中断しました、すでに他のスレッドで動いているためです!</string>
   <string name="msg_con_save_secret">秘密鍵の鍵輪を保存中</string>
   <string name="msg_con_save_public">公開鍵の鍵輪を保存中</string>
@@ -723,6 +819,9 @@
   <string name="msg_con_error_io_secret">キャッシュに秘密鍵を書く際にI/Oエラー!</string>
   <string name="msg_con_error_public">公開鍵の再インポートのエラー!</string>
   <string name="msg_con_error_secret">秘密鍵の再インポートのエラー!</string>
+  <string name="msg_con_recover">統合整理処理のレジューム</string>
+  <string name="msg_con_recursive">再帰統合処理をスキップ</string>
+  <string name="msg_con_recover_unknown">不明な状態からの統合整理処理のレジューム</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="other">%d の公開鍵を再インポート中</item>
   </plurals>
@@ -733,6 +832,19 @@
   <string name="msg_con_reimport_secret_skip">再インポートで秘密鍵がありません、スキップします...</string>
   <string name="msg_con_warn_delete_public">公開鍵キャッシュファイルの削除例外</string>
   <string name="msg_con_warn_delete_secret">秘密鍵のキャッシュファイルを削除中に例外発生</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">キー操作の実行</string>
+  <string name="msg_ed_caching_new">新しいパスフレーズをキャッシュ</string>
+  <string name="msg_ed_error_no_parcel">SaveKeyringParcel欠落!(これはバグです、レポートしてください)</string>
+  <string name="msg_ed_error_key_not_found">鍵が見当りません!</string>
+  <string name="msg_ed_fetching">フェッチした鍵を変更 (%s)</string>
+  <string name="msg_ed_success">鍵の操作に成功</string>
+  <!--Promote key-->
+  <string name="msg_pr">公開鍵が秘密鍵に昇格しました</string>
+  <string name="msg_pr_error_already_secret">鍵はすでに秘密鍵となっています!</string>
+  <string name="msg_pr_error_key_not_found">鍵が見当りません!</string>
+  <string name="msg_pr_fetching">フェッチした鍵を変更 (%s)</string>
+  <string name="msg_pr_success">鍵は正常に昇格しました</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">NFCの鍵の編集は(まだ)サポートされていません!</string>
   <string name="msg_ek_error_dummy">ストリップした主鍵では鍵輪を編集できません!</string>
@@ -741,11 +853,13 @@
   <string name="msg_dc_askip_no_key">既知の鍵で暗号化されていないデータです、スキップします...</string>
   <string name="msg_dc_askip_not_allowed">受け入れた鍵で暗号化されていないデータです、スキップします...</string>
   <string name="msg_dc_asym">鍵 %s で非対称の暗号化されたデータのブロックを検出</string>
+  <string name="msg_dc_charset">文字セットヘッダを発見: \'%s\'</string>
   <string name="msg_dc_clear_data">固定データを処理中</string>
   <string name="msg_dc_clear_decompress">圧縮データの展開中</string>
   <string name="msg_dc_clear_meta_file">ファイル名: %s</string>
   <string name="msg_dc_clear_meta_mime">MIME種別: %s</string>
   <string name="msg_dc_clear_meta_size">ファイルサイズ: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">ファイルサイズが不明</string>
   <string name="msg_dc_clear_meta_time">更新日時: %s</string>
   <string name="msg_dc_clear_signature_bad">署名の確認がOKではありません!</string>
   <string name="msg_dc_clear_signature_check">署名データの検証中</string>
@@ -755,6 +869,7 @@
   <string name="msg_dc_error_bad_passphrase">鍵のロック解除エラー、パスフレーズに問題があります!</string>
   <string name="msg_dc_error_extract_key">鍵のロック解除で不明なエラー!</string>
   <string name="msg_dc_error_integrity_check">完全性チェックエラー!</string>
+  <string name="msg_dc_error_integrity_missing">完全聖チェックの欠落!これは暗号化アプリケーションが期限切れになった場合、もしくは暗号強度低下攻撃がある場合に発生します。</string>
   <string name="msg_dc_error_invalid_siglist">正常な署名データが見付からなかった!</string>
   <string name="msg_dc_error_io">操作中にIO例外に当たりました!</string>
   <string name="msg_dc_error_no_data">ストリーム中に暗号化されたデータが見付からなかった!</string>
@@ -775,30 +890,48 @@
   <string name="msg_dc_trail_unknown">追跡で未知のタイプのデータに遭遇</string>
   <string name="msg_dc_unlocking">秘密鍵のロック解除</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">暗号化のための公開鍵の検証</string>
-  <string name="msg_se_clearsign_only">クリアテキスト署名の入力はサポートされていません!</string>
-  <string name="msg_se_compressing">圧縮の検証</string>
-  <string name="msg_se_encrypting">暗号化データ</string>
-  <string name="msg_se_error_bad_passphrase">駄目なパスフレーズ!</string>
-  <string name="msg_se_error_io">操作中にIO例外に当たりました!</string>
-  <string name="msg_se_error_key_sign">選択した署名鍵で署名データができません!</string>
-  <string name="msg_se_error_sign_key">署名鍵の取得エラー!</string>
-  <string name="msg_se_error_nfc">NFC データエラー!</string>
-  <string name="msg_se_error_no_passphrase">パスフレーズなしで提供!</string>
-  <string name="msg_se_error_pgp">PGP内部エラー!</string>
-  <string name="msg_se_error_sig">PGP署名例外に当たりました!</string>
-  <string name="msg_se_error_unlock">鍵のロック解除で不明なエラー!</string>
-  <string name="msg_se_key_ok">暗号化の鍵: %s</string>
-  <string name="msg_se_key_unknown">暗号化で鍵を紛失: %s</string>
-  <string name="msg_se_key_warn">暗号化に問題のある鍵: %s</string>
-  <string name="msg_se_ok">署名/暗号化操作に成功!</string>
-  <string name="msg_se_pending_nfc">NFCトークンが必要、ユーザー入力を要求中...</string>
-  <string name="msg_se_pending_passphrase">パスフレーズが必要、ユーザー入力を要求中...</string>
-  <string name="msg_se_signing">署名データ(暗号化していない)</string>
-  <string name="msg_se_sigcrypting">データを署名付きで暗号化中</string>
   <string name="msg_se">署名/暗号化操作を開始します</string>
-  <string name="msg_se_symmetric">対称暗号の検証</string>
+  <string name="msg_se_input_bytes">バイト配列からの入力処理中</string>
+  <string name="msg_se_input_uri">URIからの入力処理中</string>
+  <string name="msg_se_error_no_input">入力がありません!</string>
+  <string name="msg_se_error_input_uri_not_found">読み出すためにURIを開く時にエラー!</string>
+  <string name="msg_se_error_output_uri_not_found">書き込むためにURIを開く時にエラー!</string>
+  <string name="msg_se_error_too_many_inputs">不明な出力以上の入力過多です! これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_se_warn_output_left">得られた出力が入力から乖離している。これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_se_success">署名/暗号化操作に成功!</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">暗号化のための公開鍵の準備</string>
+  <string name="msg_pse_clearsign_only">クリアテキスト署名の入力はサポートされていません!</string>
+  <string name="msg_pse_compressing">圧縮の準備</string>
+  <string name="msg_pse_encrypting">データ暗号化</string>
+  <string name="msg_pse_error_bad_passphrase">駄目なパスフレーズ!</string>
+  <string name="msg_pse_error_hash_algo">この鍵ではサポートされていないハッシュアルゴリズムを要求されています!</string>
+  <string name="msg_pse_error_io">操作中にIO例外に当たりました!</string>
+  <string name="msg_pse_error_key_sign">選択した署名鍵で署名データを作れません!</string>
+  <string name="msg_pse_error_sign_key">署名鍵の取得エラー!</string>
+  <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_pse_error_sig">OpenPGP署名例外に当たりました!</string>
+  <string name="msg_pse_error_unlock">鍵のロック解除で不明なエラー!</string>
+  <string name="msg_pse_key_ok">暗号化の鍵: %s</string>
+  <string name="msg_pse_key_unknown">暗号化の鍵を紛失: %s</string>
+  <string name="msg_pse_key_warn">暗号化に問題のある鍵: %s</string>
+  <string name="msg_pse_ok">署名/暗号化操作に成功!</string>
+  <string name="msg_pse_pending_nfc">NFCトークンが必要、ユーザー入力を要求中...</string>
+  <string name="msg_pse_pending_passphrase">パスフレーズが必要、ユーザー入力を要求中...</string>
+  <string name="msg_pse_signing">署名データ(暗号化なし)</string>
+  <string name="msg_pse_signing_cleartext">クリアテキスト署名作成中</string>
+  <string name="msg_pse_signing_detached">分離署名作成中</string>
+  <string name="msg_pse_sigcrypting">データを署名付きで暗号化中</string>
+  <string name="msg_pse">署名/暗号化操作を開始します</string>
+  <string name="msg_pse_symmetric">対称暗号の準備</string>
   <string name="msg_crt_certifying">検証の生成中</string>
+  <string name="msg_crt_certify_all">鍵 %s ですべてのユーザIDの検証中</string>
+  <plurals name="msg_crt_certify_some">
+    <item quantity="other">鍵 %2$s で %1$d 個のユーザIDの検証中</item>
+  </plurals>
+  <string name="msg_crt_error_self">自己証明書的な発行は行えません!</string>
   <string name="msg_crt_error_master_not_found">主鍵が見当りません!</string>
   <string name="msg_crt_error_nothing">検証できた鍵がない!</string>
   <string name="msg_crt_error_unlock">主鍵のロック解除エラー!</string>
@@ -813,16 +946,29 @@
   <string name="msg_crt_warn_cert_failed">証明の生成が失敗!</string>
   <string name="msg_crt_warn_save_failed">保存操作が失敗!</string>
   <string name="msg_crt_upload_success">鍵をサーバにアップロードしました</string>
+  <plurals name="msg_import">
+    <item quantity="other">%d 個の鍵のインポート</item>
+  </plurals>
+  <string name="msg_import_fetch_error_decode">鍵輪のデコードエラー</string>
   <string name="msg_import_fetch_error">鍵の展開ができません! (ネットワークの問題?)</string>
-  <string name="msg_import_fetch_keybase">keybase.ioから展開: %s</string>
+  <string name="msg_import_fetch_keybase">keybase.ioから回収: %s</string>
   <string name="msg_import_fetch_keyserver_error">keybaseからの鍵の展開ができません!</string>
+  <string name="msg_import_fetch_keyserver">鍵サーバからの回収: %s</string>
   <string name="msg_import_fetch_keyserver_ok">鍵の展開に成功</string>
+  <string name="msg_import_keyserver">鍵サーバ %s を使う</string>
+  <string name="msg_import_fingerprint_error">フェッチした鍵の鍵指紋が完全には一致しませんでした!</string>
   <string name="msg_import_fingerprint_ok">指紋チェックOK!</string>
   <string name="msg_import_merge">展開したデータをマージ</string>
   <string name="msg_import_error">インポート操作に失敗!</string>
+  <string name="msg_import_error_io">I/Oエラーによりインポート操作が失敗しました!</string>
   <string name="msg_import_partial">インポート操作に成功、ただしエラーあり!</string>
   <string name="msg_import_success">インポート操作に成功!</string>
+  <plurals name="msg_export">
+    <item quantity="other">%d 個の鍵のエクスポート</item>
+  </plurals>
   <string name="msg_export_all">すべての鍵のエクスポート</string>
+  <string name="msg_export_public">公開鍵 %s  のエクスポート</string>
+  <string name="msg_export_secret">秘密鍵 %s のエクスポート</string>
   <string name="msg_export_error_no_file">指定のファイル名のファイルはありません!</string>
   <string name="msg_export_error_fopen">ファイルオープン中のエラー!</string>
   <string name="msg_export_error_no_uri">指定のURIはありません!</string>
@@ -830,13 +976,32 @@
   <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_error_key">鍵データの事前処理のエラー!</string>
   <string name="msg_export_success">エクスポート操作に成功!</string>
   <string name="msg_del_error_empty">削除するものがありません!</string>
+  <string name="msg_del_error_multi_secret">秘密鍵は個別にしか削除できません!</string>
+  <plurals name="msg_del">
+    <item quantity="other">%d 個の鍵の削除</item>
+  </plurals>
+  <string name="msg_del_key">鍵 %s の削除中</string>
+  <string name="msg_del_key_fail">鍵 %s の削除に失敗</string>
+  <string name="msg_del_consolidate">秘密鍵削除後のデータベースの統合</string>
+  <plurals name="msg_del_ok">
+    <item quantity="other">%d 個の鍵の削除に成功</item>
+  </plurals>
+  <plurals name="msg_del_fail">
+    <item quantity="other">%d 個の鍵の削除に失敗</item>
+  </plurals>
   <string name="msg_acc_saved">アカウント保存</string>
   <string name="msg_download_success">ダウンロードに成功しました!</string>
+  <string name="msg_download_no_valid_keys">ファイル/クリップボードにて正しい鍵が見付かりません!</string>
+  <string name="msg_download_no_pgp_parts">TODO: 複数部分!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</item>
   </plurals>
+  <string name="msg_download_query_too_short">鍵検索のクエリが短かすぎます。クエリを精密化してください!</string>
+  <string name="msg_download_too_many_responses">鍵検索のクエリが沢山の候補を返しました。クエリを精密化してください!</string>
+  <string name="msg_download_query_too_short_or_too_many_responses">鍵がまったく無いか、多すぎる鍵が見付かりました。クエリを改善してください!</string>
   <string name="msg_download_query_failed">鍵の検索時にエラーが発生しました。</string>
   <!--PassphraseCache-->
   <string name="passp_cache_notif_click_to_clear">クリックしてパスフレーズのキャッシュをクリア</string>
@@ -844,6 +1009,11 @@
   <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_skip">セットアップをスキップ</string>
   <!--unsorted-->
   <string name="section_certifier_id">検証者</string>
   <string name="section_cert">証明の詳細</string>
@@ -852,6 +1022,7 @@
   <string name="empty_certs">この鍵に証明がない</string>
   <string name="certs_text">あなたの検証された自己証明とあなたの鍵で生成された証明がここに表示されます</string>
   <string name="section_uids_to_certify">ユーザID</string>
+  <string name="certify_text">インポートした鍵には\"アイデンティティ\": 名前とメールアドレス を含みます。正確に期待したものと一致しているか認定されているものを選択します。</string>
   <string name="label_revocation">破棄の理由</string>
   <string name="label_verify_status">検証ステータス</string>
   <string name="label_cert_type">種別</string>
@@ -873,9 +1044,32 @@
   <string name="error_no_file_selected">暗号化するファイルを少なくとも1つ選択して下さい。</string>
   <string name="error_multi_not_supported">複数ファイルの保存はサポートされていません。これは現在のAndroidでの制限です。</string>
   <string name="key_colon">鍵:</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_skip">セットアップをスキップ</string>
+  <string name="exchange_description">鍵交換の開始は、右側の参加者の番号を選択し、その後、\"交換開始\"ボタンを推します。\n\n2つ以上の質問で交換にいる右の参加者とその指紋が正しいかを確認してください。</string>
+  <string name="user_id_none"><![CDATA[<none>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">アンロックする手段を選択してください</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">パスフレーズの入力</string>
+  <string name="passphrase">パスフレーズ</string>
+  <string name="noPassphrase">パスフレーズなし</string>
+  <string name="no_passphrase_set">パスフレーズが設定されてない</string>
+  <string name="passphrases_match">パスフレーズが一致しない</string>
+  <string name="passphrase_saved">パスフレーズを保存</string>
+  <string name="passphrase_invalid">無効なパスフレーズ</string>
+  <string name="missing_passphrase">パスフレーズがありません</string>
+  <string name="passphrase_again">もう一度</string>
+  <string name="lockpattern">ロックパターン</string>
+  <string name="lockpatternNFC">NFCとロックパターン</string>
+  <string name="unlock_method">アンロック手段</string>
+  <string name="set_passphrase">パスフレーズの設定</string>
+  <string name="draw_lockpattern">ロックパターンを描いてください</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-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index d4eb02932..6a7f53e35 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -2,80 +2,146 @@
 <resources>
   <!--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").-->
+  <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">Versleutel tekst</string>
+  <string name="title_encrypt_files">Versleutel bestanden</string>
   <string name="title_decrypt">Ontsleutelen</string>
-  <string name="title_unlock">Wachtwoord</string>
+  <string name="title_unlock">Ontgrendel sleutel</string>
+  <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_key_server_preference">Sleutelserver Voorkeur</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>
-  <string name="title_share_fingerprint_with">Vingerafdruk delen met...</string>
-  <string name="title_share_key">Sleutel delen met...</string>
-  <string name="title_share_file">Bestand delen met...</string>
+  <string name="title_share_fingerprint_with">Vingerafdruk delen met…</string>
+  <string name="title_share_key">Sleutel delen met…</string>
+  <string name="title_share_file">Bestand delen met…</string>
+  <string name="title_share_message">Bericht delen met…</string>
   <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>
-  <string name="title_send_key">Upload naar Sleutelserver</string>
-  <string name="title_certify_key">Certifiëer Identiteiten</string>
+  <string name="title_send_key">Upload naar sleutelserver</string>
+  <string name="title_certify_key">Certifieer Identiteiten</string>
   <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>
   <!--section-->
   <string name="section_user_ids">Identiteiten</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">Certificeren</string>
   <string name="section_actions">Acties</string>
+  <string name="section_share_key">Sleutel</string>
   <string name="section_certification_key">Uw Sleutel die u gebruikt voor certificatie</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_key_to_certify">Sleutel om te certificeren</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>
   <!--button-->
   <string name="btn_decrypt_verify_file">Decodeer, verifiëer en sla bestand op</string>
   <string name="btn_decrypt_verify_message">Decodeer en verifiëer bericht</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_save">Opslaan</string>
   <string name="btn_do_not_save">Annuleren</string>
   <string name="btn_delete">Verwijderen</string>
+  <string name="btn_no_date">Geen einddatum</string>
   <string name="btn_okay">OK</string>
   <string name="btn_export_to_server">Upload Naar Sleutelserver</string>
   <string name="btn_next">Volgende</string>
   <string name="btn_back">Terug</string>
   <string name="btn_lookup_key">Opzoeksleutel</string>
+  <string name="btn_share_encrypted_signed">Bericht versleutelen en delen</string>
   <string name="btn_view_cert_key">Toon certificatiesleutel</string>
+  <string name="btn_create_key">Sleutel aanmaken</string>
+  <string name="btn_add_files">Bestand(en) toevoegen</string>
+  <string name="btn_add_share_decrypted_text">Ontcijferde tekst delen</string>
+  <string name="btn_decrypt_clipboard">Tekst van klembord ontsleutelen</string>
+  <string name="btn_decrypt_and_verify">en ondertekeningen verifiëren</string>
+  <string name="btn_decrypt_files">Bestanden ontcijferen</string>
+  <string name="btn_encrypt_files">Bestanden versleutelen</string>
+  <string name="btn_encrypt_text">Tekst versleutelen</string>
   <!--menu-->
   <string name="menu_preferences">Instellingen</string>
   <string name="menu_help">Help</string>
   <string name="menu_export_key">Exporteren naar bestand</string>
   <string name="menu_delete_key">Sleutel verwijderen</string>
+  <string name="menu_create_key">Mijn sleutel aanmaken</string>
+  <string name="menu_import_existing_key">Importeren van bestand</string>
   <string name="menu_search">Zoeken</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_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_advanced">Geavanceerde info tonen</string>
   <!--label-->
   <string name="label_message">Bericht</string>
   <string name="label_file">Bestand</string>
+  <string name="label_files">Bestand(en)</string>
+  <string name="label_file_colon">Bestand:</string>
   <string name="label_no_passphrase">Geen wachtwoord</string>
   <string name="label_passphrase">Wachtwoord</string>
+  <string name="label_unlock">Bezig met ontgrendelen…</string>
+  <string name="label_passphrase_again">Herhaal wachtwoord</string>
   <string name="label_algorithm">Algoritme</string>
+  <string name="label_ascii_armor">Bestand ASCII Armor</string>
+  <string name="label_file_ascii_armor">ASCII Armor aanzetten</string>
+  <string name="label_write_version_header">Laat anderen weten dat je OpenKeychain gebruikt</string>
+  <string name="label_write_version_header_summary">Voegt \'OpenKeychain v2.7\' toe aan OpenPGP ondertekeningen, cijfertekst en geëxporteerde sleutels</string>
+  <string name="label_use_default_yubikey_pin">Gebruik standaard YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Gebruik numeriek toetsenbord voor YubiKey PIN</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Gebruikt standaard PIN (123456) om YubiKeys over NFC te bereiken</string>
+  <string name="label_asymmetric_from">Ondertekend door:</string>
+  <string name="label_to">Versleutelen naar:</string>
+  <string name="label_delete_after_encryption">Verwijder bestand na versleuteling</string>
+  <string name="label_delete_after_decryption">Verwijder na ontcijfering</string>
+  <string name="label_encryption_algorithm">Versleutelingsalgoritme</string>
+  <string name="label_hash_algorithm">Hashalgoritme</string>
+  <string name="label_symmetric">Versleutelen met wachtwoord</string>
+  <string name="label_passphrase_cache_ttl">Cachetijd</string>
+  <string name="label_passphrase_cache_subs">Cache wachtwoorden per subsleutel</string>
+  <string name="label_message_compression">Berichtscompressie</string>
+  <string name="label_file_compression">Bestandscompressie</string>
   <string name="label_keyservers">Sleutelservers</string>
   <string name="label_key_id">Sleutel-id</string>
   <string name="label_creation">Aanmaak</string>
   <string name="label_expiry">Verlopen</string>
   <string name="label_usage">Gebruik</string>
   <string name="label_key_size">Sleutelgrootte</string>
+  <string name="label_ecc_curve">Elliptische curve</string>
   <string name="label_main_user_id">Primaire identiteit</string>
   <string name="label_name">Naam</string>
   <string name="label_comment">Opmerking</string>
   <string name="label_email">E-mailadres</string>
+  <string name="label_send_key">Synchroniseren met de cloud</string>
   <string name="label_fingerprint">Vingerafdruk</string>
   <string name="expiry_date_dialog_title">Bepaal verloopdatum</string>
+  <string name="label_first_keyserver_is_used">(Voorkeur gaat uit naar de eerste keyserver in de lijst)</string>
+  <string name="label_preferred">voorkeur</string>
   <string name="user_id_no_name">&lt;no naam&gt;</string>
   <string name="none">&lt;geen&gt;</string>
   <string name="no_key">&lt;geen sleutel&gt;</string>
@@ -111,7 +177,9 @@
   <string name="dsa">DSA</string>
   <string name="elgamal">ElGamal</string>
   <string name="rsa">RSA</string>
-  <string name="filemanager_title_open">Openen...</string>
+  <string name="ecdh">ECDH</string>
+  <string name="ecdsa">ECDSA</string>
+  <string name="filemanager_title_open">Openen…</string>
   <string name="warning">Waarschuwing</string>
   <string name="error">Fout</string>
   <string name="error_message">Fout: %s</string>
@@ -127,6 +195,10 @@
   <string name="passphrase_must_not_be_empty">Vul een wachtwoord in.</string>
   <string name="passphrase_for_symmetric_encryption">Symmetrische versleuteling.</string>
   <string name="passphrase_for">Voer het wachtwoord in voor \'%s\'</string>
+  <string name="pin_for">Voer PIN in voor \'%s\'</string>
+  <string name="yubikey_pin_for">Voer PIN in om toegang te verkrijgen tot YubiKey voor \'%s\'</string>
+  <string name="nfc_text">Hou YubiKey tegen de achterkant van je toestel</string>
+  <string name="file_delete_confirmation">Ben je zeker dat je %s wil verwijderen?</string>
   <string name="file_delete_successful">Succesvol verwijderd.</string>
   <string name="no_file_selected">Selecteer eerst een bestand.</string>
   <string name="encrypt_sign_successful">Succesvol gesigneerd en/of gecodeerd.</string>
@@ -134,17 +206,30 @@
   <string name="enter_passphrase_twice">Voer het wachtwoord tweemaal in.</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="key_deletion_confirmation_multi">Ben je zeker dat je alle geselecteerde publieke sleutels wil verwijderen?\nJe kan dit niet ongedaan maken!</string>
+  <string name="secret_key_deletion_confirmation">Ben je zeker dat je de GEHEIME sleutel \'%s\' wil verwijderen?\nJe kan dit niet ongedaan maken!</string>
+  <string name="public_key_deletetion_confirmation">Ben je zeker dat je de publieke sleutel \'%s\' wil verwijderen?\nJe kan dit niet ongedaan maken!</string>
+  <string name="also_export_secret_keys">Exporteer ook geheime sleutels</string>
+  <string name="reinstall_openkeychain">Je bent een gekende Android-bug tegengekomen. Gelieve OpenKeychain opnieuw te installeren als je je contacten met sleutels wil verbinden.</string>
   <string name="key_exported">1 sleutel succesvol geëxporteerd.</string>
   <string name="keys_exported">Succesvol %d sleutels geëxporteerd.</string>
   <string name="no_keys_exported">Geen sleutels geëxporteerd.</string>
   <string name="key_creation_el_gamal_info">Opmerking: alleen subsleutels ondersteunen ElGamal.</string>
   <string name="key_not_found">Kan de sleutel %08X niet vinden.</string>
+  <plurals name="bad_keys_encountered">
+    <item quantity="one">%d slechte geheime sleutel genegeerd. Misschien heb je geëxporteerd met de optie\n--export-secret-subkeys\nZorg ervoor dat je in plaats daarvan met --export-secret-keys exporteert.</item>
+    <item quantity="other">%d slechte geheime sleutels genegeerd. Misschien heb je geëxporteerd met de optie\n--export-secret-subkeys\nZorg ervoor dat je in plaats daarvan met --export-secret-keys exporteert.</item>
+  </plurals>
   <string name="list_empty">Lijst is leeg</string>
   <string name="nfc_successful">Succesvol sleutel verstuurd met NFC Beam!</string>
   <string name="key_copied_to_clipboard">Sleutel is gekopieerd naar het klembord!</string>
   <string name="fingerprint_copied_to_clipboard">Sleutel is gekopieerd naar het klembord!</string>
   <string name="select_key_to_certify">Selecteer een sleutel die gebruikt moet worden voor certificatie!</string>
   <string name="key_too_big_for_sharing">Sleutel is te groot om op deze manier gedeeld te worden!</string>
+  <string name="text_copied_to_clipboard">Tekst is gekopieerd naar klembord!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -158,44 +243,84 @@
   <string name="error_key_needs_a_user_id">minstens een identiteit vereist</string>
   <string name="error_no_signature_passphrase">geen wachtwoord opgegeven</string>
   <string name="error_no_signature_key">geen ondertekeningssleutel opgegeven</string>
+  <string name="error_invalid_data">Geen geldige versleutelde of ondertekende OpenPGP-inhoud!</string>
   <string name="error_integrity_check_failed">integriteitcheck niet geslaagd! Data is bewerkt!</string>
-  <string name="error_wrong_passphrase">wachtwoord verekerd</string>
+  <string name="error_wrong_passphrase">wachtwoord verkeerd</string>
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">U heeft minstens Android 4.1 nodig om Androids NFC Beam eigenschap te gebruiken!</string>
   <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string>
-  <string name="error_generic_report_bug">Een algemene fout is opgetreden, maak alstublieft een nieuwe bug report voor OpenKeychain.</string>
+  <string name="error_nothing_import">Geen sleutels gevonden!</string>
+  <string name="error_contacts_key_id_missing">Sleutel-ID van contacten ophalen mislukt!</string>
+  <string name="error_generic_report_bug">Een algemene fout is opgetreden, gelieve een nieuw bug-verslag te maken voor OpenKeychain.</string>
   <!--results shown after decryption/verification-->
+  <string name="decrypt_result_no_signature">Niet ondertekend</string>
   <string name="decrypt_result_invalid_signature">Ongeldige handtekening!</string>
+  <string name="decrypt_result_signature_uncertified">Ondertekend door (niet gecertificeerd!)</string>
+  <string name="decrypt_result_signature_certified">Ondertekend door</string>
+  <string name="decrypt_result_signature_expired_key">Sleutel is verlopen!</string>
+  <string name="decrypt_result_signature_revoked_key">Sleutel is ingetrokken!</string>
+  <string name="decrypt_result_signature_missing_key">Onbekende publieke sleutel</string>
+  <string name="decrypt_result_encrypted">Versleuteld</string>
+  <string name="decrypt_result_not_encrypted">Niet versleuteld</string>
+  <string name="decrypt_result_action_show">Toon</string>
+  <string name="decrypt_result_action_Lookup">Zoek</string>
+  <string name="decrypt_invalid_text">De ondertekening is ongeldig of de sleutel is ingetrokken/verlopen. Je kan niet zeker zijn wie de tekst geschreven heeft. Ben je zeker dat je ze wil weergeven?</string>
+  <string name="decrypt_invalid_button">Ik begrijp de risico\'s, geef de tekst weer!</string>
   <!--Add keys-->
+  <string name="add_keys_my_key">Mijn sleutel:</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Gereed.</string>
   <string name="progress_cancel">Annuleren</string>
-  <string name="progress_saving">opslaan...</string>
-  <string name="progress_importing">importeren...</string>
-  <string name="progress_exporting">exporteren...</string>
-  <string name="progress_building_key">sleutel maken...</string>
-  <string name="progress_building_master_key">hoofdsleutelbos maken...</string>
+  <string name="progress_cancelling">bezig met annuleren…</string>
+  <string name="progress_saving">opslaan…</string>
+  <string name="progress_importing">importeren…</string>
+  <string name="progress_exporting">exporteren…</string>
+  <string name="progress_uploading">bezig met uploaden…</string>
+  <string name="progress_building_key">sleutel maken…</string>
+  <string name="progress_building_master_key">hoofdsleutelbos maken…</string>
+  <string name="progress_generating_rsa">bezig met genereren van nieuwe RSA-sleutel…</string>
+  <string name="progress_generating_dsa">bezig met genereren van nieuwe DSA-sleutel…</string>
+  <string name="progress_generating_elgamal">bezig met genereren van nieuwe ElGamal-sleutel…</string>
+  <string name="progress_generating_ecdsa">bezig met genereren van nieuwe ECDSA-sleutel…</string>
+  <string name="progress_generating_ecdh">bezig met genereren van nieuwe ECDH-sleutel…</string>
+  <string name="progress_modify">bezig met wijzigen van sleutelbos…</string>
+  <string name="progress_modify_unlock">bezig met ontgrendelen van sleutelbos…</string>
+  <string name="progress_modify_adduid">bezig met toevoegen van gebruikers-ID\'s…</string>
+  <string name="progress_modify_adduat">bezig met toevoegen van gebruikersattributen…</string>
+  <string name="progress_modify_revokeuid">bezig met intrekken van gebruikers-ID\'s…</string>
+  <string name="progress_modify_primaryuid">bezig met primaire gebruikers-ID te veranderen…</string>
+  <string name="progress_modify_subkeychange">bezig met wijzigen van subsleutels…</string>
+  <string name="progress_modify_subkeyrevoke">bezig met terugtrekken van subsleutels…</string>
+  <string name="progress_modify_subkeystrip">bezig met strippen van subsleutels…</string>
+  <string name="progress_modify_subkeyadd">bezig met toevoegen van subsleutels…</string>
+  <string name="progress_modify_passphrase">bezig met veranderen van wachtwoord…</string>
   <plurals name="progress_exporting_key">
-    <item quantity="one">sleutel exporteren...</item>
-    <item quantity="other">sleutels exporteren...</item>
-  </plurals>
-  <string name="progress_extracting_signature_key">ondertekeningssleutel uitpakken...</string>
-  <string name="progress_extracting_key">sleutel uitpakken...</string>
-  <string name="progress_preparing_streams">streams voorbereiden...</string>
-  <string name="progress_encrypting">gegevens versleutelen...</string>
-  <string name="progress_decrypting">gegevens ontsleutelen...</string>
-  <string name="progress_preparing_signature">handtekening voorbereiden...</string>
-  <string name="progress_generating_signature">handtekening genereren...</string>
-  <string name="progress_processing_signature">handtekening verwerken...</string>
-  <string name="progress_verifying_signature">handtekening verifiëren...</string>
-  <string name="progress_signing">ondertekenen...</string>
-  <string name="progress_reading_data">gegevens lezen...</string>
-  <string name="progress_finding_key">sleutel opzoeken...</string>
-  <string name="progress_decompressing_data">gegevens decomprimeren...</string>
-  <string name="progress_verifying_integrity">integriteit verifiëren...</string>
-  <string name="progress_deleting_securely">\'%s\' veilig verwijderen...</string>
+    <item quantity="one">sleutel exporteren…</item>
+    <item quantity="other">sleutels exporteren…</item>
+  </plurals>
+  <string name="progress_extracting_signature_key">ondertekeningssleutel uitpakken…</string>
+  <string name="progress_extracting_key">sleutel uitpakken…</string>
+  <string name="progress_preparing_streams">streams voorbereiden…</string>
+  <string name="progress_encrypting">gegevens versleutelen…</string>
+  <string name="progress_decrypting">gegevens ontsleutelen…</string>
+  <string name="progress_preparing_signature">handtekening voorbereiden…</string>
+  <string name="progress_generating_signature">handtekening genereren…</string>
+  <string name="progress_processing_signature">handtekening verwerken…</string>
+  <string name="progress_verifying_signature">handtekening verifiëren…</string>
+  <string name="progress_signing">ondertekenen…</string>
+  <string name="progress_certifying">bezig met certificeren…</string>
+  <string name="progress_reading_data">gegevens lezen…</string>
+  <string name="progress_finding_key">sleutel opzoeken…</string>
+  <string name="progress_decompressing_data">gegevens decomprimeren…</string>
+  <string name="progress_verifying_integrity">integriteit verifiëren…</string>
+  <string name="progress_deleting_securely">\'%s\' veilig verwijderen…</string>
+  <string name="progress_deleting">bezig met verwijderen van sleutels…</string>
+  <string name="progress_con_saving">consolidatie: bezig met opslaan naar cache…</string>
+  <string name="progress_con_reimport">consolidatie: bezig met opnieuw importeren…</string>
   <!--action strings-->
+  <string name="hint_keyserver_search_hint">Naam/E-mail/Sleutel ID…</string>
+  <string name="hint_cloud_search_hint">Name/E-mail/Bewijs/Sleutel…</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -207,8 +332,12 @@
   <string name="key_size_8192">8192</string>
   <string name="key_size_custom">Aangepaste sleutelgrootte</string>
   <string name="key_size_custom_info">Typ aangepaste sleutellengte (in bits):</string>
+  <string name="key_size_custom_info_rsa">RSA sleutellengte moet groter zijn dan 1024 en ten hoogste 16384. Ze moet ook deelbaar zijn door 8.</string>
   <string name="key_size_custom_info_dsa">DSA sleutellengte moet minstens 512 zijn en maximaal 1024. Het moet ook deelbaar zijn door 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>
+  <string name="key_curve_nist_p521">NIST P-521</string>
   <!--not in for now, see SaveKeyringParcel
     <string name="key_curve_bp_p256">"Brainpool P-256"</string>
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
@@ -225,19 +354,85 @@
   <string name="help_tab_about">Over</string>
   <string name="help_about_version">Versie:</string>
   <!--Import-->
+  <string name="import_tab_keyserver">Sleutelserver</string>
+  <string name="import_tab_cloud">Zoeken</string>
+  <string name="import_tab_direct">Bestand/klembord</string>
+  <string name="import_tab_qr_code">QR code/NFC</string>
   <string name="import_import">Geselecteerde sleutels importeren</string>
   <string name="import_qr_code_wrong">QR-code ongeldig. Probeer het opnieuw</string>
   <string name="import_qr_code_too_short_fingerprint">Vingerafdruk is te kort (&lt; 16 tekens)</string>
+  <string name="import_qr_code_button">QR code scannen</string>
+  <string name="import_qr_code_text">Plaats je camera voor de QR-code!</string>
   <!--Generic result toast-->
+  <string name="view_log">Details</string>
+  <string name="with_warnings">, met waarschuwingen</string>
+  <string name="with_cancelled">, tot annulatie</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">Sleutel succesvol geïmporteerd</item>
+    <item quantity="other">%1$d sleutels succesvol geïmporteerd</item>
+  </plurals>
+  <plurals name="import_keys_added_and_updated_2">
+    <item quantity="one">en sleutel%2$s geüpdatet.</item>
+    <item quantity="other">en %1$d sleutels%2$s.</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="one">Sleutel%2$s succesvol geïmporteerd.</item>
+    <item quantity="other">%1$d sleutels%2$s succesvol geïmporteerd.</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="one">Sleutel%2$s succesvol geüpdatet.</item>
+    <item quantity="other">%1$d sleutels%2$s succesvol geüpdatet.</item>
+  </plurals>
+  <plurals name="import_keys_with_errors">
+    <item quantity="one">Importeren mislukt voor een sleutel!</item>
+    <item quantity="other">Importeren mislukt voor %d sleutels!</item>
+  </plurals>
+  <plurals name="import_error">
+    <item quantity="one">Importeren mislukt!</item>
+    <item quantity="other">Importeren van %d sleutels mislukt!</item>
+  </plurals>
+  <string name="import_error_nothing">Niets te importeren.</string>
+  <string name="import_error_nothing_cancelled">Importeren geannuleerd.</string>
   <!--Delete result toast-->
+  <plurals name="delete_ok_but_fail_1">
+    <item quantity="one">Een sleutel succesvol verwijderd</item>
+    <item quantity="other">%1$d sleutels succesvol verwijderd</item>
+  </plurals>
+  <plurals name="delete_ok_but_fail_2">
+    <item quantity="one">, maar verwijderen van een sleutel%2$s mislukt.</item>
+    <item quantity="other">, maar verwijderen van %1$d sleutels%2$s mislukt.</item>
+  </plurals>
+  <plurals name="delete_ok">
+    <item quantity="one">Sleutel%2$s succesvol verwijderd.</item>
+    <item quantity="other">%1$d sleutels%2$s succesvol verwijderd.</item>
+  </plurals>
+  <plurals name="delete_fail">
+    <item quantity="one">Fout bij verwijderen van een sleutel%2$s.</item>
+    <item quantity="other">Fout bij verwijderen van %1$d sleutels.</item>
+  </plurals>
+  <string name="delete_nothing">Niets te verwijderen.</string>
+  <string name="delete_cancelled">Verwijderen geannuleerd.</string>
   <!--Certify result toast-->
+  <plurals name="certify_keys_ok">
+    <item quantity="one">Sleutel%2$s succesvol gecertificeerd.</item>
+    <item quantity="other">%1$d sleutels%2$s succesvol gecertificeerd.</item>
+  </plurals>
+  <plurals name="certify_keys_with_errors">
+    <item quantity="one">Certificatie mislukt!</item>
+    <item quantity="other">Certificatie mislukt voor %d sleutels!</item>
+  </plurals>
+  <plurals name="certify_error">
+    <item quantity="one">Certificatie mislukt!</item>
+    <item quantity="other">Certificatie van %d sleutels mislukt!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Decodeer bestand met OpenKeychain</string>
   <string name="intent_import_key">Importeer Sleutel met OpenKeychain</string>
   <string name="intent_send_encrypt">Codeer met OpenKeychain</string>
   <string name="intent_send_decrypt">Decodeer met OpenKeychain</string>
   <!--Remote API-->
+  <string name="api_no_apps">Geen geregistreerde apps!\n\nEen lijst van ondersteunde derde-partij applicaties kan gevonden worden in \'Help\'!</string>
   <string name="api_settings_show_info">Toon geavanceerde informatie</string>
   <string name="api_settings_hide_info">Verberg geavanceerde informatie</string>
   <string name="api_settings_show_advanced">Toon geavanceerde instellingen</string>
@@ -246,17 +441,29 @@
   <string name="api_settings_select_key">Sleutel selecteren</string>
   <string name="api_settings_create_key">Maak nieuwe sleutel voor dit account</string>
   <string name="api_settings_save">Opslaan</string>
+  <string name="api_settings_save_msg">Account is opgeslaan</string>
   <string name="api_settings_cancel">Annuleren</string>
   <string name="api_settings_revoke">Toegang herroepen</string>
   <string name="api_settings_start">Start applicatie</string>
   <string name="api_settings_delete_account">Verwijder account</string>
   <string name="api_settings_package_name">Pakketnaam</string>
   <string name="api_settings_package_signature">SHA-256 van Pakkethandtekening</string>
-  <string name="api_settings_accounts">Accounts</string>
+  <string name="api_settings_accounts">Accounts (verouderde API)</string>
+  <string name="api_settings_advanced">Geavanceerde informatie</string>
+  <string name="api_settings_allowed_keys">Toegestane sleutels</string>
+  <string name="api_settings_settings">Instellingen</string>
+  <string name="api_settings_key">Accountsleutel:</string>
+  <string name="api_settings_accounts_empty">Geen accounts verbonden aan deze app.</string>
+  <string name="api_create_account_text">Geen sleutel ingesteld voor deze account. Gelieve een van je bestaande sleutels te selecteren, of een nieuwe sleutel aan te maken.\nApps kunnen enkel ontcijferen/ondertekenen met de sleutels die je hier selecteert!</string>
+  <string name="api_update_account_text">De sleutel opgeslaan voor deze account is verwijderd. Gelieve een andere te selecteren!\nApps kunnen enkel ontcijferen/ondertekenen met de sleutels die je hier selecteert!</string>
+  <string name="api_register_text">De weergegeven app will berichten versleutelen/ontcijferen en ze in jouw naam ondertekenen.\nToegang toestaan?\n\nWAARSCHUWING: als je niet weet waarom dit scherm verscheen, sta dan geen toegang toe! Je kan later toegang weghalen via het \'Apps\' scherm.</string>
   <string name="api_register_allow">Toegang toestaan</string>
   <string name="api_register_disallow">Toegang weigeren</string>
   <string name="api_register_error_select_key">Selecteert u a.u.b. een sleutel</string>
+  <string name="api_select_pub_keys_missing_text">Geen sleutels gevonden voor deze identiteiten:</string>
+  <string name="api_select_pub_keys_dublicates_text">Meer dan een sleutel bestaat voor deze identiteiten:</string>
   <string name="api_select_pub_keys_text">Bekijkt u a.u.b. de ontvangers</string>
+  <string name="api_select_pub_keys_text_no_user_ids">Gelieve de ontvangers te selecteren!</string>
   <string name="api_error_wrong_signature">Handtekening check mislukt! Hebt u deze app van een andere bron geïnstalleerd? Als u zeker weet dat dit geen aanval is, haal dan de registratie van deze app in OpenKeychain weg en registreer de app opnieuw.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Delen met QR-code</string>
@@ -266,63 +473,616 @@
     <item quantity="one">1 sleutel geselecteerd.</item>
     <item quantity="other">%d sleutels geselecteerd.</item>
   </plurals>
+  <string name="key_list_empty_text1">Geen sleutels gevonden!</string>
+  <string name="key_list_filter_show_all">Alle sleutels weergeven</string>
+  <string name="key_list_filter_show_certified">Enkel gecertificeerde sleutels weergeven</string>
   <!--Key view-->
   <string name="key_view_action_edit">Sleutel bewerken</string>
+  <string name="key_view_action_encrypt">Versleutel tekst</string>
+  <string name="key_view_action_encrypt_files">bestanden</string>
   <string name="key_view_action_certify">Certifiëer identiteiten</string>
-  <string name="key_view_action_share_with">Delen met...</string>
+  <string name="key_view_action_update">Update van sleutelserver</string>
+  <string name="key_view_action_share_with">Delen met…</string>
+  <string name="key_view_action_share_nfc">Delen over NFC</string>
+  <string name="key_view_action_upload">Uploaden naar sleutelserver</string>
   <string name="key_view_tab_main">Hoofd Info</string>
   <string name="key_view_tab_share">Delen</string>
   <string name="key_view_tab_keys">Subsleutels</string>
   <string name="key_view_tab_certs">Certificaten</string>
+  <string name="user_id_info_revoked_title">Ingetrokken</string>
+  <string name="user_id_info_revoked_text">Deze identiteit is door de sleuteleigenaar ingetrokken. Ze is niet langer geldig.</string>
+  <string name="user_id_info_certified_title">Gecertificeerd</string>
+  <string name="user_id_info_certified_text">Deze identiteit is door jou gecertificeerd.</string>
+  <string name="user_id_info_uncertified_title">Niet gecertificeerd</string>
+  <string name="user_id_info_uncertified_text">Deze identiteit is nog niet gecertificeerd. Je kan niet zeker zijn dat deze identiteit echt overeenkomt met een bepaald persoon.</string>
+  <string name="user_id_info_invalid_title">Ongeldig</string>
+  <string name="user_id_info_invalid_text">Er is iets mis met deze identiteit!</string>
   <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Wachtwoord wijzigen</string>
+  <string name="edit_key_action_add_identity">Identiteit toevoegen</string>
+  <string name="edit_key_action_add_subkey">Subsleutel toevoegen</string>
+  <string name="edit_key_edit_user_id_title">Selecteer een actie!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Verander naar primaire identiteit</item>
+    <item>Trek identiteit in</item>
+  </string-array>
+  <string-array name="edit_key_edit_user_id_revert_revocation">
+    <item>Intrekking ongedaan maken</item>
+  </string-array>
+  <string name="edit_key_edit_user_id_revoked">Deze identiteit is ingetrokken. Dit kan niet ongedaan gemaakt worden.</string>
+  <string name="edit_key_edit_subkey_title">Selecteer een actie!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Vervaldatum veranderen</item>
+    <item>Subsleutel intrekken</item>
+    <item>Subsleutel strippen</item>
+  </string-array>
+  <string name="edit_key_new_subkey">nieuwe subsleutel</string>
+  <string name="edit_key_select_flag">Gelieve minstens een vlag te selecteren!</string>
+  <string name="edit_key_error_add_identity">Voeg minstens een identiteit toe!</string>
+  <string name="edit_key_error_add_subkey">Voeg minstens een subsleutel toe!</string>
   <!--Create key-->
+  <string name="create_key_upload">Upload sleutel naar sleutelserver</string>
+  <string name="create_key_empty">Dit veld moet ingevuld worden</string>
+  <string name="create_key_passphrases_not_equal">Wachtwoorden komen niet overeen</string>
+  <string name="create_key_final_text">Je hebt volgende identiteit ingevoerd:</string>
+  <string name="create_key_final_robot_text">Een sleutel aanmaken kan even duren, maak intussen een tasje thee klaar…</string>
+  <string name="create_key_rsa">(3 subsleutels, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(aangepaste sleutelconfiguratie)</string>
+  <string name="create_key_text">Voer je volledige naam en e-mailadres in, en kies een wachtwoord.</string>
+  <string name="create_key_hint_full_name">Volledige naam, bv. Max Mustermann</string>
+  <string name="create_key_edit">Sleutelconfiguratie wijzigen</string>
   <!--View key-->
+  <string name="view_key_revoked">Deze sleutel is ingetrokken!</string>
+  <string name="view_key_expired">Deze sleutel is verlopen!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Sleutels</string>
+  <string name="nav_encrypt_decrypt">Versleutelen/Ontsleutelen</string>
+  <string name="nav_apps">Apps</string>
   <string name="drawer_open">Open navigatiemenu</string>
   <string name="drawer_close">Sluit navigatiemenu</string>
   <string name="my_keys">Mijn Sleutels</string>
   <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Type tekst</string>
   <!--certs-->
   <string name="cert_default">standaard</string>
   <string name="cert_none">geen</string>
   <string name="cert_casual">eenvoudig</string>
   <string name="cert_positive">positief</string>
   <string name="cert_revoke">ingetrokken</string>
+  <string name="cert_verify_ok">Oké</string>
   <string name="cert_verify_failed">mislukt!</string>
   <string name="cert_verify_error">fout!</string>
   <string name="cert_verify_unavailable">sleutel onbeschikbaar</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Interne fout!</string>
+  <string name="msg_cancelled">Bewerking geannuleerd.</string>
   <!--Import Public log entries-->
+  <string name="msg_ip_apply_batch">Bezig met toepassen van invoeg-batchbewerking.</string>
+  <string name="msg_ip_bad_type_secret">Geprobeerd een geheime sleutel als publieke sleutel te importeren. Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_ip_delete_old_fail">Geen oude sleutel verwijderd (een nieuwe aan het aanmaken?)</string>
+  <string name="msg_ip_delete_old_ok">Oude sleutel van database verwijderd</string>
+  <string name="msg_ip_encode_fail">Bewerking mislukt door coderingsfout</string>
+  <string name="msg_ip_error_io_exc">Bewerking mislukt door i/o-fout</string>
+  <string name="msg_ip_error_op_exc">Bewerking mislukt door databasefout</string>
+  <string name="msg_ip_error_remote_ex">Bewerking mislukt door interne fout</string>
+  <string name="msg_ip">Bezig met importeren van publieke sleutelbos %s</string>
+  <string name="msg_ip_insert_keyring">Bezig met coderen van sleutelbosgegevens</string>
+  <string name="msg_ip_insert_keys">Bezig met analyseren van sleutels</string>
+  <string name="msg_ip_prepare">Bezig met voorbereiden van databasebewerkingen</string>
+  <string name="msg_ip_master">Bezig met verwerken van hoofdsleutel %s</string>
+  <string name="msg_ip_master_expired">Sleutelbos is verlopen op %s</string>
+  <string name="msg_ip_master_expires">Sleutelbos verloopt op %s</string>
+  <string name="msg_ip_master_flags_unspecified">Hoofdvlaggen: niet gespecificeerd (alle worden verondersteld)</string>
+  <string name="msg_ip_master_flags_cesa">Hoofdvlaggen: certificeren, versleutelen, ondertekenen, authenticeren</string>
+  <string name="msg_ip_master_flags_cesx">Hoofdvlaggen: certificeren, versleutelen, ondertekenen</string>
+  <string name="msg_ip_master_flags_cexa">Hoofdvlaggen: certificeren, versleutelen, authenticeren</string>
+  <string name="msg_ip_master_flags_cexx">Hoofdvlaggen: certificeren, versleutelen</string>
+  <string name="msg_ip_master_flags_cxsa">Hoofdvlaggen: certificeren, versleutelen, authenticeren</string>
+  <string name="msg_ip_master_flags_cxsx">Hoofdvlaggen: certificeren, ondertekenen</string>
+  <string name="msg_ip_master_flags_cxxa">Hoofdvlaggen: certificeren, authenticeren</string>
+  <string name="msg_ip_master_flags_cxxx">Hoofdvlaggen: certificeren</string>
+  <string name="msg_ip_master_flags_xesa">Hoofdvlaggen: versleutelen, ondertekenen, authenticeren</string>
+  <string name="msg_ip_master_flags_xesx">Hoofdvlaggen: versleutelen, ondertekenen</string>
+  <string name="msg_ip_master_flags_xexa">Hoofdvlaggen: versleutelen, authenticeren</string>
+  <string name="msg_ip_master_flags_xexx">Hoofdvlaggen: versleutelen</string>
+  <string name="msg_ip_master_flags_xxsa">Hoofdvlaggen: ondertekenen, authenticeren</string>
+  <string name="msg_ip_master_flags_xxsx">Hoofdvlaggen: ondertekenen</string>
+  <string name="msg_ip_master_flags_xxxa">Hoofdvlaggen: authenticeren</string>
+  <string name="msg_ip_master_flags_xxxx">Hoofdvlaggen: geen</string>
+  <string name="msg_ip_merge_public">Bezig met samenvoegen van geïmporteerde gegevens in bestaande publieke sleutelbos</string>
+  <string name="msg_ip_merge_secret">Bezig met samenvoegen van geïmporteerde gegevens in bestaande publieke sleutelbos</string>
+  <string name="msg_ip_subkey">Bezig met verwerken van subsleutel %s</string>
+  <string name="msg_ip_subkey_expired">Subsleutel is vervallen op %s</string>
+  <string name="msg_ip_subkey_expires">Subsleutel vervalt op %s</string>
+  <string name="msg_ip_subkey_flags_unspecified">Subsleutelvlaggen: niet gespecificeerd (alle worden verondersteld)</string>
+  <string name="msg_ip_subkey_flags_cesa">Subsleutelvlaggen: certificeren, versleutelen, ondertekenen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_cesx">Subsleutelvlaggen: certificeren, versleutelen, ondertekenen</string>
+  <string name="msg_ip_subkey_flags_cexa">Subsleutelvlaggen: certificeren, versleutelen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_cexx">Subsleutelvlaggen: certificeren, versleutelen</string>
+  <string name="msg_ip_subkey_flags_cxsa">Subsleutelvlaggen: certificeren, ondertekenen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_cxsx">Subsleutelvlaggen: certificeren, ondertekenen</string>
+  <string name="msg_ip_subkey_flags_cxxa">Subsleutelvlaggen: certificeren, authenticeren</string>
+  <string name="msg_ip_subkey_flags_cxxx">Subsleutelvlaggen: certificeren</string>
+  <string name="msg_ip_subkey_flags_xesa">Subsleutelvlaggen: versleutelen, ondertekenen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_xesx">Subsleutelvlaggen: versleutelen, ondertekenen</string>
+  <string name="msg_ip_subkey_flags_xexa">Subsleutelvlaggen: versleutelen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_xexx">Subsleutelvlaggen: versleutelen</string>
+  <string name="msg_ip_subkey_flags_xxsa">Subsleutelvlaggen: ondertekenen, authenticeren</string>
+  <string name="msg_ip_subkey_flags_xxsx">Subsleutelvlaggen: ondertekenen</string>
+  <string name="msg_ip_subkey_flags_xxxa">Subsleutelvlaggen: authenticeren</string>
+  <string name="msg_ip_subkey_flags_xxxx">Subsleutelvlaggen: geen</string>
+  <string name="msg_ip_success">Publieke sleutelbos succesvol geïmporteerd</string>
+  <string name="msg_ip_success_identical">Sleutelbos bevat geen nieuwe gegevens, niets te doen</string>
+  <string name="msg_ip_reinsert_secret">Bezig met opnieuw invoegen van geheime sleutel</string>
+  <string name="msg_ip_uid_cert_bad">Slecht certificaat tegengekomen!</string>
+  <string name="msg_ip_uid_cert_error">Fout bij verwerken van certificaat!</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Er is al een niet-intrekbaar certificaat, dit certificaat wordt overgeslaan.</string>
+  <string name="msg_ip_uid_cert_old">Dit certificaat is ouder dan het vorige en wordt overgeslaan.</string>
+  <string name="msg_ip_uid_cert_new">Dit certificaat is recenter en vervangt het vorige.</string>
+  <string name="msg_ip_uid_cert_good">Goed certificaat door %1$s gevonden</string>
+  <string name="msg_ip_uid_cert_good_revoke">Goede intrekking van certificaat door %1$s gevonden</string>
+  <plurals name="msg_ip_uid_certs_unknown">
+    <item quantity="one">Een certificaat uitgegeven door een onbekende publieke sleutel wordt genegeerd</item>
+    <item quantity="other">%s certificaten uitgegeven door onbekende publieke sleutels worden genegeerd</item>
+  </plurals>
+  <string name="msg_ip_uid_classifying_zero">Bezig met classificeren van gebruikers-ID\'s (geen vertrouwde sleutels beschikbaar)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Bezig met classificeren van gebruikers-ID\'s (een vertrouwde sleutel wordt gebruikt)</item>
+    <item quantity="other">Bezig met classificeren van gebruikers-ID\'s (%s vertrouwde sleutels worden gebruikt)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Bezig met opnieuw ordenen van gebruikers-ID\'s</string>
+  <string name="msg_ip_uid_processing">Bezig met verwerken van gebruikers-ID %s</string>
+  <string name="msg_ip_uid_revoked">Gebruikers-ID is ingetrokken</string>
+  <string name="msg_ip_uat_processing_image">Bezig met verwerken van gebruikersattribuut van type afbeelding</string>
+  <string name="msg_ip_uat_processing_unknown">Bezig met verwerken van gebruikersattribuut van onbekend type</string>
+  <string name="msg_ip_uat_cert_bad">Slecht certificaat tegengekomen!</string>
+  <string name="msg_ip_uat_cert_error">Fout bij verwerken van certificaat!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Er is al een niet-intrekbaar certificaat, dit certificaat wordt overgeslaan.</string>
+  <string name="msg_ip_uat_cert_old">Dit certificaat is ouder dan het vorige en wordt overgeslaan.</string>
+  <string name="msg_ip_uat_cert_new">Dit certificaat is recenter en vervangt het vorige.</string>
+  <string name="msg_ip_uat_cert_good">Goed certificaat door %1$s gevonden</string>
+  <string name="msg_ip_uat_cert_good_revoke">Goede intrekking van certificaat door %1$s gevonden</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Een certificaat uitgegeven door een onbekende publieke sleutel wordt genegeerd</item>
+    <item quantity="other">%s certificaten uitgegeven door onbekende publieke sleutels worden genegeerd</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Bezig met classificeren van gebruikersattributen</string>
+  <string name="msg_ip_uat_revoked">Gebruikersattribuut is ingetrokken</string>
+  <string name="msg_is_bad_type_public">Geprobeerd een geheime sleutelbos als publieke sleutelbos te importeren. Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_is_bad_type_uncanon">Geprobeerd een sleutelbos zonder standaardisatie te importeren. Dit is een bug, gelieve een verslag in te dienen!</string>
   <!--Import Secret log entries-->
+  <string name="msg_is">Bezig met importeren van geheime sleutel %s</string>
+  <string name="msg_is_db_exception">Databasefout!</string>
+  <string name="msg_is_importing_subkeys">Bezig met verwerken van geheime subsleutels</string>
+  <string name="msg_is_error_io_exc">Fout bij coderen van sleutelbos</string>
+  <string name="msg_is_merge_public">Bezig met samenvoegen van geïmporteerde gegevens in bestaande publieke sleutelbos</string>
+  <string name="msg_is_merge_secret">Bezig met samenvoegen van geïmporteerde gegevens in bestaande publieke sleutelbos</string>
+  <string name="msg_is_merge_special">Bezig met samenvoegen van gegevens van self-certificaten uit publieke sleutelbos</string>
+  <string name="msg_is_pubring_generate">Bezig met aanmaken van publieke sleutelbos uit geheime sleutelbos</string>
+  <string name="msg_is_subkey_nonexistent">Subsleutel %s niet beschikbaar in geheime sleutel</string>
+  <string name="msg_is_subkey_ok">Geheime subsleutel %s gemarkeerd als beschikbaar</string>
+  <string name="msg_is_subkey_empty">Geheime subsleutel %s gemarkeerd als beschikbaar, met leeg wachtwoord</string>
+  <string name="msg_is_subkey_pin">Geheime subsleutel %s gemarkeerd als beschikbaar, met PIN</string>
+  <string name="msg_is_subkey_stripped">Geheime subsleutel %s gemarkeerd als gestript</string>
+  <string name="msg_is_subkey_divert">Geheime subsleutel %s gemarkeerd als \'doorschakelen naar smartcard/NFC\'</string>
+  <string name="msg_is_success_identical">Sleutelbos bevat geen nieuwe gegevens, niets te doen</string>
+  <string name="msg_is_success">Geheime sleutelbos succesvol geïmporteerd</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_public">Bezig met standaardiseren van publieke sleutelbos %s</string>
+  <string name="msg_kc_secret">Bezig met standaardiseren van geheime sleutelbos %s</string>
+  <string name="msg_kc_error_v3">Dit is een OpenPGP versie 3 sleutel, deze is verouderd en wordt niet meer ondersteund!</string>
+  <string name="msg_kc_error_no_uid">Sleutelbos bevat geen geldige gebruikers-ID\'s!</string>
+  <string name="msg_kc_error_master_algo">De hoofdsleutel gebruikt een onbekend (%s) algoritme!</string>
+  <string name="msg_kc_error_dup_key">Subsleutel %s komt tweemaal voor in sleutelbos. Sleutelbos is misvormd en wordt niet geïmporteerd!</string>
+  <string name="msg_kc_master">Bezig met verwerken van hoofdsleutel</string>
+  <string name="msg_kc_master_bad_type">Bezig met verwijderen van hoofdsleutelcertificaat van onbekend type (%s)</string>
+  <string name="msg_kc_master_bad_local">Bezig met verwijderen van hoofdsleutelcertificaat met vlag \'lokaal\'</string>
+  <string name="msg_kc_master_bad_err">Bezig met verwijderen van slecht hoofdsleutelcertificaat</string>
+  <string name="msg_kc_master_bad_time">Bezig met verwijderen van sleutelbosintrekkingscertificaat met toekomstige tijdstempel</string>
+  <string name="msg_kc_master_bad_type_uid">Bezig met verwijderen van gebruikers-ID-certificaat in slechte positie</string>
+  <string name="msg_kc_master_bad">Bezig met verwijderen van slecht hoofdsleutelcertificaat</string>
+  <string name="msg_kc_master_local">Bezig met verwijderen van hoofdsleutelcertificaat met vlag \'lokaal\'</string>
+  <string name="msg_kc_revoke_dup">Bezig met verwijderen van overbodig sleutelbosintrekkingscertificaat</string>
+  <string name="msg_kc_notation_dup">Bezig met verwijderen van overbodig notatiecertificaat</string>
+  <string name="msg_kc_notation_empty">Bezig met verwijderen van leeg notatiecertificaat</string>
+  <string name="msg_kc_sub">Bezig met verwerken van subsleutel %s</string>
+  <string name="msg_kc_sub_bad">Bezig met verwijderen van ongeldig subsleutelbindend certificaat</string>
+  <string name="msg_kc_sub_bad_err">Bezig met verwijderen van slecht subsleutelbindend certificaat</string>
+  <string name="msg_kc_sub_bad_local">Bezig met verwijderen van subsleutelbindend certificaat met vlag \'lokaal\'</string>
+  <string name="msg_kc_sub_bad_keyid">Subsleutelbindende uitgevers-ID komt niet overeen</string>
+  <string name="msg_kc_sub_bad_time">Bezig met verwijderen van subsleutelbindend certificaat met toekomstige tijdstempel</string>
+  <string name="msg_kc_sub_bad_type">Onbekend subsleutelcertificaattype: %s</string>
+  <string name="msg_kc_sub_dup">Bezig met verwijderen van overbodig subsleutelbindend certificaat</string>
+  <string name="msg_kc_sub_primary_bad">Bezig met verwijderen van subsleutelbindend certificaat wegens ongeldig primair bindend certificaat</string>
+  <string name="msg_kc_sub_primary_bad_err">Bezig met verwijderen van subsleutelbindend certificaat wegens slecht primair bindend certificaat</string>
+  <string name="msg_kc_sub_primary_none">Bezig met verwijderen van subsleutelbindend certificaat wegens ontbrekend primair bindend certificaat</string>
+  <string name="msg_kc_sub_no_cert">Geen geldig certificaat gevonden voor %s, wordt verwijderd van sleutelbos</string>
+  <string name="msg_kc_sub_revoke_bad_err">Bezig met verwijderen van slecht subsleutelintrekkingscertificaat</string>
+  <string name="msg_kc_sub_revoke_bad">Bezig met verwijderen van slecht subsleutelintrekkingscertificaat</string>
+  <string name="msg_kc_sub_revoke_dup">Bezig met verwijderen van overbodig subsleutelintrekkingscertificaat</string>
+  <string name="msg_kc_sub_unknown_algo">Subsleutel gebruikt een onbekend algoritme en wordt niet geïmporteerd…</string>
+  <string name="msg_kc_sub_algo_bad_encrpyt">Subsleutel heeft versleuteling-gebruiksvlag, maar algoritme is niet geschikt voor versleuteling.</string>
+  <string name="msg_kc_sub_algo_bad_sign">Subsleutel heeft ondertekenen-gebruiksvlag, maar algoritme is niet geschikt voor ondertekenen.</string>
+  <string name="msg_kc_success">Standaardisatie van sleutelbos geslaagd, geen wijzigingen</string>
+  <plurals name="msg_kc_success_bad">
+    <item quantity="one">Standaardisatie van sleutelbos geslaagd, een foutief certificaat verwijderd</item>
+    <item quantity="other">Standaardisatie van sleutelbos geslaagd, %d foutieve certificaten verwijderd</item>
+  </plurals>
+  <string name="msg_kc_success_bad_and_red">Standaardisatie van sleutelbos geslaagd, %1$s foutieve en %2$s overbodige certificaten verwijderd</string>
+  <plurals name="msg_kc_success_redundant">
+    <item quantity="one">Standaardisatie van sleutelbos geslaagd, een overbodig certificaat verwijderd</item>
+    <item quantity="other">Standaardisatie van sleutelbos geslaagd, %d overbodige certificaten verwijderd</item>
+  </plurals>
+  <string name="msg_kc_uid_bad_err">Bezig met verwijderen van slecht self-certificaat voor gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_bad_local">Bezig met verwijderen van gebruikers-ID-certificaat met vlag \'lokaal\'</string>
+  <string name="msg_kc_uid_bad_time">Bezig met verwijderen van gebruikers-ID-certificaat met toekomstige tijdstempel</string>
+  <string name="msg_kc_uid_bad_type">Bezig met verwijderen van gebruikers-ID-certificaat van onbekend type (%s)</string>
+  <string name="msg_kc_uid_bad">Bezig met verwijderen van slecht self-certificaat voor gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_cert_dup">Bezig met verwijderen van verlopen self-certificaat voor gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_foreign">Bezig met verwijderen van vreemd gebruikers-ID-certificaat door \'%s\'</string>
+  <string name="msg_kc_uid_revoke_dup">Bezig met verwijderen van overbodig intrekkingscertificaat voor gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_revoke_old">Bezig met verwijderen van verlopen intrekkingscertificaat voor gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_no_cert">Geen geldig self-certificaat gevonden voor gebruikers-ID \'%s\', wordt verwijderd van sleutelbos</string>
+  <string name="msg_kc_uid_remove">Bezig met verwijderen van ongeldige gebruikers-ID \'%s\'</string>
+  <string name="msg_kc_uid_dup">Bezig met verwijderen van dubbele gebruikers-ID \'%s\'. De sleutelbos bevat er twee. Dit kan resulteren in ontbrekende certificaten!</string>
+  <string name="msg_kc_uid_warn_encoding">Gebruikers-ID verifieert niet als UTF-8!</string>
+  <string name="msg_kc_uat_jpeg">Bezig met verwerken van gebruikersattribuut van type JPEG</string>
+  <string name="msg_kc_uat_unknown">Bezig met verwerken van gebruikersattribuut van onbekend type</string>
+  <string name="msg_kc_uat_bad_err">Bezig met verwijderen van slecht self-certificaat voor gebruikersattribuut</string>
+  <string name="msg_kc_uat_bad_local">Bezig met verwijderen van gebruikersattribuut-certificaat met vlag \'lokaal\'</string>
+  <string name="msg_kc_uat_bad_time">Bezig met verwijderen van gebruikersattribuut-certificaat met toekomstige tijdstempel</string>
+  <string name="msg_kc_uat_bad_type">Bezig met verwijderen van gebruikersattribuut-certificaat van onbekend type (%s)</string>
+  <string name="msg_kc_uat_bad">Bezig met verwijderen van slecht self-certificaat voor gebruikersattribuut</string>
+  <string name="msg_kc_uat_cert_dup">Bezig met verwijderen van verlopen self-certificaat voor gebruikersattribuut</string>
+  <string name="msg_kc_uat_dup">Bezig met verwijderen van dubbel gebruikersattribuut. De sleutelbos bevat er twee. Dit kan resulteren in ontbrekende certificaten!</string>
+  <string name="msg_kc_uat_foreign">Bezig met verwijderen van vreemd gebruikersattribuut-certificaat door</string>
+  <string name="msg_kc_uat_revoke_dup">Bezig met verwijderen van overbodig intrekkingscertificaat voor gebruikersattribuut</string>
+  <string name="msg_kc_uat_revoke_old">Bezig met verwijderen van verlopen intrekkingscertificaat voor gebruikersattribuut</string>
+  <string name="msg_kc_uat_no_cert">Geen geldig self-certificaat gevonden voor gebruikersattribuut, wordt verwijderd van sleutelbos</string>
+  <string name="msg_kc_uat_remove">Bezig met verwijderen van ongeldig gebruikersattribuut</string>
+  <string name="msg_kc_uat_warn_encoding">Gebruikers-ID verifieert niet als UTF-8!</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_error_secret_dummy">Nieuwe publieke subsleutel gevonden, maar geheime subsleutel dummy-generatie wordt niet ondersteund!</string>
+  <string name="msg_mg_error_heterogeneous">Geprobeerd om sleutelbossen met verschillende vingerafdrukken samen te voegen!</string>
+  <string name="msg_mg_error_encode">Fatale fout bij coderen van ondertekening!</string>
+  <string name="msg_mg_public">Bezig met samenvoegen in publieke sleutelbos %s</string>
+  <string name="msg_mg_secret">Bezig met samenvoegen in geheime sleutelbos %s</string>
+  <string name="msg_mg_new_subkey">Bezig met toevoegen van nieuwe subsleutel %s</string>
+  <string name="msg_mg_found_new">%s nieuwe certificaten in sleutelbos gevonden</string>
+  <string name="msg_mg_unchanged">Niets om samen te voegen</string>
   <!--createSecretKeyRing-->
+  <string name="msg_cr">Bezig met aanmaken van nieuwe hoofdsleutel</string>
+  <string name="msg_cr_error_no_master">Geen hoofdsleutel-opties opgegeven!</string>
+  <string name="msg_cr_error_no_user_id">Sleutelbossen moeten met minstens een gebruikers-ID aangemaakt worden!</string>
+  <string name="msg_cr_error_no_certify">Hoofdsleutel moet certificeer-vlag hebben!</string>
+  <string name="msg_cr_error_null_expiry">Verloopdatum kan niet hetzelfde als voordien zijn bij aanmaken van een sleutel. Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_cr_error_keysize_512">Sleutelgrootte moet groter dan of gelijk zijn aan 512!</string>
+  <string name="msg_cr_error_no_curve">Geen sleutelgrootte opgegeven! Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_cr_error_no_keysize">Geen elliptische curve opgegeven! Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_cr_error_internal_pgp">Interne OpenPGP-fout!</string>
+  <string name="msg_cr_error_unknown_algo">Onbekend algoritme geselecteerd! Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_cr_error_flags_dsa">Slechte sleutelvlaggen geselecteerd, DSA kan niet gebruikt worden voor versleuteling!</string>
+  <string name="msg_cr_error_flags_elgamal">Slechte sleutelvlaggen geselecteerd, ElGamal kan niet gebruikt worden voor versleuteling!</string>
+  <string name="msg_cr_error_flags_ecdsa">Slechte sleutelvlaggen geselecteerd, ECDSA kan niet gebruikt worden voor versleuteling!</string>
+  <string name="msg_cr_error_flags_ecdh">Slechte sleutelvlaggen geselecteerd, ECDH kan niet gebruikt worden voor versleuteling!</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mr">Bezig met wijzigen van sleutelbos %s</string>
+  <string name="msg_mf_error_divert_serial">Het serienummer van een doorschakelen-naar-kaart sleutel moet 16 bytes zijn! Dit is een programmeerfout, gelieve een verslag in te dienen!</string>
+  <string name="msg_mf_error_encode">Codeeruitzondering!</string>
+  <string name="msg_mf_error_fingerprint">Eigenlijke vingerafdruk van sleutel komt niet overeen met verwachte vingerafdruk!</string>
+  <string name="msg_mf_error_keyid">Geen sleutel-ID. Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_mf_error_integrity">Interne fout, integriteitscheck mislukt!</string>
+  <string name="msg_mf_error_master_none">Geen hoofdcertificaat gevonden om mee te werken! (Allemaal ingetrokken?)</string>
+  <string name="msg_mf_error_noexist_primary">Slechte primaire gebruikers-ID opgegeven!</string>
+  <string name="msg_mf_error_noexist_revoke">Slechte gebruikers-ID voor intrekking opgegeven!</string>
+  <string name="msg_mf_error_restricted">Geprobeerd een beperkte bewerking uit te voeren zonder wachtwoord! Dit is een programmeerfout, gelieve een verslag in te dienen!</string>
+  <string name="msg_mf_error_revoked_primary">Ingetrokken gebruikers-ID\'s kunnen niet primair zijn!</string>
+  <string name="msg_mf_error_null_expiry">Verloopdatum kan niet hetzelfde als voordien zijn bij aanmaken van een subsleutel. Dit is een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_mf_error_passphrase_master">Fatale fout bij ontcijferen van hoofdsleutel. Dit is waarschijnlijk een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_mf_error_pgp">Interne OpenPGP-fout!</string>
+  <string name="msg_mf_error_sig">Ondertekeningsuitzondering!</string>
+  <string name="msg_mf_master">Bezig met wijzigen van hoofdcertificaten</string>
+  <string name="msg_mf_notation_empty">Bezig met toevoegen van leeg notatiepakket</string>
+  <string name="msg_mf_notation_pin">Bezig met toevoegen van PIN-notatiepakket</string>
+  <string name="msg_mf_passphrase">Bezig met wijzigen van wachtwoord voor sleutelbos</string>
+  <string name="msg_mf_passphrase_key">Bezig met opnieuw versleutelen van subsleutel %s met nieuw wachtwoord</string>
+  <string name="msg_mf_passphrase_empty_retry">Instellen van nieuw wachtwoord mislukt, opnieuw proberen met leeg oud wachtwoord</string>
+  <string name="msg_mf_passphrase_fail">Wachtwoord voor subsleutel kon niet gewijzigd worden! (Heeft het een ander wachtwoord dan de andere sleutels?)</string>
+  <string name="msg_mf_primary_replace_old">Bezig met vervangen van certificaat van vorige primaire gebruikers-ID</string>
+  <string name="msg_mf_primary_new">Bezig met aanmaken van nieuw certificaat voor nieuwe primaire gebruikers-ID</string>
+  <string name="msg_mf_subkey_change">Bezig met wijzigen van subsleutel %s</string>
+  <string name="msg_mf_error_subkey_missing">Geprobeerd om bewerking uit te voeren op ontbrekende subsleutel %s!</string>
+  <string name="msg_mf_subkey_new">Bezig met toevoegen van nieuwe subsleutel of type %s</string>
+  <string name="msg_mf_subkey_new_id">Nieuwe subsleutel-ID: %s</string>
+  <string name="msg_mf_error_past_expiry">Verloopdatum kan niet in het verleden zijn!</string>
+  <string name="msg_mf_subkey_revoke">Bezig met intrekken van subsleutel %s</string>
+  <string name="msg_mf_subkey_strip">Bezig met strippen van subsleutel %s</string>
+  <string name="msg_mf_success">Sleutelbos succesvol gewijzigd</string>
+  <string name="msg_mf_uid_add">Bezig met toevoegen van gebruikers-ID %s</string>
+  <string name="msg_mf_uid_primary">Bezig met wijzigen van primaire gebruikers-ID naar %s</string>
+  <string name="msg_mf_uid_revoke">Bezig met intrekken van gebruikers-ID %s</string>
+  <string name="msg_mf_uid_error_empty">Gebruikers-ID kan niet leeg zijn!</string>
+  <string name="msg_mf_uat_error_empty">Gebruikersattribuut kan niet leeg zijn!</string>
+  <string name="msg_mf_uat_add_image">Bezig met toevoegen van gebruikersattribuut van type afbeelding</string>
+  <string name="msg_mf_uat_add_unknown">Bezig met toevoegen van gebruikersattribuut van onbekend type</string>
+  <string name="msg_mf_unlock_error">Fout bij ontgrendelen van sleutelbos!</string>
+  <string name="msg_mf_unlock">Bezig met ontgrendelen van sleutelbos</string>
   <!--Consolidate-->
+  <string name="msg_con">Bezig met consolideren van database</string>
+  <string name="msg_con_error_bad_state">Consolidatie gestart terwijl er geen database was gecached! Dit is waarschijnlijk een bug, gelieve een verslag in te dienen!</string>
+  <string name="msg_con_error_concurrent">Consolidatie afgebroken, loopt al op een andere draad!</string>
+  <string name="msg_con_save_secret">Bezig met opslaan van geheime sleutelbossen</string>
+  <string name="msg_con_save_public">Bezig met opslaan van publieke sleutelbossen</string>
+  <string name="msg_con_db_clear">Bezig met wissen van database</string>
+  <string name="msg_con_success">Database succesvol geconsolideerd</string>
+  <string name="msg_con_critical_in">Begin van kritieke fase</string>
+  <string name="msg_con_critical_out">Einde van kritieke fase</string>
+  <string name="msg_con_delete_public">Bezig met verwijderen van cachebestand van publieke sleutelbos</string>
+  <string name="msg_con_delete_secret">Bezig met verwijderen van cachebestand van geheime sleutelbos</string>
+  <string name="msg_con_error_db">Fout bij openen van database!</string>
+  <string name="msg_con_error_io_public">I/O-fout bij schrijven van publieke sleutels naar cache!</string>
+  <string name="msg_con_error_io_secret">I/O-fout bij schrijven van geheime sleutels naar cache!</string>
+  <string name="msg_con_error_public">Fout bij opnieuw importeren van publieke sleutels!</string>
+  <string name="msg_con_error_secret">Fout bij opnieuw importeren van geheime sleutels!</string>
+  <string name="msg_con_recover">Bezig met hervatten van consolidatieproces</string>
+  <string name="msg_con_recursive">Recursief samenvoegen wordt overgeslaan</string>
+  <string name="msg_con_recover_unknown">Bezig met hervatten van consolidatieproces uit onbekende staat</string>
+  <plurals name="msg_con_reimport_public">
+    <item quantity="one">Bezig met opnieuw importeren van een publieke sleutel</item>
+    <item quantity="other">Bezig met opnieuw importeren van %d publieke sleutels</item>
+  </plurals>
+  <string name="msg_con_reimport_public_skip">Geen publieke sleutels om opnieuw te importeren, bewerking wordt overgeslaan…</string>
+  <plurals name="msg_con_reimport_secret">
+    <item quantity="one">Bezig met opnieuw importeren van een geheime sleutel</item>
+    <item quantity="other">Bezig met opnieuw importeren van %d geheime sleutels</item>
+  </plurals>
+  <string name="msg_con_reimport_secret_skip">Geen geheime sleutel om opnieuw te importeren, bewerking wordt overgeslaan…</string>
+  <string name="msg_con_warn_delete_public">Uitzondering bij verwijderen van publiek cachebestand</string>
+  <string name="msg_con_warn_delete_secret">Uitzondering bij verwijderen van geheim cachebestand</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Bezig met uitvoeren van sleutelbewerking</string>
+  <string name="msg_ed_caching_new">Bezig met cachen van nieuw wachtwoord</string>
+  <string name="msg_ed_error_no_parcel">SaveKeyringParcel ontbreekt! (dit is een bug, gelieve een verslag in te dienen)</string>
+  <string name="msg_ed_error_key_not_found">Sleutel niet gevonden!</string>
+  <string name="msg_ed_fetching">Bezig met ophalen van de te wijzigen sleutel (%s)</string>
+  <string name="msg_ed_success">Sleutelbewerking geslaagd</string>
+  <!--Promote key-->
+  <string name="msg_pr">Bezig met promoveren van publieke sleutel naar geheime sleutel</string>
+  <string name="msg_pr_error_already_secret">Sleutel is al een geheime sleutel!</string>
+  <string name="msg_pr_error_key_not_found">Sleutel niet gevonden!</string>
+  <string name="msg_pr_fetching">Bezig met ophalen van de te wijzigen sleutel (%s)</string>
+  <string name="msg_pr_success">Sleutel succesvol gepromoveerd!</string>
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_divert">Bewerken van NFC-sleutels wordt (nog) niet ondersteund!</string>
+  <string name="msg_ek_error_dummy">Kan sleutelbos niet bewerken met gestripte hoofdsleutel!</string>
+  <string name="msg_ek_error_not_found">Sleutel niet gevonden!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_askip_no_key">Gegevens niet versleuteld met bekende sleutel, bewerking wordt overgeslaan…</string>
+  <string name="msg_dc_askip_not_allowed">Gegevens niet versleuteld met toegestane sleutel, bewerking wordt overgeslaan…</string>
+  <string name="msg_dc_asym">Blok van asymmetrisch versleutelde gegevens gevonden voor sleutel %s</string>
+  <string name="msg_dc_charset">Karakterset-header gevonder: \'%s\'</string>
+  <string name="msg_dc_clear_data">Bezig met verwerken van letterlijke gegevens</string>
+  <string name="msg_dc_clear_decompress">Bezig met uitpakken van gecomprimeerde gegevens</string>
+  <string name="msg_dc_clear_meta_file">Bestandsnaam: %s</string>
+  <string name="msg_dc_clear_meta_mime">MIME-type: %s</string>
+  <string name="msg_dc_clear_meta_size">Bestandsgrootte: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">Bestandsgrootte onbekend</string>
+  <string name="msg_dc_clear_meta_time">Wijzigingstijd: %s</string>
+  <string name="msg_dc_clear_signature_bad">Ondertekeningscontrole NIET OKÉ!</string>
+  <string name="msg_dc_clear_signature_check">Bezig met verifiëren van ondertekeningsgegevens</string>
+  <string name="msg_dc_clear_signature_ok">Ondertekeningscontrole OKÉ</string>
+  <string name="msg_dc_clear_signature">Bezig met opslaan van ondertekeningsgegevens voor later</string>
+  <string name="msg_dc_clear">Bezig met verwerken van platte tekst-gegevens</string>
+  <string name="msg_dc_error_bad_passphrase">Fout bij ontcijferen van sleutel, slecht wachtwoord!</string>
+  <string name="msg_dc_error_extract_key">Onbekende fout bij ontgrendelen van sleutel!</string>
+  <string name="msg_dc_error_integrity_check">Fout bij integriteitscontrole!</string>
+  <string name="msg_dc_error_integrity_missing">Integriteitscheck ontbreekt! Dit kan gebeuren omdat de versleutelingsapplicatie verouderd is, of door een downgrade-aanval.</string>
+  <string name="msg_dc_error_invalid_siglist">Geen geldige ondertekeningsgegevens gevonden!</string>
+  <string name="msg_dc_error_io">I/O-uitzondering tegengekomen tijdens bewerking!</string>
+  <string name="msg_dc_error_no_data">Geen versleutelde gegevens gevonden!</string>
+  <string name="msg_dc_error_no_key">Geen versleutelde gegevens met bekende geheime sleutel gevonden!</string>
+  <string name="msg_dc_error_pgp_exception">OpenPGP-uitzondering tegengekomen tijdens bewerking!</string>
+  <string name="msg_dc_integrity_check_ok">Integriteitscontrole OKÉ!</string>
+  <string name="msg_dc_ok_meta_only">Enkel metadata opgevraagd, ontcijferen wordt overgeslaan</string>
+  <string name="msg_dc_ok">Oké</string>
+  <string name="msg_dc_pass_cached">Wachtwoord wordt uit cache gebruikt</string>
+  <string name="msg_dc_pending_nfc">NFC token vereist, gebruikersinput wordt gevraagd…</string>
+  <string name="msg_dc_pending_passphrase">Wachtwoord vereist, gebruikersinput wordt gevraagd…</string>
+  <string name="msg_dc_prep_streams">Bezig met voorbereiden van streams voor ontcijfering</string>
+  <string name="msg_dc">Ontcijfering wordt gestart…</string>
+  <string name="msg_dc_sym_skip">Symmetrische gegevens niet toegestaan, bewerking wordt overgeslaan…</string>
+  <string name="msg_dc_sym">Blok met symmetrisch versleutelde gegevens gevonden</string>
+  <string name="msg_dc_trail_asym">Achterlopende, asymmetrisch versleutelde gegevens tegengekomen voor sleutel %s</string>
+  <string name="msg_dc_trail_sym">Achterlopende, symmetrisch versleutelde gegevens tegengekomen</string>
+  <string name="msg_dc_trail_unknown">Achterlopende gegevens van onbekend type tegengekomen</string>
+  <string name="msg_dc_unlocking">Bezig met ontgrendelen van geheime sleutel</string>
   <!--Messages for SignEncrypt operation-->
+  <string name="msg_se">Ondertekening/versleuteling wordt gestart</string>
+  <string name="msg_se_input_bytes">Bezig met verwerken van input van byte array</string>
+  <string name="msg_se_input_uri">Bezig met verwerken van input van URI</string>
+  <string name="msg_se_error_no_input">Geen input gegeven!</string>
+  <string name="msg_se_error_input_uri_not_found">Fout bij openen van URI voor lezen!</string>
+  <string name="msg_se_error_output_uri_not_found">Fout bij openen van URI voor schrijven!</string>
+  <string name="msg_se_error_too_many_inputs">Meer inputs dan outputs opgegeven! Dit is waarschijnlijk een programmeerfout, gelieve dit te melden!</string>
+  <string name="msg_se_warn_output_left">Er blijven outputs over maar geen inputs. Dit is waarschijnlijk een programmeerfout, gelieve dit te melden!</string>
+  <string name="msg_se_success">Ondertekening/versleuteling geslaagd</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Bezig met publieke sleutels voorbereiden voor versleuteling</string>
+  <string name="msg_pse_clearsign_only">Ondertekenen van platte tekst-input wordt niet ondersteund!</string>
+  <string name="msg_pse_compressing">Bezig met voorbereiden van comprimeren</string>
+  <string name="msg_pse_encrypting">Bezig met versleutelen van gegevens</string>
+  <string name="msg_pse_error_bad_passphrase">Slecht wachtwoord!</string>
+  <string name="msg_pse_error_hash_algo">Het gevraagde hashing-algoritme wordt niet ondersteund door deze sleutel!</string>
+  <string name="msg_pse_error_io">I/O-uitzondering tegengekomen tijdens bewerking!</string>
+  <string name="msg_pse_error_key_sign">Geselecteerde sleutel kan geen gegevens ondertekenen!</string>
+  <string name="msg_pse_error_sign_key">Fout bij ophalen van ondertekeningssleutel!</string>
+  <string name="msg_pse_error_nfc">NFC-gegevensfout!</string>
+  <string name="msg_pse_error_no_passphrase">Geen wachtwoord gegeven!</string>
+  <string name="msg_pse_error_pgp">Interne OpenPGP-fout!</string>
+  <string name="msg_pse_error_sig">OpenPGP-ondertekeningsuitzondering tegengekomen!</string>
+  <string name="msg_pse_error_unlock">Onbekende fout bij ontgrendelen van sleutel!</string>
+  <string name="msg_pse_key_ok">Bezig met versleutelen voor sleutel: %s</string>
+  <string name="msg_pse_key_unknown">Ontbrekende sleutel voor versleuteling: %s</string>
+  <string name="msg_pse_key_warn">Slechte sleutel voor versleuteling: %s</string>
+  <string name="msg_pse_ok">Ondertekening/versleuteling geslaagd!</string>
+  <string name="msg_pse_pending_nfc">NFC token vereist, gebruikersinput gevraagd…</string>
+  <string name="msg_pse_pending_passphrase">Wachtwoord vereist, gebruikersinput gevraagd…</string>
+  <string name="msg_pse_signing">Bezig met ondertekenen van gegevens (zonder versleuteling)</string>
+  <string name="msg_pse_signing_cleartext">Bezig met aanmaken van platte tekst-ondertekening</string>
+  <string name="msg_pse_signing_detached">Bezig met aanmaken van vrijstaande ondertekening</string>
+  <string name="msg_pse_sigcrypting">Bezig met versleutelen van gegevens met ondertekening</string>
+  <string name="msg_pse">Ondertekening en/of versleuteling wordt gestart</string>
+  <string name="msg_pse_symmetric">Bezig met voorbereiden van symmetrische versleuteling</string>
+  <string name="msg_crt_certifying">Bezig met aanmaken van certificaten</string>
+  <string name="msg_crt_certify_all">Bezig met certificeren van alle gebruikers-ID\'s voor sleutel %s</string>
+  <plurals name="msg_crt_certify_some">
+    <item quantity="one">Bezig met certificeren van een gebruikers-ID voor sleutel %2$s</item>
+    <item quantity="other">Bezig met certificeren van %1$d gebruikers-ID\'s voor sleutel %2$s</item>
+  </plurals>
+  <string name="msg_crt_error_self">Kan self-certificaat zo niet uitgeven!</string>
+  <string name="msg_crt_error_master_not_found">Hoofdsleutel niet gevonden!</string>
+  <string name="msg_crt_error_nothing">Geen sleutels gecertificeerd!</string>
+  <string name="msg_crt_error_unlock">Fout bij ontgrendelen van hoofdsleutel!</string>
+  <string name="msg_crt_error_divert">Certificatie met NFC wordt (nog) niet ondersteund!</string>
+  <string name="msg_crt">Bezig met certificeren van sleutelbossen</string>
+  <string name="msg_crt_master_fetch">Bezig met ophalen van gecertificeerde hoofdsleutel</string>
+  <string name="msg_crt_save">Bezig met opslaan van gecertificeerde sleutel %s</string>
+  <string name="msg_crt_saving">Bezig met opslaan van sleutelbossen</string>
+  <string name="msg_crt_unlock">Bezig met ontgrendelen van hoofdsleutel</string>
+  <string name="msg_crt_success">Identiteiten succesvol gecertificeerd</string>
+  <string name="msg_crt_warn_not_found">Sleutel niet gevonden!</string>
+  <string name="msg_crt_warn_cert_failed">Aanmaken van certificaat mislukt!</string>
+  <string name="msg_crt_warn_save_failed">Opslaan mislukt!</string>
+  <string name="msg_crt_upload_success">Sleutel succesvol geüpload naar server</string>
+  <plurals name="msg_import">
+    <item quantity="one">Bezig met importeren van sleutel</item>
+    <item quantity="other">Bezig met importeren van %d sleutels</item>
+  </plurals>
+  <string name="msg_import_fetch_error_decode">Fout bij decoderen van opgehaalde sleutelbos!</string>
+  <string name="msg_import_fetch_error">Sleutel kon niet opgehaald worden! (Netwerkproblemen?)</string>
+  <string name="msg_import_fetch_keybase">Bezig met ophalen van keybase.io: %s</string>
+  <string name="msg_import_fetch_keyserver_error">Kon sleutel niet ophalen!</string>
+  <string name="msg_import_fetch_keyserver">Bezig met ophalen van sleutelserver: %s</string>
+  <string name="msg_import_fetch_keyserver_ok">Ophalen van sleutel geslaagd!</string>
+  <string name="msg_import_keyserver">Sleutelserver %s wordt gebruikt</string>
+  <string name="msg_import_fingerprint_error">Vingerafdruk van opgehaalde sleutel komt niet overeen met verwachte vingerafdruk!</string>
+  <string name="msg_import_fingerprint_ok">Vingerafdrukcontrole OKÉ</string>
+  <string name="msg_import_merge">Bezig met samenvoegen van opgehaalde gegevens</string>
+  <string name="msg_import_error">Importeren mislukt!</string>
+  <string name="msg_import_error_io">Importeren mislukt door i/o-fout!</string>
+  <string name="msg_import_partial">Importeren geslaagd, met fouten!</string>
+  <string name="msg_import_success">Importeren geslaagd!</string>
+  <plurals name="msg_export">
+    <item quantity="one">Bezig met exporteren van een sleutel</item>
+    <item quantity="other">Bezig met exporteren van %d sleutels</item>
+  </plurals>
+  <string name="msg_export_all">Bezig met exporteren van alle sleutels</string>
+  <string name="msg_export_public">Bezig met exporteren van publieke sleutel %s</string>
+  <string name="msg_export_secret">Bezig met exporteren van geheime sleutel %s</string>
+  <string name="msg_export_error_no_file">Geen bestandsnaam opgegeven!</string>
+  <string name="msg_export_error_fopen">Fout bij openen van bestand!</string>
+  <string name="msg_export_error_no_uri">Geen URI opgegeven!</string>
+  <string name="msg_export_error_uri_open">Fout bij openen van URI stream!</string>
+  <string name="msg_export_error_storage">Opslag is niet klaar voor schrijven!</string>
+  <string name="msg_export_error_db">Databasefout!</string>
+  <string name="msg_export_error_io">Input/output-fout!</string>
+  <string name="msg_export_error_key">Fout bij voorwerken van sleutelgegevens!</string>
+  <string name="msg_export_success">Exporteren geslaagd</string>
+  <string name="msg_del_error_empty">Niets om te verwijderen!</string>
+  <string name="msg_del_error_multi_secret">Geheime sleutels kunnen enkel individueel verwijderd worden!</string>
+  <plurals name="msg_del">
+    <item quantity="one">Bezig met verwijderen van een sleutel</item>
+    <item quantity="other">Bezig met verwijderen van %d sleutels</item>
+  </plurals>
+  <string name="msg_del_key">Bezig met verwijderen van sleutel %s</string>
+  <string name="msg_del_key_fail">Verwijderen van sleutel %s mislukt</string>
+  <string name="msg_del_consolidate">Bezig met consolideren van database na verwijderen van geheime sleutel</string>
+  <plurals name="msg_del_ok">
+    <item quantity="one">Sleutel succesvol verwijderd</item>
+    <item quantity="other">%d sleutels succesvol verwijderd</item>
+  </plurals>
+  <plurals name="msg_del_fail">
+    <item quantity="one">Verwijderen van een sleutel mislukt</item>
+    <item quantity="other">Verwijderen van %d sleutels mislukt</item>
+  </plurals>
+  <string name="msg_acc_saved">Account opgeslaan</string>
+  <string name="msg_download_success">Succesvol gedownload!</string>
+  <string name="msg_download_no_valid_keys">Geen geldige sleutels gevonden in bestand/klembord!</string>
+  <string name="msg_download_no_pgp_parts">TODO: meervouden!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Deel van het geladen bestand is geldig OpenPGP object maar niet een OpenPGP sleutel</item>
     <item quantity="other">Delen van het geladen bestand zijn geldige OpenPGP objecten maar niet OpenPGP sleutels</item>
   </plurals>
+  <string name="msg_download_query_too_short">Zoekopdracht te kort. Gelieve je zoekopdracht te verfijnen!</string>
+  <string name="msg_download_too_many_responses">Zoekopdracht gaf te veel kandidaten. Gelieve je zoekopdracht te verfijnen!</string>
+  <string name="msg_download_query_too_short_or_too_many_responses">Geen of te veel sleutels werden gevonden. Gelieve je zoekopdracht te verfijnen!</string>
+  <string name="msg_download_query_failed">Er trad een fout op bij het zoeken naar sleutels.</string>
   <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Klik om de gecachete wachtwoorden te wissen</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain heeft %d wachtwoorden gecachet</string>
+  <string name="passp_cache_notif_keys">Gecachete wachtwoorden:</string>
+  <string name="passp_cache_notif_clear">Wis cache</string>
+  <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</string>
+  <string name="first_time_import_key">Importeren van bestand</string>
+  <string name="first_time_skip">Setup overslaan</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certificeer</string>
   <string name="section_cert">Certificaat Details</string>
   <string name="label_user_id">Identiteit</string>
   <string name="unknown_uid">&lt;onbekend&gt;</string>
   <string name="empty_certs">Geen certificaten voor deze sleutel</string>
+  <string name="certs_text">Enkel gevalideerde self-certificaten en gevalideerde certificaten gemaakt met jouw sleutels worden hier weergegeven.</string>
+  <string name="section_uids_to_certify">Identiteiten voor</string>
+  <string name="certify_text">De sleutels die je importeert bevatten \'identiteiten\': namen en e-mailadressen. Selecteer precies die voor certificatie die overeenkomen met wat je had verwacht.</string>
   <string name="label_revocation">Intrek Reden</string>
   <string name="label_verify_status">Verificatie Status</string>
   <string name="label_cert_type">Type</string>
   <string name="error_key_not_found">Sleutel niet gevonden!</string>
   <string name="error_key_processing">Fout bij verwerken sleutel!</string>
   <string name="key_stripped">gestript</string>
+  <string name="key_divert">doorschakelen naar smartcard/NFC</string>
+  <string name="key_no_passphrase">geen wachtwoord</string>
+  <string name="key_unavailable">niet beschikbaar</string>
+  <string name="secret_cannot_multiple">Je eigen sleutels kunnen enkel individueel verwijderd worden!</string>
   <string name="title_view_cert">Toon Certificaat Details</string>
   <string name="unknown_algorithm">onbekend</string>
   <string name="can_sign_not">kan niet ondertekenen</string>
   <string name="error_no_encrypt_subkey">Geen codeer-subsleutel beschikbaar!</string>
-  <!--First Time-->
+  <string name="info_no_manual_account_creation">Maak OpenKeychain-accounts niet handmatig aan.\nVoor meer informatie, zie Help.</string>
+  <string name="contact_show_key">Toon sleutel (%s)</string>
+  <string name="swipe_to_update">Veeg naar beneden om van sleutelserver te updaten</string>
+  <string name="error_no_file_selected">Selecteer minstens een bestand om te versleutelen!</string>
+  <string name="error_multi_not_supported">Opslaan van meerdere bestanden wordt niet ondersteund. Dit is een beperking van Android.</string>
+  <string name="key_colon">Sleutel:</string>
+  <string name="exchange_description">Selecteer om een sleuteluitwisseling te starten het aantal deelnemers aan de rechterkant, en klik vervolgens op de knop \'Start uitwisseling\'.\n\nJe zal twee vragne gesteld worden om zeker te zijn dat enkel de juiste deelnemers zich in de uitwisseling bevinden en dat hun vingerafdrukken correct zijn.</string>
+  <string name="user_id_none"><![CDATA[<none>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Kies een ontgrendelingsmethode</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Voer wachtwoord in</string>
+  <string name="passphrase">Wachtwoord</string>
+  <string name="noPassphrase">Geen wachtwoord</string>
+  <string name="no_passphrase_set">Geen wachtwoord ingesteld</string>
+  <string name="passphrases_match">Wachtwoorden komen niet overeen</string>
+  <string name="passphrase_saved">Wachtwoord opgeslagen</string>
+  <string name="passphrase_invalid">Wachtwoord ongeldig</string>
+  <string name="missing_passphrase">Ontbrekend wachtwoord</string>
+  <string name="passphrase_again">Opnieuw</string>
+  <string name="lockpattern">Vergrendelingspatroon</string>
+  <string name="lockpatternNFC">NFC + vergrendelingspatroon</string>
+  <string name="unlock_method">Ontgrendelingsmethode</string>
+  <string name="set_passphrase">Wachtwoord instellen</string>
+  <string name="draw_lockpattern">Vergrendelingspatroon tekenen</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">Verkeerde tag. Gelieve opnieuw te proberen.</string>
+  <string name="enable_nfc">Gelieve NFC in je instellingen te activeren</string>
+  <string name="no_nfc_support">Dit toestel biedt geen ondersteuning voor NFC</string>
+  <string name="nfc_write_succesful">Succesvol geschreven op NFC-tag</string>
+  <string name="unlocked">Ontgrendeld</string>
+  <string name="nfc_settings">Instellingen</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index ad1134d6e..bf15bfff9 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -9,13 +9,11 @@
   <string name="title_encrypt_text">Szyfruj tekst</string>
   <string name="title_encrypt_files">Szyfruj pliki</string>
   <string name="title_decrypt">Odszyfruj</string>
-  <string name="title_unlock">Hasło</string>
+  <string name="title_unlock">Klucz odblokowania</string>
   <string name="title_add_subkey">Dodaj pod-klucz</string>
   <string name="title_edit_key">Edytuj klucz</string>
-  <string name="title_preferences">Właściwości</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">Właściwości serwera kluczy</string>
   <string name="title_change_passphrase">Zmień hasło</string>
   <string name="title_share_fingerprint_with">Podziel się fingerprintem z...</string>
   <string name="title_share_key">Podziel się kluczem z...</string>
@@ -34,9 +32,8 @@
   <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ń klucze</string>
-  <string name="title_advanced_key_info">Zaawansowane informacje o kluczu</string>
-  <string name="title_keys">Klucze</string>
+  <string name="title_exchange_keys">Wymień się kluczami</string>
+  <string name="title_advanced_key_info">Zaawansowane Info Klucza</string>
   <!--section-->
   <string name="section_user_ids">Tożsamości</string>
   <string name="section_keys">Pod-klucze</string>
@@ -55,9 +52,7 @@
   <string name="section_key_to_certify">Klucz do certyfikacji</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>
+  <string name="section_certs">Certyfikaty</string>
   <!--button-->
   <string name="btn_decrypt_verify_file">Odszyfruj, weryfikuj i zapisz plik</string>
   <string name="btn_decrypt_verify_message">Odszyfruj i weryfikuj wiadomość</string>
@@ -77,17 +72,15 @@
   <string name="btn_create_key">Utwórz klucz</string>
   <string name="btn_add_files">Dodaj plik(i)</string>
   <string name="btn_add_share_decrypted_text">Podziel się odszyfrowanym tekstem</string>
-  <string name="btn_decrypt_clipboard">Odszyfruj ze schowka</string>
   <string name="btn_decrypt_and_verify">oraz weryfikuj podpisy</string>
   <string name="btn_decrypt_files">Odszyfruj pliki</string>
-  <string name="btn_encrypt_files">Zaszyfruj pliki</string>
-  <string name="btn_encrypt_text">Zaszyfruj tekst</string>
   <!--menu-->
   <string name="menu_preferences">Ustawienia</string>
   <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_create_key">Utwórz mój 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>
@@ -110,9 +103,9 @@
   <string name="label_file_ascii_armor">Włącz ASCII Armor</string>
   <string name="label_write_version_header">Niech inni wiedzą, że używasz OpenKeychain</string>
   <string name="label_write_version_header_summary">Napisze \'\'OpenKeychain v2.7\' do podpisów OpenPGP, ciphertekstu i wyeksportowanych kluczy</string>
-  <string name="label_use_default_yubikey_pin">Użyj domyślnego Yubikey PINa</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PINu Yubikey</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Używa domyślnego PINu (123456) do dostępu do Yubikeys przez NFC</string>
+  <string name="label_use_default_yubikey_pin">Użyj domyślnego PINu YubiKey </string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN\'u YubiKey</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Używa domyślnego PINu (123456) do dostępu do YubiKeys przez NFC</string>
   <string name="label_asymmetric_from">Podpisane przez:</string>
   <string name="label_to">Szyfruj do:</string>
   <string name="label_delete_after_encryption">Usuń plik po zaszyfrowaniu</string>
@@ -135,6 +128,7 @@
   <string name="label_name">Imię</string>
   <string name="label_comment">Komentarz</string>
   <string name="label_email">Adres email</string>
+  <string name="label_send_key">Synchronizuj z chmurą</string>
   <string name="label_fingerprint">Odcisk</string>
   <string name="expiry_date_dialog_title">Ustaw datę wygaśnięcia</string>
   <string name="label_first_keyserver_is_used">(Pierwszy serwer kluczy jest preferowany)</string>
@@ -194,7 +188,8 @@
   <string name="passphrase_must_not_be_empty">Podaj hasło.</string>
   <string name="passphrase_for_symmetric_encryption">Szyfrowanie symetryczne.</string>
   <string name="passphrase_for">Podaj hasło dla \'%s\'</string>
-  <string name="yubikey_pin_for">Wpisz PIN, aby otworzyć Yubikey dla \'%s\'</string>
+  <string name="pin_for">Wpisz PIN dla \'%s\'</string>
+  <string name="nfc_text">Trzymaj YubiKey z tyłu Twojego urządzenia.</string>
   <string name="file_delete_confirmation">Czy jesteś pewny, że chcesz usunąć\n%s?</string>
   <string name="file_delete_successful">Usunięto pomyślnie.</string>
   <string name="no_file_selected">Najpierw wskaż plik.</string>
@@ -263,6 +258,7 @@
   <string name="decrypt_result_not_encrypted">Nie szyfrowane</string>
   <string name="decrypt_result_action_show">Pokaż</string>
   <string name="decrypt_result_action_Lookup">Sprawdź</string>
+  <string name="decrypt_invalid_button">Rozumiem ryzko, pokaż!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Mój klucz:</string>
   <!--progress dialogs, usually ending in '…'-->
@@ -356,9 +352,7 @@
   <string name="import_qr_code_wrong">Kod QR zniekształcony! Spróbuj jeszcze raz!</string>
   <string name="import_qr_code_too_short_fingerprint">Odcisk klucza jest za krótki (&lt; 16 znaków)</string>
   <string name="import_qr_code_button">Skanuj kod QR</string>
-  <string name="import_qr_code_text">Umieść kamerę przed kodem QR!</string>
   <!--Generic result toast-->
-  <string name="view_log">Pokaż logi</string>
   <string name="with_warnings">, z ostrzeżeniami</string>
   <string name="with_cancelled">, aż anulowano</string>
   <!--Import result toast-->
@@ -455,7 +449,6 @@
   <string name="api_settings_delete_account">Usuń konto</string>
   <string name="api_settings_package_name">Nazwa paczki</string>
   <string name="api_settings_package_signature">Skrót SHA-256 podpisu paczki</string>
-  <string name="api_settings_accounts">Konta</string>
   <string name="api_settings_settings">Ustawienia</string>
   <string name="api_settings_key">Klucz konta:</string>
   <string name="api_settings_accounts_empty">Brak kont połączonych z tą aplikacją.</string>
@@ -481,6 +474,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
     <item quantity="few">%d kluczy wybranych.</item>
     <item quantity="other">%d kluczy wybranych.</item>
   </plurals>
+  <string name="key_list_empty_text1">Nie znaleziono kluczy!</string>
   <string name="key_list_filter_show_all">Pokaż wszystkie klucze</string>
   <string name="key_list_filter_show_certified">Pokaż tylko certyfikowane klucze</string>
   <!--Key view-->
@@ -543,7 +537,6 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="view_key_expired">Ten klucz stracił swoją ważność!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klucze</string>
-  <string name="nav_encrypt_decrypt">"Zaszyfruj/Odszyfruj"</string>
   <string name="nav_apps">Aplikacje</string>
   <string name="drawer_open">Otwórz panel nawigacji</string>
   <string name="drawer_close">Zamknij panel nawigacji</string>
@@ -579,10 +572,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
   <string name="msg_cr">Generowanie nowego master klucza</string>
-  <string name="msg_cr_error_internal_pgp">Wewnętrzny błąd PGP!</string>
   <!--modifySecretKeyRing-->
-  <string name="msg_mf_error_pgp">Wewnętrzny błąd PGP!</string>
-  <string name="msg_mf_passphrase">Zmienianie hasła dla pęku kluczy...</string>
   <string name="msg_mf_error_past_expiry">Data ważności nie może być przeszła!</string>
   <string name="msg_mf_subkey_revoke">Unieważnianie pod-klucza %s</string>
   <string name="msg_mf_uid_error_empty">ID użytkownika nie może być pusty!</string>
@@ -591,6 +581,8 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="msg_con_save_secret">Zapisywanie prywatnych pęków kluczy</string>
   <string name="msg_con_save_public">Zapisywanie publicznych pęków kluczy</string>
   <string name="msg_con_db_clear">Czyszczenie bazy danych</string>
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Nie znaleziono klucza!</string>
   <!--Messages for DecryptVerify operation-->
@@ -608,17 +600,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="msg_dc_pending_passphrase">Hasło wymagane, wymagana reakcja użytkownika...</string>
   <string name="msg_dc">Rozpoczynanie operacji odszyfrowania...</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_encrypting">Szyfrowanie danych</string>
-  <string name="msg_se_error_bad_passphrase">Nieprawidłowe hasło!</string>
-  <string name="msg_se_error_no_passphrase">Nie wprowadzono hasła!</string>
-  <string name="msg_se_key_ok">Szyfrowanie dla klucza: %s</string>
-  <string name="msg_se_key_unknown">Brakujący klucz do szyfrowania: %s</string>
-  <string name="msg_se_key_warn">Zły klucz do szyfrowania: %s</string>
-  <string name="msg_se_ok">Operacja Podpisania/Szyfrowania zakończona pomyślnie!</string>
-  <string name="msg_se_pending_nfc">Token NFC jest wymagany, wymagana reakcja użytkownika...</string>
-  <string name="msg_se_pending_passphrase">Hasło wymagane, wymagana reakcja użytkownika...</string>
-  <string name="msg_se_signing">Podpisywanie danych (bez podpisu)</string>
-  <string name="msg_se_sigcrypting">Szyfrowanie danych z podpisem</string>
+  <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_saving">Zapisywanie pęków kluczy</string>
   <string name="msg_crt_unlock">Odblokowanie master klucza</string>
   <string name="msg_crt_success">Pomyślnie certyfikowane tożsamości</string>
@@ -667,12 +649,17 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="passp_cache_notif_keys">Zapamiętane hasła:</string>
   <string name="passp_cache_notif_clear">Wyczyść pamięć cache</string>
   <string name="passp_cache_notif_pwd">Hasło</string>
+  <!--First Time-->
+  <string name="first_time_text1">Weź prywatność w swoje ręce używając OpenKeychain!</string>
+  <string name="first_time_create_key">Utwórz mój klucz</string>
+  <string name="first_time_skip">Pomiń ustawienia</string>
   <!--unsorted-->
   <string name="section_certifier_id">Certyfikujący</string>
   <string name="section_cert">Szczegóły certyfikatu</string>
   <string name="label_user_id">Tożsamość</string>
   <string name="unknown_uid">&lt;nieznany&gt;</string>
   <string name="empty_certs">Nie ma certyfikatów dla tego klucza</string>
+  <string name="section_uids_to_certify">Tożsamości dla</string>
   <string name="label_revocation">Powód odwołania</string>
   <string name="label_verify_status">Stan weryfikacji</string>
   <string name="label_cert_type">Typ</string>
@@ -690,9 +677,8 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="swipe_to_update">Pociągnij w dół, aby aktualizować z serwera kluczy</string>
   <string name="error_no_file_selected">Wybierz przynajmniej jeden plik, aby szyfrować!</string>
   <string name="key_colon">Klucz:</string>
-  <string name="btn_start_exchange">Rozpocznij wymianę</string>
-  <!--First Time-->
-  <string name="first_time_text1">Weź prywatność w swoje ręce używając OpenKeychain!</string>
-  <string name="first_time_create_key">Utwórz mój klucz</string>
-  <string name="first_time_skip">Pomiń ustawienia</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-pt/strings.xml b/OpenKeychain/src/main/res/values-pt/strings.xml
index 460c5462e..ef0a0ce94 100644
--- a/OpenKeychain/src/main/res/values-pt/strings.xml
+++ b/OpenKeychain/src/main/res/values-pt/strings.xml
@@ -50,10 +50,17 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-  <!--unsorted-->
   <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-ro/strings.xml b/OpenKeychain/src/main/res/values-ro/strings.xml
new file mode 100644
index 000000000..ef0a0ce94
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-ro/strings.xml
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--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-->
+  <!--section-->
+  <!--button-->
+  <!--menu-->
+  <!--label-->
+  <!--choice-->
+  <!--key flags-->
+  <!--sentences-->
+  <!--errors
+         no punctuation, all lowercase,
+         they will be put after "error_message", e.g. "Error: file not found"-->
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
+  <!--Add keys-->
+  <!--progress dialogs, usually ending in '…'-->
+  <!--action strings-->
+  <!--key bit length selections-->
+  <!--elliptic curve names-->
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">"Brainpool P-256"</string>
+    <string name="key_curve_bp_p384">"Brainpool P-384"</string>
+    <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
+  <!--compression-->
+  <!--Help-->
+  <!--Import-->
+  <!--Generic result toast-->
+  <!--Import result toast-->
+  <!--Delete result toast-->
+  <!--Certify result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <!--Share-->
+  <!--Key list-->
+  <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
+  <!--Navigation Drawer-->
+  <!--hints-->
+  <!--certs-->
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <!--Import Public log entries-->
+  <!--Import Secret log entries-->
+  <!--Keyring Canonicalization log entries-->
+  <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
+  <!--modifySecretKeyRing-->
+  <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <!--PassphraseCache-->
+  <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+</resources>
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 3e9f3a234..ec862020a 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -5,13 +5,16 @@
   <!--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_unlock">Разблокировать ключ</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_key_server_preference">Серверы ключей</string>
   <string name="title_change_passphrase">Изменить пароль</string>
   <string name="title_share_fingerprint_with">Отправить отпечаток...</string>
   <string name="title_share_key">Отправить ключ...</string>
@@ -20,6 +23,7 @@
   <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>
@@ -29,17 +33,30 @@
   <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>
   <!--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_certify">Удостоверить</string>
   <string name="section_actions">Действия</string>
+  <string name="section_share_key">Ключ</string>
   <string name="section_certification_key">Ваш ключ для сертификации</string>
+  <string name="section_upload_key">Синхронизировать ключ</string>
   <string name="section_key_server">Сервер ключей</string>
   <string name="section_fingerprint">Отпечаток ключа</string>
   <string name="section_key_to_certify">Сертифицируемый ключ</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>
   <!--button-->
   <string name="btn_decrypt_verify_file">Расшифровать, проверить и сохранить файл</string>
   <string name="btn_decrypt_verify_message">Расшифровать и проверить сообщение</string>
@@ -58,18 +75,26 @@
   <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>
   <!--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_create_key">Создать свой ключ</string>
+  <string name="menu_import_existing_key">Импорт из файла</string>
   <string name="menu_search">Поиск</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-->
@@ -79,11 +104,27 @@
   <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_algorithm">Алгоритм</string>
   <string name="label_ascii_armor">ASCII формат</string>
+  <string name="label_file_ascii_armor">Использовать ASCII формат</string>
   <string name="label_write_version_header">Добавить комментарий об использовании OpenKeychain</string>
   <string name="label_write_version_header_summary">Дописывать \'OpenKeychain v2.x\' в OpenPGP подписи, шифры, и экспортируемые ключи</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) для доступа к YubiKeys через NFC</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_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>
   <string name="label_creation">Создан</string>
@@ -95,8 +136,11 @@
   <string name="label_name">Имя</string>
   <string name="label_comment">Комментарий</string>
   <string name="label_email">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="user_id_no_name">&lt;нет имени&gt;</string>
   <string name="none">&lt;нет&gt;</string>
   <string name="no_key">&lt;нет ключа&gt;</string>
@@ -153,6 +197,12 @@
   <string name="passphrase_for_symmetric_encryption">Симметричное шифрование.</string>
   <string name="passphrase_for">Введите пароль для
 \'%s\'</string>
+  <string name="pin_for">Введите PIN для
+\'%s\'</string>
+  <string name="yubikey_pin_for">Введите PIN для доступа к YubiKey для
+\'%s\'</string>
+  <string name="nfc_text">Держите YubiKey возле задней части вашего устройства.</string>
+  <string name="file_delete_confirmation">Вы уверены, что хотите удалить\n%s?</string>
   <string name="file_delete_successful">Удалено.</string>
   <string name="no_file_selected">Сначала выберите файл.</string>
   <string name="encrypt_sign_successful">Успешно подписано и/или зашифровано.</string>
@@ -160,7 +210,14 @@
   <string name="enter_passphrase_twice">Дважды введите пароль.</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="key_deletion_confirmation_multi">Вы уверены, что хотите удалить ВСЕ выбранные Публичные ключи?\nЭто действие нельзя отменить!</string>
+  <string name="secret_key_deletion_confirmation">Вы уверены, что хотите удалить СЕКРЕТНЫЙ ключ \'%s\'?\nЭто действие нельзя отменить!</string>
+  <string name="public_key_deletetion_confirmation">Вы правда хотите удалить публичный ключ \'%s\'?\nЭто действие нельзя отменить!</string>
   <string name="also_export_secret_keys">Экспортировать секретные ключи</string>
+  <string name="reinstall_openkeychain">Вы столкнулись с багом Андроид. Пожалуйста, переустановите OpenKeychain чтобы связать ваши контакты и ключи.  </string>
   <string name="key_exported">Успешный экспорт 1 ключа.</string>
   <string name="keys_exported">Экспортировано %d ключей.</string>
   <string name="no_keys_exported">Ключи не были экспортированы.</string>
@@ -172,6 +229,7 @@
   <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"-->
@@ -185,6 +243,7 @@
   <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>
@@ -192,13 +251,28 @@
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
   <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string>
   <string name="error_nothing_import">Ключи не найдены!</string>
+  <string name="error_contacts_key_id_missing">Ошибка извлечения идентификатора ключа из контактов!</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</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_exporting">экспорт...</string>
@@ -213,10 +287,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">
@@ -241,8 +317,11 @@
   <string name="progress_verifying_integrity">проверка целостности...</string>
   <string name="progress_deleting_securely">безопасное удаление \'%s\'...</string>
   <string name="progress_deleting">удаление ключей...</string>
+  <string name="progress_con_saving">объединение: сохранение в кэш...</string>
+  <string name="progress_con_reimport">объединение: реимпорт...</string>
   <!--action strings-->
   <string name="hint_keyserver_search_hint">Имя/Email/ID ключа…</string>
+  <string name="hint_cloud_search_hint">Имя/Email/Проверка/Ключ...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -277,13 +356,18 @@
   <string name="help_about_version">Версия:</string>
   <!--Import-->
   <string name="import_tab_keyserver">Сервер ключей</string>
+  <string name="import_tab_cloud">Поиск в облаке</string>
   <string name="import_tab_direct">Файл/Буфер</string>
   <string name="import_tab_qr_code">QR код/NFC</string>
   <string name="import_import">Импорт выбранных ключей</string>
   <string name="import_qr_code_wrong">Некорректный QR код. Попробуйте снова!</string>
   <string name="import_qr_code_too_short_fingerprint">Отпечаток слишком коротнкий (&lt; 16 символов)</string>
+  <string name="import_qr_code_button">Сканировать QR код...</string>
+  <string name="import_qr_code_text">Расположите вашу камеру над QR кодом!</string>
   <!--Generic result toast-->
-  <string name="view_log">Смотреть журнал</string>
+  <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="one">Ключ успешно импортирован</item>
@@ -291,7 +375,10 @@
     <item quantity="other">Успешно добавлено %1$d ключей</item>
   </plurals>
   <string name="import_error_nothing">Нет данных для импорта.</string>
+  <string name="import_error_nothing_cancelled">Импорт отменен.</string>
   <!--Delete result toast-->
+  <string name="delete_nothing">Нет данных для удаления!</string>
+  <string name="delete_cancelled">Удаление отменено.</string>
   <!--Certify result toast-->
   <!--Intent labels-->
   <string name="intent_decrypt_file">OpenKeychain: Расшифровать файл</string>
@@ -299,6 +386,7 @@
   <string name="intent_send_encrypt">OpenKeychain: Зашифровать</string>
   <string name="intent_send_decrypt">OpenKeychain: Расшифровать</string>
   <!--Remote API-->
+  <string name="api_no_apps">Нет связанных приложений!\n\nСписок приложений, поддерживающих интеграцию, доступен в разделе \'Помощь\'!</string>
   <string name="api_settings_show_info">Показать подробную информацию</string>
   <string name="api_settings_hide_info">Скрыть  подробную информацию</string>
   <string name="api_settings_show_advanced">Показать расширенные настройки</string>
@@ -307,18 +395,29 @@
   <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_accounts">Аккаунты</string>
+  <string name="api_settings_accounts">Аккаунты (устаревший API)</string>
+  <string name="api_settings_advanced">Подробная информация</string>
+  <string name="api_settings_allowed_keys">Разрешённые ключи</string>
+  <string name="api_settings_settings">Настройки</string>
+  <string name="api_settings_key">Ключ аккаунта:</string>
   <string name="api_settings_accounts_empty">Нет аккаунтов, связанных с этим приложением.</string>
+  <string name="api_create_account_text">Отсутствует ключ настроенный для данного аккаунта. Выберите имеющийся ключ или создайте новый.\nПриложения могут расшифровывать/подписывать только при помощи выбранных здесь ключей!</string>
+  <string name="api_update_account_text">Ключ, сохранённый для данного аккаунта, был удалён. Пожалуйста, выберите другой!\nПриложения могут расшифровывать/подписывать только при помощи выбранных здесь ключей!</string>
+  <string name="api_register_text">Отображаемое приложение собирается зашифровать/расшифровать сообщения и подписать их Вашим именем.\nРазрешить доступ?\n\nВНИМАНИЕ: Если вы не знаете почему возник этот запрос, откажите в доступе! Позже вы можете отозвать право доступа в разделе \"Программы\"</string>
   <string name="api_register_allow">Разрешить доступ</string>
   <string name="api_register_disallow">Запретить доступ</string>
   <string name="api_register_error_select_key">Пожалуйста, выберите ключ!</string>
+  <string name="api_select_pub_keys_missing_text">Для данных лиц ключи не найдены:</string>
+  <string name="api_select_pub_keys_dublicates_text">Для данных лиц имеется более одного ключа: </string>
   <string name="api_select_pub_keys_text">Пожалуйста, проверьте получателей!</string>
+  <string name="api_select_pub_keys_text_no_user_ids">Пожалуйста, выберите получателей!</string>
   <string name="api_error_wrong_signature">Проверка подписи пакета не удалась! Если  вы установили программу из другого источника, отзовите для неё доступ к этой программе или обновите право доступа.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Отправить как QR код</string>
@@ -329,15 +428,28 @@
     <item quantity="few">%d ключей выбрано.</item>
     <item quantity="other">%d ключей выбрано.</item>
   </plurals>
+  <string name="key_list_empty_text1">Ключи не найдены!</string>
+  <string name="key_list_filter_show_all">Показать все ключи</string>
+  <string name="key_list_filter_show_certified">Показать только сертифицированные ключи</string>
   <!--Key view-->
   <string name="key_view_action_edit">Изменить ключ</string>
+  <string name="key_view_action_encrypt">Зашифровать текст</string>
+  <string name="key_view_action_encrypt_files">файлы</string>
   <string name="key_view_action_certify">Сертифицировать</string>
+  <string name="key_view_action_update">Обновить с сервера ключей</string>
   <string name="key_view_action_share_with">Отправить...</string>
+  <string name="key_view_action_share_nfc">Отправить через NFC</string>
+  <string name="key_view_action_upload">Загрузить на сервер ключей</string>
   <string name="key_view_tab_main">Основные данные</string>
   <string name="key_view_tab_share">Отправить...</string>
   <string name="key_view_tab_keys">Доп. ключи</string>
   <string name="key_view_tab_certs">Сертификация</string>
   <string name="user_id_info_revoked_title">Аннулировано</string>
+  <string name="user_id_info_revoked_text">Этот идентификатор отозван владельцем ключа. Он больше недействителен.</string>
+  <string name="user_id_info_certified_title">Сертифицировано</string>
+  <string name="user_id_info_certified_text">Этот идентификатор был сертифицирован Вами</string>
+  <string name="user_id_info_uncertified_title">Не сертифицирован</string>
+  <string name="user_id_info_uncertified_text">Этот идентификатор не был заверен. Нет гарантии, что он принадлежит этому человеку.</string>
   <string name="user_id_info_invalid_title">Недействительно</string>
   <string name="user_id_info_invalid_text">Что-то не так с идентификатором!</string>
   <!--Edit key-->
@@ -345,73 +457,238 @@
   <string name="edit_key_action_add_identity">Добавить идентификатор</string>
   <string name="edit_key_action_add_subkey">Добавить доп. ключ</string>
   <string name="edit_key_edit_user_id_title">Выберите действие!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Изменить на основной идентификатор</item>
+    <item>Отозвать идентификатор</item>
+  </string-array>
+  <string-array name="edit_key_edit_user_id_revert_revocation">
+    <item>Отменить отзыв</item>
+  </string-array>
+  <string name="edit_key_edit_user_id_revoked">Этот идентификатор был отозван. Это не может быть отменено.</string>
+  <string name="edit_key_edit_subkey_title">Выберите действие!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Изменить срок годности</item>
+    <item>Отозвать доп. ключ</item>
+    <item>Отделить доп. ключ</item>
+  </string-array>
+  <string name="edit_key_new_subkey">новый доп. ключ</string>
+  <string name="edit_key_select_flag">Пожалуйста, выберите хотя бы один флаг!</string>
+  <string name="edit_key_error_add_identity">Добавьте хотя бы один идентификатор!</string>
+  <string name="edit_key_error_add_subkey">Добавьте хотя бы один доп. ключ!</string>
   <!--Create key-->
   <string name="create_key_upload">Загрузить ключ на сервер</string>
   <string name="create_key_empty">Это обязательне поле</string>
   <string name="create_key_passphrases_not_equal">Пароли не совпадают.</string>
   <string name="create_key_final_text">Вы указали следующие данные:</string>
+  <string name="create_key_final_robot_text">Создание ключа займет некоторое время, можете пока выпить чашечку кофе...</string>
+  <string name="create_key_rsa">(3 доп. ключа, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(произвольная конфигурация ключа)</string>
   <string name="create_key_text">Укажите полное имя, адрес почты и придумайте надежный пароль.</string>
   <string name="create_key_hint_full_name">Полное имя, напр. Иван Хлестаков</string>
+  <string name="create_key_edit">Изменить конфигурацию ключа</string>
   <!--View key-->
   <string name="view_key_revoked">Этот ключ был аннулирован!</string>
   <string name="view_key_expired">Срок годности ключа истёк!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ключи</string>
+  <string name="nav_encrypt_decrypt">Зашифровать/Расшифровать</string>
   <string name="nav_apps">Приложения</string>
   <string name="drawer_open">Открыть панель навигации</string>
   <string name="drawer_close">Закрыть панель навигации</string>
   <string name="my_keys">Мои ключи</string>
   <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Напишите текст</string>
   <!--certs-->
   <string name="cert_default">по умолчанию</string>
   <string name="cert_none">нет</string>
+  <string name="cert_casual">случайный</string>
+  <string name="cert_positive">положительный</string>
   <string name="cert_revoke">отозван</string>
   <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">сбой!</string>
   <string name="cert_verify_error">ошибка!</string>
-  <string name="cert_verify_unavailable">ключ не доступен</string>
+  <string name="cert_verify_unavailable">ключ недоступен</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Внутренняя ошибка!</string>
+  <string name="msg_cancelled">Действие отменено.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">Выполнение пакетной вставки.</string>
   <string name="msg_ip_bad_type_secret">Попытка импорта секретной связки как публичной. Это ошибка, пожалуйста, сообщите об этом.</string>
   <string name="msg_ip_delete_old_fail">Старый ключ не удален (создать новый?)</string>
   <string name="msg_ip_delete_old_ok">Старый ключ удален из базы</string>
-  <string name="msg_ip_encode_fail">Действие прервано из-за ошибки кодировки</string>
+  <string name="msg_ip_encode_fail">Действие прервано из-за ошибки кодирования</string>
+  <string name="msg_ip_error_io_exc">Действие прервано из-за ошибки ввода/вывода</string>
+  <string name="msg_ip_error_op_exc">Действие прервано из-за ошибки базы</string>
+  <string name="msg_ip_error_remote_ex">Действие прервано из-за внутренней ошибки</string>
   <string name="msg_ip">Импорт связки публичных ключей %s</string>
+  <string name="msg_ip_insert_keyring">Кодирование связки ключей</string>
   <string name="msg_ip_insert_keys">Разбор ключей</string>
   <string name="msg_ip_prepare">Подготовка операций</string>
   <string name="msg_ip_master">Подготовка основного ключа %s</string>
+  <string name="msg_ip_master_expired">Срок годности связки ключей истек %s</string>
+  <string name="msg_ip_master_expires">Срок годности связки ключей истекает %s</string>
+  <string name="msg_ip_master_flags_unspecified">Основные флаги: не определены (подразумеваются все)</string>
+  <string name="msg_ip_master_flags_cesa">Основные флаги: сертифицировать, зашифровать, подписать, удостоверить</string>
+  <string name="msg_ip_master_flags_cesx">Основные флаги: сертифицировать, зашифровать, подписать</string>
+  <string name="msg_ip_master_flags_cexa">Основные флаги: сертифицировать, зашифровать,  удостоверить</string>
+  <string name="msg_ip_master_flags_cexx">Основные флаги: сертифицировать, зашифровать</string>
+  <string name="msg_ip_master_flags_cxsa">Основные флаги: сертифицировать, подписать, удостоверить</string>
+  <string name="msg_ip_master_flags_cxsx">Основные флаги: сертифицировать, подписать</string>
+  <string name="msg_ip_master_flags_cxxa">Основные флаги: сертифицировать, удостоверить</string>
+  <string name="msg_ip_master_flags_cxxx">Основные флаги: сертифицировать</string>
+  <string name="msg_ip_master_flags_xesa">Основные флаги: зашифровать, подписать, удостоверить</string>
+  <string name="msg_ip_master_flags_xesx">Основные флаги: зашифровать, подписать</string>
+  <string name="msg_ip_master_flags_xexa">Основные флаги: зашифровать, удостоверить</string>
+  <string name="msg_ip_master_flags_xexx">Основные флаги: зашифровать</string>
+  <string name="msg_ip_master_flags_xxsa">Основные флаги: подписать, удостоверить</string>
+  <string name="msg_ip_master_flags_xxsx">Основные флаги: подписать</string>
+  <string name="msg_ip_master_flags_xxxa">Основные флаги: удостоверить</string>
+  <string name="msg_ip_master_flags_xxxx">Основные флаги: нет</string>
+  <string name="msg_ip_merge_public">Объединение импортированных данных с существующей связкой публичных ключей</string>
+  <string name="msg_ip_merge_secret">Объединение импортированных данных с существующей связкой публичных ключей</string>
+  <string name="msg_ip_subkey">Обработка доп. ключа %s</string>
+  <string name="msg_ip_subkey_expired">Срок годности доп. ключа истек %s</string>
+  <string name="msg_ip_subkey_expires">Срок годности доп. ключа истекает %s</string>
+  <string name="msg_ip_subkey_flags_unspecified">Флаги доп. ключа: не определены (подразумеваются все)</string>
+  <string name="msg_ip_subkey_flags_cesa">Флаги доп. ключа: сертифицировать, зашифровать, подписать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_cesx">Флаги доп. ключа:  сертифицировать, зашифровать, подписать</string>
+  <string name="msg_ip_subkey_flags_cexa">Флаги доп. ключа: сертифицировать, зашифровать,  удостоверить</string>
+  <string name="msg_ip_subkey_flags_cexx">Флаги доп. ключа: сертифицировать, зашифровать</string>
+  <string name="msg_ip_subkey_flags_cxsa">Флаги доп. ключа: сертифицировать, подписать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_cxsx">Флаги доп. ключа: сертифицировать, подписать</string>
+  <string name="msg_ip_subkey_flags_cxxa">Флаги доп. ключа: сертифицировать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_cxxx">Флаги доп. ключа: сертифицировать</string>
+  <string name="msg_ip_subkey_flags_xesa">Флаги доп. ключа: зашифровать, подписать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_xesx">Флаги доп. ключа: зашифровать, подписать</string>
+  <string name="msg_ip_subkey_flags_xexa">Флаги доп. ключа: зашифровать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_xexx">Флаги доп. ключа: зашифровать</string>
+  <string name="msg_ip_subkey_flags_xxsa">Флаги доп. ключа: подписать, удостоверить</string>
+  <string name="msg_ip_subkey_flags_xxsx">Флаги доп. ключа: подписать</string>
+  <string name="msg_ip_subkey_flags_xxxa">Флаги доп. ключа: удостоверить</string>
+  <string name="msg_ip_subkey_flags_xxxx">Флаги доп. ключа: нет</string>
   <string name="msg_ip_success">Успешно внесена связка публичных ключей</string>
+  <string name="msg_ip_success_identical">Связка ключей не содержит новых данных, нечего делать</string>
   <string name="msg_ip_reinsert_secret">Повторное внесение секретного ключа</string>
   <string name="msg_ip_uid_cert_bad">Плохой сертификат!</string>
   <string name="msg_ip_uid_cert_error">Ошибка обработки сертификата!</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Уже есть неотзываемый сертификат, пропускаем.</string>
+  <string name="msg_ip_uid_cert_old">Сертификат старее, чем предыдущий, пропускаем.</string>
+  <string name="msg_ip_uid_cert_new">Сертификат более новый, заменяем предыдущий.</string>
+  <string name="msg_ip_uid_cert_good">Найден хороший сертификат %1$s</string>
+  <string name="msg_ip_uid_cert_good_revoke">Найдено аннулирование хорошего сертификата %1$s</string>
+  <string name="msg_ip_uid_classifying_zero">Сортировка пользовательских ID (доверенные ключи недоступны)</string>
+  <string name="msg_ip_uid_reorder">Переупорядочение пользовательских ID</string>
+  <string name="msg_ip_uid_processing">Обработка id %s</string>
+  <string name="msg_ip_uid_revoked">id аннулирован</string>
+  <string name="msg_ip_uat_processing_image">Обработка пользовательского атрибута типа изображения</string>
+  <string name="msg_ip_uat_processing_unknown">Обработка пользовательского атрибута неизвестного типа</string>
+  <string name="msg_ip_uat_cert_bad">Плохой сертификат!</string>
+  <string name="msg_ip_uat_cert_error">Ошибка обработки сертификата!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Уже есть неотзываемый сертификат, пропускаем.</string>
+  <string name="msg_ip_uat_cert_old">Сертификат старее, чем предыдущий, пропускаем.</string>
+  <string name="msg_ip_uat_cert_new">Сертификат более новый, заменяем предыдущий.</string>
+  <string name="msg_ip_uat_cert_good">Найден хороший сертификат %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Найдено аннулирование хорошего сертификата %1$s</string>
+  <string name="msg_ip_uat_classifying">Сортировка атрибутов пользователя</string>
+  <string name="msg_ip_uat_revoked">Атрибут пользователя аннулирован</string>
   <string name="msg_is_bad_type_public">Попытка импорта публичной связки как секретной. Это ошибка, пожалуйста, сообщите об этом.</string>
+  <string name="msg_is_bad_type_uncanon">Попытка импорта связки без нормализации. Это ошибка, пожалуйста, сообщите об этом.</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Импорт секретного ключа %s</string>
   <string name="msg_is_db_exception">Ошибка базы данных!</string>
-  <string name="msg_is_importing_subkeys">Обработка секретных ключей</string>
+  <string name="msg_is_importing_subkeys">Обработка секретных доп. ключей</string>
+  <string name="msg_is_error_io_exc">Ошибка кодирования ключа</string>
+  <string name="msg_is_merge_public">Объединение импортированных данных с существующей связкой публичных ключей</string>
+  <string name="msg_is_merge_secret">Объединение импортированных данных с существующей связкой публичных ключей</string>
+  <string name="msg_is_merge_special">Объединение само-сертифицированных данных из публичных ключей</string>
+  <string name="msg_is_pubring_generate">Формирование публичной связки из секретной связки</string>
+  <string name="msg_is_subkey_nonexistent">Доп. ключ %s недоступен в секретном ключе</string>
+  <string name="msg_is_subkey_ok">Секретный доп. ключ %s отмечен как доступный</string>
+  <string name="msg_is_subkey_empty">Секретный доп. ключ %s отмечен как доступный, с пустым паролем</string>
+  <string name="msg_is_subkey_pin">Секретный доп. ключ %s отмечен как доступный, с PIN</string>
+  <string name="msg_is_subkey_stripped">Секретный доп. ключ %s отмечен как отделённый</string>
+  <string name="msg_is_subkey_divert">Секретный доп. ключ %s отмечен как \'переключенный на смарт-карту/NFC\'</string>
+  <string name="msg_is_success_identical">Связка ключей не содержит новых данных, нечего делать</string>
   <string name="msg_is_success">Успешно добавлена связка секретных ключей</string>
   <!--Keyring Canonicalization log entries-->
+  <string name="msg_kc_public">Нормализация публичной связки %s</string>
+  <string name="msg_kc_secret">Нормализация секретной связки %s</string>
+  <string name="msg_kc_error_v3">Это ключ OpenPGP версии 3, которая устарела и больше не поддерживается!</string>
+  <string name="msg_kc_error_no_uid">Связка не имеет допустимых ID!</string>
+  <string name="msg_kc_error_master_algo">Основной ключ использует неизвестный алгоритм (%s)!</string>
+  <string name="msg_kc_error_dup_key">Доп. ключ %s найден дважды в связке. Связка некорректна, не импортируется!</string>
   <string name="msg_kc_master">Подготовка основного ключа</string>
+  <string name="msg_kc_master_bad_type">Удаление сертификата основного ключа неизвестного типа (%s)</string>
+  <string name="msg_kc_master_bad_local">Удаление сертификата основного ключа с \"локальным\" флагом</string>
+  <string name="msg_kc_master_bad_err">Удаление плохого сертификата основного ключа</string>
+  <string name="msg_kc_master_bad_time">Удаление сертификата аннулирования ключа с отметкой времени, находящейся в будущем</string>
+  <string name="msg_kc_master_bad_type_uid">Удаление сертификата ID в некорректном положении</string>
+  <string name="msg_kc_master_bad">Удаление плохого сертификата основного ключа</string>
+  <string name="msg_kc_master_local">Удаление сертификата основного ключа с \"локальным\" флагом</string>
+  <string name="msg_kc_revoke_dup">Удаление лишнего сертификата аннулирования ключа</string>
+  <string name="msg_kc_notation_dup">Удаление лишнего сертификата обозначения</string>
+  <string name="msg_kc_notation_empty">Удаление пустого сертификата обозначения</string>
+  <string name="msg_kc_sub">Обработка доп. ключа %s</string>
+  <string name="msg_kc_sub_bad">Удаление недопустимого сертификата связывания доп. ключа</string>
+  <string name="msg_kc_sub_bad_err">Удаление плохого сертификата связывания доп. ключа</string>
+  <string name="msg_kc_sub_bad_local">Удаление сертификата связывания доп. ключа с \"локальным\" флагом</string>
+  <string name="msg_kc_sub_bad_keyid">Несоответствие id издателя связывания доп. ключа</string>
+  <string name="msg_kc_sub_bad_time">Удаление сертификата связывания доп. ключа с отметкой времени, находящейся в будущем</string>
+  <string name="msg_kc_sub_bad_type">Неизвестный тип сертификата доп. ключа: %s</string>
+  <string name="msg_kc_sub_dup">Удаление лишнего сертификата связывания доп. ключа</string>
+  <string name="msg_kc_sub_primary_bad">Удаление сертификата связывания доп. ключа вследствие недопустимого основного сертификата связывания</string>
+  <string name="msg_kc_sub_primary_bad_err">Удаление сертификата связывания доп. ключа вследствие плохого основного сертификата связывания</string>
+  <string name="msg_kc_sub_primary_none">Удаление сертификата связывания доп. ключа вследствие отсутствующего основного сертификата связывания</string>
+  <string name="msg_kc_sub_no_cert">Нет допустимого сертификата для %s, удаление из связки</string>
+  <string name="msg_kc_sub_revoke_bad_err">Удаление плохого сертификата аннулирования доп. ключа</string>
+  <string name="msg_kc_sub_revoke_bad">Удаление плохого сертификата аннулирования доп. ключа</string>
+  <string name="msg_kc_sub_revoke_dup">Удаление лишнего сертификата аннулирования доп. ключа</string>
+  <string name="msg_kc_sub_unknown_algo">Доп. ключ использует неизвестный алгоритм, не импортируется...</string>
+  <string name="msg_kc_sub_algo_bad_encrpyt">Доп. ключ имеет флаг использования шифрования, но алгоритм не подходит для шифрования.</string>
+  <string name="msg_kc_sub_algo_bad_sign">Доп. ключ имеет флаг использования подписи, но алгоритм не подходит для подписи.</string>
+  <string name="msg_kc_success">Связка нормализована успешно, нет изменений</string>
+  <string name="msg_kc_success_bad_and_red">Связка нормализована успешно, удалено %1$s ошибочных и %2$s лишних сертификатов</string>
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
+  <string name="msg_cr">Создание нового основного ключа</string>
+  <string name="msg_cr_error_keysize_512">Размер ключа должен быть больше или равен 512!</string>
+  <string name="msg_cr_error_internal_pgp">Внутренняя ошибка OpenPGP!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mf_error_encode">Ошибка кодирования!</string>
   <string name="msg_mf_error_integrity">Внутренняя ошибка, сбой проверки целостности!</string>
+  <string name="msg_mf_error_pgp">Внутренняя ошибка OpenPGP!</string>
   <string name="msg_mf_error_sig">Ошибка подписи!</string>
   <string name="msg_mf_success">Связка успешно изменена</string>
   <string name="msg_mf_unlock_error">Ошибка разблокирования связки!</string>
   <string name="msg_mf_unlock">Разблокирование связки</string>
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <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_unlocking">Разблокировка секретного ключа</string>
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_error_pgp">Внутренняя ошибка OpenPGP!</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_upload_success">Ключ успешно загружен на сервер</string>
+  <string name="msg_export_error_fopen">Ошибка открытия файла!</string>
+  <string name="msg_export_error_db">Ошибка базы данных!</string>
+  <string name="msg_export_error_io">Ошибка ввода/вывода!</string>
+  <string name="msg_del_error_empty">Нет данных для удаления!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
     <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
     <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
   </plurals>
   <!--PassphraseCache-->
+  <!--First Time-->
+  <string name="first_time_text1">Верните вашу приватность с помощью OpenKeychain!</string>
   <!--unsorted-->
   <string name="section_certifier_id">Кем подписан</string>
   <string name="section_cert">Детали сертификации</string>
@@ -423,10 +700,14 @@
   <string name="label_cert_type">Тип</string>
   <string name="error_key_not_found">Ключ не найден!</string>
   <string name="error_key_processing">Ошибка обработки ключа!</string>
+  <string name="key_unavailable">недоступно</string>
   <string name="title_view_cert">Просмотреть детали сертификации</string>
   <string name="unknown_algorithm">неизв.</string>
   <string name="can_sign_not">не для подписания</string>
   <string name="error_no_encrypt_subkey">Нет доп. ключа для шифрования!</string>
   <string name="contact_show_key">Показать ключ (%s)</string>
-  <!--First Time-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 6eeb7bd72..499ff8468 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -9,13 +9,11 @@
   <string name="title_encrypt_text">Šifriraj besedilo</string>
   <string name="title_encrypt_files">Šifriraj datoteko</string>
   <string name="title_decrypt">Dešifriraj</string>
-  <string name="title_unlock">Geslo</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">Nastavitve strežnikov</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>
@@ -253,6 +251,7 @@
   <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_subkeychange">spreminjanje podključev...</string>
   <string name="progress_modify_subkeyrevoke">preklicevanje podključev...</string>
   <string name="progress_modify_subkeyadd">dodajanje podključev...</string>
@@ -323,7 +322,6 @@
   <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>
   <!--Generic result toast-->
-  <string name="view_log">Poglej dnevnik</string>
   <!--Import result toast-->
   <string name="import_error_nothing">Nič za uvoziti.</string>
   <string name="import_error_nothing_cancelled">Uvoz preklican.</string>
@@ -349,7 +347,6 @@
   <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</string>
   <string name="api_settings_settings">Nastavitve</string>
   <string name="api_settings_accounts_empty">S to aplikacijo ni povezan noben račun</string>
   <string name="api_register_allow">Dovoli dostop</string>
@@ -402,9 +399,6 @@
   <string name="view_key_expired">Ta ključ je pretekel!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ključi</string>
-  <string name="nav_encrypt_text">Šifriraj besedilo</string>
-  <string name="nav_encrypt_files">Šifriraj datoteke</string>
-  <string name="nav_decrypt">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>
@@ -447,11 +441,6 @@
   <string name="msg_is_success">Zasebna zbirka ključev uspešno uvožena</string>
   <!--Keyring Canonicalization log entries-->
   <string name="msg_kc_master">Obdelujem glavni ključ...</string>
-  <string name="msg_kc_master_bad_err">Umikam slab certifikat za preklic zbirk ključev</string>
-  <string name="msg_kc_master_bad_local">Umikam certifikat za preklic zbirk ključev z oznako \"lokalno\"</string>
-  <string name="msg_kc_master_bad_time">Umikam certifikat za preklic zbirk ključev s časovno znamko v prihodnosti</string>
-  <string name="msg_kc_master_bad_type">Umikam certifikat glavnega ključa neznanega tipa (%s)</string>
-  <string name="msg_kc_master_bad">Umikam slab certifikat za preklic zbirk ključev</string>
   <string name="msg_kc_revoke_dup">Umikam odvečen certifikat za preklic zbirk ključev</string>
   <string name="msg_kc_sub">Obdelujem podključ %s</string>
   <string name="msg_kc_sub_bad">Umikam neveljaven certifikat za povezovanje podključev</string>
@@ -465,10 +454,13 @@
   <string name="msg_mf_subkey_revoke">Preklic podključa %s</string>
   <!--Consolidate-->
   <string name="msg_con_db_clear">Čiščenje podatkovne baze</string>
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Ključ ni bil najden!</string>
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_warn_not_found">Ključ ni bil najden!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">Del naložene datoteke je veljavnen objekt OpenPGP a ni ključ.</item>
@@ -481,6 +473,11 @@
   <string name="passp_cache_notif_n_keys">OpenKeychain pomni gesla: %d</string>
   <string name="passp_cache_notif_keys">Zapomnjena gesla:</string>
   <string name="passp_cache_notif_pwd">Geslo</string>
+  <!--First Time-->
+  <string name="first_time_text1">Vzemite si svojo zasebnost nazaj v svoje roke z OpenKeychain!</string>
+  <string name="first_time_create_key">Ustvari zasebni ključ</string>
+  <string name="first_time_import_key">Uvozi iz datoteke</string>
+  <string name="first_time_skip">Preskoči nastavitev</string>
   <!--unsorted-->
   <string name="section_certifier_id">Overovitelj</string>
   <string name="section_cert">Podrobnosti potrdil</string>
@@ -502,9 +499,8 @@
   <string name="error_no_encrypt_subkey">Ni nobenega podključa za šifriranje!</string>
   <string name="contact_show_key">Prikaži ključ (%s)</string>
   <string name="key_colon">Ključ:</string>
-  <!--First Time-->
-  <string name="first_time_text1">Vzemite si svojo zasebnost nazaj v svoje roke z OpenKeychain!</string>
-  <string name="first_time_create_key">Ustvari zasebni ključ</string>
-  <string name="first_time_import_key">Uvozi iz datoteke</string>
-  <string name="first_time_skip">Preskoči nastavitev</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index b4955b9eb..b3a15cb7f 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -9,13 +9,13 @@
   <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_unlock">Откључај кључ</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_key_server_preference">Сервери кључева</string>
   <string name="title_change_passphrase">Измени лозинку</string>
   <string name="title_share_fingerprint_with">Подели отисак са…</string>
   <string name="title_share_key">Подели кључ са…</string>
@@ -36,6 +36,7 @@
   <string name="title_create_key">Направи кључ</string>
   <string name="title_exchange_keys">Размена кључева</string>
   <string name="title_advanced_key_info">Напредни подаци о кључу</string>
+  <string name="title_keys">Кључеви</string>
   <!--section-->
   <string name="section_user_ids">Идентитети</string>
   <string name="section_keys">Поткључеви</string>
@@ -55,6 +56,8 @@
   <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>
   <!--button-->
   <string name="btn_decrypt_verify_file">Дешифруј, овери и сачувај фајл</string>
   <string name="btn_decrypt_verify_message">Дешифруј и овери поруку</string>
@@ -74,9 +77,11 @@
   <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_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>
   <!--menu-->
   <string name="menu_preferences">Поставке</string>
   <string name="menu_help">Помоћ</string>
@@ -90,6 +95,7 @@
   <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-->
@@ -108,7 +114,7 @@
   <string name="label_write_version_header_summary">Уписује „OpenKeychain v3.0“ у ОпенПГП потписе, шифровани текст и извезене кључеве</string>
   <string name="label_use_default_yubikey_pin">Користи подразумевани Јубикључ ПИН</string>
   <string name="label_use_num_keypad_for_yubikey_pin">Користи бројчану тастатуру за Јубикључ ПИН</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Користи подразумевани ПИН (123456) за приступ Јуби-кључевима преко НФЦ-а</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Користи подразумевани ПИН (123456) за приступ Јубикључевима преко НФЦ-а</string>
   <string name="label_asymmetric_from">Потписник:</string>
   <string name="label_to">Шифруј за:</string>
   <string name="label_delete_after_encryption">Обриши фајл након шифровања</string>
@@ -191,7 +197,9 @@
   <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“</string>
   <string name="yubikey_pin_for">Унесите ПИН за приступ Јубикључу за „%s“</string>
+  <string name="nfc_text">Држите Јубикључ на полеђини вашег уређаја.</string>
   <string name="file_delete_confirmation">Желите ли заиста да обришете\n%s?</string>
   <string name="file_delete_successful">Брисање је успело.</string>
   <string name="no_file_selected">Најпре изаберите фајл.</string>
@@ -282,6 +290,7 @@
   <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>
@@ -357,8 +366,9 @@
   <string name="import_qr_code_wrong">Бар-код деформисан! Покушајте поново!</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">Усмерите камеру на бар-код!</string>
   <!--Generic result toast-->
-  <string name="view_log">Прикажи дневник</string>
+  <string name="view_log">Детаљи</string>
   <string name="with_warnings">, са упозорењима</string>
   <string name="with_cancelled">, док није отказано</string>
   <!--Import result toast-->
@@ -455,7 +465,9 @@
   <string name="api_settings_delete_account">Обриши налог</string>
   <string name="api_settings_package_name">Име пакета</string>
   <string name="api_settings_package_signature">СХА-256 потписа пакета</string>
-  <string name="api_settings_accounts">Налози</string>
+  <string name="api_settings_accounts">Налози (застарели АПИ)</string>
+  <string name="api_settings_advanced">Напредни подаци</string>
+  <string name="api_settings_allowed_keys">Дозвољени кључеви</string>
   <string name="api_settings_settings">Поставке</string>
   <string name="api_settings_key">Кључ налога:</string>
   <string name="api_settings_accounts_empty">Нема налога придружених овој апликацији.</string>
@@ -542,9 +554,7 @@
   <string name="view_key_expired">Овај кључ је истекао!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Кључеви</string>
-  <string name="nav_encrypt_text">Шифруј текст</string>
-  <string name="nav_encrypt_files">Шифруј фајлове</string>
-  <string name="nav_decrypt">Дешифруј</string>
+  <string name="nav_encrypt_decrypt">Шифруј/дешифруј</string>
   <string name="nav_apps">Апликације</string>
   <string name="drawer_open">Отвори навигациону фиоку</string>
   <string name="drawer_close">Затвори навигациону фиоку</string>
@@ -570,7 +580,7 @@
   <string name="msg_ip_delete_old_fail">Ниједан стари кључ није обрисан (прављење новог?)</string>
   <string name="msg_ip_delete_old_ok">Обрисан стари кључ из базе података</string>
   <string name="msg_ip_encode_fail">Радња није успела због грешке кодирања</string>
-  <string name="msg_ip_error_io_exc">Радња није успела због улазно/излазне грешке</string>
+  <string name="msg_ip_error_io_exc">Радња није успела због У/И грешке</string>
   <string name="msg_ip_error_op_exc">Радња није успела због грешке базе података</string>
   <string name="msg_ip_error_remote_ex">Радња није успела због унутрашње грешке</string>
   <string name="msg_ip">Увозим јавни привезак %s</string>
@@ -643,6 +653,22 @@
   <string name="msg_ip_uid_reorder">Поново разврставам корисничке ИД-ове</string>
   <string name="msg_ip_uid_processing">Обрађујем кориснички ИД %s</string>
   <string name="msg_ip_uid_revoked">Кориснички ИД је опозван</string>
+  <string name="msg_ip_uat_processing_image">Обрађујем кориснички атрибут типа слике</string>
+  <string name="msg_ip_uat_processing_unknown">Обрађујем кориснички атрибут непознатог типа</string>
+  <string name="msg_ip_uat_cert_bad">Наиђох на лош сертификат!</string>
+  <string name="msg_ip_uat_cert_error">Грешка обраде сертификата!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Већ постоји неопозив сертификат, прескачем.</string>
+  <string name="msg_ip_uat_cert_old">Сертификат је старији него претходни, прескачем.</string>
+  <string name="msg_ip_uat_cert_new">Сертификат је новији, замењујем претходни.</string>
+  <string name="msg_ip_uat_cert_good">Нађен добар сертификат од %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Нађен добар опозив сертификата од %1$s</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Игноришем сертификат издат од непознатог јавног кључа</item>
+    <item quantity="few">Игноришем %s сертификата издата од непознатих јавних кључева</item>
+    <item quantity="other">Игноришем %s сертификата издатих од непознатих јавних кључева</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Разврставам корисничке атрибуте</string>
+  <string name="msg_ip_uat_revoked">Кориснички атрибут је опозван</string>
   <string name="msg_is_bad_type_public">Покушај увоза јавног привеска као тајног. Ово је грешка, поднесите извештај!</string>
   <string name="msg_is_bad_type_uncanon">Покушај увоза привеска без каноникализације. Ово је грешка, поднесите извештај!</string>
   <!--Import Secret log entries-->
@@ -657,6 +683,7 @@
   <string name="msg_is_subkey_nonexistent">Поткључ %s није доступан у тајном кључу</string>
   <string name="msg_is_subkey_ok">Тајни поткључ %d означен као доступан</string>
   <string name="msg_is_subkey_empty">Тајни поткључ %d означен као доступан, без лозинке</string>
+  <string name="msg_is_subkey_pin">Тајни поткључ %s означен као доступан, са ПИНом</string>
   <string name="msg_is_subkey_stripped">Тајни поткључ %d означен као огољен</string>
   <string name="msg_is_subkey_divert">Тајни поткључ %d означен као „преусмерен на картицу/НФЦ“</string>
   <string name="msg_is_success_identical">Привезак не садржи нове податке, нема шта да се ради</string>
@@ -669,13 +696,16 @@
   <string name="msg_kc_error_master_algo">Главни кључ користи непознат алгоритам (%s)!</string>
   <string name="msg_kc_error_dup_key">Поткључ %s се појављује два пута у привеску. Привезак је деформисан, не увозим!</string>
   <string name="msg_kc_master">Обрађујем главни кључ</string>
-  <string name="msg_kc_master_bad_err">Уклањам лош сертификат опозива привеска</string>
-  <string name="msg_kc_master_bad_local">Уклањам сертификат опозива привеска са заставицом „локални“</string>
-  <string name="msg_kc_master_bad_time">Уклањам сертификат опозива привеска са временском ознаком у будућности</string>
   <string name="msg_kc_master_bad_type">Уклањам сертификат главног кључа непознатог типа (%s)</string>
+  <string name="msg_kc_master_bad_local">Уклањам сертификат главног кључа са заставицом „локални“</string>
+  <string name="msg_kc_master_bad_err">Уклањам лош сертификат главног кључа</string>
+  <string name="msg_kc_master_bad_time">Уклањам сертификат опозива привеска са временском ознаком у будућности</string>
   <string name="msg_kc_master_bad_type_uid">Уклањам сертификат корисничког ИД-а са погрешног места</string>
-  <string name="msg_kc_master_bad">Уклањам лош сертификат опозива привеска</string>
+  <string name="msg_kc_master_bad">Уклањам лош сертификат главног кључа</string>
+  <string name="msg_kc_master_local">Уклањам сертификат главног кључа са заставицом „локални“</string>
   <string name="msg_kc_revoke_dup">Уклањам сувишни сертификат опозива привеска</string>
+  <string name="msg_kc_notation_dup">Уклањам сувишни сертификат нотације</string>
+  <string name="msg_kc_notation_empty">Уклањам празни сертификат нотације</string>
   <string name="msg_kc_sub">Обрађујем поткључ %s</string>
   <string name="msg_kc_sub_bad">Уклањам неисправан повезујући сертификат поткључа</string>
   <string name="msg_kc_sub_bad_err">Уклањам лош повезујући сертификат поткључа</string>
@@ -717,8 +747,23 @@
   <string name="msg_kc_uid_revoke_old">Уклањам застарели сертификат опозива за кориснички ИД „%s“</string>
   <string name="msg_kc_uid_no_cert">Није нађен исправан сопствени сертификат за кориснички ИД „%s“, уклањам из прстена</string>
   <string name="msg_kc_uid_remove">Уклањам неисправан кориснички ИД „%s“</string>
-  <string name="msg_kc_uid_dup">Уклањам дупли кориснички ИД „%s“. Тајни кључ је садржао два. Ово може да доведе до недостајућих сертификата!</string>
+  <string name="msg_kc_uid_dup">Уклањам дупли кориснички ИД „%s“. Привезак је садржао два. Ово може да доведе до недостајућих сертификата!</string>
   <string name="msg_kc_uid_warn_encoding">ИД корисника није потврђен као УТФ-8!</string>
+  <string name="msg_kc_uat_jpeg">Обрађујем кориснички атрибут ЈПЕГ типа</string>
+  <string name="msg_kc_uat_unknown">Обрађујем кориснички атрибут непознатог типа</string>
+  <string name="msg_kc_uat_bad_err">Уклањам лош сопствени сертификат за кориснички атрибут</string>
+  <string name="msg_kc_uat_bad_local">Уклањам сертификат корисничког атрибута са заставицом „локални“</string>
+  <string name="msg_kc_uat_bad_time">Уклањам кориснички атрибут са временском ознаком у будућности</string>
+  <string name="msg_kc_uat_bad_type">Уклањам сертификат корисничког атрибута непознатог типа (%s)</string>
+  <string name="msg_kc_uat_bad">Уклањам лош сопствени сертификат за кориснички атрибут</string>
+  <string name="msg_kc_uat_cert_dup">Уклањам застарели сопствени сертификат за кориснички атрибут</string>
+  <string name="msg_kc_uat_dup">Уклањам дупли кориснички атрибут. Привезак је садржао два. Ово може да доведе до недостајућих сертификата!</string>
+  <string name="msg_kc_uat_foreign">Уклањам страни сертификат корисничког атрибута од</string>
+  <string name="msg_kc_uat_revoke_dup">Уклањам сувишни сертификат опозива за кориснички атрибут</string>
+  <string name="msg_kc_uat_revoke_old">Уклањам застарели сертификат опозива за кориснички атрибут</string>
+  <string name="msg_kc_uat_no_cert">Није нађен исправан сопствени сертификат за кориснички атрибут, уклањам из прстена</string>
+  <string name="msg_kc_uat_remove">Уклањам неисправан кориснички атрибут</string>
+  <string name="msg_kc_uat_warn_encoding">ИД корисника није потврђен као УТФ-8!</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_secret_dummy">Нађен је нови јавни поткључ, али генерисање лажног тајног поткључа није подржано!</string>
   <string name="msg_mg_error_heterogeneous">Покушај спајања привезака са различитим отисцима!</string>
@@ -737,7 +782,7 @@
   <string name="msg_cr_error_keysize_512">Величина кључа мора бити већа или једнака 512!</string>
   <string name="msg_cr_error_no_curve">Није наведена величина кључа! Ово је грешка у програмирању, поднесите извештај о грешци!</string>
   <string name="msg_cr_error_no_keysize">Није наведена елиптичка крива! Ово је грешка у програмирању, поднесите извештај о грешци!</string>
-  <string name="msg_cr_error_internal_pgp">Унутрашња ПГП грешка!</string>
+  <string name="msg_cr_error_internal_pgp">Унутрашња ОпенПГП грешка!</string>
   <string name="msg_cr_error_unknown_algo">Одређен је непознат алгоритам! Ово је грешка у програмирању, поднесите извештај о грешци!</string>
   <string name="msg_cr_error_flags_dsa">Изабране су погрешне заставице кључа, ДСА не може да се користи за шифровање!</string>
   <string name="msg_cr_error_flags_elgamal">Изабране су погрешне заставице кључа, Елгамал не може да се користи за потписивање!</string>
@@ -745,6 +790,7 @@
   <string name="msg_cr_error_flags_ecdh">Изабране су погрешне заставице кључа, ЕЦДХ не може да се користи за потписивање!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Модификујем привезак %s</string>
+  <string name="msg_mf_error_divert_serial">Серијски број преусмеравање-у-картицу кључа мора бити 16 бита. Ово је грешка у програмирању, поднесите извештај о грешци!</string>
   <string name="msg_mf_error_encode">Изузетак кодирања!</string>
   <string name="msg_mf_error_fingerprint">Стварни отисак кључа не одговара очекиваном!</string>
   <string name="msg_mf_error_keyid">Нема ИД-а кључа. Ово је унутрашња грешка, поднесите извештај о грешци!</string>
@@ -752,13 +798,16 @@
   <string name="msg_mf_error_master_none">Нема главног сертификата на којем треба да се изврши радња! (Сви су опозвани?)</string>
   <string name="msg_mf_error_noexist_primary">Наведен је лош примарни кориснички ИД!</string>
   <string name="msg_mf_error_noexist_revoke">Наведен је лош кориснички ИД за опозив!</string>
+  <string name="msg_mf_error_restricted">Покушај извршења ограничене радње без лозинке! Ово је грешка у програмирању, поднесите извештај о грешци!</string>
   <string name="msg_mf_error_revoked_primary">Опозвани кориснички ИД-ови не могу бити примарни!</string>
   <string name="msg_mf_error_null_expiry">Датум истицања не може бити „исти као пре“ на стварању поткључа. Ово је грешка у програмирању, поднесите извештај о грешци!</string>
   <string name="msg_mf_error_passphrase_master">Кобна грешка дешифровања главног кључа! Ово је вероватно грешка у програмирању, поднесите извештај о грешци!</string>
-  <string name="msg_mf_error_pgp">Унутрашња ПГП грешка!</string>
+  <string name="msg_mf_error_pgp">Унутрашња ОпенПГП грешка!</string>
   <string name="msg_mf_error_sig">Изузетак потписа!</string>
   <string name="msg_mf_master">Модификујем главне сертификате</string>
-  <string name="msg_mf_passphrase">Мењам лозинку за поткључ…</string>
+  <string name="msg_mf_notation_empty">Додајем празни пакет нотације</string>
+  <string name="msg_mf_notation_pin">Додајем ПИН пакет нотације</string>
+  <string name="msg_mf_passphrase">Мењам лозинку за привезак</string>
   <string name="msg_mf_passphrase_key">Поново шифрујем поткључ %s новом лозинком</string>
   <string name="msg_mf_passphrase_empty_retry">Постављање нове лозинке није успело, покушавам поново са празном старом лозинком</string>
   <string name="msg_mf_passphrase_fail">Не могу да променим лозинку за поткључ! (Да ли се разликује од оне у осталим кључевима?)</string>
@@ -775,7 +824,10 @@
   <string name="msg_mf_uid_add">Додајем кориснички ИД %s</string>
   <string name="msg_mf_uid_primary">Постављам примарни кориснички ИД на %s</string>
   <string name="msg_mf_uid_revoke">Опозивам кориснички ИД %s</string>
-  <string name="msg_mf_uid_error_empty">Кориснички ИД не смије бити празан!</string>
+  <string name="msg_mf_uid_error_empty">Кориснички ИД не сме бити празан!</string>
+  <string name="msg_mf_uat_error_empty">Кориснички атрибут не сме бити празан!</string>
+  <string name="msg_mf_uat_add_image">Додајем кориснички атрибут типа слике</string>
+  <string name="msg_mf_uat_add_unknown">Додајем кориснички атрибут непознатог типа</string>
   <string name="msg_mf_unlock_error">Грешка откључавања привеска!</string>
   <string name="msg_mf_unlock">Откључавам привезак</string>
   <!--Consolidate-->
@@ -796,6 +848,7 @@
   <string name="msg_con_error_public">Грешка поновног увоза јавних кључева!</string>
   <string name="msg_con_error_secret">Грешка поновног увоза тајних кључева!</string>
   <string name="msg_con_recover">Настављам процес учвршћивања</string>
+  <string name="msg_con_recursive">Прескачем рекурзивно учвршћивање</string>
   <string name="msg_con_recover_unknown">Настављам процес учвршћивања из непознатог стања</string>
   <plurals name="msg_con_reimport_public">
     <item quantity="one">Поново увозим %d јавни кључ</item>
@@ -811,6 +864,19 @@
   <string name="msg_con_reimport_secret_skip">Нема тајних кључева за поновно увожење, прескачем…</string>
   <string name="msg_con_warn_delete_public">Изузетак при брисању фајла јавног кеша</string>
   <string name="msg_con_warn_delete_secret">Изузетак при брисању фајла тајног кеша</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Извршавам радњу на кључу</string>
+  <string name="msg_ed_caching_new">Кеширам нову лозинку</string>
+  <string name="msg_ed_error_no_parcel">Недостаје SaveKeyringParcel! (ово је грешка, пријавите је)</string>
+  <string name="msg_ed_error_key_not_found">Кључ није нађен!</string>
+  <string name="msg_ed_fetching">Добављам кључ за модификовање (%s)</string>
+  <string name="msg_ed_success">Радња на кључу је успела</string>
+  <!--Promote key-->
+  <string name="msg_pr">Унапређујем јавни кључ у тајни кључ</string>
+  <string name="msg_pr_error_already_secret">Кључ је већ тајни кључ!</string>
+  <string name="msg_pr_error_key_not_found">Кључ није нађен!</string>
+  <string name="msg_pr_fetching">Добављам кључ за модификовање (%s)</string>
+  <string name="msg_pr_success">Кључ успешно унапређен</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">Уређивање НФЦ кључева (још) није подржано!</string>
   <string name="msg_ek_error_dummy">Не могу да уредим кључ са огољеним главним кључем!</string>
@@ -819,11 +885,13 @@
   <string name="msg_dc_askip_no_key">Подаци нису шифровани познатим кључем, прескачем…</string>
   <string name="msg_dc_askip_not_allowed">Подаци нису шифровани дозвољеним кључем, прескачем…</string>
   <string name="msg_dc_asym">Нађен блок асиметрично шифрованих података за кључ %s</string>
+  <string name="msg_dc_charset">Нађено заглавље кодирања: „%s“</string>
   <string name="msg_dc_clear_data">Обрађујем дословне податке</string>
   <string name="msg_dc_clear_decompress">Распакујем компресоване податке</string>
   <string name="msg_dc_clear_meta_file">Име фајла: %s</string>
   <string name="msg_dc_clear_meta_mime">МИМЕ тип: %s</string>
   <string name="msg_dc_clear_meta_size">Величина: %s</string>
+  <string name="msg_dc_clear_meta_size_unknown">Величина није позната</string>
   <string name="msg_dc_clear_meta_time">Време измене: %s</string>
   <string name="msg_dc_clear_signature_bad">Провера потписа НИЈЕ У РЕДУ!</string>
   <string name="msg_dc_clear_signature_check">Оверавам податке потписа</string>
@@ -833,11 +901,12 @@
   <string name="msg_dc_error_bad_passphrase">Грешка откључавања кључа, погрешна лозинка!</string>
   <string name="msg_dc_error_extract_key">Непозната грешка откључавања кључа!</string>
   <string name="msg_dc_error_integrity_check">Грешка провере интегритета!</string>
+  <string name="msg_dc_error_integrity_missing">Недостаје провера интегритета! Ово може да се деси ако је апликација за шифровање застарела, или услед напада старијег издања.</string>
   <string name="msg_dc_error_invalid_siglist">Нису нађени исправни подаци потписа!</string>
   <string name="msg_dc_error_io">Наиђох на У/И изузетак током радње!</string>
   <string name="msg_dc_error_no_data">Шифровани подаци нису нађени у току!</string>
   <string name="msg_dc_error_no_key">Подаци шифровани познатим тајним кључем нису нађени у току!</string>
-  <string name="msg_dc_error_pgp_exception">Наиђох на ПГП изузетак током радње!</string>
+  <string name="msg_dc_error_pgp_exception">Наиђох на ОпенПГП изузетак током радње!</string>
   <string name="msg_dc_integrity_check_ok">Провера интегритета је у реду!</string>
   <string name="msg_dc_ok_meta_only">Само су метаподаци затражени, прескачем дешифровање</string>
   <string name="msg_dc_ok">У реду</string>
@@ -853,29 +922,42 @@
   <string name="msg_dc_trail_unknown">Наиђох на пратеће податке непознатог типа</string>
   <string name="msg_dc_unlocking">Откључавам тајни кључ</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Припремам јавне кључеве за шифровање</string>
-  <string name="msg_se_clearsign_only">Потписивање обичног текста није подржано!</string>
-  <string name="msg_se_compressing">Припремам компресију</string>
-  <string name="msg_se_encrypting">Шифрујем податке</string>
-  <string name="msg_se_error_bad_passphrase">Нетачна лозинка!</string>
-  <string name="msg_se_error_io">Наиђох на У/И изузетак током радње!</string>
-  <string name="msg_se_error_key_sign">Изабрани кључ за потписивање не може да потпише податке!</string>
-  <string name="msg_se_error_sign_key">Грешка добављања кључа за потписивање!</string>
-  <string name="msg_se_error_nfc">Грешка НФЦ података!</string>
-  <string name="msg_se_error_no_passphrase">Лозинка није дата!</string>
-  <string name="msg_se_error_pgp">Унутрашња ПГП грешка!</string>
-  <string name="msg_se_error_sig">Наиђох на изузетак ПГП потписивања!</string>
-  <string name="msg_se_error_unlock">Непозната грешка откључавања кључа!</string>
-  <string name="msg_se_key_ok">Шифрујем за кључ: %s</string>
-  <string name="msg_se_key_unknown">Недостаје кључ за шифровање: %s</string>
-  <string name="msg_se_key_warn">Лош кључ за шифровање: %s</string>
-  <string name="msg_se_ok">Радња потписивања/шифровања је успела!</string>
-  <string name="msg_se_pending_nfc">Потребан је НФЦ токен. захтевам унос корисника…</string>
-  <string name="msg_se_pending_passphrase">Потребна је лозинка, захтевам унос корисника…</string>
-  <string name="msg_se_signing">Потписујем податке (без шифровања)</string>
-  <string name="msg_se_sigcrypting">Шифрујем податке са потписом</string>
-  <string name="msg_se">Почињем радњу потписивања и/или шифровања</string>
-  <string name="msg_se_symmetric">Припремам симетрично шифровање</string>
+  <string name="msg_se">Почињем радњу потписивања/шифровања</string>
+  <string name="msg_se_input_bytes">Обрађујем улаз низа бајтова</string>
+  <string name="msg_se_input_uri">Обрађујем УРИ унос</string>
+  <string name="msg_se_error_no_input">Унос није дат!</string>
+  <string name="msg_se_error_input_uri_not_found">Грешка отварања УРИ-ја за читање!</string>
+  <string name="msg_se_error_output_uri_not_found">Грешка отварања УРИ-ја за упис!</string>
+  <string name="msg_se_error_too_many_inputs">Наведено више улаза него излаза! Ово је грешка у програмирању, поднесите извештај о грешци!</string>
+  <string name="msg_se_warn_output_left">Преостали су излази али нема улаза. Ово је вероватно грешка у програмирању, поднесите извештај о грешци.</string>
+  <string name="msg_se_success">Радња потписивања/шифровања је успела!</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Припремам јавне кључеве за шифровање</string>
+  <string name="msg_pse_clearsign_only">Потписивање обичног текста није подржано!</string>
+  <string name="msg_pse_compressing">Припремам компресију</string>
+  <string name="msg_pse_encrypting">Шифрујем податке</string>
+  <string name="msg_pse_error_bad_passphrase">Нетачна лозинка!</string>
+  <string name="msg_pse_error_hash_algo">Овај кључ не подржава захтевани хеш алгоритам!</string>
+  <string name="msg_pse_error_io">Наиђох на У/И изузетак током радње!</string>
+  <string name="msg_pse_error_key_sign">Изабрани кључ за потписивање не може да потпише податке!</string>
+  <string name="msg_pse_error_sign_key">Грешка добављања кључа за потписивање!</string>
+  <string name="msg_pse_error_nfc">Грешка НФЦ података!</string>
+  <string name="msg_pse_error_no_passphrase">Лозинка није дата!</string>
+  <string name="msg_pse_error_pgp">Унутрашња ОпенПГП грешка!</string>
+  <string name="msg_pse_error_sig">Наиђох на изузетак ОпенПГП потписивања!</string>
+  <string name="msg_pse_error_unlock">Непозната грешка откључавања кључа!</string>
+  <string name="msg_pse_key_ok">Шифрујем за кључ: %s</string>
+  <string name="msg_pse_key_unknown">Недостаје кључ за шифровање: %s</string>
+  <string name="msg_pse_key_warn">Лош кључ за шифровање: %s</string>
+  <string name="msg_pse_ok">Радња потписивања/шифровања је успела!</string>
+  <string name="msg_pse_pending_nfc">Потребан је НФЦ токен, захтевам унос корисника…</string>
+  <string name="msg_pse_pending_passphrase">Потребна је лозинка, захтевам унос корисника…</string>
+  <string name="msg_pse_signing">Потписујем податке (без шифровања)</string>
+  <string name="msg_pse_signing_cleartext">Правим обични текстуални потпис</string>
+  <string name="msg_pse_signing_detached">Правим одвојени потпис</string>
+  <string name="msg_pse_sigcrypting">Шифрујем податке са потписом</string>
+  <string name="msg_pse">Почињем радњу потписивања и/или шифровања</string>
+  <string name="msg_pse_symmetric">Припремам симетрично шифровање</string>
   <string name="msg_crt_certifying">Генеришем сертификате</string>
   <string name="msg_crt_certify_all">Оверавам све корисничке ИД-ове за кључ %s</string>
   <plurals name="msg_crt_certify_some">
@@ -883,6 +965,7 @@
     <item quantity="few">Оверавам %1$d корисничка ИД-а за кључ %2$s</item>
     <item quantity="other">Оверавам %1$d корисничких ИД-ова за кључ %2$s</item>
   </plurals>
+  <string name="msg_crt_error_self">Не могу да издам овакав самопотписани сертификат!</string>
   <string name="msg_crt_error_master_not_found">Главни кључ није нађен!</string>
   <string name="msg_crt_error_nothing">Нема оверених кључева!</string>
   <string name="msg_crt_error_unlock">Грешка откључавања главног кључа!</string>
@@ -913,6 +996,7 @@
   <string name="msg_import_fingerprint_ok">Провера отиска је у реду</string>
   <string name="msg_import_merge">Спајам добављене податке</string>
   <string name="msg_import_error">Радња увоза није успела!</string>
+  <string name="msg_import_error_io">Радња увоза није успела због У/И грешке!</string>
   <string name="msg_import_partial">Радња увоза је успела, са грешкама!</string>
   <string name="msg_import_success">Радња увоза је успела!</string>
   <plurals name="msg_export">
@@ -929,7 +1013,8 @@
   <string name="msg_export_error_uri_open">Грешка отварања УРИ тока!</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_error_io">Грешка улаза/излаза!</string>
+  <string name="msg_export_error_key">Грешка предобраде података кључа!</string>
   <string name="msg_export_success">Радња извоза је успела</string>
   <string name="msg_del_error_empty">Нема ништа за брисање!</string>
   <string name="msg_del_error_multi_secret">Тајне кључеве можете брисати само појединачно!</string>
@@ -970,6 +1055,11 @@
   <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">Преузмите вашу приватност помоћу Отвореног кључарника!</string>
+  <string name="first_time_create_key">Направи ми кључ</string>
+  <string name="first_time_import_key">Увези из фајла</string>
+  <string name="first_time_skip">Прескочи поставу</string>
   <!--unsorted-->
   <string name="section_certifier_id">Сертификатор</string>
   <string name="section_cert">Детаљи сертификата</string>
@@ -1000,9 +1090,32 @@
   <string name="error_multi_not_supported">Упис више фајлова није подржан. Ово је ограничење у текућем издању Андроида.</string>
   <string name="key_colon">Кључ:</string>
   <string name="exchange_description">Да бисте почели размену кључева, са десне стране изаберите број учесника и додирните дугме „Почни размену“.\n\nБиће вам постављено још два питања да би се осигурало да су само исправни учесници у размени и да су њихови отисци тачни.</string>
-  <!--First Time-->
-  <string name="first_time_text1">Преузмите вашу приватност помоћу Отвореног кључарника!</string>
-  <string name="first_time_create_key">Направи ми кључ</string>
-  <string name="first_time_import_key">Увези из фајла</string>
-  <string name="first_time_skip">Прескочи поставу</string>
+  <string name="btn_start_exchange">Почни размену</string>
+  <string name="user_id_none"><![CDATA[<ништа>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Одредите методу откључавања</string>
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Унесите лозинку</string>
+  <string name="passphrase">Лозинка</string>
+  <string name="noPassphrase">Без лозинке</string>
+  <string name="no_passphrase_set">Лозинка није постављена</string>
+  <string name="passphrases_match">Лозинке се поклапају</string>
+  <string name="passphrase_saved">Лозинка сачувана</string>
+  <string name="passphrase_invalid">Лозинка није исправна</string>
+  <string name="missing_passphrase">Недостаје лозинка</string>
+  <string name="passphrase_again">Поновите</string>
+  <string name="lockpattern">Шаблон закључавања</string>
+  <string name="lockpatternNFC">НФЦ + шаблон</string>
+  <string name="unlock_method">Метода откључавања</string>
+  <string name="set_passphrase">Постави лозинку</string>
+  <string name="draw_lockpattern">Нацртајте шаблон</string>
+  <string name="nfc_title">НФЦ</string>
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="nfc_wrong_tag">Погрешна ознака. Покушајте поново.</string>
+  <string name="enable_nfc">Активирајте НФЦ у поставкама</string>
+  <string name="no_nfc_support">Овај уређај не подржава НФЦ</string>
+  <string name="nfc_write_succesful">Успешно уписах на НФЦ ознаку</string>
+  <string name="unlocked">Откључан</string>
+  <string name="nfc_settings">Поставке</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index 7d414d3f0..7c855176b 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -9,13 +9,13 @@
   <string name="title_encrypt_text">Kryptera text</string>
   <string name="title_encrypt_files">Kryptera filer</string>
   <string name="title_decrypt">Dekryptera</string>
-  <string name="title_unlock">Lösenordsfras</string>
+  <string name="title_unlock">Lås upp nyckel</string>
   <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">Inställningar för nyckelserver</string>
+  <string name="title_key_server_preference">Nyckelservrar</string>
   <string name="title_change_passphrase">Ändra lösenordsfras</string>
   <string name="title_share_fingerprint_with">Dela fingeravtryck med…</string>
   <string name="title_share_key">Dela nyckel med…</string>
@@ -34,6 +34,9 @@
   <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>
   <!--section-->
   <string name="section_user_ids">Identiteter</string>
   <string name="section_keys">Undernycklar</string>
@@ -52,6 +55,9 @@
   <string name="section_key_to_certify">Nyckel att certifiera</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>
   <!--button-->
   <string name="btn_decrypt_verify_file">Dekryptera, verifiera och spara fil</string>
   <string name="btn_decrypt_verify_message">Dekryptera och verifiera meddelande</string>
@@ -71,21 +77,25 @@
   <string name="btn_create_key">Skapa nyckel</string>
   <string name="btn_add_files">Lägg till fil(er)</string>
   <string name="btn_add_share_decrypted_text">Dela dekrypterad text</string>
-  <string name="btn_decrypt_clipboard">Dekryptera från urklipp</string>
+  <string name="btn_decrypt_clipboard">Dekryptera text från urklipp</string>
   <string name="btn_decrypt_and_verify">och verifiera signaturer</string>
   <string name="btn_decrypt_files">Dekryptera filer</string>
+  <string name="btn_encrypt_files">Kryptera filer</string>
+  <string name="btn_encrypt_text">Kryptera text</string>
   <!--menu-->
   <string name="menu_preferences">Inställningar</string>
   <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_create_key">Skapa min nyckel</string>
+  <string name="menu_import_existing_key">Importera från fil</string>
   <string name="menu_search">Sök</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>
   <!--label-->
@@ -102,8 +112,9 @@
   <string name="label_file_ascii_armor">Aktivera ASCII-format</string>
   <string name="label_write_version_header">Låt andra se att du använder OpenKeychain</string>
   <string name="label_write_version_header_summary">Skriver \'OpenKeychain v2.7\' till OpenPGP-signaturer, chiffertext och exporterade nycklar.</string>
-  <string name="label_use_default_yubikey_pin">Använd förvald Yubikey PIN</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Använder förvald PIN (123456) för att få åtkomst till Yubikeys via NFC</string>
+  <string name="label_use_default_yubikey_pin">Använd förvald YubiKey PIN</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Använd numeriska tangentbordet för YubiKey PIN</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Använder förvald PIN (123456) för att få åtkomst till YubiKeys via NFC</string>
   <string name="label_asymmetric_from">Signerat av:</string>
   <string name="label_to">Kryptera till:</string>
   <string name="label_delete_after_encryption">Radera fil efter kryptering</string>
@@ -116,7 +127,7 @@
   <string name="label_message_compression">Meddelandekompression</string>
   <string name="label_file_compression">Filkompression</string>
   <string name="label_keyservers">Nyckelservrar</string>
-  <string name="label_key_id">nyckel-ID</string>
+  <string name="label_key_id">Nyckel-ID</string>
   <string name="label_expiry">Går ut</string>
   <string name="label_usage">Användning</string>
   <string name="label_key_size">Nyckelstorlek</string>
@@ -125,10 +136,13 @@
   <string name="label_name">Namn</string>
   <string name="label_comment">Kommentar</string>
   <string name="label_email">E-post</string>
+  <string name="label_send_key">Synkronisera med molnet</string>
   <string name="label_fingerprint">Fingeravtryck</string>
   <string name="expiry_date_dialog_title">Ställ in utgångsdatum</string>
   <string name="label_first_keyserver_is_used">(Nyckelservern först i listan är den som föredras)</string>
+  <string name="label_preferred">föredraget</string>
   <string name="user_id_no_name">&lt;inget namn&gt;</string>
+  <string name="none">&lt;ingen&gt;</string>
   <string name="no_key">&lt;ingen nyckel&gt;</string>
   <string name="can_encrypt">kan kryptera</string>
   <string name="can_sign">kan signera</string>
@@ -144,7 +158,7 @@
     <item quantity="one">%d nyckelserver</item>
     <item quantity="other">%d nyckelservrar</item>
   </plurals>
-  <string name="secret_key">Privat nyckel</string>
+  <string name="secret_key">Privat nyckel:</string>
   <!--choice-->
   <string name="choice_none">Ingen</string>
   <string name="choice_15secs">15 s</string>
@@ -180,10 +194,12 @@
   <string name="passphrase_must_not_be_empty">Ange en lösenordsfras.</string>
   <string name="passphrase_for_symmetric_encryption">Symmetrisk kryptering.</string>
   <string name="passphrase_for">Ange lösenordsfras för \'%s\'</string>
-  <string name="yubikey_pin_for">Ange PIN för att få åtkomst till Yubikey för \'%s\'</string>
+  <string name="pin_for">Ange PIN för \'%s\'</string>
+  <string name="yubikey_pin_for">Ange PIN för att få åtkomst till YubiKey för \'%s\'</string>
+  <string name="nfc_text">Håll YubiKey mot baksidan av din enhet.</string>
   <string name="file_delete_confirmation">Vill du verkligen radera\n%s?</string>
   <string name="file_delete_successful">Raderades.</string>
-  <string name="no_file_selected">Välj en nyckel först.</string>
+  <string name="no_file_selected">Välj en fil först.</string>
   <string name="encrypt_sign_successful">Signerades och/eller krypterades.</string>
   <string name="encrypt_sign_clipboard_successful">Signerades och/eller krypterades till urklipp.</string>
   <string name="enter_passphrase_twice">Ange lösenordsfrasen två gånger.</string>
@@ -227,6 +243,7 @@
   <string name="error_no_signature_passphrase">ingen lösenordsfras angiven</string>
   <string name="error_no_signature_key">ingen signaturnyckel angiven</string>
   <string name="error_invalid_data">Inget giltigt krypterat eller signerat OpenPGP-innehåll!</string>
+  <string name="error_integrity_check_failed">integritetskontroll misslyckades! Data har modifierats!</string>
   <string name="error_wrong_passphrase">fel lösenordsfras</string>
   <string name="error_could_not_extract_private_key">kunde inte extrahera privat nyckel</string>
   <!--errors without preceeding Error:-->
@@ -247,6 +264,7 @@
   <string name="decrypt_result_not_encrypted">Inte krypterat</string>
   <string name="decrypt_result_action_show">Visa</string>
   <string name="decrypt_result_action_Lookup">Sök efter</string>
+  <string name="decrypt_invalid_text">Antingen är signaturen ogiltig eller så har nyckeln återkallats/gått ut. Du kan inte vara säker på vem som skrev texten. Vill du fortfarande visa den?</string>
   <string name="decrypt_invalid_button">Jag förstår riskerna, visa den!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Min nyckel:</string>
@@ -268,6 +286,7 @@
   <string name="progress_modify">modifierar nyckelring…</string>
   <string name="progress_modify_unlock">låser upp nyckelring…</string>
   <string name="progress_modify_adduid">lägger till användar-ID:n…</string>
+  <string name="progress_modify_adduat">lägger till användarattribut...</string>
   <string name="progress_modify_revokeuid">återkallar användar-ID:n…</string>
   <string name="progress_modify_primaryuid">ändrar primärt användar-ID…</string>
   <string name="progress_modify_subkeychange">modifierar undernycklar…</string>
@@ -299,8 +318,8 @@
   <string name="progress_con_saving">konsolidera: sparar till cache…</string>
   <string name="progress_con_reimport">konsolidera: återimporterar…</string>
   <!--action strings-->
-  <string name="hint_keyserver_search_hint">Namn/E-post/Nyckel-ID</string>
-  <string name="hint_cloud_search_hint">Namn/E-post/Bevis/Nyckel…</string>
+  <string name="hint_keyserver_search_hint">Namn/e-post/nyckel-ID…</string>
+  <string name="hint_cloud_search_hint">Namn/e-post/bevis/nyckel…</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -340,8 +359,12 @@
   <string name="import_import">Importera markerade nycklar</string>
   <string name="import_qr_code_wrong">Något är fel med QR-koden! Försök igen!</string>
   <string name="import_qr_code_too_short_fingerprint">Fingeravtryck är för kort (&lt; 16 tecken)</string>
+  <string name="import_qr_code_button">Skanna QR-kod</string>
+  <string name="import_qr_code_text">Håll din kamera över QR-koden!</string>
   <!--Generic result toast-->
-  <string name="view_log">Visa logg</string>
+  <string name="view_log">Detaljer</string>
+  <string name="with_warnings">, med varningar</string>
+  <string name="with_cancelled">, tills det avbryts</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="one">Importerade nyckel</item>
@@ -374,6 +397,10 @@
     <item quantity="one">Raderade en nyckel</item>
     <item quantity="other">Raderade %1$d nycklar</item>
   </plurals>
+  <plurals name="delete_ok_but_fail_2">
+    <item quantity="one">, men misslyckades med att radera en nyckel%2$s.</item>
+    <item quantity="other">, men misslyckades med att radera %1$d nycklar%2$s.</item>
+  </plurals>
   <plurals name="delete_ok">
     <item quantity="one">Raderade nyckel%2$s.</item>
     <item quantity="other">Raderade %1$d nycklar%2$s.</item>
@@ -383,11 +410,20 @@
     <item quantity="other">Fel vid radering av %1$d nycklar.</item>
   </plurals>
   <string name="delete_nothing">Inget att radera.</string>
+  <string name="delete_cancelled">Raderingsoperation avbruten.</string>
   <!--Certify result toast-->
   <plurals name="certify_keys_ok">
     <item quantity="one">Certifierade nyckel%2$s.</item>
     <item quantity="other">Certifierade %1$d nycklar%2$s.</item>
   </plurals>
+  <plurals name="certify_keys_with_errors">
+    <item quantity="one">Certifiering misslyckades!</item>
+    <item quantity="other">Certifiering misslyckades för %d nycklar!</item>
+  </plurals>
+  <plurals name="certify_error">
+    <item quantity="one">Certifiering misslyckades!</item>
+    <item quantity="other">Certifiering av %d nycklar misslyckades!</item>
+  </plurals>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Dekryptera fil med OpenKeychain</string>
   <string name="intent_import_key">Importera nyckel med OpenKeychain</string>
@@ -405,15 +441,20 @@
   <string name="api_settings_save">Spara</string>
   <string name="api_settings_save_msg">Konto har sparats</string>
   <string name="api_settings_cancel">Avbryt</string>
+  <string name="api_settings_revoke">Återkalla åtkomst</string>
   <string name="api_settings_start">Starta app</string>
   <string name="api_settings_delete_account">Radera konto</string>
   <string name="api_settings_package_name">Paketnamn</string>
   <string name="api_settings_package_signature">SHA-256 för paketsignatur</string>
-  <string name="api_settings_accounts">Konton</string>
+  <string name="api_settings_accounts">Konton (övergivet API)</string>
+  <string name="api_settings_advanced">Avancerad information</string>
+  <string name="api_settings_allowed_keys">Tillåtna nycklar</string>
   <string name="api_settings_settings">Inställningar</string>
   <string name="api_settings_key">Kontonyckel:</string>
   <string name="api_settings_accounts_empty">Inga konton kopplade till denna app.</string>
+  <string name="api_create_account_text">Ingen nyckel är konfigurerad för detta konto. Välj en av dina existerande nycklar eller skapa en ny.\nAppar kan endast dekryptera/signera med nycklarna som valts här!</string>
   <string name="api_update_account_text">Nyckeln som sparats för detta konto har raderats. Välj en annan!\nAppar kan endast dekryptera/signera med nycklarna som valts här!</string>
+  <string name="api_register_text">Appen som visas vill kryptera/dekryptera meddelanden och signera dem i ditt namn.\nTillåt åtkomst?\n\nVARNING: Om du inte vet varför denna sida visas, neka åtkomst! Du kan återkalla åtkomst senare från \'Appar\' sidan.</string>
   <string name="api_register_allow">Tillåt åtkomst</string>
   <string name="api_register_disallow">Tillåt inte åtkomst</string>
   <string name="api_register_error_select_key">Välj en nyckel!</string>
@@ -421,6 +462,7 @@
   <string name="api_select_pub_keys_dublicates_text">Mer än en nyckel finns för dessa identiteter:</string>
   <string name="api_select_pub_keys_text">Se över listan med mottagare!</string>
   <string name="api_select_pub_keys_text_no_user_ids">Välj mottagare!</string>
+  <string name="api_error_wrong_signature">Signaturkontroll misslyckades! Har du installerat appen från en annan källa? Om du är säker på att det här inte är en attack, återkalla den här appens registrering i OpenKeychain och registrera sen om appen igen.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Dela med QR-kod</string>
   <string name="share_nfc_dialog">Dela med NFC</string>
@@ -429,6 +471,7 @@
     <item quantity="one">1 nyckel vald.</item>
     <item quantity="other">%d nycklar valda.</item>
   </plurals>
+  <string name="key_list_empty_text1">Inga nycklar hittades!</string>
   <string name="key_list_filter_show_all">Visa alla nycklar</string>
   <string name="key_list_filter_show_certified">Visa endast certifierade nycklar</string>
   <!--Key view-->
@@ -449,6 +492,7 @@
   <string name="user_id_info_certified_title">Certifierad</string>
   <string name="user_id_info_certified_text">Den här identiteten har certifierats av dig.</string>
   <string name="user_id_info_uncertified_title">Inte certifierad.</string>
+  <string name="user_id_info_uncertified_text">Den här identiteten har ännu inte certifierats. Du kan inte vara säker på att identiteten verkligen hänger ihop med en viss person.</string>
   <string name="user_id_info_invalid_title">Ogiltig</string>
   <string name="user_id_info_invalid_text">Något är fel med den här identiteten!</string>
   <!--Edit key-->
@@ -471,6 +515,7 @@
   <string name="edit_key_error_add_subkey">Lägg till åtminstone en undernyckel!</string>
   <!--Create key-->
   <string name="create_key_upload">Ladda upp nyckel till nyckelserver</string>
+  <string name="create_key_empty">Detta fält krävs</string>
   <string name="create_key_passphrases_not_equal">Lösenordsfraser stämmer inte överens</string>
   <string name="create_key_final_text">Du angav följande identitet:</string>
   <string name="create_key_final_robot_text">Att skapa en nyckel kan ta ett tag, drick en kopp kaffe under tiden…</string>
@@ -478,14 +523,13 @@
   <string name="create_key_custom">(anpassad nyckelkonfiguration)</string>
   <string name="create_key_text">Ange ditt fullständiga namn, e-postadress och välj en lösenordsfras.</string>
   <string name="create_key_hint_full_name">Fullständigt namn, t.ex. Kalle Svensson</string>
+  <string name="create_key_edit">Ändra nyckelkonfiguration</string>
   <!--View key-->
   <string name="view_key_revoked">Den här nyckeln har återkallats!</string>
   <string name="view_key_expired">Den här nyckeln har gått ut!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Nycklar</string>
-  <string name="nav_encrypt_text">Kryptera text</string>
-  <string name="nav_encrypt_files">Kryptera filer</string>
-  <string name="nav_decrypt">Dekryptera</string>
+  <string name="nav_encrypt_decrypt">Kryptera/Dekryptera</string>
   <string name="nav_apps">Appar</string>
   <string name="my_keys">Mina nycklar</string>
   <!--hints-->
@@ -502,11 +546,16 @@
   <string name="cert_verify_unavailable">nyckel inte tillgänglig</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <string name="msg_internal_error">Intern fel!</string>
+  <string name="msg_cancelled">Operation avbruten.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_bad_type_secret">Försökte att importera privat nyckelring som publik. Detta är en bugg, skicka en felrapport!</string>
   <string name="msg_ip_delete_old_fail">Ingen gammal nyckel raderad (skapa en ny?)</string>
   <string name="msg_ip_delete_old_ok">Raderade gammal nyckel från databas</string>
+  <string name="msg_ip_error_op_exc">Operationen misslyckades på grund av ett databasfel</string>
+  <string name="msg_ip_error_remote_ex">Operationen misslyckades på grund av ett internt fel</string>
   <string name="msg_ip">Importerar publik nyckelring %s</string>
+  <string name="msg_ip_insert_keyring">Kodar nyckelringens data</string>
+  <string name="msg_ip_insert_keys">Läser nycklar</string>
   <string name="msg_ip_prepare">Förebereder databasoperationer</string>
   <string name="msg_ip_master">Bearbetar huvudnyckel %s</string>
   <string name="msg_ip_master_expired">Nyckelring gick ut %s</string>
@@ -528,6 +577,8 @@
   <string name="msg_ip_master_flags_xxsx">Huvudflaggor: signera</string>
   <string name="msg_ip_master_flags_xxxa">Huvudflaggor: autentisera</string>
   <string name="msg_ip_master_flags_xxxx">Huvudflaggor: ingen</string>
+  <string name="msg_ip_merge_public">Slår ihop importerade data med befintlig publik nyckelring</string>
+  <string name="msg_ip_merge_secret">Slår ihop importerade data med befintlig publik nyckelring</string>
   <string name="msg_ip_subkey">Bearbetar undernyckel %s</string>
   <string name="msg_ip_subkey_expired">Undernyckel gick ut %s</string>
   <string name="msg_ip_subkey_expires">Undernyckel går ut %s</string>
@@ -553,28 +604,61 @@
   <string name="msg_ip_reinsert_secret">Sätter in privat nyckel på nytt</string>
   <string name="msg_ip_uid_cert_bad">Stötte på ett dåligt certifikat!</string>
   <string name="msg_ip_uid_cert_error">Fel vid bearbetning av certifikat!</string>
+  <string name="msg_ip_uid_cert_nonrevoke">Har redan ett icke-återkalleligt certifikat, hoppar över.</string>
   <string name="msg_ip_uid_cert_old">Certifikat är äldre än det förra, hoppar över.</string>
   <string name="msg_ip_uid_cert_new">Certifikat är mer aktuellt, ersätter det förra.</string>
+  <string name="msg_ip_uid_cert_good">Hittade ett bra certifikat från %1$s</string>
+  <string name="msg_ip_uid_cert_good_revoke">Hittade bra certifikatåterkallning från %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Hoppar över ett certifikat utfärdat av okända publika nycklar</item>
     <item quantity="other">Hoppar över %s certifikat utfärdade av okända publika nycklar</item>
   </plurals>
+  <string name="msg_ip_uid_classifying_zero">Klassificerar användar-ID:n (inga tillförlitliga nycklar tillgängliga)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Klassificerar användar-ID:n (använder en tillförlitlig nyckel)</item>
+    <item quantity="other">Klassificerar användar-ID:n (använder %s tillförlitliga nycklar)</item>
+  </plurals>
+  <string name="msg_ip_uid_reorder">Ordnar om användar-ID:n</string>
+  <string name="msg_ip_uid_processing">Bearbetar användar-ID %s</string>
+  <string name="msg_ip_uid_revoked">Användar-ID är återkallat</string>
+  <string name="msg_ip_uat_processing_image">Bearbetar användarattribut av typen bild</string>
+  <string name="msg_ip_uat_processing_unknown">Bearbetar användarattribut av okänd typ</string>
+  <string name="msg_ip_uat_cert_bad">Stötte på ett dåligt certifikat!</string>
+  <string name="msg_ip_uat_cert_error">Fel vid bearbetning av certifikat!</string>
+  <string name="msg_ip_uat_cert_nonrevoke">Har redan ett icke-återkalleligt certifikat, hoppar över.</string>
+  <string name="msg_ip_uat_cert_old">Certifikat är äldre än det förra, hoppar över.</string>
+  <string name="msg_ip_uat_cert_new">Certifikat är mer aktuellt, ersätter det förra.</string>
+  <string name="msg_ip_uat_cert_good">Hittade ett bra certifikat från %1$s</string>
+  <string name="msg_ip_uat_cert_good_revoke">Hittade bra certifikatåterkallning från %1$s</string>
+  <plurals name="msg_ip_uat_certs_unknown">
+    <item quantity="one">Hoppar över ett certifikat utfärdat av en okänd publik nyckel</item>
+    <item quantity="other">Hoppar över %s certifikat utfärdade av okända publika nycklar</item>
+  </plurals>
+  <string name="msg_ip_uat_classifying">Klassificerar användarattribut</string>
+  <string name="msg_ip_uat_revoked">Användarattribut är återkallat</string>
+  <string name="msg_is_bad_type_public">Försökte att importera publik nyckelring som privat. Detta är en bugg, skicka en felrapport!</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importerar privat nyckel %s</string>
   <string name="msg_is_db_exception">Databasfel!</string>
   <string name="msg_is_importing_subkeys">Bearbetar privata undernycklar</string>
+  <string name="msg_is_error_io_exc">Fel vid kodning av nyckelring</string>
+  <string name="msg_is_merge_public">Slår ihop importerade data med befintlig publik nyckelring</string>
+  <string name="msg_is_merge_secret">Slår ihop importerade data med befintlig publik nyckelring</string>
   <string name="msg_is_pubring_generate">Genererar publik nyckelring från privat nyckelring</string>
   <string name="msg_is_subkey_nonexistent">Undernyckel %s inte tillgänglig i privat nyckelring</string>
   <string name="msg_is_success_identical">Nyckelringen innehåller ingen ny information, inget att göra</string>
   <string name="msg_is_success">Importerade privat nyckelring</string>
   <!--Keyring Canonicalization log entries-->
   <string name="msg_kc_error_v3">Den här nyckeln är skapad med OpenPGP version 3, vilken är en föråldrad version som inte längre stöds!</string>
+  <string name="msg_kc_error_no_uid">Nyckelringen har inga giltiga användar-ID:n!</string>
   <string name="msg_kc_error_master_algo">Den här huvudnyckeln använder en okänd (%s) algoritm!</string>
   <string name="msg_kc_master">Bearbetar huvudnyckel</string>
-  <string name="msg_kc_master_bad_err">Tar bort dåligt återkallelsecertifikat för nyckelring</string>
-  <string name="msg_kc_master_bad_time">Tar bort återkallelsecertifikat för nyckelring med framtida tidstämpel</string>
   <string name="msg_kc_master_bad_type">Tar bort huvudnyckelcertifikat av okänd typ (%s)</string>
-  <string name="msg_kc_master_bad">Tar bort dåligt återkallelsecertifikat för nyckelring</string>
+  <string name="msg_kc_master_bad_local">Tar bort huvudnyckelcertifikat med flaggan \"local\"</string>
+  <string name="msg_kc_master_bad_err">Tar bort dåligt huvudnyckelcertifikat</string>
+  <string name="msg_kc_master_bad_time">Tar bort återkallelsecertifikat för nyckelring med framtida tidstämpel</string>
+  <string name="msg_kc_master_bad">Tar bort dåligt huvudnyckelcertifikat</string>
+  <string name="msg_kc_master_local">Tar bort huvudnyckelcertifikat med flaggan \"local\"</string>
   <string name="msg_kc_revoke_dup">Tar bort överflödigt återkallelsecertifikat för nyckelring</string>
   <string name="msg_kc_sub">Bearbetar undernyckel %s</string>
   <string name="msg_kc_sub_no_cert">Inget giltigt certifikat hittades för %s, tar bort från nyckelring</string>
@@ -582,17 +666,30 @@
   <string name="msg_kc_sub_revoke_bad">Tar bort dåligt återkallelsecertifikat för undernyckel</string>
   <string name="msg_kc_sub_revoke_dup">Tar bort överflödigt återkallelsecertifikat för undernyckel</string>
   <string name="msg_kc_sub_unknown_algo">Undernyckel använder en okänd algoritm, importerar inte…</string>
+  <string name="msg_kc_uid_bad_err">Tar bort dåligt eget-certifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_bad_time">Tar bort användar-ID med framtida tidstämpel</string>
+  <string name="msg_kc_uid_bad">Tar bort dåligt eget-certifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_cert_dup">Tar bort föråldrat eget-certifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_revoke_dup">Tar bort överflödigt återkallelsecertifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_revoke_old">Tar bort föråldrat återkallelsecertifikat för användar-ID \'%s\'</string>
+  <string name="msg_kc_uid_no_cert">Inget giltigt eget-certifikat hittades för användar-ID \'%s\', tar bort från nyckelring</string>
+  <string name="msg_kc_uid_remove">Tar bort ogiltigt användar-ID \'%s\'</string>
   <string name="msg_kc_uid_warn_encoding">Användar-ID verifierar inte som UTF-8!</string>
+  <string name="msg_kc_uat_remove">Tar bort ogiltigt användarattribut</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_error_heterogeneous">Försökte att slå ihop nyckelringar med olika fingeravtryck!</string>
+  <string name="msg_mg_error_encode">Allvarligt fel vid kodning av signatur!</string>
   <string name="msg_mg_public">Slår ihop till publik nyckelring %s</string>
   <string name="msg_mg_secret">Slår ihop till privat nyckelring %s</string>
   <string name="msg_mg_new_subkey">Lägger till ny undernyckel %s</string>
+  <string name="msg_mg_found_new">Hittade %s nya certifikat i nyckelring</string>
+  <string name="msg_mg_unchanged">Inget att slå ihop</string>
   <!--createSecretKeyRing-->
   <string name="msg_cr">Genererar ny huvudnyckel</string>
+  <string name="msg_cr_error_no_user_id">Nyckelringar måste skapas med minst ett användar-ID!</string>
   <string name="msg_cr_error_no_certify">Huvudnyckel måste ha en certifieringsflagga!</string>
   <string name="msg_cr_error_keysize_512">Nyckelstorlek måste vara större eller lika med 512!</string>
-  <string name="msg_cr_error_internal_pgp">Internt PGP-fel!</string>
+  <string name="msg_cr_error_internal_pgp">Internt OpenPGP-fel!</string>
   <string name="msg_cr_error_unknown_algo">Okänd algoritm vald. Detta är ett programmeringsfel, skicka en buggrapport!</string>
   <string name="msg_cr_error_flags_dsa">Dåliga nyckelflaggor valda, DSA kan inte användas för kryptering!</string>
   <string name="msg_cr_error_flags_elgamal">Dåliga nyckelflaggor valda, ElGamal kan inte användas för signering!</string>
@@ -600,22 +697,33 @@
   <string name="msg_cr_error_flags_ecdh">Dåliga nyckelflaggor valda, ECDH kan inte användas för signering!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modifierar nyckelring %s</string>
+  <string name="msg_mf_error_fingerprint">Det verkliga nyckelfingeravtrycket stämmer inte överens med det som förväntades!</string>
   <string name="msg_mf_error_keyid">Inget nyckel-ID. Det här är ett internt fel, skicka en buggrapport!</string>
-  <string name="msg_mf_error_pgp">Internt PGP-fel!</string>
-  <string name="msg_mf_passphrase">Ändrar lösenordsfras för nyckelring…</string>
+  <string name="msg_mf_error_noexist_primary">Dåligt primärt användar-ID angivet!</string>
+  <string name="msg_mf_error_revoked_primary">Återkallade användar-ID:n kan inte vara primära!</string>
+  <string name="msg_mf_error_pgp">Internt OpenPGP-fel!</string>
+  <string name="msg_mf_passphrase">Ändrar lösenordsfras för nyckelring</string>
   <string name="msg_mf_passphrase_key">Krypterar undernyckel %s på nytt med ny lösenordsfras</string>
   <string name="msg_mf_passphrase_empty_retry">Det gick inte att ställa in ny lösenordsfras, försök igen med en tom gammal lösenordsfras</string>
+  <string name="msg_mf_primary_replace_old">Ersätter certifikat för tidigare primärt användar-ID</string>
+  <string name="msg_mf_primary_new">Genererar nytt certifikat för nytt primärt användar-ID</string>
   <string name="msg_mf_subkey_change">Modifierar undernyckel %s</string>
   <string name="msg_mf_subkey_new">Lägger till ny undernyckel av typen %s</string>
   <string name="msg_mf_subkey_new_id">Nytt undernyckel-ID: %s</string>
   <string name="msg_mf_error_past_expiry">Utgångsdatum kan inte vara i det förflutna!</string>
   <string name="msg_mf_subkey_revoke">Återkallar undernyckel %s</string>
   <string name="msg_mf_subkey_strip">Rensar undernyckel %s</string>
+  <string name="msg_mf_uid_add">Lägger till användar-ID %s</string>
+  <string name="msg_mf_uid_primary">Ändrar primärt användar-ID till %s</string>
+  <string name="msg_mf_uid_revoke">Återkallar användar-ID %s</string>
   <string name="msg_mf_uid_error_empty">Användar-ID får inte vara tomt!</string>
+  <string name="msg_mf_unlock">Låser upp nyckelring</string>
   <!--Consolidate-->
   <string name="msg_con">Konsoliderar databas</string>
   <string name="msg_con_error_bad_state">Konsolidering startade medan ingen databas var cachad! Detta är förmodligen ett programmeringsfel, skicka en buggrapport.</string>
   <string name="msg_con_save_secret">Sparar privata nyckelringar</string>
+  <string name="msg_con_save_public">Sparar publika nyckelringar</string>
+  <string name="msg_con_db_clear">Rensar databas</string>
   <string name="msg_con_success">Konsoliderade databas</string>
   <string name="msg_con_delete_public">Raderar cache-fil för publik nyckelring</string>
   <string name="msg_con_delete_secret">Raderar cache-fil för privat nyckelring</string>
@@ -632,31 +740,58 @@
     <item quantity="other">Återimporterar %d privata nycklar</item>
   </plurals>
   <string name="msg_con_reimport_secret_skip">Inga privata nycklar att återimportera, hoppar över…</string>
+  <!--Edit Key (higher level than modify)-->
+  <string name="msg_ed">Utför nyckeloperation</string>
+  <string name="msg_ed_caching_new">Cachar ny lösenordsfras</string>
+  <string name="msg_ed_error_key_not_found">Nyckel hittades inte!</string>
+  <string name="msg_ed_success">Nyckeloperation lyckades</string>
+  <!--Promote key-->
+  <string name="msg_pr_error_already_secret">Nyckeln är redan en privat nyckel!</string>
+  <string name="msg_pr_error_key_not_found">Nyckel hittades inte!</string>
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_divert">Det finns (ännu) inte stöd för att redigera NFC-nycklar!</string>
   <string name="msg_ek_error_dummy">Kan inte redigera nyckelring med en rensad huvudnyckel!</string>
   <string name="msg_ek_error_not_found">Nyckel hittades inte!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_askip_no_key">Data inte krypterade med känd nyckel, hoppar över…</string>
+  <string name="msg_dc_askip_not_allowed">Data inte krypterade med tillåten nyckel, hoppar över…</string>
   <string name="msg_dc_asym">Hittade block med asymmetriskt krypterad data för nyckel %s</string>
   <string name="msg_dc_clear_decompress">Packar upp komprimerad data</string>
+  <string name="msg_dc_clear_meta_file">Filnamn: %s</string>
+  <string name="msg_dc_clear_meta_mime">MIME-typ: %s</string>
+  <string name="msg_dc_clear_meta_size">Filstorlek: %s</string>
+  <string name="msg_dc_clear_signature_bad">Signaturkontroll INTE OK!</string>
   <string name="msg_dc_clear_signature_check">Verifierar signaturdata</string>
+  <string name="msg_dc_clear_signature_ok">Signaturkontroll OK</string>
   <string name="msg_dc_clear_signature">Sparar signaturdata till senare</string>
   <string name="msg_dc_clear">Bearbetar klartextdata</string>
+  <string name="msg_dc_error_extract_key">Okänt fel vid upplåsning av nyckel</string>
+  <string name="msg_dc_error_integrity_check">Fel vid integritetskontroll!</string>
   <string name="msg_dc_ok_meta_only">Endast metadata krävdes, hoppar över dekryptering</string>
+  <string name="msg_dc_ok">OK</string>
+  <string name="msg_dc_pass_cached">Använder lösenordsfras från cache</string>
   <string name="msg_dc_prep_streams">Förbereder strömmar för dekryptering</string>
+  <string name="msg_dc">Startar dekrypteringsoperation…</string>
+  <string name="msg_dc_sym_skip">Symmetrisk data inte tillåten, hoppar över…</string>
   <string name="msg_dc_sym">Hittade block med symmetriskt krypterad data</string>
   <string name="msg_dc_unlocking">Låser upp privat nyckel</string>
   <!--Messages for SignEncrypt operation-->
-  <string name="msg_se_asymmetric">Förbereder publika nycklar för kryptering</string>
-  <string name="msg_se_compressing">Förbereder kompression</string>
-  <string name="msg_se_encrypting">Krypterar data</string>
-  <string name="msg_se_error_bad_passphrase">Dålig lösenordsfras!</string>
-  <string name="msg_se_error_key_sign">Den valda signeringsnyckeln kan inte signera data!</string>
-  <string name="msg_se_error_pgp">Internt PGP-fel!</string>
-  <string name="msg_se_sigcrypting">Krypterar data med signatur</string>
-  <string name="msg_se_symmetric">Förbereder symmetrisk kryptering!</string>
+  <string name="msg_se_success">Signering/kryptering lyckades!</string>
+  <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_asymmetric">Förbereder publika nycklar för kryptering</string>
+  <string name="msg_pse_compressing">Förbereder komprimering</string>
+  <string name="msg_pse_encrypting">Krypterar data</string>
+  <string name="msg_pse_error_bad_passphrase">Dålig lösenordsfras!</string>
+  <string name="msg_pse_error_nfc">NFC datafel!</string>
+  <string name="msg_pse_error_no_passphrase">Ingen lösenordsfras angiven!</string>
+  <string name="msg_pse_error_pgp">Internt OpenPGP-fel!</string>
+  <string name="msg_pse_signing_cleartext">Skapar signatur i klartext</string>
+  <string name="msg_pse_sigcrypting">Krypterar data med signatur</string>
+  <string name="msg_pse_symmetric">Förbereder symmetrisk kryptering</string>
   <string name="msg_crt_error_master_not_found">Huvudnyckel hittades inte!</string>
   <string name="msg_crt_error_nothing">Inga nycklar certifierade!</string>
+  <string name="msg_crt_error_unlock">Fel vid upplåsning av huvudnyckel!</string>
+  <string name="msg_crt">Certifierar nyckelringar</string>
   <string name="msg_crt_save">Sparar certifierad nyckel %s</string>
   <string name="msg_crt_saving">Sparar nyckelringar</string>
   <string name="msg_crt_unlock">Låser upp huvudnyckel</string>
@@ -666,12 +801,25 @@
     <item quantity="one">Importerar nyckel</item>
     <item quantity="other">Importerar %d nycklar</item>
   </plurals>
-  <string name="msg_import_partial">Import lyckades, med fel!</string>
+  <string name="msg_import_fetch_keyserver">Hämtar från nyckelserver: %s</string>
+  <string name="msg_import_fetch_keyserver_ok">Nyckelhämtning lyckades</string>
+  <string name="msg_import_keyserver">Använder nyckelserver %s</string>
+  <string name="msg_import_fingerprint_ok">Kontroll av fingeravtyck OK</string>
+  <string name="msg_import_merge">Slår ihop data som tagits emot</string>
+  <string name="msg_import_error">Importoperation misslyckades!</string>
+  <string name="msg_import_partial">Importoperation lyckades, med fel!</string>
+  <string name="msg_import_success">Importoperation lyckades!</string>
+  <plurals name="msg_export">
+    <item quantity="one">Exporterar en nyckel</item>
+    <item quantity="other">Exporterar %d nycklar</item>
+  </plurals>
   <string name="msg_export_all">Exporterar alla nycklar</string>
   <string name="msg_export_public">Exporterar publik nyckel %s</string>
   <string name="msg_export_secret">Exporterar privat nyckel %s</string>
+  <string name="msg_export_error_fopen">Fel vid öppning av fil!</string>
+  <string name="msg_export_error_no_uri">Ingen URI specifierad!</string>
   <string name="msg_export_error_db">Databasfel!</string>
-  <string name="msg_export_success">Export lyckades</string>
+  <string name="msg_export_success">Exportoperation lyckades</string>
   <string name="msg_del_error_empty">Inget att radera!</string>
   <string name="msg_del_error_multi_secret">Privata nycklar kan bara raderas var för sig!</string>
   <plurals name="msg_del">
@@ -679,7 +827,18 @@
     <item quantity="other">Raderar %d nycklar</item>
   </plurals>
   <string name="msg_del_key">Raderar nyckel %s</string>
+  <string name="msg_del_key_fail">Misslyckades med att radera nyckel %s</string>
+  <plurals name="msg_del_ok">
+    <item quantity="one">Raderade nyckel</item>
+    <item quantity="other">Raderade %d nycklar</item>
+  </plurals>
+  <plurals name="msg_del_fail">
+    <item quantity="one">Misslyckades med att radera en nyckel</item>
+    <item quantity="other">Misslyckades med att radera %d nycklar</item>
+  </plurals>
+  <string name="msg_acc_saved">Konto sparat</string>
   <string name="msg_download_success">Hämtning lyckades!</string>
+  <string name="msg_download_no_valid_keys">Inga giltiga nycklar hittades i fil/urklipp!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">en del av den inlästa filen är ett giltigt OpenPGP-objekt men inte en OpenPGP-nyckel</item>
     <item quantity="other">delar av den inlästa filen är giltiga OpenPGP-objekt men inte OpenPGP-nycklar</item>
@@ -690,10 +849,17 @@
   <string name="passp_cache_notif_keys">Cachade lösenordsfraser:</string>
   <string name="passp_cache_notif_clear">Rensa cache</string>
   <string name="passp_cache_notif_pwd">Lösenordsfras</string>
+  <!--First Time-->
+  <string name="first_time_text1">Ta tillbaka din integritet med OpenKeychain!</string>
+  <string name="first_time_create_key">Skapa min nyckel!</string>
+  <string name="first_time_import_key">Importera från fil</string>
+  <string name="first_time_skip">Hoppa över inställning</string>
   <!--unsorted-->
-  <string name="section_cert">Certifikatdetaljer</string>
+  <string name="section_cert">Certifikatinformation</string>
   <string name="label_user_id">Identitet</string>
+  <string name="unknown_uid">&lt;okänd&gt;</string>
   <string name="empty_certs">Inga certifikat för den här nyckeln</string>
+  <string name="section_uids_to_certify">Identiteter för</string>
   <string name="label_revocation">Anledning till återkallelse</string>
   <string name="label_verify_status">Verifieringsstatus</string>
   <string name="label_cert_type">Typ</string>
@@ -709,9 +875,32 @@
   <string name="error_no_encrypt_subkey">Ingen krypteringsundernyckel tillgänglig!</string>
   <string name="info_no_manual_account_creation">Skapa inte OpenKeychain-konton manuellt. \nFör mer information, se Hjälp.</string>
   <string name="contact_show_key">Visa nyckel (%s)</string>
+  <string name="swipe_to_update">Dra nedåt för att uppdatera från nyckelserver</string>
   <string name="error_no_file_selected">Välj åtminstone en fil att kryptera!</string>
+  <string name="error_multi_not_supported">Att spara flera filer stöds ej. Detta är en begränsning i nuvarande Android.</string>
   <string name="key_colon">Nyckel:</string>
-  <!--First Time-->
-  <string name="first_time_create_key">Skapa min nyckel!</string>
-  <string name="first_time_skip">Hoppa över inställning</string>
+  <string name="user_id_none"><![CDATA[<none>]]></string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Ange lösenordsfras</string>
+  <string name="passphrase">Lösenordsfras</string>
+  <string name="noPassphrase">Ingen lösenordsfras</string>
+  <string name="passphrases_match">Lösenordsfraser stämmer överens</string>
+  <string name="passphrase_saved">Lösenordsfras sparad</string>
+  <string name="passphrase_invalid">Lösenordsfras ogiltig</string>
+  <string name="missing_passphrase">Lösenordsfras saknas</string>
+  <string name="passphrase_again">Igen</string>
+  <string name="lockpattern">Låsmönster</string>
+  <string name="lockpatternNFC">NFC + Låsmönster</string>
+  <string name="unlock_method">Upplåsningmetod</string>
+  <string name="set_passphrase">Sätt lösenordsfras</string>
+  <string name="draw_lockpattern">Dra låsmönster</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">Fel Tag. Försök igen.</string>
+  <string name="enable_nfc">Vänligen aktivera NFC i dina inställningar</string>
+  <string name="no_nfc_support">Denna enhet stöder inte NFC</string>
+  <string name="unlocked">Upplåst</string>
+  <string name="nfc_settings">Inställningar</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index c2aaaa741..194224708 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -8,19 +8,16 @@
   <string name="title_select_secret_key">Anahtarını Seç</string>
   <string name="title_encrypt_text">Metni Şifrele</string>
   <string name="title_encrypt_files">Dosyaları Şifrele</string>
-  <string name="title_decrypt">Çözümle</string>
-  <string name="title_unlock">Parola</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_preferences">Seçenekler</string>
   <string name="title_cloud_search_preferences">Bulut Arama Seçenekleri</string>
   <string name="title_api_registered_apps">Uygulamalar</string>
-  <string name="title_key_server_preference">Anahtar Sunucusu Seçenekleri</string>
   <string name="title_change_passphrase">Parolayı Değiştir</string>
-  <string name="title_share_fingerprint_with">Parmakizini şu şekilde paylaş...</string>
-  <string name="title_share_key">Anahtarı şu şekilde paylaş...</string>
-  <string name="title_share_file">Dosyayı şu şekilde paylaş...</string>
-  <string name="title_share_message">Mesajı şu şekilde paylaş...</string>
+  <string name="title_share_fingerprint_with">Parmak izini paylaş...</string>
+  <string name="title_share_key">Anahtarı paylaş...</string>
+  <string name="title_share_file">Dosyayı paylaş...</string>
+  <string name="title_share_message">Mesajı paylaş...</string>
   <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>
@@ -29,11 +26,13 @@
   <string name="title_export_keys">Anahtarları Ver</string>
   <string name="title_key_not_found">Anahtar Bulunamadı</string>
   <string name="title_send_key">Anahtar Sunucusuna Yükle</string>
-  <string name="title_certify_key">Kimlikleri Doğrula</string>
+  <string name="title_certify_key">Kimlikleri Tasdikle</string>
   <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>
@@ -42,21 +41,22 @@
   <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_certify">Doğrula</string>
+  <string name="section_certify">Tasdik et</string>
   <string name="section_actions">Eylemler</string>
   <string name="section_share_key">Anahtar</string>
-  <string name="section_certification_key">Anahtarınız sertifikalama için kullanıldı</string>
+  <string name="section_certification_key">Tasdik işlemi için kullanılan anahtarınız</string>
   <string name="section_upload_key">Anahtarı Eşitle</string>
   <string name="section_key_server">Anahtar Sunucusu</string>
-  <string name="section_fingerprint">Parmakizi</string>
-  <string name="section_key_to_certify">Doğrulanacak anahtar</string>
+  <string name="section_fingerprint">Parmak izi</string>
+  <string name="section_key_to_certify">Tasdik edilecek anahtar</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">Dosyayı çözümle, doğrula ve kaydet</string>
-  <string name="btn_decrypt_verify_message">Mesajı çözümle ve doğrula</string>
-  <string name="btn_encrypt_file">Dosyayı şifrele ve kaydet</string>
-  <string name="btn_encrypt_share_file">Dosyayı şifrele ve paylaş</string>
+  <string name="btn_decrypt_verify_file">Şifreyi çöz, doğrula ve dosyayı kaydet</string>
+  <string name="btn_decrypt_verify_message">Şifreyi çöz ve mesajı doğrula</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>
   <string name="btn_delete">Sil</string>
@@ -66,24 +66,24 @@
   <string name="btn_next">İleri</string>
   <string name="btn_back">Geri</string>
   <string name="btn_lookup_key">Anahtarı ara</string>
-  <string name="btn_share_encrypted_signed">Mesajı şifrele ve paylaş</string>
-  <string name="btn_view_cert_key">Sertifikalama anahtarını görüntüle</string>
+  <string name="btn_share_encrypted_signed">Şifrele ve mesajı paylaş</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>
-  <string name="btn_add_share_decrypted_text">Çözümlenmiş metni paylaş</string>
-  <string name="btn_decrypt_clipboard">Panodan çözümle</string>
+  <string name="btn_add_share_decrypted_text">Şifresi çözülmüş metni paylaş</string>
   <string name="btn_decrypt_and_verify">ve imzaları doğrula</string>
-  <string name="btn_decrypt_files">Dosyaları çözümle</string>
+  <string name="btn_decrypt_files">Dosyaların şifresini çöz</string>
   <!--menu-->
   <string name="menu_preferences">Ayarlar</string>
   <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_create_key">Anahtarımı oluştur</string>
+  <string name="menu_import_existing_key">Dosyadan al</string>
   <string name="menu_search">Ara</string>
-  <string name="menu_beam_preferences">Huzme ayarları</string>
+  <string name="menu_beam_preferences">NFC ayarları</string>
   <string name="menu_key_edit_cancel">İptal</string>
-  <string name="menu_encrypt_to">Buraya şifrele...</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>
@@ -95,22 +95,25 @@
   <string name="label_file_colon">Dosya:</string>
   <string name="label_no_passphrase">Parola Yok</string>
   <string name="label_passphrase">Parola</string>
-  <string name="label_unlock">Kilit Açılıyor...</string>
+  <string name="label_unlock">Kilit açılıyor...</string>
   <string name="label_passphrase_again">Parolayı Tekrarla</string>
   <string name="label_algorithm">Algoritma</string>
+  <string name="label_ascii_armor">ASCII formatında dosyalar</string>
+  <string name="label_file_ascii_armor">ASCII formatında çıktıları etkinleştir</string>
   <string name="label_write_version_header">Diğerlerinin OpenKeychain kullandığını bilmesine izin ver</string>
-  <string name="label_use_default_yubikey_pin">Yubikey PIN\'i varsayılan kullan</string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Yubikey PIN için numerik tuş takımını kullan</string>
-  <string name="label_label_use_default_yubikey_pin_summary">NFC üzerinden Yunikeys\'e ulaşmak için varsayılan PIN (123456) kullanılıyor</string>
+  <string name="label_write_version_header_summary">OpenPGP imzalarına, şifrelenmiş metinlere ve dışa aktarılmış anahtarlara \'OpenKeychain v2.7\' yazar</string>
+  <string name="label_use_default_yubikey_pin">Varsayılan YubiKey PIN\'ini kullan</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">YubiKey PIN\'i için sayısal klavyeyi kullan</string>
+  <string name="label_label_use_default_yubikey_pin_summary">NFC üzerinden YubiKey\'e ulaşmak için varsayılan PIN\'i (123456) kullanır</string>
   <string name="label_asymmetric_from">İmzalayan:</string>
-  <string name="label_to">Buraya şifrele:</string>
+  <string name="label_to">Şuna şifrele:</string>
   <string name="label_delete_after_encryption">Şifreleme sonrası dosyayı sil</string>
-  <string name="label_delete_after_decryption">Çözümleme sonrası sil</string>
+  <string name="label_delete_after_decryption">Şifre çözme sonrasında sil</string>
   <string name="label_encryption_algorithm">Şifreleme algoritması</string>
-  <string name="label_hash_algorithm">Hash algoritması</string>
+  <string name="label_hash_algorithm">Özet algoritması</string>
   <string name="label_symmetric">Parolayla şifrele</string>
   <string name="label_passphrase_cache_ttl">Önbellek zamanı</string>
-  <string name="label_passphrase_cache_subs">Altanahtar parola önbelleği</string>
+  <string name="label_passphrase_cache_subs">Parolaları altanahtarlara göre önbellekle</string>
   <string name="label_message_compression">Mesaj sıkıştırma</string>
   <string name="label_file_compression">Dosya sıkıştırma</string>
   <string name="label_keyservers">Anahtar Sunucuları</string>
@@ -124,8 +127,10 @@
   <string name="label_name">İsim</string>
   <string name="label_comment">Yorum</string>
   <string name="label_email">Eposta</string>
-  <string name="label_fingerprint">Parmakizi</string>
-  <string name="expiry_date_dialog_title">Son kullanma tarihini ayarla</string>
+  <string name="label_send_key">Bulut ile eşitle</string>
+  <string name="label_fingerprint">Parmak izi</string>
+  <string name="expiry_date_dialog_title">Zaman aşımı tarihini ayarla</string>
+  <string name="label_first_keyserver_is_used">(Listelenen ilk anahtar sunucu tercih edilecektir)</string>
   <string name="label_preferred">tercih edilen</string>
   <string name="user_id_no_name">&lt;isimsiz&gt;</string>
   <string name="none">&lt;hiçbiri&gt;</string>
@@ -133,8 +138,8 @@
   <string name="can_encrypt">şifreleyebilir</string>
   <string name="can_sign">imzalayabilir</string>
   <string name="can_certify">tasdikleyebilir</string>
-  <string name="can_certify_not">doğrulanamaz</string>
-  <string name="expired">tarihi geçmiş</string>
+  <string name="can_certify_not">tasdikleyemez</string>
+  <string name="expired">zaman aşımına uğramış</string>
   <string name="revoked">yürürlükten kaldırılmış</string>
   <plurals name="n_keys">
     <item quantity="one">1 anahtar</item>
@@ -169,10 +174,10 @@
   <string name="error">Hata</string>
   <string name="error_message">Hata: %s</string>
   <!--key flags-->
-  <string name="flag_certify">Doğrula</string>
-  <string name="flag_sign">İmzala</string>
-  <string name="flag_encrypt">Şifrele</string>
-  <string name="flag_authenticate">Yetkilendir</string>
+  <string name="flag_certify">Tasdikleme</string>
+  <string name="flag_sign">İmzalama</string>
+  <string name="flag_encrypt">Şifreleme</string>
+  <string name="flag_authenticate">Kimlik kanıtlama</string>
   <!--sentences-->
   <string name="wrong_passphrase">Yanlış parola.</string>
   <string name="no_filemanager_installed">Uyumlu dosya yöneticisi yüklenmedi.</string>
@@ -180,55 +185,76 @@
   <string name="passphrase_must_not_be_empty">Lütfen bir parola girin.</string>
   <string name="passphrase_for_symmetric_encryption">Simetrik şifreleme.</string>
   <string name="passphrase_for">\'%s\' için bir parola girin</string>
+  <string name="nfc_text">YubiKey\'inizi cihazınızın arkasında tutun.</string>
   <string name="file_delete_confirmation">Silmek istediğinize emin misiniz\n%s?</string>
   <string name="file_delete_successful">Başarıyla silindi.</string>
   <string name="no_file_selected">Önce bir dosya seçin.</string>
   <string name="encrypt_sign_successful">Başarıyla imzalandı ve/veya şifrelendi.</string>
-  <string name="encrypt_sign_clipboard_successful">Panoya başarıyla imzalandı ve/veya şifrelendi.</string>
+  <string name="encrypt_sign_clipboard_successful">Kopyalama önbelleğine başarıyla imzalandı ve/veya şifrelendi.</string>
   <string name="enter_passphrase_twice">Parolanızı iki kere girin.</string>
   <string name="select_encryption_key">En az bir şifreleme anahtarı seçiniz.</string>
-  <string name="select_encryption_or_signature_key">En az bir adet şifreleme anahtarı veya imza anahtarı seçiniz.</string>
-  <string name="key_deletion_confirmation_multi">Seçilen tüm açık anahtarları silmek istiyor musunuz?\nBu işlemi geri alamazsınız!</string>
-  <string name="public_key_deletetion_confirmation">\'%s\' genel anahtarını gerçekten silmek istiyor musunuz?\nBu geri alınamaz!</string>
-  <string name="key_exported">1 anahtar başarıyla verildi.</string>
-  <string name="keys_exported">%d anahtar başarıyla verildi.</string>
-  <string name="no_keys_exported">Hiç anahtar verilmedi.</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="key_deletion_confirmation_multi">Seçilen tüm genel anahtarları gerçekten silmek istiyor musunuz?\nBu işlemi geri alamazsınız!</string>
+  <string name="secret_key_deletion_confirmation">\'%s\' ÖZEL anahtarını gerçekten silmek istiyor musunuz?\nBu işlemi geri alamazsınız!</string>
+  <string name="public_key_deletetion_confirmation">\'%s\' genel anahtarını gerçekten silmek istiyor musunuz?\nBu işlemi geri alamazsınız!</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>
+  <string name="keys_exported">%d anahtar başarıyla dışa aktarıldı.</string>
+  <string name="no_keys_exported">Hiçbir anahtar dışa aktarılmadı.</string>
   <string name="key_creation_el_gamal_info">Not: sadece alt anahtarlar ElGamal destekler.</string>
   <string name="key_not_found">Anahtar %08X bulunamadı.</string>
-  <string name="list_empty">Liste boş!</string>
+  <plurals name="bad_keys_encountered">
+    <item quantity="one">%d bozuk özel anahtar yok sayıldı. Muhtemelen\n --export-secret-subkeys\nseçeneği ile dışa aktardınız. Onun yerine \n --export-secret-keys\nkullandığınıza emin olun.</item>
+    <item quantity="other">%d bozuk özel anahtar yok sayıldı. Muhtemelen\n --export-secret-subkeys\nseçeneği ile dışa aktardınız. Onun yerine \n --export-secret-keys\nkullandığınıza emin olun.</item>
+  </plurals>
+  <string name="list_empty">Bu liste boş!</string>
   <string name="nfc_successful">Anahtar NFC Beam ile başarıyla gönderildi!</string>
-  <string name="key_copied_to_clipboard">Anahtar panoya kopyalandı!</string>
-  <string name="fingerprint_copied_to_clipboard">Parmakizi panoya kopyalandı!</string>
-  <string name="key_too_big_for_sharing">Anatar bu yolla paylaşılamayacak kadar büyük!</string>
-  <string name="text_copied_to_clipboard">Metin panoya kopyalandı!</string>
+  <string name="key_copied_to_clipboard">Anahtar kopyalama önbelleğine kopyalandı!</string>
+  <string name="fingerprint_copied_to_clipboard">Parmak izi kopyalama önbelleğine kopyalandı!</string>
+  <string name="select_key_to_certify">Lütfen tasdikleme için kullanılacak bir anahtar seçin!</string>
+  <string name="key_too_big_for_sharing">Anahtar bu yolla paylaşılamayacak kadar büyük!</string>
+  <string name="text_copied_to_clipboard">Metin kopyalama önbelleğine kopyalandı!</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">\'%s\' silme başarısız</string>
+  <string name="error_file_delete_failed">\'%s\' silmesi başarısız oldu</string>
   <string name="error_file_not_found">dosya bulunamadı</string>
+  <string name="error_no_secret_key_found">uygun bir özel anahtar bulunamadı</string>
   <string name="error_external_storage_not_ready">harici depolama hazır değil</string>
-  <string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string>
+  <string name="error_key_size_minimum512bit">anahtar boyutu en az 512bit olmalı</string>
   <string name="error_unknown_algorithm_choice">bilinmeyen algoritma seçimi</string>
-  <string name="error_user_id_no_email">eposta bulunamadı</string>
+  <string name="error_user_id_no_email">herhangi bir eposta bulunamadı</string>
   <string name="error_key_needs_a_user_id">en az bir kimlik gerekli</string>
   <string name="error_no_signature_passphrase">parola verilmedi</string>
   <string name="error_no_signature_key">imza anahtarı verilmedi</string>
+  <string name="error_invalid_data">Geçerli olan şifrelenmiş ya da imzalanmış OpenPGP içeriği yok!</string>
   <string name="error_integrity_check_failed">Bütünlük kontrolü başarısız! Veri değiştirilmiş!</string>
   <string name="error_wrong_passphrase">yanlış parola</string>
+  <string name="error_could_not_extract_private_key">özel anahtar çıkarılamadı</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android\'in NFC Beam özelliğini kullanabilmek için Android 4.1 kullanmalısınız!</string>
   <string name="error_nfc_needed">Cihazınız NFC desteklemiyor!</string>
   <string name="error_nothing_import">Anahtar bulunamadı!</string>
-  <string name="error_generic_report_bug">Genel bir hata oluştu. Lütfen OpenKeychain için bir hata raporu oluşturun.</string>
+  <string name="error_contacts_key_id_missing">Kişilerden anahtar ID getirme işlemi başarısız!</string>
+  <string name="error_generic_report_bug">Genel bir hata oluştu, lütfen OpenKeychain için yeni bir hata raporu oluşturun.</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">İmzalanmadı</string>
   <string name="decrypt_result_invalid_signature">Geçersiz imza!</string>
-  <string name="decrypt_result_signature_uncertified">İmzalayan (doğrulanmadı!):</string>
+  <string name="decrypt_result_signature_uncertified">İmzalayan (tasdik edilmemiş!):</string>
   <string name="decrypt_result_signature_certified">İmzalayan:</string>
+  <string name="decrypt_result_signature_expired_key">Anahtar zaman aşımına uğramış!</string>
+  <string name="decrypt_result_signature_revoked_key">Anahtar yürürlükten kaldırılmış!</string>
+  <string name="decrypt_result_signature_missing_key">Bilinmeyen açık anahtar</string>
   <string name="decrypt_result_encrypted">Şifrelendi</string>
   <string name="decrypt_result_not_encrypted">Şifrelenmedi</string>
   <string name="decrypt_result_action_show">Göster</string>
   <string name="decrypt_result_action_Lookup">Araştır</string>
+  <string name="decrypt_invalid_text">Ya imza geçersiz ya da anahtar yürürlükten kaldırılmış/zaman aşımına uğramış. Metni kimin yazdığından emin olamazsınız. Yine de görüntülemek istiyor musunuz?</string>
+  <string name="decrypt_invalid_button">Tehlikelerin farkındayım, görüntüle!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Anahtarım:</string>
   <!--progress dialogs, usually ending in '…'-->
@@ -236,38 +262,52 @@
   <string name="progress_cancel">İptal</string>
   <string name="progress_cancelling">iptal ediliyor...</string>
   <string name="progress_saving">kaydediliyor...</string>
-  <string name="progress_importing">alıyor...</string>
-  <string name="progress_exporting">veriyor...</string>
+  <string name="progress_importing">içe aktarılıyor...</string>
+  <string name="progress_exporting">dışa aktarılıyor...</string>
   <string name="progress_uploading">yükleniyor...</string>
   <string name="progress_building_key">anahtar oluşturuluyor...</string>
+  <string name="progress_building_master_key">ana anahtarlık oluşturuluyor...</string>
   <string name="progress_generating_rsa">yeni RSA anahtarı oluşturuluyor...</string>
   <string name="progress_generating_dsa">yeni DSA anahtarı oluşturuluyor...</string>
   <string name="progress_generating_elgamal">yeni ElGamal anahtarı oluşturuluyor...</string>
   <string name="progress_generating_ecdsa">yeni ECDSA anahtarı oluşturuluyor...</string>
   <string name="progress_generating_ecdh">yeni ECDH anahtarı oluşturuluyor...</string>
-  <string name="progress_modify_subkeyadd">alt anahtar ekleniyor...</string>
+  <string name="progress_modify">anahtarlık değiştiriliyor...</string>
+  <string name="progress_modify_unlock">anahtarlık açılıyor...</string>
+  <string name="progress_modify_adduid">kullanıcı IDleri ekleniyor...</string>
+  <string name="progress_modify_revokeuid">kullanıcı IDleri yürürlükten kaldırılıyor...</string>
+  <string name="progress_modify_primaryuid">birincil kullanıcı IDsi değiştiriliyor...</string>
+  <string name="progress_modify_subkeychange">altanahtarlar değiştiriliyor...</string>
+  <string name="progress_modify_subkeyrevoke">altanahtarlar yürürlükten kaldırılıyor...</string>
+  <string name="progress_modify_subkeystrip">altanahtarlar çıkarılıyor...</string>
+  <string name="progress_modify_subkeyadd">altanahtarlar ekleniyor...</string>
   <string name="progress_modify_passphrase">parola değiştiriliyor...</string>
   <plurals name="progress_exporting_key">
-    <item quantity="one">anahtar veriliyor...</item>
-    <item quantity="other">anahtarlar veriliyor...</item>
+    <item quantity="one">anahtar dışa aktarılıyor...</item>
+    <item quantity="other">anahtarlar dışa aktarılıyor...</item>
   </plurals>
-  <string name="progress_extracting_signature_key">imza anahtarı veriliyor...</string>
-  <string name="progress_extracting_key">anahtarlar veriliyor...</string>
+  <string name="progress_extracting_signature_key">imza anahtarı çıkarılıyor...</string>
+  <string name="progress_extracting_key">anahtar çıkarılıyor...</string>
+  <string name="progress_preparing_streams">akışlar hazırlanıyor...</string>
   <string name="progress_encrypting">veri şifreleniyor...</string>
-  <string name="progress_decrypting">veri çözümleniyor...</string>
+  <string name="progress_decrypting">veri şifresi çözülüyor...</string>
   <string name="progress_preparing_signature">imza hazırlanıyor...</string>
   <string name="progress_generating_signature">imza oluşturuluyor...</string>
   <string name="progress_processing_signature">imza işleniyor...</string>
   <string name="progress_verifying_signature">imza doğrulanıyor...</string>
   <string name="progress_signing">imzalanıyor...</string>
-  <string name="progress_certifying">doğrulanıyor...</string>
+  <string name="progress_certifying">tasdikleniyor...</string>
   <string name="progress_reading_data">veri okunuyor...</string>
   <string name="progress_finding_key">anahtar bulunuyor...</string>
+  <string name="progress_decompressing_data">sıkıştırılmış veri açılıyor...</string>
   <string name="progress_verifying_integrity">bütünlük doğrulanıyor...</string>
+  <string name="progress_deleting_securely">\'%s\' güvenlice siliniyor...</string>
   <string name="progress_deleting">anahtarlar siliniyor...</string>
+  <string name="progress_con_saving">birleştir: önbelleğe kaydediliyor...</string>
+  <string name="progress_con_reimport">birleştir: yeniden içe aktarılıyor...</string>
   <!--action strings-->
-  <string name="hint_keyserver_search_hint">İsim/E-Posta/Anahtar Kimliği...</string>
-  <string name="hint_cloud_search_hint">İsim/E-Posta/Kanıt/Anahtar...</string>
+  <string name="hint_keyserver_search_hint">İsim/Eposta/Anahtar ID...</string>
+  <string name="hint_cloud_search_hint">İsim/Eposta/Kanıt/Anahtar...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -278,6 +318,9 @@
   <string name="key_size_4096">4096</string>
   <string name="key_size_8192">8192</string>
   <string name="key_size_custom">Özel anahtar boyutu</string>
+  <string name="key_size_custom_info">Özel anahtar boyutunu yazın (bit):</string>
+  <string name="key_size_custom_info_rsa">RSA anahtar boyutu 1024\'ten büyük olmalı ve en çok 16384 olabilir. Ek olarak 8 in katı olmalı.</string>
+  <string name="key_size_custom_info_dsa">DSA anahtar boyutu en az 512 olmalı ve en çok 1024 olabilir. Ek olarak 64 ün katı olmalı.</string>
   <!--elliptic curve names-->
   <string name="key_curve_nist_p256">NIST P-256</string>
   <string name="key_curve_nist_p384">NIST P-384</string>
@@ -292,31 +335,34 @@
   <!--Help-->
   <string name="help_tab_start">Başla</string>
   <string name="help_tab_faq">SSS</string>
-  <string name="help_tab_wot">Web of Trust</string>
+  <string name="help_tab_wot">Güven Ağı</string>
   <string name="help_tab_nfc_beam">NFC Beam</string>
   <string name="help_tab_changelog">Sürüm Notları</string>
   <string name="help_tab_about">Hakkında</string>
   <string name="help_about_version">Sürüm:</string>
   <!--Import-->
   <string name="import_tab_keyserver">Anahtar Sunucusu</string>
-  <string name="import_tab_cloud">Bulut Arama</string>
-  <string name="import_tab_direct">Dosya/Pano</string>
-  <string name="import_tab_qr_code">QR Kod/NFC</string>
-  <string name="import_import">Seçili anahtarları al</string>
+  <string name="import_tab_cloud">Bulutta Ara</string>
+  <string name="import_tab_direct">Dosya/Kopyalama önbelleği</string>
+  <string name="import_tab_qr_code">QR Kodu/NFC</string>
+  <string name="import_import">Seçili anahtarları içe aktar</string>
+  <string name="import_qr_code_wrong">QR Kodu hatalı! Lütfen tekrar deneyin!</string>
   <string name="import_qr_code_too_short_fingerprint">Parmak izi çok kısa (&lt; 16 karakter)</string>
+  <string name="import_qr_code_button">QR Kodu Tara</string>
   <!--Generic result toast-->
-  <string name="view_log">Günlüğü Görüntüle</string>
+  <string name="with_warnings">, uyarılarla</string>
+  <string name="with_cancelled">, iptal edilene kadar</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
-    <item quantity="one">Anahtar başarıyla alındı</item>
-    <item quantity="other">%1$d anahtar başarıyla alındı</item>
+    <item quantity="one">Anahtar başarıyla içe aktarıldı</item>
+    <item quantity="other">%1$d anahtar başarıyla içe aktarıldı</item>
   </plurals>
   <plurals name="import_keys_with_errors">
     <item quantity="one">Bir anahtar için alma başarısız.</item>
-    <item quantity="other">%d anahtar için alma başarısız!</item>
+    <item quantity="other">%d anahtar için içe aktarma başarısız!</item>
   </plurals>
-  <string name="import_error_nothing">Alınacak bir şey yok.</string>
-  <string name="import_error_nothing_cancelled">Alma iptal edildi.</string>
+  <string name="import_error_nothing">İçe aktarılacak bir şey yok.</string>
+  <string name="import_error_nothing_cancelled">İçe aktarma iptal edildi.</string>
   <!--Delete result toast-->
   <string name="delete_nothing">Silinecek bir şey yok.</string>
   <string name="delete_cancelled">Silme işlemi iptal edildi.</string>
@@ -340,7 +386,6 @@
   <string name="api_settings_start">Uygulamayı başlat</string>
   <string name="api_settings_delete_account">Hesabı sil</string>
   <string name="api_settings_package_name">Paket Adı</string>
-  <string name="api_settings_accounts">Hesaplar</string>
   <string name="api_settings_settings">Ayarlar</string>
   <string name="api_settings_key">Hesap anahtarı:</string>
   <string name="api_register_allow">Erişime izin ver</string>
@@ -373,6 +418,12 @@
   <string name="key_view_tab_share">Paylaş</string>
   <string name="key_view_tab_keys">Alt anahtarlar</string>
   <string name="key_view_tab_certs">Sertifikalar</string>
+  <string name="user_id_info_revoked_title">Yürürlükten kaldırılmış</string>
+  <string name="user_id_info_revoked_text">Bu kimlik anahtar sahibi tarafından yürürlükten kaldırılmış. Artık geçerli değil.</string>
+  <string name="user_id_info_certified_title">Tasdiklenmiş</string>
+  <string name="user_id_info_certified_text">Bu kimlik sizin tarafınızdan tasdiklendi.</string>
+  <string name="user_id_info_uncertified_title">Tasdiklenmemiş</string>
+  <string name="user_id_info_uncertified_text">Bu kimlik henüz tasdiklenmemiş. Bu kimliğin belirli bir kişiye ait olduğundan emin olamazsınız.</string>
   <string name="user_id_info_invalid_title">Geçersiz</string>
   <string name="user_id_info_invalid_text">Bu kimlikle ilgili yanlış olan bazı şeyler var!</string>
   <!--Edit key-->
@@ -380,6 +431,10 @@
   <string name="edit_key_action_add_identity">Kimlik Ekle</string>
   <string name="edit_key_action_add_subkey">Alt anahtar Ekle</string>
   <string name="edit_key_edit_user_id_title">Bir eylem seç!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Birincil Kimliğe geç</item>
+    <item>Kimliği Yürürlükten Kaldır</item>
+  </string-array>
   <string name="edit_key_edit_subkey_title">Bir eylem seç!</string>
   <string name="edit_key_new_subkey">yeni alt anahtar</string>
   <string name="edit_key_select_flag">Lütfen en az bir bayrak seçiniz!</string>
@@ -392,16 +447,15 @@
   <string name="create_key_final_text">Şu kimliği girdiniz:</string>
   <string name="create_key_final_robot_text">Anahtar oluşturma biraz zaman alabilir, bu sırada bir çay için...</string>
   <string name="create_key_rsa">(3 alt anahtar, RSA, 4096 bit)</string>
+  <string name="create_key_custom">(özel anahtar yapılandırması)</string>
   <string name="create_key_text">Tam isminizi, e-posta adresinizi girin ve bir parola seçin.</string>
   <string name="create_key_hint_full_name">Tam Ad, örneğin: Max Mustermann</string>
   <string name="create_key_edit">Anahtar yapılandırmasını değiştir.</string>
   <!--View key-->
+  <string name="view_key_revoked">Bu anahtar yürürlükten kaldırıldı!</string>
   <string name="view_key_expired">Bu anahtarın son kullanma tarihi geçmiş!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Anahtarlar</string>
-  <string name="nav_encrypt_text">Metni şifrele</string>
-  <string name="nav_encrypt_files">Dosyaları şifrele</string>
-  <string name="nav_decrypt">Çözümle</string>
   <string name="nav_apps">Uygulamalar</string>
   <string name="my_keys">Anahtarlarım</string>
   <!--hints-->
@@ -420,6 +474,7 @@
   <string name="msg_ip_delete_old_ok">Eski anahtarları veritabanından sil</string>
   <string name="msg_ip_prepare">Veritabanı işlemleri hazırlanıyor</string>
   <string name="msg_ip_master">Ana anahtar %s işleniyor</string>
+  <string name="msg_ip_uid_cert_error">Sertifika işlenirken hata!</string>
   <!--Import Secret log entries-->
   <string name="msg_is_db_exception">Veritabanı hatası!</string>
   <!--Keyring Canonicalization log entries-->
@@ -432,12 +487,21 @@
   <!--modifySecretKeyRing-->
   <string name="msg_mf_subkey_new_id">Yeni alt anahtar ID: %s</string>
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Anahtar bulunamadı!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_error_no_data">Akış içinde şifrelenmiş veri bulunamadı!</string>
+  <string name="msg_dc_error_no_key">Akış içinde bilinen özel anahtar ile şifrelenmiş veri bulunamadı!</string>
+  <string name="msg_dc_prep_streams">Çözümleme için akışlar hazırlanıyor</string>
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_warn_not_found">Anahtar bulunamadı!</string>
+  <string name="msg_import_keyserver">%s anahtar sunucusu kullanılıyor</string>
+  <string name="msg_import_fingerprint_ok">Parmakizi kontrolü TAMAM</string>
   <string name="msg_export_all">Tüm anahtarları dışa aktarma</string>
+  <string name="msg_export_error_uri_open">URI akışı açılırken hata!</string>
   <string name="msg_export_error_db">Veritabanı hatası!</string>
   <string name="msg_export_error_io">Giriş/çıkış hatası!</string>
   <string name="msg_export_success">Dışa aktarma işlemi başarılı</string>
@@ -447,22 +511,39 @@
   <!--PassphraseCache-->
   <string name="passp_cache_notif_clear">Önbelleği Temizle</string>
   <string name="passp_cache_notif_pwd">Parola</string>
+  <!--First Time-->
+  <string name="first_time_text1">Gizliliğinizi OpenKeychain ile geri alın!</string>
+  <string name="first_time_create_key">Anahtarımı oluştur</string>
+  <string name="first_time_import_key">Dosyadan içe aktar</string>
+  <string name="first_time_skip">Kurulumu Atla</string>
   <!--unsorted-->
   <string name="section_cert">Sertifika Detayları</string>
   <string name="label_user_id">Kimlik</string>
   <string name="unknown_uid">&lt;bilinmeyen&gt;</string>
   <string name="empty_certs">Bu anahtar için sertifika yok</string>
+  <string name="label_revocation">Yürürlükten Kaldırma Nedeni</string>
   <string name="label_verify_status">Doğrulama Durumu</string>
   <string name="label_cert_type">Tip</string>
   <string name="error_key_not_found">Anahtar bulunamadı!</string>
+  <string name="error_key_processing">Anahtar işlenirken hata!</string>
+  <string name="key_stripped">çıkartıldı</string>
+  <string name="key_divert">AkıllıKart/NFC için yönlendir</string>
   <string name="key_no_passphrase">parola yok</string>
   <string name="key_unavailable">mevcut değil</string>
+  <string name="secret_cannot_multiple">Kendi anahtarlarınız yalnızca teker teker silinebilir!</string>
   <string name="title_view_cert">Sertifika Ayrıntılarını Görüntüle</string>
   <string name="unknown_algorithm">bilinmeyen</string>
   <string name="can_sign_not">imzalanamadı</string>
+  <string name="error_no_encrypt_subkey">Şifreleme için kullanılabilecek altanahtar mevcut değil!</string>
+  <string name="info_no_manual_account_creation">OpenKeychain-hesaplarını kendiniz oluşturmayın.\nDaha fazla bilgi için Yardım bölümüne bakın.</string>
   <string name="contact_show_key">Anahtarı göster (%s)</string>
+  <string name="swipe_to_update">Anahtar sunucudan güncelleme almak için parmağınızı aşağıya doğru kaydırın</string>
+  <string name="error_no_file_selected">Şifrelemek için en az bir dosya seçin!</string>
+  <string name="error_multi_not_supported">Birden çok dosyanın kaydedilmesi desteklenmiyor. Bu şu anki Android\'in bir kısıtlamasıdır.</string>
   <string name="key_colon">Anahtar:</string>
-  <!--First Time-->
-  <string name="first_time_create_key">Anahtarımı oluştur</string>
-  <string name="first_time_skip">Kurulumu Atla</string>
+  <string name="exchange_description">Anahtar değiş tokuşu başlatmak için sağ taraftan katılımcıların sayısını seçin ve \"Değiş tokuşu başlat\" tuşuna tıklayın.\n\nSadece istenilen katılımcıların değişim işleminde olduğundan ve parmak izlerinin doğruluğundan emin olmak için size iki soru daha sorulacak.</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 80e920b8b..a8e4ac3b4 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -2,16 +2,17 @@
 <resources>
   <!--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").-->
+  <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_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>
   <string name="title_share_fingerprint_with">Поділитися відбитком із…</string>
   <string name="title_share_key">Поділитися ключем з…</string>
@@ -20,6 +21,7 @@
   <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>
@@ -29,17 +31,27 @@
   <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_certify">Сертифікувати</string>
   <string name="section_actions">Дії</string>
+  <string name="section_share_key">Ключ</string>
   <string name="section_certification_key">Ваш ключ використаний для сертифікації</string>
+  <string name="section_upload_key">Синхронізувати ключ</string>
   <string name="section_key_server">Сервер ключів</string>
   <string name="section_fingerprint">Відбиток</string>
   <string name="section_key_to_certify">Ключ для сертикації</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_decrypt_verify_message">Розшифрувати і перевірити повідомлення</string>
@@ -58,12 +70,16 @@
   <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_and_verify">і перевірити підписи</string>
+  <string name="btn_decrypt_files">Розшифрувати файли</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_create_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>
@@ -79,11 +95,27 @@
   <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_algorithm">Алгоритм</string>
   <string name="label_ascii_armor">Файл ASCII Armor</string>
+  <string name="label_file_ascii_armor">Увімкнути ASCII Armor</string>
   <string name="label_write_version_header">Нехай інші дізнаються, що ви користуєтеся OpenKeychain</string>
   <string name="label_write_version_header_summary">Напишіть \'OpenKeychain v2.7\' для підписів, зашифрованого тексту та експортованих ключів  OpenPGP</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) для доступу до YubiKey чреез NFC</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_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">ІД ключа</string>
   <string name="label_creation">Створення</string>
@@ -95,8 +127,11 @@
   <string name="label_name">Назва</string>
   <string name="label_comment">Коментар</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="user_id_no_name">&lt;без імені&gt;</string>
   <string name="none">&lt;жоден&gt;</string>
   <string name="no_key">&lt;без ключа&gt;</string>
@@ -152,6 +187,7 @@
   <string name="passphrase_must_not_be_empty">Будь ласка, введіть парольну фразу.</string>
   <string name="passphrase_for_symmetric_encryption">Симетричне шифрування.</string>
   <string name="passphrase_for">Введіть парольну фразу для \'%s\'</string>
+  <string name="file_delete_confirmation">Ви справді хочете вилучити\n%s?</string>
   <string name="file_delete_successful">Успішно вилучено.</string>
   <string name="no_file_selected">Виберіть спершу файл.</string>
   <string name="encrypt_sign_successful">Успішно підписано та/або перевірено.</string>
@@ -159,18 +195,33 @@
   <string name="enter_passphrase_twice">Введіть двічі парольну фразу.</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="key_deletion_confirmation_multi">Ви справді хочете вилучити усі вибрані відкриті ключі?\nВи не зможете це відмінити!</string>
+  <string name="secret_key_deletion_confirmation">Ви справді хочете вилучити секретний ключ \'%s\'?\nВи не зможете це відмінити!</string>
+  <string name="public_key_deletetion_confirmation">Ви справді хочете вилучити відкритий ключ \'%s\'?\nВи не зможете це відмінити!</string>
   <string name="also_export_secret_keys">Також експортувати секретні ключі</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>
+  <plurals name="bad_keys_encountered">
+    <item quantity="one">%d поганий секретний ключ проігнорований. Можливо ви експортували з параметром\n
+ --export-secret-subkeys\nЗробіть ваш експорт з   --export-secret-keys\n натомість.</item>
+    <item quantity="few">%d погані секретні ключі проігноровані. Можливо ви експортували з параметром\n
+ --export-secret-subkeys\nЗробіть ваш експорт з   --export-secret-keys\n натомість.</item>
+    <item quantity="other">%d поганих секретних ключів проігноровано. Можливо ви експортували з параметром\n
+ --export-secret-subkeys\nЗробіть ваш експорт з   --export-secret-keys\n натомість.</item>
+  </plurals>
   <string name="list_empty">Цей список - порожній!</string>
   <string name="nfc_successful">Успішно надіслано ключ через промінь NFC!</string>
   <string name="key_copied_to_clipboard">Ключ вже скопійовано у буфер обміну!</string>
   <string name="fingerprint_copied_to_clipboard">Відбиток вже скопійовано до буфера обміну!</string>
   <string name="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"-->
@@ -193,8 +244,18 @@
   <string name="error_nothing_import">Ключ не знайдено!</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_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>
   <!--Add keys-->
+  <string name="add_keys_my_key">Мій ключ:</string>
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">Готово.</string>
   <string name="progress_cancel">Скасувати</string>
@@ -284,7 +345,6 @@
   <string name="import_qr_code_wrong">Невірний штрих-код! Спробуйте знову!</string>
   <string name="import_qr_code_too_short_fingerprint">Відбиток надто короткий (&lt; 16 символів)</string>
   <!--Generic result toast-->
-  <string name="view_log">Переглянути журнал</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="one">Успішно імпортовано ключ.</item>
@@ -307,7 +367,10 @@
     <item quantity="other">Успішно оновлено %1$d ключів%2$s.</item>
   </plurals>
   <string name="import_error_nothing">Нема що імпортувати.</string>
+  <string name="import_error_nothing_cancelled">Імпорт скасовано.</string>
   <!--Delete result toast-->
+  <string name="delete_nothing">Нема що вилучати.</string>
+  <string name="delete_cancelled">Операція вилучення скасована.</string>
   <!--Certify result toast-->
   <!--Intent labels-->
   <string name="intent_decrypt_file">Розшифрувати файл з OpenKeychain</string>
@@ -329,7 +392,7 @@
   <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_accounts">Облікові записи</string>
+  <string name="api_settings_settings">Параметри</string>
   <string name="api_settings_accounts_empty">Немає облікового запису приєднаного до цієї програми.</string>
   <string name="api_register_allow">Дозволити доступ</string>
   <string name="api_register_disallow">Не дозволити доступ</string>
@@ -348,17 +411,25 @@
     <item quantity="few">%d ключі вибрано.</item>
     <item quantity="other">%d ключів вибрано.</item>
   </plurals>
+  <string name="key_list_empty_text1">Ключ не знайдено!</string>
+  <string name="key_list_filter_show_all">Показати усі ключі</string>
   <!--Key view-->
   <string name="key_view_action_edit">Редагувати ключ</string>
+  <string name="key_view_action_encrypt">Зашифрувати текст</string>
+  <string name="key_view_action_encrypt_files">файли</string>
   <string name="key_view_action_certify">Сертифікувати сутності</string>
   <string name="key_view_action_update">Оновити із сервера ключів</string>
   <string name="key_view_action_share_with">Поділитися із…</string>
+  <string name="key_view_action_share_nfc">Поділитися через NFC</string>
+  <string name="key_view_action_upload">Вивантажити на сервер ключів</string>
   <string name="key_view_tab_main">Основна інформація</string>
   <string name="key_view_tab_share">Поділитися</string>
   <string name="key_view_tab_keys">Підключі</string>
   <string name="key_view_tab_certs">Сертифікати</string>
   <string name="user_id_info_revoked_title">Відхилено</string>
   <string name="user_id_info_revoked_text">Ця сутність вже відкликана власником ключа. Вона більше не дійсна.</string>
+  <string name="user_id_info_certified_title">Сертифіковано</string>
+  <string name="user_id_info_uncertified_title">Несертифіковано</string>
   <string name="user_id_info_invalid_title">Недійсна</string>
   <string name="user_id_info_invalid_text">Щось неправильне у цій сутності!</string>
   <!--Edit key-->
@@ -368,7 +439,10 @@
   <string name="edit_key_edit_user_id_title">Виберіть дію!</string>
   <string name="edit_key_edit_user_id_revoked">Ця сутність вже відкликана. Це не можна скасувати.</string>
   <string name="edit_key_edit_subkey_title">Виберіть дію!</string>
+  <string name="edit_key_new_subkey">новий підключ</string>
   <string name="edit_key_select_flag">Будь ласка, виберіть хоча б один прапор!</string>
+  <string name="edit_key_error_add_identity">Додати хоча б одну сутність!</string>
+  <string name="edit_key_error_add_subkey">Додати хоча б один підключ!</string>
   <!--Create key-->
   <string name="create_key_upload">Відвантажити ключ на сервер ключів</string>
   <string name="create_key_empty">Це поле - обов\'язкове</string>
@@ -386,6 +460,7 @@
   <string name="drawer_close">Закрити панель навігації</string>
   <string name="my_keys">Мої ключі</string>
   <!--hints-->
+  <string name="encrypt_content_edit_text_hint">Набрати текст</string>
   <!--certs-->
   <string name="cert_default">типово</string>
   <string name="cert_none">жоден</string>
@@ -397,12 +472,17 @@
   <string name="cert_verify_error">Помилка!</string>
   <string name="cert_verify_unavailable">Недоступний ключ</string>
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <string name="msg_internal_error">Внутрішня помилка!</string>
+  <string name="msg_cancelled">Операція скасована.</string>
   <!--Import Public log entries-->
   <string name="msg_ip_apply_batch">Застосовується пакетна операція вставки.</string>
   <string name="msg_ip_bad_type_secret">Спробували імпортувати секретну в\'язку як публічну. Це вада. Будь ласка, відправте звіт!</string>
   <string name="msg_ip_delete_old_fail">Нема вилученого старого ключа (створюється новий?)</string>
   <string name="msg_ip_delete_old_ok">Вилучений старий ключ з бази даних</string>
   <string name="msg_ip_encode_fail">Операція не вдалася через помилку кодування</string>
+  <string name="msg_ip_error_io_exc">Операція не вдалася через помилку введення/виведення</string>
+  <string name="msg_ip_error_op_exc">Операція не вдалася через помилку бази даних</string>
+  <string name="msg_ip_error_remote_ex">Операція не вдалася через внутрішню помилку</string>
   <string name="msg_ip">Імпортується публічна в\'язка %s</string>
   <string name="msg_ip_insert_keyring">Шифруються дані із в\'язки</string>
   <string name="msg_ip_insert_keys">Аналізуються ключі</string>
@@ -423,12 +503,14 @@
     <item quantity="few">Ігнорується %s сертифікати, виданих невідомими відкритими ключами</item>
     <item quantity="other">Ігнорується %s сертифікатів, виданих невідомими відкритими ключами</item>
   </plurals>
+  <string name="msg_ip_uid_revoked">ІД користувача відхилене</string>
   <string name="msg_is_bad_type_public">Спробували імпортувати публічну в\'язку як секретну. Це вада. Будь ласка, відправте звіт!</string>
   <string name="msg_is_bad_type_uncanon">Спробували імпортувати в\'язку без канонізації. Це вада. Будь ласка, відправте звіт!</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Імпортується секретний ключ %s</string>
   <string name="msg_is_db_exception">Помилка бази даних!</string>
   <string name="msg_is_importing_subkeys">Опрацьовуються секретні підключі</string>
+  <string name="msg_is_error_io_exc">Помилка шифрування в’язки</string>
   <string name="msg_is_pubring_generate">Генерується публічна в\'язка із секретної</string>
   <string name="msg_is_success_identical">В\'язка не містить нових даних. Нема що робити.</string>
   <string name="msg_is_success">Успішно імпортована секретна в\'язка</string>
@@ -456,12 +538,12 @@
   <string name="msg_mg_secret">Злиття у секретну в\'язку %s</string>
   <string name="msg_mg_new_subkey">Додається новий підключ %s</string>
   <string name="msg_mg_found_new">Знайдено %s нових сертифікатів у в\'язці</string>
+  <string name="msg_mg_unchanged">Нема що зливати</string>
   <!--createSecretKeyRing-->
   <string name="msg_cr">Генерується новий основний ключ</string>
   <string name="msg_cr_error_no_master">Не вказано параметрів основного ключа!</string>
   <string name="msg_cr_error_no_certify">Основний ключ повинен мати прапорець certify!</string>
   <string name="msg_cr_error_keysize_512">Розмір ключа має бути більшим або рівним 512!</string>
-  <string name="msg_cr_error_internal_pgp">Внутрішня помилка PGP!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Змінюється в\'язка %s</string>
   <string name="msg_mf_error_encode">Виняток шифрування!</string>
@@ -469,23 +551,46 @@
   <string name="msg_mf_error_keyid">Немає ІД ключа. Це внутрішня помилка! Будь ласка, надішліть звіт про ваду!</string>
   <string name="msg_mf_error_integrity">Внутрішня помилка - збій перевірки цілісності!</string>
   <string name="msg_mf_error_master_none">Не знайдено основного сертифікату для операцій! (Усе відкликано?)</string>
+  <string name="msg_mf_error_noexist_primary">Вказаний поганий ІД первинного користувача!</string>
+  <string name="msg_mf_error_noexist_revoke">Вказаний поганий ІД первинного користувача!</string>
+  <string name="msg_mf_error_revoked_primary">ІД відхилених користувачів не може бути первинним!</string>
   <string name="msg_mf_error_sig">Виняток підпису!</string>
   <string name="msg_mf_master">Змінюються основі сертифікації</string>
+  <string name="msg_mf_primary_replace_old">Замінюється сертифікат ІД попереднього первинного користувача</string>
+  <string name="msg_mf_primary_new">Генерується новий сертифікат для ІД нового первинного користувача</string>
   <string name="msg_mf_subkey_change">Змінюється підключ %s</string>
   <string name="msg_mf_error_subkey_missing">Спробували працювати із втраченим підключем %s!</string>
+  <string name="msg_mf_subkey_new">Додається новий підключ типу %s</string>
   <string name="msg_mf_subkey_new_id">Новий ід підключа: %s</string>
   <string name="msg_mf_error_past_expiry">Дата завершення дії не може бути у минулому!</string>
   <string name="msg_mf_subkey_revoke">Відкликається підключ %s</string>
   <string name="msg_mf_success">Успішно модифіковано в\'язку</string>
+  <string name="msg_mf_uid_add">Додається ід користувача %s</string>
+  <string name="msg_mf_uid_primary">Змінюється первинне ІД користувача на %s</string>
+  <string name="msg_mf_uid_revoke">Відхилення ІД користувача %s</string>
   <string name="msg_mf_uid_error_empty">ІД користувача не повинно бути порожнім!</string>
   <string name="msg_mf_unlock_error">Помилка розблокування в\'язки!</string>
   <string name="msg_mf_unlock">Розблоковується в\'язка</string>
   <!--Consolidate-->
+  <string name="msg_con_save_secret">Збереження секретних  в\'язок</string>
+  <string name="msg_con_save_public">Збереження публічних в\'язок</string>
+  <string name="msg_con_db_clear">Очищення бази даних</string>
+  <string name="msg_con_error_db">Помилка відкриття бази даних!</string>
   <string name="msg_con_error_public">Помилка повторного імпорту публічних ключів!</string>
   <string name="msg_con_error_secret">Помилка повторного імпорту секретних ключів!</string>
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_not_found">Ключ не знайдено!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_clear_meta_file">Назва файла: %s</string>
+  <string name="msg_dc_clear_meta_mime">Тип MIME: %s</string>
+  <string name="msg_dc_clear_meta_size">Розмір файла: %s</string>
+  <string name="msg_dc_clear_meta_time">Час зміни: %s</string>
+  <string name="msg_dc_error_integrity_check">Помилка перевірки цілісності!</string>
+  <string name="msg_dc_ok">Гаразд</string>
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">частина завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item>
     <item quantity="few">частини завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item>
@@ -496,6 +601,10 @@
   <string name="passp_cache_notif_n_keys">OpenKeychain має %d кешованих парольних фраз</string>
   <string name="passp_cache_notif_keys">Кешовані парольні фрази:</string>
   <string name="passp_cache_notif_clear">Очистити кеш</string>
+  <!--First Time-->
+  <string name="first_time_text1">Заберіть вашу приватність із OpenKeychain!</string>
+  <string name="first_time_create_key">Створити мій ключ</string>
+  <string name="first_time_skip">Пропустити установку</string>
   <!--unsorted-->
   <string name="section_certifier_id">Ким підписаний</string>
   <string name="section_cert">Дані сертифікату</string>
@@ -514,8 +623,8 @@
   <string name="can_sign_not">не можна підписати</string>
   <string name="error_no_encrypt_subkey">Жодний підключ шифрування недоступний!</string>
   <string name="contact_show_key">Показати ключ (%s)</string>
-  <!--First Time-->
-  <string name="first_time_text1">Заберіть вашу приватність із OpenKeychain!</string>
-  <string name="first_time_create_key">Створити мій ключ</string>
-  <string name="first_time_skip">Пропустити установку</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index 86fd2b4ac..daa0a171b 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -9,13 +9,10 @@
   <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_preferences">偏好設定</string>
-  <string name="title_cloud_search_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>
   <string name="title_share_fingerprint_with">分享指紋…</string>
   <string name="title_share_key">分享金鑰…</string>
@@ -24,6 +21,7 @@
   <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,13 +31,16 @@
   <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_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_certification_key">用來簽署的私鑰</string>
   <string name="section_key_server">金鑰伺服器</string>
   <string name="section_fingerprint">指紋</string>
@@ -65,7 +66,6 @@
   <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>
   <!--menu-->
@@ -74,6 +74,7 @@
   <string name="menu_export_key">匯出到檔案</string>
   <string name="menu_delete_key">刪除金鑰</string>
   <string name="menu_create_key">建立金鑰</string>
+  <string name="menu_import_existing_key">從檔案匯入</string>
   <string name="menu_search">搜尋</string>
   <string name="menu_beam_preferences">Beam 設定</string>
   <string name="menu_key_edit_cancel">取消</string>
@@ -91,8 +92,6 @@
   <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_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>
@@ -100,6 +99,7 @@
   <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>
@@ -113,6 +113,7 @@
   <string name="label_name">名字</string>
   <string name="label_comment">註記</string>
   <string name="label_email">Email</string>
+  <string name="label_send_key">與雲端同步</string>
   <string name="label_fingerprint">指紋</string>
   <string name="expiry_date_dialog_title">設定效期</string>
   <string name="can_encrypt">可以加密</string>
@@ -151,28 +152,62 @@
   <string name="flag_authenticate">驗證</string>
   <!--sentences-->
   <string name="wrong_passphrase">口令錯誤。</string>
+  <string name="no_filemanager_installed">找不到相容的檔案管理員。</string>
+  <string name="passphrases_do_not_match">口令不相符。</string>
+  <string name="passphrase_must_not_be_empty">請輸入口令。</string>
   <string name="passphrase_for_symmetric_encryption">對稱加密。</string>
+  <string name="file_delete_confirmation">你確定要刪除\n%s？</string>
   <string name="file_delete_successful">刪除成功。</string>
+  <string name="no_file_selected">請先選擇檔案。</string>
+  <string name="encrypt_sign_successful">成功簽名並/或加密。</string>
+  <string name="encrypt_sign_clipboard_successful">成功簽名並/或加密到剪貼簿。</string>
+  <string name="enter_passphrase_twice">重複輸入口令</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="key_deletion_confirmation_multi">你確定要刪除選擇的公鑰？\n此動作無法復原！</string>
+  <string name="secret_key_deletion_confirmation">你確定要刪除密鑰\'%s\'？\n此動作無法復原！</string>
+  <string name="public_key_deletetion_confirmation">你確定要刪除公鑰\'%s\'？\n此動作無法復原！</string>
   <string name="also_export_secret_keys">一併匯出私鑰</string>
   <string name="key_exported">成功匯出 1 把金鑰。</string>
   <string name="keys_exported">成功匯出 %d 把金鑰。</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">刪除%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_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_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_nothing_import">找不到金鑰！</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_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_invalid_text">簽名無效或是金鑰已經過期/被撤銷，無法確認訊息內容的作者。是否繼續顯示？</string>
+  <string name="decrypt_invalid_button">我明白這樣做的風險，顯示它！</string>
   <!--Add keys-->
   <!--progress dialogs, usually ending in '…'-->
   <string name="progress_done">完成。</string>
@@ -182,43 +217,240 @@
   <string name="progress_importing">匯入中…</string>
   <string name="progress_exporting">匯出中…</string>
   <string name="progress_uploading">正在上傳…</string>
+  <string name="progress_generating_rsa">正在產生新的RSA金鑰…</string>
+  <string name="progress_generating_dsa">正在產生新的DSA金鑰…</string>
+  <string name="progress_generating_elgamal">正在產生新的ElGamal金鑰…</string>
+  <string name="progress_generating_ecdsa">正在產生新的ECDSA金鑰…</string>
+  <string name="progress_generating_ecdh">正在產生新的ECDH金鑰…</string>
+  <string name="progress_modify">正在變更鑰匙圈…</string>
+  <string name="progress_modify_unlock">正在解鎖鑰匙圈…</string>
+  <string name="progress_modify_adduid">正在新增使用者身份…</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_subkeyadd">正在新增子金鑰…</string>
+  <string name="progress_modify_passphrase">正在變更口令…</string>
+  <plurals name="progress_exporting_key">
+    <item quantity="other">正在匯出金鑰…</item>
+  </plurals>
+  <string name="progress_extracting_signature_key">正在抽取簽名金鑰…</string>
+  <string name="progress_extracting_key">正在抽取金鑰…</string>
+  <string name="progress_preparing_streams">正在準備串流…</string>
+  <string name="progress_encrypting">正在加密資料…</string>
+  <string name="progress_decrypting">正在解密資料…</string>
+  <string name="progress_preparing_signature">正在準備簽名…</string>
+  <string name="progress_generating_signature">正在產生簽名…</string>
+  <string name="progress_processing_signature">正在處理簽名…</string>
+  <string name="progress_verifying_signature">正在驗證簽名…</string>
+  <string name="progress_signing">簽名中…</string>
+  <string name="progress_certifying">正在認證…</string>
+  <string name="progress_reading_data">正在讀取資料…</string>
+  <string name="progress_finding_key">正在尋找金鑰…</string>
+  <string name="progress_decompressing_data">正在解壓縮…</string>
+  <string name="progress_verifying_integrity">正在驗證完整性…</string>
+  <string name="progress_deleting">正在刪除金鑰…</string>
   <!--action strings-->
   <!--key bit length selections-->
+  <string name="key_size_512">512</string>
+  <string name="key_size_768">768</string>
+  <string name="key_size_1024">1024</string>
+  <string name="key_size_1536">1536</string>
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_3072">3072</string>
+  <string name="key_size_4096">4096</string>
+  <string name="key_size_8192">8192</string>
+  <string name="key_size_custom">自訂金鑰長度</string>
   <!--elliptic curve names-->
+  <string name="key_curve_nist_p256">NIST P-256</string>
+  <string name="key_curve_nist_p384">NIST P-384</string>
+  <string name="key_curve_nist_p521">NIST P-521</string>
   <!--not in for now, see SaveKeyringParcel
     <string name="key_curve_bp_p256">"Brainpool P-256"</string>
     <string name="key_curve_bp_p384">"Brainpool P-384"</string>
     <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
   <!--compression-->
+  <string name="compression_fast">快</string>
+  <string name="compression_very_slow">非常慢</string>
   <!--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>
+  <string name="help_about_version">版本：</string>
   <!--Import-->
+  <string name="import_tab_keyserver">金鑰伺服器</string>
+  <string name="import_tab_cloud">雲端查詢</string>
+  <string name="import_tab_direct">檔案/剪貼簿</string>
+  <string name="import_tab_qr_code">二維條碼/NFC</string>
+  <string name="import_import">匯入選擇的金鑰</string>
+  <string name="import_qr_code_button">掃描二維條碼</string>
   <!--Generic result toast-->
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="other">成功匯入%1$d金鑰</item>
+  </plurals>
+  <plurals name="import_keys_added_and_updated_2">
+    <item quantity="other">並更新%1$d金鑰%2$s。</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="other">成功匯入%1$d金鑰%2$s。</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="other">成功更新%1$d金鑰%2$s。</item>
+  </plurals>
+  <string name="import_error_nothing">沒有東西可以匯入。</string>
+  <string name="import_error_nothing_cancelled">匯入已取消。</string>
   <!--Delete result toast-->
+  <string name="delete_nothing">沒有東西可以刪除。</string>
+  <string name="delete_cancelled">刪除已取消。</string>
   <!--Certify result toast-->
   <!--Intent labels-->
+  <string name="intent_decrypt_file">使用OpenKeychain解密檔案</string>
+  <string name="intent_import_key">匯入金鑰至OpenKeychain</string>
+  <string name="intent_send_encrypt">使用OpenKeychain加密</string>
+  <string name="intent_send_decrypt">使用OpenKeychain解密</string>
   <!--Remote API-->
+  <string name="api_no_apps">沒有已註冊的應用程式！\n\n支援的第三方應用程式請參考說明文件。</string>
+  <string name="api_settings_show_info">顯示進階資訊</string>
+  <string name="api_settings_hide_info">隱藏進階資訊</string>
+  <string name="api_settings_show_advanced">顯示進階設定</string>
+  <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_settings">設定</string>
+  <string name="api_settings_key">帳戶金鑰：</string>
+  <string name="api_settings_accounts_empty">沒有帳戶被指派給這個應用程式。</string>
+  <string name="api_create_account_text">這個帳戶尚未設置金鑰，請指派一個現有金鑰或是建立新的。\n應用程式只能使用這邊所選的金鑰進行解密/簽名。</string>
+  <string name="api_update_account_text">此帳戶指定的金鑰已被刪除，請重新選擇一個。\n應用程式只能使用這邊所選的金鑰進行解密/簽名。</string>
+  <string name="api_register_text">應用程式試圖以您的名義加/解密訊息並簽名，是否允許存取？\n\n警告：如果你不知道為什麼出現這個畫面，請拒絕存取！你可以稍後在〝應用程式〞畫面撤銷存取。</string>
+  <string name="api_register_allow">允許存取</string>
+  <string name="api_register_disallow">拒絕存取</string>
+  <string name="api_error_wrong_signature">簽名檢查失敗！你是否從其他來源安裝此應用？如果你確定這不是個攻擊，撤銷並重新註冊應用程式到OpenKeychain。</string>
   <!--Share-->
+  <string name="share_qr_code_dialog_title">以二維條碼分享</string>
+  <string name="share_nfc_dialog">以NFC分享</string>
   <!--Key list-->
+  <string name="key_list_empty_text1">找不到金鑰！</string>
   <!--Key view-->
+  <string name="key_view_action_edit">編輯金鑰</string>
+  <string name="key_view_action_encrypt">加密文字</string>
+  <string name="key_view_action_encrypt_files">檔案</string>
+  <string name="key_view_action_upload">上傳到金鑰伺服器</string>
+  <string name="key_view_tab_main">摘要</string>
+  <string name="key_view_tab_share">分享</string>
+  <string name="key_view_tab_keys">子金鑰</string>
+  <string name="user_id_info_revoked_title">已撤銷</string>
+  <string name="user_id_info_revoked_text">這個身分識別被金鑰持有人撤銷，已不再有效。</string>
+  <string name="user_id_info_certified_title">已認證</string>
+  <string name="user_id_info_certified_text">這個身分識別已經過你的認證。</string>
+  <string name="user_id_info_uncertified_title">未認證</string>
+  <string name="user_id_info_uncertified_text">這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。</string>
+  <string name="user_id_info_invalid_title">無效</string>
   <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">變更口令</string>
+  <string name="edit_key_action_add_identity">新增身分識別</string>
+  <string name="edit_key_action_add_subkey">新增子金鑰</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>變更為主身分識別</item>
+    <item>撤銷身分識別</item>
+  </string-array>
+  <string name="edit_key_edit_user_id_revoked">這個身分識別已被撤銷。此動作無法還原。</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>變更到期日</item>
+    <item>撤銷子金鑰</item>
+    <item>Strip Subkey</item>
+  </string-array>
+  <string name="edit_key_error_add_identity">新增至少一組身分識別！</string>
+  <string name="edit_key_error_add_subkey">新增至少一組子金鑰！</string>
   <!--Create key-->
+  <string name="create_key_upload">上傳到金鑰伺服器</string>
+  <string name="create_key_empty">必填欄位</string>
+  <string name="create_key_passphrases_not_equal">口令不相符</string>
+  <string name="create_key_final_robot_text">建立金鑰可能需要一點時間，來杯咖啡吧…</string>
+  <string name="create_key_text">輸入你的全名、電子郵件，並選擇一組口令。</string>
   <!--View key-->
+  <string name="view_key_revoked">這把金鑰已被撤銷！</string>
+  <string name="view_key_expired">這把金鑰已經過期！</string>
   <!--Navigation Drawer-->
+  <string name="nav_keys">金鑰</string>
+  <string name="nav_apps">應用程式</string>
+  <string name="my_keys">我的金鑰</string>
   <!--hints-->
   <!--certs-->
   <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
   <!--Import Public log entries-->
   <!--Import Secret log entries-->
+  <string name="msg_is_db_exception">資料庫錯誤！</string>
+  <string name="msg_is_merge_public">將匯入的資料合併至公鑰鑰匙圈</string>
+  <string name="msg_is_merge_secret">將匯入的資料合併至密鑰鑰匙圈</string>
+  <string name="msg_is_pubring_generate">從密鑰鑰匙圈產生公鑰鑰匙圈</string>
+  <string name="msg_is_success_identical">鑰匙圈沒有新資料，不必進行操作</string>
+  <string name="msg_is_success">成功匯入密鑰鑰匙圈</string>
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
+  <string name="msg_ek_error_not_found">找不到金鑰！</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_error_invalid_siglist">找不到有效的簽名資訊！</string>
+  <string name="msg_dc">開始解密…</string>
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <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_fetch_error">無法取得金鑰！(網路問題？)</string>
+  <string name="msg_import_fetch_keybase">從keybase.io取回：%s</string>
+  <string name="msg_import_fetch_keyserver_error">無法從keybase取得金鑰！</string>
+  <string name="msg_import_fetch_keyserver">從金鑰伺服器取回：%s</string>
+  <string name="msg_import_fetch_keyserver_ok">成功取得金鑰</string>
+  <string name="msg_import_keyserver">使用金鑰伺服器%s</string>
+  <string name="msg_import_fingerprint_ok">指紋檢查正確</string>
+  <string name="msg_import_merge">正在合併取得的資料</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>
+  <string name="msg_download_success">下載成功！</string>
+  <string name="msg_download_no_valid_keys">在檔案/剪貼簿中找不到有效的金鑰！</string>
+  <string name="msg_download_query_failed">查詢金鑰的時候發生錯誤。</string>
   <!--PassphraseCache-->
-  <!--unsorted-->
+  <string name="passp_cache_notif_n_keys">OpenKeychain快取了%d個口令</string>
+  <string name="passp_cache_notif_keys">已快取的口令：</string>
+  <string name="passp_cache_notif_clear">清除快取</string>
+  <string name="passp_cache_notif_pwd">口令</string>
   <!--First Time-->
+  <!--unsorted-->
+  <string name="empty_certs">這把金鑰未經過認證</string>
+  <string name="certs_text">只有有效的自簽署認證以及經由你的金鑰簽署的有效認證會被顯示在這。</string>
+  <string name="label_revocation">撤銷原因</string>
+  <string name="error_key_not_found">找不到金鑰！</string>
+  <string name="key_no_passphrase">沒有口令</string>
+  <string name="key_unavailable">無法使用</string>
+  <string name="title_view_cert">查看認證內容</string>
+  <string name="unknown_algorithm">未知</string>
+  <string name="error_no_encrypt_subkey">沒有可供加密的子金鑰！</string>
+  <string name="info_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string>
+  <string name="exchange_description">要發起金鑰交換，先在右邊選擇與會人數，然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題，以確保會議成員與交換的指紋是正確的。</string>
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 8dd85050d..1c0e0c396 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -7,11 +7,8 @@
   <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_edit_key">编辑密钥</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>
@@ -57,7 +54,6 @@
   <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>
   <!--menu-->
@@ -231,10 +227,17 @@
   <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
   <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
   <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-  <!--unsorted-->
   <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
 </resources>
-- 
cgit v1.2.3


From f852cb74499eb82eed2b82ae3192b35fae57f276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 21:41:29 +0100
Subject: Pull from transifex

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

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

diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index b5ca0687b..e6416b28b 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -536,7 +536,7 @@
   <string name="view_key_expired">Dieser Schlüssel ist nicht mehr gültig!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
-  <string name="nav_encrypt_decrypt">Veschlüsseln/Entschlüsseln</string>
+  <string name="nav_encrypt_decrypt">Verschlüsseln/Entschlüsseln</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Menü öffnen</string>
   <string name="drawer_close">Menü schließen</string>
-- 
cgit v1.2.3


From e20c6add4398ffc0137fc637bb9897c2cd09cb18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 22 Feb 2015 23:52:29 +0100
Subject: Fix multi select and more colors

---
 .../src/main/res/drawable-hdpi/ic_lock_white_24dp.png     | Bin 0 -> 399 bytes
 .../src/main/res/drawable-mdpi/ic_lock_white_24dp.png     | Bin 0 -> 296 bytes
 .../src/main/res/drawable-xhdpi/ic_lock_white_24dp.png    | Bin 0 -> 465 bytes
 .../src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png   | Bin 0 -> 760 bytes
 .../src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png  | Bin 0 -> 971 bytes
 OpenKeychain/src/main/res/drawable/section_header.xml     |   2 +-
 .../src/main/res/layout/foldable_linearlayout.xml         |   2 +-
 OpenKeychain/src/main/res/menu/key_list_multi.xml         |   5 +----
 OpenKeychain/src/main/res/values/colors.xml               |   8 ++++----
 OpenKeychain/src/main/res/values/styles.xml               |   2 +-
 OpenKeychain/src/main/res/values/themes.xml               |   4 +++-
 11 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png
new file mode 100644
index 000000000..b94735ecb
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png
new file mode 100644
index 000000000..381b6a118
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png
new file mode 100644
index 000000000..c5e9d0b49
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png
new file mode 100644
index 000000000..0dcada814
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png
new file mode 100644
index 000000000..a70c55b7e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml
index a4468484e..04d3d4957 100644
--- a/OpenKeychain/src/main/res/drawable/section_header.xml
+++ b/OpenKeychain/src/main/res/drawable/section_header.xml
@@ -6,6 +6,6 @@
         android:height="2dp"
         android:width="1000dp" />
 
-    <solid android:color="@color/emphasis" />
+    <solid android:color="@color/header_text" />
 
 </shape>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
index cddc98ac5..773a9d416 100644
--- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
+++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:text="@string/none"
             android:layout_gravity="center_vertical"
-            android:textColor="@color/emphasis" />
+            android:textColor="@color/header_text" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml
index 3e0f87692..7fdf4a5c1 100644
--- a/OpenKeychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml
@@ -4,26 +4,23 @@
 
     <item
         android:id="@+id/menu_key_list_multi_encrypt"
-        android:icon="@drawable/ic_action_secure"
+        android:icon="@drawable/ic_lock_white_24dp"
         android:title="@string/menu_encrypt_to" />
 
     <item
         android:id="@+id/menu_key_list_multi_export"
-        android:icon="@drawable/ic_action_import_export"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_export_key" />
 
     <item
         android:id="@+id/menu_key_list_multi_delete"
-        android:icon="@drawable/ic_action_discard"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_delete_key" />
 
     <item
         android:id="@+id/menu_key_list_multi_select_all"
-        android:icon="@drawable/ic_action_select_all"
         android:showAsAction="never"
         tools:ignore="AppCompatResource"
         android:title="@string/menu_select_all" />
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 006b9b9b5..895273967 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -14,16 +14,16 @@
     <!-- Other colors -->
 
     <color name="primary_light">#C8E6C9</color>
-    <color name="fab">#2196F3</color>
+    <color name="fab">@color/accent</color>
     <color name="fab_pressed">#1976D2</color>
     <color name="primary_text">#212121</color>
     <color name="secondary_text">#727272</color>
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
 
-    <!-- set to text colors -->
-    <color name="emphasis">#212121</color>
-    <color name="emphasis_dark">#727272</color>
+    <color name="header_text">#212121</color>
+    <!-- item selection, search highlight -->
+    <color name="emphasis">@color/accent</color>
 
     <color name="bg_gray">#cecbce</color>
     <color name="tertiary_text_light">#808080</color>
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 03ccce85e..f05bdb0ff 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -26,7 +26,7 @@
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">8dp</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/emphasis</item>
+        <item name="android:textColor">@color/header_text</item>
         <item name="android:textSize">14sp</item>
     </style>
 
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 147bd8d4c..da616492c 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -12,12 +12,14 @@
         <item name="android:windowNoTitle">true</item>
         <!-- remove actionbar, we use toolbar! -->
         <item name="windowActionBar">false</item>
+        <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 -->
+        <item name="windowActionModeOverlay">true</item>
         <item name="searchViewStyle">@style/MySearchViewStyle</item>
 
         <!-- Navigation Drawer library -->
         <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item>
         <!-- dark action bar... -->
-        <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <!-- ...but light popup menu (white background) -->
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="drawerColor">#fafafa</item>
-- 
cgit v1.2.3


From 4e8c4af262ebe838cdbe848c40588f4bcc4a4d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Feb 2015 00:11:06 +0100
Subject: Update tab lib and fix colors of tabs

---
 OpenKeychain/src/main/res/layout/help_activity.xml     | 5 +++--
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 5 +++--
 OpenKeychain/src/main/res/values/colors.xml            | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml
index 6a78aa273..1722f03ea 100644
--- a/OpenKeychain/src/main/res/layout/help_activity.xml
+++ b/OpenKeychain/src/main/res/layout/help_activity.xml
@@ -20,8 +20,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:textColor="#FFFFFF"
-            app:pstsIndicatorColor="#FFFFFF" />
+            android:textColor="@color/tab_text"
+            app:pstsTextColorSelected="@color/tab_text_selected"
+            app:pstsIndicatorColor="@color/tab_indicator" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/pager"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index cb6456082..f9a329acd 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -52,8 +52,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:textColor="#FFFFFF"
-            app:pstsIndicatorColor="#FFFFFF" />
+            android:textColor="@color/tab_text"
+            app:pstsTextColorSelected="@color/tab_text_selected"
+            app:pstsIndicatorColor="@color/tab_indicator" />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/view_key_pager"
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 895273967..c49e06b4b 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -32,6 +32,11 @@
     <color name="holo_gray_light">#33999999</color>
     <color name="holo_gray_bright">#33CCCCCC</color>
 
+    <!-- tabs -->
+    <color name="tab_text">#70FFFFFF</color>
+    <color name="tab_text_selected">#FFFFFF</color>
+    <color name="tab_indicator">#FFFFFF</color>
+
 
     <!-- floating action buttons -->
     <color name="black_semi_transparent">#B2000000</color>
-- 
cgit v1.2.3


From 7bddd5be1d76360f1112e780091ee6636591caae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Feb 2015 00:28:26 +0100
Subject: Remove old pattern lib, add new pattern lib

---
 .../layout/alp_42447968_lock_pattern_fragment.xml  | 15 -----
 .../passphrase_wizard_fragment_passphrase.xml      | 64 ++++++++++++----------
 2 files changed, 36 insertions(+), 43 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml b/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml
deleted file mode 100644
index 6a154fa55..000000000
--- a/OpenKeychain/src/main/res/layout/alp_42447968_lock_pattern_fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/topLayout"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-    <com.haibison.android.lockpattern.widget.LockPatternView_v14
-        android:id="@+id/lockPattern"
-        android:layout_width="@dimen/alp_42447968_separator_size"
-        android:layout_height="@dimen/alp_42447968_separator_size"
-        android:layout_marginTop="@dimen/alp_42447968_separator_size"
-        android:layout_marginBottom="@dimen/alp_42447968_separator_size"
-        android:layout_gravity="center_horizontal" />
-</LinearLayout> 
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml
index 61bd4572d..de957cc74 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_passphrase.xml
@@ -7,13 +7,12 @@
     tools:context="pSontag.testopenkeychain.Passphrase">
 
 
-
     <TableLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TableRow
-            android:layout_marginBottom="10dp">
+        <TableRow android:layout_marginBottom="10dp">
+
             <TextView
                 android:id="@+id/passphraseText"
                 android:layout_width="match_parent"
@@ -23,7 +22,7 @@
                 android:layout_gravity="center_vertical"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:text="@string/passphrase"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
         </TableRow>
 
         <View
@@ -32,26 +31,29 @@
             android:background="?android:attr/listDivider" />
 
         <TableRow>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="8dp"
                 android:layout_weight="1"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/passphrase"/>
+                android:text="@string/passphrase" />
+
             <EditText
                 android:id="@+id/passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="textPassword"
                 android:padding="8dp"
-                android:layout_weight="6"/>
+                android:layout_weight="6" />
 
         </TableRow>
 
         <TableRow
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp">
+
             <TextView
                 android:id="@+id/passphraseTextAgain"
                 android:layout_width="wrap_content"
@@ -59,7 +61,8 @@
                 android:padding="8dp"
                 android:text="@string/passphrase_again"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
+
             <EditText
                 android:id="@+id/passphraseAgain"
                 android:layout_width="match_parent"
@@ -67,10 +70,11 @@
                 android:inputType="textPassword"
                 android:imeOptions="actionDone"
                 android:padding="8dp"
-                android:layout_weight="6"/>
+                android:layout_weight="6" />
 
         </TableRow>
     </TableLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
@@ -80,28 +84,32 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Cancel"
-            android:onClick="cancel"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            style="?attr/alp_42447968_button_bar_button_style"/>
-        <View
-            android:layout_width="1dip"
-            android:layout_height="50dip"
-            android:background="?android:attr/listDivider" />
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Ok"
-            android:onClick="savePassphrase"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            style="?attr/alp_42447968_button_bar_button_style"/>
+
+        <!--<Button-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="Cancel"-->
+            <!--android:onClick="cancel"-->
+            <!--android:layout_weight="1"-->
+            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+            <!--style="?attr/alp_42447968_button_bar_button_style" />-->
+
+        <!--<View-->
+            <!--android:layout_width="1dip"-->
+            <!--android:layout_height="50dip"-->
+            <!--android:background="?android:attr/listDivider" />-->
+
+        <!--<Button-->
+            <!--android:layout_width="wrap_content"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="Ok"-->
+            <!--android:onClick="savePassphrase"-->
+            <!--android:layout_weight="1"-->
+            <!--android:textAppearance="?android:attr/textAppearanceMedium"-->
+            <!--style="?attr/alp_42447968_button_bar_button_style" />-->
 
     </LinearLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
-- 
cgit v1.2.3


From dd3af50956ec80502f9f14e91cffbd271cc232fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Feb 2015 10:36:39 +0100
Subject: Uncluttering App Settings: Move advanced info in dialog

---
 .../main/res/layout/api_app_settings_activity.xml  | 41 ----------------------
 .../src/main/res/menu/api_app_settings.xml         |  5 +++
 2 files changed, 5 insertions(+), 41 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
index 253836080..6df5c84f5 100644
--- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
+++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
@@ -103,47 +103,6 @@
                     android:layout_height="match_parent"
                     android:orientation="vertical" />
 
-                <TextView
-                    style="@style/SectionHeader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/api_settings_advanced" />
-
-                <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:textColor="@color/icons"
-                    custom:foldedLabel="@string/api_settings_show_info"
-                    custom:unFoldedLabel="@string/api_settings_hide_info">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/api_settings_package_name"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <TextView
-                        android:id="@+id/api_app_settings_package_name"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="com.example"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/api_settings_package_signature"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <TextView
-                        android:id="@+id/api_app_settings_package_signature"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="Base64 encoded hash of signature"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
-
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml
index 4b4fc39e8..5ac340550 100644
--- a/OpenKeychain/src/main/res/menu/api_app_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_app_settings.xml
@@ -12,4 +12,9 @@
         android:title="@string/api_settings_revoke"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_api_settings_advanced"
+        android:title="@string/api_settings_advanced"
+        app:showAsAction="never" />
+
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 2064d81aef27492e5f9f13a14375fc505bf105ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Feb 2015 21:52:04 +0100
Subject: Refactor AppsListFragment

---
 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 97e6a9d71..4a56274d7 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -476,7 +476,6 @@
     <string name="intent_send_decrypt">"Decrypt with OpenKeychain"</string>
 
     <!-- Remote API -->
-    <string name="api_no_apps">"No registered apps!\n\nA list of supported third-party applications can be found in 'Help'!"</string>
     <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>
-- 
cgit v1.2.3


From 52bcfd71adc1935ad81be7c0a9b2aae02000357c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 23 Feb 2015 23:03:45 +0100
Subject: New advanced key view

---
 .../src/main/res/layout/view_key_adv_activity.xml  |  41 ++++
 .../res/layout/view_key_adv_certs_fragment.xml     |  57 ++++++
 .../res/layout/view_key_adv_share_fragment.xml     | 212 +++++++++++++++++++++
 .../res/layout/view_key_adv_subkeys_fragment.xml   |  34 ++++
 .../main/res/layout/view_key_advanced_activity.xml |  32 ----
 .../main/res/layout/view_key_advanced_fragment.xml |  87 ---------
 .../main/res/layout/view_key_share_fragment.xml    | 212 ---------------------
 7 files changed, 344 insertions(+), 331 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_share_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml
new file mode 100644
index 000000000..59888c25a
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_activity.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:visibility="gone"
+            android:id="@+id/view_key_status_divider" />
+
+        <com.astuetz.PagerSlidingTabStrip
+            android:id="@+id/view_key_sliding_tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:textColor="@color/tab_text"
+            app:pstsTextColorSelected="@color/tab_text_selected"
+            app:pstsIndicatorColor="@color/tab_indicator" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/view_key_pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:background="@android:color/white" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
new file mode 100644
index 000000000..2232ea9f2
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
@@ -0,0 +1,57 @@
+<?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="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="@string/section_certs" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/holo_gray_bright"
+        android:padding="8dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/certs_text"
+        android:gravity="center_horizontal" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:id="@+id/view_key_status_divider" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/certs_list"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:scrollbarStyle="outsideOverlay" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/empty_certs"
+            android:id="@+id/empty"
+            android:visibility="gone"
+            android:layout_gravity="center" />
+
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
new file mode 100644
index 000000000..9971032ce
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -0,0 +1,212 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_fingerprint"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_fingerprint_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_fingerprint"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text=""
+                android:layout_weight="1"
+                android:typeface="monospace"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_fingerprint_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <ImageView
+            android:id="@+id/view_key_fingerprint_qr_code_image"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            style="@style/SelectableItem" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_share_key"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_key_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_with"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_safeslinger"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_safeslinger"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_upload"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_nfc_help"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_nfc"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_help"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_nfc_prefs"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_settings"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml
new file mode 100644
index 000000000..62fd113f9
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkeys_fragment.xml
@@ -0,0 +1,34 @@
+<?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="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="@string/section_keys" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ListView
+            android:id="@+id/keys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbarStyle="outsideOverlay"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:layout_marginBottom="8dp" />
+    </FrameLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
deleted file mode 100644
index c7f0f50d9..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_activity.xml
+++ /dev/null
@@ -1,32 +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">
-
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/notify_area" />
-
-        <FrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <FrameLayout
-                android:id="@+id/view_key_advanced_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" />
-
-        </FrameLayout>
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml
deleted file mode 100644
index 9a2190f7e..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_advanced_fragment.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"--><!--android:layout_width="match_parent"--><!--android:layout_height="match_parent">-->
-
-<!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:descendantFocusability="beforeDescendants"
-    android:orientation="vertical">
-
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:text="@string/section_keys" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.4">
-
-        <ListView
-            android:id="@+id/keys"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbarStyle="outsideOverlay"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:layout_marginBottom="8dp" />
-    </FrameLayout>
-
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:text="@string/section_certs" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@color/holo_gray_bright"
-        android:padding="8dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="@string/certs_text"
-        android:gravity="center_horizontal" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:id="@+id/view_key_status_divider" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.6">
-
-        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/certs_list"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:scrollbarStyle="outsideOverlay" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/empty_certs"
-            android:id="@+id/empty"
-            android:visibility="gone"
-            android:layout_gravity="center" />
-
-    </FrameLayout>
-
-</LinearLayout>
-
-    <!--</ScrollView>-->
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
deleted file mode 100644
index 9971032ce..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_fingerprint"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_fingerprint_share"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_fingerprint"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text=""
-                android:layout_weight="1"
-                android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_fingerprint_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <ImageView
-            android:id="@+id/view_key_fingerprint_qr_code_image"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            style="@style/SelectableItem" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_share_key"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_key_share"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_with"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_safeslinger"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_upload"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_upload"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_nfc_help"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_nfc"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_help"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_nfc_prefs"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_settings"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</ScrollView>
-- 
cgit v1.2.3


From 17a6003eddff3fd52b4b2ac5ee553e3f70315d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Feb 2015 11:25:19 +0100
Subject: Remove tabs in view key

---
 .../src/main/res/layout/view_key_activity.xml      |  23 +-
 .../main/res/layout/view_key_adv_certs_header.xml  |  27 ++
 .../main/res/layout/view_key_adv_certs_item.xml    |  46 +++
 .../main/res/layout/view_key_adv_main_fragment.xml | 164 ++++++++++
 .../main/res/layout/view_key_adv_subkey_item.xml   | 130 ++++++++
 .../main/res/layout/view_key_adv_user_id_item.xml  |  83 +++++
 .../src/main/res/layout/view_key_certs_header.xml  |  27 --
 .../src/main/res/layout/view_key_certs_item.xml    |  46 ---
 .../src/main/res/layout/view_key_fragment.xml      | 360 +++++++++++++++++++++
 .../src/main/res/layout/view_key_main_fragment.xml | 164 ----------
 .../src/main/res/layout/view_key_subkey_item.xml   | 130 --------
 .../src/main/res/layout/view_key_user_id_item.xml  |  83 -----
 12 files changed, 820 insertions(+), 463 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_certs_header.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_certs_item.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_user_id_item.xml

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index f9a329acd..25115eb2f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -47,21 +47,18 @@
             android:visibility="gone"
             android:id="@+id/view_key_status_divider" />
 
-        <com.astuetz.PagerSlidingTabStrip
-            android:id="@+id/view_key_sliding_tab_layout"
+        <FrameLayout
+            android:id="@+id/content_frame"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            android:textColor="@color/tab_text"
-            app:pstsTextColorSelected="@color/tab_text_selected"
-            app:pstsIndicatorColor="@color/tab_indicator" />
+            android:layout_height="match_parent">
 
-        <android.support.v4.view.ViewPager
-            android:id="@+id/view_key_pager"
-            android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="1"
-            android:background="@android:color/white" />
+            <FrameLayout
+                android:id="@+id/view_key_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
+
+        </FrameLayout>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml
new file mode 100644
index 000000000..f99c012c9
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_header.xml
@@ -0,0 +1,27 @@
+<?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="wrap_content" >
+
+    <TextView
+        style="@style/SectionHeader"
+        android:id="@+id/stickylist_header_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|left"
+        android:text="header text" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="certification count"
+        android:id="@+id/certs_num"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="8dp"
+        android:visibility="visible"
+        android:textColor="@android:color/darker_gray" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml
new file mode 100644
index 000000000..e84a98cdb
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_item.xml
@@ -0,0 +1,46 @@
+<?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="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingLeft="8dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:singleLine="true"
+    android:descendantFocusability="blocksDescendants"
+    android:focusable="false">
+
+    <TextView
+        android:id="@+id/signerName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="signer name"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:id="@+id/signerKeyId"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="&lt;user@example.com>"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_below="@+id/signerName"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:id="@+id/signStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="status"
+        android:visibility="visible"
+        android:layout_above="@+id/signerKeyId"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="10dp" />
+
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
new file mode 100644
index 000000000..691ee357d
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -0,0 +1,164 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_user_ids"
+            android:layout_weight="1" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/view_key_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_certify"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_certify_text"
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/view_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_key_action_certify_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_edit"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_edit"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_edit"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:id="@+id/view_key_action_edit_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+
+        <LinearLayout
+            android:id="@+id/view_key_action_encrypt_text"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_text_text"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_files"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt_files"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_update"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_update"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
new file mode 100644
index 000000000..b2875b9e6
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -0,0 +1,130 @@
+<?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="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <ImageView
+        android:id="@+id/subkey_item_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/status_signature_revoked_cutout"
+        android:paddingLeft="8dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true" />
+
+    <FrameLayout
+        android:id="@+id/subkey_item_buttons"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true">
+
+        <ImageView
+            android:id="@+id/subkey_item_edit_image"
+            android:src="@drawable/ic_action_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp" />
+
+        <ImageButton
+            android:id="@+id/subkey_item_delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:src="@drawable/ic_action_cancel"
+            style="@style/SelectableItem" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_toLeftOf="@id/subkey_item_buttons"
+        android:layout_toRightOf="@id/subkey_item_status"
+        android:layout_centerVertical="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="2dip"
+            android:paddingTop="2dip">
+
+            <TextView
+                android:id="@+id/subkey_item_key_id"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="0x00000000"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/subkey_item_ic_certify"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/key_flag_certify"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/subkey_item_ic_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/key_flag_sign"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/subkey_item_ic_encrypt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/key_flag_encrypt"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/subkey_item_ic_authenticate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/key_flag_authenticate"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:id="@+id/subkey_item_details"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:paddingRight="5dip"
+                android:text="RSA, 1024bit"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/subkey_item_expiry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Expiry: 4/7/2016"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_gravity="right" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
new file mode 100644
index 000000000..24e8e1a10
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -0,0 +1,83 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:singleLine="true">
+
+    <CheckBox
+        android:id="@+id/user_id_item_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:id="@+id/user_id_item_certified_layout"
+        android:layout_width="22dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/user_id_item_certified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_gravity="center_vertical"
+        android:layout_width="0dip"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/user_id_item_address"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="alice@example.com"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/user_id_item_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Alice"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <TextView
+            android:id="@+id/user_id_item_comment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/tertiary_text_light"
+            android:text="comment"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/user_id_item_edit_image"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@drawable/ic_action_edit"
+        android:padding="8dp"
+        android:layout_gravity="center_vertical" />
+
+    <ImageButton
+        android:id="@+id/user_id_item_delete_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        android:src="@drawable/ic_action_cancel"
+        android:layout_gravity="center_vertical"
+        style="@style/SelectableItem" />
+
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
deleted file mode 100644
index f99c012c9..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml
+++ /dev/null
@@ -1,27 +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="wrap_content" >
-
-    <TextView
-        style="@style/SectionHeader"
-        android:id="@+id/stickylist_header_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start|left"
-        android:text="header text" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="certification count"
-        android:id="@+id/certs_num"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="8dp"
-        android:visibility="visible"
-        android:textColor="@android:color/darker_gray" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
deleted file mode 100644
index e84a98cdb..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_certs_item.xml
+++ /dev/null
@@ -1,46 +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="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingLeft="8dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:singleLine="true"
-    android:descendantFocusability="blocksDescendants"
-    android:focusable="false">
-
-    <TextView
-        android:id="@+id/signerName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="signer name"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <TextView
-        android:id="@+id/signerKeyId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="&lt;user@example.com>"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_below="@+id/signerName"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <TextView
-        android:id="@+id/signStatus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="status"
-        android:visibility="visible"
-        android:layout_above="@+id/signerKeyId"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="10dp" />
-
-</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
new file mode 100644
index 000000000..fadad0e56
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -0,0 +1,360 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_user_ids"
+            android:layout_weight="1" />
+
+        <org.sufficientlysecure.keychain.ui.widget.FixedListView
+            android:id="@+id/view_key_user_ids"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_actions"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_certify"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:paddingRight="4dp"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_certify_text"
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_certify"
+                android:layout_weight="1"
+                android:gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/view_key_action_certify_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/status_signature_verified_cutout"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view_key_action_certify_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_edit"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_edit"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_edit"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:id="@+id/view_key_action_edit_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+
+        <LinearLayout
+            android:id="@+id/view_key_action_encrypt_text"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_text_text"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <TextView
+                android:id="@+id/view_key_action_encrypt_files"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_encrypt_files"
+                android:drawableRight="@drawable/ic_action_secure"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_update"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_update"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_download"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/section_fingerprint"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_fingerprint_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/view_key_fingerprint"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text=""
+                android:layout_weight="1"
+                android:typeface="monospace"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_fingerprint_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <ImageView
+            android:id="@+id/view_key_fingerprint_qr_code_image"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            style="@style/SelectableItem" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="14dp"
+            android:text="@string/section_share_key"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_key_share"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_with"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_share"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_clipboard"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_copy"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_key_safeslinger"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_safeslinger"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/view_key_action_upload"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:text="@string/key_view_action_upload"
+            android:layout_weight="1"
+            android:drawableRight="@drawable/ic_action_upload"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/view_key_action_nfc_help"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="@style/SelectableItem"
+            android:orientation="horizontal"
+            android:layout_marginBottom="8dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:text="@string/key_view_action_share_nfc"
+                android:layout_weight="1"
+                android:drawableRight="@drawable/ic_action_help"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical" />
+
+            <View
+                android:layout_width="1dip"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/listDivider" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_nfc_prefs"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_action_settings"
+                android:layout_gravity="center_vertical"
+                style="@style/SelectableItem" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
deleted file mode 100644
index 691ee357d..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_user_ids"
-            android:layout_weight="1" />
-
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginBottom="4dp"
-            android:layout_weight="1" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_certify"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_certify_text"
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/view_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_key_action_certify_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_edit"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_edit"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_edit"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:id="@+id/view_key_action_edit_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-
-        <LinearLayout
-            android:id="@+id/view_key_action_encrypt_text"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_text_text"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt_files"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_update"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_update"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
deleted file mode 100644
index b2875b9e6..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
+++ /dev/null
@@ -1,130 +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="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:singleLine="true">
-
-    <ImageView
-        android:id="@+id/subkey_item_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:src="@drawable/status_signature_revoked_cutout"
-        android:paddingLeft="8dp"
-        android:layout_centerVertical="true"
-        android:layout_alignParentStart="true" />
-
-    <FrameLayout
-        android:id="@+id/subkey_item_buttons"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true">
-
-        <ImageView
-            android:id="@+id/subkey_item_edit_image"
-            android:src="@drawable/ic_action_edit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp" />
-
-        <ImageButton
-            android:id="@+id/subkey_item_delete_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:src="@drawable/ic_action_cancel"
-            style="@style/SelectableItem" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_toLeftOf="@id/subkey_item_buttons"
-        android:layout_toRightOf="@id/subkey_item_status"
-        android:layout_centerVertical="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingBottom="2dip"
-            android:paddingTop="2dip">
-
-            <TextView
-                android:id="@+id/subkey_item_key_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="0x00000000"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/subkey_item_ic_certify"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_certify"
-                android:layout_marginLeft="8dp"
-                android:layout_gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/subkey_item_ic_sign"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_sign"
-                android:layout_marginLeft="8dp"
-                android:layout_gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/subkey_item_ic_encrypt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_encrypt"
-                android:layout_marginLeft="8dp"
-                android:layout_gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/subkey_item_ic_authenticate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_authenticate"
-                android:layout_marginLeft="8dp"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/subkey_item_details"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:paddingRight="5dip"
-                android:text="RSA, 1024bit"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/subkey_item_expiry"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Expiry: 4/7/2016"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_gravity="right" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
deleted file mode 100644
index 24e8e1a10..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_user_id_item.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:singleLine="true">
-
-    <CheckBox
-        android:id="@+id/user_id_item_check_box"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:clickable="false"
-        android:focusable="false" />
-
-    <LinearLayout
-        android:id="@+id/user_id_item_certified_layout"
-        android:layout_width="22dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/user_id_item_certified"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_gravity="center_vertical"
-        android:layout_width="0dip"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@+id/user_id_item_address"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="alice@example.com"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            android:id="@+id/user_id_item_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Alice"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-        <TextView
-            android:id="@+id/user_id_item_comment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/tertiary_text_light"
-            android:text="comment"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/user_id_item_edit_image"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:src="@drawable/ic_action_edit"
-        android:padding="8dp"
-        android:layout_gravity="center_vertical" />
-
-    <ImageButton
-        android:id="@+id/user_id_item_delete_button"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
-        android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
-
-</LinearLayout>
-- 
cgit v1.2.3


From 2b609b8144c093b1034c2845a8110ac84eecc414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 24 Feb 2015 13:43:24 +0100
Subject: Fix QR Code, design experiments for key view

---
 .../res/drawable-hdpi/ic_qrcode_white_24dp.png     | Bin 0 -> 427 bytes
 .../res/drawable-mdpi/ic_qrcode_white_24dp.png     | Bin 0 -> 231 bytes
 .../res/drawable-xhdpi/ic_qrcode_white_24dp.png    | Bin 0 -> 284 bytes
 .../res/drawable-xxhdpi/ic_qrcode_white_24dp.png   | Bin 0 -> 352 bytes
 .../res/drawable-xxxhdpi/ic_qrcode_white_24dp.png  | Bin 0 -> 414 bytes
 OpenKeychain/src/main/res/drawable/qrcode.xml      |   8 --
 .../src/main/res/layout/key_list_fragment.xml      |   2 +-
 .../src/main/res/layout/view_key_activity.xml      | 105 ++++++++++++++++-----
 OpenKeychain/src/main/res/menu/key_view.xml        |   7 +-
 9 files changed, 88 insertions(+), 34 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable/qrcode.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 000000000..261f4a5ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_qrcode_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 000000000..5cf552b13
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_qrcode_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 000000000..a2c6ade61
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_qrcode_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 000000000..c4f2f57c9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_qrcode_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png
new file mode 100644
index 000000000..e795f80a5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_qrcode_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable/qrcode.xml b/OpenKeychain/src/main/res/drawable/qrcode.xml
deleted file mode 100644
index 87eb7d485..000000000
--- a/OpenKeychain/src/main/res/drawable/qrcode.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/qrcode.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M5,5H7V7H5V5M1,1H11V11H1V1M3,3V9H9V3H3M5,17H7V19H5V17M1,13H11V23H1V13M3,15V21H9V15H3M17,5H19V7H17V5M13,1H23V11H13V1M15,3V9H21V3H15M13,13H17V15H19V13H23V15H19V17H23V23H19V21H15V23H13V21H15V19H13V13M21,21V19H19V21H21M19,17H17V15H15V19H19V17Z" />
-</vector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index c918ace37..3c46b4f9c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -66,7 +66,7 @@
             android:id="@+id/fab_add_qr_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            fab:fab_icon="@drawable/qrcode"
+            fab:fab_icon="@drawable/ic_qrcode_white_24dp"
             fab:fab_colorNormal="@color/primary"
             fab:fab_colorPressed="@color/primary_dark"
             fab:fab_title="Scan QR Code"
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 25115eb2f..f9c23f065 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -1,44 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include
-        android:id="@+id/toolbar_include"
-        layout="@layout/toolbar_standalone" />
-
-    <LinearLayout
-        android:layout_below="@id/toolbar_include"
+    <RelativeLayout
+        android:id="@+id/toolbar_big"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="@dimen/big_toolbar"
+        android:elevation="4dp"
+        android:background="?attr/colorPrimary"
+        android:orientation="horizontal">
 
-        <include layout="@layout/notify_area" />
+        <ImageView
+            android:id="@+id/status_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/statusbar_height"
+            android:background="?attr/colorPrimary" />
 
-        <LinearLayout
-            android:id="@+id/view_key_status_layout"
-            android:layout_width="wrap_content"
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_below="@+id/status_bar"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:orientation="horizontal">
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:overScrollMode="always"
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="UnusedAttribute"
+            android:transitionGroup="false"
+            android:touchscreenBlocksFocus="false" />
 
-            <ImageView
-                android:id="@+id/view_key_status_image"
+        <LinearLayout
+            android:layout_below="@+id/toolbar"
+            android:layout_marginLeft="48dp"
+            android:layout_marginRight="72dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:id="@+id/view_key_status_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/view_key_status_image"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/view_key_status_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="8dp" />
+
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/view_key_status_text"
+                android:id="@+id/api_app_settings_app_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="Name (set in-code)longlong"
+                android:textColor="@color/icons"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dp" />
-
+                android:paddingLeft="8dp"
+                android:layout_gravity="center_vertical" />
         </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/body"
+        android:layout_below="@id/toolbar_big"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <View
             android:layout_width="match_parent"
@@ -59,6 +103,19 @@
                 android:orientation="vertical" />
 
         </FrameLayout>
-
     </LinearLayout>
+
+    <com.getbase.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_alignBottom="@id/toolbar_big"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="-40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        fab:fab_icon="@drawable/ic_qrcode_white_24dp"
+        fab:fab_colorNormal="@color/fab"
+        fab:fab_colorPressed="@color/fab_pressed" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 049c7013a..d2ca90942 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,9 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_key_view_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_update" />
+
     <item
         android:id="@+id/menu_key_view_export_file"
-        android:icon="@drawable/ic_action_import_export"
         app:showAsAction="never"
         android:title="@string/menu_export_key" />
 
-- 
cgit v1.2.3


From 56d38dd68b7248dff54d56affce0af14e8e2e161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 02:35:09 +0100
Subject: First work on new key view toolbar

---
 .../res/drawable-hdpi/ic_action_encrypt_file.png   | Bin 0 -> 623 bytes
 .../res/drawable-hdpi/ic_action_encrypt_text.png   | Bin 0 -> 787 bytes
 .../drawable-hdpi/ic_action_verified_cutout.png    | Bin 0 -> 1080 bytes
 .../res/drawable-mdpi/ic_action_encrypt_file.png   | Bin 0 -> 480 bytes
 .../res/drawable-mdpi/ic_action_encrypt_text.png   | Bin 0 -> 572 bytes
 .../drawable-mdpi/ic_action_verified_cutout.png    | Bin 0 -> 751 bytes
 .../res/drawable-xhdpi/ic_action_encrypt_file.png  | Bin 0 -> 836 bytes
 .../res/drawable-xhdpi/ic_action_encrypt_text.png  | Bin 0 -> 976 bytes
 .../drawable-xhdpi/ic_action_verified_cutout.png   | Bin 0 -> 1455 bytes
 .../res/drawable-xxhdpi/ic_action_encrypt_file.png | Bin 0 -> 1095 bytes
 .../res/drawable-xxhdpi/ic_action_encrypt_text.png | Bin 0 -> 1331 bytes
 .../drawable-xxhdpi/ic_action_verified_cutout.png  | Bin 0 -> 2168 bytes
 .../src/main/res/layout/view_key_activity.xml      | 106 +++++++++++++++------
 OpenKeychain/src/main/res/menu/key_view2.xml       |  11 +++
 OpenKeychain/src/main/res/values-v21/dimens.xml    |   1 +
 OpenKeychain/src/main/res/values/attr.xml          |   9 ++
 OpenKeychain/src/main/res/values/dimens.xml        |   1 +
 OpenKeychain/src/main/res/values/strings.xml       |   7 +-
 18 files changed, 104 insertions(+), 31 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/menu/key_view2.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png
new file mode 100644
index 000000000..1e397ebed
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png
new file mode 100644
index 000000000..1cbd993a7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout.png
new file mode 100644
index 000000000..896aca575
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png
new file mode 100644
index 000000000..06a054160
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png
new file mode 100644
index 000000000..97cb03def
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout.png
new file mode 100644
index 000000000..0329b488f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png
new file mode 100644
index 000000000..5f528864d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png
new file mode 100644
index 000000000..f8867e922
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout.png
new file mode 100644
index 000000000..116adf28d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png
new file mode 100644
index 000000000..c77329563
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png
new file mode 100644
index 000000000..15650500d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout.png
new file mode 100644
index 000000000..49b13017c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_verified_cutout.png differ
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index f9c23f065..ad46a8d62 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -9,11 +9,22 @@
     <RelativeLayout
         android:id="@+id/toolbar_big"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/big_toolbar"
+        android:layout_height="@dimen/huge_toolbar"
         android:elevation="4dp"
         android:background="?attr/colorPrimary"
         android:orientation="horizontal">
 
+        <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
+            android:id="@+id/view_key_photo"
+            app:aspectRatioEnabled="true"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/status_bar"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:src="@drawable/first_time_1" />
+
         <ImageView
             android:id="@+id/status_bar"
             android:layout_width="match_parent"
@@ -26,7 +37,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
             android:overScrollMode="always"
             app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
@@ -35,46 +45,84 @@
             android:touchscreenBlocksFocus="false" />
 
         <LinearLayout
-            android:layout_below="@+id/toolbar"
-            android:layout_marginLeft="48dp"
-            android:layout_marginRight="72dp"
+            android:id="@+id/name_layout"
+            android:orientation="horizontal"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_above="@+id/toolbar2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <LinearLayout
-                android:id="@+id/view_key_status_layout"
-                android:layout_width="wrap_content"
+            <ImageView
+                android:id="@+id/view_key_status_image"
+                android:layout_width="24dp"
+                android:visibility="invisible"
+                android:src="@drawable/status_signature_unverified_cutout"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:orientation="horizontal">
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="2dp" />
 
-                <ImageView
-                    android:id="@+id/view_key_status_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
-                    android:id="@+id/view_key_status_text"
+                    android:id="@+id/view_key_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="8dp" />
+                    android:text=""
+                    android:textColor="@color/icons"
+                    android:textAppearance="?android:attr/textAppearanceLarge" />
 
+                <TextView
+                    android:id="@+id/view_key_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textColor="@color/tab_text"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/api_app_settings_app_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Name (set in-code)longlong"
-                android:textColor="@color/icons"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:paddingLeft="8dp"
-                android:layout_gravity="center_vertical" />
         </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/toolbar2"
+            android:orientation="horizontal"
+            android:layout_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:minHeight="?attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_marginLeft="32dp">
+
+            <ImageButton
+                android:id="@+id/view_key_action_encrypt_files"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                style="?android:attr/borderlessButtonStyle"
+                android:src="@drawable/ic_action_encrypt_file" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_encrypt_text"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                style="?android:attr/borderlessButtonStyle"
+                android:src="@drawable/ic_action_encrypt_text" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_verify"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:visibility="invisible"
+                style="?android:attr/borderlessButtonStyle"
+                android:src="@drawable/ic_action_verified_cutout" />
+        </LinearLayout>
+
     </RelativeLayout>
 
     <LinearLayout
diff --git a/OpenKeychain/src/main/res/menu/key_view2.xml b/OpenKeychain/src/main/res/menu/key_view2.xml
new file mode 100644
index 000000000..d928bee36
--- /dev/null
+++ b/OpenKeychain/src/main/res/menu/key_view2.xml
@@ -0,0 +1,11 @@
+<?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/menu_key_view_refresh"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_update" />
+
+</menu>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index 3a85cca93..eee21b52e 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -7,4 +7,5 @@
     <dimen name="statusbar_height">24dp</dimen>
     <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
+    <dimen name="huge_toolbar">233dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml
index 5dfa03987..98ce1c364 100644
--- a/OpenKeychain/src/main/res/values/attr.xml
+++ b/OpenKeychain/src/main/res/values/attr.xml
@@ -6,4 +6,13 @@
         <attr name="unFoldedLabel" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="AspectRatioImageView">
+        <attr name="aspectRatio" format="float" />
+        <attr name="aspectRatioEnabled" format="boolean" />
+        <attr name="dominantMeasurement">
+            <enum name="width" value="0" />
+            <enum name="height" value="1" />
+        </attr>
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 7e361a358..08b072202 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -3,4 +3,5 @@
     <!-- on Android < 5, we do not color the status bar, thus 0dp! -->
     <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
+    <dimen name="huge_toolbar">212dp</dimen>
 </resources>
\ 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 4a56274d7..730746787 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -582,8 +582,11 @@
     <string name="create_key_edit">"Change key configuration"</string>
 
     <!-- View key -->
-    <string name="view_key_revoked">"This key has been revoked!"</string>
-    <string name="view_key_expired">"This key is expired!"</string>
+    <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
+    <string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string>
+    <string name="view_key_my_key">"My Key"</string>
+    <string name="view_key_verified">"Verified Key"</string>
+    <string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string>
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">"Keys"</string>
-- 
cgit v1.2.3


From 430ba2f7778e70c6c8a8c46e51de46543e074f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 11:29:46 +0100
Subject: Bigger status icon in key view

---
 .../res/drawable-hdpi/key_flag_authenticate.png    | Bin 1302 -> 0 bytes
 .../drawable-hdpi/key_flag_authenticate_24px.png   | Bin 0 -> 1302 bytes
 .../main/res/drawable-hdpi/key_flag_certify.png    | Bin 2289 -> 0 bytes
 .../res/drawable-hdpi/key_flag_certify_24px.png    | Bin 0 -> 2289 bytes
 .../main/res/drawable-hdpi/key_flag_encrypt.png    | Bin 1530 -> 0 bytes
 .../res/drawable-hdpi/key_flag_encrypt_24px.png    | Bin 0 -> 1530 bytes
 .../src/main/res/drawable-hdpi/key_flag_sign.png   | Bin 1751 -> 0 bytes
 .../main/res/drawable-hdpi/key_flag_sign_24px.png  | Bin 0 -> 1751 bytes
 .../main/res/drawable-hdpi/status_lock_closed.png  | Bin 675 -> 0 bytes
 .../res/drawable-hdpi/status_lock_closed_24px.png  | Bin 0 -> 675 bytes
 .../main/res/drawable-hdpi/status_lock_error.png   | Bin 748 -> 0 bytes
 .../res/drawable-hdpi/status_lock_error_24px.png   | Bin 0 -> 748 bytes
 .../main/res/drawable-hdpi/status_lock_open.png    | Bin 675 -> 0 bytes
 .../res/drawable-hdpi/status_lock_open_24px.png    | Bin 0 -> 675 bytes
 .../res/drawable-hdpi/status_signature_expired.png | Bin 723 -> 0 bytes
 .../status_signature_expired_cutout.png            | Bin 789 -> 0 bytes
 .../status_signature_expired_cutout_24px.png       | Bin 0 -> 789 bytes
 .../status_signature_expired_cutout_96px.png       | Bin 0 -> 3241 bytes
 .../res/drawable-hdpi/status_signature_invalid.png | Bin 528 -> 0 bytes
 .../status_signature_invalid_cutout.png            | Bin 444 -> 0 bytes
 .../status_signature_invalid_cutout_24px.png       | Bin 0 -> 444 bytes
 .../status_signature_invalid_cutout_96px.png       | Bin 0 -> 1656 bytes
 .../res/drawable-hdpi/status_signature_revoked.png | Bin 714 -> 0 bytes
 .../status_signature_revoked_cutout.png            | Bin 861 -> 0 bytes
 .../status_signature_revoked_cutout_24px.png       | Bin 0 -> 861 bytes
 .../status_signature_revoked_cutout_96px.png       | Bin 0 -> 3638 bytes
 .../res/drawable-hdpi/status_signature_unknown.png | Bin 640 -> 0 bytes
 .../status_signature_unknown_cutout.png            | Bin 740 -> 0 bytes
 .../status_signature_unknown_cutout_24px.png       | Bin 0 -> 740 bytes
 .../status_signature_unknown_cutout_96px.png       | Bin 0 -> 2878 bytes
 .../drawable-hdpi/status_signature_unverified.png  | Bin 536 -> 0 bytes
 .../status_signature_unverified_cutout.png         | Bin 813 -> 0 bytes
 .../status_signature_unverified_cutout_24px.png    | Bin 0 -> 813 bytes
 .../status_signature_unverified_cutout_96px.png    | Bin 0 -> 3257 bytes
 .../drawable-hdpi/status_signature_verified.png    | Bin 541 -> 0 bytes
 .../status_signature_verified_cutout.png           | Bin 695 -> 0 bytes
 .../status_signature_verified_cutout_24px.png      | Bin 0 -> 695 bytes
 .../status_signature_verified_cutout_96px.png      | Bin 0 -> 3277 bytes
 .../res/drawable-mdpi/key_flag_authenticate.png    | Bin 897 -> 0 bytes
 .../drawable-mdpi/key_flag_authenticate_24px.png   | Bin 0 -> 897 bytes
 .../main/res/drawable-mdpi/key_flag_certify.png    | Bin 1746 -> 0 bytes
 .../res/drawable-mdpi/key_flag_certify_24px.png    | Bin 0 -> 1746 bytes
 .../main/res/drawable-mdpi/key_flag_encrypt.png    | Bin 1153 -> 0 bytes
 .../res/drawable-mdpi/key_flag_encrypt_24px.png    | Bin 0 -> 1153 bytes
 .../src/main/res/drawable-mdpi/key_flag_sign.png   | Bin 1353 -> 0 bytes
 .../main/res/drawable-mdpi/key_flag_sign_24px.png  | Bin 0 -> 1353 bytes
 .../main/res/drawable-mdpi/status_lock_closed.png  | Bin 528 -> 0 bytes
 .../res/drawable-mdpi/status_lock_closed_24px.png  | Bin 0 -> 528 bytes
 .../main/res/drawable-mdpi/status_lock_error.png   | Bin 622 -> 0 bytes
 .../res/drawable-mdpi/status_lock_error_24px.png   | Bin 0 -> 622 bytes
 .../main/res/drawable-mdpi/status_lock_open.png    | Bin 522 -> 0 bytes
 .../res/drawable-mdpi/status_lock_open_24px.png    | Bin 0 -> 522 bytes
 .../res/drawable-mdpi/status_signature_expired.png | Bin 601 -> 0 bytes
 .../status_signature_expired_cutout.png            | Bin 643 -> 0 bytes
 .../status_signature_expired_cutout_24px.png       | Bin 0 -> 643 bytes
 .../status_signature_expired_cutout_96px.png       | Bin 0 -> 2411 bytes
 .../res/drawable-mdpi/status_signature_invalid.png | Bin 463 -> 0 bytes
 .../status_signature_invalid_cutout.png            | Bin 410 -> 0 bytes
 .../status_signature_invalid_cutout_24px.png       | Bin 0 -> 410 bytes
 .../status_signature_invalid_cutout_96px.png       | Bin 0 -> 958 bytes
 .../res/drawable-mdpi/status_signature_revoked.png | Bin 613 -> 0 bytes
 .../status_signature_revoked_cutout.png            | Bin 685 -> 0 bytes
 .../status_signature_revoked_cutout_24px.png       | Bin 0 -> 685 bytes
 .../status_signature_revoked_cutout_96px.png       | Bin 0 -> 2475 bytes
 .../res/drawable-mdpi/status_signature_unknown.png | Bin 517 -> 0 bytes
 .../status_signature_unknown_cutout.png            | Bin 589 -> 0 bytes
 .../status_signature_unknown_cutout_24px.png       | Bin 0 -> 589 bytes
 .../status_signature_unknown_cutout_96px.png       | Bin 0 -> 2105 bytes
 .../drawable-mdpi/status_signature_unverified.png  | Bin 469 -> 0 bytes
 .../status_signature_unverified_cutout.png         | Bin 667 -> 0 bytes
 .../status_signature_unverified_cutout_24px.png    | Bin 0 -> 667 bytes
 .../status_signature_unverified_cutout_96px.png    | Bin 0 -> 2314 bytes
 .../drawable-mdpi/status_signature_verified.png    | Bin 476 -> 0 bytes
 .../status_signature_verified_cutout.png           | Bin 557 -> 0 bytes
 .../status_signature_verified_cutout_24px.png      | Bin 0 -> 557 bytes
 .../status_signature_verified_cutout_96px.png      | Bin 0 -> 2148 bytes
 .../res/drawable-xhdpi/key_flag_authenticate.png   | Bin 2161 -> 0 bytes
 .../drawable-xhdpi/key_flag_authenticate_24px.png  | Bin 0 -> 2161 bytes
 .../main/res/drawable-xhdpi/key_flag_certify.png   | Bin 3713 -> 0 bytes
 .../res/drawable-xhdpi/key_flag_certify_24px.png   | Bin 0 -> 3713 bytes
 .../main/res/drawable-xhdpi/key_flag_encrypt.png   | Bin 2310 -> 0 bytes
 .../res/drawable-xhdpi/key_flag_encrypt_24px.png   | Bin 0 -> 2310 bytes
 .../src/main/res/drawable-xhdpi/key_flag_sign.png  | Bin 2705 -> 0 bytes
 .../main/res/drawable-xhdpi/key_flag_sign_24px.png | Bin 0 -> 2705 bytes
 .../main/res/drawable-xhdpi/status_lock_closed.png | Bin 911 -> 0 bytes
 .../res/drawable-xhdpi/status_lock_closed_24px.png | Bin 0 -> 911 bytes
 .../main/res/drawable-xhdpi/status_lock_error.png  | Bin 1008 -> 0 bytes
 .../res/drawable-xhdpi/status_lock_error_24px.png  | Bin 0 -> 1008 bytes
 .../main/res/drawable-xhdpi/status_lock_open.png   | Bin 911 -> 0 bytes
 .../res/drawable-xhdpi/status_lock_open_24px.png   | Bin 0 -> 911 bytes
 .../drawable-xhdpi/status_signature_expired.png    | Bin 1049 -> 0 bytes
 .../status_signature_expired_cutout.png            | Bin 1179 -> 0 bytes
 .../status_signature_expired_cutout_24px.png       | Bin 0 -> 1179 bytes
 .../status_signature_expired_cutout_96px.png       | Bin 0 -> 4973 bytes
 .../drawable-xhdpi/status_signature_invalid.png    | Bin 736 -> 0 bytes
 .../status_signature_invalid_cutout.png            | Bin 676 -> 0 bytes
 .../status_signature_invalid_cutout_24px.png       | Bin 0 -> 676 bytes
 .../status_signature_invalid_cutout_96px.png       | Bin 0 -> 2306 bytes
 .../drawable-xhdpi/status_signature_revoked.png    | Bin 1033 -> 0 bytes
 .../status_signature_revoked_cutout.png            | Bin 1218 -> 0 bytes
 .../status_signature_revoked_cutout_24px.png       | Bin 0 -> 1218 bytes
 .../status_signature_revoked_cutout_96px.png       | Bin 0 -> 5757 bytes
 .../drawable-xhdpi/status_signature_unknown.png    | Bin 906 -> 0 bytes
 .../status_signature_unknown_cutout.png            | Bin 1043 -> 0 bytes
 .../status_signature_unknown_cutout_24px.png       | Bin 0 -> 1043 bytes
 .../status_signature_unknown_cutout_96px.png       | Bin 0 -> 4395 bytes
 .../drawable-xhdpi/status_signature_unverified.png | Bin 706 -> 0 bytes
 .../status_signature_unverified_cutout.png         | Bin 1166 -> 0 bytes
 .../status_signature_unverified_cutout_24px.png    | Bin 0 -> 1166 bytes
 .../status_signature_unverified_cutout_96px.png    | Bin 0 -> 4908 bytes
 .../drawable-xhdpi/status_signature_verified.png   | Bin 784 -> 0 bytes
 .../status_signature_verified_cutout.png           | Bin 1017 -> 0 bytes
 .../status_signature_verified_cutout_24px.png      | Bin 0 -> 1017 bytes
 .../status_signature_verified_cutout_96px.png      | Bin 0 -> 5309 bytes
 .../res/drawable-xxhdpi/key_flag_authenticate.png  | Bin 3073 -> 0 bytes
 .../drawable-xxhdpi/key_flag_authenticate_24px.png | Bin 0 -> 3073 bytes
 .../main/res/drawable-xxhdpi/key_flag_certify.png  | Bin 5303 -> 0 bytes
 .../res/drawable-xxhdpi/key_flag_certify_24px.png  | Bin 0 -> 5303 bytes
 .../main/res/drawable-xxhdpi/key_flag_encrypt.png  | Bin 3158 -> 0 bytes
 .../res/drawable-xxhdpi/key_flag_encrypt_24px.png  | Bin 0 -> 3158 bytes
 .../src/main/res/drawable-xxhdpi/key_flag_sign.png | Bin 3765 -> 0 bytes
 .../res/drawable-xxhdpi/key_flag_sign_24px.png     | Bin 0 -> 3765 bytes
 .../res/drawable-xxhdpi/status_lock_closed.png     | Bin 1160 -> 0 bytes
 .../drawable-xxhdpi/status_lock_closed_24px.png    | Bin 0 -> 1160 bytes
 .../main/res/drawable-xxhdpi/status_lock_error.png | Bin 1316 -> 0 bytes
 .../res/drawable-xxhdpi/status_lock_error_24px.png | Bin 0 -> 1316 bytes
 .../main/res/drawable-xxhdpi/status_lock_open.png  | Bin 1165 -> 0 bytes
 .../res/drawable-xxhdpi/status_lock_open_24px.png  | Bin 0 -> 1165 bytes
 .../drawable-xxhdpi/status_signature_expired.png   | Bin 1429 -> 0 bytes
 .../status_signature_expired_cutout.png            | Bin 1590 -> 0 bytes
 .../status_signature_expired_cutout_24px.png       | Bin 0 -> 1590 bytes
 .../status_signature_expired_cutout_96px.png       | Bin 0 -> 6986 bytes
 .../drawable-xxhdpi/status_signature_invalid.png   | Bin 840 -> 0 bytes
 .../status_signature_invalid_cutout.png            | Bin 694 -> 0 bytes
 .../status_signature_invalid_cutout_24px.png       | Bin 0 -> 694 bytes
 .../status_signature_invalid_cutout_96px.png       | Bin 0 -> 3701 bytes
 .../drawable-xxhdpi/status_signature_revoked.png   | Bin 1353 -> 0 bytes
 .../status_signature_revoked_cutout.png            | Bin 1660 -> 0 bytes
 .../status_signature_revoked_cutout_24px.png       | Bin 0 -> 1660 bytes
 .../status_signature_revoked_cutout_96px.png       | Bin 0 -> 7922 bytes
 .../drawable-xxhdpi/status_signature_unknown.png   | Bin 1231 -> 0 bytes
 .../status_signature_unknown_cutout.png            | Bin 1377 -> 0 bytes
 .../status_signature_unknown_cutout_24px.png       | Bin 0 -> 1377 bytes
 .../status_signature_unknown_cutout_96px.png       | Bin 0 -> 5952 bytes
 .../status_signature_unverified.png                | Bin 946 -> 0 bytes
 .../status_signature_unverified_cutout.png         | Bin 1555 -> 0 bytes
 .../status_signature_unverified_cutout_24px.png    | Bin 0 -> 1555 bytes
 .../status_signature_unverified_cutout_96px.png    | Bin 0 -> 6544 bytes
 .../drawable-xxhdpi/status_signature_verified.png  | Bin 1012 -> 0 bytes
 .../status_signature_verified_cutout.png           | Bin 1319 -> 0 bytes
 .../status_signature_verified_cutout_24px.png      | Bin 0 -> 1319 bytes
 .../status_signature_verified_cutout_96px.png      | Bin 0 -> 7353 bytes
 .../src/main/res/layout/certify_key_fragment.xml   |   2 +-
 .../src/main/res/layout/decrypt_result_include.xml |   4 +--
 .../src/main/res/layout/import_keys_list_item.xml  |   2 +-
 OpenKeychain/src/main/res/layout/key_list_item.xml |   2 +-
 .../src/main/res/layout/keyspinner_item.xml        |   2 +-
 .../src/main/res/layout/select_key_item.xml        |   2 +-
 .../src/main/res/layout/view_key_activity.xml      |  32 +++++++++++++--------
 .../main/res/layout/view_key_adv_main_fragment.xml |   2 +-
 .../main/res/layout/view_key_adv_subkey_item.xml   |  10 +++----
 .../src/main/res/layout/view_key_fragment.xml      |   2 +-
 162 files changed, 34 insertions(+), 26 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
deleted file mode 100644
index 9d4ed6e84..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png
new file mode 100644
index 000000000..9d4ed6e84
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
deleted file mode 100644
index e76393659..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png
new file mode 100644
index 000000000..e76393659
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
deleted file mode 100644
index 3c2f8c09c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png
new file mode 100644
index 000000000..3c2f8c09c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
deleted file mode 100644
index 046424643..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png
new file mode 100644
index 000000000..046424643
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png
deleted file mode 100644
index a1b090630..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png
new file mode 100644
index 000000000..a1b090630
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png
deleted file mode 100644
index e567055aa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png
new file mode 100644
index 000000000..e567055aa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png
deleted file mode 100644
index 98e32eadc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png
new file mode 100644
index 000000000..98e32eadc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png
deleted file mode 100644
index 21e8b536a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 84ac9bec2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png
new file mode 100644
index 000000000..84ac9bec2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png
new file mode 100644
index 000000000..63546068f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png
deleted file mode 100644
index 9ae2a09ab..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index 967e00e80..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png
new file mode 100644
index 000000000..967e00e80
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png
new file mode 100644
index 000000000..9957db288
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png
deleted file mode 100644
index 16e1d7181..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 244dd0708..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png
new file mode 100644
index 000000000..244dd0708
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png
new file mode 100644
index 000000000..1c3a15c07
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png
deleted file mode 100644
index 5c3ba866d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 82cc25a4b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png
new file mode 100644
index 000000000..82cc25a4b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png
new file mode 100644
index 000000000..ce46c6317
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png
deleted file mode 100644
index b8b472a5a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index e752eaeab..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png
new file mode 100644
index 000000000..e752eaeab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png
new file mode 100644
index 000000000..19ee3c241
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png
deleted file mode 100644
index d8141b47b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 08a9f464c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png
new file mode 100644
index 000000000..08a9f464c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png
new file mode 100644
index 000000000..ed3db0aca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
deleted file mode 100644
index ed1ba24d2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png
new file mode 100644
index 000000000..ed1ba24d2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
deleted file mode 100644
index d54d461fa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png
new file mode 100644
index 000000000..d54d461fa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
deleted file mode 100644
index 81c1b3dfa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png
new file mode 100644
index 000000000..81c1b3dfa
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
deleted file mode 100644
index 9afc43901..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png
new file mode 100644
index 000000000..9afc43901
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png
deleted file mode 100644
index cfc39f0e7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png
new file mode 100644
index 000000000..cfc39f0e7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png
deleted file mode 100644
index 824dc2672..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png
new file mode 100644
index 000000000..824dc2672
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png
deleted file mode 100644
index 9bca59ae3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png
new file mode 100644
index 000000000..9bca59ae3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png
deleted file mode 100644
index 81a900147..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png
deleted file mode 100644
index bc91094b5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png
new file mode 100644
index 000000000..bc91094b5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png
new file mode 100644
index 000000000..df385bb1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png
deleted file mode 100644
index baa78f795..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index bc2f56e2a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png
new file mode 100644
index 000000000..bc2f56e2a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png
new file mode 100644
index 000000000..aeb899599
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png
deleted file mode 100644
index 7cf985274..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 2d2593194..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png
new file mode 100644
index 000000000..2d2593194
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png
new file mode 100644
index 000000000..d77c5e1c1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png
deleted file mode 100644
index 3d4665320..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 0fc74d07e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png
new file mode 100644
index 000000000..0fc74d07e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png
new file mode 100644
index 000000000..ee0661234
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png
deleted file mode 100644
index 8348b32b3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 96a2d1413..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png
new file mode 100644
index 000000000..96a2d1413
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png
new file mode 100644
index 000000000..1602747f1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png
deleted file mode 100644
index 02e53ac8a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 9f7cf837c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png
new file mode 100644
index 000000000..9f7cf837c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png
new file mode 100644
index 000000000..61c23f749
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
deleted file mode 100644
index 8d36d7202..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png
new file mode 100644
index 000000000..8d36d7202
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
deleted file mode 100644
index 01a74bcc0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png
new file mode 100644
index 000000000..01a74bcc0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
deleted file mode 100644
index ff07bd0a4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png
new file mode 100644
index 000000000..ff07bd0a4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
deleted file mode 100644
index b8002162a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png
new file mode 100644
index 000000000..b8002162a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png
deleted file mode 100644
index 7c6bb2d18..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png
new file mode 100644
index 000000000..7c6bb2d18
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png
deleted file mode 100644
index da4a5d89a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png
new file mode 100644
index 000000000..da4a5d89a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png
deleted file mode 100644
index cd02fc1e4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png
new file mode 100644
index 000000000..cd02fc1e4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png
deleted file mode 100644
index f5105c1ae..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 83f6fde35..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png
new file mode 100644
index 000000000..83f6fde35
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png
new file mode 100644
index 000000000..568b48c43
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png
deleted file mode 100644
index 67880d6db..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index 29830f5ba..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png
new file mode 100644
index 000000000..29830f5ba
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png
new file mode 100644
index 000000000..89f899212
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png
deleted file mode 100644
index 2ed67419b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 2f7695043..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png
new file mode 100644
index 000000000..2f7695043
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png
new file mode 100644
index 000000000..3db663e2e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png
deleted file mode 100644
index a6f1f2792..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 2ce28c7ca..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png
new file mode 100644
index 000000000..2ce28c7ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png
new file mode 100644
index 000000000..4e0e04375
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png
deleted file mode 100644
index c25a84b4d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 442c55eee..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png
new file mode 100644
index 000000000..442c55eee
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png
new file mode 100644
index 000000000..0b2ccc9f7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png
deleted file mode 100644
index 6f435a85e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 160ec7cbe..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png
new file mode 100644
index 000000000..160ec7cbe
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png
new file mode 100644
index 000000000..471e5e513
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
deleted file mode 100644
index d786dc72f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png
new file mode 100644
index 000000000..d786dc72f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
deleted file mode 100644
index 4bb97f992..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png
new file mode 100644
index 000000000..4bb97f992
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
deleted file mode 100644
index fe0c8e41b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png
new file mode 100644
index 000000000..fe0c8e41b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
deleted file mode 100644
index 51ab367a9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png
new file mode 100644
index 000000000..51ab367a9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png
deleted file mode 100644
index 5a9664d59..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png
new file mode 100644
index 000000000..5a9664d59
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png
deleted file mode 100644
index 608f065af..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png
new file mode 100644
index 000000000..608f065af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png
deleted file mode 100644
index ee34dd396..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png
new file mode 100644
index 000000000..ee34dd396
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png
deleted file mode 100644
index f475c9d84..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png
deleted file mode 100644
index 33a3efed1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png
new file mode 100644
index 000000000..33a3efed1
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png
new file mode 100644
index 000000000..ba7e8c2f4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png
deleted file mode 100644
index f21c2cf52..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png
deleted file mode 100644
index bc39d3496..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png
new file mode 100644
index 000000000..bc39d3496
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png
new file mode 100644
index 000000000..1fbf5ceb2
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png
deleted file mode 100644
index be1a1d9dc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png
deleted file mode 100644
index 58929661f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png
new file mode 100644
index 000000000..58929661f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png
new file mode 100644
index 000000000..338c696ac
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png
deleted file mode 100644
index 841cfa958..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png
deleted file mode 100644
index 3020357a4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png
new file mode 100644
index 000000000..3020357a4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png
new file mode 100644
index 000000000..2690310a6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png
deleted file mode 100644
index 525d1cf6b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png
deleted file mode 100644
index 3829bb3a0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png
new file mode 100644
index 000000000..3829bb3a0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png
new file mode 100644
index 000000000..e559faf9d
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png
deleted file mode 100644
index 54eee5ba0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png
deleted file mode 100644
index 3548ee2b6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png
new file mode 100644
index 000000000..3548ee2b6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png
new file mode 100644
index 000000000..79e4ec4a9
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png differ
diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
index a55a8ea0c..2df3755a4 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml
@@ -95,7 +95,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
+                android:src="@drawable/status_signature_verified_cutout_24px"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 9140ad07b..659d1c207 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -24,7 +24,7 @@
                 android:id="@+id/result_encryption_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/status_lock_open"
+                android:src="@drawable/status_lock_open_24px"
                 android:layout_gravity="center_vertical" />
 
             <TextView
@@ -47,7 +47,7 @@
                 android:id="@+id/result_signature_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/status_signature_unverified_cutout"
+                android:src="@drawable/status_signature_unverified_cutout_24px"
                 android:layout_gravity="center_vertical" />
 
             <TextView
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
index a97e81abe..bf9d33852 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml
@@ -73,7 +73,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:src="@drawable/status_signature_revoked_cutout"
+                    android:src="@drawable/status_signature_revoked_cutout_24px"
                     android:padding="16dp" />
 
                 <TextView
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index df69e4237..5a3a97358 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -69,7 +69,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout"
+        android:src="@drawable/status_signature_revoked_cutout_24px"
         android:padding="16dp" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index b75bb808e..757dae5be 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout"
+        android:src="@drawable/status_signature_revoked_cutout_24px"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
 
diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml
index c7fa882cb..13f63d2ee 100644
--- a/OpenKeychain/src/main/res/layout/select_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/select_key_item.xml
@@ -50,7 +50,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_revoked_cutout"
+        android:src="@drawable/status_signature_revoked_cutout_24px"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index ad46a8d62..9b055d322 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -53,19 +53,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/view_key_status_image"
-                android:layout_width="24dp"
-                android:visibility="invisible"
-                android:src="@drawable/status_signature_unverified_cutout"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="2dp" />
-
             <LinearLayout
                 android:orientation="vertical"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -98,12 +89,15 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:layout_marginLeft="32dp">
+            android:layout_marginLeft="32dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true">
 
             <ImageButton
                 android:id="@+id/view_key_action_encrypt_files"
                 android:layout_width="64dp"
                 android:layout_height="64dp"
+                android:visibility="invisible"
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_encrypt_file" />
 
@@ -111,6 +105,7 @@
                 android:id="@+id/view_key_action_encrypt_text"
                 android:layout_width="64dp"
                 android:layout_height="64dp"
+                android:visibility="invisible"
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_encrypt_text" />
 
@@ -123,6 +118,18 @@
                 android:src="@drawable/ic_action_verified_cutout" />
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/view_key_status_image"
+            android:layout_width="96dp"
+            android:visibility="invisible"
+            android:src="@drawable/status_signature_unverified_cutout_96px"
+            android:layout_height="96dp"
+            android:layout_gravity="center_vertical"
+            android:layout_above="@+id/toolbar2"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="16dp" />
+
     </RelativeLayout>
 
     <LinearLayout
@@ -161,6 +168,7 @@
         android:layout_marginBottom="-40dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:visibility="invisible"
         android:elevation="4dp"
         fab:fab_icon="@drawable/ic_qrcode_white_24dp"
         fab:fab_colorNormal="@color/fab"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
index 691ee357d..6d0ed3298 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
+                android:src="@drawable/status_signature_verified_cutout_24px"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index b2875b9e6..f41109d84 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/status_signature_revoked_cutout"
+        android:src="@drawable/status_signature_revoked_cutout_24px"
         android:paddingLeft="8dp"
         android:layout_centerVertical="true"
         android:layout_alignParentStart="true" />
@@ -71,7 +71,7 @@
                 android:id="@+id/subkey_item_ic_certify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_certify"
+                android:src="@drawable/key_flag_certify_24px"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -79,7 +79,7 @@
                 android:id="@+id/subkey_item_ic_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_sign"
+                android:src="@drawable/key_flag_sign_24px"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -87,7 +87,7 @@
                 android:id="@+id/subkey_item_ic_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_encrypt"
+                android:src="@drawable/key_flag_encrypt_24px"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -95,7 +95,7 @@
                 android:id="@+id/subkey_item_ic_authenticate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/key_flag_authenticate"
+                android:src="@drawable/key_flag_authenticate_24px"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index fadad0e56..790d4143e 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout"
+                android:src="@drawable/status_signature_verified_cutout_24px"
                 android:layout_gravity="center_vertical" />
 
         </LinearLayout>
-- 
cgit v1.2.3


From fa92ceeae3ba89d11cce1282e7c2f824969acf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 13:49:21 +0100
Subject: Toolbar: qr code in header, cleanup of fragment

---
 .../res/drawable-hdpi/ic_mode_edit_white_24dp.png  | Bin 0 -> 351 bytes
 .../ic_swap_vert_circle_white_24dp.png             | Bin 0 -> 483 bytes
 .../res/drawable-hdpi/ic_swap_vert_white_24dp.png  | Bin 0 -> 300 bytes
 .../res/drawable-mdpi/ic_mode_edit_white_24dp.png  | Bin 0 -> 272 bytes
 .../ic_swap_vert_circle_white_24dp.png             | Bin 0 -> 341 bytes
 .../res/drawable-mdpi/ic_swap_vert_white_24dp.png  | Bin 0 -> 226 bytes
 .../res/drawable-xhdpi/ic_mode_edit_white_24dp.png | Bin 0 -> 378 bytes
 .../ic_swap_vert_circle_white_24dp.png             | Bin 0 -> 569 bytes
 .../res/drawable-xhdpi/ic_swap_vert_white_24dp.png | Bin 0 -> 330 bytes
 .../drawable-xxhdpi/ic_mode_edit_white_24dp.png    | Bin 0 -> 490 bytes
 .../ic_swap_vert_circle_white_24dp.png             | Bin 0 -> 863 bytes
 .../drawable-xxhdpi/ic_swap_vert_white_24dp.png    | Bin 0 -> 414 bytes
 .../drawable-xxxhdpi/ic_mode_edit_white_24dp.png   | Bin 0 -> 632 bytes
 .../ic_swap_vert_circle_white_24dp.png             | Bin 0 -> 1048 bytes
 .../drawable-xxxhdpi/ic_swap_vert_white_24dp.png   | Bin 0 -> 502 bytes
 .../src/main/res/layout/view_key_activity.xml      |  82 +++--
 .../src/main/res/layout/view_key_fragment.xml      | 368 ++-------------------
 17 files changed, 75 insertions(+), 375 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
new file mode 100644
index 000000000..3ee3e1720
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png
new file mode 100644
index 000000000..ddd8bb736
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
new file mode 100644
index 000000000..705a4cc70
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
new file mode 100644
index 000000000..85cff0b91
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png
new file mode 100644
index 000000000..efa97b3af
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
new file mode 100644
index 000000000..5f6e11bc8
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
new file mode 100644
index 000000000..7f0ea51bf
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png
new file mode 100644
index 000000000..677b7267c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
new file mode 100644
index 000000000..fb82f4208
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png
new file mode 100644
index 000000000..34ec7092f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png
new file mode 100644
index 000000000..74557d202
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
new file mode 100644
index 000000000..c34970372
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png
new file mode 100644
index 000000000..9380370f4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png
new file mode 100644
index 000000000..c43cc4325
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
new file mode 100644
index 000000000..06b27ea19
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 9b055d322..17303ee84 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -44,40 +44,35 @@
             android:transitionGroup="false"
             android:touchscreenBlocksFocus="false" />
 
-        <LinearLayout
-            android:id="@+id/name_layout"
-            android:orientation="horizontal"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_above="@+id/toolbar2"
+        <TextView
+            android:id="@+id/view_key_name"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_marginLeft="32dp"
-                android:layout_marginStart="32dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:id="@+id/view_key_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=""
-                    android:textColor="@color/icons"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                <TextView
-                    android:id="@+id/view_key_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=""
-                    android:textColor="@color/tab_text"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-        </LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="48dp"
+            android:layout_marginStart="48dp"
+            android:layout_marginRight="48dp"
+            android:layout_marginEnd="48dp"
+            android:layout_above="@+id/view_key_status"
+            android:text=""
+            android:textColor="@color/icons"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:layout_toLeftOf="@+id/view_key_qr_code"
+            android:layout_toStartOf="@+id/view_key_qr_code" />
+
+        <TextView
+            android:id="@+id/view_key_status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="48dp"
+            android:layout_marginStart="48dp"
+            android:layout_marginRight="48dp"
+            android:layout_marginEnd="48dp"
+            android:layout_above="@+id/toolbar2"
+            android:text=""
+            android:textColor="@color/tab_text"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:layout_toLeftOf="@+id/view_key_qr_code"
+            android:layout_toStartOf="@+id/view_key_qr_code" />
 
 
         <LinearLayout
@@ -116,6 +111,15 @@
                 android:visibility="invisible"
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_verified_cutout" />
+
+            <ImageButton
+                android:id="@+id/view_key_action_edit"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:visibility="invisible"
+                style="?android:attr/borderlessButtonStyle"
+                android:src="@drawable/ic_mode_edit_white_24dp" />
+
         </LinearLayout>
 
         <ImageView
@@ -130,6 +134,18 @@
             android:layout_alignParentEnd="true"
             android:layout_marginRight="16dp" />
 
+        <ImageButton
+            android:id="@+id/view_key_qr_code"
+            android:layout_width="96dp"
+            android:layout_height="96dp"
+            android:visibility="gone"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_gravity="center_vertical"
+            android:layout_above="@+id/toolbar2"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="20dp" />
+
     </RelativeLayout>
 
     <LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 790d4143e..d37a41236 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -1,358 +1,42 @@
 <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">
 
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
         android:orientation="vertical"
+        android:paddingTop="16dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_user_ids"
-            android:layout_weight="1" />
-
-        <org.sufficientlysecure.keychain.ui.widget.FixedListView
-            android:id="@+id/view_key_user_ids"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginBottom="4dp"
-            android:layout_weight="1" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_certify"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_certify_text"
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/view_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout_24px"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_key_action_certify_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_edit"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_edit"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_edit"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:id="@+id/view_key_action_edit_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-
-        <LinearLayout
-            android:id="@+id/view_key_action_encrypt_text"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_text_text"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt_files"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_update"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_update"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_fingerprint"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_fingerprint_share"
+        <android.support.v7.widget.CardView
+            android:id="@+id/card_view"
+            android:layout_gravity="center"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_fingerprint"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text=""
-                android:layout_weight="1"
-                android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_fingerprint_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <ImageView
-            android:id="@+id/view_key_fingerprint_qr_code_image"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:layout_width="200dp"
             android:layout_height="200dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_weight="1"
-            style="@style/SelectableItem" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_share_key"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_key_share"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_with"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_clipboard"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_key_safeslinger"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_upload"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_upload"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_nfc_help"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_nfc"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_help"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_nfc_prefs"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_settings"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
+            card_view:cardCornerRadius="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/section_user_ids" />
+
+                <org.sufficientlysecure.keychain.ui.widget.FixedListView
+                    android:id="@+id/view_key_user_ids"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp" />
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
 
 
     </LinearLayout>
-- 
cgit v1.2.3


From 4ea59f79ccbfac85129d09c52dfe5d5247713d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 15:18:00 +0100
Subject: Use material icon for safeslinger

---
 .../src/main/res/drawable-hdpi/ic_action_safeslinger.png | Bin 2616 -> 0 bytes
 .../main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png    | Bin 0 -> 300 bytes
 .../src/main/res/drawable-mdpi/ic_action_safeslinger.png | Bin 1457 -> 0 bytes
 .../main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png    | Bin 0 -> 230 bytes
 .../main/res/drawable-xhdpi/ic_action_safeslinger.png    | Bin 4012 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png   | Bin 0 -> 332 bytes
 .../main/res/drawable-xxhdpi/ic_action_safeslinger.png   | Bin 6626 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png  | Bin 0 -> 418 bytes
 .../main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 531 bytes
 OpenKeychain/src/main/res/layout/key_list_item.xml       |   2 +-
 .../src/main/res/layout/safe_slinger_activity.xml        |   2 +-
 .../src/main/res/layout/view_key_adv_share_fragment.xml  |   2 +-
 12 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png
deleted file mode 100644
index 6ff9bb7b4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png
new file mode 100644
index 000000000..961aedecc
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png
deleted file mode 100644
index bfea67f33..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png
new file mode 100644
index 000000000..f7faa5cf4
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png
deleted file mode 100644
index 864a18d1a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png
new file mode 100644
index 000000000..22ff0c308
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png
deleted file mode 100644
index 02efa1d24..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png
new file mode 100644
index 000000000..3edec452e
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png
new file mode 100644
index 000000000..3dea0d014
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 5a3a97358..9f9cf4eca 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:src="@drawable/ic_action_safeslinger"
+            android:src="@drawable/ic_swap_vert_grey_24dp"
             android:padding="12dp"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index 8dbe1d62e..ff5fa6d94 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -69,7 +69,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:padding="8dp"
-                    android:src="@drawable/ic_action_safeslinger"
+                    android:src="@drawable/ic_swap_vert_grey_24dp"
                     android:layout_gravity="center_vertical" />
 
             </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 9971032ce..782091f16 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -135,7 +135,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_safeslinger"
+                android:src="@drawable/ic_swap_vert_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
-- 
cgit v1.2.3


From 27263edda5ffba4241e54e2f64f35eb1058663e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 18:37:31 +0100
Subject: CardView and more header design

---
 .../src/main/res/drawable/cardview_header.xml      | 11 ++++++
 .../src/main/res/layout/view_key_activity.xml      | 43 +++++++++++++---------
 .../src/main/res/layout/view_key_fragment.xml      |  9 +++--
 OpenKeychain/src/main/res/values/strings.xml       |  1 +
 OpenKeychain/src/main/res/values/styles.xml        | 10 +++++
 5 files changed, 53 insertions(+), 21 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable/cardview_header.xml

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

diff --git a/OpenKeychain/src/main/res/drawable/cardview_header.xml b/OpenKeychain/src/main/res/drawable/cardview_header.xml
new file mode 100644
index 000000000..9bab96ea9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/cardview_header.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <size
+        android:height="1dp"
+        android:width="1000dp" />
+
+    <solid android:color="@color/bg_gray" />
+
+</shape>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 17303ee84..25b978e37 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -52,12 +53,12 @@
             android:layout_marginStart="48dp"
             android:layout_marginRight="48dp"
             android:layout_marginEnd="48dp"
-            android:layout_above="@+id/view_key_status"
             android:text=""
             android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_toLeftOf="@+id/view_key_qr_code"
-            android:layout_toStartOf="@+id/view_key_qr_code" />
+            android:layout_above="@+id/view_key_status"
+            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
+            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
 
         <TextView
             android:id="@+id/view_key_status"
@@ -67,19 +68,18 @@
             android:layout_marginStart="48dp"
             android:layout_marginRight="48dp"
             android:layout_marginEnd="48dp"
-            android:layout_above="@+id/toolbar2"
             android:text=""
             android:textColor="@color/tab_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_toLeftOf="@+id/view_key_qr_code"
-            android:layout_toStartOf="@+id/view_key_qr_code" />
-
+            android:layout_above="@+id/toolbar2"
+            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
+            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
 
         <LinearLayout
             android:id="@+id/toolbar2"
             android:orientation="horizontal"
             android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:minHeight="?attr/actionBarSize"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -128,23 +128,30 @@
             android:visibility="invisible"
             android:src="@drawable/status_signature_unverified_cutout_96px"
             android:layout_height="96dp"
-            android:layout_gravity="center_vertical"
-            android:layout_above="@+id/toolbar2"
+            android:layout_above="@id/toolbar2"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_marginRight="16dp" />
 
-        <ImageButton
-            android:id="@+id/view_key_qr_code"
-            android:layout_width="96dp"
-            android:layout_height="96dp"
+        <android.support.v7.widget.CardView
+            android:id="@+id/view_key_qr_code_layout"
             android:visibility="gone"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_gravity="center_vertical"
-            android:layout_above="@+id/toolbar2"
+            android:layout_below="@id/toolbar"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="20dp" />
+            android:layout_marginRight="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <ImageButton
+                android:id="@+id/view_key_qr_code"
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                style="?android:attr/borderlessButtonStyle" />
+        </android.support.v7.widget.CardView>
 
     </RelativeLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index d37a41236..8e1bad3a8 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -8,6 +8,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingTop="16dp"
+        android:paddingBottom="16dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp">
 
@@ -15,7 +16,10 @@
             android:id="@+id/card_view"
             android:layout_gravity="center"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2sp"
+            card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
             <LinearLayout
@@ -24,10 +28,9 @@
                 android:orientation="vertical">
 
                 <TextView
-                    style="@style/SectionHeader"
+                    style="@style/CardViewHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:text="@string/section_user_ids" />
 
                 <org.sufficientlysecure.keychain.ui.widget.FixedListView
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 730746787..46d6d3e47 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -584,6 +584,7 @@
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
     <string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string>
+    <string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
     <string name="view_key_my_key">"My Key"</string>
     <string name="view_key_verified">"Verified Key"</string>
     <string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string>
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index f05bdb0ff..8420e0c13 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -20,6 +20,16 @@
         <!--<item name="centerMedium">@android:drawable/popup_center_medium</item>-->
     </style>
 
+    <style name="CardViewHeader">
+        <item name="android:drawableBottom">@drawable/cardview_header</item>
+        <item name="android:drawablePadding">16dp</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/header_text</item>
+        <item name="android:textSize">17sp</item>
+    </style>
+
     <style name="SectionHeader">
         <item name="android:drawableBottom">@drawable/section_header</item>
         <item name="android:drawablePadding">4dp</item>
-- 
cgit v1.2.3


From 57fa702cbf28368994810c33dcc9afeebf60932d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 19:38:13 +0100
Subject: Design fixes for header, QR Code shared element transitions

---
 .../src/main/res/layout/qr_code_activity.xml       | 23 +++++++++++++++++-----
 .../src/main/res/layout/view_key_activity.xml      | 13 +++++-------
 OpenKeychain/src/main/res/values-v21/dimens.xml    |  2 +-
 OpenKeychain/src/main/res/values-v21/themes.xml    |  2 ++
 OpenKeychain/src/main/res/values/dimens.xml        |  2 +-
 5 files changed, 27 insertions(+), 15 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 11b502b34..126be4c3a 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -13,12 +15,23 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/qr_code_image"
-            android:padding="32dp"
+        <android.support.v7.widget.CardView
+            android:id="@+id/qr_code_image_layout"
+            android:transitionName="qr_code"
+            android:layout_margin="32dp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/SelectableItem" />
+            android:layout_height="wrap_content"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
+                android:id="@+id/qr_code_image"
+                app:aspectRatioEnabled="true"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?android:attr/borderlessButtonStyle" />
+        </android.support.v7.widget.CardView>
 
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 25b978e37..bc46ac85f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -56,9 +56,7 @@
             android:text=""
             android:textColor="@color/icons"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:layout_above="@+id/view_key_status"
-            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
-            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
+            android:layout_above="@+id/view_key_status" />
 
         <TextView
             android:id="@+id/view_key_status"
@@ -71,9 +69,7 @@
             android:text=""
             android:textColor="@color/tab_text"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_above="@+id/toolbar2"
-            android:layout_toLeftOf="@+id/view_key_qr_code_layout"
-            android:layout_toStartOf="@+id/view_key_qr_code_layout" />
+            android:layout_above="@+id/toolbar2" />
 
         <LinearLayout
             android:id="@+id/toolbar2"
@@ -135,8 +131,9 @@
 
         <android.support.v7.widget.CardView
             android:id="@+id/view_key_qr_code_layout"
-            android:visibility="gone"
-            android:layout_below="@id/toolbar"
+            android:transitionName="qr_code"
+            android:visibility="visible"
+            android:layout_above="@id/toolbar2"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_marginRight="20dp"
diff --git a/OpenKeychain/src/main/res/values-v21/dimens.xml b/OpenKeychain/src/main/res/values-v21/dimens.xml
index eee21b52e..7e07ae0f9 100644
--- a/OpenKeychain/src/main/res/values-v21/dimens.xml
+++ b/OpenKeychain/src/main/res/values-v21/dimens.xml
@@ -7,5 +7,5 @@
     <dimen name="statusbar_height">24dp</dimen>
     <!-- 120dp + statusbar_height -->
     <dimen name="big_toolbar">141dp</dimen>
-    <dimen name="huge_toolbar">233dp</dimen>
+    <dimen name="huge_toolbar">243dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values-v21/themes.xml b/OpenKeychain/src/main/res/values-v21/themes.xml
index 93d534873..b47026e5b 100644
--- a/OpenKeychain/src/main/res/values-v21/themes.xml
+++ b/OpenKeychain/src/main/res/values-v21/themes.xml
@@ -4,10 +4,12 @@
     <style name="KeychainTheme" parent="KeychainTheme.Base">
         <item name="android:windowTranslucentStatus">true</item>
 
+        <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
         <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+
     </style>
 </resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml
index 08b072202..434a0a171 100644
--- a/OpenKeychain/src/main/res/values/dimens.xml
+++ b/OpenKeychain/src/main/res/values/dimens.xml
@@ -3,5 +3,5 @@
     <!-- on Android < 5, we do not color the status bar, thus 0dp! -->
     <dimen name="statusbar_height">0dp</dimen>
     <dimen name="big_toolbar">120dp</dimen>
-    <dimen name="huge_toolbar">212dp</dimen>
+    <dimen name="huge_toolbar">222dp</dimen>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 0931c7742bdb238d222362fee3b865bfa33dfc22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 20:20:39 +0100
Subject: Other icon for key exchange

---
 .../src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png   | Bin 0 -> 297 bytes
 .../src/main/res/drawable-hdpi/ic_repeat_white_24dp.png  | Bin 0 -> 296 bytes
 .../res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png | Bin 483 -> 0 bytes
 .../main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png    | Bin 300 -> 0 bytes
 .../main/res/drawable-hdpi/ic_swap_vert_white_24dp.png   | Bin 300 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png   | Bin 0 -> 238 bytes
 .../src/main/res/drawable-mdpi/ic_repeat_white_24dp.png  | Bin 0 -> 236 bytes
 .../res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png | Bin 341 -> 0 bytes
 .../main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png    | Bin 230 -> 0 bytes
 .../main/res/drawable-mdpi/ic_swap_vert_white_24dp.png   | Bin 226 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png  | Bin 0 -> 317 bytes
 .../src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png | Bin 0 -> 314 bytes
 .../drawable-xhdpi/ic_swap_vert_circle_white_24dp.png    | Bin 569 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png   | Bin 332 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png  | Bin 330 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png | Bin 0 -> 400 bytes
 .../main/res/drawable-xxhdpi/ic_repeat_white_24dp.png    | Bin 0 -> 397 bytes
 .../drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png   | Bin 863 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png  | Bin 418 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png | Bin 414 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png    | Bin 0 -> 481 bytes
 .../main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png   | Bin 0 -> 478 bytes
 .../drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png  | Bin 1048 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png | Bin 531 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png     | Bin 502 -> 0 bytes
 OpenKeychain/src/main/res/layout/key_list_item.xml       |   2 +-
 .../src/main/res/layout/safe_slinger_activity.xml        |   2 +-
 .../src/main/res/layout/view_key_adv_share_fragment.xml  |   2 +-
 28 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..48d6ce93a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..612e73458
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index ddd8bb736..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 961aedecc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 705a4cc70..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..60aa53747
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..8a2b641ca
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index efa97b3af..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index f7faa5cf4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 5f6e11bc8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..3d0e27547
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..729220066
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index 677b7267c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 22ff0c308..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index fb82f4208..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..6a8906126
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..63f8de50f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index 74557d202..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 3edec452e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index c34970372..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png
new file mode 100644
index 000000000..bf33f287b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_grey_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png
new file mode 100644
index 000000000..f3c284330
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png
deleted file mode 100644
index c43cc4325..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_circle_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png
deleted file mode 100644
index 3dea0d014..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png
deleted file mode 100644
index 06b27ea19..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_white_24dp.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 9f9cf4eca..27444a260 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:src="@drawable/ic_swap_vert_grey_24dp"
+            android:src="@drawable/ic_repeat_grey_24dp"
             android:padding="12dp"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
index ff5fa6d94..bafad173b 100644
--- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
+++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml
@@ -69,7 +69,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:padding="8dp"
-                    android:src="@drawable/ic_swap_vert_grey_24dp"
+                    android:src="@drawable/ic_repeat_grey_24dp"
                     android:layout_gravity="center_vertical" />
 
             </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 782091f16..cd8f96e6f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -135,7 +135,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_swap_vert_grey_24dp"
+                android:src="@drawable/ic_repeat_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
-- 
cgit v1.2.3


From b521162ef049d223987af4c424083a8355c9bfb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 20:50:34 +0100
Subject: Invoke NFC button

---
 .../src/main/res/drawable-hdpi/ic_action_nfc.png         | Bin 1660 -> 0 bytes
 .../src/main/res/drawable-hdpi/ic_action_qr_code.png     | Bin 2134 -> 0 bytes
 .../src/main/res/drawable-hdpi/ic_nfc_white_24dp.png     | Bin 0 -> 740 bytes
 .../src/main/res/drawable-mdpi/ic_action_nfc.png         | Bin 1147 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_action_qr_code.png     | Bin 1314 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_nfc_white_24dp.png     | Bin 0 -> 485 bytes
 .../src/main/res/drawable-xhdpi/ic_action_nfc.png        | Bin 2297 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_action_qr_code.png    | Bin 2959 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png    | Bin 0 -> 943 bytes
 .../src/main/res/drawable-xxhdpi/ic_action_nfc.png       | Bin 2378 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_action_qr_code.png   | Bin 4129 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png   | Bin 0 -> 1476 bytes
 .../src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png  | Bin 0 -> 1938 bytes
 .../src/main/res/layout/import_keys_qr_code_fragment.xml |   4 ++--
 OpenKeychain/src/main/res/layout/view_key_activity.xml   |   8 ++++++++
 15 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png
deleted file mode 100644
index 635633709..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png
deleted file mode 100644
index ceb3b1645..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png
new file mode 100644
index 000000000..1d87415c5
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png
deleted file mode 100644
index da5e267d0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png
deleted file mode 100644
index 21594e62f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png
new file mode 100644
index 000000000..65ae04b7c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png
deleted file mode 100644
index ff569927c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png
deleted file mode 100644
index 93bdac866..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png
new file mode 100644
index 000000000..44b9006ab
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png
deleted file mode 100644
index 1f96ce37b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png
deleted file mode 100644
index 7ede90609..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png
new file mode 100644
index 000000000..484856b3f
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png
new file mode 100644
index 000000000..c8f25bbf7
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_white_24dp.png differ
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 1cc414dab..9007d2149 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:text="@string/import_qr_code_button"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_qr_code"
+            android:drawableRight="@drawable/ic_qrcode_white_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_nfc"
+            android:src="@drawable/ic_nfc_white_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index bc46ac85f..94f0932f4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -116,6 +116,14 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_mode_edit_white_24dp" />
 
+            <ImageButton
+                android:id="@+id/view_key_action_nfc"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:visibility="invisible"
+                style="?android:attr/borderlessButtonStyle"
+                android:src="@drawable/ic_nfc_white_24dp" />
+
         </LinearLayout>
 
         <ImageView
-- 
cgit v1.2.3


From a38f84a40169a65bf0eac1e06165a844df9b642c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 25 Feb 2015 21:53:46 +0100
Subject: Dont show verification icons in my key view, hide edit button for
 non-secret keys

---
 OpenKeychain/src/main/res/layout/view_key_activity.xml | 8 --------
 OpenKeychain/src/main/res/menu/key_view.xml            | 7 +++++++
 OpenKeychain/src/main/res/values/strings.xml           | 4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 94f0932f4..7dd30c22c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -108,14 +108,6 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_verified_cutout" />
 
-            <ImageButton
-                android:id="@+id/view_key_action_edit"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:visibility="invisible"
-                style="?android:attr/borderlessButtonStyle"
-                android:src="@drawable/ic_mode_edit_white_24dp" />
-
             <ImageButton
                 android:id="@+id/view_key_action_nfc"
                 android:layout_width="64dp"
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index d2ca90942..86f8ea6a2 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -2,6 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_key_view_edit"
+        android:icon="@drawable/ic_mode_edit_white_24dp"
+        android:visible="false"
+        app:showAsAction="always"
+        android:title="@string/key_view_action_edit" />
+
     <item
         android:id="@+id/menu_key_view_refresh"
         android:icon="@drawable/ic_refresh_white_24dp"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 46d6d3e47..067ce20ea 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="menu_create_key">"Create my key"</string>
     <string name="menu_import_existing_key">"Import from file"</string>
     <string name="menu_search">"Search"</string>
+    <string name="menu_nfc_preferences">"NFC settings"</string>
     <string name="menu_beam_preferences">"Beam settings"</string>
     <string name="menu_key_edit_cancel">"Cancel"</string>
     <string name="menu_encrypt_to">"Encrypt to…"</string>
@@ -272,7 +273,8 @@
 
     <!-- errors without preceeding Error: -->
     <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string>
-    <string name="error_nfc_needed">"NFC is not available on your device!"</string>
+    <string name="error_nfc_needed">"NFC must be enabled!"</string>
+    <string name="error_beam_needed">"Beam must be enabled!"</string>
     <string name="error_nothing_import">"No keys found!"</string>
     <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string>
     <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string>
-- 
cgit v1.2.3


From 72acaaa41f88c729b651575a2c014cff11ca0fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 26 Feb 2015 02:06:57 +0100
Subject: Fingerprint verification, design fixes for qr code card

---
 .../res/layout/certify_fingerprint_activity.xml    |  32 +++++
 .../res/layout/certify_fingerprint_fragment.xml    | 154 +++++++++++++++++++++
 .../src/main/res/layout/create_key_activity.xml    |  10 +-
 .../main/res/layout/create_key_final_fragment.xml  |   4 +-
 .../main/res/layout/create_key_input_fragment.xml  |   4 +-
 .../src/main/res/layout/qr_code_activity.xml       |  12 +-
 .../src/main/res/layout/view_key_activity.xml      |  15 +-
 OpenKeychain/src/main/res/menu/key_view.xml        |   6 +
 OpenKeychain/src/main/res/values/strings.xml       |   5 +
 9 files changed, 214 insertions(+), 28 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
 create mode 100644 OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
new file mode 100644
index 000000000..ec91d1455
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_activity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/content_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/certify_fingerprint_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
new file mode 100644
index 000000000..9b6b35012
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/certify_fingerprint_fragment.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/certify_fingerprint_buttons_divider">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/certify_fingerprint_text" />
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/certify_fingerprint_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardBackgroundColor="@android:color/white"
+                app:cardUseCompatPadding="true"
+                app:cardCornerRadius="4dp"
+                android:layout_gravity="top">
+
+                <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/label_fingerprint" />
+
+                    <TextView
+                        android:id="@+id/certify_fingerprint_fingerprint"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        android:paddingTop="8dp"
+                        android:paddingBottom="8dp"
+                        android:textSize="20sp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:typeface="monospace"
+                        android:gravity="center_vertical" />
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+        </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:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:id="@+id/certify_fingerprint_buttons">
+
+        <TextView
+            android:id="@+id/certify_fingerprint_button_no"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_no"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_gravity="center_vertical" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/certify_fingerprint_button_yes"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/btn_match"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_gravity="center_vertical" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/certify_fingerprint_buttons_divider2"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_alignBottom="@+id/certify_fingerprint_buttons_text"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <TextView
+        android:id="@+id/certify_fingerprint_buttons_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/certify_fingerprint_text2"
+        android:layout_above="@+id/certify_fingerprint_buttons"
+        android:layout_centerHorizontal="true" />
+
+    <View
+        android:id="@+id/certify_fingerprint_buttons_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider"
+        android:layout_alignTop="@+id/certify_fingerprint_buttons_text"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index e8422fb37..c42fd4d4b 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -7,19 +7,15 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
-    <LinearLayout
+    <FrameLayout
         android:layout_below="@id/toolbar_include"
-        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/notify_area" />
-
         <FrameLayout
             android:id="@+id/create_key_fragment_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" />
+            android:layout_height="match_parent" />
 
-    </LinearLayout>
+    </FrameLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 189579f91..97eba9cd1 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -159,7 +159,7 @@
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_gravity="center_vertical" />
 
         <View
@@ -183,7 +183,7 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_gravity="center_vertical" />
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index d92988111..026d98004 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ScrollView
@@ -139,7 +139,7 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
-            style="@style/SelectableItem"
+            style="?android:attr/borderlessButtonStyle"
             android:layout_gravity="center_vertical" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 126be4c3a..4ce097f40 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -21,16 +20,17 @@
             android:layout_margin="32dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            card_view:cardBackgroundColor="@android:color/white"
-            card_view:cardUseCompatPadding="true"
-            card_view:cardCornerRadius="4dp">
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardUseCompatPadding="true"
+            app:cardCornerRadius="4dp">
 
             <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
                 android:id="@+id/qr_code_image"
-                app:aspectRatioEnabled="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="?android:attr/borderlessButtonStyle" />
+                app:aspectRatioEnabled="true" />
         </android.support.v7.widget.CardView>
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 7dd30c22c..e2d153e0d 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -100,14 +100,6 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:src="@drawable/ic_action_encrypt_text" />
 
-            <ImageButton
-                android:id="@+id/view_key_action_verify"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:visibility="invisible"
-                style="?android:attr/borderlessButtonStyle"
-                android:src="@drawable/ic_action_verified_cutout" />
-
             <ImageButton
                 android:id="@+id/view_key_action_nfc"
                 android:layout_width="64dp"
@@ -139,15 +131,16 @@
             android:layout_marginRight="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
             card_view:cardBackgroundColor="@android:color/white"
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/view_key_qr_code"
                 android:layout_width="96dp"
-                android:layout_height="96dp"
-                style="?android:attr/borderlessButtonStyle" />
+                android:layout_height="96dp" />
         </android.support.v7.widget.CardView>
 
     </RelativeLayout>
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index 86f8ea6a2..c724c46a5 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -31,4 +31,10 @@
         app:showAsAction="never"
         android:title="@string/menu_advanced" />
 
+    <item
+        android:id="@+id/menu_key_view_certify_fingerprint"
+        app:showAsAction="never"
+        android:visible="false"
+        android:title="@string/menu_certify_fingerprint" />
+
 </menu>
\ 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 067ce20ea..e4b7cdd20 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -78,6 +78,8 @@
     <string name="btn_export_to_server">"Upload To Keyserver"</string>
     <string name="btn_next">"Next"</string>
     <string name="btn_back">"Back"</string>
+    <string name="btn_no">"No"</string>
+    <string name="btn_match">"Fingerprints are matching"</string>
     <string name="btn_lookup_key">"Lookup key"</string>
     <string name="btn_share_encrypted_signed">"Encrypt and share message"</string>
     <string name="btn_view_cert_key">"View certification key"</string>
@@ -107,6 +109,7 @@
     <string name="menu_search_cloud">"Search cloud"</string>
     <string name="menu_export_all_keys">"Export all keys"</string>
     <string name="menu_advanced">"Show advanced info"</string>
+    <string name="menu_certify_fingerprint">"Verify via fingerprint comparison"</string>
 
     <!-- label -->
     <string name="label_message">"Message"</string>
@@ -1124,6 +1127,8 @@
     <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string>
     <string name="section_uids_to_certify">"Identities for "</string>
     <string name="certify_text">"The keys you are importing contain “identities”: names and emails. Select exactly those for certification which match what you expected."</string>
+    <string name="certify_fingerprint_text">"Compare the displayed fingerprint, character by character, with the one displayed on your partners device."</string>
+    <string name="certify_fingerprint_text2">"Do the displayed fingerprints match?"</string>
     <string name="label_revocation">"Revocation Reason"</string>
     <string name="label_verify_status">"Verification Status"</string>
     <string name="label_cert_type">"Type"</string>
-- 
cgit v1.2.3


From 4c4782bd5eb54b1f67a66b9065ce48a585ed2d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 26 Feb 2015 17:32:08 +0100
Subject: Hopefully fixes drop down icon for spinners on Android lower 5

---
 OpenKeychain/src/main/res/values/styles.xml | 19 -------------------
 1 file changed, 19 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index 8420e0c13..8d8797bf0 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Used in Android < 4 -->
-
-    <style name="KeychainThemeOLD" parent="@style/Theme.AppCompat.Light">
-        <item name="android:alertDialogStyle">@style/CustomDialogTheme</item>
-    </style>
-
-    <!-- Ugly fix to make content background of Dialogs on Android < 4 white not black! -->
-    <style name="CustomDialogTheme" parent="@android:style/Theme.Dialog">
-        <item name="android:fullDark">@drawable/popup_full_bright</item>
-        <!--<item name="android:topDark">@android:drawable/popup_full_dark</item>-->
-        <item name="android:centerDark">@drawable/popup_center_bright</item>
-        <!--<item name="android:bottomDark">@android:drawable/popup_bottom_dark</item>-->
-        <!--<item name="fullBright">@android:drawable/popup_full_bright</item>-->
-        <!--<item name="topBright">@android:drawable/popup_top_bright</item>-->
-        <!--<item name="centerBright">@android:drawable/popup_center_bright</item>-->
-        <!--<item name="bottomBright">@android:drawable/popup_bottom_bright</item>-->
-        <!--<item name="bottomMedium">@android:drawable/popup_bottom_medium</item>-->
-        <!--<item name="centerMedium">@android:drawable/popup_center_medium</item>-->
-    </style>
 
     <style name="CardViewHeader">
         <item name="android:drawableBottom">@drawable/cardview_header</item>
-- 
cgit v1.2.3


From 1210a80a96d9f862829ac1122e94b68fe8b8b5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 26 Feb 2015 17:37:28 +0100
Subject: Remove old Holo design resources

---
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 398 -> 0 bytes
 ...haintheme_btn_check_off_disabled_holo_light.png | Bin 361 -> 0 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 413 -> 0 bytes
 .../keychaintheme_btn_check_off_holo_light.png     | Bin 242 -> 0 bytes
 ...chaintheme_btn_check_off_pressed_holo_light.png | Bin 423 -> 0 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 792 -> 0 bytes
 ...chaintheme_btn_check_on_disabled_holo_light.png | Bin 624 -> 0 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 1668 -> 0 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 1483 -> 0 bytes
 ...ychaintheme_btn_check_on_pressed_holo_light.png | Bin 803 -> 0 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 327 -> 0 bytes
 ...haintheme_btn_default_disabled_holo_light.9.png | Bin 422 -> 0 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 398 -> 0 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 406 -> 0 bytes
 ...chaintheme_btn_default_pressed_holo_light.9.png | Bin 390 -> 0 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 1420 -> 0 bytes
 ...haintheme_btn_radio_off_disabled_holo_light.png | Bin 717 -> 0 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 1507 -> 0 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 790 -> 0 bytes
 ...chaintheme_btn_radio_off_pressed_holo_light.png | Bin 1574 -> 0 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 2366 -> 0 bytes
 ...chaintheme_btn_radio_on_disabled_holo_light.png | Bin 1169 -> 0 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 2253 -> 0 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 1409 -> 0 bytes
 ...ychaintheme_btn_radio_on_pressed_holo_light.png | Bin 1908 -> 0 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 395 -> 0 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 419 -> 0 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 387 -> 0 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 459 -> 0 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 419 -> 0 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 420 -> 0 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 514 -> 0 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 428 -> 0 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 523 -> 0 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 556 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 260 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 467 -> 0 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 115 -> 0 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 139 -> 0 bytes
 .../keychaintheme_list_longpressed_holo.9.png      | Bin 115 -> 0 bytes
 .../keychaintheme_list_pressed_holo_light.9.png    | Bin 115 -> 0 bytes
 ...intheme_list_selector_disabled_holo_light.9.png | Bin 189 -> 0 bytes
 .../keychaintheme_progress_bg_holo_light.9.png     | Bin 175 -> 0 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 384 -> 0 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 149 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 785 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 866 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 977 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 1022 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 928 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 1037 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 812 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 886 -> 0 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 845 -> 0 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 1108 -> 0 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 1371 -> 0 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 1721 -> 0 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 148 -> 0 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 147 -> 0 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 169 -> 0 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 312 -> 0 bytes
 ...keychaintheme_spinner_disabled_holo_light.9.png | Bin 378 -> 0 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 481 -> 0 bytes
 .../keychaintheme_spinner_pressed_holo_light.9.png | Bin 359 -> 0 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 1376 -> 0 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 1495 -> 0 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 1502 -> 0 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 198 -> 0 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 227 -> 0 bytes
 ...eme_textfield_disabled_focused_holo_light.9.png | Bin 1208 -> 0 bytes
 ...ychaintheme_textfield_disabled_holo_light.9.png | Bin 1116 -> 0 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 295 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 298 -> 0 bytes
 ...haintheme_btn_check_off_disabled_holo_light.png | Bin 329 -> 0 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 318 -> 0 bytes
 .../keychaintheme_btn_check_off_holo_light.png     | Bin 183 -> 0 bytes
 ...chaintheme_btn_check_off_pressed_holo_light.png | Bin 289 -> 0 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 570 -> 0 bytes
 ...chaintheme_btn_check_on_disabled_holo_light.png | Bin 508 -> 0 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 1077 -> 0 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 982 -> 0 bytes
 ...ychaintheme_btn_check_on_pressed_holo_light.png | Bin 554 -> 0 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 232 -> 0 bytes
 ...haintheme_btn_default_disabled_holo_light.9.png | Bin 313 -> 0 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 293 -> 0 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 286 -> 0 bytes
 ...chaintheme_btn_default_pressed_holo_light.9.png | Bin 265 -> 0 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 770 -> 0 bytes
 ...haintheme_btn_radio_off_disabled_holo_light.png | Bin 479 -> 0 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 785 -> 0 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 428 -> 0 bytes
 ...chaintheme_btn_radio_off_pressed_holo_light.png | Bin 962 -> 0 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 1256 -> 0 bytes
 ...chaintheme_btn_radio_on_disabled_holo_light.png | Bin 736 -> 0 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 1155 -> 0 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 829 -> 0 bytes
 ...ychaintheme_btn_radio_on_pressed_holo_light.png | Bin 1118 -> 0 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 334 -> 0 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 331 -> 0 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 382 -> 0 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 344 -> 0 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 298 -> 0 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 307 -> 0 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 346 -> 0 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 324 -> 0 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 397 -> 0 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 361 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 170 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 306 -> 0 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 110 -> 0 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 117 -> 0 bytes
 .../keychaintheme_list_longpressed_holo.9.png      | Bin 110 -> 0 bytes
 .../keychaintheme_list_pressed_holo_light.9.png    | Bin 110 -> 0 bytes
 ...intheme_list_selector_disabled_holo_light.9.png | Bin 171 -> 0 bytes
 .../keychaintheme_progress_bg_holo_light.9.png     | Bin 161 -> 0 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 273 -> 0 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 135 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 457 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 526 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 589 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 573 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 545 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 584 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 535 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 553 -> 0 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 520 -> 0 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 694 -> 0 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 815 -> 0 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 983 -> 0 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 138 -> 0 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 138 -> 0 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 163 -> 0 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 263 -> 0 bytes
 ...keychaintheme_spinner_disabled_holo_light.9.png | Bin 274 -> 0 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 375 -> 0 bytes
 .../keychaintheme_spinner_pressed_holo_light.9.png | Bin 279 -> 0 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 861 -> 0 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 885 -> 0 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 959 -> 0 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 165 -> 0 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 182 -> 0 bytes
 ...eme_textfield_disabled_focused_holo_light.9.png | Bin 1133 -> 0 bytes
 ...ychaintheme_textfield_disabled_holo_light.9.png | Bin 1094 -> 0 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 261 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 470 -> 0 bytes
 ...haintheme_btn_check_off_disabled_holo_light.png | Bin 375 -> 0 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 483 -> 0 bytes
 .../keychaintheme_btn_check_off_holo_light.png     | Bin 293 -> 0 bytes
 ...chaintheme_btn_check_off_pressed_holo_light.png | Bin 549 -> 0 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 1054 -> 0 bytes
 ...chaintheme_btn_check_on_disabled_holo_light.png | Bin 762 -> 0 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 2891 -> 0 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 2617 -> 0 bytes
 ...ychaintheme_btn_check_on_pressed_holo_light.png | Bin 1134 -> 0 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 385 -> 0 bytes
 ...haintheme_btn_default_disabled_holo_light.9.png | Bin 541 -> 0 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 451 -> 0 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 528 -> 0 bytes
 ...chaintheme_btn_default_pressed_holo_light.9.png | Bin 507 -> 0 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 2109 -> 0 bytes
 ...haintheme_btn_radio_off_disabled_holo_light.png | Bin 919 -> 0 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 2200 -> 0 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 1043 -> 0 bytes
 ...chaintheme_btn_radio_off_pressed_holo_light.png | Bin 2235 -> 0 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 3537 -> 0 bytes
 ...chaintheme_btn_radio_on_disabled_holo_light.png | Bin 1643 -> 0 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 3670 -> 0 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 2416 -> 0 bytes
 ...ychaintheme_btn_radio_on_pressed_holo_light.png | Bin 2683 -> 0 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 420 -> 0 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 528 -> 0 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 452 -> 0 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 574 -> 0 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 546 -> 0 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 452 -> 0 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 633 -> 0 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 525 -> 0 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 567 -> 0 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 721 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 323 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 611 -> 0 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 121 -> 0 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 154 -> 0 bytes
 .../keychaintheme_list_longpressed_holo.9.png      | Bin 121 -> 0 bytes
 .../keychaintheme_list_pressed_holo_light.9.png    | Bin 121 -> 0 bytes
 ...intheme_list_selector_disabled_holo_light.9.png | Bin 188 -> 0 bytes
 .../keychaintheme_progress_bg_holo_light.9.png     | Bin 178 -> 0 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 476 -> 0 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 150 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 889 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 1068 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 1262 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 1218 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 1183 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 1297 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 1155 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 1139 -> 0 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 1101 -> 0 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 1392 -> 0 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 1610 -> 0 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 2366 -> 0 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 156 -> 0 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 154 -> 0 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 175 -> 0 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 408 -> 0 bytes
 ...keychaintheme_spinner_disabled_holo_light.9.png | Bin 420 -> 0 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 645 -> 0 bytes
 .../keychaintheme_spinner_pressed_holo_light.9.png | Bin 507 -> 0 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 1859 -> 0 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 2075 -> 0 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 2065 -> 0 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 234 -> 0 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 220 -> 0 bytes
 ...eme_textfield_disabled_focused_holo_light.9.png | Bin 1176 -> 0 bytes
 ...ychaintheme_textfield_disabled_holo_light.9.png | Bin 1116 -> 0 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 432 -> 0 bytes
 ...e_btn_check_off_disabled_focused_holo_light.png | Bin 455 -> 0 bytes
 ...haintheme_btn_check_off_disabled_holo_light.png | Bin 1177 -> 0 bytes
 ...chaintheme_btn_check_off_focused_holo_light.png | Bin 541 -> 0 bytes
 .../keychaintheme_btn_check_off_holo_light.png     | Bin 443 -> 0 bytes
 ...chaintheme_btn_check_off_pressed_holo_light.png | Bin 598 -> 0 bytes
 ...me_btn_check_on_disabled_focused_holo_light.png | Bin 1112 -> 0 bytes
 ...chaintheme_btn_check_on_disabled_holo_light.png | Bin 1574 -> 0 bytes
 ...ychaintheme_btn_check_on_focused_holo_light.png | Bin 3906 -> 0 bytes
 .../keychaintheme_btn_check_on_holo_light.png      | Bin 3595 -> 0 bytes
 ...ychaintheme_btn_check_on_pressed_holo_light.png | Bin 1155 -> 0 bytes
 ...e_btn_default_disabled_focused_holo_light.9.png | Bin 542 -> 0 bytes
 ...haintheme_btn_default_disabled_holo_light.9.png | Bin 1643 -> 0 bytes
 ...chaintheme_btn_default_focused_holo_light.9.png | Bin 826 -> 0 bytes
 ...ychaintheme_btn_default_normal_holo_light.9.png | Bin 972 -> 0 bytes
 ...chaintheme_btn_default_pressed_holo_light.9.png | Bin 823 -> 0 bytes
 ...e_btn_radio_off_disabled_focused_holo_light.png | Bin 2512 -> 0 bytes
 ...haintheme_btn_radio_off_disabled_holo_light.png | Bin 2208 -> 0 bytes
 ...chaintheme_btn_radio_off_focused_holo_light.png | Bin 2706 -> 0 bytes
 .../keychaintheme_btn_radio_off_holo_light.png     | Bin 1660 -> 0 bytes
 ...chaintheme_btn_radio_off_pressed_holo_light.png | Bin 3039 -> 0 bytes
 ...me_btn_radio_on_disabled_focused_holo_light.png | Bin 4512 -> 0 bytes
 ...chaintheme_btn_radio_on_disabled_holo_light.png | Bin 3894 -> 0 bytes
 ...ychaintheme_btn_radio_on_focused_holo_light.png | Bin 4769 -> 0 bytes
 .../keychaintheme_btn_radio_on_holo_light.png      | Bin 3485 -> 0 bytes
 ...ychaintheme_btn_radio_on_pressed_holo_light.png | Bin 3544 -> 0 bytes
 ...tn_toggle_off_disabled_focused_holo_light.9.png | Bin 633 -> 0 bytes
 ...ntheme_btn_toggle_off_disabled_holo_light.9.png | Bin 1662 -> 0 bytes
 ...intheme_btn_toggle_off_focused_holo_light.9.png | Bin 653 -> 0 bytes
 ...aintheme_btn_toggle_off_normal_holo_light.9.png | Bin 852 -> 0 bytes
 ...intheme_btn_toggle_off_pressed_holo_light.9.png | Bin 869 -> 0 bytes
 ...btn_toggle_on_disabled_focused_holo_light.9.png | Bin 703 -> 0 bytes
 ...intheme_btn_toggle_on_disabled_holo_light.9.png | Bin 1033 -> 0 bytes
 ...aintheme_btn_toggle_on_focused_holo_light.9.png | Bin 781 -> 0 bytes
 ...haintheme_btn_toggle_on_normal_holo_light.9.png | Bin 847 -> 0 bytes
 ...aintheme_btn_toggle_on_pressed_holo_light.9.png | Bin 1197 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_default_holo.png | Bin 623 -> 0 bytes
 ...keychaintheme_fastscroll_thumb_pressed_holo.png | Bin 980 -> 0 bytes
 .../keychaintheme_list_activated_holo.9.png        | Bin 133 -> 0 bytes
 .../keychaintheme_list_focused_holo.9.png          | Bin 158 -> 0 bytes
 .../keychaintheme_list_longpressed_holo.9.png      | Bin 133 -> 0 bytes
 .../keychaintheme_list_pressed_holo_light.9.png    | Bin 133 -> 0 bytes
 ...intheme_list_selector_disabled_holo_light.9.png | Bin 280 -> 0 bytes
 .../keychaintheme_progress_bg_holo_light.9.png     | Bin 1084 -> 0 bytes
 ...keychaintheme_progress_primary_holo_light.9.png | Bin 847 -> 0 bytes
 ...ychaintheme_progress_secondary_holo_light.9.png | Bin 145 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo1.png | Bin 1351 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo2.png | Bin 1654 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo3.png | Bin 1926 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo4.png | Bin 1924 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo5.png | Bin 1857 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo6.png | Bin 1991 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo7.png | Bin 1771 -> 0 bytes
 ...ychaintheme_progressbar_indeterminate_holo8.png | Bin 1772 -> 0 bytes
 ...eychaintheme_scrubber_control_disabled_holo.png | Bin 1403 -> 0 bytes
 ...keychaintheme_scrubber_control_focused_holo.png | Bin 2105 -> 0 bytes
 .../keychaintheme_scrubber_control_normal_holo.png | Bin 2534 -> 0 bytes
 ...keychaintheme_scrubber_control_pressed_holo.png | Bin 2720 -> 0 bytes
 .../keychaintheme_scrubber_primary_holo.9.png      | Bin 149 -> 0 bytes
 .../keychaintheme_scrubber_secondary_holo.9.png    | Bin 150 -> 0 bytes
 .../keychaintheme_scrubber_track_holo_light.9.png  | Bin 1095 -> 0 bytes
 .../keychaintheme_spinner_default_holo_light.9.png | Bin 473 -> 0 bytes
 ...keychaintheme_spinner_disabled_holo_light.9.png | Bin 1326 -> 0 bytes
 .../keychaintheme_spinner_focused_holo_light.9.png | Bin 691 -> 0 bytes
 .../keychaintheme_spinner_pressed_holo_light.9.png | Bin 630 -> 0 bytes
 .../keychaintheme_text_select_handle_left.png      | Bin 2823 -> 0 bytes
 .../keychaintheme_text_select_handle_middle.png    | Bin 3098 -> 0 bytes
 .../keychaintheme_text_select_handle_right.png     | Bin 2712 -> 0 bytes
 ...chaintheme_textfield_activated_holo_light.9.png | Bin 334 -> 0 bytes
 ...eychaintheme_textfield_default_holo_light.9.png | Bin 325 -> 0 bytes
 ...eme_textfield_disabled_focused_holo_light.9.png | Bin 464 -> 0 bytes
 ...ychaintheme_textfield_disabled_holo_light.9.png | Bin 315 -> 0 bytes
 ...eychaintheme_textfield_focused_holo_light.9.png | Bin 511 -> 0 bytes
 ...ychaintheme_activated_background_holo_light.xml |  20 -------
 .../keychaintheme_btn_check_holo_light.xml         |  65 ---------------------
 .../keychaintheme_btn_default_holo_light.xml       |  32 ----------
 .../keychaintheme_btn_radio_holo_light.xml         |  59 -------------------
 .../keychaintheme_btn_toggle_holo_light.xml        |  50 ----------------
 .../keychaintheme_edit_text_holo_light.xml         |  25 --------
 .../keychaintheme_fastscroll_thumb_holo.xml        |  20 -------
 .../keychaintheme_item_background_holo_light.xml   |  26 ---------
 ...t_selector_background_transition_holo_light.xml |  20 -------
 .../keychaintheme_list_selector_holo_light.xml     |  28 ---------
 ...eychaintheme_progress_horizontal_holo_light.xml |  32 ----------
 ...rogress_indeterminate_horizontal_holo_light.xml |  30 ----------
 ...ntheme_scrubber_control_selector_holo_light.xml |  22 -------
 ...eme_scrubber_progress_horizontal_holo_light.xml |  28 ---------
 .../keychaintheme_searchview_holo_light.xml        |   7 ---
 ...keychaintheme_spinner_background_holo_light.xml |  25 --------
 .../src/main/res/values/colors_keychaintheme.xml   |   4 --
 .../src/main/res/values/styles_keychaintheme.xml   |  39 -------------
 OpenKeychain/src/main/res/values/themes.xml        |   1 -
 .../src/main/res/values/themes_keychaintheme.xml   |  43 --------------
 308 files changed, 576 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_longpressed_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_selector_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_bg_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_longpressed_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_selector_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_bg_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_longpressed_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_selector_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_bg_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_longpressed_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_selector_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_bg_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_pressed_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_default_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_activated_background_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml
 delete mode 100644 OpenKeychain/src/main/res/values/colors_keychaintheme.xml
 delete mode 100644 OpenKeychain/src/main/res/values/styles_keychaintheme.xml
 delete mode 100644 OpenKeychain/src/main/res/values/themes_keychaintheme.xml

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

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
deleted file mode 100644
index 964832508..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_holo_light.png
deleted file mode 100644
index 9dbad9b92..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png
deleted file mode 100644
index 6f221e7cb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_holo_light.png
deleted file mode 100644
index b1b52b23a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_pressed_holo_light.png
deleted file mode 100644
index e5f0ddf50..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
deleted file mode 100644
index cd3de280a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_holo_light.png
deleted file mode 100644
index cd02122be..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png
deleted file mode 100644
index e271afeff..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png
deleted file mode 100644
index 0d06ce453..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_pressed_holo_light.png
deleted file mode 100644
index 313698a88..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_check_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
deleted file mode 100644
index d1e8f795f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_holo_light.9.png
deleted file mode 100644
index 6a2a92cce..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png
deleted file mode 100644
index 5b295174b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_normal_holo_light.9.png
deleted file mode 100644
index 55139e939..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_pressed_holo_light.9.png
deleted file mode 100644
index aaae193fb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_default_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
deleted file mode 100644
index 0d079e5fe..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
deleted file mode 100644
index 25e8e1ba5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png
deleted file mode 100644
index 7ef86d832..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png
deleted file mode 100644
index 5021bb434..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
deleted file mode 100644
index 065e49a12..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
deleted file mode 100644
index e1e75b295..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
deleted file mode 100644
index 6e61b5287..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png
deleted file mode 100644
index c627a6247..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png
deleted file mode 100644
index 0a45b94a4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
deleted file mode 100644
index 7f66e282f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_radio_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
deleted file mode 100644
index 49343edc3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
deleted file mode 100644
index a7e6bc3c5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
deleted file mode 100644
index c31f805bd..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
deleted file mode 100644
index aba55810b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
deleted file mode 100644
index 9f68344ab..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
deleted file mode 100644
index 0cb6fcfef..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
deleted file mode 100644
index aed04dd6c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
deleted file mode 100644
index 43329514c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
deleted file mode 100644
index 1d7474560..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
deleted file mode 100644
index a0d649d24..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index 5ea146b28..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index 25ad77295..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png
deleted file mode 100644
index 63c53a343..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_activated_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png
deleted file mode 100644
index 59d605fba..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_focused_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_longpressed_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_longpressed_holo.9.png
deleted file mode 100644
index e9196aa82..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_longpressed_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_pressed_holo_light.9.png
deleted file mode 100644
index 895e51bdf..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_selector_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_selector_disabled_holo_light.9.png
deleted file mode 100644
index ca8e9a277..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_bg_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_bg_holo_light.9.png
deleted file mode 100644
index 3f12166d2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_bg_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png
deleted file mode 100644
index e3ce6fd56..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_primary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png
deleted file mode 100644
index ade0f6d82..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png
deleted file mode 100644
index 3889a0e92..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo1.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png
deleted file mode 100644
index d4ca8797f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo2.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png
deleted file mode 100644
index 099ba55de..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo3.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png
deleted file mode 100644
index 99c38df70..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo4.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png
deleted file mode 100644
index cd380c371..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo5.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png
deleted file mode 100644
index ddba06e81..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo6.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png
deleted file mode 100644
index cef58060d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo7.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png
deleted file mode 100644
index 74b6d01ae..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_progressbar_indeterminate_holo8.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png
deleted file mode 100644
index 1a9ced650..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_disabled_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png
deleted file mode 100644
index b873aeb30..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_focused_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png
deleted file mode 100644
index 6451fe6e4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_normal_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png
deleted file mode 100644
index 480786ac4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_control_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png
deleted file mode 100644
index 6bc032e27..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png
deleted file mode 100644
index 880456b02..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png
deleted file mode 100644
index 90528b130..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png
deleted file mode 100644
index a5fd6ca04..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_disabled_holo_light.9.png
deleted file mode 100644
index d0d94197b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png
deleted file mode 100644
index ae4ba5fc1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_pressed_holo_light.9.png
deleted file mode 100644
index 35f8ec52a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_spinner_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png
deleted file mode 100644
index 5f262c9d4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_left.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png
deleted file mode 100644
index e4f292ff6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_middle.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png
deleted file mode 100644
index 5f5e7f173..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_text_select_handle_right.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png
deleted file mode 100644
index 9f400ba30..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_activated_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png
deleted file mode 100644
index 5fa1d0315..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
deleted file mode 100644
index b70db4e10..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_holo_light.9.png
deleted file mode 100644
index a77d66d99..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png
deleted file mode 100644
index 96109c07b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_textfield_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
deleted file mode 100644
index 10a3e55fa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_holo_light.png
deleted file mode 100644
index db190430c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png
deleted file mode 100644
index bd65c9fd5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_holo_light.png
deleted file mode 100644
index f5eaf804b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_pressed_holo_light.png
deleted file mode 100644
index c237545b1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
deleted file mode 100644
index 3d5364179..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_holo_light.png
deleted file mode 100644
index 20e2aab12..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png
deleted file mode 100644
index cae17c8da..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png
deleted file mode 100644
index d0ade76a2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_pressed_holo_light.png
deleted file mode 100644
index 09f2df11f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_check_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
deleted file mode 100644
index 6cf3e64d9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_holo_light.9.png
deleted file mode 100644
index d424a0e77..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png
deleted file mode 100644
index 0edd1628a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png
deleted file mode 100644
index bbe7baafc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_pressed_holo_light.9.png
deleted file mode 100644
index 693371f44..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_default_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
deleted file mode 100644
index e61c664c5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
deleted file mode 100644
index a67375ec8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png
deleted file mode 100644
index 325125494..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png
deleted file mode 100644
index 0d81a6ad4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
deleted file mode 100644
index ad8341be4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
deleted file mode 100644
index 72f7f3717..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
deleted file mode 100644
index 4583c3e1f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png
deleted file mode 100644
index 0599c3d62..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png
deleted file mode 100644
index 247f8c19d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
deleted file mode 100644
index 7d47196e4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_radio_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
deleted file mode 100644
index bf6992195..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
deleted file mode 100644
index 3a35a4e3e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
deleted file mode 100644
index 0516d15e5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
deleted file mode 100644
index 37f70c55d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
deleted file mode 100644
index 98a9f10ac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
deleted file mode 100644
index f54b70ffd..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
deleted file mode 100644
index 603cb3f30..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
deleted file mode 100644
index e9c001eed..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
deleted file mode 100644
index 36b6534b5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
deleted file mode 100644
index 54f56e187..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index 00c08d808..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index 2532f32dc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png
deleted file mode 100644
index b6862ea33..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_activated_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png
deleted file mode 100644
index cd4d77dc2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_focused_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_longpressed_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_longpressed_holo.9.png
deleted file mode 100644
index ba6538fbe..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_longpressed_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_pressed_holo_light.9.png
deleted file mode 100644
index 886a6ee0c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_selector_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_selector_disabled_holo_light.9.png
deleted file mode 100644
index 42cb6463e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_bg_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_bg_holo_light.9.png
deleted file mode 100644
index 780b4b256..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_bg_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png
deleted file mode 100644
index c1ec11fb9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_primary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png
deleted file mode 100644
index 14b87c197..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png
deleted file mode 100644
index 3331b051d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo1.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png
deleted file mode 100644
index c0540bb6d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo2.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png
deleted file mode 100644
index fb502a712..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo3.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png
deleted file mode 100644
index 184a0aceb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo4.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png
deleted file mode 100644
index 39115cb49..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo5.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png
deleted file mode 100644
index c70815d42..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo6.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png
deleted file mode 100644
index 48f0571fe..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo7.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png
deleted file mode 100644
index 242297424..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_progressbar_indeterminate_holo8.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png
deleted file mode 100644
index 97a637c1b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_disabled_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png
deleted file mode 100644
index 60874b80c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_focused_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png
deleted file mode 100644
index 5020b7947..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_normal_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png
deleted file mode 100644
index e2beb812a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_control_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png
deleted file mode 100644
index 55b07371f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_primary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png
deleted file mode 100644
index 9bfdf2318..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_secondary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png
deleted file mode 100644
index 359ae4a1b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_scrubber_track_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png
deleted file mode 100644
index 5303d6ef4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_disabled_holo_light.9.png
deleted file mode 100644
index a78d6c082..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png
deleted file mode 100644
index add105bbb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_pressed_holo_light.9.png
deleted file mode 100644
index 3636d59d4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_spinner_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png
deleted file mode 100644
index 5cb13d1ac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_left.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png
deleted file mode 100644
index 6a7607826..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_middle.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png
deleted file mode 100644
index c354870e4..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_text_select_handle_right.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png
deleted file mode 100644
index 5358a857a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_activated_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png
deleted file mode 100644
index 15efce9bb..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
deleted file mode 100644
index 0d5ea839d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_holo_light.9.png
deleted file mode 100644
index ea6d2f74b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png
deleted file mode 100644
index 96a1ac5a2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/keychaintheme_textfield_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
deleted file mode 100644
index 8c444bb97..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_holo_light.png
deleted file mode 100644
index 6a364bbe3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png
deleted file mode 100644
index f0e76edea..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_holo_light.png
deleted file mode 100644
index a1c2005a8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 7ae2fad2b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
deleted file mode 100644
index 74347750d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_holo_light.png
deleted file mode 100644
index d705b4204..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png
deleted file mode 100644
index eb8004be8..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png
deleted file mode 100644
index 00fe90604..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_pressed_holo_light.png
deleted file mode 100644
index db233e702..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_check_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
deleted file mode 100644
index 73106561c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_holo_light.9.png
deleted file mode 100644
index b410d238e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png
deleted file mode 100644
index 0611a95e6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png
deleted file mode 100644
index 908d601f7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_pressed_holo_light.9.png
deleted file mode 100644
index 06d1d1e75..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_default_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
deleted file mode 100644
index edcca62f9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
deleted file mode 100644
index 1030a801a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
deleted file mode 100644
index 697ca2ca7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png
deleted file mode 100644
index 08b65d235..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
deleted file mode 100644
index 0bbf8a326..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
deleted file mode 100644
index 28a808de5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
deleted file mode 100644
index 5741490d3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
deleted file mode 100644
index 8454a0e2a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png
deleted file mode 100644
index 330b85e4f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
deleted file mode 100644
index c6a6d833d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
deleted file mode 100644
index bc74c108c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
deleted file mode 100644
index 61230cbdc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
deleted file mode 100644
index 2abf70dcf..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
deleted file mode 100644
index 54e5e8eb7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
deleted file mode 100644
index a096c03ca..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
deleted file mode 100644
index fd43d3779..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
deleted file mode 100644
index a1a66fbb0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
deleted file mode 100644
index 0bd49f267..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
deleted file mode 100644
index 7d1ba0c4a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
deleted file mode 100644
index 7490663c6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index da5a4cdb5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index bea07662b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png
deleted file mode 100644
index 053686014..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_activated_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png
deleted file mode 100644
index 75c9e3340..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_focused_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_longpressed_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_longpressed_holo.9.png
deleted file mode 100644
index 22ab07906..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_longpressed_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_pressed_holo_light.9.png
deleted file mode 100644
index 541163853..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_selector_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_selector_disabled_holo_light.9.png
deleted file mode 100644
index c6a7d4d87..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_bg_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_bg_holo_light.9.png
deleted file mode 100644
index cbd19ac4f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_bg_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png
deleted file mode 100644
index 582d3a05e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_primary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png
deleted file mode 100644
index c5e146368..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png
deleted file mode 100644
index f5ce0144a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo1.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png
deleted file mode 100644
index 0289af47c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo2.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png
deleted file mode 100644
index 60fc76e51..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo3.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png
deleted file mode 100644
index ffffb0478..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo4.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png
deleted file mode 100644
index 9d4354800..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo5.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png
deleted file mode 100644
index b9bd4c6ec..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo6.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png
deleted file mode 100644
index b33d3eec2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo7.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png
deleted file mode 100644
index 1df288012..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_progressbar_indeterminate_holo8.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png
deleted file mode 100644
index c3389745f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_disabled_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png
deleted file mode 100644
index 971f70f9f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_focused_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png
deleted file mode 100644
index e97197c5a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_normal_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png
deleted file mode 100644
index afa8bcdc2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_control_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png
deleted file mode 100644
index 2f81fdcac..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_primary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png
deleted file mode 100644
index 51d99830f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_secondary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png
deleted file mode 100644
index a7d396de2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_scrubber_track_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png
deleted file mode 100644
index 8c469f65d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_disabled_holo_light.9.png
deleted file mode 100644
index fe541269e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png
deleted file mode 100644
index 4de02f1ff..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_pressed_holo_light.9.png
deleted file mode 100644
index 9d4c6e5a2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_spinner_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png
deleted file mode 100644
index 1d7ea81b1..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_left.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png
deleted file mode 100644
index e66240fe2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_middle.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png
deleted file mode 100644
index 92ae3058b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_text_select_handle_right.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png
deleted file mode 100644
index d133f4614..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_activated_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_default_holo_light.9.png
deleted file mode 100644
index f0ad55a66..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
deleted file mode 100644
index 40a28cf70..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png
deleted file mode 100644
index 4ffdd869e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png
deleted file mode 100644
index 88fe46270..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/keychaintheme_textfield_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png
deleted file mode 100644
index 645a7bf93..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_holo_light.png
deleted file mode 100644
index 47a63730b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png
deleted file mode 100644
index bcadf4553..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png
deleted file mode 100644
index 441cd8660..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_pressed_holo_light.png
deleted file mode 100644
index 773206f63..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png
deleted file mode 100644
index ed742229d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_holo_light.png
deleted file mode 100644
index 013c1f6ee..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png
deleted file mode 100644
index 6ac275165..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png
deleted file mode 100644
index c40b01964..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_pressed_holo_light.png
deleted file mode 100644
index 4b0e39517..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_check_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png
deleted file mode 100644
index 2268fd1cd..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_holo_light.9.png
deleted file mode 100644
index b4c90d408..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png
deleted file mode 100644
index 9cfe77d71..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png
deleted file mode 100644
index ee4d44903..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_pressed_holo_light.9.png
deleted file mode 100644
index 9c808dd2c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_default_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png
deleted file mode 100644
index 1575dcdaf..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png
deleted file mode 100644
index 06f0cc78c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png
deleted file mode 100644
index 2438d4e96..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png
deleted file mode 100644
index 6112308fa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png
deleted file mode 100644
index 9fe2ebfce..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_off_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png
deleted file mode 100644
index 90163e927..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png
deleted file mode 100644
index adb730439..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_disabled_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png
deleted file mode 100644
index f9ade3353..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_focused_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png
deleted file mode 100644
index df1188084..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png
deleted file mode 100644
index 58108fc4e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_radio_on_pressed_holo_light.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png
deleted file mode 100644
index 0e343f7be..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png
deleted file mode 100644
index 9b3900a77..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png
deleted file mode 100644
index e4742d90e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png
deleted file mode 100644
index d3ef0e1a6..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png
deleted file mode 100644
index c9edf5c87..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png
deleted file mode 100644
index 71a96f167..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png
deleted file mode 100644
index f0d3a6c97..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png
deleted file mode 100644
index 90423ce4e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png
deleted file mode 100644
index 4c95cf030..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png
deleted file mode 100644
index f907579a0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png
deleted file mode 100644
index bb03584f3..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_default_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png
deleted file mode 100644
index 6167f00a5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_fastscroll_thumb_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png
deleted file mode 100644
index b6b64d316..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_activated_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png
deleted file mode 100644
index 443ba5db5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_focused_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_longpressed_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_longpressed_holo.9.png
deleted file mode 100644
index 82036b6b7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_longpressed_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_pressed_holo_light.9.png
deleted file mode 100644
index c7b06aa6a..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_selector_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_selector_disabled_holo_light.9.png
deleted file mode 100644
index 70bc9f282..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_list_selector_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_bg_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_bg_holo_light.9.png
deleted file mode 100644
index fb146c339..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_bg_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png
deleted file mode 100644
index 16a92d086..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_primary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png
deleted file mode 100644
index f9622cb95..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progress_secondary_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png
deleted file mode 100644
index a7cd41efa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo1.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png
deleted file mode 100644
index ee8b812aa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo2.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png
deleted file mode 100644
index 9ef2f180b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo3.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png
deleted file mode 100644
index 46dddfa8d..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo4.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png
deleted file mode 100644
index 808d452ce..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo5.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png
deleted file mode 100644
index 49858655c..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo6.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png
deleted file mode 100644
index c9ad3229b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo7.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png
deleted file mode 100644
index 158279fbd..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_progressbar_indeterminate_holo8.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png
deleted file mode 100644
index 6c4fe4e8e..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_disabled_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png
deleted file mode 100644
index 37055e319..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_focused_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png
deleted file mode 100644
index f6eeaa9e5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_normal_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png
deleted file mode 100644
index 43eca997b..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_control_pressed_holo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png
deleted file mode 100644
index cac367df7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_primary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png
deleted file mode 100644
index a9cef40e2..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_secondary_holo.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png
deleted file mode 100644
index 1a6f577fc..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_scrubber_track_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png
deleted file mode 100644
index dfcd63db7..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_disabled_holo_light.9.png
deleted file mode 100644
index 4cef09547..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png
deleted file mode 100644
index e3e6c8c0f..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_pressed_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_pressed_holo_light.9.png
deleted file mode 100644
index 62ac88d40..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_spinner_pressed_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png
deleted file mode 100644
index f55d53bb5..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_left.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png
deleted file mode 100644
index 212d020b0..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_middle.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png
deleted file mode 100644
index cdffc3863..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_text_select_handle_right.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png
deleted file mode 100644
index f445e8b33..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_activated_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_default_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_default_holo_light.9.png
deleted file mode 100644
index 6db1dd0aa..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_default_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png
deleted file mode 100644
index d157d7d60..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_holo_light.9.png
deleted file mode 100644
index c91f7da91..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_disabled_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png
deleted file mode 100644
index e019443f9..000000000
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/keychaintheme_textfield_focused_holo_light.9.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_activated_background_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_activated_background_holo_light.xml
deleted file mode 100644
index 60415e926..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_activated_background_holo_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/keychaintheme_list_activated_holo" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml
deleted file mode 100644
index 62567cb98..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_check_holo_light.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Enabled states -->
-        
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_on_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_off_holo_light" />
-
-    <item android:state_checked="true" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_on_pressed_holo_light" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_off_pressed_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_on_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_off_focused_holo_light" />
-
-    <item android:state_checked="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_off_holo_light" />
-    <item android:state_checked="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_check_on_holo_light" />
-
-
-    <!-- Disabled states -->
-
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/keychaintheme_btn_check_on_disabled_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/keychaintheme_btn_check_off_disabled_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/keychaintheme_btn_check_on_disabled_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/keychaintheme_btn_check_off_disabled_focused_holo_light" />
-
-    <item android:state_checked="false" android:drawable="@drawable/keychaintheme_btn_check_off_disabled_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/keychaintheme_btn_check_on_disabled_holo_light" />
-
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml
deleted file mode 100644
index c9261f53b..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_default_holo_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_default_normal_holo_light" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/keychaintheme_btn_default_disabled_holo_light" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/keychaintheme_btn_default_pressed_holo_light" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_default_focused_holo_light" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_default_normal_holo_light" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/keychaintheme_btn_default_disabled_focused_holo_light" />
-    <item
-         android:drawable="@drawable/keychaintheme_btn_default_disabled_holo_light" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml
deleted file mode 100644
index eeba95d4f..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_radio_holo_light.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_holo_light" />
-          
-    <item android:state_checked="true" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_pressed_holo_light" />
-    <item android:state_checked="false" android:state_pressed="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_pressed_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_focused_holo_light" />
-
-    <item android:state_checked="false" android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_holo_light" />
-    <item android:state_checked="true" android:state_enabled="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_holo_light" />
-
-    <!-- Disabled states -->
-
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_disabled_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_disabled_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_on_disabled_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/keychaintheme_btn_radio_off_disabled_focused_holo_light" />
-
-    <item android:state_checked="false" android:drawable="@drawable/keychaintheme_btn_radio_off_disabled_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/keychaintheme_btn_radio_on_disabled_holo_light" />
-
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
deleted file mode 100644
index 733728e79..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_btn_toggle_holo_light.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true"
-        android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_normal_holo_light" />
-    <item android:state_checked="true"
-        android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_holo_light" />
-    <item android:state_checked="true" android:state_pressed="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_pressed_holo_light" />
-    <item android:state_checked="true"
-        android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_focused_holo_light" />
-    <item android:state_checked="true" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_normal_holo_light" />
-    <item android:state_checked="true"  android:state_focused="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_focused_holo_light" />
-    <item android:state_checked="true"
-         android:drawable="@drawable/keychaintheme_btn_toggle_on_disabled_holo_light" />
-
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_normal_holo_light" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_holo_light" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_pressed_holo_light" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_focused_holo_light" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_normal_holo_light" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_focused_holo_light" />
-    <item
-         android:drawable="@drawable/keychaintheme_btn_toggle_off_disabled_holo_light" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml
deleted file mode 100644
index 7acab984d..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_edit_text_holo_light.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true" android:drawable="@drawable/keychaintheme_textfield_default_holo_light" />
-    <item android:state_window_focused="false" android:state_enabled="false" android:drawable="@drawable/keychaintheme_textfield_disabled_holo_light" />
-    <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/keychaintheme_textfield_activated_holo_light" />
-    <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/keychaintheme_textfield_focused_holo_light" />
-    <item android:state_enabled="true" android:drawable="@drawable/keychaintheme_textfield_default_holo_light" />
-    <item android:state_focused="true" android:drawable="@drawable/keychaintheme_textfield_disabled_focused_holo_light" />
-    <item android:drawable="@drawable/keychaintheme_textfield_disabled_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
deleted file mode 100644
index 51b376345..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_fastscroll_thumb_holo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/keychaintheme_fastscroll_thumb_pressed_holo" />
-    <item android:drawable="@drawable/keychaintheme_fastscroll_thumb_default_holo" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml
deleted file mode 100644
index b385d2f92..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_item_background_holo_light.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_disabled_holo_light" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/keychaintheme_list_selector_disabled_holo_light" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_background_transition_holo_light" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_background_transition_holo_light" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/keychaintheme_list_focused_holo" />
-    <item                                                                                          android:drawable="@android:color/transparent" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml
deleted file mode 100644
index 2a5561b22..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_background_transition_holo_light.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/keychaintheme_list_pressed_holo_light"  />
-    <item android:drawable="@drawable/keychaintheme_list_longpressed_holo"  />
-</transition>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml
deleted file mode 100644
index 17164fd1d..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_list_selector_holo_light.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_disabled_holo_light" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/keychaintheme_list_selector_disabled_holo_light" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_background_transition_holo_light" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/keychaintheme_list_selector_background_transition_holo_light" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/keychaintheme_list_focused_holo" />
-
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml
deleted file mode 100644
index a99f756f6..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_horizontal_holo_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background"
-          android:drawable="@drawable/keychaintheme_progress_bg_holo_light" />
-
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/keychaintheme_progress_secondary_holo_light" />
-    </item>
-
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
-               android:drawable="@drawable/keychaintheme_progress_primary_holo_light" />
-    </item>
-
-</layer-list>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml
deleted file mode 100644
index 79c050e47..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_progress_indeterminate_horizontal_holo_light.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<animation-list
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:oneshot="false">
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo1" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo2" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo3" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo4" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo5" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo6" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo7" android:duration="50" />
-    <item android:drawable="@drawable/keychaintheme_progressbar_indeterminate_holo8" android:duration="50" />
-</animation-list>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
deleted file mode 100644
index a3b3530ac..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_control_selector_holo_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:drawable="@drawable/keychaintheme_scrubber_control_disabled_holo" />
-    <item android:state_pressed="true" android:drawable="@drawable/keychaintheme_scrubber_control_pressed_holo" />
-    <item android:state_selected="true" android:drawable="@drawable/keychaintheme_scrubber_control_focused_holo" />
-    <item android:drawable="@drawable/keychaintheme_scrubber_control_normal_holo" />
-</selector>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
deleted file mode 100644
index 4ecf8a6c1..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_scrubber_progress_horizontal_holo_light.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@android:id/background"
-            android:drawable="@drawable/keychaintheme_scrubber_track_holo_light" />
-    <item android:id="@android:id/secondaryProgress">
-        <scale android:scaleWidth="100%"
-                android:drawable="@drawable/keychaintheme_scrubber_secondary_holo" />
-    </item>
-    <item android:id="@android:id/progress">
-        <scale android:scaleWidth="100%"
-                android:drawable="@drawable/keychaintheme_scrubber_primary_holo" />
-    </item>
-</layer-list>
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml
deleted file mode 100644
index e82b1c2f3..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-        android:drawable="@drawable/keychaintheme_textfield_activated_holo_light" />
-    <item android:drawable="@drawable/keychaintheme_textfield_default_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml
deleted file mode 100644
index 9fbb83f95..000000000
--- a/OpenKeychain/src/main/res/drawable/keychaintheme_spinner_background_holo_light.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-          android:drawable="@drawable/keychaintheme_spinner_disabled_holo_light" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/keychaintheme_spinner_pressed_holo_light" />
-    <item android:state_pressed="false" android:state_focused="true"
-          android:drawable="@drawable/keychaintheme_spinner_focused_holo_light" />
-    <item android:drawable="@drawable/keychaintheme_spinner_default_holo_light" />
-</selector>
diff --git a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
deleted file mode 100644
index 26386e80b..000000000
--- a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="keychaintheme_color">#7bad45</color>
-</resources>
diff --git a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml
deleted file mode 100644
index 2913ad4c1..000000000
--- a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="AutoCompleteTextViewKeychainTheme" parent="android:Widget.Holo.Light.AutoCompleteTextView">
-      <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item>
-	    <item name="android:background">@drawable/keychaintheme_edit_text_holo_light</item>
-  </style>
-
-  <style name="ButtonKeychainTheme" parent="android:Widget.Holo.Light.Button">
-	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
-  </style>
-
-  <style name="ImageButtonKeychainTheme" parent="android:Widget.Holo.Light.ImageButton">
-	  <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item>
-  </style>
-
-  <style name="SpinnerKeychainTheme" parent="android:Widget.Holo.Light.Spinner">
-      <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item>
-      <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item>
-  </style>
-
-  <style name="ProgressBarKeychainTheme" parent="android:Widget.Holo.Light.ProgressBar.Horizontal">
-      <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item>
-      <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item>
-  </style>
-
-  <style name="SeekBarKeychainTheme" parent="android:Widget.Holo.Light.SeekBar">
-      <item name="android:progressDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item>
-      <item name="android:indeterminateDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item>
-      <item name="android:thumb">@drawable/keychaintheme_scrubber_control_selector_holo_light</item>
-  </style>
-
-  <style name="ToggleKeychainTheme" parent="android:Widget.Holo.Light.Button.Toggle">
-      <item name="android:background">@drawable/keychaintheme_btn_toggle_holo_light</item>
-  </style>
-
-</resources>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index da616492c..c87895c01 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -3,7 +3,6 @@
 
     <style name="KeychainTheme" parent="KeychainTheme.Base" />
 
-    <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">-->
     <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
diff --git a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml
deleted file mode 100644
index ce6922ba0..000000000
--- a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="HoloKeychainTheme" parent="@style/_KeychainTheme"/>
-
-  <style name="_KeychainTheme" parent="Base.Theme.AppCompat.Light">
-
-    <item name="android:editTextBackground">@drawable/keychaintheme_edit_text_holo_light</item>
-
-    <item name="android:textColorHighlight">#994caf50</item>
-    <item name="android:textSelectHandleLeft">@drawable/keychaintheme_text_select_handle_left</item>
-    <item name="android:textSelectHandleRight">@drawable/keychaintheme_text_select_handle_right</item>
-    <item name="android:textSelectHandle">@drawable/keychaintheme_text_select_handle_middle</item>
-
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewKeychainTheme</item>
-
-    <item name="android:listChoiceIndicatorMultiple">@drawable/keychaintheme_btn_check_holo_light</item>
-
-    <item name="android:listChoiceIndicatorSingle">@drawable/keychaintheme_btn_radio_holo_light</item>
-
-    <item name="android:buttonStyle">@style/ButtonKeychainTheme</item>
-
-    <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item>
-
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerKeychainTheme</item>
-
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item>
-
-    <item name="android:seekBarStyle">@style/SeekBarKeychainTheme</item>
-
-    <item name="android:buttonStyleToggle">@style/ToggleKeychainTheme</item>
-
-    <item name="android:listChoiceBackgroundIndicator">@drawable/keychaintheme_list_selector_holo_light</item>
-
-    <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item>
-
-    <item name="android:fastScrollThumbDrawable">@drawable/keychaintheme_fastscroll_thumb_holo</item>
-
-  </style>
-
-</resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 6bd4e1e5b377225e55491b77f5d495a7661ad5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 01:26:04 +0100
Subject: Fix margins of dialog views

---
 OpenKeychain/src/main/res/layout/add_subkey_dialog.xml  |  8 ++++----
 OpenKeychain/src/main/res/layout/add_user_id_dialog.xml |  8 ++++----
 .../src/main/res/layout/edit_subkey_expiry_dialog.xml   |  7 ++++---
 OpenKeychain/src/main/res/layout/file_dialog.xml        | 17 ++++++++++-------
 .../src/main/res/layout/passphrase_repeat_dialog.xml    |  6 ++++--
 .../src/main/res/layout/view_key_delete_fragment.xml    |  5 ++++-
 6 files changed, 30 insertions(+), 21 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
index d52e72997..d32b1496f 100644
--- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml
@@ -6,10 +6,10 @@
     <TableLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
         android:stretchColumns="1">
 
         <TextView
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
index 4560e0b9e..79137bf51 100644
--- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml
@@ -3,10 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
 
     <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView
         android:id="@+id/add_user_id_address"
diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
index 8a713115e..a692db574 100644
--- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <CheckBox
         android:id="@+id/edit_subkey_expiry_no_expiry"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
         android:checked="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index dcf711679..deefd0428 100644
--- a/OpenKeychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
 
     <TextView
         android:id="@+id/message"
@@ -25,10 +27,11 @@
             android:layout_weight="1"
             android:gravity="top|left"
             android:inputType="textMultiLine|textUri"
-            android:lines="4"
-            android:maxLines="10"
-            android:minLines="2"
-            android:scrollbars="vertical" />
+            android:lines="1"
+            android:maxLines="1"
+            android:minLines="1"
+            android:scrollbars="vertical"
+            android:layout_gravity="center_vertical" />
 
         <ImageButton
             android:id="@+id/btn_browse"
diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
index 3a19dd452..09e37ee56 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
@@ -3,8 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp">
 
     <CheckBox
         android:id="@+id/passphrase_no_passphrase"
diff --git a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml
index bbc723bfa..1a6454f91 100644
--- a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -8,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/mainMessage"
-        android:layout_margin="4dp"
         android:textAppearance="?android:textAppearanceMedium" />
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 4ccd9f9bb148a75e9cde48648216d1037a617c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 01:38:57 +0100
Subject: Uncluttering advanced key view

---
 .../main/res/layout/view_key_adv_main_fragment.xml | 88 ----------------------
 .../res/layout/view_key_adv_share_fragment.xml     | 45 -----------
 2 files changed, 133 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
index 6d0ed3298..d4272b816 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -71,94 +71,6 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <TextView
-            android:id="@+id/view_key_action_edit"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_edit"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_edit"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:id="@+id/view_key_action_edit_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-
-        <LinearLayout
-            android:id="@+id/view_key_action_encrypt_text"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_text_text"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <TextView
-                android:id="@+id/view_key_action_encrypt_files"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_encrypt_files"
-                android:drawableRight="@drawable/ic_action_secure"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/view_key_action_update"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:text="@string/key_view_action_update"
-            android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_download"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
     </LinearLayout>
 
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index cd8f96e6f..127fe36de 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -162,51 +162,6 @@
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_nfc_help"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="@style/SelectableItem"
-            android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_share_nfc"
-                android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_help"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical" />
-
-            <View
-                android:layout_width="1dip"
-                android:layout_height="match_parent"
-                android:gravity="right"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/listDivider" />
-
-            <ImageButton
-                android:id="@+id/view_key_action_nfc_prefs"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_settings"
-                android:layout_gravity="center_vertical"
-                style="@style/SelectableItem" />
-
-        </LinearLayout>
-
     </LinearLayout>
 
 </ScrollView>
-- 
cgit v1.2.3


From 11c34364545ff99268949e558cddcb853ea1810b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 01:44:40 +0100
Subject: Prettify qr code in advanced key view

---
 .../res/layout/view_key_adv_share_fragment.xml     | 32 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 127fe36de..1056a4681 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -1,4 +1,5 @@
 <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">
 
@@ -67,15 +68,36 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-        <ImageView
-            android:id="@+id/view_key_fingerprint_qr_code_image"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/view_key_qr_code_layout"
+            android:transitionName="qr_code"
+            android:visibility="visible"
             android:layout_width="200dp"
             android:layout_height="200dp"
             android:layout_gravity="center_horizontal"
             android:layout_weight="1"
-            style="@style/SelectableItem" />
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
+            card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardUseCompatPadding="true"
+            card_view:cardCornerRadius="4dp">
+
+            <ImageView
+                android:id="@+id/view_key_qr_code"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </android.support.v7.widget.CardView>
+
+        <!--<ImageView-->
+            <!--android:id="@+id/view_key_fingerprint_qr_code_image"-->
+            <!--android:paddingTop="8dp"-->
+            <!--android:paddingBottom="8dp"-->
+            <!--android:layout_width="200dp"-->
+            <!--android:layout_height="200dp"-->
+            <!--android:layout_gravity="center_horizontal"-->
+            <!--android:layout_weight="1"-->
+            <!--style="@style/SelectableItem" />-->
 
         <TextView
             style="@style/SectionHeader"
-- 
cgit v1.2.3


From ea4ca9e6865e6b109c653da35beae98d3d1ded9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 01:47:06 +0100
Subject: Prettify qr code cleanup

---
 .../src/main/res/layout/view_key_adv_share_fragment.xml        | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 1056a4681..7b382dca5 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -89,16 +89,6 @@
                 android:layout_height="match_parent" />
         </android.support.v7.widget.CardView>
 
-        <!--<ImageView-->
-            <!--android:id="@+id/view_key_fingerprint_qr_code_image"-->
-            <!--android:paddingTop="8dp"-->
-            <!--android:paddingBottom="8dp"-->
-            <!--android:layout_width="200dp"-->
-            <!--android:layout_height="200dp"-->
-            <!--android:layout_gravity="center_horizontal"-->
-            <!--android:layout_weight="1"-->
-            <!--style="@style/SelectableItem" />-->
-
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
-- 
cgit v1.2.3


From 54e04f496ea27800ad5fa03023d102f08b33ee67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 22:26:11 +0100
Subject: Better qr code resizing

---
 .../src/main/res/layout-land/qr_code_activity.xml  | 39 ++++++++++++++++++++++
 .../src/main/res/layout/qr_code_activity.xml       |  4 ++-
 .../src/main/res/layout/view_key_activity.xml      |  1 +
 .../res/layout/view_key_adv_share_fragment.xml     |  5 +--
 .../src/main/res/layout/view_key_fragment.xml      |  2 +-
 5 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout-land/qr_code_activity.xml

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

diff --git a/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml b/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
new file mode 100644
index 000000000..59a733e89
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/toolbar_standalone" />
+
+    <LinearLayout
+        android:layout_below="@id/toolbar_include"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.CardView
+            android:id="@+id/qr_code_image_layout"
+            android:transitionName="qr_code"
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="32dp"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:clickable="true"
+            android:foreground="?android:attr/selectableItemBackground"
+            app:cardBackgroundColor="@android:color/white"
+            app:cardUseCompatPadding="true"
+            app:cardCornerRadius="4dp">
+
+            <org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
+                android:id="@+id/qr_code_image"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                app:dominantMeasurement="height"
+                app:aspectRatioEnabled="true" />
+        </android.support.v7.widget.CardView>
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/qr_code_activity.xml b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
index 4ce097f40..5709bf0ff 100644
--- a/OpenKeychain/src/main/res/layout/qr_code_activity.xml
+++ b/OpenKeychain/src/main/res/layout/qr_code_activity.xml
@@ -12,11 +12,12 @@
         android:layout_below="@id/toolbar_include"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="horizontal">
 
         <android.support.v7.widget.CardView
             android:id="@+id/qr_code_image_layout"
             android:transitionName="qr_code"
+            android:layout_gravity="center_vertical"
             android:layout_margin="32dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,6 +31,7 @@
                 android:id="@+id/qr_code_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:dominantMeasurement="width"
                 app:aspectRatioEnabled="true" />
         </android.support.v7.widget.CardView>
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index e2d153e0d..1a45370a5 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -134,6 +134,7 @@
             android:clickable="true"
             android:foreground="?android:attr/selectableItemBackground"
             card_view:cardBackgroundColor="@android:color/white"
+            card_view:cardElevation="2dp"
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index 7b382dca5..a6224a8d1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -68,11 +68,11 @@
             android:layout_height="1dip"
             android:background="?android:attr/listDivider" />
 
-
         <android.support.v7.widget.CardView
             android:id="@+id/view_key_qr_code_layout"
             android:transitionName="qr_code"
             android:visibility="visible"
+            android:layout_marginTop="16dp"
             android:layout_width="200dp"
             android:layout_height="200dp"
             android:layout_gravity="center_horizontal"
@@ -81,6 +81,7 @@
             android:foreground="?android:attr/selectableItemBackground"
             card_view:cardBackgroundColor="@android:color/white"
             card_view:cardUseCompatPadding="true"
+            card_view:cardElevation="2dp"
             card_view:cardCornerRadius="4dp">
 
             <ImageView
@@ -93,7 +94,7 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="16dp"
             android:text="@string/section_share_key"
             android:layout_weight="1" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index 8e1bad3a8..bba412f99 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             card_view:cardBackgroundColor="@android:color/white"
-            card_view:cardElevation="2sp"
+            card_view:cardElevation="2dp"
             card_view:cardUseCompatPadding="true"
             card_view:cardCornerRadius="4dp">
 
-- 
cgit v1.2.3


From fe31883f661d55c20903cf1b249dc46395b57c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 22:40:52 +0100
Subject: Keybase header text

---
 .../res/layout/view_key_adv_keybase_fragment.xml   | 126 +++++++++++++++++++++
 .../main/res/layout/view_key_adv_keybase_proof.xml |  19 ++++
 .../src/main/res/layout/view_key_keybase_proof.xml |  19 ----
 .../main/res/layout/view_key_trust_fragment.xml    | 105 -----------------
 OpenKeychain/src/main/res/values/strings.xml       |   1 +
 5 files changed, 146 insertions(+), 124 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
new file mode 100644
index 000000000..a29c9fbee
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_fragment.xml
@@ -0,0 +1,126 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/holo_gray_bright"
+        android:padding="8dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/key_trust_header_text"
+        android:gravity="center_horizontal" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="?android:attr/listDivider" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:descendantFocusability="beforeDescendants"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="8dp"
+                android:text="@string/section_should_you_trust"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/view_key_trust_readout"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginLeft="8dp"
+                android:layout_weight="1"
+                style="?android:attr/textAppearanceMedium" />
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:text="@string/section_cloud_evidence"
+                android:layout_weight="1" />
+
+            <LinearLayout
+                android:id="@+id/view_key_trust_search_cloud"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/listPreferredItemHeight"
+                android:clickable="true"
+                android:paddingRight="4dp"
+                style="@style/SelectableItem"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:paddingLeft="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:text="@string/key_trust_start_cloud_search"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="8dp"
+                    android:src="@drawable/ic_action_search_cloud"
+                    android:layout_gravity="center_vertical" />
+
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/view_key_trust_cloud_narrative"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:layout_marginLeft="8dp"
+                android:layout_weight="1"
+                style="?android:attr/textAppearanceMedium" />
+
+            <TableLayout
+                android:id="@+id/view_key_proof_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <TextView
+                android:id="@+id/view_key_proof_verify_header"
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/section_proof_details"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/view_key_proof_verify_detail"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginLeft="8dp"
+                android:layout_weight="1"
+                style="?android:attr/textAppearanceMedium" />
+
+
+        </LinearLayout>
+
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
new file mode 100644
index 000000000..0ffd151c1
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_keybase_proof.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/proof_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dip"
+        android:text="1."
+        style="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/proof_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dip"
+        android:text="Posts to twitter as Timbray"
+        style="?android:attr/textAppearanceMedium" />
+</TableRow>
diff --git a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml b/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
deleted file mode 100644
index 0ffd151c1..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_keybase_proof.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
-    <TextView
-        android:id="@+id/proof_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dip"
-        android:text="1."
-        style="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/proof_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="6dip"
-        android:text="Posts to twitter as Timbray"
-        style="?android:attr/textAppearanceMedium" />
-</TableRow>
diff --git a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
deleted file mode 100644
index f97401271..000000000
--- a/OpenKeychain/src/main/res/layout/view_key_trust_fragment.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:descendantFocusability="beforeDescendants"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/section_should_you_trust"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/view_key_trust_readout"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginLeft="8dp"
-            android:layout_weight="1"
-            style="?android:attr/textAppearanceMedium"/>
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_cloud_evidence"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_trust_search_cloud"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_trust_start_cloud_search"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_action_search_cloud"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-
-        <TextView
-            android:id="@+id/view_key_trust_cloud_narrative"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp"
-            android:layout_marginLeft="8dp"
-            android:layout_weight="1"
-            style="?android:attr/textAppearanceMedium" />
-
-        <TableLayout
-            android:id="@+id/view_key_proof_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/view_key_proof_verify_header"
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/section_proof_details"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/view_key_proof_verify_detail"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginLeft="8dp"
-            android:layout_weight="1"
-            style="?android:attr/textAppearanceMedium"/>
-
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f43b4e623..bf83150b3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -564,6 +564,7 @@
     <string name="key_trust_no_cloud_evidence">"No evidence from the cloud on this key’s trustworthiness."</string>
     <string name="key_trust_start_cloud_search">"Start search"</string>
     <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
+    <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to verifying them."</string>
 
     <!-- keybase proof stuff -->
     <string name="keybase_narrative_twitter">"Posts to Twitter as"</string>
-- 
cgit v1.2.3


From 80c159056d8efc4dd82c36a2c168511d34d6e8b4 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 27 Feb 2015 22:46:40 +0100
Subject: show refresh key progress inline

---
 OpenKeychain/src/main/res/anim/rotate.xml                   | 8 ++++++++
 OpenKeychain/src/main/res/anim/rotate_spin.xml              | 8 ++++++++
 OpenKeychain/src/main/res/layout/indeterminate_progress.xml | 9 +++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 OpenKeychain/src/main/res/anim/rotate.xml
 create mode 100644 OpenKeychain/src/main/res/anim/rotate_spin.xml
 create mode 100644 OpenKeychain/src/main/res/layout/indeterminate_progress.xml

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

diff --git a/OpenKeychain/src/main/res/anim/rotate.xml b/OpenKeychain/src/main/res/anim/rotate.xml
new file mode 100644
index 000000000..3856fa081
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/rotate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromDegrees="0"
+        android:toDegrees="360"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="800"
+        android:interpolator="@android:anim/linear_interpolator" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/anim/rotate_spin.xml b/OpenKeychain/src/main/res/anim/rotate_spin.xml
new file mode 100644
index 000000000..e6ddec869
--- /dev/null
+++ b/OpenKeychain/src/main/res/anim/rotate_spin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:fromDegrees="0"
+        android:toDegrees="360"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:duration="400"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/indeterminate_progress.xml b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml
new file mode 100644
index 000000000..8515e83a4
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/indeterminate_progress.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"
+    android:padding="0dp"
+    android:src="@drawable/ic_refresh_white_24dp"
+    style="@style/Widget.AppCompat.ActionButton" />
-- 
cgit v1.2.3


From b1c8fa347162825e603e44781efa1446181a1218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 23:24:04 +0100
Subject: Fix keyboard overlay bug on top of edittexts

---
 OpenKeychain/src/main/res/layout/create_key_activity.xml        | 6 ++++++
 OpenKeychain/src/main/res/layout/create_key_input_fragment.xml  | 2 +-
 OpenKeychain/src/main/res/layout/decrypt_files_activity.xml     | 6 ++++++
 OpenKeychain/src/main/res/layout/decrypt_text_activity.xml      | 8 +++++++-
 OpenKeychain/src/main/res/layout/encrypt_files_activity.xml     | 6 ++++++
 OpenKeychain/src/main/res/layout/encrypt_text_activity.xml      | 6 ++++++
 OpenKeychain/src/main/res/layout/import_keys_activity.xml       | 6 ++++++
 OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml | 1 -
 OpenKeychain/src/main/res/layout/key_list_fragment.xml          | 9 ++++++++-
 9 files changed, 46 insertions(+), 4 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml
index c42fd4d4b..b9d5206a1 100644
--- a/OpenKeychain/src/main/res/layout/create_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml
@@ -7,8 +7,14 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <FrameLayout
         android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 026d98004..f678825aa 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -6,7 +6,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="false"
+        android:fillViewport="true"
         android:layout_above="@+id/create_key_button_divider">
 
         <LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
index 608fce111..06c1dda7b 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
@@ -7,8 +7,14 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <LinearLayout
         android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
index b97fc9c8e..a692b3681 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml
@@ -6,9 +6,15 @@
     <include
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
-
+    
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <LinearLayout
         android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index d292b1a5b..168e6d0be 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -7,9 +7,15 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
index 66abd03b1..fd7fd6672 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml
@@ -7,9 +7,15 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <LinearLayout
         android:layout_below="@id/toolbar_include"
         android:id="@+id/content_frame"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 93d630437..dcdd9a31a 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -7,8 +7,14 @@
         android:id="@+id/toolbar_include"
         layout="@layout/toolbar_standalone" />
 
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
     <LinearLayout
         android:layout_below="@id/toolbar_include"
+        android:fitsSystemWindows="true"
+        android:layout_marginTop="-25dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index 46ec736ca..6f52e1938 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 3c46b4f9c..bdebf2ea7 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fitsSystemWindows="true"
+    android:layout_marginTop="-25dp"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <!--
+        fitsSystemWindows and layout_marginTop from
+        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
+    -->
+
+    <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout
         android:id="@+id/key_list_swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-- 
cgit v1.2.3


From 200d4a6bb6185242afa566d09d10d5b0ba62d58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 23:39:36 +0100
Subject: Remove swipte to refresh src, fix padding in key list

---
 .../src/main/res/layout/key_list_fragment.xml      | 68 +++++++++-------------
 1 file changed, 27 insertions(+), 41 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index bdebf2ea7..2affa6e86 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -1,56 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
-    android:layout_marginTop="-25dp"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <!--
-        fitsSystemWindows and layout_marginTop from
-        https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705
-    -->
-
-    <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout
-        android:id="@+id/key_list_swipe_container"
+    <!--rebuild functionality of ListFragment -->
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <!--rebuild functionality of ListFragment -->
-        <FrameLayout
+        android:layout_height="match_parent">
+
+        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+            android:id="@+id/key_list_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:drawSelectorOnTop="true"
+            android:fastScrollEnabled="true"
+            android:paddingBottom="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="32dp"
+            android:scrollbarStyle="outsideOverlay" />
 
-            <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-                android:id="@+id/key_list_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipToPadding="false"
-                android:drawSelectorOnTop="true"
-                android:fastScrollEnabled="true"
-                android:paddingBottom="16dp"
-                android:paddingLeft="16dp"
-                android:paddingRight="32dp"
-                android:scrollbarStyle="outsideOverlay" />
+        <LinearLayout
+            android:id="@+id/key_list_empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="visible">
 
-            <LinearLayout
-                android:id="@+id/key_list_empty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="visible">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@string/key_list_empty_text1"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:text="@string/key_list_empty_text1"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            </LinearLayout>
-        </FrameLayout>
-    </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout>
+        </LinearLayout>
+    </FrameLayout>
 
     <com.getbase.floatingactionbutton.FloatingActionsMenu
         android:id="@+id/fab_main"
-- 
cgit v1.2.3


From 582caaba97c288de88b7a957cdf1b6f5bc84ed31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Fri, 27 Feb 2015 23:56:53 +0100
Subject: Reorder advanced key view

---
 .../res/layout/view_key_adv_certs_fragment.xml     |  9 -----
 .../main/res/layout/view_key_adv_main_fragment.xml | 43 ----------------------
 2 files changed, 52 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
index 2232ea9f2..d512477aa 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_certs_fragment.xml
@@ -7,15 +7,6 @@
     android:descendantFocusability="beforeDescendants"
     android:orientation="vertical">
 
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:text="@string/section_certs" />
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
index d4272b816..3347a514c 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml
@@ -28,49 +28,6 @@
             android:layout_marginBottom="4dp"
             android:layout_weight="1" />
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_marginTop="14dp"
-            android:text="@string/section_actions"
-            android:layout_weight="1" />
-
-        <LinearLayout
-            android:id="@+id/view_key_action_certify"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            android:paddingRight="4dp"
-            style="@style/SelectableItem"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/view_key_action_certify_text"
-                android:paddingLeft="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:text="@string/key_view_action_certify"
-                android:layout_weight="1"
-                android:gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/view_key_action_certify_image"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/status_signature_verified_cutout_24px"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:id="@+id/view_key_action_certify_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
     </LinearLayout>
 
 </ScrollView>
-- 
cgit v1.2.3


From 0b49becaa800f472b843588c4a8a4c9f9fed40ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Feb 2015 00:04:15 +0100
Subject: padding fixes for key list

---
 OpenKeychain/src/main/res/layout/key_list_fragment.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index 2affa6e86..f31d5fce6 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -15,7 +15,6 @@
             android:layout_height="match_parent"
             android:drawSelectorOnTop="true"
             android:fastScrollEnabled="true"
-            android:paddingBottom="16dp"
             android:paddingLeft="16dp"
             android:paddingRight="32dp"
             android:scrollbarStyle="outsideOverlay" />
@@ -51,7 +50,7 @@
         fab:fab_addButtonPlusIconColor="@color/icons"
         fab:fab_expandDirection="up"
         fab:fab_labelStyle="@style/FabMenuStyle"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="8dp"
         android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp">
 
-- 
cgit v1.2.3


From 1c91be84af72b80e3aeec003fe3b9edd09d165a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Feb 2015 00:11:34 +0100
Subject: Upload new keys to keyserver by default

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

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

diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 97eba9cd1..9b6a807cb 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -66,6 +66,7 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:checked="true"
                 android:text="@string/create_key_upload"
                 android:id="@+id/create_key_upload" />
 
-- 
cgit v1.2.3


From 9c62c3fd3985958a43707c7a25f07744a6cfcb95 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 28 Feb 2015 00:28:20 +0100
Subject: control flow for moving the fab up with snackbar

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

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

diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index f31d5fce6..65935f9c8 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:fab="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    >
 
     <!--rebuild functionality of ListFragment -->
     <FrameLayout
@@ -52,7 +53,8 @@
         fab:fab_labelStyle="@style/FabMenuStyle"
         android:layout_marginBottom="8dp"
         android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp">
+        android:layout_marginEnd="16dp"
+        >
 
         <com.getbase.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_add_qr_code"
-- 
cgit v1.2.3


From 453b67f7a8cb274d794843e54d6d050a7ef7a98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Feb 2015 00:38:53 +0100
Subject: Update from transifex

---
 OpenKeychain/src/main/res/raw-eu/help_about.html   |  57 +++++
 .../src/main/res/raw-eu/help_changelog.html        | 232 +++++++++++++++++
 .../src/main/res/raw-eu/help_nfc_beam.html         |  12 +
 OpenKeychain/src/main/res/raw-eu/help_start.html   |  19 ++
 OpenKeychain/src/main/res/raw-eu/help_wot.html     |  17 ++
 .../src/main/res/raw-eu/nfc_beam_share.html        |  11 +
 .../src/main/res/raw-ru/help_changelog.html        | 276 ++++++++++-----------
 .../src/main/res/raw-ru/help_nfc_beam.html         |   2 +-
 OpenKeychain/src/main/res/raw-ru/help_start.html   |   4 +-
 OpenKeychain/src/main/res/raw-ru/help_wot.html     |   2 +-
 OpenKeychain/src/main/res/values-bg/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-cs/strings.xml    |   6 +-
 OpenKeychain/src/main/res/values-de/strings.xml    |   7 +-
 OpenKeychain/src/main/res/values-es/strings.xml    | 101 ++++++--
 OpenKeychain/src/main/res/values-et/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-eu/strings.xml    |  69 ++++++
 OpenKeychain/src/main/res/values-fi/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-fr/strings.xml    |  62 ++++-
 OpenKeychain/src/main/res/values-is/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-it/strings.xml    |   7 +-
 OpenKeychain/src/main/res/values-ja/strings.xml    |  24 +-
 OpenKeychain/src/main/res/values-nl/strings.xml    |  74 +++++-
 OpenKeychain/src/main/res/values-pl/strings.xml    |  61 +++--
 OpenKeychain/src/main/res/values-pt/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-ro/strings.xml    |   3 +
 OpenKeychain/src/main/res/values-ru/strings.xml    | 116 ++++++++-
 OpenKeychain/src/main/res/values-sl/strings.xml    |   5 +-
 OpenKeychain/src/main/res/values-sr/strings.xml    |  35 ++-
 OpenKeychain/src/main/res/values-sv/strings.xml    |   7 +-
 OpenKeychain/src/main/res/values-tr/strings.xml    |   6 +-
 OpenKeychain/src/main/res/values-uk/strings.xml    |   6 +-
 .../src/main/res/values-zh-rTW/strings.xml         |   7 +-
 OpenKeychain/src/main/res/values-zh/strings.xml    |   3 +
 33 files changed, 1010 insertions(+), 236 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/raw-eu/help_about.html
 create mode 100644 OpenKeychain/src/main/res/raw-eu/help_changelog.html
 create mode 100644 OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html
 create mode 100644 OpenKeychain/src/main/res/raw-eu/help_start.html
 create mode 100644 OpenKeychain/src/main/res/raw-eu/help_wot.html
 create mode 100644 OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html
 create mode 100644 OpenKeychain/src/main/res/values-eu/strings.xml

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

diff --git a/OpenKeychain/src/main/res/raw-eu/help_about.html b/OpenKeychain/src/main/res/raw-eu/help_about.html
new file mode 100644
index 000000000..2c6c5b3c4
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/help_about.html
@@ -0,0 +1,57 @@
+<html>
+<head></head>
+<body>
+<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p>
+<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
+<p>License: GPLv3+</p>
+
+<h2>Developers</h2>
+<ul>
+<li>Dominik Schürmann (Maintainer)</li>
+<li>Art O Cathain</li>
+<li>Ash Hughes</li>
+<li>Brian C. Barnes</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Daniel Albert</li>
+<li>Daniel Hammann</li>
+<li>Daniel Haß</li>
+<li>Greg Witczak</li>
+<li>'mar-v-in'</li>
+<li>Markus Doits</li>
+<li>Miroojin Bakshi</li>
+<li>Nikhil Peter Raj</li>
+<li>Paul Sarbinowski</li>
+<li>'Senecaso'</li>
+<li>Signe Rüsch</li>
+<li>Sreeram Boyapati</li>
+<li>Thialfihar (APG 1.x)</li>
+<li>Tim Bray</li>
+<li>Vincent Breitmoser</li>
+</ul>
+<h2>Libraries</h2>
+<ul>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li>
+<li>
+<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/rtreffer/minidns">MiniDNS</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li>
+<li>
+<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
+<li>
+<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
+<li>
+<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li>
+<a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.html b/OpenKeychain/src/main/res/raw-eu/help_changelog.html
new file mode 100644
index 000000000..0cb7d5210
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.html
@@ -0,0 +1,232 @@
+<html>
+<head></head>
+<body>
+
+<h2>3.1.2</h2>
+<ul>
+<li>Fix key export to files (now for real)</li>
+</ul>
+<h2>3.1.1</h2>
+<ul>
+<li>Fix key export to files (they were written partially)</li>
+<li>Fix crash on Android 2.3</li>
+</ul>
+<h2>3.1</h2>
+<ul>
+<li>Fix crash on Android 5</li>
+<li>New certify screen</li>
+<li>Secure Exchange directly from key list (SafeSlinger library)</li>
+<li>New QR Code program flow</li>
+<li>Redesigned decrypt screen</li>
+<li>New icon usage and colors</li>
+<li>Fix import of secret keys from Symantec Encryption Desktop</li>
+<li>Subkey IDs on Yubikeys are now checked correctly</li>
+</ul>
+<h2>3.0.1</h2>
+<ul>
+<li>Better handling of large key imports</li>
+<li>Improved subkey selection</li>
+</ul>
+<h2>3.0</h2>
+<ul>
+<li>Full support for Yubikey signature generation and decryption!</li>
+<li>Propose installable compatible apps in apps list</li>
+<li>New design for decryption screens</li>
+<li>Many fixes for key import, also fixes stripped keys</li>
+<li>Honor and display key authenticate flags</li>
+<li>User interface to generate custom keys</li>
+<li>Fixing user id revocation certificates</li>
+<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
+<li>Support for stripping keys inside OpenKeychain</li>
+</ul>
+<h2>2.9.2</h2>
+<ul>
+<li>Fix keys broken in 2.9.1</li>
+<li>Yubikey decryption now working via API</li>
+</ul>
+<h2>2.9.1</h2>
+<ul>
+<li>Split encrypt screen into two</li>
+<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
+<li>Improved passphrase handling</li>
+<li>Key sharing via SafeSlinger</li>
+<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
+<li>Fix usage of stripped keys</li>
+<li>SHA256 as default for compatibility</li>
+<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+</ul>
+<h2>2.9</h2>
+<ul>
+<li>Fixing crashes introduced in v2.8</li>
+<li>Experimental ECC support</li>
+<li>Experimental Yubikey support (signing-only with imported keys)</li>
+</ul>
+<h2>2.8</h2>
+<ul>
+<li>So many bugs have been fixed in this release that we focus on the main new features</li>
+<li>Key edit: awesome new design, key revocation</li>
+<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
+<li>New first time screen</li>
+<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>File encryption: awesome new design, support for encrypting multiple files</li>
+<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Important bug fix: Importing of large key collections from a file is now possible</li>
+<li>Notification showing cached passphrases</li>
+<li>Keys are connected to Android's contacts</li>
+</ul>
+<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>
+
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+<h2>2.6.1</h2>
+<ul>
+<li>Some fixes for regression bugs</li>
+</ul>
+<h2>2.6</h2>
+<ul>
+<li>Key certifications (thanks to Vincent Breitmoser)</li>
+<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>New design for signature verification</li>
+<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Fix share-functionality from other apps</li>
+</ul>
+<h2>2.5</h2>
+<ul>
+<li>Fix decryption of symmetric OpenPGP messages/files</li>
+<li>Refactored key edit screen (thanks to Ash Hughes)</li>
+<li>New modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+</ul>
+<h2>2.4</h2>
+<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>
+<ul>
+<li>New unified key list</li>
+<li>Colorized key fingerprint</li>
+<li>Support for keyserver ports</li>
+<li>Deactivate possibility to generate weak keys</li>
+<li>Much more internal work on the API</li>
+<li>Certify user ids</li>
+<li>Keyserver query based on machine-readable output</li>
+<li>Lock navigation drawer on tablets</li>
+<li>Suggestions for emails on creation of keys</li>
+<li>Search in public key lists</li>
+<li>And much more improvements and fixes…</li>
+</ul>
+<h2>2.3.1</h2>
+<ul>
+<li>Hotfix for crash when upgrading from old versions</li>
+</ul>
+<h2>2.3</h2>
+<ul>
+<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
+<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
+<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
+<li>Querying keyservers directly from the import screen</li>
+<li>Fix layout and dialog style on Android 2.2-3.0</li>
+<li>Fix crash on keys with empty user ids</li>
+<li>Fix crash and empty lists when coming back from signing screen</li>
+<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
+<li>Fix upload of key from signing screen</li>
+</ul>
+<h2>2.2</h2>
+<ul>
+<li>New design with navigation drawer</li>
+<li>New public key list design</li>
+<li>New public key view</li>
+<li>Bug fixes for importing of keys</li>
+<li>Key cross-certification (thanks to Ash Hughes)</li>
+<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
+<li>First version with new languages (thanks to the contributors on Transifex)</li>
+<li>Sharing of keys via QR Codes fixed and improved</li>
+<li>Package signature verification for API</li>
+</ul>
+<h2>2.1.1</h2>
+<ul>
+<li>API Updates, preparation for K-9 Mail integration</li>
+</ul>
+<h2>2.1</h2>
+<ul>
+<li>Lots of bug fixes</li>
+<li>New API for developers</li>
+<li>PRNG bug fix by Google</li>
+</ul>
+<h2>2.0</h2>
+<ul>
+<li>Complete redesign</li>
+<li>Share public keys via QR codes, NFC beam</li>
+<li>Sign keys</li>
+<li>Upload keys to server</li>
+<li>Fixes import issues</li>
+<li>New AIDL API</li>
+</ul>
+<h2>1.0.8</h2>
+<ul>
+<li>Basic keyserver support</li>
+<li>App2sd</li>
+<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
+<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
+<li>Bugfixes</li>
+<li>Optimizations</li>
+</ul>
+<h2>1.0.7</h2>
+<ul>
+<li>Fixed problem with signature verification of texts with trailing newline</li>
+<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+</ul>
+<h2>1.0.6</h2>
+<ul>
+<li>Account adding crash on Froyo fixed</li>
+<li>Secure file deletion</li>
+<li>Option to delete key file after import</li>
+<li>Stream encryption/decryption (gallery, etc.)</li>
+<li>New options (language, force v3 signatures)</li>
+<li>Interface changes</li>
+<li>Bugfixes</li>
+</ul>
+<h2>1.0.5</h2>
+<ul>
+<li>German and Italian translation</li>
+<li>Much smaller package, due to reduced BC sources</li>
+<li>New preferences GUI</li>
+<li>Layout adjustment for localization</li>
+<li>Signature bugfix</li>
+</ul>
+<h2>1.0.4</h2>
+<ul>
+<li>Fixed another crash caused by some SDK bug with query builder</li>
+</ul>
+<h2>1.0.3</h2>
+<ul>
+<li>Fixed crashes during encryption/signing and possibly key export</li>
+</ul>
+<h2>1.0.2</h2>
+<ul>
+<li>Filterable key lists</li>
+<li>Smarter pre-selection of encryption keys</li>
+<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
+<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+</ul>
+<h2>1.0.1</h2>
+<ul>
+<li>GMail account listing was broken in 1.0.0, fixed again</li>
+</ul>
+<h2>1.0.0</h2>
+<ul>
+<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
+<li>Support of more file managers (including ASTRO)</li>
+<li>Slovenian translation</li>
+<li>New database, much faster, less memory usage</li>
+<li>Defined Intents and content provider for other apps</li>
+<li>Bugfixes</li>
+</ul>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html
new file mode 100644
index 000000000..966fb554a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/help_nfc_beam.html
@@ -0,0 +1,12 @@
+<html>
+<head></head>
+<body>
+<h2>How to receive keys</h2>
+<ol>
+<li>Go to your partners keys and open the key you want to share.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li>
+<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the your device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_start.html b/OpenKeychain/src/main/res/raw-eu/help_start.html
new file mode 100644
index 000000000..92fd4a92a
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/help_start.html
@@ -0,0 +1,19 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+
+<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
+
+<h2>I found a bug in OpenKeychain!</h2>
+<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p>
+
+<h2>Contribute</h2>
+<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p>
+
+<h2>Translations</h2>
+<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/help_wot.html b/OpenKeychain/src/main/res/raw-eu/help_wot.html
new file mode 100644
index 000000000..2a551f79c
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/help_wot.html
@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Web of Trust</h2>
+<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+
+<h2>Support in OpenKeychain</h2>
+<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+
+<h2>Trust Model</h2>
+<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+
+<h2>Certifying keys</h2>
+<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html
new file mode 100644
index 000000000..083e055c7
--- /dev/null
+++ b/OpenKeychain/src/main/res/raw-eu/nfc_beam_share.html
@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; NFC and make sure that Android Beam is also on in the same section.</li>
+<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li>
+<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li>
+<li>Tap the card and the content will then load on the other person’s device.</li>
+</ol>
+</body>
+</html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
index 0cb7d5210..6c22f1315 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.html
@@ -4,229 +4,229 @@
 
 <h2>3.1.2</h2>
 <ul>
-<li>Fix key export to files (now for real)</li>
+<li>Исправление экспорта ключей в файл (на этот раз точно)</li>
 </ul>
 <h2>3.1.1</h2>
 <ul>
-<li>Fix key export to files (they were written partially)</li>
-<li>Fix crash on Android 2.3</li>
+<li>Исправление экспорта ключей (записывались частично)</li>
+<li>Исправление падений на Android 2.3</li>
 </ul>
 <h2>3.1</h2>
 <ul>
-<li>Fix crash on Android 5</li>
-<li>New certify screen</li>
-<li>Secure Exchange directly from key list (SafeSlinger library)</li>
-<li>New QR Code program flow</li>
-<li>Redesigned decrypt screen</li>
-<li>New icon usage and colors</li>
-<li>Fix import of secret keys from Symantec Encryption Desktop</li>
-<li>Subkey IDs on Yubikeys are now checked correctly</li>
+<li>Исправление падений на Android 5</li>
+<li>Новый диалог сертификации</li>
+<li>Безопасный обмен ключами из списка (SafeSlinger library)</li>
+<li>Новый обработчик QR кодов</li>
+<li>Изменение дизайна диалога расшифровки</li>
+<li>Использование новых иконок и цветов</li>
+<li>Исправлен импорт закрытых ключей из Symantec Encryption Desktop</li>
+<li>Корректная проверка идентификаторов доп. ключей на Yubikeys</li>
 </ul>
 <h2>3.0.1</h2>
 <ul>
-<li>Better handling of large key imports</li>
-<li>Improved subkey selection</li>
+<li>Улучшение обработки импорта больших ключей</li>
+<li>Улучшение выбора доп. ключей</li>
 </ul>
 <h2>3.0</h2>
 <ul>
-<li>Full support for Yubikey signature generation and decryption!</li>
-<li>Propose installable compatible apps in apps list</li>
-<li>New design for decryption screens</li>
-<li>Many fixes for key import, also fixes stripped keys</li>
-<li>Honor and display key authenticate flags</li>
-<li>User interface to generate custom keys</li>
-<li>Fixing user id revocation certificates</li>
-<li>New cloud search (searches over traditional keyservers and keybase.io)</li>
-<li>Support for stripping keys inside OpenKeychain</li>
+<li>Полная поддержка подписания и расшифровки с Yubikey!</li>
+<li>Предлагаются для установки совместимые программы</li>
+<li>Новый дизайн для диалога расшифровки</li>
+<li>Исправление ошибок импорта ключей и исправление сжатых ключей</li>
+<li>Обработка и отображение флагов ключей</li>
+<li>Пользовательский интерфейс для генерации ключей</li>
+<li>Исправление сертификатов отзыва</li>
+<li>Новый облачный поиск (ищет на традиционных серверах и keybase.io)</li>
+<li>Поддержка сжатых ключей в OpenKeychain</li>
 </ul>
 <h2>2.9.2</h2>
 <ul>
-<li>Fix keys broken in 2.9.1</li>
-<li>Yubikey decryption now working via API</li>
+<li>Исправление ключей, сломанных в 2.9.1</li>
+<li>Расшифровка с Yubikey теперь работает через API</li>
 </ul>
 <h2>2.9.1</h2>
 <ul>
-<li>Split encrypt screen into two</li>
-<li>Fix key flags handling (now supporting Mailvelope 0.7 keys)</li>
-<li>Improved passphrase handling</li>
-<li>Key sharing via SafeSlinger</li>
-<li>Yubikey: preference to allow other PINs, currently only signing via the OpenPGP API works, not inside of OpenKeychain</li>
-<li>Fix usage of stripped keys</li>
-<li>SHA256 as default for compatibility</li>
-<li>Intent API has changed, see https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
-<li>OpenPGP API now handles revoked/expired keys and returns all user ids</li>
+<li>Разделение диалога шифрования на два окна</li>
+<li>Исправление обработки флагов ключей (теперь поддерживаются ключи Mailvelope 0.7)</li>
+<li>Улучшение обработчика паролей</li>
+<li>Передача ключей через SafeSlinger</li>
+<li>Yubikey: опция использования других PIN, пока работает только подписание через OpenPGP API, не внутри OpenKeychain</li>
+<li>Исправление использования сжатых ключей</li>
+<li>SHA256 по умолчанию для совместимости</li>
+<li>Изменение API. См. https://github.com/open-keychain/open-keychain/wiki/Intent-API</li>
+<li>OpenPGP API теперь обрабатывает отозванные/просроченные ключи и возвращает все идентификаторы</li>
 </ul>
 <h2>2.9</h2>
 <ul>
-<li>Fixing crashes introduced in v2.8</li>
-<li>Experimental ECC support</li>
-<li>Experimental Yubikey support (signing-only with imported keys)</li>
+<li>Исправление падений, выявленных в 2.8</li>
+<li>Экспериментальная поддержка Эллиптических кривых</li>
+<li>Экспериментальная поддержка Yubikey (вход по импортированному ключу)</li>
 </ul>
 <h2>2.8</h2>
 <ul>
-<li>So many bugs have been fixed in this release that we focus on the main new features</li>
-<li>Key edit: awesome new design, key revocation</li>
-<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
-<li>New first time screen</li>
-<li>New key creation screen: autocompletion of name and email based on your personal Android accounts</li>
-<li>File encryption: awesome new design, support for encrypting multiple files</li>
-<li>New icons to show status of key (by Brennan Novak)</li>
-<li>Important bug fix: Importing of large key collections from a file is now possible</li>
-<li>Notification showing cached passphrases</li>
-<li>Keys are connected to Android's contacts</li>
-</ul>
-<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>
+<li>Так много небольших исправлений, что лучше сообщить о существенных изменениях</li>
+<li>Изменение ключа: новый дизайн, аннулирование клуча</li>
+<li>Импорт ключа: усовершенствованный дизайн, безопасное соединение с серверами ключей по протоколу hkps, определение серверов по записям DNS SRV</li>
+<li>Новый диалог при первом запуске</li>
+<li>Экран создания ключа: автодополнение имени и адреса почты из учетной записи Android</li>
+<li>Шифрование файла: усовершенствованный дизайн, возможность шифрования нескольких файлов</li>
+<li>Новые иконки статуса ключа (Brennan Novak)</li>
+<li>Важное исправление: Теперь возможен импорт большого количества ключей из одного файла</li>
+<li>Уведомление о запомненных паролях</li>
+<li>Ключи соединяются с контактами Android</li>
+</ul>
+<p>Этот релиз стал возможен благодаря работе Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
 
 <h2>2.7</h2>
 <ul>
-<li>Purple! (Dominik, Vincent)</li>
-<li>New key view design (Dominik, Vincent)</li>
-<li>New flat Android buttons (Dominik, Vincent)</li>
-<li>API fixes (Dominik)</li>
-<li>Keybase.io import (Tim Bray)</li>
+<li>Пурпурный! (Dominik, Vincent)</li>
+<li>Новый вид просмотра ключей (Dominik, Vincent)</li>
+<li>Новый вид кнопок в стиле Android (Dominik, Vincent)</li>
+<li>Исправления API (Dominik)</li>
+<li>Импорт Keybase.io (Tim Bray)</li>
 </ul>
 <h2>2.6.1</h2>
 <ul>
-<li>Some fixes for regression bugs</li>
+<li>Исправления найденных ошибок</li>
 </ul>
 <h2>2.6</h2>
 <ul>
-<li>Key certifications (thanks to Vincent Breitmoser)</li>
-<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>New design for signature verification</li>
-<li>Custom key length (thanks to Greg Witczak)</li>
-<li>Fix share-functionality from other apps</li>
+<li>Сертификация ключей (благодаря Vincent Breitmoser)</li>
+<li>Поддержка частично-секретных ключей GnuPG (благодаря  Vincent Breitmoser)</li>
+<li>Новый дизайн проверки подписи</li>
+<li>Произвольная длина ключей (благодаря Greg Witczak)</li>
+<li>Исправление ошибки получения данных от других приложений</li>
 </ul>
 <h2>2.5</h2>
 <ul>
-<li>Fix decryption of symmetric OpenPGP messages/files</li>
-<li>Refactored key edit screen (thanks to Ash Hughes)</li>
-<li>New modern design for encrypt/decrypt screens</li>
-<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+<li>Исправлено симметричное шифрование сообщений/файлов</li>
+<li>Переработано окно изменения ключа (благодаря Ash Hughes)</li>
+<li>Новый дизайн для окон шифрования/расшифровки</li>
+<li>OpenPGP API версии 3 (множественные аккаунты, внутренние исправления, поиск ключей)</li>
 </ul>
 <h2>2.4</h2>
-<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):
+<p>Спасибо всем участникам Google Summer of Code 2014, которые помогли сделать этот выпуск, добавив функции и исправив ошибки!
+Из общего числа патчей, особенный вклад внесли следующие люди (в алфавитном порядке):
 Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p>
 <ul>
-<li>New unified key list</li>
-<li>Colorized key fingerprint</li>
-<li>Support for keyserver ports</li>
-<li>Deactivate possibility to generate weak keys</li>
-<li>Much more internal work on the API</li>
-<li>Certify user ids</li>
-<li>Keyserver query based on machine-readable output</li>
-<li>Lock navigation drawer on tablets</li>
-<li>Suggestions for emails on creation of keys</li>
-<li>Search in public key lists</li>
-<li>And much more improvements and fixes…</li>
+<li>Новый объединенный список ключей</li>
+<li>Цветовая индикация отпечатков ключей</li>
+<li>Поддержка портов серверов ключей</li>
+<li>Отключена возможность создавать слабые ключи</li>
+<li>Ещё больше улучшений работы API</li>
+<li>Сертификация пользовательских данных</li>
+<li>Запрос к серверу ключей основывается на машинном формате вывода</li>
+<li>Фиксация панели на планшетах</li>
+<li>Подсказки email при создании ключей</li>
+<li>Поиск в списках публичных ключей</li>
+<li>И множество других исправлений и улучшений...</li>
 </ul>
 <h2>2.3.1</h2>
 <ul>
-<li>Hotfix for crash when upgrading from old versions</li>
+<li>Исправление ошибки при обновлении со старых версий</li>
 </ul>
 <h2>2.3</h2>
 <ul>
-<li>Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li>
-<li>Fix setting expiry dates on keys (thanks to Ash Hughes)</li>
-<li>More internal fixes when editing keys (thanks to Ash Hughes)</li>
-<li>Querying keyservers directly from the import screen</li>
-<li>Fix layout and dialog style on Android 2.2-3.0</li>
-<li>Fix crash on keys with empty user ids</li>
-<li>Fix crash and empty lists when coming back from signing screen</li>
-<li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li>
-<li>Fix upload of key from signing screen</li>
+<li>Удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li>
+<li>Исправлена ошибка срока годности ключей (спасибо, Ash Hughes)</li>
+<li>Исправления ошибок при изменении ключей (спасибо, Ash Hughes)</li>
+<li>Запрос ключа с сервера прямо из окна импорта ключей</li>
+<li>Исправление внешнего вида для Android 2.2-3.0</li>
+<li>Исправлено падение когда ключ не содержал идентификатор пользователя</li>
+<li>Исправлено падение и пустой список при возвращении из окна подписания</li>
+<li>Криптографическая библиотека Bouncy Castle обновлена с версии 1.47 до 1.50 и пересобрана</li>
+<li>Исправлена загрузка ключа из окна подписания</li>
 </ul>
 <h2>2.2</h2>
 <ul>
-<li>New design with navigation drawer</li>
-<li>New public key list design</li>
-<li>New public key view</li>
-<li>Bug fixes for importing of keys</li>
-<li>Key cross-certification (thanks to Ash Hughes)</li>
-<li>Handle UTF-8 passwords properly (thanks to Ash Hughes)</li>
-<li>First version with new languages (thanks to the contributors on Transifex)</li>
-<li>Sharing of keys via QR Codes fixed and improved</li>
-<li>Package signature verification for API</li>
+<li>Новый дизайн с боковой панелью</li>
+<li>Новый дизайн списка ключей</li>
+<li>Новый вид просмотра ключа</li>
+<li>Исправление ошибок импорта ключей</li>
+<li>Кросс-сертификация ключей (спасибо, Ash Hughes)</li>
+<li>Правильная обработка паролей в UTF-8 (спасибо, Ash Hughes)</li>
+<li>Первая версия с новыми языками (спасибо переводчикам с Transifex)</li>
+<li>Исправление и улучшение передачи ключей через QR коды</li>
+<li>Проверка подписей пакетов для API</li>
 </ul>
 <h2>2.1.1</h2>
 <ul>
-<li>API Updates, preparation for K-9 Mail integration</li>
+<li>Обновление API, подготовка к интеграции с K-9 Mail</li>
 </ul>
 <h2>2.1</h2>
 <ul>
-<li>Lots of bug fixes</li>
-<li>New API for developers</li>
-<li>PRNG bug fix by Google</li>
+<li>Множество исправлений ошибок</li>
+<li>Новый API для разработчиков</li>
+<li>Исправление ошибки генератора случайных чисел</li>
 </ul>
 <h2>2.0</h2>
 <ul>
-<li>Complete redesign</li>
-<li>Share public keys via QR codes, NFC beam</li>
-<li>Sign keys</li>
-<li>Upload keys to server</li>
-<li>Fixes import issues</li>
-<li>New AIDL API</li>
+<li>Переработка дизайна</li>
+<li>Передача ключей через QR коды и NFC</li>
+<li>Подписание ключей</li>
+<li>Загрузка ключей на сервер</li>
+<li>Исправление проблем импорта</li>
+<li>Новый AIDL API</li>
 </ul>
 <h2>1.0.8</h2>
 <ul>
-<li>Basic keyserver support</li>
-<li>App2sd</li>
-<li>More choices for passphrase cache: 1, 2, 4, 8, hours</li>
-<li>Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li>
-<li>Bugfixes</li>
-<li>Optimizations</li>
+<li>Поддержка серверов ключей</li>
+<li>App2SD</li>
+<li>Больше вариантов сохранения кэша пароля: 1, 2, 4, 8 часов</li>
+<li>Переводы: Норвежский (спасибо, Sander Danielsen), Китайский (спасибо, Zhang Fredrick)</li>
+<li>Исправления ошибок</li>
+<li>Оптимизация</li>
 </ul>
 <h2>1.0.7</h2>
 <ul>
-<li>Fixed problem with signature verification of texts with trailing newline</li>
-<li>More options for passphrase cache time to live (20, 40, 60 mins)</li>
+<li>Исправление ошибки при проверке подписи текста с переводом строки</li>
+<li>Больше вариантов сохранения кэша пароля (20, 40, 60 минут)</li>
 </ul>
 <h2>1.0.6</h2>
 <ul>
-<li>Account adding crash on Froyo fixed</li>
-<li>Secure file deletion</li>
-<li>Option to delete key file after import</li>
-<li>Stream encryption/decryption (gallery, etc.)</li>
-<li>New options (language, force v3 signatures)</li>
-<li>Interface changes</li>
-<li>Bugfixes</li>
+<li>Исправление ошибки создания записи на Froyo</li>
+<li>Безопасное удаление файлов</li>
+<li>Опция удаления файла ключа после импорта</li>
+<li>Передача шифрования (галерея и т.д.)</li>
+<li>Новые возможности (язык, v3 подписи)</li>
+<li>Изменения интерфейса</li>
+<li>Исправления ошибок</li>
 </ul>
 <h2>1.0.5</h2>
 <ul>
-<li>German and Italian translation</li>
-<li>Much smaller package, due to reduced BC sources</li>
-<li>New preferences GUI</li>
-<li>Layout adjustment for localization</li>
-<li>Signature bugfix</li>
+<li>Новые языки: немецкий, итальянский</li>
+<li>Значительное уменьшение размера программы</li>
+<li>Новый интерфейс настроек</li>
+<li>Изменение вида для локализации</li>
+<li>Исправление ошибки подписи</li>
 </ul>
 <h2>1.0.4</h2>
 <ul>
-<li>Fixed another crash caused by some SDK bug with query builder</li>
+<li>Исправление еще одной ошибки, возникающей в SDK</li>
 </ul>
 <h2>1.0.3</h2>
 <ul>
-<li>Fixed crashes during encryption/signing and possibly key export</li>
+<li>Исправление ошибок при шифровании/подписании и экспорте ключей</li>
 </ul>
 <h2>1.0.2</h2>
 <ul>
-<li>Filterable key lists</li>
-<li>Smarter pre-selection of encryption keys</li>
-<li>New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li>
-<li>Fixes and additional features (key preselection) for K-9 Mail, new beta build available</li>
+<li>Фильтр списка ключей</li>
+<li>Улучшение выбора ключей шифрования</li>
+<li>Добавлена возможность шифровать файлы прямо из файлового менеджера</li>
+<li>Исправления ошибок и новые возможности для интеграции с K-9 Mail</li>
 </ul>
 <h2>1.0.1</h2>
 <ul>
-<li>GMail account listing was broken in 1.0.0, fixed again</li>
+<li>Исправление выбора учетной записи GMail, сломанного в 1.0.0</li>
 </ul>
 <h2>1.0.0</h2>
 <ul>
-<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li>
-<li>Support of more file managers (including ASTRO)</li>
-<li>Slovenian translation</li>
-<li>New database, much faster, less memory usage</li>
-<li>Defined Intents and content provider for other apps</li>
-<li>Bugfixes</li>
+<li>интеграция с K-9 Mail, APG поддерживает beta-версию K-9 Mail</li>
+<li>Поддержка сторонних файловых менеджеров (в т.ч. ASTRO)</li>
+<li>Словенский перевод</li>
+<li>Новая база данных, еще быстрее и компактнее</li>
+<li>Добавлены обработчики для взаимодействия с другими приложениями</li>
+<li>Исправления ошибок</li>
 </ul>
 </body>
 </html>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
index 5ed10635d..fcf55cdaf 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html
@@ -3,7 +3,7 @@
 <body>
 <h2>Как обменяться ключами</h2>
 <ol>
-<li>Go to your partners keys and open the key you want to share.</li>
+<li>Нажмите и удерживайте ключ, который вы хотите передать.</li>
 <li>Поднесите оба устройства вплотную обратными сторонами (до полного касания). Вы почувствуете небольшую вибрацию.</li>
 <li>Как только устройства завибрируют, на экране появится карточка с передаваемым содержимым.</li>
 <li>Нажмите на карточку, что бы передать данные (ключи) с одного устройства на другое.</li>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html
index ef91a4131..1463d374d 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_start.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_start.html
@@ -2,9 +2,9 @@
 <head></head>
 <body>
 <h2>Приступая</h2>
-<p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>Для начала Вам нужен свой секретный ключ. Создайте его в меню раздела "Ключи" или импортируйте ранее созданный ключ. Позже вы сможете поделиться данными своего ключа с друзьями с помощью QR кода или NFC.</p>
 
-<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p>
+<p>На Android ниже 4.4, рекомендуется установить <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для выбора файлов.</p>
 
 <h2>Я нашел ошибку в OpenKeychain!</h2>
 <p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenKeychain</a>.</p>
diff --git a/OpenKeychain/src/main/res/raw-ru/help_wot.html b/OpenKeychain/src/main/res/raw-ru/help_wot.html
index 4da6c9a82..7fbde44d3 100644
--- a/OpenKeychain/src/main/res/raw-ru/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-ru/help_wot.html
@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Сеть доверия (WoT)</h2>
-<p>The Web of Trust describes the part of OpenPGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+<p>Сеть доверия (The Web of Trust) предоставляет механизм заверения ключей посредством присоединения и распространения информации о выполненной сертификации. Для гарантии безопасного зашифрованного общения крайне важно не сомневаться, что владельцем ключа является ваш собеседник.</p>
 
 <h2>Поддержка в OpenKeychain</h2>
 <p>В настоящее время реализованы только базовые возможности WoT. Работа в самом разгаре и в будущих версиях OpenKeychain будут появляться дополнительные возможности.</p>
diff --git a/OpenKeychain/src/main/res/values-bg/strings.xml b/OpenKeychain/src/main/res/values-bg/strings.xml
index ef0a0ce94..233347bd3 100644
--- a/OpenKeychain/src/main/res/values-bg/strings.xml
+++ b/OpenKeychain/src/main/res/values-bg/strings.xml
@@ -36,6 +36,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -54,6 +56,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index cbf0eb0b8..903cc50f3 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -238,7 +238,6 @@
   <string name="error_could_not_extract_private_key">nebylo možné extrahovat privátní klíč</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Musíte mít Android 4.1 abyste mohli používat Androidí NFC Beam technologii!</string>
-  <string name="error_nfc_needed">NFC není na vašem zařízení k dispozici!</string>
   <string name="error_nothing_import">Žádný klíč nenalezen!</string>
   <string name="error_contacts_key_id_missing">Příjem ID klíče od kontatktu selhal!</string>
   <string name="error_generic_report_bug">Nastala obecná chyba, prosím vytvořte nový bug report pro OpenKeychain.</string>
@@ -432,6 +431,8 @@
   <string name="user_id_info_uncertified_text">Tato identita nebyla ještě ověřena. Nemůžete si být jisti, že identita skutečně odpovídá konkrétní osobě.</string>
   <string name="user_id_info_invalid_title">Neplatná</string>
   <string name="user_id_info_invalid_text">S touto identitou je něco v nepořádku!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Změnit heslo</string>
   <string name="edit_key_action_add_identity">Přidat identitu</string>
@@ -467,8 +468,6 @@
   <string name="create_key_hint_full_name">Celé jméno, např. Jan Novák</string>
   <string name="create_key_edit">Změnit konfiguraci klíče</string>
   <!--View key-->
-  <string name="view_key_revoked">Tento klíč byl zneplatněn!</string>
-  <string name="view_key_expired">Tento klíč vyexpiroval!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klíče</string>
   <string name="nav_apps">Aplikace</string>
@@ -510,6 +509,7 @@
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Klíč nenalezen!</string>
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_acc_saved">Účet uložen</string>
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index e6416b28b..63b0c4c09 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -249,7 +249,6 @@
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC Beam nutzen zu können!</string>
-  <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string>
   <string name="error_nothing_import">Keine Schlüssel gefunden!</string>
   <string name="error_contacts_key_id_missing">Abrufen der Schlüsselkennung von den Kontakten ist fehlgeschlagen!</string>
   <string name="error_generic_report_bug">Ein allgemeiner Fehler trat auf, bitte schreiben Sie einen neuen Bugreport für OpenKeychain.</string>
@@ -432,7 +431,6 @@
   <string name="intent_send_encrypt">Verschlüsseln mit OpenKeychain </string>
   <string name="intent_send_decrypt">Entschlüsseln mit OpenKeychain </string>
   <!--Remote API-->
-  <string name="api_no_apps">Keine registrierten Apps!\n\nEine Liste der unterstützten Anwendungen ist in der \'Hilfe\' verfügbar.</string>
   <string name="api_settings_show_info">Erweiterte Informationen anzeigen</string>
   <string name="api_settings_hide_info">Erweiterte Informationen ausblenden</string>
   <string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string>
@@ -497,6 +495,8 @@
   <string name="user_id_info_uncertified_text">Diese Identität wurde noch nicht beglaubigt. Sie können nicht sicher sein, ob diese Identität wirklich zu einer bestimmten Person gehört.</string>
   <string name="user_id_info_invalid_title">Ungültig</string>
   <string name="user_id_info_invalid_text">Irgend etwas ist mit dieser Identität nicht in Ordnung!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Passwort ändern</string>
   <string name="edit_key_action_add_identity">Identität hinzufügen</string>
@@ -532,8 +532,6 @@
   <string name="create_key_hint_full_name">Vollständiger Name, z.B. Max Mustermann</string>
   <string name="create_key_edit">Schlüsselkonfiguration ändern</string>
   <!--View key-->
-  <string name="view_key_revoked">Dieser Schlüssel wurde widerrufen!</string>
-  <string name="view_key_expired">Dieser Schlüssel ist nicht mehr gültig!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
   <string name="nav_encrypt_decrypt">Verschlüsseln/Entschlüsseln</string>
@@ -885,6 +883,7 @@
   <string name="msg_dc_trail_sym">Anhang gefunden, symmetrisch verschlüsselte Daten</string>
   <string name="msg_dc_trail_unknown">Anhängende Daten unbekannter Art gefunden</string>
   <string name="msg_dc_unlocking">Geheimer Schlüssel wird entsperrt</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Starte Signier-/Verschlüsselungsvorgang</string>
   <string name="msg_se_error_no_input">Keine Eingabe gegeben!</string>
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index e2c657f3e..0d7444c47 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -39,6 +39,9 @@
   <string name="title_keys">Claves</string>
   <!--section-->
   <string name="section_user_ids">Identificaciones</string>
+  <string name="section_should_you_trust">¿Debe confiar en esta clave?</string>
+  <string name="section_proof_details">Prueba de verificación</string>
+  <string name="section_cloud_evidence">Evidencia 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>
@@ -71,6 +74,8 @@
   <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 son coincidentes</string>
   <string name="btn_lookup_key">Buscar clave</string>
   <string name="btn_share_encrypted_signed">Cifrar y compartir mensaje</string>
   <string name="btn_view_cert_key">Ver clave de verificación</string>
@@ -90,6 +95,7 @@
   <string name="menu_create_key">Crear mi clave</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>
@@ -98,6 +104,7 @@
   <string name="menu_search_cloud">Buscar en la nube</string>
   <string name="menu_export_all_keys">Exportar todas las claves</string>
   <string name="menu_advanced">Mostrar información avanzada</string>
+  <string name="menu_certify_fingerprint">Verificar vía comparación de huellas de validación</string>
   <!--label-->
   <string name="label_message">Mensaje</string>
   <string name="label_file">Archivo</string>
@@ -243,13 +250,14 @@
   <string name="error_key_needs_a_user_id">necesita al menos una identificación</string>
   <string name="error_no_signature_passphrase">no has proporcionado una frase de contraseña</string>
   <string name="error_no_signature_key">no has proporcionado una clave de firma</string>
-  <string name="error_invalid_data">¡No hay contenido cifrado o firmado con OpenPGP válido!</string>
+  <string name="error_invalid_data">¡No es un contenido cifrado o firmado con OpenPGP válido!</string>
   <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string>
   <string name="error_wrong_passphrase">frase de contraseña incorrecta</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">¡Necesita Android 4.1 para usar la característica NFC Beam (haz NFC) de Android!</string>
-  <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
+  <string name="error_nfc_needed">¡NFC ha de estar habilitado!</string>
+  <string name="error_beam_needed">¡Beam ha de estar habilitado!</string>
   <string name="error_nothing_import">¡No se encontraron claves!</string>
   <string name="error_contacts_key_id_missing">¡Fallo al obtener clave de identificación desde los contactos!</string>
   <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</string>
@@ -258,14 +266,14 @@
   <string name="decrypt_result_invalid_signature">¡Firma no válida!</string>
   <string name="decrypt_result_signature_uncertified">Firmado por (¡no certificada!)</string>
   <string name="decrypt_result_signature_certified">Firmado por</string>
-  <string name="decrypt_result_signature_expired_key">¡La clave ha expirado!</string>
+  <string name="decrypt_result_signature_expired_key">¡La clave ha caducado!</string>
   <string name="decrypt_result_signature_revoked_key">¡La clave ha sido revocada!</string>
   <string name="decrypt_result_signature_missing_key">Clave pública desconocida</string>
   <string name="decrypt_result_encrypted">Cifrado</string>
   <string name="decrypt_result_not_encrypted">No cifrado</string>
   <string name="decrypt_result_action_show">Mostrar</string>
   <string name="decrypt_result_action_Lookup">Buscar</string>
-  <string name="decrypt_invalid_text">O bien la firma no es válida, o la clave ha sido revocada/ha expirado. No puede estar seguro de quién escribió el texto. ¿Todavía quiere mostrarlo?</string>
+  <string name="decrypt_invalid_text">O bien la firma no es válida, o la clave ha sido revocada o ha caducado. No puede estar seguro de quién escribió el texto. ¿Aún quiere mostrarlo?</string>
   <string name="decrypt_invalid_button">Comprendo los riesgos, ¡muéstralo!</string>
   <!--Add keys-->
   <string name="add_keys_my_key">Mi clave:</string>
@@ -432,7 +440,6 @@
   <string name="intent_send_encrypt">Cifrar con OpenKeychain</string>
   <string name="intent_send_decrypt">Descifrar con OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">¡No hay aplicaciones registradas!\n\n¡Puede encontrar una lista de aplicaciones de terceros soportadas en \'Ayuda\'!</string>
   <string name="api_settings_show_info">Mostrar información avanzada</string>
   <string name="api_settings_hide_info">Ocultar información avanzada</string>
   <string name="api_settings_show_advanced">Mostrar la configuración avanzada</string>
@@ -489,14 +496,54 @@
   <string name="key_view_tab_share">Compartir</string>
   <string name="key_view_tab_keys">Subclaves</string>
   <string name="key_view_tab_certs">Certificados</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
   <string name="user_id_info_revoked_title">Revocada</string>
-  <string name="user_id_info_revoked_text">Esta identificación ha sido revocada por el propietario de la clave. En adelante no es válida.</string>
+  <string name="user_id_info_revoked_text">Esta identificación ha sido revocada por el propietario de la clave. En adelante no será válida.</string>
   <string name="user_id_info_certified_title">Certificada</string>
   <string name="user_id_info_certified_text">Esta identificación ha sido certificada por usted.</string>
   <string name="user_id_info_uncertified_title">No certificada</string>
   <string name="user_id_info_uncertified_text">Esta identificación de no ha sido certificada aún. No puede estar seguro de si la identificación corresponde en realidad a una persona específica.</string>
-  <string name="user_id_info_invalid_title">No válido</string>
+  <string name="user_id_info_invalid_title">No válida</string>
   <string name="user_id_info_invalid_text">¡Hay algo mal con esta identificación!</string>
+  <!--Key trust-->
+  <string name="key_trust_already_verified">¡Ya ha certificado esta clave!</string>
+  <string name="key_trust_it_is_yours">¡Esta es una de sus claves!</string>
+  <string name="key_trust_maybe">Esta clave no está revocada ni caducada.\nNo la ha certificado, pero puede elegir confiar en ella.</string>
+  <string name="key_trust_revoked">Esta clave ha sido revocada por su propietario. No debe confiar en ella.</string>
+  <string name="key_trust_expired">Esta clave ha caducado. No debe confiar en ella.</string>
+  <string name="key_trust_old_keys">Puede ser correcto usar esta para descifrar un mensaje antiguo que date del momento en que esta clave estaba vigente.</string>
+  <string name="key_trust_no_cloud_evidence">No hay evidencia desde la nube de la fiabilidad de esta clave.</string>
+  <string name="key_trust_start_cloud_search">Comenzar búsqueda</string>
+  <string name="key_trust_results_prefix">Keybase.io ofrece \"pruebas\" que sostienen que el propietario de esta clave:</string>
+  <!--keybase proof stuff-->
+  <string name="keybase_narrative_twitter">Publica en Twitter como</string>
+  <string name="keybase_narrative_github">Es conocido en GitHub como</string>
+  <string name="keybase_narrative_dns">Controla el(los) nombre(s) de dominio</string>
+  <string name="keybase_narrative_web_site">Puede publicar en el(los) sitio(s) web</string>
+  <string name="keybase_narrative_reddit">Publica en Reddit como </string>
+  <string name="keybase_narrative_coinbase">Es conocido en Coinbase como</string>
+  <string name="keybase_narrative_hackernews">Publica en Hacker News como</string>
+  <string name="keybase_narrative_unknown">Tipo de prueba desconocido</string>
+  <string name="keybase_proof_failure">Desafortunadamente esta prueba no puede ser verificada.</string>
+  <string name="keybase_unknown_proof_failure">Problema no reconocido con el verificador de la prueba</string>
+  <string name="keybase_problem_fetching_evidence">Problema con la evidencia de la prueba</string>
+  <string name="keybase_key_mismatch">La huella de validación de clave no coincide con aquella en el post de la prueba</string>
+  <string name="keybase_dns_query_failure">Fallo al obtener registro DNS TXT</string>
+  <string name="keybase_no_prover_found">No se encontró verificador de prueba para</string>
+  <string name="keybase_message_payload_mismatch">El post de la prueba descifrada no coincide con el valor esperado</string>
+  <string name="keybase_message_fetching_data">Descargado evidencia de la prueba</string>
+  <string name="keybase_proof_succeeded">¡Esta prueba ha sido verificada!</string>
+  <string name="keybase_a_post">Un post</string>
+  <string name="keybase_fetched_from">descargada desde</string>
+  <string name="keybase_for_the_domain">para el dominio</string>
+  <string name="keybase_contained_signature">contiene un mensaje que sólo podría haber sido creado por el propietario de esta clave.</string>
+  <string name="keybase_twitter_proof">Un twit</string>
+  <string name="keybase_dns_proof">Un registro DNS TXT</string>
+  <string name="keybase_web_site_proof">Un fichero de texto</string>
+  <string name="keybase_github_proof">Un gist</string>
+  <string name="keybase_reddit_proof">Un fichero JSON</string>
+  <string name="keybase_reddit_attribution">atribuido por Reddit a</string>
+  <string name="keybase_verify">Verificar</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Cambiar frase-contraseña</string>
   <string name="edit_key_action_add_identity">Añadir identificación</string>
@@ -532,8 +579,12 @@
   <string name="create_key_hint_full_name">Nombre completo, ej. Max Mustermann</string>
   <string name="create_key_edit">Cambiar configuración de clave</string>
   <!--View key-->
-  <string name="view_key_revoked">¡Esta clave ha sido revocada!</string>
-  <string name="view_key_expired">¡Esta clave ha expirado!</string>
+  <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 las claves!</string>
+  <string name="view_key_expired_secret">Caducada: ¡Puede extender la vigencia de las claves al editarlas!</string>
+  <string name="view_key_my_key">Mi clave</string>
+  <string name="view_key_verified">Clave verificada</string>
+  <string name="view_key_unverified">No verificada: ¡Escanee el código QR para verificar la clave!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Claves</string>
   <string name="nav_encrypt_decrypt">Cifrar/Descifrar</string>
@@ -570,8 +621,8 @@
   <string name="msg_ip_insert_keys">Analizando claves</string>
   <string name="msg_ip_prepare">Preparando base de datos de operaciones</string>
   <string name="msg_ip_master">Procesando clave maestra %s</string>
-  <string name="msg_ip_master_expired">El juego de claves expiró el %s</string>
-  <string name="msg_ip_master_expires">El juego de claves expira el %s</string>
+  <string name="msg_ip_master_expired">El juego de claves caducó el %s</string>
+  <string name="msg_ip_master_expires">El juego de claves caduca el %s</string>
   <string name="msg_ip_master_flags_unspecified">Indicativos maestros: no especificados (se asumen todos)</string>
   <string name="msg_ip_master_flags_cesa">Indicativos maestros: certificar, cifrar, firmar, autentificar</string>
   <string name="msg_ip_master_flags_cesx">Indicativos maestros: certificar, cifrar, firmar</string>
@@ -592,8 +643,8 @@
   <string name="msg_ip_merge_public">Incorporando datos importados al juego de claves público existente</string>
   <string name="msg_ip_merge_secret">Incorporando datos importados al juego de claves público existente</string>
   <string name="msg_ip_subkey">Procesando subclave %s</string>
-  <string name="msg_ip_subkey_expired">La subclave expiró el %s</string>
-  <string name="msg_ip_subkey_expires">La subclave expira el %s</string>
+  <string name="msg_ip_subkey_expired">La subclave caducó el %s</string>
+  <string name="msg_ip_subkey_expires">La subclave caduca el %s</string>
   <string name="msg_ip_subkey_flags_unspecified">Indicativos de subclave: no especificados (se asumen todos)</string>
   <string name="msg_ip_subkey_flags_cesa">Indicativos de subclave: certificar, cifrar, firmar, autentificar</string>
   <string name="msg_ip_subkey_flags_cesx">Indicativos de subclave: certificar, cifrar, firmar</string>
@@ -686,17 +737,17 @@
   <string name="msg_kc_notation_dup">Eliminando certificado de notación redundante</string>
   <string name="msg_kc_notation_empty">Eliminando certificado de notación vacía</string>
   <string name="msg_kc_sub">Procesando subclave %s</string>
-  <string name="msg_kc_sub_bad">Eliminando certificado no válido de vinculación de subclave</string>
+  <string name="msg_kc_sub_bad">Eliminando certificado no vigente de vinculación de subclave</string>
   <string name="msg_kc_sub_bad_err">Eliminando certificado defectuoso de vinculación de subclave</string>
   <string name="msg_kc_sub_bad_local">Eliminando certificado de vinculación de subclave, con distintivo \"local\"</string>
   <string name="msg_kc_sub_bad_keyid">La identificación del publicante de la vinculación de subclave no coincide</string>
   <string name="msg_kc_sub_bad_time">Eliminando certificado de vinculación de subclave, con marca de tiempo futura</string>
   <string name="msg_kc_sub_bad_type">Tipo de certificado de subclave desconocido: %s</string>
   <string name="msg_kc_sub_dup">Eliminando certificado redundante de vinculación de subclave</string>
-  <string name="msg_kc_sub_primary_bad">Eliminando certificado de vinculación de subclave debido a un certificado de vinculación principal no válido</string>
+  <string name="msg_kc_sub_primary_bad">Eliminando certificado de vinculación de subclave debido a un certificado de vinculación principal no vigente</string>
   <string name="msg_kc_sub_primary_bad_err">Eliminando certificado de vinculación de subclave debido a un certificado de vinculación principal defectuoso</string>
   <string name="msg_kc_sub_primary_none">Eliminando certificado de vinculación de subclave debido a un certificado de vinculación principal ausente</string>
-  <string name="msg_kc_sub_no_cert">No se encontró ningún certificado válido para %s, eliminándola del juego de claves</string>
+  <string name="msg_kc_sub_no_cert">No se encontró ningún certificado vigente para %s, eliminándola del juego de claves</string>
   <string name="msg_kc_sub_revoke_bad_err">Eliminando certificado defectuoso de revocación de subclave</string>
   <string name="msg_kc_sub_revoke_bad">Eliminando certificado defectuoso de revocación de subclave</string>
   <string name="msg_kc_sub_revoke_dup">Eliminando certificado redundante de revocación de subclave</string>
@@ -722,7 +773,7 @@
   <string name="msg_kc_uid_foreign">Eliminando certificado por \'%s\' de identificación de usuario ajeno </string>
   <string name="msg_kc_uid_revoke_dup">Eliminando certificado de revocación redundante para la identificación de usuario \'%s\'</string>
   <string name="msg_kc_uid_revoke_old">Eliminando certificado de revocación caducado para la identificación de usuario \'%s\'</string>
-  <string name="msg_kc_uid_no_cert">No se encontró auto-certificado válido para la identificación de usuario \'%s\', eliminándola del juego de claves</string>
+  <string name="msg_kc_uid_no_cert">No se encontró auto-certificado vigente para la identificación de usuario \'%s\', eliminándola del juego de claves</string>
   <string name="msg_kc_uid_remove">Eliminando identificación de usuario \'%s\' no válida</string>
   <string name="msg_kc_uid_dup">Eliminando identificaciones de usuario duplicadas \'%s\'. El juego de claves contenía dos de ellas. ¡Esto puede resultar en certificados perdidos!</string>
   <string name="msg_kc_uid_warn_encoding">¡La identificación de usuario no se verifica como UTF-8!</string>
@@ -896,6 +947,18 @@
   <string name="msg_dc_trail_sym">Se encontró huella, datos cifrados simétricamente</string>
   <string name="msg_dc_trail_unknown">Se encontró huella, datos de tipo desconocido</string>
   <string name="msg_dc_unlocking">Desbloqueando clave secreta (privada)</string>
+  <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl">Comenzando comprobación de firma</string>
+  <string name="msg_vl_error_no_siglist">No hay lista de firmas en los datos literales firmados</string>
+  <string name="msg_vl_error_wrong_key">Mensaje no firmado con una clave correcta</string>
+  <string name="msg_vl_error_missing_literal">No hay carga útil en los datos literales firmados</string>
+  <string name="msg_vl_clear_meta_file">Nombre de fichero: %s</string>
+  <string name="msg_vl_clear_meta_mime">Tipo MIME: %s</string>
+  <string name="msg_vl_clear_meta_time">Fecha de modificación: %s</string>
+  <string name="msg_vl_clear_meta_size">Tamaño de fichero: %s</string>
+  <string name="msg_vl_clear_signature_check">Verificando datos de firma</string>
+  <string name="msg_vl_error_integrity_check">¡Error de comprobación de integridad!</string>
+  <string name="msg_vl_ok">Correcto</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Iniciando operación de firmado/cifrado</string>
   <string name="msg_se_input_bytes">Procesando entrada de matriz de bytes</string>
@@ -1007,7 +1070,7 @@
   </plurals>
   <string name="msg_acc_saved">Cuenta guardada</string>
   <string name="msg_download_success">¡Descargado con éxito!</string>
-  <string name="msg_download_no_valid_keys">¡No se encontraron clave válidas en el fichero/portapapeles!</string>
+  <string name="msg_download_no_valid_keys">¡No se encontraron claves vigentes en el fichero/portapapeles!</string>
   <string name="msg_download_no_pgp_parts">PENDIENTE: ¡plurales!</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">parte del archivo cargado es un objeto OpenPGP válido pero no una clave OpenPGP</item>
@@ -1037,6 +1100,8 @@
   <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 \"identificaciones\": nombres y correos electrónicos. Para certificación seleccione exactamente aquellas que coinciden con lo que usted 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>
   <string name="label_verify_status">Estado de la verificación</string>
   <string name="label_cert_type">Tipo</string>
diff --git a/OpenKeychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml
index 992d1db91..057eb8e00 100644
--- a/OpenKeychain/src/main/res/values-et/strings.xml
+++ b/OpenKeychain/src/main/res/values-et/strings.xml
@@ -90,6 +90,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -108,6 +110,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-eu/strings.xml b/OpenKeychain/src/main/res/values-eu/strings.xml
new file mode 100644
index 000000000..233347bd3
--- /dev/null
+++ b/OpenKeychain/src/main/res/values-eu/strings.xml
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--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-->
+  <!--section-->
+  <!--button-->
+  <!--menu-->
+  <!--label-->
+  <!--choice-->
+  <!--key flags-->
+  <!--sentences-->
+  <!--errors
+         no punctuation, all lowercase,
+         they will be put after "error_message", e.g. "Error: file not found"-->
+  <!--errors without preceeding Error:-->
+  <!--results shown after decryption/verification-->
+  <!--Add keys-->
+  <!--progress dialogs, usually ending in '…'-->
+  <!--action strings-->
+  <!--key bit length selections-->
+  <!--elliptic curve names-->
+  <!--not in for now, see SaveKeyringParcel
+    <string name="key_curve_bp_p256">"Brainpool P-256"</string>
+    <string name="key_curve_bp_p384">"Brainpool P-384"</string>
+    <string name="key_curve_bp_p512">"Brainpool P-512"</string>-->
+  <!--compression-->
+  <!--Help-->
+  <!--Import-->
+  <!--Generic result toast-->
+  <!--Import result toast-->
+  <!--Delete result toast-->
+  <!--Certify result toast-->
+  <!--Intent labels-->
+  <!--Remote API-->
+  <!--Share-->
+  <!--Key list-->
+  <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
+  <!--Navigation Drawer-->
+  <!--hints-->
+  <!--certs-->
+  <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !-->
+  <!--Import Public log entries-->
+  <!--Import Secret log entries-->
+  <!--Keyring Canonicalization log entries-->
+  <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
+  <!--modifySecretKeyRing-->
+  <!--Consolidate-->
+  <!--Edit Key (higher level than modify)-->
+  <!--Promote key-->
+  <!--Other messages used in OperationLogs-->
+  <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
+  <!--Messages for SignEncrypt operation-->
+  <!--Messages for PgpSignEncrypt operation-->
+  <!--PassphraseCache-->
+  <!--First Time-->
+  <!--unsorted-->
+  <!--Passphrase wizard-->
+  <!--TODO: rename all the things!-->
+  <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+</resources>
diff --git a/OpenKeychain/src/main/res/values-fi/strings.xml b/OpenKeychain/src/main/res/values-fi/strings.xml
index 468d7b835..804383637 100644
--- a/OpenKeychain/src/main/res/values-fi/strings.xml
+++ b/OpenKeychain/src/main/res/values-fi/strings.xml
@@ -214,6 +214,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -232,6 +234,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 6d0733625..50bd53921 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -39,6 +39,9 @@
   <string name="title_keys">Clefs</string>
   <!--section-->
   <string name="section_user_ids">identités</string>
+  <string name="section_should_you_trust">Devriez-vous faire confiance à cette clef ?</string>
+  <string name="section_proof_details">Vérification de preuve</string>
+  <string name="section_cloud_evidence">Preuve 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>
@@ -71,6 +74,8 @@
   <string name="btn_export_to_server">Téléverser vers le serveur de clefs</string>
   <string name="btn_next">Suivant</string>
   <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 le message</string>
   <string name="btn_view_cert_key">Voir la clef de certification</string>
@@ -90,6 +95,7 @@
   <string name="menu_create_key">Créer ma clef</string>
   <string name="menu_import_existing_key">Importer depuis 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>
@@ -98,6 +104,7 @@
   <string name="menu_search_cloud">Rechercher dans le nuage</string>
   <string name="menu_export_all_keys">Exporter toutes les clefs</string>
   <string name="menu_advanced">Afficher les infos avancées</string>
+  <string name="menu_certify_fingerprint">Vérifier par comparaison d\'empreintes</string>
   <!--label-->
   <string name="label_message">Message</string>
   <string name="label_file">Fichier</string>
@@ -249,7 +256,8 @@
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
-  <string name="error_nfc_needed">La NFC n\'est pas proposée sur votre appareil !</string>
+  <string name="error_nfc_needed">La NFC doit être activée !</string>
+  <string name="error_beam_needed">Beam doit être activé !</string>
   <string name="error_nothing_import">Aucune clef trouvée !</string>
   <string name="error_contacts_key_id_missing">Échec lors de la récupération de l\'ID de clef à partir des contacts !</string>
   <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</string>
@@ -432,7 +440,6 @@
   <string name="intent_send_encrypt">Chiffrer avec OpenKeychain</string>
   <string name="intent_send_decrypt">Déchiffrer avec OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">Aucune application enregistrée !\n\nUne liste d\'applications tierces prises en charge peut être trouvée dans l\'« Aide » !</string>
   <string name="api_settings_show_info">Afficher les informations avancées</string>
   <string name="api_settings_hide_info">Masquer les informations avancées</string>
   <string name="api_settings_show_advanced">Afficher les paramètres avancés</string>
@@ -489,6 +496,7 @@
   <string name="key_view_tab_share">Partager</string>
   <string name="key_view_tab_keys">Sous-clefs</string>
   <string name="key_view_tab_certs">Certificats</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
   <string name="user_id_info_revoked_title">Révoquée</string>
   <string name="user_id_info_revoked_text">Cette identité a été révoquée par le propriétaire de la clef. Elle n\'est plus valide.</string>
   <string name="user_id_info_certified_title">Certifié</string>
@@ -497,6 +505,43 @@
   <string name="user_id_info_uncertified_text">Cette identité n\'a pas encore été certifiée. Vous ne pouvez pas être sûr que l\'identité correspond vraiment à une personne spécifique.</string>
   <string name="user_id_info_invalid_title">Invalide</string>
   <string name="user_id_info_invalid_text">Quelque chose ne va pas avec cette identité !</string>
+  <!--Key trust-->
+  <string name="key_trust_already_verified">Vous avez déjà certifié cette clef !</string>
+  <string name="key_trust_it_is_yours">C\'est une de vos clefs !</string>
+  <string name="key_trust_maybe">Cette clef n\'est ni révoquée, ni expirée.\nVous ne l\'avez pas certifiée, mais vous pourriez décider de lui faire confiance.</string>
+  <string name="key_trust_revoked">Cette clef a été révoquée par son propriétaire. Vous ne devriez pas lui faire confiance.</string>
+  <string name="key_trust_expired">Cette clef est expirée. Vous ne devriez pas lui faire confiance.</string>
+  <string name="key_trust_old_keys">Vous pourriez l\'utiliser pour déchiffrer un ancien message datant de la période de validité de la clef.</string>
+  <string name="key_trust_no_cloud_evidence">Aucune preuve de fiabilité provenant du nuage pour cette clef.</string>
+  <string name="key_trust_start_cloud_search">Lancer la recherche</string>
+  <string name="key_trust_results_prefix">Keybase.io offre des « preuves » affirmant que le propriétaire de cette clef : </string>
+  <!--keybase proof stuff-->
+  <string name="keybase_narrative_twitter">Publie vers Twitter en tant que</string>
+  <string name="keybase_narrative_github">Est connu sur GitHub en tant que</string>
+  <string name="keybase_narrative_dns">Contrôle le/les nom(s) de domaine</string>
+  <string name="keybase_narrative_web_site">Peut publier vers le/les site(s) Web</string>
+  <string name="keybase_narrative_reddit">Publie sur Reddit en tant que</string>
+  <string name="keybase_narrative_coinbase">Est connu sur Coinbase en tant que</string>
+  <string name="keybase_narrative_hackernews">Publie sur « Hacker News » en tant que</string>
+  <string name="keybase_narrative_unknown">Type de preuve inconnu</string>
+  <string name="keybase_proof_failure">Malheureusement cette preuve ne peut pas être vérifiée.</string>
+  <string name="keybase_unknown_proof_failure">Problème inconnu avec le vérificateur de preuve</string>
+  <string name="keybase_key_mismatch">L\'empreinte de clef ne correspondant pas à celle du billet de preuve</string>
+  <string name="keybase_dns_query_failure">Échec lors de la récupération de l\'enregistrement DNS TXT</string>
+  <string name="keybase_no_prover_found">Aucun vérificateur de preuve trouvé pour</string>
+  <string name="keybase_message_payload_mismatch">Le billet de preuve déchiffré ne correspond pas à la valeur attendue</string>
+  <string name="keybase_proof_succeeded">Cette preuve a été vérifié !</string>
+  <string name="keybase_a_post">Un billet</string>
+  <string name="keybase_fetched_from">récupéré de</string>
+  <string name="keybase_for_the_domain">pour le domaine</string>
+  <string name="keybase_contained_signature">contient un message qui a seulement pu être créé par le propriétaire de cette clef.</string>
+  <string name="keybase_twitter_proof">Un gazouillis</string>
+  <string name="keybase_dns_proof">Un enregistrement DNS TXT</string>
+  <string name="keybase_web_site_proof">Un fichier texte</string>
+  <string name="keybase_github_proof">Un gist</string>
+  <string name="keybase_reddit_proof">Un fichier JSON</string>
+  <string name="keybase_reddit_attribution">attribué par Reddit à</string>
+  <string name="keybase_verify">Vérifier</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Changer la phrase de passe</string>
   <string name="edit_key_action_add_identity">Ajouter une identité</string>
@@ -532,8 +577,12 @@
   <string name="create_key_hint_full_name">Nom complet, p. ex. Marc-Olivier Lagacé</string>
   <string name="create_key_edit">Changer la configuration de la clef</string>
   <!--View key-->
-  <string name="view_key_revoked">Cette clef a été révoquée !</string>
-  <string name="view_key_expired">Cette clef est expirée !</string>
+  <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>
+  <string name="view_key_expired_secret">Expirée : vous pouvez prolonger la validité de la clef en la modifiant !</string>
+  <string name="view_key_my_key">Ma clef</string>
+  <string name="view_key_verified">Clef vérifiée</string>
+  <string name="view_key_unverified">Non vérifiée : balayez le code QR pour vérifier la clef !</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Clefs</string>
   <string name="nav_encrypt_decrypt">Chiffrer/déchiffrer</string>
@@ -896,6 +945,8 @@
   <string name="msg_dc_trail_sym">Des données traînantes chiffrées symétriquement ont été rencontrées</string>
   <string name="msg_dc_trail_unknown">Des données traînantes de type inconnu ont été rencontrées</string>
   <string name="msg_dc_unlocking">Déverrouillage de la clef secrète</string>
+  <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl">Lancement de la vérification de la signature</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Début de l\'opération de signature/chiffrement</string>
   <string name="msg_se_input_bytes">Traitement de l\'entrée du tableau de bytes</string>
@@ -1037,6 +1088,8 @@
   <string name="certs_text">Seuls les auto-certificats et les certificats validés créés avec vos clefs sont affichés ici.</string>
   <string name="section_uids_to_certify">Identités pour</string>
   <string name="certify_text">Les clefs que vous importez contiennent des « identités » : des noms et des adresses courriel. Choisissez exactement ceux qui correspondent à ce que vous attendiez.</string>
+  <string name="certify_fingerprint_text">Comparez l\'empreinte affichée, caractère par caractère, à celle affichée sur l\'appareil de l\'autre personne.</string>
+  <string name="certify_fingerprint_text2">Est-ce que les empreintes affichées correspondent ?</string>
   <string name="label_revocation">Raison de la révocation</string>
   <string name="label_verify_status">État de vérification</string>
   <string name="label_cert_type">Type</string>
@@ -1058,6 +1111,7 @@
   <string name="error_multi_not_supported">L\'enregistrement des fichiers multiples n\'est pas pris en charge. Ceci est actuellement une limitation d\'Android.</string>
   <string name="key_colon">Clef :</string>
   <string name="exchange_description">Pour démarrer un échange de clef, choisir le nombre de participants du côté droit, puis cliquer sur le bouton « Démarrer l\'échange ».\n\Deux questions de plus seront posées pour s\'assurer que seuls les bons participants sont dans l\'échange et que les empreintes sont correctes.</string>
+  <string name="btn_start_exchange">Démarrer l\'échange</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
diff --git a/OpenKeychain/src/main/res/values-is/strings.xml b/OpenKeychain/src/main/res/values-is/strings.xml
index ef0a0ce94..233347bd3 100644
--- a/OpenKeychain/src/main/res/values-is/strings.xml
+++ b/OpenKeychain/src/main/res/values-is/strings.xml
@@ -36,6 +36,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -54,6 +56,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 4c73ebc72..d741f7111 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -240,7 +240,6 @@ Non potrai annullare!</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string>
-  <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
   <string name="error_nothing_import">Nessuna chiave trovata!</string>
   <string name="error_contacts_key_id_missing">Recupero dell\'ID della chiave dai contatti fallito!</string>
   <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string>
@@ -388,7 +387,6 @@ Non potrai annullare!</string>
   <string name="intent_send_encrypt">Codifica con OpenKeychain</string>
   <string name="intent_send_decrypt">Decodifica con OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">Nessuna applicazione registrata!\n\nUna lista di applicazioni di terze parti supportate è disponibile in \'Aiuto\'!</string>
   <string name="api_settings_show_info">Mostra informazioni dettagliate</string>
   <string name="api_settings_hide_info">Nascondi informazioni dettagliate</string>
   <string name="api_settings_show_advanced">Mostra impostazioni avanzate</string>
@@ -451,6 +449,8 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="user_id_info_uncertified_text">Questa identità non è stata ancora certificata. Non puoi esser sicuro che l\'identità corrisponda veramente ad una specifica persona.</string>
   <string name="user_id_info_invalid_title">Non valido</string>
   <string name="user_id_info_invalid_text">C\'è qualcosa che non va con questa identità!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Cambia Frase Di Accesso</string>
   <string name="edit_key_action_add_identity">Aggiungi Identità</string>
@@ -486,8 +486,6 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="create_key_hint_full_name">Nome completo, es: Mario Rossi</string>
   <string name="create_key_edit">Cambia configurazione della chiave</string>
   <!--View key-->
-  <string name="view_key_revoked">Questa chiave è stata revocata!</string>
-  <string name="view_key_expired">Questa chiave è scaduta</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
   <string name="nav_apps">Apps</string>
@@ -709,6 +707,7 @@ Permetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' appars
   <string name="msg_dc">Inizio operazione di decodifica...</string>
   <string name="msg_dc_sym_skip">Dati simmetrici non permessi, proseguo...</string>
   <string name="msg_dc_unlocking">Sblocco chiave segreta</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_success">Identità certificata correttamente</string>
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 936440893..c5318db36 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -71,6 +71,8 @@
   <string name="btn_export_to_server">鍵サーバへアップロード</string>
   <string name="btn_next">次</string>
   <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_view_cert_key">検証した鍵を見る</string>
@@ -90,6 +92,7 @@
   <string name="menu_create_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>
@@ -98,6 +101,7 @@
   <string name="menu_search_cloud">クラウドを検索</string>
   <string name="menu_export_all_keys">すべての鍵のエクスポート</string>
   <string name="menu_advanced">詳細情報を表示</string>
+  <string name="menu_certify_fingerprint">指紋比較による検証</string>
   <!--label-->
   <string name="label_message">メッセージ</string>
   <string name="label_file">ファイル</string>
@@ -257,7 +261,8 @@
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1  が必要です!</string>
-  <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
+  <string name="error_nfc_needed">NFCを有効にしてください!</string>
+  <string name="error_beam_needed">Beamを有効にしてください!</string>
   <string name="error_nothing_import">鍵が見当りません!</string>
   <string name="error_contacts_key_id_missing">連絡帳から鍵IDの回収が失敗しました!</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
@@ -426,9 +431,6 @@
   <string name="intent_send_encrypt">OpenKeychainで暗号化</string>
   <string name="intent_send_decrypt">OpenKeychainで復号化</string>
   <!--Remote API-->
-  <string name="api_no_apps">未登録のアプリです!
-
-\'ヘルプ\'のサードパーティ製アプリケーションのサポートリストにあるかを見てください!</string>
   <string name="api_settings_show_info">詳細情報を表示</string>
   <string name="api_settings_hide_info">詳細情報を非表示</string>
   <string name="api_settings_show_advanced">拡張設定を表示</string>
@@ -497,6 +499,8 @@
   <string name="user_id_info_uncertified_text">このIDはまだ検証されていません。IDが本当に特定の人に対応している場合を、あなたは確認することができません。</string>
   <string name="user_id_info_invalid_title">無効</string>
   <string name="user_id_info_invalid_text">このIDではなにかしら問題があります!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">パスフレーズの変更</string>
   <string name="edit_key_action_add_identity">ユーザIDの追加</string>
@@ -532,8 +536,12 @@
   <string name="create_key_hint_full_name">フルネーム、例えば Max Mustermann</string>
   <string name="create_key_edit">鍵の設定変更</string>
   <!--View key-->
-  <string name="view_key_revoked">この鍵は破棄されています!</string>
-  <string name="view_key_expired">この鍵は期限切れです!</string>
+  <string name="view_key_revoked">破棄: 鍵はもう使われません!</string>
+  <string name="view_key_expired">期限切れ: この連絡先は鍵の妥当性を拡張する必要があります!</string>
+  <string name="view_key_expired_secret">期限切れ: 編集で鍵の妥当性を拡張することができます!</string>
+  <string name="view_key_my_key">自分の鍵</string>
+  <string name="view_key_verified">検証済みの鍵</string>
+  <string name="view_key_unverified">未検証: QRコードをスキャンして鍵を検証!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">鍵</string>
   <string name="nav_encrypt_decrypt">暗号化/復号化</string>
@@ -889,6 +897,7 @@
   <string name="msg_dc_trail_sym">追跡で遭遇、対称暗号化されたデータ</string>
   <string name="msg_dc_trail_unknown">追跡で未知のタイプのデータに遭遇</string>
   <string name="msg_dc_unlocking">秘密鍵のロック解除</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">署名/暗号化操作を開始します</string>
   <string name="msg_se_input_bytes">バイト配列からの入力処理中</string>
@@ -1023,6 +1032,8 @@
   <string name="certs_text">あなたの検証された自己証明とあなたの鍵で生成された証明がここに表示されます</string>
   <string name="section_uids_to_certify">ユーザID</string>
   <string name="certify_text">インポートした鍵には\"アイデンティティ\": 名前とメールアドレス を含みます。正確に期待したものと一致しているか認定されているものを選択します。</string>
+  <string name="certify_fingerprint_text">表示している指紋を、文字対文字で、あなたのパートナーの表示しているものと比較</string>
+  <string name="certify_fingerprint_text2">表示している指紋は一致しましたか?</string>
   <string name="label_revocation">破棄の理由</string>
   <string name="label_verify_status">検証ステータス</string>
   <string name="label_cert_type">種別</string>
@@ -1045,6 +1056,7 @@
   <string name="error_multi_not_supported">複数ファイルの保存はサポートされていません。これは現在のAndroidでの制限です。</string>
   <string name="key_colon">鍵:</string>
   <string name="exchange_description">鍵交換の開始は、右側の参加者の番号を選択し、その後、\"交換開始\"ボタンを推します。\n\n2つ以上の質問で交換にいる右の参加者とその指紋が正しいかを確認してください。</string>
+  <string name="btn_start_exchange">交換開始</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index 6a7f53e35..34b8f1627 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -39,6 +39,9 @@
   <string name="title_keys">Sleutels</string>
   <!--section-->
   <string name="section_user_ids">Identiteiten</string>
+  <string name="section_should_you_trust">Zou je deze sleutel vertrouwen?</string>
+  <string name="section_proof_details">Bewijs van verificatie</string>
+  <string name="section_cloud_evidence">Bewijs van de cloud</string>
   <string name="section_keys">Subsleutels</string>
   <string name="section_cloud_search">Cloud zoeken</string>
   <string name="section_general">Algemeen</string>
@@ -71,6 +74,8 @@
   <string name="btn_export_to_server">Upload Naar Sleutelserver</string>
   <string name="btn_next">Volgende</string>
   <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">Bericht versleutelen en delen</string>
   <string name="btn_view_cert_key">Toon certificatiesleutel</string>
@@ -90,6 +95,7 @@
   <string name="menu_create_key">Mijn sleutel aanmaken</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>
@@ -98,6 +104,7 @@
   <string name="menu_search_cloud">Zoeken</string>
   <string name="menu_export_all_keys">Alle sleutels exporteren</string>
   <string name="menu_advanced">Geavanceerde info tonen</string>
+  <string name="menu_certify_fingerprint">Verifiëren door vingerafdrukken te vergelijken</string>
   <!--label-->
   <string name="label_message">Bericht</string>
   <string name="label_file">Bestand</string>
@@ -249,7 +256,8 @@
   <string name="error_could_not_extract_private_key">kan privésleutel niet uitpakken</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">U heeft minstens Android 4.1 nodig om Androids NFC Beam eigenschap te gebruiken!</string>
-  <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string>
+  <string name="error_nfc_needed">NFC moet aangezet zijn!</string>
+  <string name="error_beam_needed">Beam moet aangezet zijn!</string>
   <string name="error_nothing_import">Geen sleutels gevonden!</string>
   <string name="error_contacts_key_id_missing">Sleutel-ID van contacten ophalen mislukt!</string>
   <string name="error_generic_report_bug">Een algemene fout is opgetreden, gelieve een nieuw bug-verslag te maken voor OpenKeychain.</string>
@@ -432,7 +440,6 @@
   <string name="intent_send_encrypt">Codeer met OpenKeychain</string>
   <string name="intent_send_decrypt">Decodeer met OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">Geen geregistreerde apps!\n\nEen lijst van ondersteunde derde-partij applicaties kan gevonden worden in \'Help\'!</string>
   <string name="api_settings_show_info">Toon geavanceerde informatie</string>
   <string name="api_settings_hide_info">Verberg geavanceerde informatie</string>
   <string name="api_settings_show_advanced">Toon geavanceerde instellingen</string>
@@ -489,6 +496,7 @@
   <string name="key_view_tab_share">Delen</string>
   <string name="key_view_tab_keys">Subsleutels</string>
   <string name="key_view_tab_certs">Certificaten</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
   <string name="user_id_info_revoked_title">Ingetrokken</string>
   <string name="user_id_info_revoked_text">Deze identiteit is door de sleuteleigenaar ingetrokken. Ze is niet langer geldig.</string>
   <string name="user_id_info_certified_title">Gecertificeerd</string>
@@ -497,6 +505,45 @@
   <string name="user_id_info_uncertified_text">Deze identiteit is nog niet gecertificeerd. Je kan niet zeker zijn dat deze identiteit echt overeenkomt met een bepaald persoon.</string>
   <string name="user_id_info_invalid_title">Ongeldig</string>
   <string name="user_id_info_invalid_text">Er is iets mis met deze identiteit!</string>
+  <!--Key trust-->
+  <string name="key_trust_already_verified">Je hebt deze sleutel al gecertificeerd!</string>
+  <string name="key_trust_it_is_yours">Dit is een van jouw sleutels!</string>
+  <string name="key_trust_maybe">Deze sleutel is ingetrokken noch verlopen.\nJe hebt ze niet gecertificeerd, maar je kan kiezen ze te vertrouwen.</string>
+  <string name="key_trust_revoked">Deze sleutel is door de eigenaar ingetrokken. Je zou ze niet moeten vertrouwen.</string>
+  <string name="key_trust_expired">Deze sleutel is verlopen. Je zou ze niet moeten vertrouwen.</string>
+  <string name="key_trust_old_keys">Het kan oké zijn deze sleutel te gebruiken om een oud bericht te ontsleutelen van een moment waarop de sleutel nog geldig was.</string>
+  <string name="key_trust_no_cloud_evidence">Geen bewijs van de cloud voor de betrouwbaarheid van deze sleutel.</string>
+  <string name="key_trust_start_cloud_search">Zoeken starten</string>
+  <string name="key_trust_results_prefix">Keybase.io geeft “bewijzen” die stellen dat de eigenaar van deze sleutel:</string>
+  <!--keybase proof stuff-->
+  <string name="keybase_narrative_twitter">Post op Twitter als</string>
+  <string name="keybase_narrative_github">Bekend is op GitHub als</string>
+  <string name="keybase_narrative_dns">De volgende domeinnamen beheert</string>
+  <string name="keybase_narrative_web_site">Kan posten op de website(s)</string>
+  <string name="keybase_narrative_reddit">Post op Reddit als</string>
+  <string name="keybase_narrative_coinbase">Bekend is op Coinbase als</string>
+  <string name="keybase_narrative_hackernews">Post op Hacker News als</string>
+  <string name="keybase_narrative_unknown">Onbekend bewijstype</string>
+  <string name="keybase_proof_failure">Helaas kan dit bewijs niet geverifieerd worden.</string>
+  <string name="keybase_unknown_proof_failure">Niet-herkend probleem met de bewijschecker</string>
+  <string name="keybase_problem_fetching_evidence">Probleem met bewijs van bewijs</string>
+  <string name="keybase_key_mismatch">Sleutelvingerafdruk komt niet overeen met die in bewijspost</string>
+  <string name="keybase_dns_query_failure">DNS TXT record ophalen mislukt</string>
+  <string name="keybase_no_prover_found">Geen bewijschecker gevonden voor</string>
+  <string name="keybase_message_payload_mismatch">Ontsleuteld bewijs komt niet overeen met verwachte waarde</string>
+  <string name="keybase_message_fetching_data">Bezig met ophalen van bewijs van bewijs</string>
+  <string name="keybase_proof_succeeded">Dit bewijs is geverifieerd!</string>
+  <string name="keybase_a_post">Een post</string>
+  <string name="keybase_fetched_from">opgehaald van</string>
+  <string name="keybase_for_the_domain">voor het domein</string>
+  <string name="keybase_contained_signature">bevat een bericht dat enkel gemaakt kan zijn door de eigenaar van deze sleutel.</string>
+  <string name="keybase_twitter_proof">Een tweet</string>
+  <string name="keybase_dns_proof">Een DNS TXT record</string>
+  <string name="keybase_web_site_proof">Een tekstbestand</string>
+  <string name="keybase_github_proof">Een gist</string>
+  <string name="keybase_reddit_proof">Een JSON-bestand</string>
+  <string name="keybase_reddit_attribution">toegeschreven door Reddit aan</string>
+  <string name="keybase_verify">Verifiëren</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Wachtwoord wijzigen</string>
   <string name="edit_key_action_add_identity">Identiteit toevoegen</string>
@@ -532,8 +579,12 @@
   <string name="create_key_hint_full_name">Volledige naam, bv. Max Mustermann</string>
   <string name="create_key_edit">Sleutelconfiguratie wijzigen</string>
   <!--View key-->
-  <string name="view_key_revoked">Deze sleutel is ingetrokken!</string>
-  <string name="view_key_expired">Deze sleutel is verlopen!</string>
+  <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 sleutels verlengen!</string>
+  <string name="view_key_expired_secret">Verlopen: je kan de geldigheid van de sleutels verlengen door ze te bewerken!</string>
+  <string name="view_key_my_key">Mijn sleutel</string>
+  <string name="view_key_verified">Geverifieerde sleutels</string>
+  <string name="view_key_unverified">Niet geverifieerd: scan QR-code om de sleutel te verifiëren!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Sleutels</string>
   <string name="nav_encrypt_decrypt">Versleutelen/Ontsleutelen</string>
@@ -896,6 +947,18 @@
   <string name="msg_dc_trail_sym">Achterlopende, symmetrisch versleutelde gegevens tegengekomen</string>
   <string name="msg_dc_trail_unknown">Achterlopende gegevens van onbekend type tegengekomen</string>
   <string name="msg_dc_unlocking">Bezig met ontgrendelen van geheime sleutel</string>
+  <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl">Ondertekeningscontrole wordt gestart</string>
+  <string name="msg_vl_error_no_siglist">Geen ondertekeningslijst in ondertekende letterlijke gegevens</string>
+  <string name="msg_vl_error_wrong_key">Bericht niet ondertekend met de juiste sleutel</string>
+  <string name="msg_vl_error_missing_literal">Geen payload in ondertekende letterlijke gegevens</string>
+  <string name="msg_vl_clear_meta_file">Bestandsnaam: %s</string>
+  <string name="msg_vl_clear_meta_mime">MIME-type: %s</string>
+  <string name="msg_vl_clear_meta_time">Wijzigingstijd: %s</string>
+  <string name="msg_vl_clear_meta_size">Bestandsgrootte: %s</string>
+  <string name="msg_vl_clear_signature_check">Bezig met verifiëren van ondertekeningsgegevens</string>
+  <string name="msg_vl_error_integrity_check">Fout bij integriteitscontrole!</string>
+  <string name="msg_vl_ok">Oké</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Ondertekening/versleuteling wordt gestart</string>
   <string name="msg_se_input_bytes">Bezig met verwerken van input van byte array</string>
@@ -1037,6 +1100,8 @@
   <string name="certs_text">Enkel gevalideerde self-certificaten en gevalideerde certificaten gemaakt met jouw sleutels worden hier weergegeven.</string>
   <string name="section_uids_to_certify">Identiteiten voor</string>
   <string name="certify_text">De sleutels die je importeert bevatten \'identiteiten\': namen en e-mailadressen. Selecteer precies die voor certificatie die overeenkomen met wat je had verwacht.</string>
+  <string name="certify_fingerprint_text">Vergelijk de weergegeven vingerafdruk, karakter per karakter, met die weergegeven op het toestel van je partner.</string>
+  <string name="certify_fingerprint_text2">Komen de weergegeven vingerafdrukken overeen?</string>
   <string name="label_revocation">Intrek Reden</string>
   <string name="label_verify_status">Verificatie Status</string>
   <string name="label_cert_type">Type</string>
@@ -1058,6 +1123,7 @@
   <string name="error_multi_not_supported">Opslaan van meerdere bestanden wordt niet ondersteund. Dit is een beperking van Android.</string>
   <string name="key_colon">Sleutel:</string>
   <string name="exchange_description">Selecteer om een sleuteluitwisseling te starten het aantal deelnemers aan de rechterkant, en klik vervolgens op de knop \'Start uitwisseling\'.\n\nJe zal twee vragne gesteld worden om zeker te zijn dat enkel de juiste deelnemers zich in de uitwisseling bevinden en dat hun vingerafdrukken correct zijn.</string>
+  <string name="btn_start_exchange">Uitwisseling starten</string>
   <string name="user_id_none"><![CDATA[<none>]]></string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index bf15bfff9..3dc6a2a35 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -9,16 +9,18 @@
   <string name="title_encrypt_text">Szyfruj tekst</string>
   <string name="title_encrypt_files">Szyfruj pliki</string>
   <string name="title_decrypt">Odszyfruj</string>
-  <string name="title_unlock">Klucz odblokowania</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>
-  <string name="title_share_fingerprint_with">Podziel się fingerprintem z...</string>
-  <string name="title_share_key">Podziel się kluczem z...</string>
-  <string name="title_share_file">Podziel się plikiem z...</string>
-  <string name="title_share_message">Podziel się wiadomością z...</string>
+  <string name="title_share_fingerprint_with">Podziel się odciskiem klucza przez...</string>
+  <string name="title_share_key">Podziel się kluczem przez...</string>
+  <string name="title_share_file">Podziel się plikiem przez...</string>
+  <string name="title_share_message">Podziel się wiadomością przez...</string>
   <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>
@@ -33,7 +35,8 @@
   <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 Info Klucza</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>
@@ -48,11 +51,13 @@
   <string name="section_certification_key">Twój klucz użyty do certyfikacji</string>
   <string name="section_upload_key">Synchronizuj Klucz</string>
   <string name="section_key_server">Serwer kluczy</string>
-  <string name="section_fingerprint">Fingerprint</string>
+  <string name="section_fingerprint">Odcisk klucza</string>
   <string name="section_key_to_certify">Klucz do certyfikacji</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_decrypt_verify_message">Odszyfruj i weryfikuj wiadomość</string>
@@ -72,8 +77,11 @@
   <string name="btn_create_key">Utwórz klucz</string>
   <string name="btn_add_files">Dodaj plik(i)</string>
   <string name="btn_add_share_decrypted_text">Podziel się odszyfrowanym tekstem</string>
-  <string name="btn_decrypt_and_verify">oraz weryfikuj podpisy</string>
+  <string name="btn_decrypt_clipboard">Odszyfruj ze schowka</string>
+  <string name="btn_decrypt_and_verify">oraz zweryfikuj podpisy</string>
   <string name="btn_decrypt_files">Odszyfruj pliki</string>
+  <string name="btn_encrypt_files">Zaszyfruj pliki</string>
+  <string name="btn_encrypt_text">Zaszyfruj tekst</string>
   <!--menu-->
   <string name="menu_preferences">Ustawienia</string>
   <string name="menu_help">Pomoc</string>
@@ -102,16 +110,16 @@
   <string name="label_ascii_armor">Plik ASCII Armor</string>
   <string name="label_file_ascii_armor">Włącz ASCII Armor</string>
   <string name="label_write_version_header">Niech inni wiedzą, że używasz OpenKeychain</string>
-  <string name="label_write_version_header_summary">Napisze \'\'OpenKeychain v2.7\' do podpisów OpenPGP, ciphertekstu i wyeksportowanych kluczy</string>
-  <string name="label_use_default_yubikey_pin">Użyj domyślnego PINu YubiKey </string>
-  <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN\'u YubiKey</string>
-  <string name="label_label_use_default_yubikey_pin_summary">Używa domyślnego PINu (123456) do dostępu do YubiKeys przez NFC</string>
+  <string name="label_write_version_header_summary">Wpisuje \'\'OpenKeychain v2.7\' do podpisów, szyfrogramów i wyeksportowanych kluczy OpenPGP.</string>
+  <string name="label_use_default_yubikey_pin">Użyj domyślnego PIN-u YubiKey</string>
+  <string name="label_use_num_keypad_for_yubikey_pin">Użyj klawiatury numerycznej dla PIN-u YubiKey</string>
+  <string name="label_label_use_default_yubikey_pin_summary">Używa domyślnego PIN-u (123456) do dostępu do YubiKeys przez NFC</string>
   <string name="label_asymmetric_from">Podpisane przez:</string>
   <string name="label_to">Szyfruj do:</string>
   <string name="label_delete_after_encryption">Usuń plik po zaszyfrowaniu</string>
   <string name="label_delete_after_decryption">Usuń po odszyfrowaniu</string>
   <string name="label_encryption_algorithm">Algorytm szyfrowania</string>
-  <string name="label_hash_algorithm">Algorytm hash</string>
+  <string name="label_hash_algorithm">Funkcja skrótu</string>
   <string name="label_symmetric">Szyfruj z hasłem</string>
   <string name="label_passphrase_cache_ttl">Czas pamięci cache</string>
   <string name="label_passphrase_cache_subs">Pamiętaj hasła względem pod-klucza:</string>
@@ -178,9 +186,9 @@
   <string name="error_message">Błąd: %s</string>
   <!--key flags-->
   <string name="flag_certify">Certyfikuj</string>
-  <string name="flag_sign">Podpisz</string>
-  <string name="flag_encrypt">Zaszyfruj</string>
-  <string name="flag_authenticate">Autentykuj</string>
+  <string name="flag_sign">Podpisuj</string>
+  <string name="flag_encrypt">Szyfruj</string>
+  <string name="flag_authenticate">Uwierzytelniaj</string>
   <!--sentences-->
   <string name="wrong_passphrase">Nieprawidłowe hasło.</string>
   <string name="no_filemanager_installed">Nie zainstalowano żadnego kompatybilnego menadżera plików.</string>
@@ -219,7 +227,7 @@
   <string name="list_empty">Lista jest pusta!</string>
   <string name="nfc_successful">Pomyślnie wysłano klucz przez NFC Beam!</string>
   <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string>
-  <string name="fingerprint_copied_to_clipboard">Fingerprint został skopiowany do schowka!</string>
+  <string name="fingerprint_copied_to_clipboard">Odcisk klucza został skopiowany do schowka!</string>
   <string name="select_key_to_certify">Proszę wybrać klucz który będzie użyty do certyfikacji!</string>
   <string name="key_too_big_for_sharing">Klucz ma za duży rozmiar by być udostępniony w ten sposób!</string>
   <string name="text_copied_to_clipboard">Tekst został skopiowany do schowka!</string>
@@ -242,7 +250,6 @@
   <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 aby korzystać z Android NFC Beam</string>
-  <string name="error_nfc_needed">NCF jest niedostępne na twoim urządzeniu</string>
   <string name="error_nothing_import">Nie znaleziono kluczy!</string>
   <string name="error_contacts_key_id_missing">Pobieranie ID klucza z kontaktów nie powiodło się!</string>
   <string name="error_generic_report_bug">Wystąpił błąd ogólny, proszę zgłoś go autorom OpenKeychain.</string>
@@ -345,14 +352,16 @@
   <string name="help_about_version">Wersja:</string>
   <!--Import-->
   <string name="import_tab_keyserver">Serwery kluczy</string>
-  <string name="import_tab_cloud">Szukaj w Chmurze</string>
+  <string name="import_tab_cloud">Szukaj w chmurze</string>
   <string name="import_tab_direct">Plik/Schowek</string>
   <string name="import_tab_qr_code">Kod QR/NFC</string>
   <string name="import_import">Zaimportuj wybrane klucze</string>
   <string name="import_qr_code_wrong">Kod QR zniekształcony! Spróbuj jeszcze raz!</string>
   <string name="import_qr_code_too_short_fingerprint">Odcisk klucza jest za krótki (&lt; 16 znaków)</string>
   <string name="import_qr_code_button">Skanuj kod QR</string>
+  <string name="import_qr_code_text">Umieść kod QR przed kamerą!</string>
   <!--Generic result toast-->
+  <string name="view_log">Szczegóły</string>
   <string name="with_warnings">, z ostrzeżeniami</string>
   <string name="with_cancelled">, aż anulowano</string>
   <!--Import result toast-->
@@ -433,7 +442,6 @@
   <string name="intent_send_encrypt">Zaszyfruj korzystając z OpenKeychain</string>
   <string name="intent_send_decrypt">Deszyfruj korzystając z OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">Brak zarejestrowanych aplikacji!\n\nLista obsługiwanych aplikacji innych firm jest dostępna w \'Pomoc\'.</string>
   <string name="api_settings_show_info">Pokaż zaawansowane informacje</string>
   <string name="api_settings_hide_info">Ukryj zaawansowane informacje</string>
   <string name="api_settings_show_advanced">Pokaż zaawanowane ustawienia</string>
@@ -449,6 +457,7 @@
   <string name="api_settings_delete_account">Usuń konto</string>
   <string name="api_settings_package_name">Nazwa paczki</string>
   <string name="api_settings_package_signature">Skrót SHA-256 podpisu paczki</string>
+  <string name="api_settings_accounts">Konta (przestarzłe API)</string>
   <string name="api_settings_settings">Ustawienia</string>
   <string name="api_settings_key">Klucz konta:</string>
   <string name="api_settings_accounts_empty">Brak kont połączonych z tą aplikacją.</string>
@@ -498,6 +507,8 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="user_id_info_uncertified_text">Ta tożsamość nie była jeszcze certyfikowana. Nie możesz być pewny, że ta tożsamość naprawdę jest tą osobą za którą się podaje.</string>
   <string name="user_id_info_invalid_title">Nieprawidłowe</string>
   <string name="user_id_info_invalid_text">Coś jest nie tak z tą tożsamością!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Zmień hasło</string>
   <string name="edit_key_action_add_identity">Dodaj tożsamość</string>
@@ -533,10 +544,9 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="create_key_hint_full_name">Imię i nazwisko, na przykład, Jan Kowalski</string>
   <string name="create_key_edit">Zmień klucz konfiguracji</string>
   <!--View key-->
-  <string name="view_key_revoked">Ten klucz został unieważniony!</string>
-  <string name="view_key_expired">Ten klucz stracił swoją ważność!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Klucze</string>
+  <string name="nav_encrypt_decrypt">Zaszyfruj/Odszyfruj</string>
   <string name="nav_apps">Aplikacje</string>
   <string name="drawer_open">Otwórz panel nawigacji</string>
   <string name="drawer_close">Zamknij panel nawigacji</string>
@@ -571,8 +581,11 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
   <!--createSecretKeyRing-->
-  <string name="msg_cr">Generowanie nowego master klucza</string>
+  <string name="msg_cr">Generowanie nowego klucza głównego</string>
+  <string name="msg_cr_error_internal_pgp">Błąd wewnętrzny PGP!</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mf_error_pgp">Błąd wewnętrzny PGP!</string>
+  <string name="msg_mf_passphrase">Zmiana hasła dla pęku kluczy</string>
   <string name="msg_mf_error_past_expiry">Data ważności nie może być przeszła!</string>
   <string name="msg_mf_subkey_revoke">Unieważnianie pod-klucza %s</string>
   <string name="msg_mf_uid_error_empty">ID użytkownika nie może być pusty!</string>
@@ -599,6 +612,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="msg_dc_pass_cached">Użycie hasła z pamięci cache</string>
   <string name="msg_dc_pending_passphrase">Hasło wymagane, wymagana reakcja użytkownika...</string>
   <string name="msg_dc">Rozpoczynanie operacji odszyfrowania...</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_saving">Zapisywanie pęków kluczy</string>
@@ -677,6 +691,7 @@ OSTRZEŻENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezw
   <string name="swipe_to_update">Pociągnij w dół, aby aktualizować z serwera kluczy</string>
   <string name="error_no_file_selected">Wybierz przynajmniej jeden plik, aby szyfrować!</string>
   <string name="key_colon">Klucz:</string>
+  <string name="btn_start_exchange">Rozpocznij wymianę</string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
   <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
diff --git a/OpenKeychain/src/main/res/values-pt/strings.xml b/OpenKeychain/src/main/res/values-pt/strings.xml
index ef0a0ce94..233347bd3 100644
--- a/OpenKeychain/src/main/res/values-pt/strings.xml
+++ b/OpenKeychain/src/main/res/values-pt/strings.xml
@@ -36,6 +36,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -54,6 +56,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-ro/strings.xml b/OpenKeychain/src/main/res/values-ro/strings.xml
index ef0a0ce94..233347bd3 100644
--- a/OpenKeychain/src/main/res/values-ro/strings.xml
+++ b/OpenKeychain/src/main/res/values-ro/strings.xml
@@ -36,6 +36,8 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -54,6 +56,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index ec862020a..dc1c81bb4 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -2,6 +2,7 @@
 <resources>
   <!--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").-->
+  <string name="app_name">OpenKeychain</string>
   <!--title-->
   <string name="title_select_recipients">Выберите ключи</string>
   <string name="title_select_secret_key">Выберите Ваш ключ</string>
@@ -70,6 +71,8 @@
   <string name="btn_export_to_server">Загрузить на сервер ключей</string>
   <string name="btn_next">Далее</string>
   <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_view_cert_key">Просмотр ключа</string>
@@ -89,6 +92,7 @@
   <string name="menu_create_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>
@@ -97,6 +101,7 @@
   <string name="menu_search_cloud">Поиск в облаке</string>
   <string name="menu_export_all_keys">Экспорт всех ключей</string>
   <string name="menu_advanced">Подробные данные</string>
+  <string name="menu_certify_fingerprint">Сверить отпечатки</string>
   <!--label-->
   <string name="label_message">Сообщение</string>
   <string name="label_file">Файл</string>
@@ -249,7 +254,8 @@
   <string name="error_could_not_extract_private_key">не удалось извлечь личный ключ</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Для использования NFC Beam требуется Android 4.1+ !</string>
-  <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string>
+  <string name="error_nfc_needed">Необходимо включить NFC!</string>
+  <string name="error_beam_needed">Необходимо включить Beam!</string>
   <string name="error_nothing_import">Ключи не найдены!</string>
   <string name="error_contacts_key_id_missing">Ошибка извлечения идентификатора ключа из контактов!</string>
   <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string>
@@ -386,7 +392,6 @@
   <string name="intent_send_encrypt">OpenKeychain: Зашифровать</string>
   <string name="intent_send_decrypt">OpenKeychain: Расшифровать</string>
   <!--Remote API-->
-  <string name="api_no_apps">Нет связанных приложений!\n\nСписок приложений, поддерживающих интеграцию, доступен в разделе \'Помощь\'!</string>
   <string name="api_settings_show_info">Показать подробную информацию</string>
   <string name="api_settings_hide_info">Скрыть  подробную информацию</string>
   <string name="api_settings_show_advanced">Показать расширенные настройки</string>
@@ -452,6 +457,8 @@
   <string name="user_id_info_uncertified_text">Этот идентификатор не был заверен. Нет гарантии, что он принадлежит этому человеку.</string>
   <string name="user_id_info_invalid_title">Недействительно</string>
   <string name="user_id_info_invalid_text">Что-то не так с идентификатором!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Изменить пароль</string>
   <string name="edit_key_action_add_identity">Добавить идентификатор</string>
@@ -487,8 +494,12 @@
   <string name="create_key_hint_full_name">Полное имя, напр. Иван Хлестаков</string>
   <string name="create_key_edit">Изменить конфигурацию ключа</string>
   <!--View key-->
-  <string name="view_key_revoked">Этот ключ был аннулирован!</string>
-  <string name="view_key_expired">Срок годности ключа истёк!</string>
+  <string name="view_key_revoked">Аннулирован: Ключ не должен использоваться когда-либо в будущем!</string>
+  <string name="view_key_expired">Срок годности истёк: Контакт должен продлить срок!</string>
+  <string name="view_key_expired_secret">Срок годности истёк: Вы можете продлить срок, изменив ключ!</string>
+  <string name="view_key_my_key">Мой ключ</string>
+  <string name="view_key_verified">Подтвержденный ключ</string>
+  <string name="view_key_unverified">Достоверность: Сканируйте QR код для проверки ключа!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ключи</string>
   <string name="nav_encrypt_decrypt">Зашифровать/Расшифровать</string>
@@ -580,8 +591,8 @@
   <string name="msg_ip_uid_reorder">Переупорядочение пользовательских ID</string>
   <string name="msg_ip_uid_processing">Обработка id %s</string>
   <string name="msg_ip_uid_revoked">id аннулирован</string>
-  <string name="msg_ip_uat_processing_image">Обработка пользовательского атрибута типа изображения</string>
-  <string name="msg_ip_uat_processing_unknown">Обработка пользовательского атрибута неизвестного типа</string>
+  <string name="msg_ip_uat_processing_image">Обработка атрибута пользователя типа изображения</string>
+  <string name="msg_ip_uat_processing_unknown">Обработка атрибута пользователя неизвестного типа</string>
   <string name="msg_ip_uat_cert_bad">Плохой сертификат!</string>
   <string name="msg_ip_uat_cert_error">Ошибка обработки сертификата!</string>
   <string name="msg_ip_uat_cert_nonrevoke">Уже есть неотзываемый сертификат, пропускаем.</string>
@@ -629,14 +640,14 @@
   <string name="msg_kc_notation_dup">Удаление лишнего сертификата обозначения</string>
   <string name="msg_kc_notation_empty">Удаление пустого сертификата обозначения</string>
   <string name="msg_kc_sub">Обработка доп. ключа %s</string>
-  <string name="msg_kc_sub_bad">Удаление недопустимого сертификата связывания доп. ключа</string>
+  <string name="msg_kc_sub_bad">Удаление неверного сертификата связывания доп. ключа</string>
   <string name="msg_kc_sub_bad_err">Удаление плохого сертификата связывания доп. ключа</string>
   <string name="msg_kc_sub_bad_local">Удаление сертификата связывания доп. ключа с \"локальным\" флагом</string>
   <string name="msg_kc_sub_bad_keyid">Несоответствие id издателя связывания доп. ключа</string>
   <string name="msg_kc_sub_bad_time">Удаление сертификата связывания доп. ключа с отметкой времени, находящейся в будущем</string>
   <string name="msg_kc_sub_bad_type">Неизвестный тип сертификата доп. ключа: %s</string>
   <string name="msg_kc_sub_dup">Удаление лишнего сертификата связывания доп. ключа</string>
-  <string name="msg_kc_sub_primary_bad">Удаление сертификата связывания доп. ключа вследствие недопустимого основного сертификата связывания</string>
+  <string name="msg_kc_sub_primary_bad">Удаление сертификата связывания доп. ключа вследствие неверного основного сертификата связывания</string>
   <string name="msg_kc_sub_primary_bad_err">Удаление сертификата связывания доп. ключа вследствие плохого основного сертификата связывания</string>
   <string name="msg_kc_sub_primary_none">Удаление сертификата связывания доп. ключа вследствие отсутствующего основного сертификата связывания</string>
   <string name="msg_kc_sub_no_cert">Нет допустимого сертификата для %s, удаление из связки</string>
@@ -648,20 +659,85 @@
   <string name="msg_kc_sub_algo_bad_sign">Доп. ключ имеет флаг использования подписи, но алгоритм не подходит для подписи.</string>
   <string name="msg_kc_success">Связка нормализована успешно, нет изменений</string>
   <string name="msg_kc_success_bad_and_red">Связка нормализована успешно, удалено %1$s ошибочных и %2$s лишних сертификатов</string>
+  <string name="msg_kc_uid_bad_err">Удаление плохого самостоятельного сертификата для ID \'%s\'</string>
+  <string name="msg_kc_uid_bad_local">Удаление сертификата ID с \'локальным\' флагом</string>
+  <string name="msg_kc_uid_bad_time">Удаление ID с отметкой времени, находящейся в будущем</string>
+  <string name="msg_kc_uid_bad_type">Удаление сертификата ID неизвестного типа (%s)</string>
+  <string name="msg_kc_uid_bad">Удаление плохого самостоятельного сертификата для ID \'%s\'</string>
+  <string name="msg_kc_uid_cert_dup">Удаление устаревшего самостоятельного сертификата для ID \'%s\'</string>
+  <string name="msg_kc_uid_foreign">Удаление \'%s\' несоответствующего сертификата ID</string>
+  <string name="msg_kc_uid_revoke_dup">Удаление лишнего сертификата аннулирования для ID \'%s\'</string>
+  <string name="msg_kc_uid_revoke_old">Удаление устаревшего сертификата аннулирования для ID \'%s\'</string>
+  <string name="msg_kc_uid_no_cert">Нет допустимого самостоятельного сертификата для ID \'%s\', удаление из связки</string>
+  <string name="msg_kc_uid_remove">Удаление неверного ID \'%s\'</string>
+  <string name="msg_kc_uid_dup">Удаление повторяющегося ID \'%s\'. Связка содержит их два. Это может привести к отсутствию сертификатов!</string>
+  <string name="msg_kc_uid_warn_encoding">ID пользователя не соответствует UTF-8!</string>
+  <string name="msg_kc_uat_jpeg">Обработка атрибута пользователя типа JPEG</string>
+  <string name="msg_kc_uat_unknown">Обработка атрибута пользователя неизвестного типа</string>
+  <string name="msg_kc_uat_bad_err">Удаление плохого самостоятельного сертификата для атрибута пользователя</string>
+  <string name="msg_kc_uat_bad_local">Удаление сертификата атрибута пользователя с \'локальным\' флагом</string>
+  <string name="msg_kc_uat_bad_time">Удаление атрибута пользователя с отметкой времени, находящейся в будущем</string>
+  <string name="msg_kc_uat_bad_type">Удаление сертификата атрибута пользователя неизвестного типа (%s)</string>
+  <string name="msg_kc_uat_bad">Удаление плохого самостоятельного сертификата для атрибута пользователя</string>
+  <string name="msg_kc_uat_cert_dup">Удаление устаревшего самостоятельного сертификата для атрибута пользователя</string>
+  <string name="msg_kc_uat_dup">Удаление повторяющегося атрибута пользователя. Связка содержит их два. Это может привести к отсутствию сертификатов!</string>
+  <string name="msg_kc_uat_foreign">Удаление несоответствующего сертификата атрибута пользователя</string>
+  <string name="msg_kc_uat_revoke_dup">Удаление лишнего сертификата аннулирования для атрибута пользователя</string>
+  <string name="msg_kc_uat_revoke_old">Удаление устаревшего сертификата аннулирования для атрибута пользователя</string>
+  <string name="msg_kc_uat_no_cert">Нет допустимого самостоятельного сертификата для атрибута пользователя, удаление из связки</string>
+  <string name="msg_kc_uat_remove">Удаление неверного атрибута пользователя</string>
+  <string name="msg_kc_uat_warn_encoding">ID пользователя не соответствует UTF-8!</string>
   <!--Keyring merging log entries-->
+  <string name="msg_mg_error_secret_dummy">Найден новый публичный доп. ключ, но фиктивное создание секретного доп. ключа не поддерживается!</string>
+  <string name="msg_mg_error_heterogeneous">Попытка объединить связки с различными отпечатками!</string>
+  <string name="msg_mg_error_encode">Фатальная ошибка кодирования подписи!</string>
+  <string name="msg_mg_public">Объединение с публичной связкой %s</string>
+  <string name="msg_mg_secret">Объединение с секретной связкой %s</string>
+  <string name="msg_mg_new_subkey">Добавление нового доп. ключа %s</string>
+  <string name="msg_mg_found_new">Найдено %s новых сертификатов в связке</string>
+  <string name="msg_mg_unchanged">Нет данных для объединения</string>
   <!--createSecretKeyRing-->
   <string name="msg_cr">Создание нового основного ключа</string>
+  <string name="msg_cr_error_no_master">Ну заданы параметры основного ключа!</string>
+  <string name="msg_cr_error_no_user_id">Связки должны создаваться с хотя бы одним ID пользователя!</string>
+  <string name="msg_cr_error_no_certify">Основной ключ должен иметь флаг сертификата!</string>
+  <string name="msg_cr_error_null_expiry">Срок годности не может быть \'такой же как раньше\' при создании ключа. Это программная ошибка, пожалуйста, сообщите об этом!</string>
   <string name="msg_cr_error_keysize_512">Размер ключа должен быть больше или равен 512!</string>
+  <string name="msg_cr_error_no_curve">Не задан размер ключа! Это программная ошибка, пожалуйста, сообщите об этом!</string>
+  <string name="msg_cr_error_no_keysize">Не задана эллиптическая кривая! Это программная ошибка, пожалуйста, сообщите об этом!</string>
   <string name="msg_cr_error_internal_pgp">Внутренняя ошибка OpenPGP!</string>
+  <string name="msg_cr_error_unknown_algo">Выбран неизвестный алгоритм! Это программная ошибка, пожалуйста, сообщите об этом!</string>
+  <string name="msg_cr_error_flags_dsa">Выбраны плохие флаги ключа, DSA не может быть использован для шифрования!</string>
+  <string name="msg_cr_error_flags_elgamal">Выбраны плохие флаги ключа, ElGamal не может быть использован для подписи!</string>
+  <string name="msg_cr_error_flags_ecdsa">Выбраны плохие флаги ключа, ECDSA не может быть использован для шифрования!</string>
+  <string name="msg_cr_error_flags_ecdh">Выбраны плохие флаги ключа, ECDH не может быть использован для подписи!</string>
   <!--modifySecretKeyRing-->
+  <string name="msg_mr">Изменение связки %s</string>
   <string name="msg_mf_error_encode">Ошибка кодирования!</string>
+  <string name="msg_mf_error_fingerprint">Отпечаток ключа не совпадает с представленным!</string>
+  <string name="msg_mf_error_keyid">Нет ID ключа. Это программная ошибка. Пожалуйста, сообщите об этом!</string>
   <string name="msg_mf_error_integrity">Внутренняя ошибка, сбой проверки целостности!</string>
+  <string name="msg_mf_error_master_none">Не найден основной сертификат! (Все отозваны?)</string>
+  <string name="msg_mf_error_revoked_primary">Аннулированные идентификаторы не могут быть основными!</string>
   <string name="msg_mf_error_pgp">Внутренняя ошибка OpenPGP!</string>
   <string name="msg_mf_error_sig">Ошибка подписи!</string>
+  <string name="msg_mf_master">Изменение основного сертификата</string>
+  <string name="msg_mf_passphrase_key">Перешифрование доп. ключа %s новым паролем</string>
+  <string name="msg_mf_primary_new">Создание нового сертификата для основного идентификатора</string>
+  <string name="msg_mf_subkey_change">Изменение доп. ключа %s</string>
+  <string name="msg_mf_error_subkey_missing">Попытка работы с отсутствующим доп. ключом %s!</string>
+  <string name="msg_mf_subkey_new">Добавление нового доп. ключа типа %s</string>
+  <string name="msg_mf_subkey_new_id">Идентификатор нового доп. ключа: %s</string>
+  <string name="msg_mf_error_past_expiry">Срок годности не может быть в прошлом!</string>
+  <string name="msg_mf_subkey_revoke">Аннулирование доп. ключа %s</string>
   <string name="msg_mf_success">Связка успешно изменена</string>
+  <string name="msg_mf_uid_primary">Изменение основного идентификатора на %s</string>
+  <string name="msg_mf_uid_error_empty">Идентификатор пользователя не может быть пустой</string>
   <string name="msg_mf_unlock_error">Ошибка разблокирования связки!</string>
   <string name="msg_mf_unlock">Разблокирование связки</string>
   <!--Consolidate-->
+  <string name="msg_con">Консолидация базы данных</string>
+  <string name="msg_con_error_bad_state">Консолидация началась но база не кэширована! Это программная ошибка, пожалуйста, сообщите об этом.</string>
   <!--Edit Key (higher level than modify)-->
   <!--Promote key-->
   <string name="msg_pr_error_key_not_found">Ключ не найден!</string>
@@ -669,26 +745,40 @@
   <string name="msg_ek_error_divert">Редактирование NFC ключей (еще) не поддерживается!</string>
   <string name="msg_ek_error_not_found">Ключ не найден!</string>
   <!--Messages for DecryptVerify operation-->
+  <string name="msg_dc_ok">OK</string>
   <string name="msg_dc_unlocking">Разблокировка секретного ключа</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
+  <string name="msg_pse_compressing">Подготовка сжатия</string>
+  <string name="msg_pse_encrypting">Шифрование данных</string>
+  <string name="msg_pse_error_bad_passphrase">Неправильный пароль!</string>
+  <string name="msg_pse_error_nfc">Ошибка данных NFC!</string>
   <string name="msg_pse_error_pgp">Внутренняя ошибка OpenPGP!</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_upload_success">Ключ успешно загружен на сервер</string>
   <string name="msg_export_error_fopen">Ошибка открытия файла!</string>
   <string name="msg_export_error_db">Ошибка базы данных!</string>
   <string name="msg_export_error_io">Ошибка ввода/вывода!</string>
   <string name="msg_del_error_empty">Нет данных для удаления!</string>
+  <string name="msg_acc_saved">Аккаунт сохранен</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item>
     <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
     <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item>
   </plurals>
   <!--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_skip">Пропустить настройку</string>
   <!--unsorted-->
   <string name="section_certifier_id">Кем подписан</string>
   <string name="section_cert">Детали сертификации</string>
@@ -706,8 +796,18 @@
   <string name="can_sign_not">не для подписания</string>
   <string name="error_no_encrypt_subkey">Нет доп. ключа для шифрования!</string>
   <string name="contact_show_key">Показать ключ (%s)</string>
+  <string name="key_colon">Ключ:</string>
+  <string name="btn_start_exchange">Начать обмен</string>
   <!--Passphrase wizard-->
   <!--TODO: rename all the things!-->
+  <string name="title_unlock_method">Выберите метод разблокировки</string>
   <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>-->
+  <string name="enter_passphrase">Введите пароль</string>
+  <string name="passphrase">Пароль</string>
+  <string name="passphrase_invalid">Неверный пароль</string>
+  <string name="passphrase_again">Еще раз</string>
+  <string name="nfc_title">NFC</string>
   <!--<string name="nfc_text">Please place a NFC tag near your device</string>-->
+  <string name="unlocked">Разблокирован</string>
+  <string name="nfc_settings">Настройки</string>
 </resources>
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 499ff8468..5d6581bfc 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -219,7 +219,6 @@
   <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">NFC ni na voljo na vaši napravi!</string>
   <string name="error_nothing_import">Najden ni bil noben ključ!</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-->
@@ -381,6 +380,8 @@
   <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_invalid_title">Neveljaven</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Zamenjaj geslo</string>
   <string name="edit_key_action_add_identity">Dodaj identiteto</string>
@@ -396,7 +397,6 @@
   <string name="create_key_passphrases_not_equal">Gesli se ne ujemata</string>
   <string name="create_key_hint_full_name">Polno ime, npr. Janez Vzorec</string>
   <!--View key-->
-  <string name="view_key_expired">Ta ključ je pretekel!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ključi</string>
   <string name="nav_apps">Aplikacije</string>
@@ -459,6 +459,7 @@
   <!--Other messages used in OperationLogs-->
   <string name="msg_ek_error_not_found">Ključ ni bil najden!</string>
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_warn_not_found">Ključ ni bil najden!</string>
diff --git a/OpenKeychain/src/main/res/values-sr/strings.xml b/OpenKeychain/src/main/res/values-sr/strings.xml
index b3a15cb7f..11639e2eb 100644
--- a/OpenKeychain/src/main/res/values-sr/strings.xml
+++ b/OpenKeychain/src/main/res/values-sr/strings.xml
@@ -71,6 +71,8 @@
   <string name="btn_export_to_server">Отпреми на сервер кључева</string>
   <string name="btn_next">Следеће</string>
   <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_view_cert_key">Прикажи кључ за оверавање</string>
@@ -90,6 +92,7 @@
   <string name="menu_create_key">Направи ми кључ</string>
   <string name="menu_import_existing_key">Увези из фајла</string>
   <string name="menu_search">Претрага</string>
+  <string name="menu_nfc_preferences">НФЦ поставке</string>
   <string name="menu_beam_preferences">Поставке Снопа</string>
   <string name="menu_key_edit_cancel">Одустани</string>
   <string name="menu_encrypt_to">Шифруј у…</string>
@@ -98,6 +101,7 @@
   <string name="menu_search_cloud">Клауд претрага</string>
   <string name="menu_export_all_keys">Извези све кључеве</string>
   <string name="menu_advanced">Прикажи напредне податке</string>
+  <string name="menu_certify_fingerprint">Овери поређењем отисака</string>
   <!--label-->
   <string name="label_message">Порука</string>
   <string name="label_file">Фајл</string>
@@ -252,7 +256,8 @@
   <string name="error_could_not_extract_private_key">нисам могао да извучем лични кључ</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Потребан вам је Андроид 4.1 да бисте користили Андроидову могућност НФЦ Снопа!</string>
-  <string name="error_nfc_needed">НФЦ није доступан на вашем уређају!</string>
+  <string name="error_nfc_needed">НФЦ мора бити укључен!</string>
+  <string name="error_beam_needed">Бим мора бити укључен</string>
   <string name="error_nothing_import">Нема нађених кључева!</string>
   <string name="error_contacts_key_id_missing">Добављање ИД кључа из контаката није успело!</string>
   <string name="error_generic_report_bug">Дошло је до опште грешке, направите нови извештај о грешци за Отворени кључарник.</string>
@@ -449,7 +454,6 @@
   <string name="intent_send_encrypt">Шифруј помоћу Отвореног кључарника</string>
   <string name="intent_send_decrypt">Дешифруј помоћу Отвореног кључарника</string>
   <!--Remote API-->
-  <string name="api_no_apps">Нема регистрованих апликација!\n\nСписак подржаних апликација треће стране можете наћи у одељку „Помоћ“!</string>
   <string name="api_settings_show_info">Прикажи напредне податке</string>
   <string name="api_settings_hide_info">Сакриј напредне податке</string>
   <string name="api_settings_show_advanced">Прикажи напредне поставке</string>
@@ -507,6 +511,7 @@
   <string name="key_view_tab_share">Подели</string>
   <string name="key_view_tab_keys">Поткључеви</string>
   <string name="key_view_tab_certs">Сертификати</string>
+  <string name="key_view_tab_keybase">Keybase.io</string>
   <string name="user_id_info_revoked_title">Опозван</string>
   <string name="user_id_info_revoked_text">Власник кључа је опозвао овај идентитет. Више није исправан.</string>
   <string name="user_id_info_certified_title">Оверен</string>
@@ -515,6 +520,13 @@
   <string name="user_id_info_uncertified_text">Овај идентитет још није оверен. Не можете бити сигурни да идентитет заиста одговара одређеној особи.</string>
   <string name="user_id_info_invalid_title">Неисправан</string>
   <string name="user_id_info_invalid_text">Нешто није у реду са овим идентитетом!</string>
+  <!--Key trust-->
+  <string name="key_trust_it_is_yours">Ово је један од ваших кључева!</string>
+  <string name="key_trust_revoked">Власни је опозвао овај кључ. Не бисте требали да се поуздате у њега.</string>
+  <string name="key_trust_expired">Овај кључ је истекао. Не бисте требали да се поуздате у њега.</string>
+  <string name="key_trust_start_cloud_search">Почни претрагу</string>
+  <!--keybase proof stuff-->
+  <string name="keybase_verify">Овери</string>
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Измени лозинку</string>
   <string name="edit_key_action_add_identity">Додај идентитет</string>
@@ -550,8 +562,12 @@
   <string name="create_key_hint_full_name">Пуно име, нпр. Петар Петровић</string>
   <string name="create_key_edit">Промени конфигурацију кључа</string>
   <!--View key-->
-  <string name="view_key_revoked">Овај кључ је опозван!</string>
-  <string name="view_key_expired">Овај кључ је истекао!</string>
+  <string name="view_key_revoked">Опозван: кључ више не смије бити коришћен!</string>
+  <string name="view_key_expired">Истекао: контакт мора да продужи ваљаност кључа!</string>
+  <string name="view_key_expired_secret">Истекао: можете да уредите кључ и продужите му ваљаност!</string>
+  <string name="view_key_my_key">Мој кључ</string>
+  <string name="view_key_verified">Оверен кључ</string>
+  <string name="view_key_unverified">Неоверен: очитајте бар-код да бисте оверили кључ!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Кључеви</string>
   <string name="nav_encrypt_decrypt">Шифруј/дешифруј</string>
@@ -921,6 +937,15 @@
   <string name="msg_dc_trail_sym">Наиђох на пратеће симетрично шифроване податке</string>
   <string name="msg_dc_trail_unknown">Наиђох на пратеће податке непознатог типа</string>
   <string name="msg_dc_unlocking">Откључавам тајни кључ</string>
+  <!--Messages for VerifySignedLiteralData operation-->
+  <string name="msg_vl">Почињем проверу потписа</string>
+  <string name="msg_vl_clear_meta_file">Име фајла: %s</string>
+  <string name="msg_vl_clear_meta_mime">МИМЕ тип: %s</string>
+  <string name="msg_vl_clear_meta_time">Време измене: %s</string>
+  <string name="msg_vl_clear_meta_size">Величина: %s</string>
+  <string name="msg_vl_clear_signature_check">Оверавам податке потписа</string>
+  <string name="msg_vl_error_integrity_check">Грешка провере интегритета!</string>
+  <string name="msg_vl_ok">У реду</string>
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se">Почињем радњу потписивања/шифровања</string>
   <string name="msg_se_input_bytes">Обрађујем улаз низа бајтова</string>
@@ -1069,6 +1094,8 @@
   <string name="certs_text">Приказани су само потврђени сопствени сертификати и потврђени сертификати направљени вашим кључем.</string>
   <string name="section_uids_to_certify">Идентитети за</string>
   <string name="certify_text">Кључеви које увозите садрже „идентитете“: имена и е-адресе. Одредите за оверу само оне који одговарају ономе што очекујете.</string>
+  <string name="certify_fingerprint_text">Упоредите приказани отисак, знак по знак, са оним приказаним на другаревом уређају.</string>
+  <string name="certify_fingerprint_text2">Да ли се приказани отисци поклапају?</string>
   <string name="label_revocation">Разлог опозива</string>
   <string name="label_verify_status">Стање овере</string>
   <string name="label_cert_type">Тип</string>
diff --git a/OpenKeychain/src/main/res/values-sv/strings.xml b/OpenKeychain/src/main/res/values-sv/strings.xml
index 7c855176b..a24fe7ee7 100644
--- a/OpenKeychain/src/main/res/values-sv/strings.xml
+++ b/OpenKeychain/src/main/res/values-sv/strings.xml
@@ -248,7 +248,6 @@
   <string name="error_could_not_extract_private_key">kunde inte extrahera privat nyckel</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Du behöver Android 4.1 för att använda Androids NFC Beam-funktion!</string>
-  <string name="error_nfc_needed">NFC är inte tillgängligt på din enhet!</string>
   <string name="error_nothing_import">Inga nycklar hittades!</string>
   <string name="error_contacts_key_id_missing">Det gick inte att hämta nyckel-ID:t från kontakter!</string>
   <string name="error_generic_report_bug">Ett generiskt fel inträffade, skapa en ny buggrapport för OpenKeychain.</string>
@@ -430,7 +429,6 @@
   <string name="intent_send_encrypt">Kryptera med OpenKeychain</string>
   <string name="intent_send_decrypt">Dekryptera med OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">Inga registrerade appar!\n\nEn lista med tredjepartsappar som stöds kan hittas under \'Hjälp\'! </string>
   <string name="api_settings_show_info">Visa avancerad information</string>
   <string name="api_settings_hide_info">Göm avancerad information</string>
   <string name="api_settings_show_advanced">Visa avancerade inställningar</string>
@@ -495,6 +493,8 @@
   <string name="user_id_info_uncertified_text">Den här identiteten har ännu inte certifierats. Du kan inte vara säker på att identiteten verkligen hänger ihop med en viss person.</string>
   <string name="user_id_info_invalid_title">Ogiltig</string>
   <string name="user_id_info_invalid_text">Något är fel med den här identiteten!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Ändra lösenordsfras</string>
   <string name="edit_key_action_add_identity">Lägg till identitet</string>
@@ -525,8 +525,6 @@
   <string name="create_key_hint_full_name">Fullständigt namn, t.ex. Kalle Svensson</string>
   <string name="create_key_edit">Ändra nyckelkonfiguration</string>
   <!--View key-->
-  <string name="view_key_revoked">Den här nyckeln har återkallats!</string>
-  <string name="view_key_expired">Den här nyckeln har gått ut!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Nycklar</string>
   <string name="nav_encrypt_decrypt">Kryptera/Dekryptera</string>
@@ -775,6 +773,7 @@
   <string name="msg_dc_sym_skip">Symmetrisk data inte tillåten, hoppar över…</string>
   <string name="msg_dc_sym">Hittade block med symmetriskt krypterad data</string>
   <string name="msg_dc_unlocking">Låser upp privat nyckel</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <string name="msg_se_success">Signering/kryptering lyckades!</string>
   <!--Messages for PgpSignEncrypt operation-->
diff --git a/OpenKeychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml
index 194224708..7b6a976f5 100644
--- a/OpenKeychain/src/main/res/values-tr/strings.xml
+++ b/OpenKeychain/src/main/res/values-tr/strings.xml
@@ -237,7 +237,6 @@
   <string name="error_could_not_extract_private_key">özel anahtar çıkarılamadı</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Android\'in NFC Beam özelliğini kullanabilmek için Android 4.1 kullanmalısınız!</string>
-  <string name="error_nfc_needed">Cihazınız NFC desteklemiyor!</string>
   <string name="error_nothing_import">Anahtar bulunamadı!</string>
   <string name="error_contacts_key_id_missing">Kişilerden anahtar ID getirme işlemi başarısız!</string>
   <string name="error_generic_report_bug">Genel bir hata oluştu, lütfen OpenKeychain için yeni bir hata raporu oluşturun.</string>
@@ -426,6 +425,8 @@
   <string name="user_id_info_uncertified_text">Bu kimlik henüz tasdiklenmemiş. Bu kimliğin belirli bir kişiye ait olduğundan emin olamazsınız.</string>
   <string name="user_id_info_invalid_title">Geçersiz</string>
   <string name="user_id_info_invalid_text">Bu kimlikle ilgili yanlış olan bazı şeyler var!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Parolayı Değiştir</string>
   <string name="edit_key_action_add_identity">Kimlik Ekle</string>
@@ -452,8 +453,6 @@
   <string name="create_key_hint_full_name">Tam Ad, örneğin: Max Mustermann</string>
   <string name="create_key_edit">Anahtar yapılandırmasını değiştir.</string>
   <!--View key-->
-  <string name="view_key_revoked">Bu anahtar yürürlükten kaldırıldı!</string>
-  <string name="view_key_expired">Bu anahtarın son kullanma tarihi geçmiş!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Anahtarlar</string>
   <string name="nav_apps">Uygulamalar</string>
@@ -495,6 +494,7 @@
   <string name="msg_dc_error_no_data">Akış içinde şifrelenmiş veri bulunamadı!</string>
   <string name="msg_dc_error_no_key">Akış içinde bilinen özel anahtar ile şifrelenmiş veri bulunamadı!</string>
   <string name="msg_dc_prep_streams">Çözümleme için akışlar hazırlanıyor</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_warn_not_found">Anahtar bulunamadı!</string>
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index a8e4ac3b4..cf586b2d5 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -240,7 +240,6 @@
   <string name="error_could_not_extract_private_key">не можна витягти секретний ключ</string>
   <!--errors without preceeding Error:-->
   <string name="error_jelly_bean_needed">Вам потрібний Android 4.1 для використання функції Androids NFC промінь!</string>
-  <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string>
   <string name="error_nothing_import">Ключ не знайдено!</string>
   <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string>
   <!--results shown after decryption/verification-->
@@ -432,6 +431,8 @@
   <string name="user_id_info_uncertified_title">Несертифіковано</string>
   <string name="user_id_info_invalid_title">Недійсна</string>
   <string name="user_id_info_invalid_text">Щось неправильне у цій сутності!</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">Змінити пароль</string>
   <string name="edit_key_action_add_identity">Додати сутність</string>
@@ -451,8 +452,6 @@
   <string name="create_key_text">Введіть ваше повне ім\'я, електронну адреса та оберіть парольну фразу.</string>
   <string name="create_key_hint_full_name">Повне ім\'я, наприклад Степан Бандера</string>
   <!--View key-->
-  <string name="view_key_revoked">Цей ключ вже відкликано!</string>
-  <string name="view_key_expired">Термін дії цього ключа вже минув!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Ключі</string>
   <string name="nav_apps">Програми</string>
@@ -589,6 +588,7 @@
   <string name="msg_dc_clear_meta_time">Час зміни: %s</string>
   <string name="msg_dc_error_integrity_check">Помилка перевірки цілісності!</string>
   <string name="msg_dc_ok">Гаразд</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <plurals name="error_import_non_pgp_part">
diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
index daa0a171b..b6ab2c8a4 100644
--- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml
@@ -196,7 +196,6 @@
   <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_nothing_import">找不到金鑰！</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_no_signature">尚未簽名</string>
@@ -313,7 +312,6 @@
   <string name="intent_send_encrypt">使用OpenKeychain加密</string>
   <string name="intent_send_decrypt">使用OpenKeychain解密</string>
   <!--Remote API-->
-  <string name="api_no_apps">沒有已註冊的應用程式！\n\n支援的第三方應用程式請參考說明文件。</string>
   <string name="api_settings_show_info">顯示進階資訊</string>
   <string name="api_settings_hide_info">隱藏進階資訊</string>
   <string name="api_settings_show_advanced">顯示進階設定</string>
@@ -356,6 +354,8 @@
   <string name="user_id_info_uncertified_title">未認證</string>
   <string name="user_id_info_uncertified_text">這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。</string>
   <string name="user_id_info_invalid_title">無效</string>
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <string name="edit_key_action_change_passphrase">變更口令</string>
   <string name="edit_key_action_add_identity">新增身分識別</string>
@@ -379,8 +379,6 @@
   <string name="create_key_final_robot_text">建立金鑰可能需要一點時間，來杯咖啡吧…</string>
   <string name="create_key_text">輸入你的全名、電子郵件，並選擇一組口令。</string>
   <!--View key-->
-  <string name="view_key_revoked">這把金鑰已被撤銷！</string>
-  <string name="view_key_expired">這把金鑰已經過期！</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">金鑰</string>
   <string name="nav_apps">應用程式</string>
@@ -408,6 +406,7 @@
   <!--Messages for DecryptVerify operation-->
   <string name="msg_dc_error_invalid_siglist">找不到有效的簽名資訊！</string>
   <string name="msg_dc">開始解密…</string>
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <string name="msg_crt_warn_not_found">找不到金鑰！</string>
diff --git a/OpenKeychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml
index 1c0e0c396..209350332 100644
--- a/OpenKeychain/src/main/res/values-zh/strings.xml
+++ b/OpenKeychain/src/main/res/values-zh/strings.xml
@@ -213,6 +213,8 @@
   <string name="share_nfc_dialog">使用NFC分享</string>
   <!--Key list-->
   <!--Key view-->
+  <!--Key trust-->
+  <!--keybase proof stuff-->
   <!--Edit key-->
   <!--Create key-->
   <!--View key-->
@@ -231,6 +233,7 @@
   <!--Promote key-->
   <!--Other messages used in OperationLogs-->
   <!--Messages for DecryptVerify operation-->
+  <!--Messages for VerifySignedLiteralData operation-->
   <!--Messages for SignEncrypt operation-->
   <!--Messages for PgpSignEncrypt operation-->
   <!--PassphraseCache-->
-- 
cgit v1.2.3


From cec7cb36208e3af3db70eecf128ec75f04ca0418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Feb 2015 00:51:58 +0100
Subject: Fix strings based on transifex reports

---
 OpenKeychain/src/main/res/values/strings.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 bf83150b3..c261a4980 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -47,7 +47,7 @@
     <string name="section_user_ids">"Identities"</string>
     <string name="section_should_you_trust">"Should you trust this key?"</string>
     <string name="section_proof_details">Proof verification</string>
-    <string name="section_cloud_evidence">"Evidence from the cloud"</string>
+    <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_general">"General"</string>
@@ -82,7 +82,7 @@
     <string name="btn_next">"Next"</string>
     <string name="btn_back">"Back"</string>
     <string name="btn_no">"No"</string>
-    <string name="btn_match">"Fingerprints are matching"</string>
+    <string name="btn_match">"Fingerprints match"</string>
     <string name="btn_lookup_key">"Lookup key"</string>
     <string name="btn_share_encrypted_signed">"Encrypt and share message"</string>
     <string name="btn_view_cert_key">"View certification key"</string>
@@ -561,7 +561,7 @@
     <string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
     <string name="key_trust_expired">"This key has expired. You should not trust it."</string>
     <string name="key_trust_old_keys">" It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
-    <string name="key_trust_no_cloud_evidence">"No evidence from the cloud on this key’s trustworthiness."</string>
+    <string name="key_trust_no_cloud_evidence">"No proof from the cloud on this key’s trustworthiness."</string>
     <string name="key_trust_start_cloud_search">"Start search"</string>
     <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>
     <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to verifying them."</string>
@@ -577,12 +577,12 @@
     <string name="keybase_narrative_unknown">"Unknown proof type"</string>
     <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string>
     <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string>
-    <string name="keybase_problem_fetching_evidence">"Problem with proof evidence"</string>
+    <string name="keybase_problem_fetching_evidence">"Problem with proof"</string>
     <string name="keybase_key_mismatch">"Key fingerprint doesn’t match that in proof post"</string>
     <string name="keybase_dns_query_failure">"DNS TXT Record retrieval failed"</string>
     <string name="keybase_no_prover_found">"No proof checker found for"</string>
     <string name="keybase_message_payload_mismatch">"Decrypted proof post does not match expected value"</string>
-    <string name="keybase_message_fetching_data">"Fetching proof evidence"</string>
+    <string name="keybase_message_fetching_data">"Fetching proof"</string>
     <string name="keybase_proof_succeeded">"This proof has been verified!"</string>
     <string name="keybase_a_post">"A post"</string>
     <string name="keybase_fetched_from">"fetched from"</string>
@@ -621,7 +621,7 @@
     <string name="edit_key_error_add_subkey">"Add at least one subkey!"</string>
 
     <!-- Create key -->
-    <string name="create_key_upload">"Upload key to keyserver"</string>
+    <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_final_text">"You entered the following identity:"</string>
@@ -634,7 +634,7 @@
 
     <!-- View key -->
     <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string>
-    <string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string>
+    <string name="view_key_expired">"Expired: The contact needs to extend the key's validity!"</string>
     <string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string>
     <string name="view_key_my_key">"My Key"</string>
     <string name="view_key_verified">"Verified Key"</string>
@@ -791,19 +791,19 @@
     <string name="msg_kc_error_dup_key">"Subkey %s occurs twice in keyring. Keyring is malformed, not importing!"</string>
     <string name="msg_kc_master">"Processing master key"</string>
     <string name="msg_kc_master_bad_type">"Removing master key certificate of unknown type (%s)"</string>
-    <string name="msg_kc_master_bad_local">"Removing master key certificate with "local" flag"</string>
+    <string name="msg_kc_master_bad_local">"Removing master key certificate with 'local' flag"</string>
     <string name="msg_kc_master_bad_err">"Removing bad master key certificate"</string>
     <string name="msg_kc_master_bad_time">"Removing keyring revocation certificate with future timestamp"</string>
     <string name="msg_kc_master_bad_type_uid">"Removing user ID certificate in bad position"</string>
     <string name="msg_kc_master_bad">"Removing bad master key certificate"</string>
-    <string name="msg_kc_master_local">"Removing master key certificate with "local" flag"</string>
+    <string name="msg_kc_master_local">"Removing master key certificate with 'local' flag"</string>
     <string name="msg_kc_revoke_dup">"Removing redundant keyring revocation certificate"</string>
     <string name="msg_kc_notation_dup">"Removing redundant notation certificate"</string>
     <string name="msg_kc_notation_empty">"Removing empty notation certificate"</string>
     <string name="msg_kc_sub">"Processing subkey %s"</string>
     <string name="msg_kc_sub_bad">"Removing invalid subkey binding certificate"</string>
     <string name="msg_kc_sub_bad_err">"Removing bad subkey binding certificate"</string>
-    <string name="msg_kc_sub_bad_local">"Removing subkey binding certificate with "local" flag"</string>
+    <string name="msg_kc_sub_bad_local">"Removing subkey binding certificate with 'local' flag"</string>
     <string name="msg_kc_sub_bad_keyid">"Subkey binding issuer id mismatch"</string>
     <string name="msg_kc_sub_bad_time">"Removing subkey binding certificate with future timestamp"</string>
     <string name="msg_kc_sub_bad_type">"Unknown subkey certificate type: %s"</string>
@@ -1036,10 +1036,10 @@
     <!-- Messages for SignEncrypt operation -->
     <string name="msg_se">"Starting sign/encrypt operation"</string>
     <string name="msg_se_input_bytes">"Processing input from byte array"</string>
-    <string name="msg_se_input_uri">"Processing input from uri"</string>
+    <string name="msg_se_input_uri">"Processing input from URI"</string>
     <string name="msg_se_error_no_input">"No input given!"</string>
-    <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_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>
-- 
cgit v1.2.3


From c8f5dc5cf3c93a744ca0af4d7a1bf6afa6b46495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 28 Feb 2015 00:56:04 +0100
Subject: Strings: File size

---
 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 c261a4980..2d599e984 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -988,8 +988,8 @@
     <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string>
     <string name="msg_dc_clear_meta_file">"Filename: %s"</string>
     <string name="msg_dc_clear_meta_mime">"MIME type: %s"</string>
-    <string name="msg_dc_clear_meta_size">"Filesize: %s"</string>
-    <string name="msg_dc_clear_meta_size_unknown">"Filesize is unknown"</string>
+    <string name="msg_dc_clear_meta_size">"File size: %s"</string>
+    <string name="msg_dc_clear_meta_size_unknown">"File size is unknown"</string>
     <string name="msg_dc_clear_meta_time">"Modification time: %s"</string>
     <string name="msg_dc_clear_signature_bad">"Signature check NOT OK!"</string>
     <string name="msg_dc_clear_signature_check">"Verifying signature data"</string>
-- 
cgit v1.2.3