fixed some English typos; updated Hungarian file

1 files changed, 425 insertions, 300 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f9006bc3..5ab64dc7 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2001-11-24 14:46+0100\n"
+"POT-Creation-Date: 2001-11-27 19:52+0100\n"
 "PO-Revision-Date: 2001-08-22 18:07+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -29,27 +29,27 @@ msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 $rpm\n"
 
-#: _irpm:31 po/placeholder.h:152 urpmi:248
-msgid "Is it ok?"
+#: _irpm:31 po/placeholder.h:163 urpmi:248
+msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:281
+#: _irpm:33 po/placeholder.h:153 urpmi:251 urpmi:279
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:116 urpmi:252 urpmi:282
+#: _irpm:34 po/placeholder.h:119 urpmi:252 urpmi:280
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:154 urpmi:256 urpmi:319 urpmi:343
+#: _irpm:40 po/placeholder.h:130 urpmi:256 urpmi:318 urpmi:342
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:119 urpmi:257 urpmi:320 urpmi:344
+#: _irpm:41 po/placeholder.h:133 urpmi:257 urpmi:319 urpmi:343
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:118 urpmi:258
+#: _irpm:42 po/placeholder.h:157 urpmi:258
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -152,120 +152,120 @@ msgstr ""
 msgid "urpmi is not installed"
 msgstr "urpmi没有安装"
 
-#: po/placeholder.h:29 urpm.pm:283
+#: po/placeholder.h:29
+#, fuzzy, c-format
+msgid "reading synthesis file [%s]"
+msgstr "读取 compss 文件 [%s]"
+
+#: po/placeholder.h:30 urpm.pm:298
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:169
+#: po/placeholder.h:31 urpm.pm:277
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:31
-#, c-format
+#: po/placeholder.h:32
+#, fuzzy, c-format
 msgid "nothing to write in list file for \"%s\""
-msgstr ""
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:32 urpm.pm:218
+#: po/placeholder.h:33 urpm.pm:233
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:33
+#: po/placeholder.h:34
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:34
-#, c-format
+#: po/placeholder.h:35
+#, fuzzy, c-format
 msgid "nothing written in list file for \"%s\""
-msgstr ""
-
-#: po/placeholder.h:35 urpm.pm:1951
-#, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
-msgstr ""
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:39 urpm.pm:839
+#: po/placeholder.h:36 urpm.pm:845
 #, c-format
 msgid "read provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:40
-#, c-format
-msgid "trying to remove inexistant medium \"%s\""
-msgstr "无法删除不存在的介质\"%s\""
-
-#: po/placeholder.h:41 urpm.pm:1692
+#: po/placeholder.h:37 urpm.pm:1549
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:42
-#, c-format
-msgid "unable to copy source of [%s] from [%s]"
-msgstr ""
-
-#: po/placeholder.h:43 urpm.pm:870
+#: po/placeholder.h:38 urpm.pm:876
 #, c-format
 msgid "unable to write compss file [%s]"
 msgstr "无法写入 compss 文件 [%s]"
 
-#: po/placeholder.h:44 urpm.pm:813
+#: po/placeholder.h:39 urpm.pm:819
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:45
+#: po/placeholder.h:40
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:46 urpm.pm:919 urpm.pm:1634
+#: po/placeholder.h:41 urpm.pm:925 urpm.pm:1491
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:176
+#: po/placeholder.h:42 urpm.pm:160
+#, c-format
+msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
+msgstr ""
+
+#: po/placeholder.h:43 urpm.pm:184
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+
+#: po/placeholder.h:44 urpm.pm:191
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: po/placeholder.h:48
+#: po/placeholder.h:45
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:49
+#: po/placeholder.h:46
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:50
+#: po/placeholder.h:47
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:51 urpm.pm:836
+#: po/placeholder.h:48 urpm.pm:842
 #, c-format
 msgid "unable to read provides file [%s]"
 msgstr "无法读取 提供信息 provides 文件 [%s]"
 
-#: po/placeholder.h:52 urpm.pm:2034
+#: po/placeholder.h:49 urpm.pm:1891
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:53 urpm.pm:311
+#: po/placeholder.h:50
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:54 urpm.pm:295
+#: po/placeholder.h:54 urpm.pm:326
 #, c-format
-msgid "write config file [%s]"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
 #: po/placeholder.h:55
