merge: different msg if nothing was merged

2014-07-15 19:17:08 +02:00
parent 858fe47d46
commit 29145e49c9
4 changed files with 9 additions and 3 deletions
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -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>