From 29145e49c96998f220485a8e46cd2b62665b00de Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 15 Jul 2014 19:17:08 +0200
Subject: merge: different msg if nothing was merged

---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res')

diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c444d64a1..80b8bb507 100644
--- 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>
-- 
cgit v1.2.3