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

Merge branch 'master' into encrypted-export

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-01 17:28:43 +02:00
parent 7f1dbccb5b 4f13dc4fc5
commit 7c79902a82
13 changed files with 144 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1535,8 +1535,10 @@
<string name="error_nfc_chaining_error">"YubiKey expected last command in a chain."</string>
<string name="error_nfc_header">"YubiKey reported invalid %s byte."</string>
<string name="error_nfc_tag_lost">"YubiKey has been taken off too early. Keep the YubiKey at the back until the operation finishes."</string>
<string name="error_nfc_iso_dep_not_supported">"Tag does not support ISO-DEP (ISO 14443-4)"</string>
<string name="error_nfc_try_again">"Try again"</string>
<string name="error_pin_nodefault">Default PIN was rejected!</string>
<string name="error_pin_wrong">PIN is wrong!</string>
<string name="error_temp_file">Error creating temporary file.</string>
<string name="btn_delete_original">Delete original file</string>