corrected some English typos

1 files changed, 217 insertions, 240 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index a58d1923..1bbf05ca 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-12-03 17:32+0100\n"
+"POT-Creation-Date: 2001-12-10 16:21+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:169 urpmi:248
+#: _irpm:31 po/placeholder.h:157 urpmi:235
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:159 urpmi:251 urpmi:279
+#: _irpm:33 po/placeholder.h:147 urpmi:238 urpmi:266
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:125 urpmi:252 urpmi:280
+#: _irpm:34 po/placeholder.h:113 urpmi:239 urpmi:267
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:136 urpmi:256 urpmi:318 urpmi:342
+#: _irpm:40 po/placeholder.h:124 urpmi:243 urpmi:305 urpmi:329
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:139 urpmi:257 urpmi:319 urpmi:343
+#: _irpm:41 po/placeholder.h:127 urpmi:244 urpmi:306 urpmi:330
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:163 urpmi:258
+#: _irpm:42 po/placeholder.h:151 urpmi:245
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -119,7 +119,7 @@ msgid "  --description   - print tag description: description."
 msgstr ""
 
 #: po/placeholder.h:20
-msgid "  --provides      - print tag provides: all provides (mutliple lines)."
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
 msgstr ""
 
 #: po/placeholder.h:21
@@ -149,8 +149,8 @@ msgid "try urpmf --help for more options"
 msgstr ""
 
 #: po/placeholder.h:28
-msgid "urpmi is not installed"
-msgstr "urpmi没有安装"
+msgid "no full media list was found"
+msgstr ""
 
 #: po/placeholder.h:29
 #, fuzzy, c-format
@@ -166,11 +166,11 @@ msgstr ""
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:32 urpm.pm:1719
+#: po/placeholder.h:32 urpm.pm:1553
 msgid "retrieving rpms files..."
 msgstr ""
 
-#: po/placeholder.h:33 urpm.pm:283
+#: po/placeholder.h:33 urpm.pm:275
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr ""
@@ -180,7 +180,7 @@ msgstr ""
 msgid "nothing to write in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:35 urpm.pm:239
+#: po/placeholder.h:35 urpm.pm:231
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
@@ -195,491 +195,432 @@ msgstr "无法分析hdlist文件 \"%s\""
 msgid "nothing written in list file for \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:38 urpm.pm:869
-#, c-format
-msgid "read provides file [%s]"
-msgstr ""
-
-#: po/placeholder.h:39 urpm.pm:1595
+#: po/placeholder.h:38 urpm.pm:1429
 #, c-format
 msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:40 urpm.pm:900
-#, c-format
-msgid "unable to write compss file [%s]"
-msgstr "无法写入 compss 文件 [%s]"
-
-#: po/placeholder.h:41 urpm.pm:843
+#: po/placeholder.h:39 urpm.pm:852
 #, c-format
 msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:42
+#: po/placeholder.h:40
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: po/placeholder.h:43 urpm.pm:949 urpm.pm:1537
+#: po/placeholder.h:41
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:44 urpm.pm:166
+#: 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:45 urpm.pm:190
+#: 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:46 urpm.pm:197
+#: 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:47
+#: po/placeholder.h:45
 msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:48
+#: po/placeholder.h:46
 #, c-format
 msgid "unable to build synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:49
+#: po/placeholder.h:47
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:50 urpm.pm:866
-#, c-format
-msgid "unable to read provides file [%s]"
-msgstr "无法读取 提供信息 provides 文件 [%s]"
-
-#: po/placeholder.h:51 urpm.pm:1945
+#: po/placeholder.h:48 urpm.pm:1771
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:52
+#: po/placeholder.h:49
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:56
+#: po/placeholder.h:53
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:57
+#: po/placeholder.h:54
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:58
+#: po/placeholder.h:55
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:59 urpm.pm:1133
+#: po/placeholder.h:56 urpm.pm:1021
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:60 urpm.pm:878
-#, c-format
-msgid "unable to read compss file [%s]"
-msgstr "无法读取 compss 文件 [%s]"
-
-#: po/placeholder.h:61 urpm.pm:234
+#: po/placeholder.h:57 urpm.pm:226
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:62
+#: po/placeholder.h:58
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "无法为介质\"%s\"创建 synthesis文件"
 
