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

This commit is contained in:
Dominik Schürmann
2014-01-24 16:05:42 +01:00
3 changed files with 12 additions and 7 deletions

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>