@@ -273,171 +273,185 @@ msgstr ""
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:56 urpm.pm:1817
-#, c-format
-msgid "retrieving [%s]"
-msgstr ""
-
-#: po/placeholder.h:57 urpm.pm:1819
+#: po/placeholder.h:56 urpm.pm:310
 #, c-format
-msgid "wget of [%s] failed"
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:58 urpm.pm:1101
+#: po/placeholder.h:57 urpm.pm:1107
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:59 urpm.pm:848
+#: po/placeholder.h:58 urpm.pm:854
 #, c-format
 msgid "unable to read compss file [%s]"
 msgstr "无法读取 compss 文件 [%s]"
 
-#: po/placeholder.h:60 urpm.pm:213
+#: po/placeholder.h:59 urpm.pm:228
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:61
-#, c-format
+#: po/placeholder.h:60
+#, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:62
+#: po/placeholder.h:61
 msgid "computing dependencies"
 msgstr ""
 
-#: po/placeholder.h:63 urpm.pm:868
+#: po/placeholder.h:62
+#, fuzzy, c-format
+msgid "retrieve of [%s] failed"
+msgstr "拷贝 [%s] 失败"
+
+#: po/placeholder.h:63 urpm.pm:874
 #, c-format
 msgid "write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:64 urpm.pm:803
+#: po/placeholder.h:64 urpm.pm:809
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: po/placeholder.h:65 urpm.pm:163
+#: po/placeholder.h:65 urpm.pm:178
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr ""
 
-#: po/placeholder.h:66 urpm.pm:148
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
-
-#: po/placeholder.h:67
-#, c-format
+#: po/placeholder.h:66
+#, fuzzy, c-format
 msgid "reading hdlist file [%s]"
-msgstr ""
+msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:68 urpm.pm:873
+#: po/placeholder.h:67 urpm.pm:879
 #, c-format
 msgid "write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:69 urpm.pm:827
+#: po/placeholder.h:68 urpm.pm:833
 #, c-format
 msgid "read depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:70
-#, c-format
-msgid "trying to select inexistant medium \"%s\""
-msgstr "试图选择不存在的介质\"%s\""
+#: po/placeholder.h:69 urpm.pm:103
+msgid "curl failed\n"
+msgstr ""
+
+#: po/placeholder.h:70 urpm.pm:281 urpm.pm:284
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:71 urpm.pm:1812
+#: po/placeholder.h:71 urpm.pm:1668
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:145
+#: po/placeholder.h:72 urpm.pm:1502 urpm.pm:1528
 #, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1943
+#: po/placeholder.h:73 urpm.pm:163
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
+msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:865
+#: po/placeholder.h:74 urpm.pm:871
 #, c-format
 msgid "unable to write provides file [%s]"
 msgstr "无法写入 provides 文件 [%s]"
 
-#: po/placeholder.h:78 urpm.pm:191
+#: po/placeholder.h:75 urpm.pm:206
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:79 urpm.pm:1005
+#: po/placeholder.h:76 urpm.pm:1215
+#, fuzzy
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#: po/placeholder.h:77 urpm.pm:1011
 msgid "unable to register rpm file"
 msgstr "无法登记 rpm 文件"
 
-#: po/placeholder.h:80 urpm.pm:1362
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:78 urpm.pm:256
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:81 urpm.pm:241
+#: po/placeholder.h:79 urpm.pm:272
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:82 urpm.pm:233
+#: po/placeholder.h:80 urpm.pm:248
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:83
+#: po/placeholder.h:81
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:84 urpm.pm:907 urpm.pm:1338 urpm.pm:1616 urpm.pm:1623
+#: po/placeholder.h:82
+#, c-format
+msgid "trying to remove inexistent medium \"%s\""
+msgstr "无法删除不存在的介质\"%s\""
+
+#: po/placeholder.h:83 urpm.pm:913 urpm.pm:1191 urpm.pm:1473 urpm.pm:1480
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:85 urpm.pm:824
+#: po/placeholder.h:84 urpm.pm:1192
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
+msgstr "读取 compss 文件 [%s]"
+
+#: po/placeholder.h:85 urpm.pm:830
 #, c-format
 msgid "unable to read depslist file [%s]"
 msgstr "无法读取depslist 文件 [%s]"
 
