1.0.x merged back into trunk

This commit is contained in:
Thialfihar
2010-08-15 17:32:08 +00:00
parent e6dc995126
commit bd99b2590b
8 changed files with 111 additions and 51 deletions

View File

@@ -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">

View File

@@ -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>