updated pot file

1 files changed, 312 insertions, 324 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 7bfeceb8..5d264441 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2001-07-19 16:38+0200\n"
+"Project-Id-Version: urpmi 1.7\n"
+"POT-Creation-Date: 2001-08-17 13:07+0200\n"
 "PO-Revision-Date: 2001-04-09 13:04+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:150 urpmi:239
+#: _irpm:31 po/placeholder.h:152 urpmi:239
 msgid "Is it ok?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:156 urpmi:242 urpmi:272
+#: _irpm:33 po/placeholder.h:153 urpmi:242 urpmi:272
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:120 urpmi:243 urpmi:273
+#: _irpm:34 po/placeholder.h:116 urpmi:243 urpmi:273
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:157 urpmi:247 urpmi:305
+#: _irpm:40 po/placeholder.h:154 urpmi:247 urpmi:305
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:151 urpmi:248 urpmi:306
+#: _irpm:41 po/placeholder.h:119 urpmi:248 urpmi:306
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:122 urpmi:249
+#: _irpm:42 po/placeholder.h:118 urpmi:249
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
@@ -153,59 +153,46 @@ msgstr ""
 msgid "urpmi is not installed"
 msgstr "urpmi没有安装"
 
-#: po/placeholder.h:29 urpm.pm:231
+#: po/placeholder.h:29 urpm.pm:256
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:894
+#: po/placeholder.h:30 urpm.pm:167
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "unable to use name \"%s\" for unamed medium because it is already used"
 msgstr ""
 
 #: po/placeholder.h:31
 #, c-format
-msgid "copy of [%s] failed"
-msgstr ""
-
-#: po/placeholder.h:32 urpm.pm:1583
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
-
-#: po/placeholder.h:33 urpm.pm:906
-#, c-format
-msgid "invalid rpm file name [%s]"
+msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:34
+#: po/placeholder.h:32 urpm.pm:216
 #, c-format
-msgid "source of [%s] not found as [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:795
+#: po/placeholder.h:33
 #, fuzzy, c-format
-msgid "unable to write compss file [%s]"
-msgstr "无法创建介质\"%s\"\n"
-
-#: po/placeholder.h:36 urpm.pm:1719
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:37 urpm.pm:738
+#: po/placeholder.h:34
 #, c-format
-msgid "unmounting %s"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:38 urpm.pm:191
+#: po/placeholder.h:35 urpm.pm:1747
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid ""
+"removing %s to upgrade ...\n"
+" to %s since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:39 urpm.pm:798
+#: po/placeholder.h:39 urpm.pm:764
 #, c-format
-msgid "write compss file [%s]"
+msgid "read provides file [%s]"
 msgstr ""
 
 #: po/placeholder.h:40
@@ -213,391 +200,368 @@ msgstr ""
 msgid "trying to remove inexistant medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:41 urpm.pm:1595
+#: po/placeholder.h:41 urpm.pm:1540
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "package %s is not found."
 msgstr ""
 
-#: po/placeholder.h:42 urpm.pm:752
+#: po/placeholder.h:42
 #, c-format
-msgid "read depslist file [%s]"
+msgid "unable to copy source of [%s] from [%s]"
 msgstr ""
 
-#: po/placeholder.h:43
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+#: po/placeholder.h:43 urpm.pm:795
+#, fuzzy, c-format
+msgid "unable to write compss file [%s]"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:44 urpm.pm:764
+#: po/placeholder.h:44 urpm.pm:738
 #, c-format
-msgid "read provides file [%s]"
+msgid "unmounting %s"
 msgstr ""
 
-#: po/placeholder.h:45 urpm.pm:161
+#: po/placeholder.h:45
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
 #: po/placeholder.h:46
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:785
-#, fuzzy, c-format
-msgid "unable to write depslist file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+#: po/placeholder.h:47 urpm.pm:174
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
 
 #: po/placeholder.h:48
-msgid "computing dependencies"
+msgid "keeping only files referenced in provides"
 msgstr ""
 
-#: po/placeholder.h:49 urpm.pm:790
+#: po/placeholder.h:49
 #, fuzzy, c-format
-msgid "unable to write provides file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:50 urpm.pm:1656
+#: po/placeholder.h:50
 #, c-format
