review

1 files changed, 366 insertions, 222 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 5d264441..d20a3742 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "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"
+"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"
 "MIME-Version: 1.0\n"
@@ -18,68 +18,91 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: _irpm:21
-msgid "installing $rpm\n"
-msgstr "正在安装 $rpm\n"
+msgid ""
+"installing $rpm\n"
+""
+msgstr ""
+"正在安装 $rpm\n"
+""
 
 #: _irpm:31
 msgid ""
 "Automatic installation of packages...\n"
 "You requested installation of package $rpm\n"
+""
 msgstr ""
 "自动安装软件包...\n"
 "你要求安装软件包 $rpm\n"
+""
 
-#: _irpm:31 po/placeholder.h:152 urpmi:239
+#: _irpm:31
+#: po/placeholder.h:152
+#: urpmi:239
 msgid "Is it ok?"
 msgstr "这样好了吗?"
 
-#: _irpm:33 po/placeholder.h:153 urpmi:242 urpmi:272
+#: _irpm:33
+#: po/placeholder.h:153
+#: urpmi:242
+#: urpmi:272
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:34 po/placeholder.h:116 urpmi:243 urpmi:273
+#: _irpm:34
+#: po/placeholder.h:116
+#: urpmi:243
+#: urpmi:273
 msgid "Cancel"
 msgstr "取消"
 
-#: _irpm:40 po/placeholder.h:154 urpmi:247 urpmi:305
+#: _irpm:40
+#: po/placeholder.h:154
+#: urpmi:247
+#: urpmi:305
 msgid "Nn"
 msgstr "nN不否"
 
-#: _irpm:41 po/placeholder.h:119 urpmi:248 urpmi:306
+#: _irpm:41
+#: po/placeholder.h:119
+#: urpmi:248
+#: urpmi:306
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:42 po/placeholder.h:118 urpmi:249
+#: _irpm:42
+#: po/placeholder.h:118
+#: urpmi:249
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
 #: _irpm:61
-msgid "$rpm: command not found\n"
-msgstr "$rpm: 命令没找到\n"
+msgid ""
+"$rpm: command not found\n"
+""
+msgstr ""
+"$rpm: 命令没找到\n"
+""
 
 #: po/placeholder.h:6
-#, fuzzy, c-format
+#, c-format
 msgid "urpmf version %s"
-msgstr "urpmi 版本 %s"
+msgstr "urpmf 版本 %s"
 
 #: po/placeholder.h:7
 msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
-msgstr ""
+msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
 
 #: po/placeholder.h:8
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+msgid "This is free software and may be redistributed under the terms of the GNU GPL."
 msgstr ""
 
-#: po/placeholder.h:9 po/placeholder.h:26
-#, fuzzy
+#: po/placeholder.h:9
+#: po/placeholder.h:26
 msgid "usage: urpmf [options] <file>"
-msgstr "用法: rpmf [<文件>]"
+msgstr "用法: rpmf [选项] <文件>"
 
 #: po/placeholder.h:10
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+msgid "  --quiet         - do not print tag name (default if no tag given on command"
 msgstr ""
 
 #: po/placeholder.h:11
@@ -91,8 +114,7 @@ msgid "  --all           - print all tags."
 msgstr ""
 
 #: po/placeholder.h:13
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgid "  --name          - print tag name: rpm filename (assumed if no tag given on"
 msgstr ""
 
 #: po/placeholder.h:14
@@ -132,13 +154,11 @@ msgid "  --files         - print tag files: all files (multiple lines)."
 msgstr ""
 
 #: po/placeholder.h:23
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgid "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 msgstr ""
 
 #: po/placeholder.h:24
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgid "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 msgstr ""
 
 #: po/placeholder.h:25
@@ -153,12 +173,14 @@ msgstr ""
 msgid "urpmi is not installed"
 msgstr "urpmi没有安装"
 
-#: po/placeholder.h:29 urpm.pm:256
+#: po/placeholder.h:29
+#: urpm.pm:256
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr ""
 
-#: po/placeholder.h:30 urpm.pm:167
+#: po/placeholder.h:30
+#: urpm.pm:167
 #, c-format
 msgid "unable to use name \"%s\" for unamed medium because it is already used"
 msgstr ""
@@ -168,39 +190,43 @@ msgstr ""
 msgid "nothing to write in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:32 urpm.pm:216
+#: po/placeholder.h:32
+#: urpm.pm:216
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
 #: po/placeholder.h:33