-#: po/placeholder.h:86
-msgid "removable medium not selected"
-msgstr ""
-
-#: po/placeholder.h:87 urpm.pm:851
+#: po/placeholder.h:86 urpm.pm:857
 #, c-format
 msgid "read compss file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:88 urpm.pm:124 urpm.pm:136
+#: po/placeholder.h:87 urpm.pm:139 urpm.pm:151
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:89
+#: po/placeholder.h:88
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:90 urpm.pm:1746
+#: po/placeholder.h:89 urpm.pm:1603
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:91 urpm.pm:1009
+#: po/placeholder.h:90 urpm.pm:1015
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:92 urpm.pm:1762
+#: po/placeholder.h:91 urpm.pm:273
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr ""
+
+#: po/placeholder.h:92 urpm.pm:1619
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
@@ -447,119 +461,198 @@ msgstr ""
 msgid "unable to build hdlist: %s"
 msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:94 urpm.pm:1000
+#: po/placeholder.h:94 urpm.pm:1593 urpm.pm:1596 urpm.pm:1615
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr ""
+
+#: po/placeholder.h:95 urpm.pm:1006
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1736 urpm.pm:1739 urpm.pm:1758
+#: po/placeholder.h:96 urpm.pm:1175
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:96 urpm.pm:207
+#: po/placeholder.h:97 urpm.pm:222
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:863
+#: po/placeholder.h:98 urpm.pm:869
 #, c-format
 msgid "write depslist file [%s]"
 msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:98 urpm.pm:1322
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:99
-#, c-format
-msgid "source of [%s] not found as [%s]"
-msgstr "[%s]源未发现 [%s]"
-
-#: po/placeholder.h:100 urpm.pm:193
+#: po/placeholder.h:99 urpm.pm:208
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:2024
+#: po/placeholder.h:100 urpm.pm:1879
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:102
-#, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:103 urpm.pm:1001
+#: po/placeholder.h:101 urpm.pm:1007
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:104 urpm.pm:860
+#: po/placeholder.h:102 urpm.pm:866
 #, c-format
 msgid "unable to write depslist file [%s]"
 msgstr "无法写 depslist 文件[\"%s]"
 
-#: po/placeholder.h:105 urpm.pm:327 urpm.pm:1773
+#: po/placeholder.h:103
+#, c-format
+msgid ""
+"removing %s to upgrade to %s ...\n"
+"  since it will not upgrade correctly!"
+msgstr ""
+
+#: po/placeholder.h:107 urpm.pm:342 urpm.pm:1630
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:106 urpm.pm:988
+#: po/placeholder.h:108 urpm.pm:994
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:107 urpm.pm:914 urpm.pm:1629 urpm.pm:1680
+#: po/placeholder.h:109
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "试图选择不存在的介质\"%s\""
+
+#: po/placeholder.h:110 urpm.pm:97
+msgid "wget failed\n"
 msgstr ""
 
-#: po/placeholder.h:108
+#: po/placeholder.h:111 urpm.pm:920 urpm.pm:1486 urpm.pm:1537
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 没有发现rpm 文件"
+msgid "unable to parse correctly [%s] on value \"%s\""
+msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:1104
+#: po/placeholder.h:112 urpm.pm:1110
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: po/placeholder.h:110 urpm.pm:1645 urpm.pm:1671
+#: po/placeholder.h:113
 #, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
-msgstr ""
+msgid "no rpm files found from [%s]"
+msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:111 urpm.pm:1920
+#: po/placeholder.h:114 urpm.pm:1772
 #, c-format
 msgid "selecting %s using obsoletes"
 msgstr "使用过期选择 %s"
 
-#: po/placeholder.h:112 urpm.pm:2031
+#: po/placeholder.h:115 urpm.pm:1888
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "正在文件上选择 %s"
 
