aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-07-15 19:22:44 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-07-15 19:22:44 +0200
commit503b146a146dbe35e0db5ab9c99dba38b101bd86 (patch)
tree5ed672dfa4845db3566ed59a03b15858f761c1d3 /OpenKeychain/src/main/res
parent72237a08924e60f0ee5d57f5b1e6735ece9172c1 (diff)
parent2f35e07c9ee12d29cbf0d61b69d7ebb310b7705b (diff)
downloadopen-keychain-503b146a146dbe35e0db5ab9c99dba38b101bd86.tar.gz
open-keychain-503b146a146dbe35e0db5ab9c99dba38b101bd86.tar.bz2
open-keychain-503b146a146dbe35e0db5ab9c99dba38b101bd86.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml1
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 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>