diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 00:26:13 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-26 00:26:13 +0200 |
| commit | 33738b1f520802124821faae12471c4019add17a (patch) | |
| tree | 0b3955cec15186fd687d7eb0ebc5512e0fad257d /OpenKeychain/src/main/res/values | |
| parent | 74bac3ea36d89f4ee450782fdbb6da49b02ede2e (diff) | |
| download | open-keychain-33738b1f520802124821faae12471c4019add17a.tar.gz open-keychain-33738b1f520802124821faae12471c4019add17a.tar.bz2 open-keychain-33738b1f520802124821faae12471c4019add17a.zip | |
Retry canonicalization with pubkey self certs if first attempt failed
Fixes #974
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 73d5c612c..d914b4299 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -688,6 +688,7 @@ <string name="msg_is_error_io_exc">"Error encoding keyring"</string> <string name="msg_is_merge_public">"Merging imported data into existing public keyring"</string> <string name="msg_is_merge_secret">"Merging imported data into existing public keyring"</string> + <string name="msg_is_merge_special">"Merging in self-certificates data from public 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 secret key"</string> <string name="msg_is_subkey_ok">"Marked secret subkey %s as available"</string> |