diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-01 17:28:43 +0200 |
| commit | 7c79902a82602ff4e25b03e1232faa1a1768ba16 (patch) | |
| tree | 03ec60c97bd961436ffffe17ad6917db768bfafa /OpenKeychain/src/main/res/values | |
| parent | 7f1dbccb5b1640482e9b83391400506f4ad40e04 (diff) | |
| parent | 4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 (diff) | |
| download | open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.gz open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.bz2 open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.zip | |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d6333019a..bad91d9f9 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -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> |