diff --git a/po/ChangeLog b/po/ChangeLog
index 130e1d0ad..ff4d4f513 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-03  Werner Koch  <wk@g10code.com>
+
+	* zh_CN.po: Updated.
+
+2006-06-27  Werner Koch  <wk@g10code.com>
+
+	* de.po: Fixed misleading translation.  Thanks to Olav Seyfarth.
+
 2005-10-06  Werner Koch  <wk@g10code.com>
 
 	* POTFILES.in: s/g10.c/gpg.c/.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 44930474f..99a5783cc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # Simplified Chinese(zh-CN) messages for GnuPG
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # Meng Jie <zuxyhere@eastday.com>, 2004.
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.1\n"
+"Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-06-25 13:35+0200\n"
-"PO-Revision-Date: 2005-03-17 22:24+0800\n"
+"POT-Creation-Date: 2005-07-26 18:08+0200\n"
+"PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.1\n"
+"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
 #: cipher/primegen.c:121
 #, c-format
@@ -34,21 +34,37 @@ msgid "no entropy gathering module detected\n"
 msgstr "检测不到熵搜集模块\n"
 
 #: cipher/random.c:403
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s': %s\n"
-msgstr "无法锁定‘%s’\n"
+msgstr "无法锁定‘%s’：%s\n"
 
 #: cipher/random.c:408
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for lock on `%s'...\n"
-msgstr "正在将私钥写至`%s'\n"
+msgstr "等待‘%s’上的锁\n"
 
-#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
-#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
-#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
-#: g10/sign.c:1268 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: cipher/random.c:448
+#: g10/card-util.c:678
+#: g10/card-util.c:747
+#: g10/dearmor.c:61
+#: g10/dearmor.c:110
+#: g10/encode.c:184
+#: g10/encode.c:474
+#: g10/gpg.c:1003
+#: g10/gpg.c:3461
+#: g10/import.c:195
+#: g10/keygen.c:2385
+#: g10/keyring.c:1525
+#: g10/openfile.c:186
+#: g10/openfile.c:342
+#: g10/plaintext.c:481
+#: g10/sign.c:830
+#: g10/sign.c:1005
+#: g10/sign.c:1118
+#: g10/sign.c:1268
+#: g10/tdbdump.c:141
+#: g10/tdbdump.c:149
+#: g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -81,14 +97,24 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
-#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
+#: cipher/random.c:544
+#: g10/exec.c:481
+#: g10/gpg.c:1002
+#: g10/keygen.c:2864
+#: g10/keygen.c:2894
+#: g10/keyring.c:1201
+#: g10/keyring.c:1501
+#: g10/openfile.c:263
+#: g10/openfile.c:357
+#: g10/sign.c:848
+#: g10/sign.c:1134
+#: g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:556 cipher/random.c:566
+#: cipher/random.c:556
+#: cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "无法写入‘%s’：%s\n"
@@ -147,34 +173,44 @@ msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期：%s\n"
 
 #: g10/app-openpgp.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "reading public key failed: %s\n"
-msgstr "无法读出密钥\n"
+msgstr "无法读出公钥：%s\n"
 
-#: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
+#: g10/app-openpgp.c:985
+#: g10/app-openpgp.c:1910
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:993 g10/app-openpgp.c:1918
+#: g10/app-openpgp.c:993
+#: g10/app-openpgp.c:1918
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1002 g10/app-openpgp.c:1928
+#: g10/app-openpgp.c:1002
+#: g10/app-openpgp.c:1928
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
+#: g10/app-openpgp.c:1258
+#: g10/app-openpgp.c:1346
+#: g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
+#: g10/app-openpgp.c:1264
+#: g10/app-openpgp.c:1352
+#: g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
+#: g10/app-openpgp.c:1273
+#: g10/app-openpgp.c:1287
+#: g10/app-openpgp.c:1362
+#: g10/app-openpgp.c:2169
+#: g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
@@ -183,11 +219,13 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
+#: g10/app-openpgp.c:1325
+#: g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
+#: g10/app-openpgp.c:1331
+#: g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -219,11 +257,13 @@ msgstr "新的 PIN"
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1546 g10/app-openpgp.c:1996
+#: g10/app-openpgp.c:1546
+#: g10/app-openpgp.c:1996
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1552 g10/app-openpgp.c:2003
+#: g10/app-openpgp.c:1552
+#: g10/app-openpgp.c:2003
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
@@ -241,22 +281,23 @@ msgstr "生成新密钥\n"
 
 #: g10/app-openpgp.c:1735
 msgid "creation timestamp missing\n"
-msgstr ""
+msgstr "缺少创建时间戳\n"
 
 #: g10/app-openpgp.c:1742
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
+msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
 #: g10/app-openpgp.c:1749
-#, fuzzy, c-format
+#, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "公钥指数太大(超过 32 位)\n"
+msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
+#: g10/app-openpgp.c:1757
+#: g10/app-openpgp.c:1764
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
+msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
 #: g10/app-openpgp.c:1827
 #, c-format
@@ -281,26 +322,26 @@ msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
 #: g10/app-openpgp.c:2087
-#, fuzzy, c-format
+#, c-format
 msgid "card does not support digest algorithm %s\n"
-msgstr "%s 签字，散列算法 %s\n"
+msgstr "卡不支持散列算法 %s\n"
 
 #: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
-msgstr "目前已创建的签字：%lu\n"
+msgstr "目前已创建的签名：%lu\n"
 
 #: g10/app-openpgp.c:2142
-#, fuzzy, c-format
+#, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [完成签字：%lu]"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
 #: g10/app-openpgp.c:2403
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
-msgstr ""
+msgid "verification of Admin PIN is currently prohibited through this command\n"
+msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
+#: g10/app-openpgp.c:2474
+#: g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -320,11 +361,11 @@ msgstr "ASCII 封装头："
 
 #: g10/armor.c:381
 msgid "invalid clearsig header\n"
-msgstr "无效的明文签字头\n"
+msgstr "无效的明文签名头\n"
 
 #: g10/armor.c:433
 msgid "nested clear text signatures\n"
-msgstr "多层明文签字\n"
+msgstr "多层明文签名\n"
 
 #: g10/armor.c:568
 msgid "unexpected armor: "
@@ -334,7 +375,8 @@ msgstr "与预期不符的 ASCII 封装："
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:734
+#: g10/armor.c:1343
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -351,7 +393,8 @@ msgstr "文件先于预期结束(CRC 部分未结束)\n"
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:823
+#: g10/armor.c:1380
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
@@ -374,11 +417,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
 #: g10/armor.c:1167
-msgid ""
-"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
-#: g10/card-util.c:63 g10/card-util.c:306
+#: g10/card-util.c:63
+#: g10/card-util.c:306
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -388,18 +431,29 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:76
+#: g10/card-util.c:1406
+#: g10/delkey.c:128
+#: g10/keyedit.c:1524
+#: g10/keygen.c:2569
+#: g10/revoke.c:218
+#: g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
+#: g10/card-util.c:103
+#: g10/card-util.c:1132
+#: g10/card-util.c:1215
+#: g10/keyedit.c:425
+#: g10/keyedit.c:446
+#: g10/keyedit.c:460
+#: g10/keygen.c:1381
 #: g10/keygen.c:1448
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:216 g10/card-util.c:266
+#: g10/card-util.c:216
+#: g10/card-util.c:266
 msgid "[not set]"
 msgstr "[未设定]"
 
@@ -457,7 +511,9 @@ msgstr "获取公钥的 URL："
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:687 g10/card-util.c:756 g10/import.c:280
+#: g10/card-util.c:687
+#: g10/card-util.c:756
+#: g10/import.c:280
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -526,7 +582,8 @@ msgstr "取得当前密钥信息时出错：%s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1054 g10/card-util.c:1063
+#: g10/card-util.c:1054
+#: g10/card-util.c:1063
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
@@ -549,20 +606,28 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1206
+#: g10/card-util.c:1125
+#: g10/card-util.c:1206
 msgid "   (1) Signature key\n"
-msgstr "  (1) 签字密钥\n"
+msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1126 g10/card-util.c:1208
+#: g10/card-util.c:1126
+#: g10/card-util.c:1208
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1127 g10/card-util.c:1210
+#: g10/card-util.c:1127
+#: g10/card-util.c:1210
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
+#: g10/card-util.c:1143
+#: g10/card-util.c:1226
+#: g10/keyedit.c:946
+#: g10/keygen.c:1385
+#: g10/keygen.c:1413
+#: g10/keygen.c:1487
+#: g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -582,7 +647,8 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1357
+#: g10/card-util.c:1319
+#: g10/keyedit.c:1357
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -590,7 +656,8 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1360
+#: g10/card-util.c:1322
+#: g10/keyedit.c:1360
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -628,7 +695,7 @@ msgstr "更改一个 CA 指纹"
 
 #: g10/card-util.c:1334
 msgid "toggle the signature force PIN flag"
-msgstr "设定 PIN 签字是否必须"
+msgstr "设定 PIN 签名是否必须"
 
 #: g10/card-util.c:1335
 msgid "generate new keys"
@@ -640,9 +707,10 @@ msgstr "更改或解锁 PIN 的菜单"
 
 #: g10/card-util.c:1337
 msgid "verify the PIN and list all data"
-msgstr ""
+msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1457 g10/keyedit.c:1623
+#: g10/card-util.c:1457
+#: g10/keyedit.c:1623
 msgid "Command> "
 msgstr "命令> "
 
@@ -658,7 +726,8 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1602 g10/keyedit.c:2244
+#: g10/card-util.c:1602
+#: g10/keyedit.c:2244
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -703,29 +772,43 @@ msgstr "再次输入此 PIN："
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377
-#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
+#: g10/decrypt.c:69
+#: g10/decrypt.c:160
+#: g10/gpg.c:3826
+#: g10/keyring.c:377
+#: g10/keyring.c:663
+#: g10/verify.c:102
+#: g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/decrypt.c:105 g10/encode.c:839
+#: g10/decrypt.c:105
+#: g10/encode.c:839
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
+#: g10/delkey.c:75
+#: g10/export.c:311
+#: g10/keyedit.c:3387
+#: g10/keyserver.c:1700
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83
+#: g10/export.c:341
+#: g10/import.c:2346
+#: g10/keyserver.c:1714
+#: g10/revoke.c:234
+#: g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
-#: g10/delkey.c:129 g10/delkey.c:136
+#: g10/delkey.c:129
+#: g10/delkey.c:136
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
@@ -759,7 +842,8 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1288
+#: g10/encode.c:213
+#: g10/sign.c:1288
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -773,12 +857,15 @@ msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 msgid "using cipher %s\n"
 msgstr "使用对称加密算法 %s\n"
 
-#: g10/encode.c:241 g10/encode.c:536
+#: g10/encode.c:241
+#: g10/encode.c:536
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
+#: g10/encode.c:292
+#: g10/encode.c:584
+#: g10/sign.c:615
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -793,21 +880,18 @@ msgid "reading from `%s'\n"
 msgstr "正在从‘%s’读取\n"
 
 #: g10/encode.c:508
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
 
 #: g10/encode.c:518
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:628 g10/sign.c:967
+#: g10/encode.c:628
+#: g10/sign.c:967
 #, c-format
-msgid ""
-"WARNING: forcing compression algorithm %s (%d) violates recipient "
-"preferences\n"
+msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
 #: g10/encode.c:715
