diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-27 12:24:37 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-27 12:24:37 +0200 |
| commit | ec7a3a704701537eda24afe16081b18b34497928 (patch) | |
| tree | 1279cd5b61f0bb19a3473c5a4c116c0163b0ff15 /OpenKeychain/src/main/res | |
| parent | f92e5f663fd73c8a2b518d7aa6f24a298fe13761 (diff) | |
| download | open-keychain-ec7a3a704701537eda24afe16081b18b34497928.tar.gz open-keychain-ec7a3a704701537eda24afe16081b18b34497928.tar.bz2 open-keychain-ec7a3a704701537eda24afe16081b18b34497928.zip | |
Experimental feature setting
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/passphrase_preferences.xml (renamed from OpenKeychain/src/main/res/xml/adv_preferences.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d44c9a5a0..ded2da6a2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ <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_other_settings">"Other Settings"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -185,6 +186,9 @@ <!-- label shown in Android settings under the OpenKeychain account --> <string name="keyserver_sync_settings_title">"Automatically update keys"</string> + <string name="label_other_settings_experimental_title">"Enable experimental features"</string> + <string name="label_other_settings_experimental_summary">"Enable experimental features, mostly results of security/UX research. Don't rely on their security!"</string> + <!-- Proxy Preferences --> <string name="pref_proxy_tor_title">"Enable Tor"</string> <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string> diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml index 7dd649e5d..7dd649e5d 100644 --- a/OpenKeychain/src/main/res/xml/adv_preferences.xml +++ b/OpenKeychain/src/main/res/xml/passphrase_preferences.xml diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index 606196c1e..36fc9a7ae 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -6,12 +6,15 @@ android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$CloudSearchPrefsFragment" android:title="@string/section_cloud_search" /> <header - android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$PassphrasePrefsFragment" android:title="@string/section_passphrase_cache" /> <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" android:title="@string/section_proxy_settings" /> <header - android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncSettingsFragment" + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$SyncPrefsFragment" android:title="@string/section_sync_settings" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$OtherPrefsFragment" + android:title="@string/section_other_settings" /> </preference-headers> |