aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-20 17:55:55 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-20 17:55:55 +0200
commit5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed (patch)
tree2aa105658d112f1ac213dc106d87072a814bd2a2 /OpenKeychain/src/main/res/values
parente643e098e2ad1a762e40f4ecbe6f97f729b11e3c (diff)
parent0251f0e41695d3961dde553ba9ab76fa46583abb (diff)
downloadopen-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.tar.gz
open-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.tar.bz2
open-keychain-5e2f24520b3f8ecdc5be3fbff56a6f51344a88ed.zip
Merge pull request #1461 from open-keychain/keyserver-sync
Periodic Keyserver Sync
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml17
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 72406aaab..643f41004 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,15 @@
<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_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_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>
<string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string>
@@ -1304,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>
@@ -1351,6 +1360,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">"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">"Direct"</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>