@@ -815,7 +899,9 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:785
+#: g10/pkclist.c:803
+#: g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -825,19 +911,20 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:293
+#: g10/encr-data.c:67
+#: g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:297
+#: g10/encr-data.c:69
+#: g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
 #: g10/encr-data.c:93
-msgid ""
-"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
 #: g10/encr-data.c:104
@@ -848,14 +935,14 @@ msgstr "处理加密包有问题\n"
 msgid "no remote program execution supported\n"
 msgstr "不支持远程调用\n"
 
-#: g10/exec.c:176 g10/openfile.c:415
+#: g10/exec.c:176
+#: g10/openfile.c:415
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
 #: g10/exec.c:317
-msgid ""
-"external program calls are disabled due to unsafe options file permissions\n"
+msgid "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
 #: g10/exec.c:347
@@ -877,7 +964,8 @@ msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程序时发生系统错误：%s\n"
 
-#: g10/exec.c:524 g10/exec.c:590
+#: g10/exec.c:524
+#: g10/exec.c:590
 msgid "unnatural exit of external program\n"
 msgstr "外部程序异常退出\n"
 
@@ -890,7 +978,8 @@ msgstr "无法执行外部程序\n"
 msgid "unable to read external program response: %s\n"
 msgstr "无法读取外部程序响应：%s\n"
 
-#: g10/exec.c:601 g10/exec.c:608
+#: g10/exec.c:601
+#: g10/exec.c:608
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
@@ -901,32 +990,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
 #: g10/export.c:61
-#, fuzzy
 msgid "export signatures that are marked as local-only"
-msgstr "这份签字会被标记成不可吊销。\n"
+msgstr "导出被标记为局部的密名"
 
 #: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
-msgstr ""
+msgstr "导出属性用户标识(一般为照片标识)"
 
 #: g10/export.c:65
-#, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
-msgstr "没有找到“%s”的吊销密钥\n"
+msgstr "导出被标记为“敏感”的吊销密钥"
 
 #: g10/export.c:67
-#, fuzzy
 msgid "remove the passphrase from exported subkeys"
-msgstr "吊销密钥或选定的子钥"
+msgstr "从导出的子钥中删除所有密码"
 
 #: g10/export.c:69
-#, fuzzy
 msgid "remove unusable parts from key during export"
-msgstr "不可用的私钥"
+msgstr "导出时清除密钥中的不可用部分"
 
 #: g10/export.c:71
 msgid "remove as much as possible from key during export"
-msgstr ""
+msgstr "导出时尽可能清除密钥中的可选部分"
 
 #: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
@@ -943,18 +1028,18 @@ msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
 #: g10/export.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
+msgstr "密钥 %s：密钥在卡上——已跳过\n"
 
 #: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
-msgstr ""
+msgstr "准备导出一把不受保护的子钥\n"
 
 #: g10/export.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "failed to unprotect the subkey: %s\n"
-msgstr "无法存储密钥：%s\n"
+msgstr "无法取消保护子钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
 #: g10/export.c:565
@@ -976,15 +1061,15 @@ msgstr ""
 
 #: g10/gpg.c:377
 msgid "|[file]|make a signature"
-msgstr "|[文件名]|生成一份签字"
+msgstr "|[文件名]|生成一份签名"
 
 #: g10/gpg.c:378
 msgid "|[file]|make a clear text signature"
-msgstr "|[文件名]|生成一份明文签字"
+msgstr "|[文件名]|生成一份明文签名"
 
 #: g10/gpg.c:379
 msgid "make a detached signature"
-msgstr "生成一份分离的签字"
+msgstr "生成一份分离的签名"
 
 #: g10/gpg.c:380
 msgid "encrypt data"
@@ -1000,7 +1085,7 @@ msgstr "解密数据(默认)"
 
 #: g10/gpg.c:386
 msgid "verify a signature"
-msgstr "验证签字"
+msgstr "验证签名"
 
 #: g10/gpg.c:388
 msgid "list keys"
@@ -1008,11 +1093,11 @@ msgstr "列出密钥"
 
 #: g10/gpg.c:390
 msgid "list keys and signatures"
-msgstr "列出密钥和签字"
+msgstr "列出密钥和签名"
 
 #: g10/gpg.c:391
 msgid "list and check key signatures"
-msgstr "列出并检查密钥签字"
+msgstr "列出并检查密钥签名"
 
 #: g10/gpg.c:392
 msgid "list keys and fingerprints"
@@ -1036,15 +1121,15 @@ msgstr "从私钥钥匙环里删除密钥"
 
 #: g10/gpg.c:398
 msgid "sign a key"
-msgstr "为某把密钥添加签字"
+msgstr "为某把密钥添加签名"
 
 #: g10/gpg.c:399
 msgid "sign a key locally"
-msgstr "为某把密钥添加本地签字"
+msgstr "为某把密钥添加本地签名"
 
 #: g10/gpg.c:400
 msgid "sign or edit a key"
-msgstr "编辑某把密钥或为其添加签字"
+msgstr "编辑某把密钥或为其添加签名"
 
 #: g10/gpg.c:401
 msgid "generate a revocation certificate"
@@ -1094,7 +1179,8 @@ msgstr "更新信任度数据库"
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:437 g10/gpgv.c:71
+#: g10/gpg.c:437
+#: g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1114,7 +1200,7 @@ msgstr "|某甲|为收件者“某甲”加密"
 
 #: g10/gpg.c:452
 msgid "use this user-id to sign or decrypt"
-msgstr "使用这个用户标识来签字或解密"
+msgstr "使用这个用户标识来签名或解密"
 
 #: g10/gpg.c:453
 msgid "|N|set compress level N (0 disables)"
@@ -1128,7 +1214,8 @@ msgstr "使用标准的文本模式"
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:474 g10/gpgv.c:73
+#: g10/gpg.c:474
+#: g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
@@ -1170,13 +1257,14 @@ msgstr ""
 "@\n"
 "范例：\n"
 "\n"
-" -se -r Bob [文件名]          为 Bob 这个收件人签字及加密\n"
-" --clearsign [文件名]         做出明文签字\n"
-" --detach-sign [文件名]       做出分离式签字\n"
+" -se -r Bob [文件名]          为 Bob 这个收件人签名及加密\n"
+" --clearsign [文件名]         做出明文签名\n"
+" --detach-sign [文件名]       做出分离式签名\n"
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:757 g10/gpgv.c:98
+#: g10/gpg.c:757
+#: g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
@@ -1193,7 +1281,7 @@ msgid ""
 "default operation depends on the input data\n"
 msgstr ""
 "语法：gpg [选项] [文件名]\n"
-"签字、检查、加密或解密\n"
+"签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
 #: g10/gpg.c:788
@@ -1208,7 +1296,8 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:797 g10/keyedit.c:2310
+#: g10/gpg.c:797
+#: g10/keyedit.c:2310
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -1216,7 +1305,8 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:809 g10/keyedit.c:2356
+#: g10/gpg.c:809
+#: g10/keyedit.c:2356
 msgid "Compression: "
 msgstr "压缩："
 
@@ -1270,8 +1360,7 @@ msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
 #: g10/gpg.c:1282
 #, c-format
-msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
 #: g10/gpg.c:1285
@@ -1286,8 +1375,7 @@ msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
 #: g10/gpg.c:1294
 #, c-format
-msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
 #: g10/gpg.c:1297
@@ -1302,51 +1390,47 @@ msgstr "未知的配置项‘%s’\n"
 
 #: g10/gpg.c:1531
 msgid "display photo IDs during key listings"
-msgstr ""
+msgstr "列出密钥时显示用户标识"
 
 #: g10/gpg.c:1533
 msgid "show policy URLs during signature listings"
-msgstr ""
+msgstr "列出签名时显示策略 URL"
 
 #: g10/gpg.c:1535
-#, fuzzy
 msgid "show all notations during signature listings"
-msgstr "在私钥环里没有相应的签字\n"
+msgstr "列出签名时显示 IETF 标准注记"
 
 #: g10/gpg.c:1537
 msgid "show IETF standard notations during signature listings"
-msgstr ""
+msgstr "列出签名时显示 IETF 标准注记"
 
 #: g10/gpg.c:1541
 msgid "show user-supplied notations during signature listings"
-msgstr ""
+msgstr "列出签名时显示用户提供的注记"
 
 #: g10/gpg.c:1543
-#, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
-msgstr "给定的首选公钥服务器 URL 无效\n"
+msgstr "列出密钥时显示首选公钥服务器 URL"
 
 #: g10/gpg.c:1545
 msgid "show user ID validity during key listings"
-msgstr ""
+msgstr "列出密钥时显示用户标识的有效性"
 
 #: g10/gpg.c:1547
 msgid "show revoked and expired user IDs in key listings"
-msgstr ""
+msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
 #: g10/gpg.c:1549
 msgid "show revoked and expired subkeys in key listings"
-msgstr ""
+msgstr "列出密钥时显示已吊销或已过期的子钥"
 
 #: g10/gpg.c:1551
-#, fuzzy
 msgid "show the keyring name in key listings"
-msgstr "在私钥和公钥清单间切换"
+msgstr "列出密钥时显示钥匙环的名称"
 
 #: g10/gpg.c:1553
-#, fuzzy
 msgid "show expiration dates during signature listings"
-msgstr "在私钥环里没有相应的签字\n"
+msgstr "列出签名时显示过期日期"
 
 #: g10/gpg.c:1920
 #, c-format
@@ -1368,7 +1452,9 @@ msgstr "配置文件‘%s’：%s\n"
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
+#: g10/gpg.c:2188
+#: g10/gpg.c:2814
+#: g10/gpg.c:2833
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
@@ -1378,17 +1464,20 @@ msgstr "注意：一般情况下不会用到 %s！\n"
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2364 g10/gpg.c:2376
-#, fuzzy, c-format
+#: g10/gpg.c:2364
+#: g10/gpg.c:2376
+#, c-format
 msgid "`%s' is not a valid signature expiration\n"
-msgstr "‘%s’不是一个有效的字符集\n"
+msgstr "‘%s’不是一个有效的签名过期日期\n"
 
 #: g10/gpg.c:2452
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
+#: g10/gpg.c:2476
+#: g10/gpg.c:2663
+#: g10/keyedit.c:4064
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
@@ -1430,46 +1519,43 @@ msgstr "无效的列表选项\n"
 
 #: g10/gpg.c:2529
 msgid "display photo IDs during signature verification"
-msgstr ""
+msgstr "验证签名时显示照片标识"
 
 #: g10/gpg.c:2531
 msgid "show policy URLs during signature verification"
-msgstr ""
+msgstr "验证签名时显示策略 URL"
 
 #: g10/gpg.c:2533
-#, fuzzy
 msgid "show all notations during signature verification"
-msgstr "‘%s’不是一个有效的字符集\n"
+msgstr "验证签名时显示所有注记"
 
 #: g10/gpg.c:2535
 msgid "show IETF standard notations during signature verification"
-msgstr ""
+msgstr "验证签名时显示 IETF 标准注记"
 
 #: g10/gpg.c:2539
 msgid "show user-supplied notations during signature verification"
-msgstr ""
+msgstr "验证签名时显示用户提供的注记"
 
 #: g10/gpg.c:2541
