merge latest curl error messages

1 files changed, 136 insertions, 67 deletions

diff --git a/grpmi/po/zh_CN.po b/grpmi/po/zh_CN.po
index d4358168..d5f050f1 100644
--- a/grpmi/po/zh_CN.po
+++ b/grpmi/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: grpmi\n"
-"POT-Creation-Date: 2003-02-21 00:37+0100\n"
+"POT-Creation-Date: 2003-04-15 14:36+0200\n"
 "PO-Revision-Date: 2003-01-18 02:37+0800\n"
 "Last-Translator: Funda Wang <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Internationalization Team <cooker-i18n@linux-"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "Download directory does not exist"
 msgstr "用来保存下载文件的目录必须存在"
 
-#: ../curl_download/curl_download.xs:89 ../curl_download/curl_download.xs:206
+#: ../curl_download/curl_download.xs:89 ../curl_download/curl_download.xs:213
 msgid "Out of memory\n"
 msgstr "内存用完\n"
 
@@ -28,267 +28,336 @@ msgstr "内存用完\n"
 msgid "Could not open output file in append mode"
 msgstr "无法以追加模式打开输出文件"
 
-#: ../curl_download/curl_download.xs:126
+#: ../curl_download/curl_download.xs:133
 msgid "Unsupported protocol\n"
 msgstr "未支持的协议\n"
 
-#: ../curl_download/curl_download.xs:129
+#: ../curl_download/curl_download.xs:136
 msgid "Failed init\n"
 msgstr "初始化失败\n"
 
-#: ../curl_download/curl_download.xs:132
+#: ../curl_download/curl_download.xs:139
 msgid "Bad URL format\n"
 msgstr "错误的 URL 格式\n"
 
-#: ../curl_download/curl_download.xs:135
+#: ../curl_download/curl_download.xs:142
 msgid "Bad user format in URL\n"
 msgstr "URL 中错误的用户格式\n"
 
-#: ../curl_download/curl_download.xs:138
+#: ../curl_download/curl_download.xs:145
 msgid "Couldn't resolve proxy\n"
 msgstr "无法解析代理\n"
 
-#: ../curl_download/curl_download.xs:141
+#: ../curl_download/curl_download.xs:148
 msgid "Couldn't resolve host\n"
 msgstr "无法解析主机\n"
 
-#: ../curl_download/curl_download.xs:144
+#: ../curl_download/curl_download.xs:151
 msgid "Couldn't connect\n"
 msgstr "无法连接\n"
 
-#: ../curl_download/curl_download.xs:147
+#: ../curl_download/curl_download.xs:154
 msgid "FTP unexpected server reply\n"
 msgstr "FTP 服务器回答怪异\n"
 
-#: ../curl_download/curl_download.xs:150
+#: ../curl_download/curl_download.xs:157
 msgid "FTP access denied\n"
 msgstr "FTP 访问被拒绝\n"
 
-#: ../curl_download/curl_download.xs:153
+#: ../curl_download/curl_download.xs:160
 msgid "FTP user password incorrect\n"
 msgstr "FTP 用户口令不对\n"
 
-#: ../curl_download/curl_download.xs:156
+#: ../curl_download/curl_download.xs:163
 msgid "FTP unexpected PASS reply\n"
 msgstr "FTP 怪异的 PASS 回应\n"
 
-#: ../curl_download/curl_download.xs:159
+#: ../curl_download/curl_download.xs:166
 msgid "FTP unexpected USER reply\n"
 msgstr "FTP 怪异的 USER 回应\n"
 
-#: ../curl_download/curl_download.xs:162
+#: ../curl_download/curl_download.xs:169
 msgid "FTP unexpected PASV reply\n"
 msgstr "FTP 怪异的 PASV 回应\n"
 
-#: ../curl_download/curl_download.xs:165
+#: ../curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
 msgstr "FTP 怪异的 227 格式\n"
 
-#: ../curl_download/curl_download.xs:168
+#: ../curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
 msgstr "FTP 无法达到主机\n"
 
-#: ../curl_download/curl_download.xs:171
+#: ../curl_download/curl_download.xs:178
 msgid "FTP can't reconnect\n"
 msgstr "FTP 无法重新连接\n"
 
-#: ../curl_download/curl_download.xs:174
+#: ../curl_download/curl_download.xs:181
 msgid "FTP couldn't set binary\n"
 msgstr "FTP 无法设置二进制模式\n"
 
-#: ../curl_download/curl_download.xs:177
+#: ../curl_download/curl_download.xs:184
 msgid "Partial file\n"
 msgstr "部分文件\n"
 
-#: ../curl_download/curl_download.xs:180
+#: ../curl_download/curl_download.xs:187
 msgid "FTP couldn't RETR file\n"
 msgstr "FTP 无法 RETR 文件\n"
 
-#: ../curl_download/curl_download.xs:183
+#: ../curl_download/curl_download.xs:190
 msgid "FTP write error\n"
 msgstr "FTP 写错误\n"
 
