aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-02 00:07:05 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-02 00:07:05 +0100
commit7223abcf0cfa99a866a10483b017555fb768738f (patch)
tree3f9ee33495a7face841a6c6a4bf51deb233fd7b7 /OpenKeychain/src/main/res/values
parent1c1ae769ef78a9bd3c95f97b95215616ee9b15db (diff)
downloadopen-keychain-7223abcf0cfa99a866a10483b017555fb768738f.tar.gz
open-keychain-7223abcf0cfa99a866a10483b017555fb768738f.tar.bz2
open-keychain-7223abcf0cfa99a866a10483b017555fb768738f.zip
extend canonicalize to strip local certificates on export
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index be409078a..8788038aa 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -711,12 +711,13 @@
<string name="msg_kc_error_master_algo">"The master key uses an unknown (%s) algorithm!"</string>
<string name="msg_kc_error_dup_key">"Subkey %s occurs twice in keyring. Keyring is malformed, not importing!"</string>
<string name="msg_kc_master">"Processing master key"</string>
- <string name="msg_kc_bad_type">"Removing master key certificate of unknown type (%s)"</string>
- <string name="msg_kc_revoke_bad_err">"Removing bad keyring revocation certificate"</string>
- <string name="msg_kc_revoke_bad_local">"Removing keyring revocation certificate with "local" flag"</string>
- <string name="msg_kc_revoke_bad_time">"Removing keyring revocation certificate with future timestamp"</string>
- <string name="msg_kc_revoke_bad_type_uid">"Removing user ID certificate in bad position"</string>
- <string name="msg_kc_revoke_bad">"Removing bad keyring revocation certificate"</string>
+ <string name="msg_kc_master_bad_type">"Removing master key certificate of unknown type (%s)"</string>
+ <string name="msg_kc_master_bad_local">"Removing master key certificate with "local" flag"</string>
+ <string name="msg_kc_master_bad_err">"Removing bad master key certificate"</string>
+ <string name="msg_kc_master_bad_time">"Removing keyring revocation certificate with future timestamp"</string>
+ <string name="msg_kc_master_bad_type_uid">"Removing user ID certificate in bad position"</string>
+ <string name="msg_kc_master_bad">"Removing bad master key certificate"</string>
+ <string name="msg_kc_master_local">"Removing master key certificate with "local" flag"</string>
<string name="msg_kc_revoke_dup">"Removing redundant keyring revocation certificate"</string>
<string name="msg_kc_notation_dup">"Removing redundant notation certificate"</string>
<string name="msg_kc_notation_empty">"Removing empty notation certificate"</string>
@@ -980,6 +981,7 @@
<string name="msg_export_error_storage">"Storage is not ready for writing!"</string>
<string name="msg_export_error_db">"Database error!"</string>
<string name="msg_export_error_io">"Input/output error!"</string>
+ <string name="msg_export_error_key">"Error preprocessing key data!"</string>
<string name="msg_export_success">"Export operation successful"</string>
<string name="msg_del_error_empty">"Nothing to delete!"</string>