diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 582541ee3..73609fef0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -126,7 +126,6 @@
     <string name="choice_10mins">10 min</string>
     <string name="choice_20mins">20 min</string>
     <string name="choice_40mins">40 min</string>
-    <string name="choice_60mins">60 min</string>
     <string name="choice_untilQuit">Indtil slut</string>
 
     <string name="dsa">DSA</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7bc142f26..8490d84ae 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -132,7 +132,10 @@
     <string name="choice_10mins">10 Min.</string>
     <string name="choice_20mins">20 Min.</string>
     <string name="choice_40mins">40 Min.</string>
-    <string name="choice_60mins">60 Min.</string>
+    <string name="choice_1hour">1 Std.</string>
+    <string name="choice_2hours">2 Std.</string>
+    <string name="choice_4hours">4 Std.</string>
+    <string name="choice_8hours">8 Std.</string>
     <string name="choice_untilQuit">Bis Programmende</string>
 
     <string name="dsa">DSA</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 411ecf017..b5ce8d8c5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -151,7 +151,6 @@
     <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">hasta salir</string>
     <string name="choice_language_system">Sistema por defecto</string>
 
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2ffd3860f..9cb15d473 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -154,7 +154,6 @@
     <string name="choice_10mins">10 min</string>
     <string name="choice_20mins">20 min</string>
     <string name="choice_40mins">40 min</string>
-    <string name="choice_60mins">60 min</string>
     <string name="choice_untilQuit">tutta la sessione</string>
     <string name="choice_language_system">Default di sistema</string>
 
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index f2b24f484..b614ed197 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -16,7 +16,7 @@
      Author: Sander Danielsen <thelugal@gmail.com>
      Norsk, Bokmål
 
-     Send gjerne en e-post med spørsmål eller kommentarer. Kom gjerne med forslag til bedre 
+     Send gjerne en e-post med spørsmål eller kommentarer. Kom gjerne med forslag til bedre
      oversettelser!
 
 -->
@@ -32,7 +32,7 @@
     <string name="title_selectSignature">SVelg Signatur</string>
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
-    <string name="title_authentication">Passord</string>   
+    <string name="title_authentication">Passord</string>
     <string name="title_createKey">Lag Nøkkel</string>
     <string name="title_editKey">Rediger Nøkkel</string>
     <string name="title_preferences">Egenskaper</string>
@@ -115,7 +115,7 @@
     <string name="label_hashAlgorithm">Hash Algoritme</string>
     <string name="label_asymmetric">Offentlig Nøkkel</string>
     <string name="label_symmetric">Passord</string>
-    <string name="label_passPhraseCacheTtl">Passord Mellomlager</string> 
+    <string name="label_passPhraseCacheTtl">Passord Mellomlager</string>
     <string name="label_messageCompression">Melding komprimering</string>
     <string name="label_fileCompression">Fil Komprimering</string>
     <string name="label_language">Språk</string>
@@ -138,12 +138,12 @@
     <string name="none">&lt;ingen&gt;</string>
     <string name="noKey">&lt;ingen nøkkel&gt;</string>
     <string name="noDate">-</string>
-    <string name="noExpiry">&lt;utløper ikke&gt;</string> 
+    <string name="noExpiry">&lt;utløper ikke&gt;</string>
     <string name="unknownStatus"></string>
     <string name="canEncrypt">kan kryptere</string>
     <string name="canSign">kan signere</string>
     <string name="expired">utløpt</string>
-    <string name="notValid">ugyldig</string> 
+    <string name="notValid">ugyldig</string>
     <string name="nKeyServers">%s nøkkelserver(e)</string>
 
     <!-- choice_lowerCase: capitalized first word, no punctuation -->
@@ -158,7 +158,6 @@
     <string name="choice_10mins">10 min</string>
     <string name="choice_20mins">20 min</string>
     <string name="choice_40mins">40 min</string>
-    <string name="choice_60mins">60 min</string>
     <string name="choice_untilQuit">til avsluttning</string>
     <string name="choice_language_system">System </string>
 
@@ -223,7 +222,7 @@
     <string name="error_fileDeleteFailed">sletting \'%s\' mislyktes</string>
     <string name="error_fileNotFound">finner ikke fil</string>
     <string name="error_noSecretKeyFound">finner ingen passende hemmelig nøkkel</string>
-    <string name="error_noKnownEncryptionFound">ingen kjente krypteringsmåter funnet</string> 
+    <string name="error_noKnownEncryptionFound">ingen kjente krypteringsmåter funnet</string>
     <string name="error_externalStorageNotReady">ekstern lagringsplass ikke klar</string>
     <string name="error_accountNotFound">finner ikke kontoen - \'%s\'</string>
     <string name="error_accountReadingNotAllowed">ikke tillatelse til  lese konto</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 28be55645..e4cc8ffea 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -153,7 +153,6 @@
     <string name="choice_10mins">10 min</string>
     <string name="choice_20mins">20 min</string>
     <string name="choice_40mins">40 min</string>
-    <string name="choice_60mins">60 min</string>
     <string name="choice_untilQuit">do izhoda</string>
     <string name="choice_language_system">Sistemsko nastavljeno</string>
 
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 5592e26e5..a78c3135b 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -24,7 +24,10 @@
         <item>@string/choice_10mins</item>
         <item>@string/choice_20mins</item>
         <item>@string/choice_40mins</item>
-        <item>@string/choice_60mins</item>
+        <item>@string/choice_1hour</item>
+        <item>@string/choice_2hours</item>
+        <item>@string/choice_4hours</item>
+        <item>@string/choice_8hours</item>
     </string-array>
 
     <string-array name="pass_phrase_cache_ttl_values">
@@ -36,6 +39,9 @@
         <item>1200</item>
         <item>2400</item>
         <item>3600</item>
+        <item>7200</item>
+        <item>14400</item>
+        <item>28800</item>
     </string-array>
 
     <string-array name="language_entries">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89b18a8c7..8add0db9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -152,7 +152,10 @@
     <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_1hour">1 hour</string>
+    <string name="choice_2hours">2 hours</string>
+    <string name="choice_4hours">4 hours</string>
+    <string name="choice_8hours">8 hours</string>
     <string name="choice_untilQuit">until quit</string>
     <string name="choice_language_system">System default</string>