-#: po/placeholder.h:113 urpm.pm:180
+#: po/placeholder.h:116 urpm.pm:100
+msgid "curl is missing\n"
+msgstr ""
+
+#: po/placeholder.h:117 urpm.pm:95
+msgid "wget is missing\n"
+msgstr ""
+
+#: po/placeholder.h:118 urpm.pm:195
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:114 urpmi:308 urpmi:315 urpmi:328 urpmi:339 urpmi:352
+#: po/placeholder.h:120
+msgid "  --help         - print this help message.\n"
+msgstr ""
+
+#: po/placeholder.h:121 urpmi:361
+msgid "everything already installed"
+msgstr "全部安装完成"
+
+#: po/placeholder.h:122 urpmi:98
+#, fuzzy, c-format
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: po/placeholder.h:123 urpmi:194
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:124 po/placeholder.h:222
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: po/placeholder.h:125 urpmi:299
+msgid ""
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
+msgstr ""
+
+#: po/placeholder.h:129
+msgid "  --auto         - automatically select a good package in choices.\n"
+msgstr ""
+
+#: po/placeholder.h:131 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: po/placeholder.h:115 urpmi:279
-msgid "Press enter when it's done..."
-msgstr "准备好后按 Enter 键..."
+#: po/placeholder.h:132 po/placeholder.h:234
+msgid ""
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
 
-#: po/placeholder.h:117 urpmi:201
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: po/placeholder.h:134
+msgid "  --X            - use X interface.\n"
+msgstr ""
 
-#: po/placeholder.h:120
+#: po/placeholder.h:135 urpmi:247
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
+
+#: po/placeholder.h:136 urpmi:320 urpmi:344
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
+
+#: po/placeholder.h:137
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+
+#: po/placeholder.h:141 po/placeholder.h:240
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+
+#: po/placeholder.h:142 po/placeholder.h:241
+msgid "  -v             - verbose mode.\n"
+msgstr ""
+
+#: po/placeholder.h:143
+msgid "  -q             - quiet mode.\n"
+msgstr ""
+
+#: po/placeholder.h:144 urpmi:202
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:  (1-%d) "
+
+#: po/placeholder.h:145
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: po/placeholder.h:146
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -567,91 +660,67 @@ msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "usage:\n"
-"  --help           - print this help message.\n"
-"  --update         - use only update media.\n"
-"  --auto           - automatically select a good package in choices.\n"
-"  --auto-select    - automatically select packages for upgrading the "
-"system.\n"
-"  --force          - force invocation even if some package do not exist.\n"
-"  --X              - use X interface.\n"
-"  --best-output    - choose best interface according to the environment:\n"
-"                     X or text mode.\n"
-"  -a               - select all matches on command line.\n"
-"  -m               - choose minimum closure of requires (default).\n"
-"  -M               - choose maximun closure of requires.\n"
-"  -c               - choose complete method for resolving requires closure.\n"
-"  -p               - allow search in provides to find package.\n"
-"  -q               - quiet mode.\n"
-"  -v               - verbose mode.\n"
-"  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
-"urpmi 版本 %s\n"
-"版权所有 (C) 1999, 2000, 2001 MandrakeSoft.\n"
-"遵循 GNU GPL 许可.\n"
-"用法:\n"
-"  --help           - 显示帮助信息.\n"
-"  --update         - 仅仅使用更新介质.\n"
-"  --auto           - 自动选择好的软件包.\n"
-"  --auto-select    - 自动选择升级软件包.\n"
-"  --force          - 软件包不存在时强制取消.\n"
-"  --X              - 使用 X 窗口界面.\n"
-"  --best-output    - 根据环境选择最好的界面(窗口 或 文本).\n"
-"  -a               - 命令行选择所有匹配.\n"
-"  -m               - 选择最少要求颜色 (却省).\n"
-"  -M               - 选择最多要求颜色.\n"
-"  -c               - 选择要求颜色的分辨.\n"
-"  -p               - 允许检索 提供信息 查找软件包.\n"
-"  -q               - 哑模式.\n"
-"  -v               - 明细模式.\n"
-"  要安装的rpm名称.\n"
-
-#: po/placeholder.h:142 urpmi:362
-msgid "everything already installed"
-msgstr "全部安装完成"
 
-#: po/placeholder.h:143 urpmi:247
-#, c-format
+#: po/placeholder.h:152 urpmi:328 urpmi:352
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+
+#: po/placeholder.h:154
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: po/placeholder.h:144 urpmi:296
-#, c-format
-msgid "installing %s\n"
-msgstr "正在安装 %s\n"
+#: po/placeholder.h:155 urpmi:205
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: po/placeholder.h:145 urpmi:198
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:  (1-%d) "
+#: po/placeholder.h:156
+msgid ""
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
 
-#: po/placeholder.h:146 urpmi:321 urpmi:345
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
+#: po/placeholder.h:158
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
 
