From c60ec7a8a7b80364d2cc92aeb60e0da5522e9e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ha=C3=9F?= <daniel.hass@stzedn.de>
Date: Thu, 27 Feb 2014 22:10:07 +0100
Subject: Added error strings for key import from keyserver

---
 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 178ef8f17..91359701f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -286,6 +286,9 @@
     <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string>
     <string name="error_can_not_delete_contact">you can not delete this contact because it is your own.</string>
     <string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%s</string>
+    <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>
     <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 1baae3775e9fe60b39dc30463b0a33bd8d2d14df Mon Sep 17 00:00:00 2001
From: Jessica Yuen <jyuen@ualberta.ca>
Date: Sun, 2 Mar 2014 15:06:43 -0500
Subject: #226: Added cancel option to ProgressDialogFragments. Create Key is
 now cancelable.

---
 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..c41024fde 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -296,6 +296,7 @@
 
     <!-- progress dialogs, usually ending in '…' -->
     <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 94e161fe0d08149d26b0d5dcd41bb883d1162ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 3 Mar 2014 15:45:53 +0100
Subject: change ordering in Intent descriptions for better readability in
 small dialogs

---
 OpenPGP-Keychain/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 91359701f..46ffe5493 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -371,10 +371,10 @@
     <string name="import_clipboard_button">Get key from clipboard</string>
 
     <!-- Intent labels -->
-    <string name="intent_decrypt_file">OpenKeychain: Decrypt File</string>
-    <string name="intent_import_key">OpenKeychain: Import Key</string>
-    <string name="intent_send_encrypt">OpenKeychain: Encrypt</string>
-    <string name="intent_send_decrypt">OpenKeychain: Decrypt</string>
+    <string name="intent_decrypt_file">Decrypt File with OpenKeychain</string>
+    <string name="intent_import_key">Import Key with OpenKeychain</string>
+    <string name="intent_send_encrypt">Encrypt with OpenKeychain</string>
+    <string name="intent_send_decrypt">Decrypt with OpenKeychain</string>
 
     <!-- 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>
-- 
cgit v1.2.3


From 127ab0fd817efa62b5375e9e158c68d5e50dad6c Mon Sep 17 00:00:00 2001
From: Miroojin Bakshi <gaglu231094@gmail.com>
Date: Thu, 6 Mar 2014 01:27:35 +0530
Subject: Use string from strings.xml

---
 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 3ca5f5426..9689010ed 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -130,6 +130,7 @@
     <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>
+    <string name="expiry_date_dialog_title">Set expiry date</string>
 
     <plurals name="select_keys_button">
         <item quantity="one">%d selected</item>
-- 
cgit v1.2.3


From 1cf912de2b388fbe996e3014a00a0d91f22194a5 Mon Sep 17 00:00:00 2001
From: uberspot <onexemailx@gmail.com>
Date: Thu, 6 Mar 2014 20:32:10 +0200
Subject: Multiselect: Create 'select all' in public and secret keylist

---
 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 9689010ed..2950b7c3f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -96,6 +96,7 @@
     <string name="menu_beam_preferences">Beam settings</string>
     <string name="menu_key_edit_cancel">Cancel</string>
     <string name="menu_encrypt_to">Encrypt to…</string>
+    <string name="menu_select_all">Select all</string>
 
     <!-- label -->
     <string name="label_sign">Sign</string>
-- 
cgit v1.2.3


From 8e29b82d6daa689f07a8318bf194c8fb17133c95 Mon Sep 17 00:00:00 2001
From: Ankush <ankushbhalotia@gmail.com>
Date: Thu, 6 Mar 2014 10:05:43 +0530
Subject: corrected commit

mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338
---
 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 9689010ed..34dc26571 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Registered Applications</string>
     <string name="title_key_server_preference">Keyserver Preference</string>
-    <string name="title_change_pass_phrase">Change Passphrase</string>
+    <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_encrypt_to_file">Encrypt To File</string>
-- 
cgit v1.2.3