aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-11-21 23:55:17 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-11-21 23:55:17 +0100
commit47caad3edbdb32dd47bdbee27828edda81e433e1 (patch)
treedd76b19147dbf0f1926555b1d949f4646b570fc3 /OpenKeychain/src/main/res/values/strings.xml
parent629d83a1ceedefe42f6e763af2065033f3fe77ae (diff)
parenta805069c59586775fd5790c00cbd82f4dfeddcb6 (diff)
downloadopen-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.gz
open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.tar.bz2
open-keychain-47caad3edbdb32dd47bdbee27828edda81e433e1.zip
Merge branch 'development' into keybase-proofs
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 59c0ce408..b98f47146 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -118,9 +118,9 @@
<string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
<string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
<string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
- <string name="label_use_default_yubikey_pin">"Use default Yubikey PIN"</string>
- <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for Yubikey PIN</string>
- <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access Yubikeys over NFC"</string>
+ <string name="label_use_default_yubikey_pin">"Use default YubiKey PIN"</string>
+ <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
+ <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string>
<string name="label_asymmetric_from">"Signed by:"</string>
<string name="label_to">"Encrypt to:"</string>
<string name="label_delete_after_encryption">"Delete file after encryption"</string>
@@ -208,7 +208,8 @@
<string name="passphrase_must_not_be_empty">"Please enter a passphrase."</string>
<string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
<string name="passphrase_for">"Enter passphrase for '%s'"</string>
- <string name="yubikey_pin">"Enter PIN to access Yubikey for '%s'"</string>
+ <string name="yubikey_pin">"Enter PIN to access YubiKey for '%s'"</string>
+ <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
<string name="file_delete_confirmation">"Are you sure you want to delete\n%s?"</string>
<string name="file_delete_successful">"Successfully deleted."</string>
<string name="no_file_selected">"Select a file first."</string>