diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-02 01:24:16 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-02 01:24:16 +0200 |
| commit | e0905a3afbba7f96822becb378b7e8fd9c51e85a (patch) | |
| tree | 72f463174e322bea66c7702c236739a196b6514d /OpenKeychain/src/main/res | |
| parent | a97ebc1ec9afa4951f676b4483c6db871c4704ab (diff) | |
| download | open-keychain-e0905a3afbba7f96822becb378b7e8fd9c51e85a.tar.gz open-keychain-e0905a3afbba7f96822becb378b7e8fd9c51e85a.tar.bz2 open-keychain-e0905a3afbba7f96822becb378b7e8fd9c51e85a.zip | |
cache key s2k type in database, for later use
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5b1a44fb6..7775bc259 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -589,9 +589,11 @@ <string name="msg_is_importing_subkeys">Processing secret subkeys</string> <string name="msg_is_io_exc">Error encoding keyring</string> <string name="msg_is_pubring_generate">Generating public keyring from secret keyring</string> - <string name="msg_is_subkey_nonexistent">Subkey %s unavailable in public key</string> - <string name="msg_is_subkey_ok">Marked %s as available</string> - <string name="msg_is_subkey_stripped">Marked %s as stripped</string> + <string name="msg_is_subkey_nonexistent">Subkey %s unavailable in secret key</string> + <string name="msg_is_subkey_ok">Marked secret subkey %s as available</string> + <string name="msg_is_subkey_empty">Marked secret subkey %s as available, with empty passphrase</string> + <string name="msg_is_subkey_stripped">Marked secret subkey %s as stripped</string> + <string name="msg_is_subkey_divert">Marked secret subkey %s as "divert to smartcard/nfc"</string> <string name="msg_is_success_identical">Keyring contains no new data, nothing to do</string> <string name="msg_is_success">Successfully imported secret keyring</string> @@ -765,6 +767,9 @@ <string name="error_key_not_found">Key not found!</string> <string name="error_key_processing">Error processing key!</string> <string name="key_stripped">stripped</string> + <string name="key_divert">divert to card</string> + <string name="key_no_passphrase">no passphrase</string> + <string name="key_unavailable">unavailable</string> <string name="secret_cannot_multiple">Your own keys can only be deleted individually!</string> <string name="title_view_cert">View Certificate Details</string> <string name="unknown_algorithm">unknown</string> |