diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-06 18:20:53 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-06 18:20:53 +0100 |
commit | 9163b93a907a29dab04e1ca99b175b097d1e9d91 (patch) | |
tree | 0ccb243bff34ae5ac45047d742208b6ad7d558ad /OpenKeychain/src/main/res/values | |
parent | e0f8d078629dcd04dced3a59bc45209b27a27b8b (diff) | |
parent | ae15b5dd0d7d57746c06a7a8c15e5d9dd14c858e (diff) | |
download | open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.tar.gz open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.tar.bz2 open-keychain-9163b93a907a29dab04e1ca99b175b097d1e9d91.zip |
Merge pull request #1597 from open-keychain/inline-ttl
Select time to remember password in dialog
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/arrays.xml | 28 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 13 |
2 files changed, 12 insertions, 29 deletions
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 393a1e091..584d773b7 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -1,34 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="passphrase_cache_ttl_entries" translatable="false"> - <item>@string/choice_15secs</item> - <item>@string/choice_1min</item> - <item>@string/choice_3mins</item> - <item>@string/choice_5mins</item> - <item>@string/choice_10mins</item> - <item>@string/choice_20mins</item> - <item>@string/choice_40mins</item> - <item>@string/choice_1hour</item> - <item>@string/choice_2hours</item> - <item>@string/choice_4hours</item> - <item>@string/choice_8hours</item> - <item>@string/choice_forever</item> - </string-array> - <string-array name="passphrase_cache_ttl_values" translatable="false"> - <item>15</item> - <item>60</item> - <item>180</item> - <item>300</item> - <item>600</item> - <item>1200</item> - <item>2400</item> - <item>3600</item> - <item>7200</item> - <item>14400</item> - <item>28800</item> - <item>-1</item> - </string-array> <string-array name="pref_proxy_type_entries" translatable="false"> <item>@string/pref_proxy_type_choice_http</item> <item>@string/pref_proxy_type_choice_socks</item> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index afda3c3c3..3c77d82dd 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ <string name="title_preferences">"Settings"</string> <string name="title_api_registered_apps">"Apps"</string> <string name="title_key_server_preference">"OpenPGP keyservers"</string> + <string name="title_cache_ttl_preference">"Customize 'Remember' Choices"</string> <string name="title_change_passphrase">"Change Password"</string> <string name="title_share_fingerprint_with">"Share fingerprint with…"</string> <string name="title_share_key">"Share key with…"</string> @@ -157,7 +158,7 @@ <string name="label_encryption_algorithm">"Encryption algorithm"</string> <string name="label_hash_algorithm">"Hash algorithm"</string> <string name="label_symmetric">"Encrypt with password"</string> - <string name="label_passphrase_cache_ttl">"Remember time"</string> + <string name="label_passphrase_cache_ttl">"Customize 'Remember' Choices"</string> <string name="label_passphrase_cache_subs">"Remember passwords by subkey"</string> <string name="label_message_compression">"Text compression"</string> <string name="label_file_compression">"File compression"</string> @@ -1709,5 +1710,15 @@ <string name="title_edit_identities">"Edit Identities"</string> <string name="title_edit_subkeys">"Edit Subkeys"</string> <string name="btn_search_for_query">"Search for\n'%s'"</string> + <string name="cache_ttl_lock_screen">"until Screen Off"</string> + <string name="cache_ttl_five_minutes">"for Five Minutes"</string> + <string name="cache_ttl_one_hour">"for One Hour"</string> + <string name="cache_ttl_three_hours">"for Three Hours"</string> + <string name="cache_ttl_one_day">"for One Day"</string> + <string name="cache_ttl_three_days">"for Three Days"</string> + <string name="settings_cache_select_three">"Pick up to three."</string> + <string name="settings_cache_ttl_at_least_one">"At least one item must be selected!"</string> + <string name="settings_cache_ttl_max_three">"Can\'t select more than three items!"</string> + <string name="remember">"Remember"</string> </resources> |