-#, fuzzy, c-format
+#, c-format
 msgid "unable to parse hdlist file of \"%s\""
-msgstr "无法升级介质\"%s\"\n"
+msgstr "无法分析hdlist文件 \"%s\""
 
 #: po/placeholder.h:34
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: po/placeholder.h:35 urpm.pm:1747
+#: po/placeholder.h:35
+#: urpm.pm:1747
 #, c-format
 msgid ""
 "removing %s to upgrade ...\n"
 " to %s since it will not upgrade correctly!"
 msgstr ""
 
-#: po/placeholder.h:39 urpm.pm:764
+#: po/placeholder.h:39
+#: urpm.pm:764
 #, c-format
 msgid "read provides file [%s]"
 msgstr ""
 
 #: po/placeholder.h:40
-#, fuzzy, c-format
+#, c-format
 msgid "trying to remove inexistant medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法删除不存在的介质\"%s\""
 
-#: po/placeholder.h:41 urpm.pm:1540
+#: po/placeholder.h:41
+#: urpm.pm:1540
 #, c-format
 msgid "package %s is not found."
 msgstr ""
@@ -210,12 +236,14 @@ msgstr ""
 msgid "unable to copy source of [%s] from [%s]"
 msgstr ""
 
-#: po/placeholder.h:43 urpm.pm:795
-#, fuzzy, c-format
+#: po/placeholder.h:43
+#: urpm.pm:795
+#, c-format
 msgid "unable to write compss file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法写入 compss 文件 [%s]"
 
-#: po/placeholder.h:44 urpm.pm:738
+#: po/placeholder.h:44
+#: urpm.pm:738
 #, c-format
 msgid "unmounting %s"
 msgstr ""
@@ -230,7 +258,8 @@ msgstr ""
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: po/placeholder.h:47 urpm.pm:174
+#: po/placeholder.h:47
+#: urpm.pm:174
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
@@ -240,61 +269,70 @@ msgid "keeping only files referenced in provides"
 msgstr ""
 
 #: po/placeholder.h:49
-#, fuzzy, c-format
+#, c-format
 msgid "unable to build synthesis file for medium \"%s\""
-msgstr "无法升级介质\"%s\"\n"
+msgstr "无法为介质\"%s\"创建 synthesis文件"
 
 #: po/placeholder.h:50
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: po/placeholder.h:51 urpm.pm:761
-#, fuzzy, c-format
+#: po/placeholder.h:51
+#: urpm.pm:761
+#, c-format
 msgid "unable to read provides file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法读取 提供信息 provides 文件 [%s]"
 
-#: po/placeholder.h:52 urpm.pm:1827
+#: po/placeholder.h:52
+#: urpm.pm:1827
 #, c-format
 msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
 
-#: po/placeholder.h:53 urpm.pm:284
+#: po/placeholder.h:53
+#: urpm.pm:284
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: po/placeholder.h:54 urpm.pm:268
+#: po/placeholder.h:54
+#: urpm.pm:268
 #, c-format
 msgid "write config file [%s]"
 msgstr ""
 
 #: po/placeholder.h:55
-#, fuzzy, c-format
+#, c-format
 msgid "unable to write list file of \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:56 urpm.pm:1651
+#: po/placeholder.h:56
+#: urpm.pm:1651
 #, c-format
 msgid "retrieving [%s]"
 msgstr ""
 
-#: po/placeholder.h:57 urpm.pm:1653
+#: 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
+#: po/placeholder.h:58
+#: urpm.pm:1012
+#, c-format
 msgid "no package named %s"
-msgstr "没有名为 %s 的软件包\n"
+msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:59 urpm.pm:773
-#, fuzzy, c-format
+#: po/placeholder.h:59
+#: urpm.pm:773
+#, c-format
 msgid "unable to read compss file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法读取 compss 文件 [%s]"
 
-#: po/placeholder.h:60 urpm.pm:211
+#: po/placeholder.h:60
+#: urpm.pm:211
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
@@ -308,24 +346,26 @@ msgstr ""
 msgid "computing dependencies"
 msgstr ""
 
-#: po/placeholder.h:63 urpm.pm:793
+#: po/placeholder.h:63
+#: urpm.pm:793
 #, c-format
 msgid "write provides file [%s]"
 msgstr ""
 
-#: po/placeholder.h:64 urpm.pm:738
-#, fuzzy, c-format
+#: po/placeholder.h:64
+#: urpm.pm:738
+#, c-format
 msgid "mounting %s"
