diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-18 19:23:40 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-06 16:25:50 +0100 |
| commit | 7eafe5d1e81fe3f72e66b600736e55f8eb21f038 (patch) | |
| tree | 0e5b144e033026590dc6660e904aef3a632eac23 /OpenKeychain/src/main/res | |
| parent | 52ab77d2a41d8d2e61cc864dbfd63dd1185a184b (diff) | |
| download | open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.tar.gz open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.tar.bz2 open-keychain-7eafe5d1e81fe3f72e66b600736e55f8eb21f038.zip | |
inline-ttl: support "screen off" in preference
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index af05a3da4..81840f67f 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -44,7 +44,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Remember for " + android:text="@string/remember" android:textAppearance="@android:style/TextAppearance.Medium" /> <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 076ff0736..4a0640536 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1710,14 +1710,16 @@ <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_five_minutes">"Five Minutes"</string> - <string name="cache_ttl_one_hour">"One Hour"</string> - <string name="cache_ttl_three_hours">"Three Hours"</string> - <string name="cache_ttl_one_day">"One Day"</string> - <string name="cache_ttl_three_days">"Three Days"</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="setting_cache_select_default">"and one default"</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> |