summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-20 12:57:27 (GMT)
committer Dominik Schürmann <dominik@dominikschuermann.de>2016-05-20 12:57:27 (GMT)
commit6e4db2c3050066e926c07319b94a60388eb3bfcd (patch)
treef839d30126a2a5baecd9a798ff904befe59b7f5b
parentc002239bc7c1514b1ce6549de6917a511fc27717 (diff)
downloadopen-keychain-6e4db2c3050066e926c07319b94a60388eb3bfcd.zip
open-keychain-6e4db2c3050066e926c07319b94a60388eb3bfcd.tar.gz
open-keychain-6e4db2c3050066e926c07319b94a60388eb3bfcd.tar.bz2
More string fixes from transifex
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.md2
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md
index e9671c3..c414095 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw/help_changelog.md
@@ -267,7 +267,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
* Basic keyserver support
* App2sd
* More choices for passphrase cache: 1, 2, 4, 8, hours
- * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
+ * Translations: Norwegian Bokmål (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
* Bugfixes
* Optimizations
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 15df7bb..746e130 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1085,7 +1085,7 @@
<string name="msg_mf_error_sub_stripped">"Cannot modify stripped subkey %s!"</string>
<string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
<string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to Security Token in same operation that creates an on-card signature."</string>
- <string name="msg_mf_error_duplicate_keytocard_for_slot">"Smart card supports only one slot per key type."</string>
+ <string name="msg_mf_error_duplicate_keytocard_for_slot">"Security Token supports only one slot per key type."</string>
<string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for Security Token key."</string>
<string name="msg_mf_master">"Modifying master certifications"</string>
<string name="msg_mf_notation_empty">"Adding empty notation packet"</string>