-#: ../curl_download/curl_download.xs:188
+#: ../curl_download/curl_download.xs:195
 msgid "FTP quote error\n"
 msgstr "FTP 引用错误\n"
 
-#: ../curl_download/curl_download.xs:191
+#: ../curl_download/curl_download.xs:198
 msgid "HTTP not found\n"
 msgstr "找不到 HTTP\n"
 
-#: ../curl_download/curl_download.xs:194
+#: ../curl_download/curl_download.xs:201
 msgid "Write error\n"
 msgstr "写错误\n"
 
-#: ../curl_download/curl_download.xs:197
+#: ../curl_download/curl_download.xs:204
 msgid "User name illegally specified\n"
 msgstr "指定的用户名无效\n"
 
-#: ../curl_download/curl_download.xs:200
+#: ../curl_download/curl_download.xs:207
 msgid "FTP couldn't STOR file\n"
 msgstr "FTP 上传失败\n"
 
-#: ../curl_download/curl_download.xs:203
+#: ../curl_download/curl_download.xs:210
 msgid "Read error\n"
 msgstr "读错误\n"
 
-#: ../curl_download/curl_download.xs:209
+#: ../curl_download/curl_download.xs:216
 msgid "Time out\n"
 msgstr "超时\n"
 
-#: ../curl_download/curl_download.xs:212
+#: ../curl_download/curl_download.xs:219
 msgid "FTP couldn't set ASCII\n"
 msgstr "FTP 无法设置文本模式\n"
 
-#: ../curl_download/curl_download.xs:215
+#: ../curl_download/curl_download.xs:222
 msgid "FTP PORT failed\n"
 msgstr "FTP PORT 操作失败\n"
 
-#: ../curl_download/curl_download.xs:218
+#: ../curl_download/curl_download.xs:225
 msgid "FTP couldn't use REST\n"
 msgstr "FTP 无法使用 REST\n"
 
-#: ../curl_download/curl_download.xs:221
+#: ../curl_download/curl_download.xs:228
 msgid "FTP couldn't get size\n"
 msgstr "FTP无法获得大小\n"
 
-#: ../curl_download/curl_download.xs:224
+#: ../curl_download/curl_download.xs:231
 msgid "HTTP range error\n"
 msgstr "HTTP RANGE 命令失败\n"
 
-#: ../curl_download/curl_download.xs:227
+#: ../curl_download/curl_download.xs:234
 msgid "HTTP POST error\n"
 msgstr "HTTP POST 命令出错\n"
 
-#: ../curl_download/curl_download.xs:230
+#: ../curl_download/curl_download.xs:237
 msgid "SSL connect error\n"
 msgstr "SSL 连接出错\n"
 
-#: ../curl_download/curl_download.xs:233
+#: ../curl_download/curl_download.xs:240
 msgid "FTP bad download resume\n"
 msgstr "FTP 无法恢复下载\n"
 
-#: ../curl_download/curl_download.xs:236
+#: ../curl_download/curl_download.xs:243
 msgid "File couldn't read file\n"
 msgstr "无法读取文件\n"
 
-#: ../curl_download/curl_download.xs:239
+#: ../curl_download/curl_download.xs:246
 msgid "LDAP cannot bind\n"
 msgstr "LDAP 无法绑定\n"
 
-#: ../curl_download/curl_download.xs:242
+#: ../curl_download/curl_download.xs:249
 msgid "LDAP search failed\n"
 msgstr "LDAP 搜索失败\n"
 
-#: ../curl_download/curl_download.xs:245
+#: ../curl_download/curl_download.xs:252
 msgid "Library not found\n"
 msgstr "找不到库\n"
 
-#: ../curl_download/curl_download.xs:248
+#: ../curl_download/curl_download.xs:255
 msgid "Function not found\n"
 msgstr "找不到函数\n"
 
-#: ../curl_download/curl_download.xs:251
+#: ../curl_download/curl_download.xs:258
 msgid "Aborted by callback\n"
 msgstr "回调被中止\n"
 
-#: ../curl_download/curl_download.xs:254
+#: ../curl_download/curl_download.xs:261
 msgid "Bad function argument\n"
 msgstr "错误的函数参数\n"
 
-#: ../curl_download/curl_download.xs:257
+#: ../curl_download/curl_download.xs:264
 msgid "Bad calling order\n"
 msgstr "错误的调用次序\n"
 
-#: ../curl_download/curl_download.xs:260
+#: ../curl_download/curl_download.xs:267
+msgid "HTTP Interface operation failed\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:270
+msgid "my_getpass() returns fail\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:273
+msgid "catch endless re-direct loops\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:276
+msgid "User specified an unknown option\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:279
+msgid "Malformed telnet option\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:282
+msgid "removed after 7.7.3\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:285
+msgid "peer's certificate wasn't ok\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:288
+msgid "when this is a specific error\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:291
+#, fuzzy
+msgid "SSL crypto engine not found\n"
+msgstr "找不到函数\n"
+
+#: ../curl_download/curl_download.xs:294
+msgid "can not set SSL crypto engine as default\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:297
+msgid "failed sending network data\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:300
+msgid "failure in receiving network data\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:303
+msgid "share is in use\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:306
+msgid "problem with the local certificate\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:309
+msgid "couldn't use specified cipher\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:312
+msgid "problem with the CA cert (path?)\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:315
+msgid "Unrecognized transfer encoding\n"
+msgstr ""
+
+#: ../curl_download/curl_download.xs:320
 #, c-format
 msgid "Unknown error code %d\n"
 msgstr "未知错误码 %d\n"
 