-msgstr "正在安装 %s\n"
+msgstr "正在安装 %s"
 
-#: po/placeholder.h:65 urpm.pm:161
+#: po/placeholder.h:65
+#: urpm.pm:161
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "unable to take care of medium \"%s\" as list file is already used by another medium"
 msgstr ""
 
-#: po/placeholder.h:66 urpm.pm:146
+#: po/placeholder.h:66
+#: urpm.pm:146
 #, c-format
 msgid "medium \"%s\" try to use an already used list, medium ignored"
 msgstr ""
@@ -335,63 +375,75 @@ msgstr ""
 msgid "reading hdlist file [%s]"
 msgstr ""
 
-#: po/placeholder.h:68 urpm.pm:798
+#: po/placeholder.h:68
+#: urpm.pm:798
 #, c-format
 msgid "write compss file [%s]"
 msgstr ""
 
-#: po/placeholder.h:69 urpm.pm:752
+#: po/placeholder.h:69
+#: urpm.pm:752
 #, c-format
 msgid "read depslist file [%s]"
 msgstr ""
 
 #: po/placeholder.h:70
-#, fuzzy, c-format
+#, c-format
 msgid "trying to select inexistant medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+msgstr ""
+"试图选择不存在的介质\"%s\""
+""
 
-#: po/placeholder.h:71 urpm.pm:1646
+#: po/placeholder.h:71
+#: urpm.pm:1646
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: po/placeholder.h:72 urpm.pm:143
+#: po/placeholder.h:72
+#: urpm.pm:143
 #, c-format
 msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: po/placeholder.h:73 urpm.pm:1739
+#: po/placeholder.h:73
+#: urpm.pm:1739
 #, c-format
 msgid ""
 "removing %s to upgrade ...\n"
 " to %s since it will not be updated otherwise"
 msgstr ""
 
-#: po/placeholder.h:77 urpm.pm:790
-#, fuzzy, c-format
+#: po/placeholder.h:77
+#: urpm.pm:790
+#, c-format
 msgid "unable to write provides file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法写入 provides 文件 [%s]"
 
-#: po/placeholder.h:78 urpm.pm:189
+#: po/placeholder.h:78
+#: urpm.pm:189
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:79 urpm.pm:916
-#, fuzzy
+#: po/placeholder.h:79
+#: urpm.pm:916
 msgid "unable to register rpm file"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法登记 rpm 文件"
 
-#: po/placeholder.h:80 urpm.pm:1208
+#: po/placeholder.h:80
+#: urpm.pm:1208
 msgid "unable to find all synthesis file, using parsehdlist server"
 msgstr ""
 
-#: po/placeholder.h:81 urpm.pm:239
+#: po/placeholder.h:81
+#: urpm.pm:239
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:82 urpm.pm:231
+#: po/placeholder.h:82
+#: urpm.pm:231
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
@@ -399,28 +451,35 @@ msgstr ""
 #: po/placeholder.h:83
 #, c-format
 msgid "copy of [%s] failed"
-msgstr ""
+msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:84 urpm.pm:822 urpm.pm:1480
-#, fuzzy, c-format
+#: po/placeholder.h:84
+#: urpm.pm:822
+#: urpm.pm:1480
+#, c-format
 msgid "unable to parse correctly [%s]"
-msgstr "无法升级介质\"%s\"\n"
+msgstr "无法分析 [%s]"
 
-#: po/placeholder.h:85 urpm.pm:749
-#, fuzzy, c-format
+#: po/placeholder.h:85
+#: urpm.pm:749
+#, c-format
 msgid "unable to read depslist file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法读取depslist 文件 [%s]"
 
-#: po/placeholder.h:86 urpm.pm:1573
+#: po/placeholder.h:86
+#: urpm.pm:1573
 msgid "removable medium not selected"
 msgstr ""
 
-#: po/placeholder.h:87 urpm.pm:776
+#: po/placeholder.h:87
+#: urpm.pm:776
 #, c-format
 msgid "read compss file [%s]"
-msgstr ""
+msgstr "读取 compss 文件 [%s]"
 
-#: po/placeholder.h:88 urpm.pm:122 urpm.pm:134
+#: po/placeholder.h:88
+#: urpm.pm:122
+#: urpm.pm:134
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
@@ -428,48 +487,56 @@ msgstr ""
 #: po/placeholder.h:89
 #, c-format
 msgid "building hdlist [%s]"
