From 6362b2de94c43eca9562af832fa0cfa77d93fbe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ha=C3=9F?= <mail@danielhass.de>
Date: Mon, 3 Mar 2014 09:36:40 +0100
Subject: Added FileHasNoContent string

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 91359701f..e8dc05f3b 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -289,6 +289,7 @@
     <string name="error_keyserver_insufficient_query">Insufficient server query</string>
     <string name="error_keyserver_query">Querying keyserver failed</string>
     <string name="error_keyserver_too_many_responses">Too many responses</string>
+    <string name="error_import_file_no_content">File has no content</string>
     <plurals name="error_can_not_delete_info">
         <item quantity="one">Please delete it from the \'My Keys\' screen!</item>
         <item quantity="other">Please delete them from the \'My Keys\' screen!</item>
-- 
cgit v1.2.3


From d691d4c96548852c1797eff6426b378610b039d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ha=C3=9F?= <mail@danielhass.de>
Date: Mon, 3 Mar 2014 20:42:38 +0100
Subject: Added handling for other exceptions in the ImportListLoader.

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index e8dc05f3b..14ed7c7da 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -290,10 +290,15 @@
     <string name="error_keyserver_query">Querying keyserver failed</string>
     <string name="error_keyserver_too_many_responses">Too many responses</string>
     <string name="error_import_file_no_content">File has no content</string>
+    <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
     <plurals name="error_can_not_delete_info">
         <item quantity="one">Please delete it from the \'My Keys\' screen!</item>
         <item quantity="other">Please delete them from the \'My Keys\' screen!</item>
     </plurals>
+    <plurals name="error_import_non_pgp_part">
+        <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item>
+        <item quantity="other">parts of the loaded file are valid OpenPGP objects but not OpenPGP keys</item>
+    </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">done.</string>
-- 
cgit v1.2.3


From 2e2a9bc967399b6adc353b1b34d3c7ed981e68f4 Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Fri, 7 Mar 2014 21:16:58 +0530
Subject: Add option for  sharing encrypted file.

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index fef83c936..d5123b79c 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
     <string name="title_change_passphrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
     <string name="title_send_email">"Send Mail…"</string>
+    <string name="title_send_file">"Send File…"</string>
     <string name="title_encrypt_to_file">Encrypt To File</string>
     <string name="title_decrypt_to_file">Decrypt To File</string>
     <string name="title_import_keys">Import Keys</string>
@@ -110,6 +111,7 @@
     <string name="label_select_public_keys">Recipients</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
     <string name="label_delete_after_decryption">Delete After Decryption</string>
+    <string name="label_share_after_encryption">Share After Encryption</string>
     <string name="label_encryption_algorithm">Encryption Algorithm</string>
     <string name="label_hash_algorithm">Hash Algorithm</string>
     <string name="label_asymmetric">Public Key</string>
-- 
cgit v1.2.3


From c1c462db4f0d44a5584bf9ef9a23dffd7d1c5ef0 Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Fri, 7 Mar 2014 22:12:58 +0200
Subject: move hardcode strings to strings.xml

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index d5123b79c..99fc7c8a7 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -130,6 +130,8 @@
     <string name="label_name">Name</string>
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
+    <string name="label_sign_user_id">Sign User Id</string>
+    <string name="label_sign_email">Sign email</string>
     <string name="label_send_key">Upload key to selected keyserver after certification</string>
     <string name="label_fingerprint">Fingerprint</string>
     <string name="select_keys_button_default">Select</string>
@@ -148,6 +150,7 @@
     <string name="can_sign">can sign</string>
     <string name="expired">expired</string>
     <string name="revoked">revoked</string>
+    <string name="user_id">User ID</string>
 
     <plurals name="n_key_servers">
         <item quantity="one">%d keyserver</item>
-- 
cgit v1.2.3


From 7ad8977cf3f4117782d6568322ec76c5cd8e2475 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 8 Mar 2014 12:28:20 +0100
Subject: move some placeholders into resources

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 3ca5f5426..7f0ad52ac 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -431,5 +431,7 @@
     <string name="nav_apps">Registered Apps</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
+    <string name="edit">Edit</string>
+    <string name="my_keys">My Keys</string>
 
 </resources>
-- 
cgit v1.2.3


