From 296783a3181afa605248e27c672cbce7aa88ac0d Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 2 Nov 2017 17:43:21 +0100
Subject: po: Fixed one string wrongly marked as fuzzy.

--

These seems to a a small gettext bug which claimed that
 "NOTE: There is no guarantee that the card supports[...]"
was changed.  Also committed changes due to msgmerge.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 po/zh_CN.po | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0cf93cbac..4b3954c6b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1426,6 +1426,10 @@ msgstr "您想要用多大的密钥尺寸？(%u)"
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
+#, c-format
+msgid "The card will now be re-configured to generate a key of type: %s\n"
+msgstr ""
+
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
@@ -2738,14 +2742,6 @@ msgstr "密钥 %s：公钥“%s”已导入\n"
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#, c-format
-msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
-
-#, c-format
-msgid "key %s: can't read original keyblock: %s\n"
-msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
-
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
@@ -2833,6 +2829,14 @@ msgstr ""
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
+#, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
+msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
+
+#, c-format
+msgid "key %s: can't read original keyblock: %s\n"
+msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
+
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
@@ -3280,6 +3284,11 @@ msgstr "压缩不可用的用户标识并删除所有签名"
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret subkeys are available.\n"
+msgstr "私钥可用。\n"
+
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-- 
cgit v1.2.3