Preparing 2.0.4gnupg-2.0.4

1 files changed, 70 insertions, 70 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b69077193..39ac2db13 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2007-05-07 20:39+0200\n"
+"POT-Creation-Date: 2007-05-08 08:46+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"
@@ -82,8 +82,8 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
 #: agent/command-ssh.c:690 g10/exec.c:480 g10/gpg.c:1024 g10/keygen.c:3067
-#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:277
+#: g10/openfile.c:370 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -91,10 +91,10 @@ msgstr "无法建立‘%s’：%s\n"
 #: agent/command-ssh.c:702 g10/card-util.c:679 g10/card-util.c:748
 #: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
 #: g10/encode.c:506 g10/gpg.c:1025 g10/import.c:195 g10/keygen.c:2562
-#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
+#: g10/keyring.c:1534 g10/openfile.c:194 g10/openfile.c:355
 #: g10/plaintext.c:504 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
 #: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1780
+#: g10/tdbio.c:605 g10/verify.c:101 g10/verify.c:164 sm/gpgsm.c:1780
 #: sm/gpgsm.c:1817 sm/gpgsm.c:1855 sm/qualified.c:74
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -372,7 +372,7 @@ msgstr "建立‘%s’时发生错误：%s\n"
 
 #: agent/gpg-agent.c:1196 agent/gpg-agent.c:1299 agent/gpg-agent.c:1303
 #: agent/gpg-agent.c:1339 agent/gpg-agent.c:1343 g10/exec.c:174
-#: g10/openfile.c:418 scd/scdaemon.c:914
+#: g10/openfile.c:428 scd/scdaemon.c:914
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
@@ -401,7 +401,7 @@ msgstr "更新失败：%s\n"
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:421
+#: agent/gpg-agent.c:1307 agent/gpg-agent.c:1349 g10/openfile.c:431
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
@@ -1268,12 +1268,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:94 g10/mainproc.c:282
+#: g10/encr-data.c:94 g10/mainproc.c:288
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:96 g10/mainproc.c:286
+#: g10/encr-data.c:96 g10/mainproc.c:292
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -2737,7 +2737,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:810 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
+#: g10/import.c:810 g10/openfile.c:280 g10/sign.c:836 g10/sign.c:1145
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
@@ -3694,7 +3694,7 @@ msgstr " (敏感的)"
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:979
+#: g10/keyedit.c:2746 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:985
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
@@ -3706,7 +3706,7 @@ msgstr "已过期：%s"
 
 #: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:985
+#: g10/keylist.c:898 g10/keyserver.c:529 g10/mainproc.c:991
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -3741,12 +3741,12 @@ msgid ""
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
 #: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:533
-#: g10/mainproc.c:1831 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/mainproc.c:1837 g10/trustdb.c:1179 g10/trustdb.c:1699
 msgid "revoked"
 msgstr "已吊销"
 
 #: g10/keyedit.c:2896 g10/keyedit.c:3242 g10/keyserver.c:537
-#: g10/mainproc.c:1833 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/mainproc.c:1839 g10/trustdb.c:532 g10/trustdb.c:1701
 msgid "expired"
 msgstr "已过期"
 
@@ -4769,209 +4769,209 @@ msgstr "警告：无法获取 URI %s：%s\n"
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
 
-#: g10/mainproc.c:227
+#: g10/mainproc.c:233
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:280
+#: g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:290
+#: g10/mainproc.c:296
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:356
+#: g10/mainproc.c:362
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:413
+#: g10/mainproc.c:419
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:452
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:450 g10/pkclist.c:219
+#: g10/mainproc.c:456 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:454
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:468
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:482
+#: g10/mainproc.c:488
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:484
+#: g10/mainproc.c:490
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:516 g10/mainproc.c:538
+#: g10/mainproc.c:522 g10/mainproc.c:544
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:530
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:563
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:561
+#: g10/mainproc.c:567
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:580
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:580
+#: g10/mainproc.c:586
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:601
+#: g10/mainproc.c:607
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:603
+#: g10/mainproc.c:609
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:691
+#: g10/mainproc.c:697
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:832
+#: g10/mainproc.c:838
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1185 g10/mainproc.c:1222
+#: g10/mainproc.c:1191 g10/mainproc.c:1228
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1466
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1575
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些有歧义的签名\n"
 
-#: g10/mainproc.c:1580
+#: g10/mainproc.c:1586
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1581
+#: g10/mainproc.c:1587
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1585
+#: g10/mainproc.c:1591
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1605
+#: g10/mainproc.c:1611
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1738 g10/mainproc.c:1786
+#: g10/mainproc.c:1744 g10/mainproc.c:1792
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于“%s”"
 
-#: g10/mainproc.c:1740 g10/mainproc.c:1788
+#: g10/mainproc.c:1746 g10/mainproc.c:1794
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于“%s”"
 
-#: g10/mainproc.c:1742 g10/mainproc.c:1790
+#: g10/mainproc.c:1748 g10/mainproc.c:1796
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于“%s”"
 
-#: g10/mainproc.c:1792
+#: g10/mainproc.c:1798
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1830
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1922
+#: g10/mainproc.c:1928
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:1927
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:1930
+#: g10/mainproc.c:1936
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1937
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1932
+#: g10/mainproc.c:1938
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1932 g10/trustdb.c:531
+#: g10/mainproc.c:1938 g10/trustdb.c:531
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1952
+#: g10/mainproc.c:1958
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2036 g10/mainproc.c:2052 g10/mainproc.c:2148
+#: g10/mainproc.c:2042 g10/mainproc.c:2058 g10/mainproc.c:2154
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2079
+#: g10/mainproc.c:2085
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2087
+#: g10/mainproc.c:2093
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2152
+#: g10/mainproc.c:2158
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签名\n"
 
-#: g10/mainproc.c:2162
+#: g10/mainproc.c:2168
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -5068,39 +5068,39 @@ msgstr "有歧义的选项‘%s’\n"
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/openfile.c:87
+#: g10/openfile.c:91
 #, c-format
 msgid "File `%s' exists. "
 msgstr "文件‘%s’已存在。 "
 
-#: g10/openfile.c:91
+#: g10/openfile.c:95
 msgid "Overwrite? (y/N) "
 msgstr "是否覆盖？(y/N)"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:128
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s：未知的后缀名\n"
 
-#: g10/openfile.c:148
+#: g10/openfile.c:152
 msgid "Enter new filename"
 msgstr "请输入新的文件名"
 
-#: g10/openfile.c:193
+#: g10/openfile.c:197
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#: g10/openfile.c:308
+#: g10/openfile.c:318
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
-#: g10/openfile.c:387
+#: g10/openfile.c:397
 #, c-format
 msgid "new configuration file `%s' created\n"
 msgstr "新的配置文件‘%s’已建立\n"
 
-#: g10/openfile.c:389
+#: g10/openfile.c:399
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
@@ -6205,7 +6205,7 @@ msgstr ""
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
-#: g10/verify.c:119
+#: g10/verify.c:120
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -6215,12 +6215,12 @@ msgstr ""
 "请记住签名文件(.sig或.asc)\n"
 "应该是在命令行中给定的第一个文件。\n"
 
-#: g10/verify.c:204
+#: g10/verify.c:207
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
-#: g10/verify.c:249
+#: g10/verify.c:252
 #, fuzzy, c-format
 msgid "can't open fd %d: %s\n"
 msgstr "无法打开‘%s’： %s\n"