-#, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
-msgstr "给定的首选公钥服务器 URL 无效\n"
+msgstr "验证签名时显示首选公钥服务器 URL"
 
 #: g10/gpg.c:2543
-#, fuzzy
 msgid "show user ID validity during signature verification"
-msgstr "‘%s’不是一个有效的字符集\n"
+msgstr "验证签名时显示用户标识的有效性"
 
 #: g10/gpg.c:2545
 msgid "show revoked and expired user IDs in signature verification"
-msgstr ""
+msgstr "验证密钥时显示已吊销或已过期的子钥"
 
 #: g10/gpg.c:2547
 msgid "validate signatures with PKA data"
-msgstr ""
+msgstr "使用 PKA 数据验证签名的有效性"
 
 #: g10/gpg.c:2549
 msgid "elevate the trust of signatures with valid PKA data"
-msgstr ""
+msgstr "提升带有有效 PKA 数据的签名的信任度"
 
 #: g10/gpg.c:2556
 #, c-format
@@ -1486,13 +1572,13 @@ msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
 #: g10/gpg.c:2729
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s：%d：无效的校验选项\n"
+msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
 #: g10/gpg.c:2732
 msgid "invalid auto-key-locate list\n"
-msgstr ""
+msgstr "无效的 auto-key-locate 清单\n"
 
 #: g10/gpg.c:2803
 msgid "WARNING: program may create a core file!\n"
@@ -1514,9 +1600,9 @@ msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
 #: g10/gpg.c:2826
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent 在此次舍话中无法使用\n"
+msgstr "注意：%s 本版本中不可用\n"
 
 #: g10/gpg.c:2841
 #, c-format
@@ -1525,11 +1611,11 @@ msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
 #: g10/gpg.c:2855
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
+msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
 #: g10/gpg.c:2861
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
+msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
 #: g10/gpg.c:2867
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
@@ -1539,11 +1625,13 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2947 g10/gpg.c:2971
+#: g10/gpg.c:2947
+#: g10/gpg.c:2971
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2953 g10/gpg.c:2977
+#: g10/gpg.c:2953
+#: g10/gpg.c:2977
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -1557,11 +1645,11 @@ msgstr "所选的证书散列算法无效\n"
 
 #: g10/gpg.c:2980
 msgid "completes-needed must be greater than 0\n"
-msgstr "需要的完全可信签字数一定要大于 0\n"
+msgstr "需要的完全可信签名数一定要大于 0\n"
 
 #: g10/gpg.c:2982
 msgid "marginals-needed must be greater than 1\n"
-msgstr "需要的勉强可信签字数一定要大于 1\n"
+msgstr "需要的勉强可信签名数一定要大于 1\n"
 
 #: g10/gpg.c:2984
 msgid "max-cert-depth must be in the range from 1 to 255\n"
@@ -1761,7 +1849,7 @@ msgstr "给定的的验证策略 URL 无效\n"
 
 #: g10/gpg.c:4122
 msgid "the given signature policy URL is invalid\n"
-msgstr "给定的签字策略 URL 无效\n"
+msgstr "给定的签名策略 URL 无效\n"
 
 #: g10/gpg.c:4155
 msgid "the given preferred keyserver URL is invalid\n"
@@ -1775,18 +1863,22 @@ msgstr "pk 缓存里项目太多――已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
+#: g10/getkey.c:948
+#: g10/getkey.c:958
+#: g10/getkey.c:968
+#: g10/getkey.c:984
 #: g10/getkey.c:999
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
-msgstr ""
+msgstr "自动获取‘%s’，通过 %s\n"
 
 #: g10/getkey.c:1826
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2380 g10/keyedit.c:3707
+#: g10/getkey.c:2380
+#: g10/keyedit.c:3707
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1827,7 +1919,7 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 "语法：gpg [选项] [文件]\n"
-"用已知的受信任密钥来检查签字\n"
+"用已知的受信任密钥来检查签名\n"
 
 #: g10/helptext.c:49
 msgid ""
@@ -1853,8 +1945,7 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
 #: g10/helptext.c:66
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
+msgid "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "输入您要递送的报文的接收者的用户标识。"
 
 #: g10/helptext.c:70
@@ -1872,13 +1963,13 @@ msgid ""
 msgstr ""
 "选择使用的算法。\n"
 "\n"
-"DSA (也叫 DSS)即“数字签字算法”（美国国家标准），只能够用作签字。\n"
+"DSA (也叫 DSS)即“数字签名算法”(美国国家标准)，只能够用作签名。\n"
 "\n"
 "Elgamal 是一种只能用作加密的算法。\n"
 "\n"
-"RSA 可以用作签字或加密。\n"
+"RSA 可以用作签名或加密。\n"
 "\n"
-"第一把密钥(主钥)必须具有签字的能力。"
+"第一把密钥(主钥)必须具有签名的能力。"
 
 #: g10/helptext.c:84
 msgid ""
@@ -1886,15 +1977,20 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"通常来说用同一把密钥签字及加密并不是个好主意。这个算法只在特定的情况\n"
+"通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n"
 "下使用。请先咨询安全方面的专家。"
 
 #: g10/helptext.c:91
 msgid "Enter the size of the key"
 msgstr "请输入密钥的尺寸"
 
-#: g10/helptext.c:95 g10/helptext.c:100 g10/helptext.c:112 g10/helptext.c:144
-#: g10/helptext.c:172 g10/helptext.c:177 g10/helptext.c:182
+#: g10/helptext.c:95
+#: g10/helptext.c:100
+#: g10/helptext.c:112
+#: g10/helptext.c:144
+#: g10/helptext.c:172
+#: g10/helptext.c:177
+#: g10/helptext.c:182
 msgid "Answer \"yes\" or \"no\""
 msgstr "请回答“yes”或“no”"
 
@@ -1945,48 +2041,38 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified "
-"the\n"
+"\"0\" means you make no particular claim as to how carefully you verified the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful "
-"for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous "
-"user.\n"
+"    but you could not, or did not verify the key at all.  This is useful for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this "
-"could\n"
-"    mean that you verified the key fingerprint and checked the user ID on "
-"the\n"
+"\"2\" means you did casual verification of the key.  For example, this could\n"
+"    mean that you verified the key fingerprint and checked the user ID on the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this "
-"could\n"
+"\"3\" means you did extensive verification of the key.  For example, this could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with "
-"a\n"
-"    photo ID (such as a passport) that the name of the key owner matches "
-"the\n"
-"    name in the user ID on the key, and finally that you verified (by "
-"exchange\n"
+"    person, and that you checked, by means of a hard to forge document with a\n"
+"    photo ID (such as a passport) that the name of the key owner matches the\n"
+"    name in the user ID on the key, and finally that you verified (by exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive"
-"\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"当您为某把密钥上某个用户标识添加签字时，您必须首先验证这把密钥确实属于\n"
+"当您为某把密钥上某个用户标识添加签名时，您必须首先验证这把密钥确实属于\n"
 "署名于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验证，对其\n"
 "他人是非常有用的\n"
 "\n"
 "“0” 表示您对您有多么仔细地验证这把密钥的问题不表态。\n"
 "\n"
 "“1” 表示您相信这把密钥属于那个声明是主人的人，但是您不能或根本没有验\n"
-"      证过。如果您为一把属于类似虚拟人物的密钥签字，这个选择很有用。\n"
+"      证过。如果您为一把属于类似虚拟人物的密钥签名，这个选择很有用。\n"
 "\n"
 "“2” 表示您随意地验证了那把密钥。例如，您验证了这把密钥的指纹，或比对\n"
 "      照片验证了用户标识。\n"
@@ -1997,13 +2083,13 @@ msgstr ""
 "      了密钥上的电子邮件地址确实属于密钥持有人。\n"
 "\n"
 "请注意上述关于验证级别 2 和 3 的说明仅是例子而已。最终还是由您自己决定\n"
-"当您为其他密钥签字时，什么是“随意”，而什么是“大量而详尽”。\n"
+"当您为其他密钥签名时，什么是“随意”，而什么是“大量而详尽”。\n"
 "\n"
 "如果您不知道应该选什么答案的话，就选“0”。"
 
 #: g10/helptext.c:186
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "如果您想要为所有用户标识签字的话就选“yes”"
+msgstr "如果您想要为所有用户标识签名的话就选“yes”"
 
 #: g10/helptext.c:190
 msgid ""
@@ -2023,8 +2109,8 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"这是一份在这把密钥上有效的签字；通常您不会想要删除这份签字，\n"
-"因为要与这把密钥或拥有这把密钥的签字的密钥建立认证关系可能\n"
+"这是一份在这把密钥上有效的签名；通常您不会想要删除这份签名，\n"
+"因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n"
 "相当重要。"
 
 #: g10/helptext.c:205
@@ -2034,15 +2120,15 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"这份签字无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n"
-"直到您知道此签字使用了哪一把密钥；因为用来签字的密钥可能与\n"
+"这份签名无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n"
+"直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n"
 "其他已经验证的密钥存在信任关系。"
 
 #: g10/helptext.c:211
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "这份签字无效。应当把它从您的钥匙环里删除。"
+msgstr "这份签名无效。应当把它从您的钥匙环里删除。"
 
 #: g10/helptext.c:215
 msgid ""
@@ -2052,9 +2138,9 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"这是一份将密钥与用户标识相联系的签字。通常不应删除这样的签字。\n"
+"这是一份将密钥与用户标识相联系的签名。通常不应删除这样的签名。\n"
 "事实上，一旦删除，GnuPG可能从此就不能再使用这把密钥了。因此，\n"
-"只有在这把密钥的第一个自身签字因某些原因失效，而有第二个自身签\n"
+"只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n"
 "字可用的情况下才这么做。"
 
 #: g10/helptext.c:223
@@ -2076,7 +2162,7 @@ msgstr "请再次输入上次的密码，以确定您到底键入了些什么。
 
 #: g10/helptext.c:240
 msgid "Give the name of the file to which the signature applies"
-msgstr "请给定要添加签字的文件名"
+msgstr "请给定要添加签名的文件名"
 
 #: g10/helptext.c:245
 msgid "Answer \"yes\" if it is okay to overwrite the file"
@@ -2138,34 +2224,31 @@ msgstr "‘%s’没有可用的帮助"
 
 #: g10/import.c:96
 msgid "import signatures that are marked as local-only"
-msgstr ""
+msgstr "导入被标记为局部的签名"
 
 #: g10/import.c:98
 msgid "repair damage from the pks keyserver during import"
-msgstr ""
+msgstr "导入时修复 PKS 公钥服务器导致的损坏"
 
 #: g10/import.c:100
-#, fuzzy
 msgid "do not update the trustdb after import"
-msgstr "更新信任度数据库"
+msgstr "导入后不更新信任度数据库"
 
 #: g10/import.c:102
-#, fuzzy
 msgid "create a public key when importing a secret key"
-msgstr "公钥与私钥不吻合！\n"
+msgstr "导入私钥时创建对应的公钥"
 
 #: g10/import.c:104
 msgid "only accept updates to existing keys"
-msgstr ""
+msgstr "只接受对已有密钥的更新"
 
 #: g10/import.c:106
-#, fuzzy
 msgid "remove unusable parts from key after import"
-msgstr "不可用的私钥"
+msgstr "导入后清除密钥中无用的部分"
 
 #: g10/import.c:108
 msgid "remove as much as possible from key after import"
