aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorVincent <valodim@mugenguild.com>2015-06-12 15:00:16 +0200
committerVincent <valodim@mugenguild.com>2015-06-12 15:00:16 +0200
commit655cdfbbee096e222242efa93eda2a0a20c38493 (patch)
tree57340ee833c64b101a3147fb9c6030036ecae737 /OpenKeychain/src/main/res/values
parentd57324aa4b23633f5da995ba71d8fbb5690bae45 (diff)
parentcda8b63bb4c4c38065f76b7db474188e478e5b23 (diff)
downloadopen-keychain-655cdfbbee096e222242efa93eda2a0a20c38493.tar.gz
open-keychain-655cdfbbee096e222242efa93eda2a0a20c38493.tar.bz2
open-keychain-655cdfbbee096e222242efa93eda2a0a20c38493.zip
Merge pull request #1338 from josecastillo/development
Improved smart card error handling
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ba2ae002e..e8d1f1e70 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1310,6 +1310,17 @@
<string name="btn_import">"Import"</string>
<string name="snack_yubi_other">Different key stored on YubiKey!</string>
<string name="error_nfc">"NFC Error: %s"</string>
+ <string name="error_pin">"NFC: Incorrect PIN; %d tries remaining."</string>
+ <string name="error_nfc_terminated">"NFC: Smart card in termination state"</string>
+ <string name="error_nfc_wrong_length">"NFC: Wrong length for sent / received data"</string>
+ <string name="error_nfc_conditions_not_satisfied">"NFC: Conditions of use not satisfied"</string>
+ <string name="error_nfc_security_not_satisfied">"NFC: Security status not satisfied"</string>
+ <string name="error_nfc_authentication_blocked">"NFC: PIN blocked after too many attempts"</string>
+ <string name="error_nfc_data_not_found">"NFC: Key or object not found"</string>
+ <string name="error_nfc_unknown">"NFC: Unknown Error"</string>
+ <string name="error_nfc_bad_data">"NFC: Card reported invalid data"</string>
+ <string name="error_nfc_chaining_error">"NFC: Card expected last command in a chain"</string>
+ <string name="error_nfc_header">"NFC: Card reported invalid %s byte"</string>
<string name="error_pin_nodefault">Default PIN was rejected!</string>
<string name="error_bluetooth_file">Error creating temporary file. Bluetooth sharing will fail.</string>
<string name="snack_encrypt_filenames_on">"Filenames <b>are</b> encrypted."</string>