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