-#: po/placeholder.h:63
-msgid "computing dependencies"
-msgstr ""
-
-#: po/placeholder.h:64
+#: po/placeholder.h:59
 #, fuzzy, c-format
 msgid "retrieve of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:65 urpm.pm:898
-#, c-format
-msgid "write provides file [%s]"
-msgstr ""
-
-#: po/placeholder.h:66 urpm.pm:833
+#: po/placeholder.h:60 urpm.pm:842
 #, c-format
 msgid "mounting %s"
 msgstr "正在安装 %s"
 
-#: po/placeholder.h:67 urpm.pm:184
+#: po/placeholder.h:61 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:68
+#: po/placeholder.h:62
 #, fuzzy, c-format
 msgid "reading hdlist file [%s]"
 msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:69 urpm.pm:103
+#: po/placeholder.h:63 urpm.pm:97
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:70 urpm.pm:903
-#, c-format
-msgid "write compss file [%s]"
-msgstr ""
-
-#: po/placeholder.h:71 urpm.pm:857
-#, c-format
-msgid "read depslist file [%s]"
-msgstr ""
-
-#: po/placeholder.h:72 urpm.pm:287 urpm.pm:290
+#: po/placeholder.h:64 urpm.pm:279 urpm.pm:282
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:73 urpm.pm:1714
+#: po/placeholder.h:65 urpm.pm:1548
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:74 urpm.pm:1548 urpm.pm:1574
+#: po/placeholder.h:66 urpm.pm:1382 urpm.pm:1408
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: po/placeholder.h:75 urpm.pm:169
+#: po/placeholder.h:67 urpm.pm:163
 #, c-format
 msgid "medium \"%s\" tries to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:76 urpm.pm:895
-#, c-format
-msgid "unable to write provides file [%s]"
-msgstr "无法写入 provides 文件 [%s]"
-
-#: po/placeholder.h:77 urpm.pm:212
+#: po/placeholder.h:68 urpm.pm:204
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:78 urpm.pm:1245
-#, fuzzy
-msgid "unable to find all synthesis file, using parsehdlist server"
-msgstr "无法为介质\"%s\"创建 synthesis文件"
-
-#: po/placeholder.h:79 urpm.pm:1035
+#: po/placeholder.h:69 urpm.pm:931
 msgid "unable to register rpm file"
 msgstr "无法登记 rpm 文件"
 
-#: po/placeholder.h:80 urpm.pm:262
+#: po/placeholder.h:70 urpm.pm:254
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:81 urpm.pm:278
+#: po/placeholder.h:71 urpm.pm:270
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:82 urpm.pm:254
+#: po/placeholder.h:72 urpm.pm:246
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:83
+#: po/placeholder.h:73
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:84
+#: po/placeholder.h:74
 #, c-format
 msgid "trying to remove inexistent medium \"%s\""
 msgstr "无法删除不存在的介质\"%s\""
 
-#: po/placeholder.h:85
+#: po/placeholder.h:75
 msgid "retrieving description file..."
 msgstr ""
 
-#: po/placeholder.h:86 urpm.pm:937 urpm.pm:1221 urpm.pm:1519 urpm.pm:1526
+#: po/placeholder.h:76 urpm.pm:1137
 #, c-format
 msgid "unable to parse correctly [%s]"
 msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:87 urpm.pm:1222
+#: po/placeholder.h:77 urpm.pm:1130 urpm.pm:1136
 #, fuzzy, c-format