From 706e212b6b1f5fbd30643d33336f3967d88e8b5b Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 8 Mar 2014 13:17:52 +0100
Subject: add edit button and secret key info to public key view

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 7f0ad52ac..4a5b142ab 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -417,6 +417,7 @@
     <string name="key_list_empty_button_import">importing keys.</string>
 
     <!-- Key view -->
+    <string name="key_view_action_edit">Edit this key</string>
     <string name="key_view_action_encrypt">Encrypt to this contact</string>
     <string name="key_view_action_certify">Certify this contact\'s key</string>
     <string name="key_view_tab_main">Info</string>
@@ -433,5 +434,8 @@
     <string name="drawer_close">Close navigation drawer</string>
     <string name="edit">Edit</string>
     <string name="my_keys">My Keys</string>
+    <string name="label_secret_key">Secret Key</string>
+    <string name="secret_key_yes">available</string>
+    <string name="secret_key_no">unavailable</string>
 
 </resources>
-- 
cgit v1.2.3


From be558944b52ac038c40bdf84a3d52c9ae2e7a218 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 8 Mar 2014 14:41:25 +0100
Subject: add contact count to My Keys header

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 4a5b142ab..e13b9e0c6 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -145,6 +145,11 @@
     <string name="expired">expired</string>
     <string name="revoked">revoked</string>
 
+    <plurals name="n_contacts">
+        <item quantity="one">1 contact</item>
+        <item quantity="other">%d contacts</item>
+    </plurals>
+
     <plurals name="n_key_servers">
         <item quantity="one">%d keyserver</item>
         <item quantity="other">%d keyservers</item>
-- 
cgit v1.2.3


From e471560e25c99aeffb53295b3615876e38522639 Mon Sep 17 00:00:00 2001
From: grait <grandhiajit9@gmail.com>
Date: Sun, 9 Mar 2014 14:59:56 +0530
Subject: progress bar during key creation - minor text change

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd016c41e..2e0aed998 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -313,7 +313,7 @@
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-    <string name="progress_generating">generating key, this can take up to 3 minutes…</string>
+    <string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_preparing_master_key">preparing master key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
-- 
cgit v1.2.3


From 4874ea567a81f5b2e67895296782f36d294a8d77 Mon Sep 17 00:00:00 2001
From: grait <grandhiajit9@gmail.com>
Date: Sun, 9 Mar 2014 17:45:58 +0530
Subject: progress bar while key creation - added plurals based on no.of keys
 while key creation

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 2e0aed998..57e42e84f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -313,7 +313,7 @@
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-    <string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
+    <string name="progress_generating">generating key, this can take up to 3 minutes…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_preparing_master_key">preparing master key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
@@ -326,6 +326,11 @@
         <item quantity="other">exporting keys…</item>
     </plurals>
 
+    <plurals name="progress_generating">
+        <item quantity="one">generating key, this can take up to 3 minutes…</item>
+        <item quantity="other">generating keys, this can take up to 3 minutes…</item>
+    </plurals>
+
     <string name="progress_extracting_signature_key">extracting signature key…</string>
     <string name="progress_extracting_key">extracting key…</string>
     <string name="progress_preparing_streams">preparing streams…</string>
-- 
cgit v1.2.3


From b107766f5b311d9a0d80fd23306a11f41c438c66 Mon Sep 17 00:00:00 2001
From: rafaelav <rafaela.voiculescu@gmail.com>
Date: Sat, 8 Mar 2014 12:28:28 +0100
Subject: Issue #178 - Hide advanced options in EncryptActivity

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd016c41e..c7ab2819b 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -67,6 +67,8 @@
     <string name="btn_clipboard">Clipboard</string>
     <string name="btn_share">Share with…</string>
     <string name="btn_lookup_key">Lookup key</string>
+    <string name="btn_encryption_advanced_settings_show">Show advanced settings</string>
+    <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string>
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>
-- 
cgit v1.2.3


From 6a8fa619082ab6022f9d58c9b2dd95f88672bc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 10 Mar 2014 16:58:58 +0100
Subject: remove double definition of progress_generating

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 505e41b78..3267115a2 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -315,7 +315,6 @@
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-    <string name="progress_generating">generating key, this can take up to 3 minutes…</string>
     <string name="progress_building_key">building key…</string>
     <string name="progress_preparing_master_key">preparing master key…</string>
     <string name="progress_certifying_master_key">certifying master key…</string>
-- 
cgit v1.2.3


