i18n improvements

1 files changed, 167 insertions, 58 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 52990708..1fc11261 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi 1.3\n"
-"POT-Creation-Date: 2000-05-07 17:46+0200\n"
+"Project-Id-Version: urpmi 1.5\n"
+"POT-Creation-Date: 2001-02-14 17:48+0100\n"
 "PO-Revision-Date: 2000-09-21 17:04+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Chinese (GB) <zh@li.org>\n"
@@ -13,97 +13,206 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../urpmi:38
+#: _irpm:21
+#, fuzzy
+msgid "installing $rpm\n"
+msgstr "正在安装 %s\n"
+
+#: _irpm:31
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package $rpm\n"
+msgstr ""
+
+#: _irpm:31 urpmi:195
+msgid "Is it ok?"
+msgstr "这样好了吗?"
+
+#: _irpm:33 urpmi:198 urpmi:223
+msgid "Ok"
+msgstr "确认"
+
+#: _irpm:34 urpmi:199 urpmi:224
+msgid "Cancel"
+msgstr "取消"
+
+#: _irpm:40 urpmi:203 urpmi:252
+msgid "Nn"
+msgstr ""
+
+#: _irpm:41 urpmi:204 urpmi:253
+msgid "Yy"
+msgstr ""
+
+#: _irpm:42 urpmi:205
+msgid " (Y/n) "
+msgstr ""
+
+#: _irpm:61
+msgid "$rpm: command not found\n"
+msgstr ""
+
+#: placeholder.h:6
+msgid "usage: rpmf [<file>]"
+msgstr ""
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, c-format
 msgid ""
-"usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
-msgstr "用法: urpmi [-h] [--auto] [--force] [-a] 软件包名 [软件包名...]\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000 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"
+"  --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 does not exists.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - chose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -c               - choose complete method for resolving requires closure.\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:56
+#: placeholder.h:26
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"\tfile://<path>\n"
+"\tftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"\tftp://<host>/<path> with <relative filename of hdlist>\n"
+"\thttp://<host>/<path> with <relative filename of hdlist>\n"
+"        removable_<device>_<number>://<path>\n"
+msgstr ""
+
+#: urpmi:55
+#, c-format
+msgid "urpmi version %s"
+msgstr ""
+
+#: urpmi:118
 msgid "Only superuser is allowed to install local packages"
 msgstr "只有超级用户可以安装本机软件包"
 
-#: ../urpmi:87
-#, c-format
-msgid "no package named %s\n"
-msgstr "没有名为 %s 的软件包\n"
+#: urpmi:160
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
 
-#: ../urpmi:89
+#: urpmi:168
 #, c-format
-msgid "The following packages contain %s: %s\n"
-msgstr "下列软件包里有 %s: %s\n"
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:  (1-%d) "
 
-#: ../urpmi:97
-msgid "rpm database query failed\n"
-msgstr "rpm 数据库查询失败\n"
+#: urpmi:171
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
 
-#: ../urpmi:107
+#: urpmi:194
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed "
 "(%d MB)"
 msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: ../urpmi:108
-msgid "Is it ok?"
-msgstr "这样好了吗?"
-
-#: ../urpmi:111
-msgid "Ok"
-msgstr "确认"
-
-#: ../urpmi:112
-msgid "Cancel"
-msgstr "取消"
-
-#: ../urpmi:159
-#, c-format
-msgid "Please insert the %s named %s"
+#: urpmi:220
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请插入 %s, 标签是 %s"
 
-#: ../urpmi:161
+#: urpmi:221
 msgid "Press enter when it's done..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:166
-#, c-format
-msgid "Sorry can't find file %s, exiting"
-msgstr "对不起, 没有找到文件 %s, 正在退出"
-
-#: ../urpmi:175
+#: urpmi:234
 msgid "everything already installed"
 msgstr "全部安装完成"
 
-#: ../urpmi:181
+#: urpmi:243
 #, c-format
 msgid "installing %s\n"
 msgstr "正在安装 %s\n"
 
-#: ../urpmi:185 ../urpmi:195
+#: urpmi:247 urpmi:259
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../urpmi:190
-msgid "Try installation without checking dependencies?"
+#: urpmi:254
+#, fuzzy
+msgid "Try installation without checking dependencies? (Y/n) "
 msgstr "尝试忽略相关性检查而安装吗?"
 
-#: ../urpmi:196
-msgid "Try installation even more strongly (--force)?"
+#: urpmi:260
+#, fuzzy
+msgid "Try installation even more strongly (--force)? (Y/n) "
 msgstr "尝试更激烈的安装方式吗? (使用 --force)"
 
-#: ../urpmi:231
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+#: urpmi.addmedia:36
+msgid "usage: urpmi.addmedia <name> <url>"
+msgstr ""
 
-#: ../urpmi:240
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:  (1-%d) "
+#: urpmi.addmedia:48
+msgid "$usage  bad number (is `$num')\n"
+msgstr ""
 
-#: ../urpmi:243
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
+#: urpmi.addmedia:49
+msgid "$usage  device `$dev' do not exist\n"
+msgstr ""
 
-#: ../urpmi:251
+#: urpmi.addmedia:51
+msgid "$usage  <relative path of hdlist> missing\n"
+msgstr ""
+
+#: urpmi.addmedia:53
+msgid "$usage  `with' missing for ftp media\n"
+msgstr ""
+
+#: urpmq:44
 #, c-format
-msgid "Failed dependencies: %s requires %s"
-msgstr "相关性错误: %s 需要 %s"
+msgid "urpmq version %s"
+msgstr ""
+
+#: urpmq:79
+msgid "urpmq: unknown option \"-$1\", check usage with --help\n"
+msgstr ""
+
+#: urpmq:81
+msgid "urpmq: cannot read rpm file \"$_\"\n"
+msgstr ""
+
+#: urpmq:122
+msgid ""
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
+msgstr ""
+
+#: urpmq:135
+msgid "unable to get source packages, aborting"
+msgstr ""
+
+#~ msgid ""
+#~ "usage: urpmi [-h] [--auto] [--force] [-a] package_name [package_names...]\n"
+#~ msgstr "用法: urpmi [-h] [--auto] [--force] [-a] 软件包名 [软件包名...]\n"
+
+#~ msgid "no package named %s\n"
+#~ msgstr "没有名为 %s 的软件包\n"
+
+#~ msgid "The following packages contain %s: %s\n"
+#~ msgstr "下列软件包里有 %s: %s\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"