diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 19:17:08 +0200 |
| commit | 29145e49c96998f220485a8e46cd2b62665b00de (patch) | |
| tree | bb561f91549d8a25c182f92722262467668c61d4 /OpenKeychain/src/main/res | |
| parent | 858fe47d4677d4c727d0696a2d683a349ad2ad3b (diff) | |
| download | open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.gz open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.tar.bz2 open-keychain-29145e49c96998f220485a8e46cd2b62665b00de.zip | |
merge: different msg if nothing was merged
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
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> |