From e00436b4096466af37b3e32c3f3277c3604d85ee Mon Sep 17 00:00:00 2001
From: Bhargav Golla <bhargav.golla@gmail.com>
Date: Fri, 7 Mar 2014 18:21:16 -0500
Subject: Lint changes

Deleting lint-report gen files

Adding lint output files to gitignore
---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 99fc7c8a7..ec4a45b3e 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -302,8 +302,8 @@
     </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
-    <string name="progress_done">done.</string>
-    <string name="progress_cancel">cancel</string>
+    <string name="progress_done">Done.</string>
+    <string name="progress_cancel">Cancel</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-- 
cgit v1.2.3


From a41ee31b6c5cfbef067efb0843593a2459861b9c Mon Sep 17 00:00:00 2001
From: Sreeram Boyapati <sreeram.boyapati2011@gmail.com>
Date: Mon, 10 Mar 2014 22:37:23 +0530
Subject:         Added string reference for Issue #207

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 99fc7c8a7..754d4cece 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -145,6 +145,7 @@
     <string name="user_id_no_name">&lt;no name&gt;</string>
     <string name="none">&lt;none&gt;</string>
     <string name="no_key">&lt;no key&gt;</string>
+    <string name="no_email">&lt;No Email&gt;</string>
     <string name="unknown_status"></string>
     <string name="can_encrypt">can encrypt</string>
     <string name="can_sign">can sign</string>
@@ -271,6 +272,7 @@
     <string name="error_master_key_must_not_be_el_gamal">the master key cannot be an ElGamal key</string>
     <string name="error_unknown_algorithm_choice">unknown algorithm choice</string>
     <string name="error_user_id_needs_a_name">you need to specify a name</string>
+    <string name="error_user_id_no_email">no email found</string>
     <string name="error_user_id_needs_an_email_address">you need to specify an email address</string>
     <string name="error_key_needs_a_user_id">need at least one user id</string>
     <string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string>
-- 
cgit v1.2.3


From d91e2673d7b291e1798e1acee506749eae3cdd01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 10 Mar 2014 18:23:47 +0100
Subject: Revert "Lint changes"

This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.
---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 7f53fd0e4..3267115a2 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -310,8 +310,8 @@
     </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
-    <string name="progress_done">Done.</string>
-    <string name="progress_cancel">Cancel</string>
+    <string name="progress_done">done.</string>
+    <string name="progress_cancel">cancel</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
-- 
cgit v1.2.3


From b90e680ff91ae12e9ae31682b1ab118d6c49ab7e Mon Sep 17 00:00:00 2001
From: Bhargav Golla <bhargav.golla@gmail.com>
Date: Mon, 10 Mar 2014 14:59:15 -0400
Subject: Lint changes after testing

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 3267115a2..5e2478bf5 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -310,8 +310,8 @@
     </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
-    <string name="progress_done">done.</string>
-    <string name="progress_cancel">cancel</string>
+    <string name="progress_done">Done.</string>
+    <string name="progress_cancel">Cancel</string>
     <string name="progress_saving">saving…</string>
     <string name="progress_importing">importing…</string>
     <string name="progress_exporting">exporting…</string>
@@ -326,7 +326,7 @@
         <item quantity="one">exporting key…</item>
         <item quantity="other">exporting keys…</item>
     </plurals>
-
+    <string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
     <plurals name="progress_generating">
         <item quantity="one">generating key, this can take up to 3 minutes…</item>
         <item quantity="other">generating keys, this can take up to 3 minutes…</item>
-- 
cgit v1.2.3


From b4022b9a24dca7914d1a008700373b773343dd47 Mon Sep 17 00:00:00 2001
From: Bhargav Golla <bhargav.golla@gmail.com>
Date: Mon, 10 Mar 2014 23:19:10 -0400
Subject: Removing unused string

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 82dd05f1a..cd248c749 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -328,7 +328,7 @@
         <item quantity="one">exporting key…</item>
         <item quantity="other">exporting keys…</item>
     </plurals>
-    <string name="progress_generating">generating keys, this can take up to 3 minutes…</string>
+    
     <plurals name="progress_generating">
         <item quantity="one">generating key, this can take up to 3 minutes…</item>
         <item quantity="other">generating keys, this can take up to 3 minutes…</item>
-- 
cgit v1.2.3


