diff options
author | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 05:33:28 -0400 |
---|---|---|
committer | Joey Castillo <jose.castillo@gmail.com> | 2015-05-13 14:36:30 -0400 |
commit | d21fb7733697a8f947604dbd1d6c608f5b2a21d5 (patch) | |
tree | 1ae3348b7047b351a598dd71b8d5e4e8ffed74dd /OpenKeychain/src/main/res | |
parent | a0107afd3efefb152b5691b04c6343a4382fcd6a (diff) | |
download | open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.gz open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.tar.bz2 open-keychain-d21fb7733697a8f947604dbd1d6c608f5b2a21d5.zip |
Moving keytocard process into PgpKeyOperation.
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c933d4a16..320f72b3e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -928,6 +928,7 @@ <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string> <string name="msg_mf_error_sig">"Signature exception!"</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 card in same operation that creates an on-card signature."</string> <string name="msg_mf_master">"Modifying master certifications"</string> <string name="msg_mf_notation_empty">"Adding empty notation packet"</string> <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string> @@ -946,6 +947,8 @@ <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string> <string name="msg_mf_subkey_revoke">"Revoking subkey %s"</string> <string name="msg_mf_subkey_strip">"Stripping subkey %s"</string> + <string name="msg_mf_keytocard_start">"Moving subkey %s to smart card"</string> + <string name="msg_mf_keytocard_finish">"Moved %1$s to card %2$s"</string> <string name="msg_mf_success">"Keyring successfully modified"</string> <string name="msg_mf_uid_add">"Adding user ID %s"</string> <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string> |