-msgid "wget of [%s] failed"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:51 urpm.pm:1599
+#: po/placeholder.h:51 urpm.pm:761
+#, fuzzy, c-format
+msgid "unable to read provides file [%s]"
+msgstr "无法创建介质\"%s\"\n"
+
+#: po/placeholder.h:52 urpm.pm:1827
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:52 urpm.pm:788
+#: po/placeholder.h:53 urpm.pm:284
 #, c-format
-msgid "write depslist file [%s]"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:53
-msgid "keeping only provides files"
+#: po/placeholder.h:54 urpm.pm:268
+#, c-format
+msgid "write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:54
+#: po/placeholder.h:55
 #, fuzzy, c-format
-msgid "trying to select inexistant medium \"%s\""
+msgid "unable to write list file of \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:55
+#: po/placeholder.h:56 urpm.pm:1651
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "retrieving [%s]"
 msgstr ""
 
-#: po/placeholder.h:56 urpm.pm:1013
+#: po/placeholder.h:57 urpm.pm:1653
+#, c-format
+msgid "wget of [%s] failed"
+msgstr ""
+
+#: po/placeholder.h:58 urpm.pm:1012
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包\n"
 
-#: po/placeholder.h:57 urpm.pm:1016
+#: po/placeholder.h:59 urpm.pm:773
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s\n"
-
-#: po/placeholder.h:58 urpm.pm:793
-#, c-format
-msgid "write provides file [%s]"
-msgstr ""
-
-#: po/placeholder.h:59 urpm.pm:143
-#, c-format
-msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
-msgstr ""
+msgid "unable to read compss file [%s]"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:60 urpm.pm:1830
+#: po/placeholder.h:60 urpm.pm:211
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
 #: po/placeholder.h:61
 #, c-format
-msgid "wget of [%s] failed (maybe wget is missing?)"
-msgstr ""
-
-#: po/placeholder.h:62 urpm.pm:914
-msgid "mismatch arch for registering rpm file"
-msgstr ""
-
-#: po/placeholder.h:63
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "无法创建介质\"%s\"\n"
-
-#: po/placeholder.h:64
-#, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:65 urpm.pm:921
-msgid "error registering local packages"
+#: po/placeholder.h:62
+msgid "computing dependencies"
 msgstr ""
 
-#: po/placeholder.h:66 urpm.pm:205
+#: po/placeholder.h:63 urpm.pm:793
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:67
+#: po/placeholder.h:64 urpm.pm:738
 #, fuzzy, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "无法升级介质\"%s\"\n"
+msgid "mounting %s"
+msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:68 urpm.pm:1742
+#: po/placeholder.h:65 urpm.pm:161
 #, c-format
 msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not be updated otherwise"
-msgstr ""
-
-#: po/placeholder.h:72
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr ""
-
-#: po/placeholder.h:73 urpm.pm:776
-#, c-format
-msgid "read compss file [%s]"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: po/placeholder.h:74 urpm.pm:239
+#: po/placeholder.h:66 urpm.pm:146
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" try to use an already used list, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:75
-#, fuzzy, c-format
-msgid "unable to build hdlist: %s"
-msgstr "无法升级介质\"%s\"\n"
-
-#: po/placeholder.h:76 urpm.pm:1827
+#: po/placeholder.h:67
 #, c-format
-msgid "selecting %s by selection on files"
+msgid "reading hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:256
+#: po/placeholder.h:68 urpm.pm:798
 #, c-format
-msgid "unable to write config file [%s]"
+msgid "write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:78
+#: po/placeholder.h:69 urpm.pm:752
 #, c-format
-msgid "found %d headers in cache"
+msgid "read depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:79 urpm.pm:749
+#: po/placeholder.h:70
 #, fuzzy, c-format
-msgid "unable to read depslist file [%s]"
+msgid "trying to select inexistant medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:80
+#: po/placeholder.h:71 urpm.pm:1646
 #, c-format
-msgid "unable to copy source of [%s] from [%s]"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:81 urpm.pm:1649
+#: po/placeholder.h:72 urpm.pm:143
 #, c-format
-msgid "malformed input: [%s]"
+msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:82 urpm.pm:268
+#: po/placeholder.h:73 urpm.pm:1739
 #, c-format
-msgid "write config file [%s]"
+msgid ""
+"removing %s to upgrade ...\n"
+" to %s since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:83 urpm.pm:761
+#: po/placeholder.h:77 urpm.pm:790
 #, fuzzy, c-format
