aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-01-11 17:35:20 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-01-11 17:35:20 +0100
commitbaf0735c96900b30c9b80e85f1d87fdadfbc5613 (patch)
tree39a99775b8f840012d5cf8bdf1c0e30a05ef94e7 /OpenKeychain/src/main/res
parent900c80c25cf3cf839d02e2f2eea7f24c362b89ad (diff)
parente66c27c08129b278bcc699a7f2511d69d5dc0a29 (diff)
downloadopen-keychain-baf0735c96900b30c9b80e85f1d87fdadfbc5613.tar.gz
open-keychain-baf0735c96900b30c9b80e85f1d87fdadfbc5613.tar.bz2
open-keychain-baf0735c96900b30c9b80e85f1d87fdadfbc5613.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d5b0440c8..021b684a4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1709,11 +1709,13 @@
<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_ten_minutes">"for Ten Minutes"</string>
+ <string name="cache_ttl_thirty_minutes">"for Thirty 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="cache_ttl_forever">"forever"</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>