-msgstr ""
+msgstr "导入后尽可能清除密钥中的可选部分"
 
 #: g10/import.c:266
 #, c-format
@@ -2215,7 +2298,7 @@ msgstr "        新的子钥：%lu\n"
 #: g10/import.c:311
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "        新的签字：%lu\n"
+msgstr "        新的签名：%lu\n"
 
 #: g10/import.c:313
 #, c-format
@@ -2243,21 +2326,21 @@ msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
 #: g10/import.c:323
-#, fuzzy, c-format
+#, c-format
 msgid "    signatures cleaned: %lu\n"
-msgstr "目前已创建的签字：%lu\n"
+msgstr "      清除的签名：%lu\n"
 
 #: g10/import.c:325
-#, fuzzy, c-format
+#, c-format
 msgid "      user IDs cleaned: %lu\n"
-msgstr "      读取的私钥：%lu\n"
+msgstr "  清除的用户标识：%lu\n"
 
 #: g10/import.c:566
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
-msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
+msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
 #: g10/import.c:604
 #, c-format
@@ -2287,7 +2370,8 @@ msgstr "以避免可能的算法不匹配问题\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:717 g10/import.c:1115
+#: g10/import.c:717
+#: g10/import.c:1115
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
@@ -2300,7 +2384,7 @@ msgstr "密钥 %s：PKS 子钥破损已修复\n"
 #: g10/import.c:761
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
+msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
 #: g10/import.c:767
 #, c-format
@@ -2309,9 +2393,10 @@ msgstr "密钥 %s：没有有效的用户标识\n"
 
 #: g10/import.c:769
 msgid "this may be caused by a missing self-signature\n"
-msgstr "这可能由于遗失自身签字所致\n"
+msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:779 g10/import.c:1237
+#: g10/import.c:779
+#: g10/import.c:1237
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
@@ -2326,13 +2411,20 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
+#: g10/import.c:799
+#: g10/openfile.c:267
+#: g10/sign.c:853
+#: g10/sign.c:1139
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
-#: g10/import.c:2360 g10/import.c:2382
+#: g10/import.c:803
+#: g10/import.c:898
+#: g10/import.c:1155
+#: g10/import.c:1298
+#: g10/import.c:2360
+#: g10/import.c:2382
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
@@ -2347,12 +2439,14 @@ msgstr "密钥 %s：公钥“%s”已导入\n"
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:863 g10/import.c:1255
+#: g10/import.c:863
+#: g10/import.c:1255
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:871 g10/import.c:1262
+#: g10/import.c:871
+#: g10/import.c:1262
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
@@ -2370,12 +2464,12 @@ msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 #: g10/import.c:914
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "密钥 %s：“%s”1 个新的签字\n"
+msgstr "密钥 %s：“%s”1 个新的签名\n"
 
 #: g10/import.c:917
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "密钥 %s：“%s”%d 个新的签字\n"
+msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
 #: g10/import.c:920
 #, c-format
@@ -2388,24 +2482,24 @@ msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
 #: g10/import.c:926
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "密钥 %s：“%s”%d 个新的签字\n"
+msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
 #: g10/import.c:929
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "密钥 %s：“%s”%d 个新的签字\n"
+msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
 #: g10/import.c:932
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
 #: g10/import.c:935
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
 #: g10/import.c:958
 #, c-format
@@ -2421,7 +2515,8 @@ msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1149 g10/import.c:2375
+#: g10/import.c:1149
+#: g10/import.c:2375
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
@@ -2459,7 +2554,7 @@ msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 #: g10/import.c:1371
 #, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "密钥 %s：签字没有用户标识\n"
+msgstr "密钥 %s：签名没有用户标识\n"
 
 #: g10/import.c:1386
 #, c-format
@@ -2469,14 +2564,15 @@ msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 #: g10/import.c:1388
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
+msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
 #: g10/import.c:1406
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1417 g10/import.c:1467
+#: g10/import.c:1417
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
@@ -2523,7 +2619,7 @@ msgstr "密钥 %s：已跳过子钥\n"
 #: g10/import.c:1574
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
+msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
 #: g10/import.c:1584
 #, c-format
@@ -2538,12 +2634,12 @@ msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 #: g10/import.c:1615
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
+msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
 #: g10/import.c:1623
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
+msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
 #: g10/import.c:1723
 #, c-format
@@ -2568,7 +2664,7 @@ msgstr "密钥 %s：已新增吊销证书“%s”\n"
 #: g10/import.c:1892
 #, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "密钥 %s：已新增直接密钥签字\n"
+msgstr "密钥 %s：已新增直接密钥签名\n"
 
 #: g10/import.c:2281
 msgid "NOTE: a key's S/N does not match the card's one\n"
@@ -2592,10 +2688,11 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:316 g10/keydb.c:319
-#, fuzzy, c-format
+#: g10/keydb.c:316
+#: g10/keydb.c:319
+#, c-format
 msgid "keyblock resource `%s': %s\n"
-msgstr "建立‘%s’时发生错误：%s\n"
+msgstr "密钥块资源‘%s’：%s\n"
 
 #: g10/keydb.c:698
 #, c-format
@@ -2608,61 +2705,67 @@ msgstr "[吊销]"
 
 #: g10/keyedit.c:267
 msgid "[self-signature]"
-msgstr "[自身签字]"
+msgstr "[自身签名]"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:345
+#: g10/keylist.c:390
 msgid "1 bad signature\n"
-msgstr "1 个损坏的签字\n"
+msgstr "1 个损坏的签名\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:347
+#: g10/keylist.c:392
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d 个损坏的签字\n"
+msgstr "%d 个损坏的签名\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:349
+#: g10/keylist.c:394
 msgid "1 signature not checked due to a missing key\n"
-msgstr "有 1 份签字因为遗失密钥而未被检查\n"
+msgstr "有 1 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:351
+#: g10/keylist.c:396
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
+msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:353
+#: g10/keylist.c:398
 msgid "1 signature not checked due to an error\n"
-msgstr "有 1 份签字因为某个错误而未被检查\n"
+msgstr "有 1 份签名因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:355 g10/keylist.c:400
+#: g10/keyedit.c:355
+#: g10/keylist.c:400
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "有 %d 份签字因为某些错误而未被检查\n"
+msgstr "有 %d 份签名因为某些错误而未被检查\n"
 
 #: g10/keyedit.c:357
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "检测到 1 个没有有效自身签字的用户标识\n"
+msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 
 #: g10/keyedit.c:359
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
+msgstr "检测到 %d 个没有有效自身签名的用户标识\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:263
+#: g10/keyedit.c:415
+#: g10/pkclist.c:263
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' "
-"keys\n"
-"(by looking at passports, checking fingerprints from different sources, "
-"etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' keys\n"
+"(by looking at passports, checking fingerprints from different sources, etc.)\n"
 msgstr ""
-"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检"
-"查\n"
+"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:275
+#: g10/keyedit.c:419
+#: g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:420 g10/pkclist.c:277
+#: g10/keyedit.c:420
+#: g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
@@ -2673,27 +2776,34 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
-"请输入这份信任签字的深度。\n"
-"深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
+"请输入这份信任签名的深度。\n"
+"深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
 
 #: g10/keyedit.c:455
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
+msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
 #: g10/keyedit.c:599
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
-#: g10/keyedit.c:896 g10/keyedit.c:1742
+#: g10/keyedit.c:608
+#: g10/keyedit.c:636
+#: g10/keyedit.c:663
+#: g10/keyedit.c:831
+#: g10/keyedit.c:896
+#: g10/keyedit.c:1742
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "您仍然想要为它签字吗？(y/N)"
+msgstr "您仍然想要为它签名吗？(y/N)"
 
-#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:622
+#: g10/keyedit.c:650
+#: g10/keyedit.c:677
+#: g10/keyedit.c:837
 #: g10/keyedit.c:1748
 msgid "  Unable to sign.\n"
-msgstr "  无法添加签字。\n"
+msgstr "  无法添加签名。\n"
 
 #: g10/keyedit.c:627
 #, c-format
@@ -2703,17 +2813,16 @@ msgstr "用户标识“%s”已过期。"
 #: g10/keyedit.c:655
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "警告：用户标识“%s”不含自身签字。"
+msgstr "警告：用户标识“%s”不含自身签名。"
 
 #: g10/keyedit.c:683
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\" is signable.  "
-msgstr "警告：用户标识“%s”不含自身签字。"
+msgstr "可以为用户标识“%s”添加签名。"
 
 #: g10/keyedit.c:685
-#, fuzzy
 msgid "Sign it? (y/N) "
-msgstr "真的要签字吗？(y/N)"
+msgstr "为其添加签名吗？(y/N)"
 
 #: g10/keyedit.c:707
 #, c-format
@@ -2721,53 +2830,53 @@ msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"“%s”的自身签字是 PGP 2.x 样\n"
-"式的签字。\n"
+"“%s”的自身签名是 PGP 2.x 样\n"
+"式的签名。\n"
 
 #: g10/keyedit.c:716
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
+msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)"
 
 #: g10/keyedit.c:730
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
-msgstr "您目前为“%s”的签字已经过期了。\n"
+msgstr "您目前为“%s”的签名已经过期了。\n"
 
 #: g10/keyedit.c:734
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
+msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)"
 
 #: g10/keyedit.c:755
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-msgstr "您目前为“%s”的签字是一份本地签字。\n"
+msgstr "您目前为“%s”的签名是一份本地签名。\n"
 
 #: g10/keyedit.c:759
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
+msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)"
 
 #: g10/keyedit.c:780
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "“%s”已由密钥 %s 在本地签字\n"
+msgstr "“%s”已由密钥 %s 在本地签名\n"
 
 #: g10/keyedit.c:783
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "“%s”已由密钥 %s 签字\n"
+msgstr "“%s”已由密钥 %s 签名\n"
 
 #: g10/keyedit.c:788
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "您仍然想要为它再次签字吗？(y/N)"
+msgstr "您仍然想要为它再次签名吗？(y/N)"
 
 #: g10/keyedit.c:810
 #, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "没有东西可以让密钥 %s 签字\n"
+msgstr "没有东西可以让密钥 %s 签名\n"
 
 #: g10/keyedit.c:825
 msgid "This key has expired!"
@@ -2780,13 +2889,11 @@ msgstr "这把密钥将在 %s 过期。\n"
 
 #: g10/keyedit.c:849
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
+msgstr "您想要让您的签名也同时过期吗？ (Y/n) "
 
 #: g10/keyedit.c:889
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
-msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签字。\n"
+msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n"
 
 #: g10/keyedit.c:891
 msgid "This would make the key unusable in PGP 2.x.\n"
@@ -2794,11 +2901,10 @@ msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
 #: g10/keyedit.c:916
 msgid ""
-"How carefully have you verified the key you are about to sign actually "
-"belongs\n"
+"How carefully have you verified the key you are about to sign actually belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
+"您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
 #: g10/keyedit.c:921
@@ -2831,28 +2937,28 @@ msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"您真的确定要签字这把密钥，使用您的密钥\n"
+"您真的确定要签名这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
 #: g10/keyedit.c:964
 msgid "This will be a self-signature.\n"