-msgstr ""
+msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:90 urpm.pm:1580
-#, fuzzy, c-format
+#: po/placeholder.h:90
+#: urpm.pm:1580
+#, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:91 urpm.pm:920
+#: po/placeholder.h:91
+#: urpm.pm:920
 msgid "error registering local packages"
 msgstr ""
 
-#: po/placeholder.h:92 urpm.pm:1596
+#: po/placeholder.h:92
+#: urpm.pm:1596
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
 #: po/placeholder.h:93
-#, fuzzy, c-format
+#, c-format
 msgid "unable to build hdlist: %s"
-msgstr "无法升级介质\"%s\"\n"
+msgstr "无法创建 hdlist: %s"
 
-#: po/placeholder.h:94 urpm.pm:911
+#: po/placeholder.h:94
+#: urpm.pm:911
 #, c-format
 msgid "invalid rpm file name [%s]"
-msgstr ""
+msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:95 urpm.pm:1592
+#: po/placeholder.h:95
+#: urpm.pm:1592
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: po/placeholder.h:96 urpm.pm:205
+#: po/placeholder.h:96
+#: urpm.pm:205
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: po/placeholder.h:97 urpm.pm:788
+#: po/placeholder.h:97
+#: urpm.pm:788
 #, c-format
 msgid "write depslist file [%s]"
-msgstr ""
+msgstr "写入 depslist 文件 [%s]"
 
-#: po/placeholder.h:98 urpm.pm:1239
+#: po/placeholder.h:98
+#: urpm.pm:1239
 #, c-format
 msgid "unknown data associated with %s"
 msgstr ""
@@ -477,14 +544,16 @@ msgstr ""
 #: po/placeholder.h:99
 #, c-format
 msgid "source of [%s] not found as [%s]"
-msgstr ""
+msgstr "[%s]源未发现 [%s]"
 
-#: po/placeholder.h:100 urpm.pm:191
+#: po/placeholder.h:100
+#: urpm.pm:191
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: po/placeholder.h:101 urpm.pm:1817
+#: po/placeholder.h:101
+#: urpm.pm:1817
 #, c-format
 msgid "avoid selecting %s as not enough files will be updated"
 msgstr ""
@@ -494,27 +563,35 @@ msgstr ""
 msgid "wget of [%s] failed (maybe wget is missing?)"
 msgstr ""
 
-#: po/placeholder.h:103 urpm.pm:912
-#, fuzzy, c-format
+#: po/placeholder.h:103
+#: urpm.pm:912
+#, c-format
 msgid "unable to access rpm file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:104 urpm.pm:785
-#, fuzzy, c-format
+#: po/placeholder.h:104
+#: urpm.pm:785
+#, c-format
 msgid "unable to write depslist file [%s]"
-msgstr "无法创建介质\"%s\"\n"
+msgstr "无法写 depslist 文件[\"%s]"
 
-#: po/placeholder.h:105 urpm.pm:300 urpm.pm:1607
-#, fuzzy, c-format
+#: po/placeholder.h:105
+#: urpm.pm:300
+#: urpm.pm:1607
+#, c-format
 msgid "unable to access medium \"%s\""
-msgstr "无法升级介质\"%s\"\n"
+msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:106 urpm.pm:899
+#: po/placeholder.h:106
+#: urpm.pm:899
 #, c-format
 msgid "relocated %s entries in depslist"
-msgstr ""
+msgstr "在depslist中重新定位 %s"
 
-#: po/placeholder.h:107 urpm.pm:829 urpm.pm:1486 urpm.pm:1528
+#: po/placeholder.h:107
+#: urpm.pm:829
+#: urpm.pm:1486
+#: urpm.pm:1528
 #, c-format
 msgid "unable to parse correctly [%s] on value \"%s\""
 msgstr ""
@@ -522,58 +599,72 @@ msgstr ""
 #: po/placeholder.h:108
 #, c-format
 msgid "no rpm files found from [%s]"
-msgstr ""
+msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:109 urpm.pm:1015
-#, fuzzy, c-format
+#: po/placeholder.h:109
+#: urpm.pm:1015
+#, c-format
 msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s\n"
+msgstr ""
+"下列软件包里有 %s: %s"
+""
 
-#: po/placeholder.h:110 urpm.pm:1497 urpm.pm:1519
+#: 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:111 urpm.pm:1716
+#: po/placeholder.h:111
+#: urpm.pm:1716
 #, c-format
 msgid "selecting %s using obsoletes"