-msgid "read synthesis file [%s]"
-msgstr "读取 compss 文件 [%s]"
-
-#: po/placeholder.h:88 urpm.pm:854
-#, c-format
-msgid "unable to read depslist file [%s]"
-msgstr "无法读取depslist 文件 [%s]"
+msgid "unable to analyse synthesis data of %s"
+msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:89 urpm.pm:881
-#, c-format
-msgid "read compss file [%s]"
+#: po/placeholder.h:78 urpm.pm:1138
+#, fuzzy, c-format
+msgid "read synthesis file [%s]"
 msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:90 urpm.pm:98
+#: po/placeholder.h:79 urpm.pm:92
 msgid "no webfetch (curl or wget for example) found\n"
 msgstr ""
 
-#: po/placeholder.h:91 urpm.pm:145 urpm.pm:157
+#: po/placeholder.h:80 urpm.pm:139 urpm.pm:151
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:92
+#: po/placeholder.h:81
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:93 urpm.pm:1649
+#: po/placeholder.h:82 urpm.pm:1483
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:94 urpm.pm:1039
+#: po/placeholder.h:83 urpm.pm:935
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:95 urpm.pm:279
+#: po/placeholder.h:84 urpm.pm:271
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: po/placeholder.h:96 urpm.pm:1726
+#: po/placeholder.h:85 urpm.pm:1560
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:1665
+#: po/placeholder.h:86 urpm.pm:1499
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:98
+#: po/placeholder.h:87
 #, c-format
 msgid "unable to build hdlist: %s"
 msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:99 urpm.pm:1639 urpm.pm:1642 urpm.pm:1661
+#: po/placeholder.h:88 urpm.pm:1473 urpm.pm:1476 urpm.pm:1495
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:100 urpm.pm:1030
+#: po/placeholder.h:89 urpm.pm:926
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:101 urpm.pm:1205
-#, c-format
-msgid "unknown data associated with %s"
-msgstr ""
-
-#: po/placeholder.h:102 urpm.pm:228
+#: po/placeholder.h:90 urpm.pm:220
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:103 urpm.pm:893
+#: po/placeholder.h:91 urpm.pm:1117
 #, c-format
-msgid "write depslist file [%s]"
-msgstr "写入 depslist 文件 [%s]"
+msgid "unknown data associated with %s"
+msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:214
+#: po/placeholder.h:92 urpm.pm:206
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:105 urpm.pm:1933
+#: po/placeholder.h:93 urpm.pm:1759
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:106 urpm.pm:1031
+#: po/placeholder.h:94 urpm.pm:927
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:107 urpm.pm:890
-#, c-format
-msgid "unable to write depslist file [%s]"
-msgstr "无法写 depslist 文件[\"%s]"
-
-#: po/placeholder.h:108
+#: po/placeholder.h:95
 #, c-format
 msgid ""
 "removing %s to upgrade to %s ...\n"
 "  since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:112 urpm.pm:1018
+#: po/placeholder.h:99 urpm.pm:1510
+#, c-format
+msgid "unable to access medium \"%s\""
+msgstr "无法访问介质\"%s\""
+
+#: po/placeholder.h:100 urpm.pm:913
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:113 urpm.pm:1676
+#: po/placeholder.h:101
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "无法访问介质\"%s\""
+msgid "trying to select inexistent medium \"%s\""
+msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:114 urpm.pm:944 urpm.pm:1532 urpm.pm:1583
+#: po/placeholder.h:102 urpm.pm:1417
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:115
+#: po/placeholder.h:103
 #, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "试图选择不存在的介质\"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:116 urpm.pm:1136
+#: po/placeholder.h:104 urpm.pm:1024
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: po/placeholder.h:117
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 没有发现rpm 文件"
+#: po/placeholder.h:105 urpm.pm:914
+#, fuzzy
+msgid "no entries relocated in depslist"
+msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:118 urpm.pm:1724
+#: po/placeholder.h:106 urpm.pm:1558
 msgid "...retrieving done"
 msgstr ""
 
-#: po/placeholder.h:119 urpm.pm:1826
+#: po/placeholder.h:107 urpm.pm:1652
 #, c-format
 msgid "selecting %s using obsoletes"
 msgstr "使用过期选择 %s"
 
