aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-26 15:25:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-26 15:26:24 +0200
commitf92e5f663fd73c8a2b518d7aa6f24a298fe13761 (patch)
treedc4ae0a280df46ad98c4ceba89b64673022aa31b /OpenKeychain
parent5a7f2b2c1239efa0a67f22f2440e6c1a1d42d958 (diff)
downloadopen-keychain-f92e5f663fd73c8a2b518d7aa6f24a298fe13761.tar.gz
open-keychain-f92e5f663fd73c8a2b518d7aa6f24a298fe13761.tar.bz2
open-keychain-f92e5f663fd73c8a2b518d7aa6f24a298fe13761.zip
fix msg_ip_merge_secret
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 54d5e6d35..d44c9a5a0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -834,7 +834,7 @@
<string name="msg_ip_master_flags_xxxa">"Master flags: authenticate"</string>
<string name="msg_ip_master_flags_xxxx">"Master flags: none"</string>
<string name="msg_ip_merge_public">"Merging imported data into existing public keyring"</string>
- <string name="msg_ip_merge_secret">"Merging imported data into existing public keyring"</string>
+ <string name="msg_ip_merge_secret">"Merging imported data into existing secret keyring"</string>
<string name="msg_ip_subkey">"Processing subkey %s"</string>
<string name="msg_ip_subkey_expired">"Subkey expired on %s"</string>
<string name="msg_ip_subkey_expires">"Subkey expires on %s"</string>