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

Merge branch 'master' of github.com:dschuermann/openpgp-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-24 16:05:42 +01:00
parent 647b802b59 8fb32848e2
commit 206ba4e551
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
<item>@string/choice_2hours</item>
<item>@string/choice_4hours</item>
<item>@string/choice_8hours</item>
<item>@string/choice_forever</item>
</string-array>
<string-array name="pass_phrase_cache_ttl_values" translatable="false">
<item>15</item>
@@ -26,6 +27,7 @@
<item>7200</item>
<item>14400</item>
<item>28800</item>
<item>-1</item>
</string-array>
<string-array name="key_size_spinner_values" translatable="false">
<item>@string/key_size_512</item>
@@ -41,4 +43,4 @@
<item>@string/menu_import_from_nfc</item>
</string-array>
</resources>
</resources>

3
OpenPGP-Keychain/res/values/strings.xml
View File

@@ -166,6 +166,7 @@
<string name="choice_2hours">2 hours</string>
<string name="choice_4hours">4 hours</string>
<string name="choice_8hours">8 hours</string>
<string name="choice_forever">forever</string>
<string name="dsa">DSA</string>
<string name="elgamal">ElGamal</string>
<string name="rsa">RSA</string>
@@ -415,4 +416,4 @@
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>
</resources>
</resources>