-#: po/placeholder.h:120 urpm.pm:109
+#: po/placeholder.h:108 urpm.pm:103
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: po/placeholder.h:121 urpm.pm:1942
+#: po/placeholder.h:109 urpm.pm:1768
 #, c-format
 msgid "selecting %s by selection on files"
 msgstr "正在文件上选择 %s"
 
-#: po/placeholder.h:122 urpm.pm:106
+#: po/placeholder.h:110 urpm.pm:100
 msgid "curl is missing\n"
 msgstr ""
 
-#: po/placeholder.h:123 urpm.pm:101
+#: po/placeholder.h:111 urpm.pm:95
 msgid "wget is missing\n"
 msgstr ""
 
-#: po/placeholder.h:124 urpm.pm:201
+#: po/placeholder.h:112 urpm.pm:195
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:126
+#: po/placeholder.h:114
 msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:127 urpmi:361
+#: po/placeholder.h:115 urpmi:348
 msgid "everything already installed"
 msgstr "全部安装完成"
 
-#: po/placeholder.h:128 urpmi:98
+#: po/placeholder.h:116 urpmi:98
 #, fuzzy, c-format
 msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
 
-#: po/placeholder.h:129 urpmi:194
+#: po/placeholder.h:117 urpmi:184
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: po/placeholder.h:130 po/placeholder.h:237
+#: po/placeholder.h:118 po/placeholder.h:233
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: po/placeholder.h:131 urpmi:299
+#: po/placeholder.h:119 urpmi:286
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your urpmi database"
 msgstr ""
 
-#: po/placeholder.h:135
+#: po/placeholder.h:123
 msgid "  --auto         - automatically select a good package in choices.\n"
 msgstr ""
 
-#: po/placeholder.h:137 urpmi:307 urpmi:314 urpmi:327 urpmi:338 urpmi:351
+#: po/placeholder.h:125 urpmi:294 urpmi:301 urpmi:314 urpmi:325 urpmi:338
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: po/placeholder.h:138 po/placeholder.h:249
+#: po/placeholder.h:126 po/placeholder.h:222
 msgid ""
 "  --auto-select  - automatically select packages for upgrading the system.\n"
 msgstr ""
 
-#: po/placeholder.h:140
+#: po/placeholder.h:128
 msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: po/placeholder.h:141 urpmi:247
+#: po/placeholder.h:129 urpmi:234
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
 "d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:142 urpmi:320 urpmi:344
+#: po/placeholder.h:130 urpmi:307 urpmi:331
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:143
+#: po/placeholder.h:131
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
 msgstr ""
 
-#: po/placeholder.h:147 po/placeholder.h:256
+#: po/placeholder.h:135 po/placeholder.h:237
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: po/placeholder.h:148 po/placeholder.h:257
+#: po/placeholder.h:136 po/placeholder.h:236
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: po/placeholder.h:149
+#: po/placeholder.h:137
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: po/placeholder.h:150 urpmi:202
+#: po/placeholder.h:138 urpmi:192
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: po/placeholder.h:151 po/placeholder.h:197 po/placeholder.h:217
+#: po/placeholder.h:139 po/placeholder.h:185 po/placeholder.h:205
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:152
+#: po/placeholder.h:140
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -689,65 +630,65 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:158 urpmi:328 urpmi:352
+#: po/placeholder.h:146 urpmi:315 urpmi:339
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:160 po/placeholder.h:250
+#: po/placeholder.h:148 po/placeholder.h:221
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: po/placeholder.h:161 urpmi:205
+#: po/placeholder.h:149 urpmi:195
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: po/placeholder.h:162
+#: po/placeholder.h:150
 msgid ""
 "  names or rpm files (only for root) given on command line are installed.\n"
 msgstr ""
 
-#: po/placeholder.h:164
+#: po/placeholder.h:152
 msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: po/placeholder.h:165 po/placeholder.h:190 po/placeholder.h:210
