sync with code

1 files changed, 85 insertions, 76 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6c7b8370..c0e85f5b 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: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\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."
@@ -64,7 +64,7 @@ msgstr "正在安装软件包“%s”(%s/%s)..."
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -76,22 +76,22 @@ msgstr "取消"
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
 "\n"
 "您想要执行什么操作?"
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
 "\n"
 "您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "安装(_I)"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "选择保存文件的位置"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "确定"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -239,17 +244,17 @@ msgstr "  --searchmedia  - 只使用给定介质来搜索所请求的软件包�
 msgid "No packages specified"
 msgstr "未指定软件包"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -258,7 +263,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -269,42 +274,37 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "确定"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:204
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:239
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -315,60 +315,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -377,27 +377,27 @@ msgstr ""
 "安装失败，缺少某些文件:\n"
 "%s"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, c-format
 msgid "You may want to update your urpmi database."
 msgstr "您可能需要更新您的 urpmi 数据库。"
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -471,7 +471,7 @@ msgstr "无法将软件包下载到 %s"
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -526,62 +526,62 @@ msgstr "注册本地软件包出错"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -597,7 +597,7 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权 (C) %s %s"
@@ -644,7 +644,7 @@ msgstr "无法读取配置文件[%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
@@ -1332,8 +1332,8 @@ msgstr "架构"
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
-msgstr "(建议安装)"
+msgid "(recommended)"
+msgstr ""
 
 #: ../urpm/msg.pm:185
 #, c-format
@@ -1979,9 +1979,9 @@ msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
 #: ../urpmf:75
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggests 标签\n"
+#, fuzzy, c-format
+msgid "  --recommends   - recommends tags\n"
+msgstr "  --requires     - requires 标签\n"
 
 #: ../urpmf:76
 #, c-format
@@ -2008,27 +2008,27 @@ msgstr "  -m             - 软件包所在介质\n"
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "未终止的表达式(%s)"
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "介质“%s”的 hdlist 不可用"
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "介质“%s”的综合文件不可用"
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
@@ -2054,8 +2054,8 @@ msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 
 #: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
 
 #: ../urpmi:81
@@ -2146,8 +2146,8 @@ msgid ""
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
 #: ../urpmi:105
-#, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr "  --allow-suggests - 自动选择“推荐的”软件包。\n"
 
 #: ../urpmi:109
@@ -2949,9 +2949,9 @@ msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 打印 requires 标签。\n"
 
 #: ../urpmq:84
-#, c-format
-msgid "  --suggests     - print suggests.\n"
-msgstr "  --suggests     - 打印 suggests 标签。\n"
+#, fuzzy, c-format
+msgid "  --recommends   - print recommends.\n"
+msgstr "  --requires     - 打印 requires 标签。\n"
 
 #: ../urpmq:85
 #, c-format
@@ -3110,6 +3110,15 @@ msgstr ""
 msgid "Authentication is required to run Mageia Package Installer"
 msgstr ""
 
+#~ msgid "(suggested)"
+#~ msgstr "(建议安装)"
+
+#~ msgid "  --suggests     - suggests tags\n"
+#~ msgstr "  --suggests     - suggests 标签\n"
+
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --suggests     - 打印 suggests 标签。\n"
+
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d 个软件包，%d MB)"