-msgstr ""
+msgstr "使用过期选择 %s"
 
-#: po/placeholder.h:112 urpm.pm:1824
+#: po/placeholder.h:112
+#: urpm.pm:1824
 #, c-format
 msgid "selecting %s by selection on files"
-msgstr ""
+msgstr "正在文件上选择 %s"
 
-#: po/placeholder.h:113 urpm.pm:178
+#: po/placeholder.h:113
+#: urpm.pm:178
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
-msgstr ""
+msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:114 urpmi:300 urpmi:314
+#: po/placeholder.h:114
+#: urpmi:300
+#: urpmi:314
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: po/placeholder.h:115 urpmi:270
+#: po/placeholder.h:115
+#: urpmi:270
 msgid "Press enter when it's done..."
 msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:117 urpmi:193
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: po/placeholder.h:117
+#: urpmi:193
+msgid ""
+"Sorry, bad choice, try again\n"
+""
+msgstr ""
+"对不起, 选择无效, 请再试一次\n"
+""
 
 #: po/placeholder.h:120
-#, fuzzy, c-format
+#, c-format
 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"
+"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"
+"  --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"
@@ -586,12 +677,14 @@ msgid ""
 "  -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"
@@ -601,75 +694,94 @@ msgstr ""
 "  -m               - 选择最少要求颜色 (却省).\n"
 "  -M               - 选择最多要求颜色.\n"
 "  -c               - 选择要求颜色的分辨.\n"
+"  -p               - 允许检索 提供信息 查找软件包.\n"
 "  -q               - 哑模式.\n"
 "  -v               - 明细模式.\n"
 "  要安装的rpm名称.\n"
+""
 
-#: po/placeholder.h:142 urpmi:284
+#: po/placeholder.h:142
+#: urpmi:284
 msgid "everything already installed"
 msgstr "全部安装完成"
 
-#: po/placeholder.h:143 urpmi:238
+#: po/placeholder.h:143
+#: urpmi:238
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
+msgid "To satisfy dependencies, the following packages are going to be installed (%d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:144 urpmi:295
+#: po/placeholder.h:144
+#: urpmi:295
 #, c-format
-msgid "installing %s\n"
-msgstr "正在安装 %s\n"
+msgid ""
+"installing %s\n"
+""
+msgstr ""
+"正在安装 %s\n"
+""
 
-#: po/placeholder.h:145 urpmi:190
+#: po/placeholder.h:145
+#: urpmi:190
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:  (1-%d) "
 
-#: po/placeholder.h:146 urpmi:307
+#: po/placeholder.h:146
+#: urpmi:307
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:147 urpmi:182
+#: po/placeholder.h:147
+#: urpmi:182
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: po/placeholder.h:148 urpmi:144
+#: po/placeholder.h:148
+#: urpmi:144
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: po/placeholder.h:149 urpmi:269
-#, fuzzy, c-format
+#: po/placeholder.h:149
+#: urpmi:269
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请插入 %s, 标签到 [%s]"
+msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:150 po/placeholder.h:205 urpmi:259 urpmq:154
+#: po/placeholder.h:150
+#: po/placeholder.h:205
+#: urpmi:259
+#: urpmq:154
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包， 中止"
 
-#: po/placeholder.h:151 urpmi:315
+#: 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
+#: po/placeholder.h:155
+#: urpmi.addmedia:46
 #, c-format
 msgid ""
 "%s\n"
 "`with' missing for ftp media\n"
+""
 msgstr ""
 "%s\n"
 "`with'找不到ftp介质\n"
+""
 
 #: po/placeholder.h:159
 msgid ""
 "usage: urpmi.addmedia [--update] <name> <url>\n"
 "where <url> is one of\n"
 "       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable_<device>://<path>\n"
+""
 msgstr ""
 "用法: urpmi.addmedia <名称> <url>\n"
 "  <url> 为以下之一\n"
@@ -677,37 +789,54 @@ msgstr ""
 "       ftp://<用户>:<密码>@<主机>/<路径> with <hdlist相对路径>\n"
 "       http://<主机>/<路径> with <hdlist相对路径>\n"
 "       removable_<设备>://<路径>\n"
+""
 
-#: po/placeholder.h:168 urpmi.addmedia:57
+#: po/placeholder.h:168
+#: urpmi.addmedia:57
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质\"%s\"\n"
+msgid ""
+"unable to create medium \"%s\"\n"
+""
+msgstr ""
+"无法创建介质\"%s\"\n"
+""
 
