diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-14 16:27:50 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-14 16:28:03 +0200 |
| commit | a19784ed7e930055a6a1d0a537f2f4f1d3ea1f21 (patch) | |
| tree | 7e34a6f3b1b6db7a297ff47baad33d3bb4466a59 /OpenKeychain/src/main/res/values | |
| parent | d2b9e95c8089520411792028717ebd4b0d105764 (diff) | |
| download | open-keychain-a19784ed7e930055a6a1d0a537f2f4f1d3ea1f21.tar.gz open-keychain-a19784ed7e930055a6a1d0a537f2f4f1d3ea1f21.tar.bz2 open-keychain-a19784ed7e930055a6a1d0a537f2f4f1d3ea1f21.zip | |
merge: check fingerprints on merge operation! (this needs a testcase!)
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 20a149956..0da651b03 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -616,7 +616,7 @@ <string name="msg_mg_public">Merging into public keyring %s</string> <string name="msg_mg_secret">Merging into secret keyring %s</string> <string name="msg_mg_fatal_encode">Fatal error encoding signature</string> - <string name="msg_mg_heterogeneous">Tried to consolidate heterogeneous keyrings</string> + <string name="msg_mg_heterogeneous">Tried to merge keyrings with differing fingerprints!</string> <string name="msg_mg_new_subkey">Adding new subkey %s</string> <string name="msg_mg_found_new">Found %s new certificates in keyring</string> <string name="msg_mg_unchanged">No new certificates</string> |