+#: po/placeholder.h:153 po/placeholder.h:178 po/placeholder.h:198
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: po/placeholder.h:166 urpmi:294
+#: po/placeholder.h:154 urpmi:281
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:167 urpmi:152
+#: po/placeholder.h:155 urpmi:152
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:168 urpmi:276
+#: po/placeholder.h:156 urpmi:263
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:170 po/placeholder.h:258 urpmi:266 urpmq:149
+#: po/placeholder.h:158 po/placeholder.h:238 urpmi:253 urpmq:134
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:171 urpmi:102
+#: po/placeholder.h:159 urpmi:102
 #, fuzzy
 msgid "Only superuser is allowed to install packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:172 urpmi:193
+#: po/placeholder.h:160 urpmi:183
 #, fuzzy, c-format
 msgid "One of the following packages is needed to install %s:"
 msgstr "需要下列软件包之一:"
 
-#: po/placeholder.h:173 urpmi:277
+#: po/placeholder.h:161 urpmi:264
 msgid "Press Enter when it's done..."
 msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:174
+#: po/placeholder.h:162
 #, fuzzy
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -767,28 +708,28 @@ msgstr ""
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:184 urpmi.addmedia:76
+#: po/placeholder.h:172 urpmi.addmedia:75
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:185 urpmi.addmedia:77
+#: po/placeholder.h:173 urpmi.addmedia:76
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:186 po/placeholder.h:206 urpmi.addmedia:54
+#: po/placeholder.h:174 po/placeholder.h:194 urpmi.addmedia:53
 #, c-format
 msgid ""
 "\n"
 "unknown options '%s'\n"
 msgstr ""
 
-#: po/placeholder.h:191 po/placeholder.h:215
+#: po/placeholder.h:179 po/placeholder.h:203
 msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: po/placeholder.h:192 urpmi.addmedia:62
+#: po/placeholder.h:180 urpmi.addmedia:61
 #, c-format
 msgid ""
 "%s\n"
@@ -797,11 +738,11 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:196 po/placeholder.h:216
+#: po/placeholder.h:184 po/placeholder.h:204
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: po/placeholder.h:198 urpmi.addmedia:64
+#: po/placeholder.h:186 urpmi.addmedia:63
 #, c-format
 msgid ""
 "%s\n"
@@ -810,7 +751,7 @@ msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
 
-#: po/placeholder.h:202
+#: po/placeholder.h:190
 #, fuzzy
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
@@ -822,7 +763,7 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:211 urpmi.update:58
+#: po/placeholder.h:199 urpmi.update:59
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -831,19 +772,24 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
 
-#: po/placeholder.h:218 urpmi.update:56
+#: po/placeholder.h:206
+msgid ""
+"  -d             - force complete computation of depslist.ordered file.\n"
+msgstr ""
+
+#: po/placeholder.h:207 urpmi.update:57
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:219
+#: po/placeholder.h:208
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: po/placeholder.h:220 urpmi.removemedia:44
+#: po/placeholder.h:209 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:221 urpmi.removemedia:46
+#: po/placeholder.h:210 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -852,7 +798,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:225
+#: po/placeholder.h:214
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -867,38 +813,49 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:232
+#: po/placeholder.h:223 urpmq:120
+msgid ""
+"some packages have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+
+#: po/placeholder.h:224 urpmq:80
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: po/placeholder.h:225
 msgid "  -h             - print this help message.\n"
 msgstr ""
 
-#: po/placeholder.h:233 urpmq:131
+#: po/placeholder.h:226
 msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: po/placeholder.h:234
+#: po/placeholder.h:230
 msgid "  -g             - print groups too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:235 urpmq:83
+#: po/placeholder.h:231 urpmq:83
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
 
-#: po/placeholder.h:236
+#: po/placeholder.h:232
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:238
+#: po/placeholder.h:234
 msgid "  -r             - print version and release too with name.\n"
 msgstr ""
 
