Merge new strings

1 files changed, 232 insertions, 101 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a049ab5a..0377c009 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\n"
 "PO-Revision-Date: 2004-12-05 01:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -78,6 +78,232 @@ msgstr "(是(Y)/否(n))[是]"
 msgid "%s: command not found\n"
 msgstr "%s: 命令没找到\n"
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"未知的选项“%s”\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "没有叫做 %s 的软件包"
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "软件包安装..."
+
+#: ../gurpmi:141
+#, fuzzy, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"您选择了源软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
+"行编译)。\n"
+"\n"
+"您想要执行什么操作?"
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"您即将在您的计算机上安装下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"您也可以选择只是保存相应的软件包。您要进行什么操作?"
+
+#: ../gurpmi:154
+#, fuzzy, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+"您即将在您的计算机上安装下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"您也可以选择只是保存相应的软件包。您要进行什么操作?"
+
+#: ../gurpmi:164
+#, fuzzy, c-format
+msgid "_Install"
+msgstr "安装"
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "取消"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr "选择保存文件的位置"
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "为了安装 %s"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "确定"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, fuzzy, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s"
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr "软件包安装..."
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "无法读取源软件包，中止"
+
+#: ../gurpmi:323 ../urpmi:494
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请将标签为“%s”的介质插入到设备 [%s]"
+
+#: ../gurpmi:350
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "正在下载软件包“%s”..."
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "下列软件包的签名有错误"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"安装失败，缺少下列文件:\n"
+"%s\n"
+"您可能需要更新您的 urpmi 数据库"
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, c-format
+msgid "removing %s"
+msgstr "正在删除 %s"
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr "正在准备..."
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "全部安装完成"
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "安装失败"
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -692,11 +918,6 @@ msgstr "输入格式错误: [%s]"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -918,11 +1139,6 @@ msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:111 ../urpmi:597
-#, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1426,11 +1642,6 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1506,16 +1717,6 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "无法读取源软件包，中止"
-
-#: ../urpmi:494
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请将标签为“%s”的介质插入到设备 [%s]"
-
 #: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
@@ -1531,22 +1732,6 @@ msgstr "下列软件包的签名有错误"
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安装失败，缺少下列文件:\n"
-"%s\n"
-"您可能需要更新您的 urpmi 数据库"
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "安装失败"
-
 #: ../urpmi:581
 #, c-format
 msgid "distributing %s"
@@ -1582,12 +1767,7 @@ msgstr "%d 安装交易失败"
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "全部安装完成"
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新启动 urpmi"
@@ -1869,10 +2049,10 @@ msgid "enabling media %s"
 msgstr "删除介质“%s”"
 
 #: ../urpmq:38
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2016,12 +2196,12 @@ msgstr "--list-nodes 仅能和 --parallel 一起使用"
 msgid "skipping media %s: no hdlist\n"
 msgstr "跳过介质 %s：无 hdlist\n"
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, c-format
 msgid "No filelist found\n"
 msgstr "没有找到文件列表\n"
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
@@ -2036,29 +2216,6 @@ msgstr "没有找到更新日志\n"
 #~ "  --best-output  - 根据运行环境选择最好的界面:\n"
 #~ "                   X 或文本模式。\n"
 
-#~ msgid "Choose location to save file"
-#~ msgstr "选择保存文件的位置"
-
-#~ msgid ""
-#~ "You have selected a source package:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You probably didn't want to install it on your computer (installing it\n"
-#~ "would allow you to make modifications to its sourcecode then compile "
-#~ "it).\n"
-#~ "\n"
-#~ "What would you like to do?"
-#~ msgstr ""
-#~ "您选择了源软件包:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
-#~ "行编译)。\n"
-#~ "\n"
-#~ "您想要执行什么操作?"
-
 #~ msgid "Do nothing"
 #~ msgstr "什么也不做"
 
@@ -2068,34 +2225,8 @@ msgstr "没有找到更新日志\n"
 #~ msgid "Save file"
 #~ msgstr "保存文件"
 
-#~ msgid ""
-#~ "You are about to install the following software package on your "
-#~ "computer:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You may prefer to just save it. What is your choice?"
-#~ msgstr ""
-#~ "您即将在您的计算机上安装下列软件包:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "您也可以选择只是保存相应的软件包。您要进行什么操作?"
-
-#~ msgid "Install it"
-#~ msgstr "安装"
-
-#~ msgid "Package installation..."
-#~ msgstr "软件包安装..."
-
 #~ msgid "Initializing..."
 #~ msgstr "正在初始化..."
 
 #~ msgid "do you agree ?"
 #~ msgstr "您同意吗?"
-
-#~ msgid "Downloading package `%s'..."
-#~ msgstr "正在下载软件包“%s”..."
-
-#~ msgid "Installing package `%s' (%s/%s)..."
-#~ msgstr "正在安装软件包“%s”(%s/%s)..."