From 15d94c51bb362898464baae0d99279b754ac9450 Mon Sep 17 00:00:00 2001
From: Bhargav Golla <bhargav.golla@gmail.com>
Date: Mon, 10 Mar 2014 23:20:30 -0400
Subject: Removing tab

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd248c749..07f402802 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -328,7 +328,7 @@
         <item quantity="one">exporting key…</item>
         <item quantity="other">exporting keys…</item>
     </plurals>
-    
+
     <plurals name="progress_generating">
         <item quantity="one">generating key, this can take up to 3 minutes…</item>
         <item quantity="other">generating keys, this can take up to 3 minutes…</item>
-- 
cgit v1.2.3


From 4c5ae3cdaa525ca925b5e7229a7c02b89b8cefd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 13 Mar 2014 19:01:24 +0100
Subject: Readd create key menu items

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 1c7ead403..4b427917f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -78,6 +78,7 @@
     <string name="menu_import">Import</string>
     <string name="menu_import_from_nfc">Import from NFC</string>
     <string name="menu_export_keys">Export all keys</string>
+    <string name="menu_export_secret_keys">Export all secret keys</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
     <string name="menu_create_key">Create key</string>
-- 
cgit v1.2.3


From 908cf8e7695b282760d7a790ae782346424e7ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 13 Mar 2014 19:08:03 +0100
Subject: Add FAQ tab to help

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 4b427917f..77891d6c7 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -374,6 +374,7 @@
 
     <!-- Help -->
     <string name="help_tab_start">Start</string>
+    <string name="help_tab_faq">FAQ</string>
     <string name="help_tab_nfc_beam">NFC Beam</string>
     <string name="help_tab_changelog">Changelog</string>
     <string name="help_tab_about">About</string>
-- 
cgit v1.2.3


From e387dd7c54ddfdbe8379b57e00fed567510fd863 Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Sat, 15 Mar 2014 01:51:01 +0200
Subject: Fix export for new unified key list #409

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 77891d6c7..947801217 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -219,6 +219,7 @@
     <string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string>
     <string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string>
     <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string>
+    <string name="also_export_secret_keys">Also export secret keys?</string>
 
     <plurals name="keys_added_and_updated_1">
         <item quantity="one">Successfully added %d key</item>
-- 
cgit v1.2.3


From 1de0312bb53935f8b48e4e7437169e72a154edbf Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 15 Mar 2014 13:24:49 +0100
Subject: certify: revamp certifykeyactivity

show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 77891d6c7..0520a414b 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -465,5 +465,6 @@
     <string name="label_secret_key">Secret Key</string>
     <string name="secret_key_yes">available</string>
     <string name="secret_key_no">unavailable</string>
+    <string name="section_uids_to_sign">User IDs to sign</string>
 
 </resources>
-- 
cgit v1.2.3


From 87004fd0ca3a5178fba3050599a445ba9c64662c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sat, 15 Mar 2014 18:15:39 +0100
Subject: certify: preserve user id certificates when saving secret keys

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 0520a414b..265bcc6db 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -466,5 +466,6 @@
     <string name="secret_key_yes">available</string>
     <string name="secret_key_no">unavailable</string>
     <string name="section_uids_to_sign">User IDs to sign</string>
+    <string name="progress_re_adding_certs">Reapplying certificates</string>
 
 </resources>
-- 
cgit v1.2.3


From b39d37f59c5d1633f22a45a37c7dc94d6c37d010 Mon Sep 17 00:00:00 2001
From: Daniel Hammann <github@honnel.de>
Date: Mon, 17 Mar 2014 22:17:05 +0100
Subject: #429 4) In the clicking for a particular contact , two icon in the
 actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver'
 or just only 'server'

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 77891d6c7..d6550d63d 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -84,10 +84,11 @@
     <string name="menu_create_key">Create key</string>
     <string name="menu_create_key_expert">Create key (expert)</string>
     <string name="menu_search">Search</string>
-    <string name="menu_key_server">Import from keyserver</string>
+    <string name="menu_import_from_key_server">Keyserver</string>
+    <string name="menu_key_server">Keyserver…</string>
     <string name="menu_update_key">Update from keyserver</string>
     <string name="menu_export_key_to_server">Upload to key server</string>
-    <string name="menu_share">Share</string>
+    <string name="menu_share">Share…</string>
     <string name="menu_share_title_fingerprint">Share fingerprint…</string>
     <string name="menu_share_title">Share whole key…</string>
     <string name="menu_share_default_fingerprint">with…</string>
-- 
cgit v1.2.3