-#: po/placeholder.h:147 urpmi:190
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:159
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: po/placeholder.h:148 urpmi:149
+#: po/placeholder.h:160 urpmi:294
+#, c-format
+msgid "installing %s\n"
+msgstr "正在安装 %s\n"
+
+#: po/placeholder.h:161 urpmi:152
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:149 urpmi:278
+#: po/placeholder.h:162 urpmi:276
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:150 po/placeholder.h:205 urpmi:268 urpmq:153
+#: po/placeholder.h:164 po/placeholder.h:242 urpmi:266 urpmq:148
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:151 urpmi:329 urpmi:353
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+#: po/placeholder.h:165 urpmi:102
+#, fuzzy
+msgid "Only superuser is allowed to install packages"
+msgstr "只有超级用户可以安装本机软件包"
+
+#: po/placeholder.h:166 urpmi:193
+#, fuzzy, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:167 urpmi:277
+msgid "Press Enter when it's done..."
+msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:155 urpmi.addmedia:46
+#: po/placeholder.h:168 urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
@@ -660,7 +729,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: po/placeholder.h:159
+#: po/placeholder.h:172
 msgid ""
 "usage: urpmi.addmedia [--update] <name> <url>\n"
 "where <url> is one of\n"
@@ -678,17 +747,17 @@ msgstr ""
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:181 urpmi.addmedia:57
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:182 urpmi.addmedia:58
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:183 urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
@@ -697,7 +766,7 @@ msgstr ""
 "%s\n"
 "设备 `%s'不存在\n"
 
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:187 urpmi.addmedia:44
 #, c-format
 msgid ""
 "%s\n"
@@ -706,7 +775,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:178
+#: po/placeholder.h:191
 #, c-format
 msgid ""
 "usage: urpmi.update [-a] <name> ...\n"
@@ -725,11 +794,11 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:187 urpmi.update:51
+#: po/placeholder.h:200 urpmi.update:51
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:188 urpmi.update:53
+#: po/placeholder.h:201 urpmi.update:53
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -738,11 +807,11 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: po/placeholder.h:192 urpmi.removemedia:44
+#: po/placeholder.h:205 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:193 urpmi.removemedia:46
+#: po/placeholder.h:206 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -751,7 +820,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:197
+#: po/placeholder.h:210
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -766,23 +835,38 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:204 urpmq:85
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
-
-#: po/placeholder.h:206 urpmq:82
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+#: po/placeholder.h:217
+msgid "  -h             - print this help message.\n"
+msgstr ""
 
-#: po/placeholder.h:207 urpmq:131
+#: po/placeholder.h:218 urpmq:130
 msgid ""
 "some package have to be removed for being upgraded, this is not supported "
 "yet\n"
 msgstr "有些软件包要求先删除再升级, 暂不支持\n"
 
-#: po/placeholder.h:208
+#: po/placeholder.h:219
+msgid "  -g             - print groups too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:220 urpmq:84
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
+
+#: po/placeholder.h:221
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+
+#: po/placeholder.h:223
+msgid "  -r             - print version and release too with name.\n"
+msgstr ""
+
+#: po/placeholder.h:224
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: po/placeholder.h:225
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -790,79 +874,70 @@ msgid ""
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "usage:\n"
-"  -h             - print this help message.\n"
-"  -v             - verbose mode.\n"
-"  -d             - extend query to package dependencies.\n"
-"  -u             - remove package if a better version is already installed.\n"
-"  -m             - extend query to package dependencies, remove already\n"
-"                   installed package that provide what is necessary, add\n"
-"                   packages that may be block the upgrade.\n"
-"  -M             - extend query to package dependencies and remove already\n"
-"                   installed package only if they are newer or the same.\n"
+msgstr ""
+
+#: po/placeholder.h:231
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: po/placeholder.h:232
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+
+#: po/placeholder.h:233
+msgid ""
 "  -c             - choose complete method for resolving requires closure.\n"
-"  -p             - allow search in provides to find package.\n"
-"  -g             - print groups too with name.\n"
-"  -r             - print version and release too with name.\n"
-"  --update       - use only update media.\n"
-"  --auto-select  - automatically select packages for upgrading the system.\n"
+msgstr ""
+
+#: po/placeholder.h:235 urpmq:81
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: po/placeholder.h:236
+msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
-"  --sources      - give all source packages before downloading (root only).\n"
-"  --force        - force invocation even if some package do not exist.\n"
-"  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: urpm.pm:257
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
+#: po/placeholder.h:243
+msgid ""
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: urpm.pm:258
-#, c-format
-msgid "taking removable device as \"%s\""
+#: po/placeholder.h:244
+msgid ""
+"  --force        - force invocation even if some packages do not\n"
+"exist.\n"
 msgstr ""
 