-msgstr "这将是一个自身签字。\n"
+msgstr "这将是一个自身签名。\n"
 
 #: g10/keyedit.c:970
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "警告：这份签字不会被标记为不可导出。\n"
+msgstr "警告：这份签名不会被标记为不可导出。\n"
 
 #: g10/keyedit.c:978
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "警告：这份签字不会被标记成不可吊销。\n"
+msgstr "警告：这份签名不会被标记成不可吊销。\n"
 
 #: g10/keyedit.c:988
 msgid "The signature will be marked as non-exportable.\n"
-msgstr "这份签字会被标记成不可导出。\n"
+msgstr "这份签名会被标记成不可导出。\n"
 
 #: g10/keyedit.c:995
 msgid "The signature will be marked as non-revocable.\n"
-msgstr "这份签字会被标记成不可吊销。\n"
+msgstr "这份签名会被标记成不可吊销。\n"
 
 #: g10/keyedit.c:1002
 msgid "I have not checked this key at all.\n"
@@ -2868,31 +2974,40 @@ msgstr "我非常小心地检查过这把密钥。\n"
 
 #: g10/keyedit.c:1022
 msgid "Really sign? (y/N) "
-msgstr "真的要签字吗？(y/N)"
+msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
-#: g10/keyedit.c:4999 g10/sign.c:374
+#: g10/keyedit.c:1067
+#: g10/keyedit.c:4783
+#: g10/keyedit.c:4874
+#: g10/keyedit.c:4938
+#: g10/keyedit.c:4999
+#: g10/sign.c:374
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "签字时失败： %s\n"
+msgstr "签名时失败： %s\n"
 
 #: g10/keyedit.c:1132
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3199
+#: g10/keyedit.c:1143
+#: g10/keygen.c:3199
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
+#: g10/keyedit.c:1147
+#: g10/keygen.c:3187
+#: g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1151 g10/keygen.c:3202
+#: g10/keyedit.c:1151
+#: g10/keygen.c:3202
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1155 g10/keygen.c:3206
+#: g10/keyedit.c:1155
+#: g10/keygen.c:3206
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -2909,7 +3024,8 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1194 g10/keygen.c:1897
+#: g10/keyedit.c:1194
+#: g10/keygen.c:1897
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -2927,7 +3043,7 @@ msgstr "您真的想要这么做吗？(y/N)"
 
 #: g10/keyedit.c:1273
 msgid "moving a key signature to the correct place\n"
-msgstr "正在把密钥的签字移动到正确的位置去\n"
+msgstr "正在把密钥的签名移动到正确的位置去\n"
 
 #: g10/keyedit.c:1359
 msgid "save and quit"
@@ -2951,23 +3067,23 @@ msgstr "选择子钥 N"
 
 #: g10/keyedit.c:1367
 msgid "check signatures"
-msgstr "检查签字"
+msgstr "检查签名"
 
 #: g10/keyedit.c:1372
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
+msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
 #: g10/keyedit.c:1377
 msgid "sign selected user IDs locally"
-msgstr "为所选用户标识添加本地签字"
+msgstr "为所选用户标识添加本地签名"
 
 #: g10/keyedit.c:1379
 msgid "sign selected user IDs with a trust signature"
-msgstr "为所选用户标识添加信任签字"
+msgstr "为所选用户标识添加信任签名"
 
 #: g10/keyedit.c:1381
 msgid "sign selected user IDs with a non-revocable signature"
-msgstr "为所选用户标识添加不可吊销签字"
+msgstr "为所选用户标识添加不可吊销签名"
 
 #: g10/keyedit.c:1385
 msgid "add a user ID"
@@ -3007,7 +3123,7 @@ msgstr "增加一把吊销密钥"
 
 #: g10/keyedit.c:1410
 msgid "delete signatures from the selected user IDs"
-msgstr "删除所选用户标识上的签字"
+msgstr "删除所选用户标识上的签名"
 
 #: g10/keyedit.c:1412
 msgid "change the expiration date for the key or selected subkeys"
@@ -3034,14 +3150,12 @@ msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
 #: g10/keyedit.c:1428
-#, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
 #: g10/keyedit.c:1430
-#, fuzzy
 msgid "set a notation for the selected user IDs"
-msgstr "设定所选用户标识的首选项"
+msgstr "为所选用户标识的设定注记"
 
 #: g10/keyedit.c:1432
 msgid "change the passphrase"
@@ -3053,7 +3167,7 @@ msgstr "更改信任度"
 
 #: g10/keyedit.c:1438
 msgid "revoke signatures on the selected user IDs"
-msgstr "吊销所选用户标识上的签字"
+msgstr "吊销所选用户标识上的签名"
 
 #: g10/keyedit.c:1440
 msgid "revoke selected user IDs"
@@ -3077,11 +3191,11 @@ msgstr "显示选定的照片标识"
 
 #: g10/keyedit.c:1450
 msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr ""
+msgstr "压缩不可用的用户标识并删除不可用的签名"
 
 #: g10/keyedit.c:1452
 msgid "compact unusable user IDs and remove all signatures from key"
-msgstr ""
+msgstr "压缩不可用的用户标识并删除所有签名"
 
 #: g10/keyedit.c:1570
 #, c-format
@@ -3102,13 +3216,12 @@ msgstr "请先使用“toggle”指令。\n"
 
 #: g10/keyedit.c:1696
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures "
-"(lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
-"* ‘sign’命令可以带‘l’前缀(lsign)以添加本地签字，或‘t’前缀(tsign)以添加\n"
-"  信任签字，或‘nr’前缀(nrsign)以添加不可吊销签字，或者以上三种前缀的任何组\n"
+"* ‘sign’命令可以带‘l’前缀(lsign)以添加本地签名，或‘t’前缀(tsign)以添加\n"
+"  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
 #: g10/keyedit.c:1736
@@ -3117,23 +3230,25 @@ msgstr "密钥已被吊销。"
 
 #: g10/keyedit.c:1755
 msgid "Really sign all user IDs? (y/N) "
-msgstr "真的为所有的用户标识签字吗？(y/N)"
+msgstr "真的为所有的用户标识签名吗？(y/N)"
 
 #: g10/keyedit.c:1762
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "提示：选择要添加签字的用户标识\n"
+msgstr "提示：选择要添加签名的用户标识\n"
 
 #: g10/keyedit.c:1771
 #, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "未知的签字类型‘%s’\n"
+msgstr "未知的签名类型‘%s’\n"
 
 #: g10/keyedit.c:1794
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
+#: g10/keyedit.c:1816
+#: g10/keyedit.c:1836
+#: g10/keyedit.c:2002
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
@@ -3204,8 +3319,7 @@ msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
 #: g10/keyedit.c:2087
-msgid ""
-"Owner trust may not be set while using an user provided trust database\n"
+msgid "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
 #: g10/keyedit.c:2129
@@ -3254,17 +3368,15 @@ msgstr "特点："
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2411 g10/keylist.c:308
+#: g10/keyedit.c:2411
+#: g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2419 g10/keyedit.c:2420
-#, fuzzy
+#: g10/keyedit.c:2419
+#: g10/keyedit.c:2420
 msgid "Notations: "
-msgstr ""
-"@\n"
-"选项：\n"
-" "
+msgstr "注记："
 
 #: g10/keyedit.c:2630
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
@@ -3284,25 +3396,43 @@ msgstr "这把密钥可被 %s 密钥 %s 吊销"
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:511
+#: g10/keyedit.c:2732
+#: g10/keyedit.c:2788
+#: g10/keyedit.c:2849
+#: g10/keyedit.c:2864
+#: g10/keylist.c:194
+#: g10/keyserver.c:511
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
+#: g10/keyedit.c:2735
+#: g10/keylist.c:771
+#: g10/keylist.c:865
+#: g10/mainproc.c:964
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2737
+#: g10/keylist.c:742
+#: g10/keylist.c:777
+#: g10/keylist.c:871
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
-#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
+#: g10/keyedit.c:2739
+#: g10/keyedit.c:2790
+#: g10/keyedit.c:2851
+#: g10/keyedit.c:2866
+#: g10/keylist.c:196
+#: g10/keylist.c:748
+#: g10/keylist.c:783
+#: g10/keylist.c:877
+#: g10/keylist.c:898
+#: g10/keyserver.c:517
+#: g10/mainproc.c:970
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -3326,7 +3456,8 @@ msgstr "有效性：%s"
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2795 g10/keylist.c:200
+#: g10/keyedit.c:2795
+#: g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
@@ -3336,13 +3467,21 @@ msgid ""
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
-#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2883
+#: g10/keyedit.c:3229
+#: g10/keyserver.c:521
+#: g10/mainproc.c:1772
+#: g10/trustdb.c:1179
+#: g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
-#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2885
+#: g10/keyedit.c:3231
+#: g10/keyserver.c:525
+#: g10/mainproc.c:1774
+#: g10/trustdb.c:532
+#: g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
@@ -3350,19 +3489,18 @@ msgstr "已过期"
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
-msgstr ""
-"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
+msgstr "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
 #: g10/keyedit.c:3011
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3016 g10/keyedit.c:3346
+#: g10/keyedit.c:3016
+#: g10/keyedit.c:3346
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
@@ -3372,48 +3510,47 @@ msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
 #: g10/keyedit.c:3162
 msgid "Delete this good signature? (y/N/q)"
-msgstr "删除这个完好的签字吗？(y/N/q)"
+msgstr "删除这个完好的签名吗？(y/N/q)"
 
 #: g10/keyedit.c:3172
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "删除这个无效的签字吗？(y/N/q)"
+msgstr "删除这个无效的签名吗？(y/N/q)"
 
 #: g10/keyedit.c:3176
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "删除这个未知的签字吗？(y/N/q)"
+msgstr "删除这个未知的签名吗？(y/N/q)"
 
 #: g10/keyedit.c:3182
 msgid "Really delete this self-signature? (y/N)"
-msgstr "真的要删除这个自身签字吗？(y/N)"
+msgstr "真的要删除这个自身签名吗？(y/N)"
 
 #: g10/keyedit.c:3196
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "已经删除了 %d 个签字。\n"
+msgstr "已经删除了 %d 个签名。\n"
 
 #: g10/keyedit.c:3197
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "已经删除了 %d 个签字。\n"
+msgstr "已经删除了 %d 个签名。\n"
 
 #: g10/keyedit.c:3200
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3233 g10/trustdb.c:1703
-#, fuzzy
+#: g10/keyedit.c:3233
+#: g10/trustdb.c:1703
 msgid "invalid"
-msgstr "无效的 ASCII 封装格式"
+msgstr "无效"
 
 #: g10/keyedit.c:3249
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "用户标识“%s”已经被吊销。\n"
+msgstr "用户标识“%s”：无用部分已清除\n"
 
 #: g10/keyedit.c:3341
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
-"cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
@@ -3450,8 +3587,7 @@ msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
 #: g10/keyedit.c:3459
-msgid ""
-"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
 #: g10/keyedit.c:3520
@@ -3476,26 +3612,29 @@ msgstr "您不能变更 v3 密钥的使用期限\n"
 
 #: g10/keyedit.c:3595
 msgid "No corresponding signature in secret ring\n"
-msgstr "在私钥环里没有相应的签字\n"
+msgstr "在私钥环里没有相应的签名\n"
 
 #: g10/keyedit.c:3668
-#, fuzzy, c-format
+#, c-format
 msgid "signing subkey %s is already cross-certified\n"