From 19e962481d171efa587e928ce2339ee42de251c7 Mon Sep 17 00:00:00 2001
From: gogowitczak <gogowitczak@gmail.com>
Date: Tue, 18 Mar 2014 23:30:42 +0100
Subject: Note about blocked possibility to generate weak (<1024) RSA key.

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd374ca01..9b4ab0747 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -244,6 +244,7 @@
     <string name="keys_exported">Successfully exported %d keys.</string>
     <string name="no_keys_exported">No keys exported.</string>
     <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
+    <string name="key_creation_weak_rsa_info">Note: generating RSA key with length 1024-bit and less is considered unsafe and it\'s disabled for generating new keys.</string>
     <string name="key_not_found">Couldn\'t find key %08X.</string>
 
     <plurals name="keys_found">
-- 
cgit v1.2.3


From 2816461283c0067f524d94ddf9702e119025c9d3 Mon Sep 17 00:00:00 2001
From: Nikhil Peter Raj <nikhilpeter93@gmail.com>
Date: Fri, 21 Mar 2014 01:50:20 +0530
Subject: Fix for #410

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 9b4ab0747..6713153bf 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -220,6 +220,8 @@
     <string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string>
     <string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string>
     <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string>
+    <string name="public_key_deletetion_confirmation">Do you really want to delete the PUBLIC key \'%s\'?\nYou can\'t undo this!</string>
+    <string name="secret_key_delete_text">Delete Secret Keys ?</string>
     <string name="also_export_secret_keys">Also export secret keys?</string>
 
     <plurals name="keys_added_and_updated_1">
-- 
cgit v1.2.3


From e00eeab1bfcda87e82c5ca51468cb4a5d12ae397 Mon Sep 17 00:00:00 2001
From: Daniel Hammann <github@honnel.de>
Date: Thu, 20 Mar 2014 22:41:12 +0100
Subject: UI-Icon-Modifying #429 added hint to text edit, different icons for
 share and clipboard button

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 9b4ab0747..3383174cb 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -471,4 +471,7 @@
     <string name="section_uids_to_sign">User IDs to sign</string>
     <string name="progress_re_adding_certs">Reapplying certificates</string>
 
+    <!-- hints -->
+    <string name="encrypt_content_edit_text_hint">Write message here to encrypt…</string>
+
 </resources>
-- 
cgit v1.2.3


From cff35ca84283202d1a0b824b6eb9eaf4231c061a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 25 Mar 2014 21:23:59 +0100
Subject: More experimental work on api accounts

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 11e3028f3..5bf7ca8ca 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -412,6 +412,8 @@
 
     <!-- Remote API -->
     <string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here.</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>
     <string name="api_settings_hide_advanced">Hide advanced settings</string>
     <string name="api_settings_no_key">No key selected</string>
@@ -421,6 +423,8 @@
     <string name="api_settings_revoke">Revoke access</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_empty">No accounts attached to this application.</string>
     <string name="api_register_text">The displayed application requests access to OpenKeychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
-- 
cgit v1.2.3


From 92a4d0e914d7cd132b7e755caf914710969e512d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 13:21:29 +0100
Subject: Part 2 of basic user interface for api accounts

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 5bf7ca8ca..0d9cdc1bb 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -418,9 +418,11 @@
     <string name="api_settings_hide_advanced">Hide advanced settings</string>
     <string name="api_settings_no_key">No key selected</string>
     <string name="api_settings_select_key">Select key</string>
+    <string name="api_settings_create_key">Create new key for this account</string>
     <string name="api_settings_save">Save</string>
     <string name="api_settings_cancel">Cancel</string>
     <string name="api_settings_revoke">Revoke access</string>
+    <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>
-- 
cgit v1.2.3


From ac134790a0e2fef7a6c5cb44818d58deeaec0b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 26 Mar 2014 18:23:48 +0100
Subject: Text for creation of new api accounts

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

(limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')

diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 0d9cdc1bb..f0ae25937 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -427,6 +427,7 @@
     <string name="api_settings_package_signature">SHA-256 of Package Signature</string>
     <string name="api_settings_accounts">Accounts</string>
     <string name="api_settings_accounts_empty">No accounts attached to this application.</string>
+    <string name="api_create_account_text">The application requests the creation of a new account. Please select an existing private key or create a new one.\nApplications are restricted to the usage of keys you select here!</string>
     <string name="api_register_text">The displayed application requests access to OpenKeychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string>
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
-- 
cgit v1.2.3