-#: po/placeholder.h:169 urpmi.addmedia:58
+#: po/placeholder.h:169
+#: urpmi.addmedia:58
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法升级介质\"%s\"\n"
+msgid ""
+"unable to update medium \"%s\"\n"
+""
+msgstr ""
+"无法升级介质\"%s\"\n"
+""
 
-#: po/placeholder.h:170 urpmi.addmedia:42
+#: po/placeholder.h:170
+#: urpmi.addmedia:42
 #, c-format
 msgid ""
 "%s\n"
 "device `%s' do not exist\n"
+""
 msgstr ""
 "%s\n"
 "设备 `%s'不存在\n"
+""
 
-#: po/placeholder.h:174 urpmi.addmedia:44
+#: po/placeholder.h:174
+#: urpmi.addmedia:44
 #, c-format
 msgid ""
 "%s\n"
 "<relative path of hdlist> missing\n"
+""
 msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
+""
 
 #: po/placeholder.h:178
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: urpmi.update [-a] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -716,38 +845,58 @@ msgid ""
 "   -f    force generation of base files, use another -f for hdlist files.\n"
 "\n"
 "unknown options '%s'\n"
+""
 msgstr ""
 "用法: urpmi.update [-a] <名称> ...\n"
 "   <名称>是要升级的介质.\n"
 "   -a   选中所有介质.\n"
+"   -c   清除文件头缓存目录.\n"
+"   -f   强制生成 base文件, 用另一个 -f 生成 hdlist文件.\n"
 "\n"
 "未知选项 '%s'\n"
+""
 
-#: 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: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
+#: po/placeholder.h:188
+#: urpmi.update:52
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
+""
 msgstr ""
 "找不到要升级的项\n"
 "(%s中之一)\n"
+""
 
-#: 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:192
+#: 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:193
+#: urpmi.removemedia:46
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
+""
 msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
+""
 
 #: po/placeholder.h:197
 #, c-format
@@ -757,36 +906,50 @@ msgid ""
 "   -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:204
+#: urpmq:87
+#, c-format
+msgid ""
+"urpmq: cannot read rpm file \"%s\"\n"
+""
+msgstr ""
+"urpmq: 无法读取rpm文件 \"%s\"\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:206
+#: urpmq:85
+#, c-format
+msgid ""
+"urpmq: unknown option \"-%s\", check usage with --help\n"
+""
+msgstr ""
+"urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+""
 
-#: po/placeholder.h:207 urpmq:132
+#: po/placeholder.h:207
+#: urpmq:132
 msgid ""
-"some package have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+"some package have to be removed for being upgraded, this is not supported yet\n"
+""
+msgstr ""
+"有些软件包要求先删除再升级, 暂不支持\n"
+""
 
 #: po/placeholder.h:208
 #, c-format
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000, 2001 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"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"
@@ -808,6 +971,7 @@ msgid ""
 "  --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 ""
 
 #: urpmi:48
@@ -816,9 +980,8 @@ msgid "urpmi version %s"
 msgstr "urpmi 版本 %s"
 
 #: urpmi.addmedia:30
-#, fuzzy
 msgid "usage: urpmi.addmedia [--update] <name> <url>"
-msgstr "用法: urpmi.addmedia <名称> <url>"
+msgstr "用法: urpmi.addmedia [--update] <名称> <url>"
 
 #. <path>
 #. <login>:<password>@<host>/<path> with <relative filename of hdlist>
@@ -846,22 +1009,3 @@ msgstr ", $_);"
 msgid "urpmq version %s"
 msgstr "urpmq 版本 %s"
 
-#~ msgid "));"
-#~ msgstr "));"
-
-#~ msgid "), $_);"
-#~ msgstr "), $_);"
-
-#~ msgid ""
-#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name "
-#~ "[package_names...]\n"
-#~ msgstr "用法: urpmi [-h] [--auto] [--force] [-a] 软件包名 [软件包名...]\n"
-
-#~ msgid "rpm database query failed\n"
-#~ msgstr "rpm 数据库查询失败\n"
-
-#~ msgid "Sorry can't find file %s, exiting"
-#~ msgstr "对不起, 没有找到文件 %s, 正在退出"
-
-#~ msgid "Failed dependencies: %s requires %s"
-#~ msgstr "相关性错误: %s 需要 %s"