-msgstr "警告：正要签字的子钥 %s 未经交叉验证\n"
+msgstr "签名的子钥 %s 已经交叉验证\n"
 
 #: g10/keyedit.c:3674
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
-msgstr ""
+msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
 #: g10/keyedit.c:3836
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
+#: g10/keyedit.c:3875
+#: g10/keyedit.c:3985
+#: g10/keyedit.c:4105
+#: g10/keyedit.c:4246
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "跳过用户标识“%s”的 v3 自身签字\n"
+msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
 #: g10/keyedit.c:4046
 msgid "Enter your preferred keyserver URL: "
@@ -3510,14 +3649,12 @@ msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
 #: g10/keyedit.c:4189
-#, fuzzy
 msgid "Enter the notation: "
-msgstr "签字标记："
+msgstr "输入注记："
 
 #: g10/keyedit.c:4338
-#, fuzzy
 msgid "Proceed? (y/N) "
-msgstr "是否覆盖？(y/N)"
+msgstr "继续？(y/N)"
 
 #: g10/keyedit.c:4402
 #, c-format
@@ -3525,9 +3662,9 @@ msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
 #: g10/keyedit.c:4460
-#, fuzzy, c-format
+#, c-format
 msgid "No user ID with hash %s\n"
-msgstr "没有索引为 %d 的用户标识\n"
+msgstr "没有散列值为 %s 的用户标识\n"
 
 #: g10/keyedit.c:4487
 #, c-format
@@ -3539,19 +3676,23 @@ msgstr "没有索引为 %d 的子钥\n"
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
+#: g10/keyedit.c:4625
+#: g10/keyedit.c:4689
+#: g10/keyedit.c:4732
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
+msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
+#: g10/keyedit.c:4627
+#: g10/keyedit.c:4691
+#: g10/keyedit.c:4734
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
 #: g10/keyedit.c:4631
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "这份签字已在 %s 过期。\n"
+msgstr "这份签名已在 %s 过期。\n"
 
 #: g10/keyedit.c:4635
 msgid "Are you sure you still want to revoke it? (y/N) "
@@ -3559,12 +3700,12 @@ msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
 #: g10/keyedit.c:4639
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
+msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
 #: g10/keyedit.c:4666
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
+msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
 #: g10/keyedit.c:4692
 msgid " (non-revocable)"
@@ -3577,7 +3718,7 @@ msgstr "由您的密钥 %s 于 %s 吊销\n"
 
 #: g10/keyedit.c:4721
 msgid "You are about to revoke these signatures:\n"
-msgstr "您正在吊销这些签字：\n"
+msgstr "您正在吊销这些签名：\n"
 
 #: g10/keyedit.c:4741
 msgid "Really create the revocation certificates? (y/N) "
@@ -3595,7 +3736,7 @@ msgstr "用户标识“%s”已经被吊销。\n"
 #: g10/keyedit.c:4858
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
+msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
 #: g10/keyedit.c:4922
 #, c-format
@@ -3636,34 +3777,40 @@ msgstr "首选项字符串里有无效项‘%s’\n"
 
 #: g10/keygen.c:872
 msgid "writing direct signature\n"
-msgstr "正在写入直接签字\n"
+msgstr "正在写入直接签名\n"
 
 #: g10/keygen.c:911
 msgid "writing self signature\n"
-msgstr "正在写入自身签字\n"
+msgstr "正在写入自身签名\n"
 
 #: g10/keygen.c:961
 msgid "writing key binding signature\n"
-msgstr "正在写入密钥绑定签字\n"
+msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
+#: g10/keygen.c:1022
+#: g10/keygen.c:1104
+#: g10/keygen.c:1109
+#: g10/keygen.c:1225
 #: g10/keygen.c:2762
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
+#: g10/keygen.c:1027
+#: g10/keygen.c:1115
+#: g10/keygen.c:1230
+#: g10/keygen.c:2768
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
 #: g10/keygen.c:1323
 msgid "Sign"
-msgstr "签字"
+msgstr "签名"
 
 #: g10/keygen.c:1326
 msgid "Certify"
-msgstr ""
+msgstr "验证"
 
 #: g10/keygen.c:1329
 msgid "Encrypt"
@@ -3689,7 +3836,7 @@ msgstr "目前允许的操作："
 #: g10/keygen.c:1368
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr "   (%c) 选择是否用于签字\n"
+msgstr "   (%c) 选择是否用于签名\n"
 
 #: g10/keygen.c:1371
 #, c-format
@@ -3718,7 +3865,7 @@ msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 #: g10/keygen.c:1436
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (仅用于签字)\n"
+msgstr "   (%d) DSA (仅用于签名)\n"
 
 #: g10/keygen.c:1438
 #, c-format
@@ -3733,7 +3880,7 @@ msgstr "   (%d) ElGamal (仅用于加密)\n"
 #: g10/keygen.c:1441
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (仅用于签字)\n"
+msgstr "   (%d) RSA (仅用于签名)\n"
 
 #: g10/keygen.c:1443
 #, c-format
@@ -3770,7 +3917,8 @@ msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1556 g10/keygen.c:1561
+#: g10/keygen.c:1556
+#: g10/keygen.c:1561
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
@@ -3800,21 +3948,21 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"请设定这份签字的有效期限。\n"
-"         0 = 签字永不过期\n"
-"      <n>  = 签字在 n 天后过期\n"
-"      <n>w = 签字在 n 周后过期\n"
-"      <n>m = 签字在 n 月后过期\n"
-"      <n>y = 签字在 n 年后过期\n"
+"请设定这份签名的有效期限。\n"
+"         0 = 签名永不过期\n"
+"      <n>  = 签名在 n 天后过期\n"
+"      <n>w = 签名在 n 周后过期\n"
+"      <n>m = 签名在 n 月后过期\n"
+"      <n>y = 签名在 n 年后过期\n"
 
 #: g10/keygen.c:1644
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
 #: g10/keygen.c:1649
-#, fuzzy, c-format
+#, c-format
 msgid "Signature is valid for? (%s) "
-msgstr "签字的有效期限是多久？(0) "
+msgstr "签名的有效期限是多久？(%s) "
 
 #: g10/keygen.c:1667
 msgid "invalid value\n"
@@ -3826,7 +3974,7 @@ msgstr "密钥永远不会过期\n"
 
 #: g10/keygen.c:1675
 msgid "Signature does not expire at all\n"
-msgstr "签字永远不会过期\n"
+msgstr "签名永远不会过期\n"
 
 #: g10/keygen.c:1680
 #, c-format
@@ -3836,7 +3984,7 @@ msgstr "密钥于 %s 过期\n"
 #: g10/keygen.c:1681
 #, c-format
 msgid "Signature expires at %s\n"
-msgstr "签字于 %s 过期\n"
+msgstr "签名于 %s 过期\n"
 
 #: g10/keygen.c:1687
 msgid ""
@@ -3853,15 +4001,13 @@ msgstr "以上正确吗？(y/n)"
 #: g10/keygen.c:1715
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user "
-"ID\n"
+"You need a user ID to identify your key; the software constructs the user ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 msgstr ""
 "\n"
-"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组"
-"合\n"
+"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组合\n"
 "成用户标识，如下所示：\n"
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
@@ -3953,7 +4099,8 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1898 g10/passphrase.c:810
+#: g10/keygen.c:1898
+#: g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -3984,17 +4131,20 @@ msgstr ""
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2907 g10/keygen.c:3052
+#: g10/keygen.c:2907
+#: g10/keygen.c:3052
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2909 g10/keygen.c:3055
+#: g10/keygen.c:2909
+#: g10/keygen.c:3055
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2912 g10/keygen.c:3058
+#: g10/keygen.c:2912
+#: g10/keygen.c:3058
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
@@ -4021,7 +4171,7 @@ msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
 #: g10/keygen.c:3095
 msgid "public and secret key created and signed.\n"
-msgstr "公钥和私钥已经生成并经签字。\n"
+msgstr "公钥和私钥已经生成并经签名。\n"
 
 #: g10/keygen.c:3106
 msgid ""
@@ -4031,28 +4181,34 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
+#: g10/keygen.c:3118
+#: g10/keygen.c:3247
+#: g10/keygen.c:3363
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276
+#: g10/keygen.c:3170
+#: g10/keygen.c:3298
+#: g10/sign.c:276
 #, c-format
-msgid ""
-"key has been created %lu second in future (time warp or clock problem)\n"
+msgid "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278
+#: g10/keygen.c:3172
+#: g10/keygen.c:3300
+#: g10/sign.c:278
 #, c-format
-msgid ""
-"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3181 g10/keygen.c:3311
+#: g10/keygen.c:3181
+#: g10/keygen.c:3311
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3220 g10/keygen.c:3344
+#: g10/keygen.c:3220
+#: g10/keygen.c:3344
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
@@ -4071,17 +4227,20 @@ msgstr "不能创建备份文件‘%s’：%s\n"
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keyid.c:498 g10/keyid.c:510 g10/keyid.c:522 g10/keyid.c:534
+#: g10/keyid.c:498
+#: g10/keyid.c:510
+#: g10/keyid.c:522
+#: g10/keyid.c:534
 msgid "never     "
 msgstr "永不过期"
 
 #: g10/keylist.c:265
 msgid "Critical signature policy: "
-msgstr "关键签字策略："
+msgstr "关键签名策略："
 
 #: g10/keylist.c:267
 msgid "Signature policy: "
-msgstr "签字策略："
+msgstr "签名策略："
 
 #: g10/keylist.c:306
 msgid "Critical preferred keyserver: "
@@ -4089,11 +4248,11 @@ msgstr "关键首选公钥服务器："
 
 #: g10/keylist.c:359
 msgid "Critical signature notation: "
-msgstr "关键签字标记："
+msgstr "关键签名注记："
 
 #: g10/keylist.c:361
 msgid "Signature notation: "
-msgstr "签字标记："
+msgstr "签名注记："
 
 #: g10/keylist.c:471
 msgid "Keyring"
@@ -4118,7 +4277,8 @@ msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1520 g10/keylist.c:1524
+#: g10/keylist.c:1520
+#: g10/keylist.c:1524
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
@@ -4157,12 +4317,12 @@ msgstr "缓存钥匙环‘%s’\n"
 #: g10/keyring.c:1422
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "目前已缓存 %lu 把密钥(%lu 份签字)\n"
+msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
 #: g10/keyring.c:1434
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
+msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
 #: g10/keyring.c:1505
 #, c-format
@@ -4171,32 +4331,31 @@ msgstr "%s：钥匙环已建立\n"
 
 #: g10/keyserver.c:61
 msgid "include revoked keys in search results"
-msgstr ""
+msgstr "在搜索结果中包含已吊销的密钥"
 
 #: g10/keyserver.c:62
 msgid "include subkeys when searching by key ID"
-msgstr ""
+msgstr "按钥匙号搜索时包含子钥"
 
 #: g10/keyserver.c:64
 msgid "use temporary files to pass data to keyserver helpers"
-msgstr ""
+msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
 #: g10/keyserver.c:66
 msgid "do not delete temporary files after using them"
-msgstr ""
+msgstr "不删除使用过的临时文件"
 
 #: g10/keyserver.c:70
 msgid "automatically retrieve keys when verifying signatures"
-msgstr ""
+msgstr "验证签名时自动下载密钥"
 
 #: g10/keyserver.c:72