-#: ../rpm/grpmi_rpm.xs:69
+#: ../rpm/grpmi_rpm.xs:71
 msgid "Couldn't read RPM config files"
 msgstr "无法读取 RPM 配置文件"
 
-#: ../rpm/grpmi_rpm.xs:95
+#: ../rpm/grpmi_rpm.xs:121
 msgid "Couldn't open file\n"
 msgstr "无法打开文件\n"
 
-#: ../rpm/grpmi_rpm.xs:99
+#: ../rpm/grpmi_rpm.xs:125
 msgid "Could not read lead bytes\n"
 msgstr "无法读取前导字节\n"
 
-#: ../rpm/grpmi_rpm.xs:102
+#: ../rpm/grpmi_rpm.xs:128
 msgid "RPM version of package doesn't support signatures\n"
 msgstr "软件包的 RPM 版本不支持签名\n"
 
-#: ../rpm/grpmi_rpm.xs:107
+#: ../rpm/grpmi_rpm.xs:133
 msgid "Could not read signature block (`rpmReadSignature' failed)\n"
 msgstr "无法读取签名块(“rpmReadSignature”失败)\n"
 
-#: ../rpm/grpmi_rpm.xs:110
+#: ../rpm/grpmi_rpm.xs:136
 msgid "No signatures\n"
 msgstr "没有签名\n"
 
-#: ../rpm/grpmi_rpm.xs:114
+#: ../rpm/grpmi_rpm.xs:140
 msgid "`makeTempFile' failed!\n"
 msgstr "“makeTempFile”失败!\n"
 
-#: ../rpm/grpmi_rpm.xs:121
+#: ../rpm/grpmi_rpm.xs:147
 msgid "Error reading file\n"
 msgstr "读取文件出错\n"
 
-#: ../rpm/grpmi_rpm.xs:127
+#: ../rpm/grpmi_rpm.xs:153
 msgid "Error writing temp file\n"
 msgstr "写入临时文件出错\n"
 
-#: ../rpm/grpmi_rpm.xs:152
+#: ../rpm/grpmi_rpm.xs:178
 msgid "No GPG signature in package\n"
 msgstr "软件包中没有 GPG 签名\n"
 
-#: ../rpm/grpmi_rpm.xs:234
+#: ../rpm/grpmi_rpm.xs:260
 msgid "Couldn't open RPM DB for writing (not superuser?)"
 msgstr "无法打开 RPM 数据库进行写入 (不是 superuser?)"
 
-#: ../rpm/grpmi_rpm.xs:236
+#: ../rpm/grpmi_rpm.xs:262
 msgid "Couldn't open RPM DB for writing"
 msgstr "无法打开 RPM 数据库进行写入"
 
-#: ../rpm/grpmi_rpm.xs:240
+#: ../rpm/grpmi_rpm.xs:266
 msgid "Couldn't start transaction"
 msgstr "无法开始处理"
 
-#: ../rpm/grpmi_rpm.xs:259
+#: ../rpm/grpmi_rpm.xs:285
 #, c-format
 msgid "Can't open package `%s'\n"
 msgstr "不能打开软件包“%s”\n"
 
-#: ../rpm/grpmi_rpm.xs:264
+#: ../rpm/grpmi_rpm.xs:290
 #, c-format
 msgid "Package `%s' is corrupted\n"
 msgstr "软件包“%s”坏了\n"
 
-#: ../rpm/grpmi_rpm.xs:267
+#: ../rpm/grpmi_rpm.xs:293
 #, c-format
 msgid "Package `%s' can't be installed\n"
 msgstr "无法安装软件包“%s”\n"
 
-#: ../rpm/grpmi_rpm.xs:278
+#: ../rpm/grpmi_rpm.xs:304
 msgid "Error while checking dependencies"
 msgstr "检查依赖关系时发生错误"
 
-#: ../rpm/grpmi_rpm.xs:299
+#: ../rpm/grpmi_rpm.xs:325
 msgid "conflicts with"
 msgstr "与它冲突的有"
 
-#: ../rpm/grpmi_rpm.xs:299
+#: ../rpm/grpmi_rpm.xs:325
 msgid "is needed by"
 msgstr "需要它的有"
 
-#: ../rpm/grpmi_rpm.xs:317
+#: ../rpm/grpmi_rpm.xs:343
 msgid "Error while checking dependencies 2"
 msgstr "检查依赖关系 2 时出错"
 
-#: ../rpm/grpmi_rpm.xs:323
+#: ../rpm/grpmi_rpm.xs:349
 msgid "Problems occurred during installation:\n"
 msgstr "在安装过程中发生问题:\n"