sync with code

1 files changed, 113 insertions, 78 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ecd7be2c..8657a478 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
 "PO-Revision-Date: 2007-08-22 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -109,7 +109,86 @@ msgstr "取消(_C)"
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 版本 %s\n"
+"版权 (C) 1999-2008 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 打印帮助信息。\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.    --auto\n"
+msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - 安装之前验证 rpm 签署\n"
+"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr "  --test         - 验证安装是否可以正确进行。\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
+
+#: ../gurpmi.pm:98
 #, c-format
 msgid "No packages specified"
 msgstr "未指定软件包"
@@ -266,6 +345,11 @@ msgstr "安装完成"
 msgid "removing %s"
 msgstr "正在删除 %s"
 
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "重新启动 urpmi"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -416,7 +500,14 @@ msgstr "参数太多\n"
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "介质“%s”不可用"
@@ -742,7 +833,9 @@ msgstr "出错"
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
-msgstr "安装失败，rpm 有问题:\n%s"
+msgstr ""
+"安装失败，rpm 有问题:\n"
+"%s"
 
 #: ../urpm/main_loop.pm:270
 #, c-format
@@ -875,6 +968,11 @@ msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
 #: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "环境目录 %s 不存在"
+
+#: ../urpm/media.pm:767
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
@@ -929,7 +1027,12 @@ msgstr "...重新配置失败"
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
@@ -1187,13 +1290,6 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpm/search.pm:35 ../urpme:45 ../urpmf:35 ../urpmi:74
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息。\n"
-
 #: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
@@ -1222,11 +1318,6 @@ msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
-#, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
-
 #: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
 #, c-format
 msgid ""
@@ -1585,12 +1676,6 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
-
 #: ../urpme:49 ../urpmi:109 ../urpmq:67
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
@@ -1683,28 +1768,6 @@ msgstr "(是(y)/否(N))[否]"
 msgid "Removal failed"
 msgstr "删除失败"
 
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi 版本 %s\n"
-"版权 (C) 1999-2008 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包。\n"
-
 #: ../urpmi:81
 #, c-format
 msgid ""
@@ -1712,12 +1775,6 @@ msgid ""
 "questions.\n"
 msgstr "  --auto         - 非交互模式，对全部问题假定默认回答。\n"
 
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
-
 #: ../urpmi:83
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1823,11 +1880,6 @@ msgid ""
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
-
 #: ../urpmi:112
 #, c-format
 msgid ""
@@ -1910,22 +1962,6 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:132
-#, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - 安装之前验证 rpm 签署\n"
-"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-"  --test         - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr "  --test         - 验证安装是否可以正确进行。\n"
-
 #: ../urpmi:135
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
@@ -2030,8 +2066,7 @@ msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr ""
-"请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
+msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
 #: ../urpmi:241
 #, c-format
@@ -2236,12 +2271,12 @@ msgstr[0] "继续安装 %d 个软件包吗？"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:665
+#: ../urpmi:635
 #, c-format
-msgid "restarting urpmi"
-msgstr "重新启动 urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
 
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
 #. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:36
 #, c-format