-msgid "unable to read provides file [%s]"
+msgid "unable to write provides file [%s]"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:84 urpm.pm:122 urpm.pm:134
+#: po/placeholder.h:78 urpm.pm:189
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:85 urpm.pm:1576
-msgid "removable medium not selected"
-msgstr ""
+#: po/placeholder.h:79 urpm.pm:916
+#, fuzzy
+msgid "unable to register rpm file"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:86 urpm.pm:189
-#, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+#: po/placeholder.h:80 urpm.pm:1208
+msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:1543
+#: po/placeholder.h:81 urpm.pm:239
 #, c-format
-msgid "package %s is not found."
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:88 urpm.pm:178
+#: po/placeholder.h:82 urpm.pm:231
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:89 urpm.pm:1239
+#: po/placeholder.h:83
 #, c-format
-msgid "unknown data associated with %s"
+msgid "copy of [%s] failed"
 msgstr ""
 
-#: po/placeholder.h:90 urpm.pm:146
-#, c-format
-msgid "medium \"%s\" try to use an already used list, medium ignored"
-msgstr ""
+#: po/placeholder.h:84 urpm.pm:822 urpm.pm:1480
+#, fuzzy, c-format
+msgid "unable to parse correctly [%s]"
+msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:91 urpm.pm:174
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+#: po/placeholder.h:85 urpm.pm:749
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:92 urpm.pm:918
-msgid "rpmtools package is too old, please upgrade it"
+#: po/placeholder.h:86 urpm.pm:1573
+msgid "removable medium not selected"
 msgstr ""
 
-#: po/placeholder.h:93
+#: po/placeholder.h:87 urpm.pm:776
 #, c-format
-msgid "building hdlist [%s]"
+msgid "read compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:94 urpm.pm:300 urpm.pm:1610
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "无法升级介质\"%s\"\n"
-
-#: po/placeholder.h:95 urpm.pm:738
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "正在安装 %s\n"
-
-#: po/placeholder.h:96 urpm.pm:167
+#: po/placeholder.h:88 urpm.pm:122 urpm.pm:134
 #, c-format
-msgid "unable to use name \"%s\" for unamed medium because it is already used"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:1208
-msgid "unable to find all synthesis file, using parsehdlist server"
+#: po/placeholder.h:89
+#, c-format
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: po/placeholder.h:98 urpm.pm:907
+#: po/placeholder.h:90 urpm.pm:1580
 #, fuzzy, c-format
-msgid "unable to access rpm file [%s]"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:99 urpm.pm:1820
+#: po/placeholder.h:91 urpm.pm:920
+msgid "error registering local packages"
+msgstr ""
+
+#: po/placeholder.h:92 urpm.pm:1596
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: po/placeholder.h:100
+#: po/placeholder.h:93
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "unable to build hdlist: %s"
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:101 urpm.pm:1654
+#: po/placeholder.h:94 urpm.pm:911
 #, c-format
-msgid "retrieving [%s]"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: po/placeholder.h:102 urpm.pm:216
+#: po/placeholder.h:95 urpm.pm:1592
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:103 urpm.pm:913
-msgid "mismatch release for registering rpm file"
+#: po/placeholder.h:96 urpm.pm:205
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:104 urpm.pm:1750
+#: po/placeholder.h:97 urpm.pm:788
 #, c-format
-msgid ""
-"removing %s to upgrade ...\n"
-" to %s since it will not upgrade correctly!"
+msgid "write depslist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:108
+#: po/placeholder.h:98 urpm.pm:1239
 #, c-format
-msgid "reading hdlist file [%s]"
+msgid "unknown data associated with %s"
 msgstr ""
 
-#: po/placeholder.h:109 urpm.pm:829 urpm.pm:1489 urpm.pm:1531
+#: po/placeholder.h:99
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
+msgid "source of [%s] not found as [%s]"
 msgstr ""
 
-#: po/placeholder.h:110 urpm.pm:912
-msgid "mismatch version for registering rpm file"
+#: po/placeholder.h:100 urpm.pm:191
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:111
+#: po/placeholder.h:101 urpm.pm:1817
 #, c-format
-msgid "nothing to write in list file for \"%s\""
+msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
 
-#: po/placeholder.h:112 urpm.pm:211
+#: po/placeholder.h:102
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "wget of [%s] failed (maybe wget is missing?)"
 msgstr ""
 
-#: po/placeholder.h:113 urpm.pm:773
+#: po/placeholder.h:103 urpm.pm:912
 #, fuzzy, c-format
