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/values/strings.xml')

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 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/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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 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/values/strings.xml')

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 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

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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 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

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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>
-- 
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/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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

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

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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