-#: po/placeholder.h:239
+#: po/placeholder.h:235
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: po/placeholder.h:240
+#: po/placeholder.h:239
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -908,54 +865,43 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: po/placeholder.h:246
+#: po/placeholder.h:245
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: po/placeholder.h:247
+#: po/placeholder.h:246
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: po/placeholder.h:248
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr ""
-
-#: po/placeholder.h:251 urpmq:80
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
-
-#: po/placeholder.h:252
+#: po/placeholder.h:247
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  -u             - remove package if a better version is already installed.\n"
 msgstr ""
 
-#: po/placeholder.h:259
+#: po/placeholder.h:248
 msgid ""
-"  -u             - remove package if a better version is already installed.\n"
+"  -c             - choose complete method for resolving requires closure.\n"
 msgstr ""
 
-#: urpm.pm:1850 urpm.pm:1859
+#: urpm.pm:1676 urpm.pm:1685
 #, c-format
 msgid "removing %s to upgrade to %s ..."
 msgstr ""
 
-#: urpm.pm:1851 urpm.pm:1860
+#: urpm.pm:1677 urpm.pm:1686
 msgid ", $otherPackage, "
 msgstr ", $otherPackage, "
 
-#: urpm.pm:1851 urpm.pm:1860
+#: urpm.pm:1677 urpm.pm:1686
 msgid "));"
 msgstr "));"
 
-#: urpm.pm:1856
+#: urpm.pm:1682
 msgid "$p->{name}-$p->{version}-$p->{release}"
 msgstr "$p->{name}-$p->{version}-$p->{release}"
 
-#: urpm.pm:1866
+#: urpm.pm:1692
 msgid "$prefix/$_"
 msgstr "$prefix/$_"
 
@@ -971,7 +917,7 @@ msgstr "用法: urpmi.addmedia [--update] <名称> <url>"
 
 #: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
 #: urpmi.update:43 urpmi.update:44 urpmi.update:45 urpmi.update:46
-#: urpmi.update:47 urpmi.update:48
+#: urpmi.update:47 urpmi.update:48 urpmi.update:49
 msgid ") . _("
 msgstr ""
 
@@ -984,7 +930,7 @@ msgstr ");"
 msgid "usage: urpmi.update [options] <name> ..."
 msgstr "用法: urpmi.update [-a] <名称>..."
 
-#: urpmi.removemedia:35 urpmi.update:48
+#: urpmi.removemedia:35 urpmi.update:49
 msgid ", $_);"
 msgstr ", $_);"
 
@@ -997,6 +943,37 @@ msgstr "用法: urpmi.removemedia [-a] <名称> ..."
 msgid "urpmq version %s"
 msgstr "urpmq 版本 %s"
 
+#~ msgid "urpmi is not installed"
+#~ msgstr "urpmi没有安装"
+
+#~ msgid "unable to write compss file [%s]"
+#~ msgstr "无法写入 compss 文件 [%s]"
+
+#~ msgid "unable to read provides file [%s]"
+#~ msgstr "无法读取 提供信息 provides 文件 [%s]"
+
+#~ msgid "unable to read compss file [%s]"
+#~ msgstr "无法读取 compss 文件 [%s]"
+
+#~ msgid "unable to write provides file [%s]"
+#~ msgstr "无法写入 provides 文件 [%s]"
+
+#, fuzzy
+#~ msgid "unable to find all synthesis file, using parsehdlist server"
+#~ msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#~ msgid "unable to read depslist file [%s]"
+#~ msgstr "无法读取depslist 文件 [%s]"
+
+#~ msgid "read compss file [%s]"
+#~ msgstr "读取 compss 文件 [%s]"
+
+#~ msgid "write depslist file [%s]"
+#~ msgstr "写入 depslist 文件 [%s]"
+
+#~ msgid "unable to write depslist file [%s]"
+#~ msgstr "无法写 depslist 文件[\"%s]"
+
 #~ msgid ""
 #~ "%s\n"
 #~ "device `%s' do not exist\n"