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

This commit is contained in:
Dominik Schürmann committed 2014-09-07 17:01:07 +02:00
commit 3ba2e0b0c1
4 files changed
+212 -121

No files matched your search

@@ -87,6 +87,7 @@
<string name="label_file_colon">File:</string>
<string name="label_no_passphrase">No Passphrase</string>
<string name="label_passphrase">Passphrase</string>
<string name="label_unlock">Unlocking…</string>
<string name="label_passphrase_again">Repeat Passphrase</string>
<string name="label_algorithm">Algorithm</string>
<string name="label_ascii_armor">File ASCII Armor</string>