-#: urpm.pm:262
+#: urpm.pm:1796 urpm.pm:1805
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing %s to upgrade to %s ..."
 msgstr ""
 
-#: urpm.pm:266 urpm.pm:269
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+#: urpm.pm:1797 urpm.pm:1806
+msgid ", $otherPackage, "
+msgstr ", $otherPackage, "
 
-#: urpm.pm:1339
-#, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "读取 compss 文件 [%s]"
+#: urpm.pm:1797 urpm.pm:1806
+msgid "));"
+msgstr "));"
+
+#: urpm.pm:1802
+msgid "$p->{name}-$p->{version}-$p->{release}"
+msgstr "$p->{name}-$p->{version}-$p->{release}"
+
+#: urpm.pm:1812
+msgid "$prefix/$_"
+msgstr "$prefix/$_"
 
-#: urpmi:49
+#: urpmi:48
 #, c-format
 msgid "urpmi version %s"
 msgstr "urpmi 版本 %s"
 
-#: urpmi:98
-#, fuzzy, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
-
-#: urpmi:102
-#, fuzzy
-msgid "Only superuser is allowed to install packages"
-msgstr "只有超级用户可以安装本机软件包"
-
-#: urpmi:189
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一:"
-
-#: urpmi:301
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-
 #: urpmi.addmedia:30
 msgid "usage: urpmi.addmedia [--update] <name> <url>"
 msgstr "用法: urpmi.addmedia [--update] <名称> <url>"
@@ -892,3 +967,53 @@ msgstr ", $_);"
 #, c-format
 msgid "urpmq version %s"
 msgstr "urpmq 版本 %s"
+
+#~ msgid "source of [%s] not found as [%s]"
+#~ msgstr "[%s]源未发现 [%s]"
+
+#~ msgid ""
+#~ "urpmi version %s\n"
+#~ "Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "usage:\n"
+#~ "  --help           - print this help message.\n"
+#~ "  --update         - use only update media.\n"
+#~ "  --auto           - automatically select a good package in choices.\n"
+#~ "  --auto-select    - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ "  --force          - force invocation even if some packages do not "
+#~ "exist.\n"
+#~ "  --X              - use X interface.\n"
+#~ "  --best-output    - choose best interface according to the environment:\n"
+#~ "                     X or text mode.\n"
+#~ "  -a               - select all matches on command line.\n"
+#~ "  -m               - choose minimum closure of requires (default).\n"
+#~ "  -M               - choose maximum closure of requires.\n"
+#~ "  -c               - choose complete method for resolving requires "
+#~ "closure.\n"
+#~ "  -p               - allow search in provides to find package.\n"
+#~ "  -q               - quiet mode.\n"
+#~ "  -v               - verbose mode.\n"
+#~ "  names or rpm files (only for root) given on command line are "
+#~ "installed.\n"
+#~ msgstr ""
+#~ "urpmi 版本 %s\n"
+#~ "版权所有 (C) 1999, 2000, 2001 MandrakeSoft.\n"
+#~ "遵循 GNU GPL 许可.\n"
+#~ "用法:\n"
+#~ "  --help           - 显示帮助信息.\n"
+#~ "  --update         - 仅仅使用更新介质.\n"
+#~ "  --auto           - 自动选择好的软件包.\n"
+#~ "  --auto-select    - 自动选择升级软件包.\n"
+#~ "  --force          - 软件包不存在时强制取消.\n"
+#~ "  --X              - 使用 X 窗口界面.\n"
+#~ "  --best-output    - 根据环境选择最好的界面(窗口 或 文本).\n"
+#~ "  -a               - 命令行选择所有匹配.\n"
+#~ "  -m               - 选择最少要求颜色 (却省).\n"
+#~ "  -M               - 选择最多要求颜色.\n"
+#~ "  -c               - 选择要求颜色的分辨.\n"
+#~ "  -p               - 允许检索 提供信息 查找软件包.\n"
+#~ "  -q               - 哑模式.\n"
+#~ "  -v               - 明细模式.\n"
+#~ "  要安装的rpm名称.\n"