merge: different msg if nothing was merged

This commit is contained in:
Vincent Breitmoser committed 2014-07-15 19:17:08 +02:00
1 parent 858fe47d46
commit 29145e49c9
4 files changed
+9 -3

No files matched your search

@@ -636,6 +636,7 @@
<string name="msg_mg_heterogeneous">Tried to consolidate heterogeneous keyrings</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>
<!-- createSecretKeyRing -->
<string name="msg_cr">Generating new master key</string>