-msgid "unable to read compss file [%s]"
+msgid "unable to access rpm file [%s]"
 msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:114 urpm.pm:822 urpm.pm:1483
+#: po/placeholder.h:104 urpm.pm:785
 #, fuzzy, c-format
-msgid "unable to parse correctly [%s]"
+msgid "unable to write depslist file [%s]"
+msgstr "无法创建介质\"%s\"\n"
+
+#: po/placeholder.h:105 urpm.pm:300 urpm.pm:1607
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
 msgstr "无法升级介质\"%s\"\n"
 
-#: po/placeholder.h:115 urpm.pm:1500 urpm.pm:1522
+#: po/placeholder.h:106 urpm.pm:899
 #, c-format
-msgid "there are multiples packages with the same rpm filename \"%s\""
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: po/placeholder.h:116 urpm.pm:284
+#: po/placeholder.h:107 urpm.pm:829 urpm.pm:1486 urpm.pm:1528
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
 
-#: po/placeholder.h:117 urpmi:190
+#: po/placeholder.h:108
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:  (1-%d) "
+msgid "no rpm files found from [%s]"
+msgstr ""
 
-#: po/placeholder.h:118 urpmi:182
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+#: po/placeholder.h:109 urpm.pm:1015
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s\n"
 
-#: po/placeholder.h:119 urpmi:270
-msgid "Press enter when it's done..."
-msgstr "准备好后按 Enter 键..."
+#: po/placeholder.h:110 urpm.pm:1497 urpm.pm:1519
+#, c-format
+msgid "there are multiples packages with the same rpm filename \"%s\""
+msgstr ""
 
-#: po/placeholder.h:121 urpmi:284
-msgid "everything already installed"
-msgstr "全部安装完成"
+#: po/placeholder.h:111 urpm.pm:1716
+#, c-format
+msgid "selecting %s using obsoletes"
+msgstr ""
 
-#: po/placeholder.h:123 urpmi:238
+#: po/placeholder.h:112 urpm.pm:1824
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
+msgid "selecting %s by selection on files"
+msgstr ""
 
-#: po/placeholder.h:124 po/placeholder.h:236 urpmi:259 urpmq:154
-msgid "unable to get source packages, aborting"
-msgstr "无法读取源软件包， 中止"
+#: po/placeholder.h:113 urpm.pm:178
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
 
-#: po/placeholder.h:125 urpmi:307
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
+#: po/placeholder.h:114 urpmi:300 urpmi:314
+msgid "Installation failed"
+msgstr "安装失败"
 
-#: po/placeholder.h:126 urpmi:269
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请插入 %s, 标签到 [%s]"
+#: po/placeholder.h:115 urpmi:270
+msgid "Press enter when it's done..."
+msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:127
+#: po/placeholder.h:117 urpmi:193
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
+
+#: po/placeholder.h:120
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
@@ -641,57 +605,62 @@ msgstr ""
 "  -v               - 明细模式.\n"
 "  要安装的rpm名称.\n"
 
-#: po/placeholder.h:149 urpmi:193
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: po/placeholder.h:142 urpmi:284
+msgid "everything already installed"
+msgstr "全部安装完成"
 
-#: po/placeholder.h:152 urpmi:315
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+#: po/placeholder.h:143 urpmi:238
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:153 urpmi:295
+#: po/placeholder.h:144 urpmi:295
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: po/placeholder.h:154 urpmi:300 urpmi:314
-msgid "Installation failed"
-msgstr "安装失败"
+#: po/placeholder.h:145 urpmi:190
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:  (1-%d) "
+
+#: po/placeholder.h:146 urpmi:307
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:155 urpmi:144
+#: po/placeholder.h:147 urpmi:182
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#: po/placeholder.h:148 urpmi:144
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:158 urpmi.addmedia:46
-#, c-format
-msgid ""
-"%s\n"
-"`with' missing for ftp media\n"
-msgstr ""
-"%s\n"
-"`with'找不到ftp介质\n"
+#: po/placeholder.h:149 urpmi:269
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请插入 %s, 标签到 [%s]"
 
