diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-17 03:39:24 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-20 21:02:29 +0530 |
commit | f625a26bbd9e4e1049480028b7738ff4e37fd712 (patch) | |
tree | 53e8c90c9c1ce0ae4d64f300f3f9665661c12d41 /OpenKeychain/src/main/res | |
parent | 3f8f70b0a99554aae52fd80d31c29f32a34df5d2 (diff) | |
download | open-keychain-f625a26bbd9e4e1049480028b7738ff4e37fd712.tar.gz open-keychain-f625a26bbd9e4e1049480028b7738ff4e37fd712.tar.bz2 open-keychain-f625a26bbd9e4e1049480028b7738ff4e37fd712.zip |
added on/off summaries
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 9 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/xml/sync_preferences.xml | 6 |
2 files changed, 8 insertions, 7 deletions
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> diff --git a/OpenKeychain/src/main/res/xml/sync_preferences.xml b/OpenKeychain/src/main/res/xml/sync_preferences.xml index d4ea81591..e870be9ec 100644 --- a/OpenKeychain/src/main/res/xml/sync_preferences.xml +++ b/OpenKeychain/src/main/res/xml/sync_preferences.xml @@ -2,11 +2,9 @@ <CheckBoxPreference android:key="syncKeyserver" android:persistent="false" - android:title="@string/label_sync_settings_keyserver_title" - android:summary="@string/label_sync_settings_keyserver_summary" /> + android:title="@string/label_sync_settings_keyserver_title"/> <CheckBoxPreference android:key="syncContacts" android:persistent="false" - android:title="@string/label_sync_settings_contacts_title" - android:summary="@string/label_sync_settings_contacts_summary" /> + android:title="@string/label_sync_settings_contacts_title" /> </PreferenceScreen> |