From e0905a3afbba7f96822becb378b7e8fd9c51e85a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 2 Sep 2014 01:24:16 +0200
Subject: cache key s2k type in database, for later use

---
 OpenKeychain/src/main/res/values/strings.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/res')

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>
-- 
cgit v1.2.3