-#: po/placeholder.h:162 urpmi.addmedia:58
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法升级介质\"%s\"\n"
+#: po/placeholder.h:150 po/placeholder.h:205 urpmi:259 urpmq:154
+msgid "unable to get source packages, aborting"
+msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:163 urpmi.addmedia:42
+#: po/placeholder.h:151 urpmi:315
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+
+#: po/placeholder.h:155 urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
-"device `%s' do not exist\n"
+"`with' missing for ftp media\n"
 msgstr ""
 "%s\n"
-"设备 `%s'不存在\n"
-
-#: po/placeholder.h:167 urpmi.addmedia:57
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质\"%s\"\n"
+"`with'找不到ftp介质\n"
 
-#: po/placeholder.h:168
-#, fuzzy
+#: po/placeholder.h:159
 msgid ""
 "usage: urpmi.addmedia [--update] <name> <url>\n"
 "where <url> is one of\n"
@@ -705,33 +674,39 @@ msgstr ""
 "用法: urpmi.addmedia <名称> <url>\n"
 "  <url> 为以下之一\n"
 "       file://<路径>\n"
-"       ftp://<用户>:<密码>@<主机>/<路径>  为<hdlist相对路径>\n"
-"       http://<主机>/<路径>  为<hdlist相对路径>\n"
-"       <可移动设备>://<路径>\n"
+"       ftp://<用户>:<密码>@<主机>/<路径> with <hdlist相对路径>\n"
+"       http://<主机>/<路径> with <hdlist相对路径>\n"
+"       removable_<设备>://<路径>\n"
 
-#: po/placeholder.h:177 urpmi.addmedia:44
+#: po/placeholder.h:168 urpmi.addmedia:57
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "无法创建介质\"%s\"\n"
+
+#: po/placeholder.h:169 urpmi.addmedia:58
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法升级介质\"%s\"\n"
+
+#: po/placeholder.h:170 urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
-"<relative path of hdlist> missing\n"
+"device `%s' do not exist\n"
 msgstr ""
 "%s\n"
-"<hdlist相对路径>找不到\n"
+"设备 `%s'不存在\n"
 
-#: po/placeholder.h:181 urpmi.update:52
+#: po/placeholder.h:174 urpmi.addmedia:44
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
 msgstr ""
-"找不到要升级的项\n"
-"(%s中之一)\n"
-
-#: po/placeholder.h:185 urpmi.update:50
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
+"%s\n"
+"<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:186
+#: po/placeholder.h:178
 #, fuzzy, c-format
 msgid ""
 "usage: urpmi.update [-a] <name> ...\n"
@@ -748,26 +723,24 @@ msgstr ""
 "\n"
 "未知选项 '%s'\n"
 
-#: po/placeholder.h:195
+#: po/placeholder.h:187 urpmi.update:50
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
+
+#: po/placeholder.h:188 urpmi.update:52
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-"   -a    select all media.\n"
-"\n"
-"unknown options '%s'\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"用法: urpmi.removemedia -a <名称> ...\n"
-"   <名称>是要删除的介质名.\n"
-"   -a   选中所有介质.\n"
-"\n"
-"未知选项 '%s'\n"
+"找不到要升级的项\n"
+"(%s中之一)\n"
 
-#: po/placeholder.h:202 urpmi.removemedia:44
+#: po/placeholder.h:192 urpmi.removemedia:44
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西删除(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:203 urpmi.removemedia:46
+#: po/placeholder.h:193 urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -776,11 +749,37 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: po/placeholder.h:207 urpmq:85
+#: po/placeholder.h:197
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+"   -a    select all media.\n"
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"用法: urpmi.removemedia -a <名称> ...\n"
+"   <名称>是要删除的介质名.\n"
+"   -a   选中所有介质.\n"
+"\n"
+"未知选项 '%s'\n"
+
+#: po/placeholder.h:204 urpmq:87
+#, fuzzy, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取rpm文件 \"$_\"\n"
+
+#: po/placeholder.h:206 urpmq:85
 #, fuzzy, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "urpmq: 未知选项 \"-$1\", 用--help 检查用法\n"
 
+#: po/placeholder.h:207 urpmq:132
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+
 #: po/placeholder.h:208
 #, c-format
 msgid ""
@@ -811,17 +810,6 @@ msgid ""
 "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: po/placeholder.h:234 urpmq:132
-msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "有些软件包要求先删除再升级, 暂不支持\n"
-
-#: po/placeholder.h:235 urpmq:87
-#, fuzzy, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取rpm文件 \"$_\"\n"
-
 #: urpmi:48
 #, c-format
 msgid "urpmi version %s"