diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-08-15 17:32:08 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-08-15 17:32:08 +0000 |
| commit | bd99b2590b9b619d90ce5ffe36d5526452883cbf (patch) | |
| tree | 4361314a196beda8b03811db12442efdf4cc1f69 /res/values | |
| parent | e6dc9951268e89c776cad141c8ce0d68ea1e559b (diff) | |
| download | open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.tar.gz open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.tar.bz2 open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.zip | |
1.0.x merged back into trunk
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4f0dac371..e98d7a193 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -22,6 +22,9 @@ <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_60mins</item> </string-array> <string-array name="pass_phrase_cache_ttl_values"> @@ -30,6 +33,9 @@ <item>180</item> <item>300</item> <item>600</item> + <item>1200</item> + <item>2400</item> + <item>3600</item> </string-array> <string-array name="language_entries"> diff --git a/res/values/strings.xml b/res/values/strings.xml index ad437d725..e7a233b3e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -133,6 +133,9 @@ <string name="choice_3mins">3 mins</string> <string name="choice_5mins">5 mins</string> <string name="choice_10mins">10 mins</string> + <string name="choice_20mins">20 mins</string> + <string name="choice_40mins">40 mins</string> + <string name="choice_60mins">60 mins</string> <string name="choice_untilQuit">until quit</string> <string name="choice_language_system">System default</string> |