-#, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
-msgstr "输入您首选的公钥服务器的 URL："
+msgstr "使用密钥中指定的首选公钥服务器 URL"
 
 #: g10/keyserver.c:74
 msgid "honor the PKA record set on a key when retrieving keys"
-msgstr ""
+msgstr "获取密钥时使用密钥上的 PKA 记录"
 
 #: g10/keyserver.c:140
 #, c-format
@@ -4211,7 +4370,8 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:808 g10/keyserver.c:1421
+#: g10/keyserver.c:808
+#: g10/keyserver.c:1421
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4236,14 +4396,14 @@ msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
 #: g10/keyserver.c:1173
-#, fuzzy, c-format
+#, c-format
 msgid "searching for names from %s server %s\n"
-msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
+msgstr "在 %s 服务器 %s 上搜索名字\n"
 
 #: g10/keyserver.c:1176
-#, fuzzy, c-format
+#, c-format
 msgid "searching for names from %s\n"
-msgstr "搜索“%s”，在 %s 上\n"
+msgstr "在 %s 上搜索名字\n"
 
 #: g10/keyserver.c:1324
 #, c-format
@@ -4265,7 +4425,8 @@ msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1381 g10/keyserver.c:1477
+#: g10/keyserver.c:1381
+#: g10/keyserver.c:1477
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
@@ -4278,7 +4439,8 @@ msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1500 g10/keyserver.c:2028
+#: g10/keyserver.c:1500
+#: g10/keyserver.c:2028
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
@@ -4297,9 +4459,9 @@ msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
 #: g10/keyserver.c:1531
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not support handler version %d\n"
-msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
+msgstr "%s 不支持对版本 %d 的处理\n"
 
 #: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
@@ -4314,7 +4476,8 @@ msgstr "公钥服务器内部错误\n"
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1577 g10/keyserver.c:1611
+#: g10/keyserver.c:1577
+#: g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
@@ -4335,14 +4498,14 @@ msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
 #: g10/keyserver.c:1950
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
+msgstr "警告：无法获取 URI %s：%s\n"
 
 #: g10/keyserver.c:1956
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to parse URI %s\n"
-msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
+msgstr "不能解析 URI %s\n"
 
 #: g10/mainproc.c:240
 #, c-format
@@ -4373,7 +4536,8 @@ msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:476 g10/pkclist.c:219
+#: g10/mainproc.c:476
+#: g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
@@ -4397,7 +4561,8 @@ msgstr "以 %lu 个密码加密\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:541 g10/mainproc.c:563
+#: g10/mainproc.c:541
+#: g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
@@ -4438,23 +4603,21 @@ msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
 #: g10/mainproc.c:1165
-#, fuzzy
 msgid "no signature found\n"
-msgstr "完好的签字，来自于“%s”"
+msgstr "未找到签名\n"
 
 #: g10/mainproc.c:1408
 msgid "signature verification suppressed\n"
-msgstr "签字验证已被抑制\n"
+msgstr "签名验证已被抑制\n"
 
 #: g10/mainproc.c:1508
-#, fuzzy
 msgid "can't handle this ambiguous signature data\n"
-msgstr "无法处理这些多重签字\n"
+msgstr "无法处理这些有歧义的签名\n"
 
 #: g10/mainproc.c:1519
 #, c-format
 msgid "Signature made %s\n"
-msgstr "签字建立于 %s\n"
+msgstr "签名建立于 %s\n"
 
 #: g10/mainproc.c:1520
 #, c-format
@@ -4464,26 +4627,29 @@ msgstr "              使用 %s 密钥 %s\n"
 #: g10/mainproc.c:1524
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
+msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
 #: g10/mainproc.c:1544
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1677
+#: g10/mainproc.c:1725
 #, c-format
 msgid "BAD signature from \"%s\""
-msgstr "已损坏的签字，来自于“%s”"
+msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1679
+#: g10/mainproc.c:1727
 #, c-format
 msgid "Expired signature from \"%s\""
-msgstr "过期的签字，来自于“%s”"
+msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1681 g10/mainproc.c:1729
+#: g10/mainproc.c:1681
+#: g10/mainproc.c:1729
 #, c-format
 msgid "Good signature from \"%s\""
-msgstr "完好的签字，来自于“%s”"
+msgstr "完好的签名，来自于“%s”"
 
 #: g10/mainproc.c:1733
 msgid "[uncertain]"
@@ -4497,17 +4663,17 @@ msgstr "              亦即“%s”"
 #: g10/mainproc.c:1863
 #, c-format
 msgid "Signature expired %s\n"
-msgstr "这份签字已于 %s 过期。\n"
+msgstr "这份签名已于 %s 过期。\n"
 
 #: g10/mainproc.c:1868
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "这份签字在 %s 过期。\n"
+msgstr "这份签名在 %s 过期。\n"
 
 #: g10/mainproc.c:1871
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s 签字，散列算法 %s\n"
+msgstr "%s 签名，散列算法 %s\n"
 
 #: g10/mainproc.c:1872
 msgid "binary"
@@ -4517,32 +4683,34 @@ msgstr "二进制"
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1873 g10/trustdb.c:531
+#: g10/mainproc.c:1873
+#: g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
 #: g10/mainproc.c:1893
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "无法检查签字：%s\n"
+msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
+#: g10/mainproc.c:1962
+#: g10/mainproc.c:1978
+#: g10/mainproc.c:2064
 msgid "not a detached signature\n"
-msgstr "不是一份分离的签字\n"
+msgstr "不是一份分离的签名\n"
 
 #: g10/mainproc.c:2005
-msgid ""
-"WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "警告：检测到多重签字。只检查第一个签字。\n"
+msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
 #: g10/mainproc.c:2013
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "等级 0x%02x 的独立签字\n"
+msgstr "等级 0x%02x 的独立签名\n"
 
 #: g10/mainproc.c:2070
 msgid "old style (PGP 2.x) signature\n"
-msgstr "旧式(PGP 2.x)签字\n"
+msgstr "旧式(PGP 2.x)签名\n"
 
 #: g10/mainproc.c:2080
 msgid "invalid root packet detected in proc_tree()\n"
@@ -4553,7 +4721,9 @@ msgstr "在 proc_tree() 中检测到无效的根包\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:142 g10/misc.c:170 g10/misc.c:242
+#: g10/misc.c:142
+#: g10/misc.c:170
+#: g10/misc.c:242
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
@@ -4587,10 +4757,11 @@ msgstr "警告：不建议使用散列算法 %s\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:448 g10/sig-check.c:103
-#, fuzzy, c-format
+#: g10/misc.c:448
+#: g10/sig-check.c:103
+#, c-format
 msgid "please see %s for more information\n"
-msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
+msgstr "请参见 %s 以得到更多信息。\n"
 
 #: g10/misc.c:681
 #, c-format
@@ -4608,9 +4779,9 @@ msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
 #: g10/misc.c:694
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "警告：“%s”选项已不建议使用\n"
+msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
 #: g10/misc.c:707
 msgid "Uncompressed"
@@ -4660,7 +4831,7 @@ msgstr "正在写入到标准输出\n"
 #: g10/openfile.c:305
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "假定被签字的数据是‘%s’\n"
+msgstr "假定被签名的数据是‘%s’\n"
 
 #: g10/openfile.c:384
 #, c-format
@@ -4709,11 +4880,14 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
+#: g10/passphrase.c:379
+#: g10/passphrase.c:655
+#: g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:532 g10/passphrase.c:914
+#: g10/passphrase.c:532
+#: g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
@@ -4741,11 +4915,13 @@ msgstr "请输入密码\n"
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:805 g10/passphrase.c:968
+#: g10/passphrase.c:805
+#: g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:973
+#: g10/passphrase.c:812
+#: g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
@@ -4812,29 +4988,34 @@ msgstr "这张照片正确吗？(y/N/q)"
 
 #: g10/photoid.c:329
 msgid "no photo viewer set\n"
-msgstr ""
+msgstr "没有设置照片查看程序\n"
 
 #: g10/photoid.c:383
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62
+#: g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64
+#: g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66
+#: g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68
+#: g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70
+#: g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
@@ -4861,8 +5042,7 @@ msgid "  aka \"%s\"\n"
 msgstr "  亦即“%s”\n"
 
 #: g10/pkclist.c:256
-msgid ""
-"How much do you trust that this key actually belongs to the named user?\n"
+msgid "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "您是否相信这把密钥属于它所声称的持有者？\n"
 
 #: g10/pkclist.c:271
@@ -4901,7 +5081,8 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299
+#: g10/revoke.c:652
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
@@ -4962,7 +5143,7 @@ msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
 #: g10/pkclist.c:522
 msgid "         This could mean that the signature is forged.\n"
-msgstr "      这表明这个签字有可能是伪造的。\n"
+msgstr "      这表明这个签名有可能是伪造的。\n"
 
 #: g10/pkclist.c:528
 msgid "WARNING: This subkey has been revoked by its owner!\n"
@@ -4975,20 +5156,20 @@ msgstr "注意：这把密钥已经被禁用了。\n"
 #: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
-msgstr ""
+msgstr "注意：验证过的签名者的地址是‘%s’\n"
 
 #: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
-msgstr ""
+msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n"
 
 #: g10/pkclist.c:572
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr ""
+msgstr "PKA 信息有效，信任级别调整到“完全”\n"
 
 #: g10/pkclist.c:580
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr ""
+msgstr "PKA 信息无效，信任级别调整到“从不”\n"
 
 #: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
@@ -4996,12 +5177,11 @@ msgstr "注意：这把密钥已经过期了！\n"
 
 #: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "警告：这把密钥未经受信任的签字认证！\n"
+msgstr "警告：这把密钥未经受信任的签名认证！\n"
 
 #: g10/pkclist.c:604
-msgid ""
-"         There is no indication that the signature belongs to the owner.\n"
-msgstr "      没有证据表明这个签字属于它所声称的持有者。\n"
+msgid "         There is no indication that the signature belongs to the owner.\n"
+msgstr "      没有证据表明这个签名属于它所声称的持有者。\n"
 
 #: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
@@ -5009,23 +5189,26 @@ msgstr "警告：我们不信任这把密钥！\n"
 
 #: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "      这个签字很有可能是伪造的。\n"
+msgstr "      这个签名很有可能是伪造的。\n"
 
 #: g10/pkclist.c:621
-msgid ""
-"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "警告：这把密钥未经有足够信任度的签字所认证。\n"
+msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n"
 
 #: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "      这份签字并不一定属于它所声称的持有者\n"
+msgstr "      这份签名并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:822
+#: g10/pkclist.c:864
+#: g10/pkclist.c:1076
+#: g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:834
+#: g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
@@ -5050,7 +5233,8 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:969
+#: g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
@@ -5080,14 +5264,16 @@ msgstr "没有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
+#: g10/plaintext.c:135
+#: g10/plaintext.c:140
+#: g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
 #: g10/plaintext.c:452
 msgid "Detached signature.\n"
-msgstr "分离的签字。\n"
+msgstr "分离的签名。\n"
 
 #: g10/plaintext.c:458
 msgid "Please enter name of data file: "
@@ -5099,12 +5285,12 @@ msgstr "正在从标准输入读取 ...\n"
 
 #: g10/plaintext.c:524
 msgid "no signed data\n"
