sync with code

1 files changed, 38 insertions, 28 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 10ee5158..a60f0c8c 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: 2012-02-27 21:09+0100\n"
+"POT-Creation-Date: 2012-03-21 08:44+0100\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -253,7 +253,7 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:155 ../urpmi:632
+#: ../gurpmi2:155 ../urpmi:642
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -294,13 +294,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:276 ../urpmi:599
+#: ../gurpmi2:276 ../urpmi:609
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:277 ../urpmi:600
+#: ../gurpmi2:277 ../urpmi:610
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -327,7 +327,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:343 ../urpmi:627
+#: ../gurpmi2:343 ../urpmi:637
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -380,7 +380,7 @@ msgstr "安装完成"
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:427 ../urpmi:695
+#: ../gurpmi2:427 ../urpmi:705
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -591,22 +591,22 @@ msgstr "介质“%s”不可用"
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm/cfg.pm:81
+#: ../urpm/cfg.pm:82
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件第 %s 行语法有错"
 
-#: ../urpm/cfg.pm:114
+#: ../urpm/cfg.pm:115
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "无法读取配置文件[%s]"
 
-#: ../urpm/cfg.pm:140
+#: ../urpm/cfg.pm:141
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:541
+#: ../urpm/cfg.pm:252 ../urpm/media.pm:541
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
@@ -787,27 +787,27 @@ msgstr "无法安装软件包 %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:213 ../urpm/install.pm:277
+#: ../urpm/install.pm:213 ../urpm/install.pm:278
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:258
+#: ../urpm/install.pm:259
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:259
+#: ../urpm/install.pm:260
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:276
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:284
+#: ../urpm/install.pm:285
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
@@ -1015,6 +1015,11 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
+#: ../urpm/media.pm:719
+#, c-format
+msgid "Search start: %s end: %s"
+msgstr ""
+
 #: ../urpm/media.pm:736
 #, c-format
 msgid "skipping package %s"
@@ -1255,7 +1260,7 @@ msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:629
 #, c-format
 msgid "Nn"
 msgstr "nN否"
@@ -2419,7 +2424,7 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:630 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -2479,38 +2484,43 @@ msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:602
+#: ../urpmi:600
+#, c-format
+msgid "WARNING: %s option is in use. Some strange problems may happen"
+msgstr ""
+
+#: ../urpmi:612
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:608
+#: ../urpmi:618
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:609
+#: ../urpmi:619
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:610
+#: ../urpmi:620
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:611
+#: ../urpmi:621
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:632
+#: ../urpmi:642
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../urpmi:640
+#: ../urpmi:650
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -3243,13 +3253,13 @@ msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
 #: ../gurpmi.desktop.in.h:1
-msgid "Graphical front end to install RPM files"
-msgstr "图形化安装 RPM 软件包"
-
-#: ../gurpmi.desktop.in.h:2
 msgid "Software Installer"
 msgstr "软件安装程序"
 
+#: ../gurpmi.desktop.in.h:2
+msgid "Graphical front end to install RPM files"
+msgstr "图形化安装 RPM 软件包"
+
 #, fuzzy
 #~ msgid ""
 #~ "# Here are logs of your DUDF uploads.\n"