aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorJoey Castillo <jose.castillo@gmail.com>2015-06-11 11:52:09 -0400
committerJoey Castillo <jose.castillo@gmail.com>2015-06-11 11:52:09 -0400
commitcda8b63bb4c4c38065f76b7db474188e478e5b23 (patch)
treea59d82fbe6d1126e10af5dec5290533495075a6d /OpenKeychain/src/main/res
parent14226461c14472fd470a42357b5be5bd7bc134c7 (diff)
downloadopen-keychain-cda8b63bb4c4c38065f76b7db474188e478e5b23.tar.gz
open-keychain-cda8b63bb4c4c38065f76b7db474188e478e5b23.tar.bz2
open-keychain-cda8b63bb4c4c38065f76b7db474188e478e5b23.zip
Replace AssertionErrors with snackbar notifications, fix style issues.
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml19
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8e2f0f5e2..88d44d2e4 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1309,14 +1309,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">"Incorrect PIN; %d tries remaining."</string>
- <string name="error_nfc_terminated">"Smart card in termination state"</string>
- <string name="error_nfc_wrong_length">"Wrong length for sent / received data"</string>
- <string name="error_nfc_conditions_not_satisfied">"Conditions of use not satisfied"</string>
- <string name="error_nfc_security_not_satisfied">"Security status not satisfied"</string>
- <string name="error_nfc_authentication_blocked">"PIN blocked after too many attempts"</string>
- <string name="error_nfc_data_not_found">"Key or object not found"</string>
- <string name="error_nfc_unknown">"Unknown Error"</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>