-msgstr "不含签字的数据\n"
+msgstr "不含签名的数据\n"
 
 #: g10/plaintext.c:538
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "无法打开有签字的数据‘%s’\n"
+msgstr "无法打开有签名的数据‘%s’\n"
 
 #: g10/pubkey-enc.c:104
 #, c-format
@@ -5138,8 +5324,12 @@ msgstr "注意：私钥 %s 已于 %s 过期\n"
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
-#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:104
+#: g10/revoke.c:118
+#: g10/revoke.c:130
+#: g10/revoke.c:176
+#: g10/revoke.c:188
+#: g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -5161,11 +5351,13 @@ msgstr "(这是一把敏感的吊销密钥)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329
+#: g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344
+#: g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
@@ -5295,106 +5487,101 @@ msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
 #: g10/seskey.c:222
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr ""
+msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
 #: g10/seskey.c:236
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
-msgstr ""
+msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 
 #: g10/seskey.c:248
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
-msgstr ""
+msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n"
 
 #: g10/sig-check.c:76
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "警告：签字散列值与报文不一致\n"
+msgstr "警告：签名散列值与报文不一致\n"
 
 #: g10/sig-check.c:101
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "警告：正要签字的子钥 %s 未经交叉验证\n"
+msgstr "警告：签名的子钥 %s 未经交叉验证\n"
 
 #: g10/sig-check.c:113
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "警告：正要签字的子钥 %s 交叉验证无效\n"
+msgstr "警告：签名的子钥 %s 交叉验证无效\n"
 
 #: g10/sig-check.c:181
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
+msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
 #: g10/sig-check.c:182
 #, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
+msgstr "公钥 %s 在其签名后 %lu 秒生成\n"
 
 #: g10/sig-check.c:193
 #, c-format
-msgid ""
-"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
 #: g10/sig-check.c:195
 #, c-format
-msgid ""
-"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
 #: g10/sig-check.c:205
 #, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "注意：签字密钥 %s 已于 %s 过期\n"
+msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
 #: g10/sig-check.c:287
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
-msgstr "假定密钥 %s 的签字由于某个未知的关键位出错而损坏\n"
+msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
 #: g10/sig-check.c:544
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "密钥 %s：没有子钥吊销签字所需的子钥\n"
+msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
 
 #: g10/sig-check.c:570
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "密钥 %s：没有子钥绑定签字所需的子钥\n"
+msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签字内放入标记数据\n"
+msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n"
 
 #: g10/sign.c:93
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入标记数据\n"
+msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n"
 
 #: g10/sign.c:107
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
+msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:124
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的签字内放入策略 URL\n"
+msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n"
 
 #: g10/sign.c:132
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入策略 URL\n"
+msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n"
 
 #: g10/sign.c:145
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:173
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
-"unexpanded.\n"
+msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
 msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:339
@@ -5404,37 +5591,37 @@ msgstr "DSA 要求使用 160 位的散列算法\n"
 #: g10/sign.c:369
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "检查已建立的签字时发生错误： %s\n"
+msgstr "检查已建立的签名时发生错误： %s\n"
 
 #: g10/sign.c:378
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s 签字来自：“%s”\n"
+msgstr "%s/%s 签名来自：“%s”\n"
 
 #: g10/sign.c:810
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签字\n"
+msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
 
 #: g10/sign.c:879
 #, c-format
-msgid ""
-"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
 #: g10/sign.c:992
 msgid "signing:"
-msgstr "正在签字："
+msgstr "正在签名："
 
 #: g10/sign.c:1104
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签字\n"
+msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
 
 #: g10/sign.c:1282
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:127 g10/skclist.c:191
+#: g10/skclist.c:127
+#: g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
@@ -5443,7 +5630,9 @@ msgstr "密钥未被标示为不安全――不能与假的随机数发生器共
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:166
+#: g10/skclist.c:176
+#: g10/skclist.c:185
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "“%s”已跳过：%s\n"
@@ -5454,9 +5643,10 @@ msgstr "已跳过：私钥已存在\n"
 
 #: g10/skclist.c:186
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签字不安全！"
+msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
 
-#: g10/tdbdump.c:60 g10/trustdb.c:366
+#: g10/tdbdump.c:60
+#: g10/trustdb.c:366
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -5470,7 +5660,10 @@ msgstr ""
 "# 已指定的信任度的清单，建立于 %s \n"
 "# (请用“gpg --import-ownertrust”导入这些信任度)\n"
 
-#: g10/tdbdump.c:160 g10/tdbdump.c:168 g10/tdbdump.c:173 g10/tdbdump.c:178
+#: g10/tdbdump.c:160
+#: g10/tdbdump.c:168
+#: g10/tdbdump.c:173
+#: g10/tdbdump.c:178
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
@@ -5501,17 +5694,20 @@ msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 msgid "read error in `%s': %s\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: g10/tdbdump.c:228 g10/trustdb.c:381
+#: g10/tdbdump.c:228
+#: g10/trustdb.c:381
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：同步失败：%s\n"
 
-#: g10/tdbio.c:129 g10/tdbio.c:1445
+#: g10/tdbio.c:129
+#: g10/tdbio.c:1445
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:135 g10/tdbio.c:1452
+#: g10/tdbio.c:135
+#: g10/tdbio.c:1452
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
@@ -5530,12 +5726,15 @@ msgstr "无法存取‘%s’：%s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:546 g10/tdbio.c:589
+#: g10/tdbio.c:523
+#: g10/tdbio.c:546
+#: g10/tdbio.c:589
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "不能为‘%s’创建锁定\n"
 
-#: g10/tdbio.c:525 g10/tdbio.c:592
+#: g10/tdbio.c:525
+#: g10/tdbio.c:592
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "无法锁定‘%s’\n"
@@ -5574,8 +5773,13 @@ msgstr "%s：建立散列表失败：%s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出错： %s\n"
 
-#: g10/tdbio.c:676 g10/tdbio.c:696 g10/tdbio.c:712 g10/tdbio.c:726
-#: g10/tdbio.c:756 g10/tdbio.c:1378 g10/tdbio.c:1405
+#: g10/tdbio.c:676
+#: g10/tdbio.c:696
+#: g10/tdbio.c:712
+#: g10/tdbio.c:726
+#: g10/tdbio.c:756
+#: g10/tdbio.c:1378
+#: g10/tdbio.c:1405
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读取版本记录时出错： %s\n"
@@ -5697,7 +5901,8 @@ msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:509
+#: g10/trustdb.c:514
 msgid "[ expired]"
 msgstr "[已过期]"
 
@@ -5745,7 +5950,8 @@ msgstr "绝对"
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2352
+#: g10/trustdb.c:583
+#: g10/trustdb.c:2352
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -5760,7 +5966,8 @@ msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:839
+#: g10/trustdb.c:1277
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
@@ -5794,10 +6001,8 @@ msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
 #: g10/trustdb.c:2283
 #, c-format
-msgid ""
-"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
-msgstr ""
-"深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
+msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
 #: g10/trustdb.c:2358
 #, c-format
@@ -5810,8 +6015,8 @@ msgid ""
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"签字无法被验证。\n"
-"请记住签字文件(.sig或.asc)\n"
+"签名无法被验证。\n"
+"请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
 #: g10/verify.c:192
@@ -5849,7 +6054,7 @@ msgstr "私钥已经损坏"
 
 #: util/errors.c:62
 msgid "bad signature"
-msgstr "签字已经损坏"
+msgstr "签名已经损坏"
 
 #: util/errors.c:63
 msgid "checksum error"
@@ -5933,7 +6138,7 @@ msgstr "未实现的对称加密算法"
 
 #: util/errors.c:83
 msgid "unknown signature class"
-msgstr "未知的签字等级"
+msgstr "未知的签名等级"
 
 #: util/errors.c:84
 msgid "trust database error"
@@ -6036,9 +6241,8 @@ msgid "no card"
 msgstr "没有卡"
 
 #: util/errors.c:111
-#, fuzzy
 msgid "no data"
-msgstr "不含签字的数据\n"
+msgstr "无数据"
 
 #: util/logger.c:158
 msgid "ERROR: "
@@ -6059,20 +6263,24 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:330 util/miscutil.c:367
+#: util/miscutil.c:330
+#: util/miscutil.c:367
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:331 util/miscutil.c:372
+#: util/miscutil.c:331
+#: util/miscutil.c:372
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:333 util/miscutil.c:369
+#: util/miscutil.c:333
+#: util/miscutil.c:369
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:334 util/miscutil.c:373
+#: util/miscutil.c:334
+#: util/miscutil.c:373
 msgid "nN"
 msgstr "nN"
 
@@ -6119,89 +6327,3 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
-#~ msgid "algorithms on these user IDs:\n"
-#~ msgstr "算法：\n"
-
-#~ msgid ""
-#~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-#~ msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信息\n"
-
-#~ msgid ""
-#~ "a notation name must have only printable characters or spaces, and end "
-#~ "with an '='\n"
-#~ msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
-
-#~ msgid "a user notation name must contain the '@' character\n"
-#~ msgstr "用户标记名称一定要含有“@”字符\n"
-
-#, fuzzy
-#~ msgid "a notation name must not contain more than one '@' character\n"
-#~ msgstr "用户标记名称一定要含有“@”字符\n"
-
-#~ msgid "a notation value must not use any control characters\n"
-#~ msgstr "标记值一定不能使用任何的控制字符\n"
-
-#~ msgid "WARNING: invalid notation data found\n"
-#~ msgstr "警告：找到无效的标记数据\n"
-
-#~ msgid "not human readable"
-#~ msgstr "不是人类能读懂的"
-
-#~ msgid "expired: %s)"
-#~ msgstr "已过期：%s)"
-
-#~ msgid "key %s: expired signature from key %s - skipped\n"
-#~ msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
-
-#, fuzzy
-#~ msgid "Unable to clean `%s'\n"
-#~ msgstr "无法执行程序‘%s’：%s\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "用户标识“%s”已被吊销。"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "用户标识“%s”已被吊销。"
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "用户标识“%s”已被吊销。"
-
-#, fuzzy
-#~ msgid "No user IDs are removable.\n"
-#~ msgstr "用户标识“%s”已经被吊销。\n"
-
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "取得序列号时出错：%s\n"
-
-#~ msgid "length of RSA modulus is not %d\n"
-#~ msgstr "RSA 余数的长度不为 %d\n"
-
-#~ msgid "length of an RSA prime is not %d\n"
-#~ msgstr "RSA 质数的长度不为 %d\n"
-
-#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-#~ msgstr "密码不正确或未知的对称加密算法(%d)\n"
-
-#~ msgid "can't set client pid for the agent\n"
-#~ msgstr "无法设定代理程序客户端的进程标识\n"
-
-#~ msgid "can't get server read FD for the agent\n"
-#~ msgstr "无法取得代理程序所需的服务器读取文件描述符\n"
-
-#~ msgid "can't get server write FD for the agent\n"
-#~ msgstr "无法取得代理程序所需的服务器写入文件描述符\n"
-
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "与 gpg-agent 通讯有问题\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "密码太长\n"
-
-#~ msgid "invalid response from agent\n"
-#~ msgstr "代理程序响应无效\n"
-
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "代理程序的问题：代理程序返回 0x%lx\n"