From 1ef6f883e34a08dc916ad7dfabd7f892964aff54 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 27 Jul 2015 14:10:26 +0530
Subject: introduced keyserver sync adapter

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 72406aaab..6309faf85 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1351,6 +1351,12 @@
     <string name="passp_cache_notif_clear">"Clear Passwords"</string>
     <string name="passp_cache_notif_pwd">"Password"</string>
 
+    <!-- Keyserver sync -->
+    <string name="keyserver_sync_orbot_notif_title">"Orbot not running"</string>
+    <string name="keyserver_sync_orbot_notif_msg">"Keyserver sync failed since Orbot is not running. What would you like to do?"</string>
+    <string name="keyserver_sync_orbot_notif_start">"Start Orbot"</string>
+    <string name="keyserver_sync_orbot_notif_ignore">"Don't use Tor"</string>
+
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
     <string name="first_time_create_key">"Create my key"</string>
-- 
cgit v1.2.3


From 448657602ce5baa5b2a99e26ab2eb2fb8061778f Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Thu, 30 Jul 2015 04:39:38 +0530
Subject: improved orbot notify, added periodic sync

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6309faf85..67a727645 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1352,10 +1352,10 @@
     <string name="passp_cache_notif_pwd">"Password"</string>
 
     <!-- Keyserver sync -->
-    <string name="keyserver_sync_orbot_notif_title">"Orbot not running"</string>
-    <string name="keyserver_sync_orbot_notif_msg">"Keyserver sync failed since Orbot is not running. What would you like to do?"</string>
+    <string name="keyserver_sync_orbot_notif_title">"Sync From Cloud requires Orbot"</string>
+    <string name="keyserver_sync_orbot_notif_msg">"Tap to start orbot"</string>
     <string name="keyserver_sync_orbot_notif_start">"Start Orbot"</string>
-    <string name="keyserver_sync_orbot_notif_ignore">"Don't use Tor"</string>
+    <string name="keyserver_sync_orbot_notif_ignore">"Direct"</string>
 
     <!-- First Time -->
     <string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
-- 
cgit v1.2.3


From 6af24527da68721cb6e613e0bf8f8a5b4addbbf4 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Sun, 16 Aug 2015 14:32:35 +0530
Subject: changed sync name

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 67a727645..495660a22 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1352,6 +1352,7 @@
     <string name="passp_cache_notif_pwd">"Password"</string>
 
     <!-- Keyserver sync -->
+    <string name="keyserver_sync_settings_title">"Update Keys from Cloud"</string>
     <string name="keyserver_sync_orbot_notif_title">"Sync From Cloud requires Orbot"</string>
     <string name="keyserver_sync_orbot_notif_msg">"Tap to start orbot"</string>
     <string name="keyserver_sync_orbot_notif_start">"Start Orbot"</string>
-- 
cgit v1.2.3


From 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:08:42 +0530
Subject: added sync preferences

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 495660a22..ba5be593f 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="section_passphrase_cache">"Password/PIN Handling"</string>
     <string name="section_proxy_settings">"Proxy Settings"</string>
     <string name="section_gui">"Interface"</string>
+    <string name="section_sync_settings">"Sync Settings"</string>
     <string name="section_certify">"Confirm"</string>
     <string name="section_actions">"Actions"</string>
     <string name="section_share_key">"Key"</string>
@@ -175,6 +176,11 @@
     <string name="pref_keybase">"keybase.io"</string>
     <string name="pref_keybase_summary">"Search keys on keybase.io"</string>
 
+    <string name="label_sync_settings_keyserver_title">"Automatically update keys"</string>
+    <string name="label_sync_settings_keyserver_summary">"Updates keys older than a week, from the preferred keyserver"</string>
+    <string name="label_sync_settings_contacts_title">"Sync Contacts with Keys"</string>
+    <string name="label_sync_settings_contacts_summary">"Associates contacts with imported keys, based on email, completely offline"</string>
+
     <!-- Proxy Preferences -->
     <string name="pref_proxy_tor_title">"Enable Tor"</string>
     <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string>
-- 
cgit v1.2.3


From f625a26bbd9e4e1049480028b7738ff4e37fd712 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Mon, 17 Aug 2015 03:39:24 +0530
Subject: added on/off summaries

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ba5be593f..2d9b22852 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -177,9 +177,13 @@
     <string name="pref_keybase_summary">"Search keys on keybase.io"</string>
 
     <string name="label_sync_settings_keyserver_title">"Automatically update keys"</string>
-    <string name="label_sync_settings_keyserver_summary">"Updates keys older than a week, from the preferred keyserver"</string>
+    <string name="label_sync_settings_keyserver_summary_on">"Keys older than a week are updated from the preferred keyserver"</string>
+    <string name="label_sync_settings_keyserver_summary_off">"Keys not automatically updated"</string>
     <string name="label_sync_settings_contacts_title">"Sync Contacts with Keys"</string>
-    <string name="label_sync_settings_contacts_summary">"Associates contacts with imported keys, based on email, completely offline"</string>
+    <string name="label_sync_settings_contacts_summary_on">"Keys linked to contacts with matching emails, happens completely offline"</string>
+    <string name="label_sync_settings_contacts_summary_off">"New keys will not be linked to contacts"</string>
+    <!-- label shown in Android settings under the OpenKeychain account -->
+    <string name="keyserver_sync_settings_title">"Automatically update keys"</string>
 
     <!-- Proxy Preferences -->
     <string name="pref_proxy_tor_title">"Enable Tor"</string>
@@ -1358,7 +1362,6 @@
     <string name="passp_cache_notif_pwd">"Password"</string>
 
     <!-- Keyserver sync -->
-    <string name="keyserver_sync_settings_title">"Update Keys from Cloud"</string>
     <string name="keyserver_sync_orbot_notif_title">"Sync From Cloud requires Orbot"</string>
     <string name="keyserver_sync_orbot_notif_msg">"Tap to start orbot"</string>
     <string name="keyserver_sync_orbot_notif_start">"Start Orbot"</string>
-- 
cgit v1.2.3


From 0251f0e41695d3961dde553ba9ab76fa46583abb Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Wed, 19 Aug 2015 01:13:12 +0530
Subject: introduced constants for keyserver sync, fixed sync issue

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

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

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 2d9b22852..643f41004 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1314,7 +1314,6 @@
     </plurals>
 
     <string name="msg_revoke_error_empty">"Nothing to revoke!"</string>
-    <string name="msg_revoke_error_multi_secret">"Secret keys can only be revoked individually!"</string>
     <string name="msg_revoke_error_not_found">"Cannot find key to revoke!"</string>
     <string name="msg_revoke_key">"Revoking key %s"</string>
     <string name="msg_revoke_key_fail">"Failed revoking key"</string>
-- 
cgit v1.2.3