aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-11-13 17:36:25 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-11-13 17:36:25 +0100
commit0eade61cd4202897de6727650bd3f6d60b399705 (patch)
treee41c0a4de925ce1bd149dbd6e58f5c298f8e2435 /OpenKeychain/src/main/res/values
parentc6ea0b6a07df0c509183e4c664b5749a264954f8 (diff)
parent004c944bb752004f134a55df3053088d4b147a9c (diff)
downloadopen-keychain-0eade61cd4202897de6727650bd3f6d60b399705.tar.gz
open-keychain-0eade61cd4202897de6727650bd3f6d60b399705.tar.bz2
open-keychain-0eade61cd4202897de6727650bd3f6d60b399705.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 13b9923bc..8dc6573a6 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1150,6 +1150,8 @@
<string name="msg_ek_error_not_found">"Key not found!"</string>
<!-- Messages for DecryptVerify operation -->
+ <string name="msg_dc_askip_bad_flags">"Key is not an encryption key, skipping…"</string>
+ <string name="msg_dc_askip_unavailable">"Key not available, skipping…"</string>
<string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string>
<string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string>
<string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string>