diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
| commit | 374b21410e82877efcdd1e5110376e975bddbf9f (patch) | |
| tree | e17df8931d627e58da677aee274249e1d51c34e2 /OpenKeychain/src/main/res/values | |
| parent | 1a7677008bae900fb11a383d04766737aaa3f02f (diff) | |
| parent | 04d2b6a5076a1a7264687999152f8c24ece773ab (diff) | |
| download | open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.gz open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.bz2 open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.zip | |
Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
.travis.yml
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 11 |
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 7200d9545..ae131e029 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="btn_delete_original">Delete original file</string> |