cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #344 from ankushb92/ankush2

Browse Source 
#338
This commit is contained in:
Dominik Schürmann
2014-03-06 21:59:56 +01:00
parent 9edd4bee70 8e29b82d6d
commit 3d944483d3
28 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/src/main/res/values/arrays.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="pass_phrase_cache_ttl_entries" translatable="false">
<string-array name="passphrase_cache_ttl_entries" translatable="false">
<item>@string/choice_15secs</item>
<item>@string/choice_1min</item>
<item>@string/choice_3mins</item>
@@ -15,7 +15,7 @@
<item>@string/choice_8hours</item>
<item>@string/choice_forever</item>
</string-array>
<string-array name="pass_phrase_cache_ttl_values" translatable="false">
<string-array name="passphrase_cache_ttl_values" translatable="false">
<item>15</item>
<item>60</item>
<item>180</item>

2
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@@ -14,7 +14,7 @@
<string name="title_preferences">Preferences</string>
<string name="title_api_registered_apps">Registered Applications</string>
<string name="title_key_server_preference">Keyserver Preference</string>
<string name="title_change_pass_phrase">Change Passphrase</string>
<string name="title_change_passphrase">Change Passphrase</string>
<string name="title_set_passphrase">Set Passphrase</string>
<string name="title_send_email">"Send Mail…"</string>
<string name="title_encrypt_to_file">Encrypt To File</string>