Author: marguerite
Date: 2015-10-27 13:52:19 +0100 (Tue, 27 Oct 2015)
New Revision: 94011
Added:
trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po
Removed:
trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po
Modified:
trunk/lcn/zh_CN/po/community-repositories.zh_CN.po
trunk/lcn/zh_CN/po/opensuse-org.zh_CN.po
trunk/lcn/zh_CN/po/xen-vm-install.zh_CN.po
trunk/lcn/zh_CN/po/zypp.zh_CN.po
trunk/lcn/zh_CN/po/zypper.zh_CN.po
Log:
[cn]update
Modified: trunk/lcn/zh_CN/po/community-repositories.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/community-repositories.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/community-repositories.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -11,15 +11,15 @@
msgstr ""
"Project-Id-Version: community-repositories\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-02 11:11+0100\n"
-"PO-Revision-Date: 2015-02-08 12:32+0800\n"
-"Last-Translator: 玛格丽特 · 苏 \n"
-"Language-Team: Chinese Traditional \n"
+"POT-Creation-Date: 2015-10-06 14:51+0200\n"
+"PO-Revision-Date: 2015-10-27 20:17+0800\n"
+"Last-Translator: marguerite \n"
+"Language-Team: Chinese \n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: _openSUSE_122_Additional.xml.in.h:1 _openSUSE_123_Additional.xml.in.h:1
@@ -61,16 +61,19 @@
#: _openSUSE_122_Additional.xml.in.h:7 _openSUSE_123_Additional.xml.in.h:7
#: _openSUSE_131_Additional.xml.in.h:7 _openSUSE_132_Additional.xml.in.h:7
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:1
msgid "openSUSE BuildService - Mozilla"
msgstr "openSUSE 编译服务 - Mozilla"
#: _openSUSE_122_Additional.xml.in.h:8 _openSUSE_123_Additional.xml.in.h:8
#: _openSUSE_131_Additional.xml.in.h:8 _openSUSE_132_Additional.xml.in.h:8
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:2
msgid "Most recent builds of Mozilla Software like Firefox"
msgstr "最近编译的 Mozilla 软件,诸如火狐"
#: _openSUSE_122_Additional.xml.in.h:9 _openSUSE_123_Additional.xml.in.h:9
#: _openSUSE_131_Additional.xml.in.h:9 _openSUSE_132_Additional.xml.in.h:9
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:3
msgid ""
"Containing the latest releases of all Mozilla software, such as the popular "
"Thunderbird (mail client), Firefox and SeaMonkey (web browsers)."
@@ -80,16 +83,19 @@
#: _openSUSE_122_Additional.xml.in.h:10 _openSUSE_123_Additional.xml.in.h:10
#: _openSUSE_131_Additional.xml.in.h:10 _openSUSE_132_Additional.xml.in.h:10
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:4
msgid "openSUSE BuildService - Wine CVS Builds"
msgstr "openSUSE 编译服务 - Wine CVS 抢先版"
#: _openSUSE_122_Additional.xml.in.h:11 _openSUSE_123_Additional.xml.in.h:11
#: _openSUSE_131_Additional.xml.in.h:11 _openSUSE_132_Additional.xml.in.h:11
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:5
msgid "Snapshots of Wine CVS"
msgstr "Wine 模拟器在上游 CVS 版本管理系统中的抢先版"
#: _openSUSE_122_Additional.xml.in.h:12 _openSUSE_123_Additional.xml.in.h:12
#: _openSUSE_131_Additional.xml.in.h:12 _openSUSE_132_Additional.xml.in.h:12
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:6
msgid ""
"Wine is an Open Source implementation of the Windows API, so it allows you "
"to run some Windows applications in openSUSE. This repository provides the "
@@ -170,16 +176,19 @@
#: _openSUSE_122_Additional.xml.in.h:25 _openSUSE_123_Additional.xml.in.h:25
#: _openSUSE_131_Additional.xml.in.h:25 _openSUSE_132_Additional.xml.in.h:22
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:7
msgid "openSUSE BuildService - Database"
msgstr "openSUSE 编译服务 - 数据库"
#: _openSUSE_122_Additional.xml.in.h:26 _openSUSE_123_Additional.xml.in.h:26
#: _openSUSE_131_Additional.xml.in.h:26 _openSUSE_132_Additional.xml.in.h:23
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:8
msgid "Latest updates for database software"
msgstr "数据库软件最新更新"
#: _openSUSE_122_Additional.xml.in.h:27 _openSUSE_123_Additional.xml.in.h:27
#: _openSUSE_131_Additional.xml.in.h:27 _openSUSE_132_Additional.xml.in.h:24
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:9
msgid "Latest updates for database software including Firebird and MySQL."
msgstr "数据库软件的最新更新,诸如火鸟和 MySQL。"
@@ -201,16 +210,19 @@
#: _openSUSE_122_Additional.xml.in.h:31 _openSUSE_123_Additional.xml.in.h:31
#: _openSUSE_131_Additional.xml.in.h:31 _openSUSE_132_Additional.xml.in.h:28
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:10
msgid "openSUSE BuildService - GNOME:Apps"
msgstr "openSUSE 编译服务 - GNOME 应用程序"
#: _openSUSE_122_Additional.xml.in.h:32 _openSUSE_123_Additional.xml.in.h:32
#: _openSUSE_131_Additional.xml.in.h:32 _openSUSE_132_Additional.xml.in.h:29
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:11
msgid "Backports of GNOME applications"
msgstr "GNOME 应用程序的向后移植"
#: _openSUSE_122_Additional.xml.in.h:33 _openSUSE_123_Additional.xml.in.h:33
#: _openSUSE_131_Additional.xml.in.h:33 _openSUSE_132_Additional.xml.in.h:30
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:12
msgid ""
"Updates to the GNOME software that is shipped with the distribution "
"(backports)."
@@ -233,31 +245,37 @@
#: _openSUSE_122_Additional.xml.in.h:37 _openSUSE_123_Additional.xml.in.h:37
#: _openSUSE_131_Additional.xml.in.h:37 _openSUSE_132_Additional.xml.in.h:34
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:13
msgid "openSUSE BuildService - devel:languages:perl"
msgstr "openSUSE 编译服务 - Perl 开发源"
#: _openSUSE_122_Additional.xml.in.h:38 _openSUSE_123_Additional.xml.in.h:38
#: _openSUSE_131_Additional.xml.in.h:38 _openSUSE_132_Additional.xml.in.h:35
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:14
msgid "Community repository for Perl modules"
msgstr "Perl 模块社区源"
#: _openSUSE_122_Additional.xml.in.h:39 _openSUSE_123_Additional.xml.in.h:39
#: _openSUSE_131_Additional.xml.in.h:39 _openSUSE_132_Additional.xml.in.h:36
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:15
msgid "Updates and Additions for Perl modules"
msgstr "Perl 模块的更新和附件"
#: _openSUSE_122_Additional.xml.in.h:40 _openSUSE_123_Additional.xml.in.h:40
#: _openSUSE_131_Additional.xml.in.h:40 _openSUSE_132_Additional.xml.in.h:37
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:16
msgid "openSUSE BuildService - devel:languages:python"
msgstr "openSUSE 编译服务 - Python 开发源"
#: _openSUSE_122_Additional.xml.in.h:41 _openSUSE_123_Additional.xml.in.h:41
#: _openSUSE_131_Additional.xml.in.h:41 _openSUSE_132_Additional.xml.in.h:38
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:17
msgid "Community repository for Python modules"
msgstr "Python 模块社区源"
#: _openSUSE_122_Additional.xml.in.h:42 _openSUSE_123_Additional.xml.in.h:42
#: _openSUSE_131_Additional.xml.in.h:42 _openSUSE_132_Additional.xml.in.h:39
+#: _openSUSE_Leap_42.1_Additional.xml.in.h:18
msgid "Updates and Additions for Python modules"
msgstr "Python 模块的更新和附件"
@@ -305,38 +323,38 @@
msgstr "涵盖学生用户可能感兴趣的一些软件包"
#: _openSUSE_122_Additional.xml.in.h:52 _openSUSE_123_Additional.xml.in.h:52
-#: _openSUSE_131_Additional.xml.in.h:49 _openSUSE_132_Additional.xml.in.h:46
+#: _openSUSE_132_Additional.xml.in.h:46
msgid "openSUSE BuildService - Java:packages"
msgstr "openSUSE 编译服务 - Java 软件包"
#: _openSUSE_122_Additional.xml.in.h:53 _openSUSE_123_Additional.xml.in.h:53
-#: _openSUSE_131_Additional.xml.in.h:50 _openSUSE_132_Additional.xml.in.h:47
+#: _openSUSE_132_Additional.xml.in.h:47
msgid "Bleeding-edge Java packages"
msgstr "还热乎的 Java 软件包。"
#: _openSUSE_122_Additional.xml.in.h:54 _openSUSE_123_Additional.xml.in.h:54
-#: _openSUSE_131_Additional.xml.in.h:51 _openSUSE_132_Additional.xml.in.h:48
+#: _openSUSE_132_Additional.xml.in.h:48
msgid "Provides uptodate Java packages (Factory backports)"
msgstr "提供最新的 Java 软件包(工厂版的向后移植)"
#: _openSUSE_122_Additional.xml.in.h:55 _openSUSE_123_Additional.xml.in.h:55
-#: _openSUSE_131_Additional.xml.in.h:52 _openSUSE_132_Additional.xml.in.h:49
+#: _openSUSE_131_Additional.xml.in.h:49 _openSUSE_132_Additional.xml.in.h:49
msgid "openSUSE BuildService - KDE:KDE3"
msgstr "openSUSE 编译服务 - KDE3"
#: _openSUSE_122_Additional.xml.in.h:56 _openSUSE_123_Additional.xml.in.h:56
-#: _openSUSE_131_Additional.xml.in.h:53 _openSUSE_132_Additional.xml.in.h:50
+#: _openSUSE_131_Additional.xml.in.h:50 _openSUSE_132_Additional.xml.in.h:50
msgid "Maintained KDE 3 packages"
msgstr "仍在维护的 KDE 3 软件包"
#: _openSUSE_122_Additional.xml.in.h:57 _openSUSE_123_Additional.xml.in.h:57
-#: _openSUSE_131_Additional.xml.in.h:54 _openSUSE_132_Additional.xml.in.h:51
+#: _openSUSE_131_Additional.xml.in.h:51 _openSUSE_132_Additional.xml.in.h:51
msgid "Provides old KDE for newer openSUSE"
msgstr "提供针对新版 openSUSE 的旧版 KDE"
#: _openSUSE_122_Default.xml.in.h:1 _openSUSE_123_Default.xml.in.h:1
#: _openSUSE_131_Default.xml.in.h:1 _openSUSE_132_Default.xml.in.h:1
-#: _openSUSE_Factory_Default.xml.in.h:1
+#: _openSUSE_Factory_Default.xml.in.h:1 _openSUSE_Leap_42.1_Default.xml.in.h:1
msgid "Main Repository (OSS)"
msgstr "主软件源 (开源软件)"
@@ -358,7 +376,7 @@
#: _openSUSE_122_Default.xml.in.h:4 _openSUSE_123_Default.xml.in.h:4
#: _openSUSE_131_Default.xml.in.h:4 _openSUSE_132_Default.xml.in.h:4
-#: _openSUSE_Factory_Default.xml.in.h:4
+#: _openSUSE_Factory_Default.xml.in.h:4 _openSUSE_Leap_42.1_Default.xml.in.h:4
msgid "Main Repository (NON-OSS)"
msgstr "主软件源 (非开源软件)"
@@ -376,7 +394,7 @@
#: _openSUSE_122_Default.xml.in.h:7 _openSUSE_123_Default.xml.in.h:7
#: _openSUSE_131_Default.xml.in.h:7 _openSUSE_132_Default.xml.in.h:7
-#: _openSUSE_Factory_Default.xml.in.h:7
+#: _openSUSE_Factory_Default.xml.in.h:7 _openSUSE_Leap_42.1_Default.xml.in.h:7
msgid "Main Repository (Sources)"
msgstr "主软件源 (源代码)"
@@ -392,6 +410,7 @@
#: _openSUSE_122_Default.xml.in.h:10 _openSUSE_123_Default.xml.in.h:10
#: _openSUSE_131_Default.xml.in.h:10 _openSUSE_132_Default.xml.in.h:10
#: _openSUSE_Factory_Default.xml.in.h:10
+#: _openSUSE_Leap_42.1_Default.xml.in.h:10
msgid "Main Repository (DEBUG)"
msgstr "主调试源"
@@ -407,6 +426,8 @@
#: _openSUSE_122_Default.xml.in.h:13 _openSUSE_123_Default.xml.in.h:13
#: _openSUSE_131_Default.xml.in.h:13 _openSUSE_132_Default.xml.in.h:13
+#: _openSUSE_Factory_Default.xml.in.h:13
+#: _openSUSE_Leap_42.1_Default.xml.in.h:13
msgid "Main Update Repository"
msgstr "主更新源"
@@ -422,6 +443,7 @@
#: _openSUSE_122_Default.xml.in.h:16 _openSUSE_123_Default.xml.in.h:18
#: _openSUSE_131_Default.xml.in.h:18 _openSUSE_132_Default.xml.in.h:18
+#: _openSUSE_Leap_42.1_Default.xml.in.h:18
msgid "Update Repository (DEBUG)"
msgstr "主更新源 (调试)"
@@ -487,7 +509,7 @@
msgstr "在此软件源中,您可找到 openSUSE 12.3 的安全和维护更新。"
#: _openSUSE_123_Default.xml.in.h:16 _openSUSE_131_Default.xml.in.h:16
-#: _openSUSE_132_Default.xml.in.h:16
+#: _openSUSE_132_Default.xml.in.h:16 _openSUSE_Leap_42.1_Default.xml.in.h:16
msgid "Update Repository (Non-Oss)"
msgstr "主更新源 (非开源软件)"
@@ -527,20 +549,20 @@
"openSUSE 13.1 全部非开源软件的官方软件源,由 openSUSE 团队维护,包括 Opera 浏"
"览器、Java、Flash 以及更多。"
-#: _openSUSE_131_Default.xml.in.h:8 _openSUSE_Factory_Default.xml.in.h:8
+#: _openSUSE_131_Default.xml.in.h:8
msgid "Main repository of openSUSE 13.1 (Source packages)"
msgstr "openSUSE 13.1 主软件源 (源代码包)"
-#: _openSUSE_131_Default.xml.in.h:9 _openSUSE_Factory_Default.xml.in.h:9
+#: _openSUSE_131_Default.xml.in.h:9
msgid ""
"The repository of all source packages in openSUSE 13.1. For experts only."
msgstr "openSUSE 13.1 全部源代码包的软件源。仅供专家使用。"
-#: _openSUSE_131_Default.xml.in.h:11 _openSUSE_Factory_Default.xml.in.h:11
+#: _openSUSE_131_Default.xml.in.h:11
msgid "Main repository of openSUSE 13.1 including the debuginfo packages"
msgstr "openSUSE 13.1 主软件源包含调试信息包"
-#: _openSUSE_131_Default.xml.in.h:12 _openSUSE_Factory_Default.xml.in.h:12
+#: _openSUSE_131_Default.xml.in.h:12
msgid ""
"This repository is useful for those that want to debug applications on "
"openSUSE 13.1. For experts only."
@@ -630,8 +652,9 @@
msgstr "openSUSE 13.2 调试信息包的主更新源"
#: _openSUSE_Factory_Default.xml.in.h:2
-msgid "Main repository of openSUSE Factory including only Open Source Software"
-msgstr "openSUSE Factory 主软件源,仅包含开源软件"
+msgid ""
+"Main repository of openSUSE Tumbleweed including only Open Source Software"
+msgstr "openSUSE Tumbleweed 主软件源,仅包含开源软件"
#: _openSUSE_Factory_Default.xml.in.h:3
msgid ""
@@ -641,37 +664,123 @@
"enabled SWAP partition are highly recommended in case you want to access "
"this repository at installation time.)"
msgstr ""
-"庞大的 openSUSE 开源软件源,提供由 openSUSE 团队维护的数千个软件包。(由"
-"于软件源容量太大,添加它可能要花费点时间。若想要在系统安装时访问该源,强烈建"
-"议有 512MB 内存或启用硬盘交换分区。)"
+"庞大的 openSUSE 开源软件源,提供由 openSUSE 团队维护的数千个软件包。(由于软件"
+"源容量太大,添加它可能要花费点时间。若想要在系统安装时访问该源,强烈建议有 "
+"512MB 内存或启用硬盘交换分区。)"
#: _openSUSE_Factory_Default.xml.in.h:5
-msgid "Non-Open Source Software Addon repository for openSUSE Factory"
-msgstr "openSUSE Factory 非开源软件附加源"
+msgid "Non-Open Source Software Addon repository for openSUSE Tumbleweed"
+msgstr "openSUSE Tumbleweed 非开源软件附加源"
#: _openSUSE_Factory_Default.xml.in.h:6
msgid ""
-"The official openSUSE Factory repository for all Non-Open Source Software "
+"The official openSUSE Tumbleweed repository for all Non-Open Source Software "
"maintained by the openSUSE team, including Opera, Flash, and more."
msgstr ""
-"openSUSE Factory 全部非开源软件的官方软件源,由 openSUSE 团队维护,包括 Opera 浏"
-"览器、Java、Flash 以及更多。"
+"openSUSE Tumbleweed 全部非开源软件的官方源,由 openSUSE 团队维护,包括 "
+"Opera、Flash 等。"
-#~ msgid "Main repository of openSUSE 12.1 (Source packages)"
-#~ msgstr "openSUSE 12.1 主软件源 (源代码包)"
+#: _openSUSE_Factory_Default.xml.in.h:8
+msgid "Main repository of openSUSE Tumbleweed (Source packages)"
+msgstr "openSUSE Tumbleweed 主软件源 (源代码)"
-#~ msgid ""
-#~ "The repository of all source packages in openSUSE 12.1. For experts only."
-#~ msgstr "openSUSE 12.1 全部源代码包的软件源。仅供专家使用。"
+#: _openSUSE_Factory_Default.xml.in.h:9
+msgid ""
+"The repository of all source packages in openSUSE Tumbleweed. For experts "
+"only."
+msgstr "openSUSE Tumbleweed 全部源代码包的软件源。仅供专家使用。"
-#~ msgid "Repository for official updates to 12.1"
-#~ msgstr "12.1 的官方更新源"
+#: _openSUSE_Factory_Default.xml.in.h:11
+msgid "Main repository of openSUSE Tumbleweed including the debuginfo packages"
+msgstr "openSUSE Tumbleweed 主软件源包含调试信息包"
+#: _openSUSE_Factory_Default.xml.in.h:12
+msgid ""
+"This repository is useful for those that want to debug applications on "
+"openSUSE Tumbleweed. For experts only."
+msgstr "本软件源只对那些想要在 openSUSE Tumbleweed 中调试程序的人有用。仅供专家使用。"
+
+#: _openSUSE_Factory_Default.xml.in.h:14
+msgid "Official update repository for Tumbleweed"
+msgstr "Tumbleweed 官方更新源"
+
+#: _openSUSE_Factory_Default.xml.in.h:15
+msgid ""
+"This repository provides urgent updates until they get integrated into the "
+"main repositories."
+msgstr "此软件源提供了紧急更新,这些更新稍后会整合进主源。"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:2
+msgid ""
+"Main repository of openSUSE Leap 42.1 including only Open Source Software"
+msgstr "openSUSE Leap 42.1 主软件源,仅包含开源软件"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:3
+msgid ""
+"The big Open Source Software (OSS) repository for openSUSE Leap 42.1, giving "
+"you access to thousands of packages maintained by the openSUSE team. (Due to "
+"the size of the repository, adding it may take some time. 512 MB of RAM or "
+"an enabled SWAP partition are highly recommended in case you want to access "
+"this repository at installation time.)"
+msgstr ""
+"庞大的 openSUSE Leap 42.1 开源软件源,提供由 openSUSE "
+"团队维护的数千个软件包。(由于软件源容量太大,添加它可能要花费点时间。若想要在系统安装时访问该源,强烈建议有 512MB 内存或启用硬盘交换分区。)"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:5
+msgid "Non-Open Source Software Addon repository for openSUSE Leap 42.1"
+msgstr "openSUSE Leap 42.1 非开源软件附加源"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:6
+msgid ""
+"The official openSUSE Leap 42.1 repository for all Non-Open Source Software "
+"maintained by the openSUSE team, including Opera, Steam, Flash, and more."
+msgstr "openSUSE Leap 42.1 全部非开源软件的官方源,由 openSUSE 团队维护,包括 Opera、Steam、Flash 等。"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:8
+msgid "Main repository of openSUSE Leap 42.1 (Source packages)"
+msgstr "openSUSE Leap 42.1 主软件源 (源代码)"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:9
+msgid ""
+"The repository of all source packages in openSUSE Leap 42.1. For experts "
+"only."
+msgstr "openSUSE Leap 42.1 全部源代码包的软件源。仅供专家使用。"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:11
+msgid "Main repository of openSUSE Leap 42.1 including the debuginfo packages"
+msgstr "openSUSE Leap 42.1 主软件源包含调试信息包"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:12
+msgid ""
+"This repository is useful for those that want to debug applications on "
+"openSUSE Leap 42.1. For experts only."
+msgstr "本软件源只对那些想要在 openSUSE Leap 42.1 中调试程序的人有用。仅供专家使用。"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:14
+msgid "Repository for official updates to openSUSE Leap 42.1"
+msgstr "openSUSE Leap 42.1 官方更新源"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:15
+msgid ""
+"In this repository you find security and maintenance updates to openSUSE "
+"Leap 42.1."
+msgstr "在此软件源中您可找到 openSUSE Leap 42.1 的安全和维护更新。"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:17
+msgid "Repository for official non free updates to openSUSE Leap 42.1"
+msgstr "openSUSE Leap 42.1 官方非开源软件更新源"
+
+#: _openSUSE_Leap_42.1_Default.xml.in.h:19
+msgid "Update repository of openSUSE Leap 42.1 debuginfo packages"
+msgstr "openSUSE Leap 42.1 调试信息包更新源"
+
#~ msgid ""
-#~ "In this repository you find security and maintenance updates to openSUSE "
-#~ "12.1."
-#~ msgstr "在此软件源中,您可找到 openSUSE 12.1 的安全和维护更新。"
+#~ "Main repository of openSUSE Factory including only Open Source Software"
+#~ msgstr "openSUSE Factory 主软件源,仅包含开源软件"
+#~ msgid "Non-Open Source Software Addon repository for openSUSE Factory"
+#~ msgstr "openSUSE Factory 非开源软件附加源"
+
#~ msgid "openSUSE BuildService - KDE:UpdatedApps"
#~ msgstr "openSUSE 编译服务 - 不随 KDE 更新周期的 KDE 程序"
@@ -683,43 +792,7 @@
#~ "(backports)."
#~ msgstr "发行版中所带的 KDE 软件的更新(向后移植)。"
-#~ msgid "Main repository of openSUSE 12.1 including only Open Source Software"
-#~ msgstr "openSUSE 12.1 主软件源,仅包含开源软件"
-
#~ msgid ""
-#~ "The big Open Source Software (OSS) repository for openSUSE 12.1, giving "
-#~ "you access to thousands of packages maintained by the openSUSE team. (Due "
-#~ "to the size of the repository, adding it may take some time. 512 MB of "
-#~ "RAM or an enabled SWAP partition are highly recommended in case you want "
-#~ "to access this repository at installation time.)"
-#~ msgstr ""
-#~ "庞大的 openSUSE 12.1 开源软件源,提供由 openSUSE 团队维护的数千个软件包。"
-#~ "(由于软件源容量太大,添加它可能要花费点时间。若想要在系统安装时访问该源,"
-#~ "强烈建议有 512MB 内存或启用硬盘交换分区。)"
-
-#~ msgid "Non-Open Source Software Addon repository for openSUSE 12.1"
-#~ msgstr "openSUSE 12.1 非开源软件附加源"
-
-#~ msgid ""
-#~ "The official openSUSE 12.1 repository for all Non-Open Source Software "
-#~ "maintained by the openSUSE team, including Opera, Java, Flash, and more."
-#~ msgstr ""
-#~ "openSUSE 12.1 全部非开源软件的官方软件源,由 openSUSE 团队维护,包括 "
-#~ "Opera 浏览器、Java、Flash 以及更多。"
-
-#~ msgid "Main repository of openSUSE 12.1 including the debuginfo packages"
-#~ msgstr "openSUSE 12.1 主软件源包含调试信息包"
-
-#~ msgid ""
-#~ "This repository is useful for those that want to debug applications on "
-#~ "openSUSE 12.1. For experts only."
-#~ msgstr ""
-#~ "本软件源只对那些想要在 openSUSE 12.1 中调试程序的人有用。仅供专家使用。"
-
-#~ msgid "Update repository of openSUSE 12.1 debuginfo packages"
-#~ msgstr "openSUSE 12.1 调试信息包的主升级源"
-
-#~ msgid ""
#~ "Contrib project contains lots of useful additions to the main "
#~ "distribution by our community contributors. See http://en.opensuse.org/"
#~ "Contrib for details."
Deleted: trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -1,243 +0,0 @@
-# @TITLE@
-# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
-# FIRST AUTHOR , YEAR.
-#
-# This file is distributed under the same license as @PACKAGE@ package. FIRST
-#
-#. extracted from en.json
-msgid ""
-msgstr ""
-"Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 10:20+0200\n"
-"PO-Revision-Date: 2005-03-09 13:54+0100\n"
-"Last-Translator: Novell Language \n"
-"Language-Team: Novell Language \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: .token.Find+out+more
-msgid "Find out more"
-msgstr ""
-
-#: .token.Contribute+Hardware
-msgid "Contribute Hardware"
-msgstr ""
-
-#: .token.Any+user+who+wishes+to+have+the+newest+packages+that+include%2C+but+are+not+limited+to%2C+the+Linux+kernel%2C+SAMBA%2C+git%2C+desktops%2C+office+applications+and+many+other+packages%2C+will+want+Tumbleweed.+Tumbleweed+appeals+to+Power+Users%2C+Software+Developers+and+openSUSE+Contributors.+If+you+require+the+latest+software+stacks+and+Independent+Development+Environment+or+need+a+stable+platform+closest+to+bleeding+edge+Linux%2C+Tumbleweed+is+the+best+choice+for+you.
-msgid "Any user who wishes to have the newest packages that include, but are not limited to, the Linux kernel, SAMBA, git, desktops, office applications and many other packages, will want Tumbleweed. Tumbleweed appeals to Power Users, Software Developers and openSUSE Contributors. If you require the latest software stacks and Independent Development Environment or need a stable platform closest to bleeding edge Linux, Tumbleweed is the best choice for you."
-msgstr ""
-
-#: .token.Automated+testing+for+%2Aany%2A+operating+system%2C+that+can+read+the+screen+and+control+the+test+host+the+same+way+a+user+does.
-msgid "Automated testing for *any* operating system, that can read the screen and control the test host the same way a user does."
-msgstr ""
-
-#: .token.Change+language
-#, fuzzy
-#| msgid "Chamic Languages"
-msgid "Change language"
-msgstr "查米克语"
-
-#: .token.More+information
-#, fuzzy
-#| msgid "Memory Information"
-msgid "More information"
-msgstr "内存信息"
-
-# continue button label
-#: .token.Contribute+Code
-#, fuzzy
-#| msgid "Continue"
-msgid "Contribute Code"
-msgstr "继续"
-
-#: .token.What%27s+new
-msgid "What's new"
-msgstr ""
-
-#: .token.Donations+to+support+the+openSUSE+project+are+always+welcomed.+In+fact%2C+Open+Build+Service%2C+which+is+used+by+several+other+open-source+projects%2C+was+made+available+to+the+project%E2%80%99s+community+through+a+generous+donation+of+servers+by+AMD.+It+is+this+type+of+donations+that+allows+people+and+projects+to+thrive%2C+develop%2C+innovate+and+progress.+The+project+is+not+asking+for+money%2C+but+donations+of+hardware+to+use+the+open-source+community%E2%80%99s+expertise+to+empower+Linux+development%2C+provide+openSUSE+tools+to+the+free%2C+open+source+ecosystem+and+give+back+to+developers%2C+sysadmins+and+packagers.+Hardware+helps+the+openSUSE+community%21+Hardware+helps+the+open-source+community%21+And+Hardware+helps+Linux+development.+To+learn+how+you+can+donate+hardware+to+the+openSUSE+project%2C+email
-msgid "Donations to support the openSUSE project are always welcomed. In fact, Open Build Service, which is used by several other open-source projects, was made available to the project’s community through a generous donation of servers by AMD. It is this type of donations that allows people and projects to thrive, develop, innovate and progress. The project is not asking for money, but donations of hardware to use the open-source community’s expertise to empower Linux development, provide openSUSE tools to the free, open source ecosystem and give back to developers, sysadmins and packagers. Hardware helps the openSUSE community! Hardware helps the open-source community! And Hardware helps Linux development. To learn how you can donate hardware to the openSUSE project, email"
-msgstr ""
-
-#: .token.Install+Tumbleweed
-#, fuzzy
-#| msgid "Installed"
-msgid "Install Tumbleweed"
-msgstr "已安装 "
-
-#: .token.New+and+experienced+Linux+users+get+the+most+usable+Linux+distribution+and+stabilized+operating+system+with+openSUSE%E2%80%99s+regular+release.+Receive+updates+and+harden+your+OS+with+openSUSE%E2%80%99s+latest+major+distribution.+Pick+your+desktop%2C+configure+your+system+and+enjoy+the+platform+of+choice+for+Linux+developers%2C+administrators+and+software+vendors.
-msgid "New and experienced Linux users get the most usable Linux distribution and stabilized operating system with openSUSE’s regular release. Receive updates and harden your OS with openSUSE’s latest major distribution. Pick your desktop, configure your system and enjoy the platform of choice for Linux developers, administrators and software vendors."
-msgstr ""
-
-#: .token.Be+part+of+our+comunity+contributing+with+any+of+the+followings%3A
-msgid "Be part of our comunity contributing with any of the followings:"
-msgstr ""
-
-#: .token.Social+Network
-#, fuzzy
-#| msgid "Local Network"
-msgid "Social Network"
-msgstr "本地网络"
-
-#: .token.Discover+the+best+open-source+tools+developed+by+our+community
-msgid "Discover the best open-source tools developed by our community"
-msgstr ""
-
-#: .token.Machinery+supports+configuration+discovery%2C+system+validation%2C+and+service+migration.
-msgid "Machinery supports configuration discovery, system validation, and service migration."
-msgstr ""
-
-#: .token.Get+the+newest+Linux+packages+with+our+rolling+release.+Fast%21+Integrated%21+Stabilized%21+Tested%21
-msgid "Get the newest Linux packages with our rolling release. Fast! Integrated! Stabilized! Tested!"
-msgstr ""
-
-#: .token.View+upcoming+conferences
-msgid "View upcoming conferences"
-msgstr ""
-
-#: .token.Press
-#, fuzzy
-#| msgid "Progress"
-msgid "Press"
-msgstr "进度"
-
-#: .token.News
-msgid "News"
-msgstr ""
-
-#: .token.Check+all+openSUSE+tools
-msgid "Check all openSUSE tools"
-msgstr ""
-
-#: .token.Shop
-msgid "Shop"
-msgstr ""
-
-#: .token.Meet+up+with+openSUSE+at+conferences.
-msgid "Meet up with openSUSE at conferences."
-msgstr ""
-
-#: .token.Go+to+link
-msgid "Go to link"
-msgstr ""
-
-#: .token.Back+to+main+page
-#, fuzzy
-#| msgid "Back to overview"
-msgid "Back to main page"
-msgstr "回到概览"
-
-#: .token.Our+build+tool%2C+building+all+of+our+packages+as+well+as+ones+for+SUSE+Linux+Enterprise%2C+Arch%2C+Debian%2C+Fedora%2C+Scientific+Linux%2C+RHEL%2C+CentOS%2C+Ubuntu%2C+and+more.
-msgid "Our build tool, building all of our packages as well as ones for SUSE Linux Enterprise, Arch, Debian, Fedora, Scientific Linux, RHEL, CentOS, Ubuntu, and more."
-msgstr ""
-
-#: .token.The+makers%27+choice+for+sysadmins%2C+developers+and+desktop+users.
-msgid "The makers' choice for sysadmins, developers and desktop users."
-msgstr ""
-
-#: .token.Blogs
-msgid "Blogs"
-msgstr ""
-
-#: .token.Get+software
-#, fuzzy
-#| msgid "About this software"
-msgid "Get software"
-msgstr "关于该软件"
-
-#: .token.openSUSE+TOOLS
-#, fuzzy
-#| msgid "openSUSE Project"
-msgid "openSUSE TOOLS"
-msgstr "openSUSE 项目"
-
-#: .token.Get+the+most+complete+Linux+distribution+with+openSUSE%E2%80%99s+latest+regular-release+version%21
-msgid "Get the most complete Linux distribution with openSUSE’s latest regular-release version!"
-msgstr ""
-
-#: .token.Find+out+more+about+how+to+participate.
-msgid "Find out more about how to participate."
-msgstr ""
-
-#: .token.Build+Service
-msgid "Build Service"
-msgstr "包构建服务"
-
-#: .token.Wiki
-msgid "Wiki"
-msgstr ""
-
-#: .token.openSUSE+believes+the+best+results+come+from+people+collaborating+and+having+fun.+Being+different+from+other+open-source+communities+is+what+makes+openSUSE+desirable.+We+are+not+the+conventional+community+and+our+community%E2%80%99s+efforts+determines+the+path+of+the+project.+The+efforts+of+the+community+have+created+several+great+tools+for+Linux+and+an+awsome+distribution.+With+openSUSE%2C+you+have+a+voice+and+can+easily+contribute+to+the+project.+Whether+you+are+an+experienced+Linux+developer+or+an+end+user+get+involved+in+the+openSUSE+project.+Join+a+forum%2C+maintain+and+keep+our+wiki+up-to-date%2C%2C+find+and+report+bugs%2C+review+the+documentation%2C+send+your+wish+list+for+new+packages+and+features%2C+create+and+submit+patches%2C+or+become+an+advocate+for+openSUSE+by+attending+events+and+becoming+an+ambassador.
-msgid "openSUSE believes the best results come from people collaborating and having fun. Being different from other open-source communities is what makes openSUSE desirable. We are not the conventional community and our community’s efforts determines the path of the project. The efforts of the community have created several great tools for Linux and an awsome distribution. With openSUSE, you have a voice and can easily contribute to the project. Whether you are an experienced Linux developer or an end user get involved in the openSUSE project. Join a forum, maintain and keep our wiki up-to-date,, find and report bugs, review the documentation, send your wish list for new packages and features, create and submit patches, or become an advocate for openSUSE by attending events and becoming an ambassador."
-msgstr ""
-
-#: .token.Code
-#, fuzzy
-#| msgid "No Code"
-msgid "Code"
-msgstr "无代码"
-
-#: .token.All+Rights+Reserved.
-msgid "All Rights Reserved."
-msgstr ""
-
-#: .token.The+best%2Fonly+comprehensive+Linux+system+configuration+%26+installation+tool.
-msgid "The best/only comprehensive Linux system configuration & installation tool."
-msgstr ""
-
-#: .token.Conferences
-#, fuzzy
-#| msgid "_Preferences"
-msgid "Conferences"
-msgstr "首选项(_P)"
-
-#: .token.Forums
-msgid "Forums"
-msgstr ""
-
-# continue button label
-#: .token.Contribute
-#, fuzzy
-#| msgid "Continue"
-msgid "Contribute"
-msgstr "继续"
-
-#: .token.Hardware
-msgid "Hardware"
-msgstr "硬件"
-
-#: .token.Machinery+is+based+on+the+idea+of+an+universal+system+description.It+is+transparent%2Cextensible%2C+and+crafted+beautifully.
-msgid "Machinery is based on the idea of an universal system description.It is transparent,extensible, and crafted beautifully."
-msgstr ""
-
-#: .token.Sponsored+by%3A
-msgid "Sponsored by:"
-msgstr ""
-
-#: .token.Machinery+is+made+for+the+system+administrator+of+the+data+center.+Read+more+about+the+philosophy+behind+it.
-msgid "Machinery is made for the system administrator of the data center. Read more about the philosophy behind it."
-msgstr ""
-
-#: .token.CONTRIBUTE+TO+OPENSUSE
-msgid "CONTRIBUTE TO OPENSUSE"
-msgstr ""
-
-#: .token.Install+openSUSE
-msgid "Install openSUSE"
-msgstr ""
-
-#: .token.Create+Linux+images+for+deployment+on+real+hardware%2C+virtualisation%2C+and+now+even+container+systems+like+Docker.+Kiwi+is+the+engine+that+powers+SUSE+Studio.
-msgid "Create Linux images for deployment on real hardware, virtualisation, and now even container systems like Docker. Kiwi is the engine that powers SUSE Studio."
-msgstr ""
-
-#: .token.Home
-msgid "Home"
-msgstr "主目录"
-
-#: .token.Tools
-msgid "Tools"
-msgstr "工具"
Added: trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po (rev 0)
+++ trunk/lcn/zh_CN/po/opensuse-landing-page.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -0,0 +1,266 @@
+# marguerite , 2015.
+#. extracted from en.json
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-23 10:20+0200\n"
+"PO-Revision-Date: 2015-09-20 14:24+0800\n"
+"Last-Translator: marguerite \n"
+"Language-Team: Chinese \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .token.Find+out+more
+msgid "Find out more"
+msgstr "详细了解"
+
+#: .token.Contribute+Hardware
+msgid "Contribute Hardware"
+msgstr "贡献硬件"
+
+#: .token.Any+user+who+wishes+to+have+the+newest+packages+that+include%2C+but+are+not+limited+to%2C+the+Linux+kernel%2C+SAMBA%2C+git%2C+desktops%2C+office+applications+and+many+other+packages%2C+will+want+Tumbleweed.+Tumbleweed+appeals+to+Power+Users%2C+Software+Developers+and+openSUSE+Contributors.+If+you+require+the+latest+software+stacks+and+Independent+Development+Environment+or+need+a+stable+platform+closest+to+bleeding+edge+Linux%2C+Tumbleweed+is+the+best+choice+for+you.
+msgid ""
+"Any user who wishes to have the newest packages that include, but are not "
+"limited to, the Linux kernel, SAMBA, git, desktops, office applications and "
+"many other packages, will want Tumbleweed. Tumbleweed appeals to Power "
+"Users, Software Developers and openSUSE Contributors. If you require the "
+"latest software stacks and Independent Development Environment or need a "
+"stable platform closest to bleeding edge Linux, Tumbleweed is the best "
+"choice for you."
+msgstr ""
+
+#: .token.Automated+testing+for+%2Aany%2A+operating+system%2C+that+can+read+the+screen+and+control+the+test+host+the+same+way+a+user+does.
+msgid ""
+"Automated testing for *any* operating system, that can read the screen and "
+"control the test host the same way a user does."
+msgstr ""
+
+#: .token.Change+language
+msgid "Change language"
+msgstr "修改语言"
+
+#: .token.More+information
+msgid "More information"
+msgstr "更多信息"
+
+#: .token.Contribute+Code
+msgid "Contribute Code"
+msgstr "贡献代码"
+
+#: .token.What%27s+new
+msgid "What's new"
+msgstr "最新消息"
+
+#: .token.Donations+to+support+the+openSUSE+project+are+always+welcomed.+In+fact%2C+Open+Build+Service%2C+which+is+used+by+several+other+open-source+projects%2C+was+made+available+to+the+project%E2%80%99s+community+through+a+generous+donation+of+servers+by+AMD.+It+is+this+type+of+donations+that+allows+people+and+projects+to+thrive%2C+develop%2C+innovate+and+progress.+The+project+is+not+asking+for+money%2C+but+donations+of+hardware+to+use+the+open-source+community%E2%80%99s+expertise+to+empower+Linux+development%2C+provide+openSUSE+tools+to+the+free%2C+open+source+ecosystem+and+give+back+to+developers%2C+sysadmins+and+packagers.+Hardware+helps+the+openSUSE+community%21+Hardware+helps+the+open-source+community%21+And+Hardware+helps+Linux+development.+To+learn+how+you+can+donate+hardware+to+the+openSUSE+project%2C+email
+msgid ""
+"Donations to support the openSUSE project are always welcomed. In fact, Open "
+"Build Service, which is used by several other open-source projects, was made "
+"available to the project’s community through a generous donation of servers "
+"by AMD. It is this type of donations that allows people and projects to "
+"thrive, develop, innovate and progress. The project is not asking for money, "
+"but donations of hardware to use the open-source community’s expertise to "
+"empower Linux development, provide openSUSE tools to the free, open source "
+"ecosystem and give back to developers, sysadmins and packagers. Hardware "
+"helps the openSUSE community! Hardware helps the open-source community! And "
+"Hardware helps Linux development. To learn how you can donate hardware to "
+"the openSUSE project, email"
+msgstr ""
+
+#: .token.Install+Tumbleweed
+msgid "Install Tumbleweed"
+msgstr "安装 Tumbleweed"
+
+#: .token.New+and+experienced+Linux+users+get+the+most+usable+Linux+distribution+and+stabilized+operating+system+with+openSUSE%E2%80%99s+regular+release.+Receive+updates+and+harden+your+OS+with+openSUSE%E2%80%99s+latest+major+distribution.+Pick+your+desktop%2C+configure+your+system+and+enjoy+the+platform+of+choice+for+Linux+developers%2C+administrators+and+software+vendors.
+msgid ""
+"New and experienced Linux users get the most usable Linux distribution and "
+"stabilized operating system with openSUSE’s regular release. Receive updates "
+"and harden your OS with openSUSE’s latest major distribution. Pick your "
+"desktop, configure your system and enjoy the platform of choice for Linux "
+"developers, administrators and software vendors."
+msgstr ""
+
+#: .token.Be+part+of+our+comunity+contributing+with+any+of+the+followings%3A
+msgid "Be part of our comunity contributing with any of the followings:"
+msgstr ""
+
+#: .token.Social+Network
+msgid "Social Network"
+msgstr "社交网络"
+
+#: .token.Discover+the+best+open-source+tools+developed+by+our+community
+msgid "Discover the best open-source tools developed by our community"
+msgstr ""
+
+#: .token.Machinery+supports+configuration+discovery%2C+system+validation%2C+and+service+migration.
+msgid ""
+"Machinery supports configuration discovery, system validation, and service "
+"migration."
+msgstr ""
+
+#: .token.Get+the+newest+Linux+packages+with+our+rolling+release.+Fast%21+Integrated%21+Stabilized%21+Tested%21
+msgid ""
+"Get the newest Linux packages with our rolling release. Fast! Integrated! "
+"Stabilized! Tested!"
+msgstr ""
+
+#: .token.View+upcoming+conferences
+msgid "View upcoming conferences"
+msgstr ""
+
+#: .token.Press
+msgid "Press"
+msgstr "媒体"
+
+#: .token.News
+msgid "News"
+msgstr "新闻"
+
+#: .token.Check+all+openSUSE+tools
+msgid "Check all openSUSE tools"
+msgstr ""
+
+#: .token.Shop
+msgid "Shop"
+msgstr "商店"
+
+#: .token.Meet+up+with+openSUSE+at+conferences.
+msgid "Meet up with openSUSE at conferences."
+msgstr "邂逅 openSUSE"
+
+#: .token.Go+to+link
+msgid "Go to link"
+msgstr ""
+
+#: .token.Back+to+main+page
+msgid "Back to main page"
+msgstr ""
+
+#: .token.Our+build+tool%2C+building+all+of+our+packages+as+well+as+ones+for+SUSE+Linux+Enterprise%2C+Arch%2C+Debian%2C+Fedora%2C+Scientific+Linux%2C+RHEL%2C+CentOS%2C+Ubuntu%2C+and+more.
+msgid ""
+"Our build tool, building all of our packages as well as ones for SUSE Linux "
+"Enterprise, Arch, Debian, Fedora, Scientific Linux, RHEL, CentOS, Ubuntu, "
+"and more."
+msgstr ""
+
+#: .token.The+makers%27+choice+for+sysadmins%2C+developers+and+desktop+users.
+msgid "The makers' choice for sysadmins, developers and desktop users."
+msgstr ""
+
+#: .token.Blogs
+msgid "Blogs"
+msgstr "博客"
+
+#: .token.Get+software
+msgid "Get software"
+msgstr "撷取软件"
+
+#: .token.openSUSE+TOOLS
+msgid "openSUSE TOOLS"
+msgstr "openSUSE 工具"
+
+#: .token.Get+the+most+complete+Linux+distribution+with+openSUSE%E2%80%99s+latest+regular-release+version%21
+msgid ""
+"Get the most complete Linux distribution with openSUSE’s latest regular-"
+"release version!"
+msgstr ""
+
+#: .token.Find+out+more+about+how+to+participate.
+msgid "Find out more about how to participate."
+msgstr ""
+
+#: .token.Build+Service
+msgid "Build Service"
+msgstr "包构建服务"
+
+#: .token.Wiki
+msgid "Wiki"
+msgstr "维基"
+
+#: .token.openSUSE+believes+the+best+results+come+from+people+collaborating+and+having+fun.+Being+different+from+other+open-source+communities+is+what+makes+openSUSE+desirable.+We+are+not+the+conventional+community+and+our+community%E2%80%99s+efforts+determines+the+path+of+the+project.+The+efforts+of+the+community+have+created+several+great+tools+for+Linux+and+an+awsome+distribution.+With+openSUSE%2C+you+have+a+voice+and+can+easily+contribute+to+the+project.+Whether+you+are+an+experienced+Linux+developer+or+an+end+user+get+involved+in+the+openSUSE+project.+Join+a+forum%2C+maintain+and+keep+our+wiki+up-to-date%2C%2C+find+and+report+bugs%2C+review+the+documentation%2C+send+your+wish+list+for+new+packages+and+features%2C+create+and+submit+patches%2C+or+become+an+advocate+for+openSUSE+by+attending+events+and+becoming+an+ambassador.
+msgid ""
+"openSUSE believes the best results come from people collaborating and having "
+"fun. Being different from other open-source communities is what makes "
+"openSUSE desirable. We are not the conventional community and our "
+"community’s efforts determines the path of the project. The efforts of the "
+"community have created several great tools for Linux and an awsome "
+"distribution. With openSUSE, you have a voice and can easily contribute to "
+"the project. Whether you are an experienced Linux developer or an end user "
+"get involved in the openSUSE project. Join a forum, maintain and keep our "
+"wiki up-to-date,, find and report bugs, review the documentation, send your "
+"wish list for new packages and features, create and submit patches, or "
+"become an advocate for openSUSE by attending events and becoming an "
+"ambassador."
+msgstr ""
+
+#: .token.Code
+msgid "Code"
+msgstr "代码"
+
+#: .token.All+Rights+Reserved.
+msgid "All Rights Reserved."
+msgstr "保留所有权利。"
+
+#: .token.The+best%2Fonly+comprehensive+Linux+system+configuration+%26+installation+tool.
+msgid ""
+"The best/only comprehensive Linux system configuration & installation tool."
+msgstr ""
+
+#: .token.Conferences
+msgid "Conferences"
+msgstr "聚会"
+
+#: .token.Forums
+msgid "Forums"
+msgstr "论坛"
+
+#: .token.Contribute
+msgid "Contribute"
+msgstr "贡献"
+
+#: .token.Hardware
+msgid "Hardware"
+msgstr "硬件"
+
+#: .token.Machinery+is+based+on+the+idea+of+an+universal+system+description.It+is+transparent%2Cextensible%2C+and+crafted+beautifully.
+msgid ""
+"Machinery is based on the idea of an universal system description.It is "
+"transparent,extensible, and crafted beautifully."
+msgstr ""
+
+#: .token.Sponsored+by%3A
+msgid "Sponsored by:"
+msgstr "友情赞助,诚致呜谢:"
+
+#: .token.Machinery+is+made+for+the+system+administrator+of+the+data+center.+Read+more+about+the+philosophy+behind+it.
+msgid ""
+"Machinery is made for the system administrator of the data center. Read more "
+"about the philosophy behind it."
+msgstr ""
+
+#: .token.CONTRIBUTE+TO+OPENSUSE
+msgid "CONTRIBUTE TO OPENSUSE"
+msgstr ""
+
+#: .token.Install+openSUSE
+msgid "Install openSUSE"
+msgstr ""
+
+#: .token.Create+Linux+images+for+deployment+on+real+hardware%2C+virtualisation%2C+and+now+even+container+systems+like+Docker.+Kiwi+is+the+engine+that+powers+SUSE+Studio.
+msgid ""
+"Create Linux images for deployment on real hardware, virtualisation, and now "
+"even container systems like Docker. Kiwi is the engine that powers SUSE "
+"Studio."
+msgstr ""
+
+#: .token.Home
+msgid "Home"
+msgstr "首页"
+
+#: .token.Tools
+msgid "Tools"
+msgstr "工具"
Modified: trunk/lcn/zh_CN/po/opensuse-org.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/opensuse-org.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/opensuse-org.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -7,16 +7,16 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-01-20 12:30+0100\n"
-"PO-Revision-Date: 2015-02-01 12:15+0800\n"
-"Last-Translator: 玛格丽特 · 苏 \n"
-"Language-Team: Chinese Simplified \n"
+"POT-Creation-Date: 2015-09-03 10:51-0300\n"
+"PO-Revision-Date: 2015-10-27 20:52+0800\n"
+"Last-Translator: marguerite \n"
+"Language-Team: Chinese \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#. type: Attribute 'lang' of: <html>
#: en/index.shtml:2
@@ -353,28 +353,28 @@
#. type: Content of: <h2>
#: en/whats_hot.html:1
-msgid "openSUSE Conference crossing borders between communities"
-msgstr "openSUSE 峰会,沟通无界"
+msgid "openSUSE.Asia Summit 2015"
+msgstr "openSUSE.Asia Summit 2015"
#. type: Content of: <p>
#: en/whats_hot.html:4
msgid ""
-"Dear contributors, friends and fans: the openSUSE Conference will be May 1-4 "
-"in The Hague, Netherlands. We are working together to make this year's "
-"conference unforgettable, but we still need your help."
+"Dear contributors, friends and fans: the openSUSE.Asia Summit is from Dec "
+"5-6 in Taipei, Taiwan. The openSUSE.Asia team is looking for speakers, "
+"sponsors and visitors to make the summit an unforgettable experience."
msgstr ""
-"亲爱的贡献者、朋友们和粉丝:openSUSE 峰会将于 5 月 1 至 4 日于荷兰海牙召开。我们正共同努力使今年的峰会成为难忘的峰会,我们需要您的帮助。"
+"亲爱的贡献者、朋友和粉丝们:openSUSE.Asia 将于 12 月 5-6 日在台北召开。openSUSE.Asia "
+"团队正在寻找演讲者、赞助者和来访者以期使本次盛会能成为一段难忘的经历。"
#. type: Content of: <p>
#: en/whats_hot.html:8
msgid ""
-"Take part in oSC15 and help to advance the Free and Open Source movement. "
-"To get involved, https://news.opensuse.org/2014/12/22/osc-2015-"
-"call-for-team-members/\">read here</a>."
+"Take part in the openSUSE.Asia Summit and help us advance the Free and Open "
+"Source movement. To know more about the event, https://events."
+"opensuse.org/conference/summitasia15\">read here</a>."
msgstr ""
-"参与 oSC15,帮助推进自由开源运动。参与请https://news.opensuse.org/2014/12/22/osc-2015"
-"-"
-"call-for-team-members/\">阅读这里</a>。"
+"参与 openSUSE.Asia Summit,帮助推进自由开源运动。进一步了解该活动请阅读https://events.opensuse.org/conference/summitasia15\">这里</a>。"
#. type: Content of: <h2>
#: en/whats_hot.html:15
@@ -428,6 +428,17 @@
"积极的 openSUSE 社员。http://zh.opensuse.org/Portal:如何參與\">心花"
"怒放否?赶快抓起爪边的电脑,998 都不要哦!</a>"
+#~ msgid "openSUSE Conference crossing borders between communities"
+#~ msgstr "openSUSE 峰会,沟通无界"
+
+#~ msgid ""
+#~ "Dear contributors, friends and fans: the openSUSE Conference will be May "
+#~ "1-4 in The Hague, Netherlands. We are working together to make this "
+#~ "year's conference unforgettable, but we still need your help."
+#~ msgstr ""
+#~ "亲爱的贡献者、朋友们和粉丝:openSUSE 峰会将于 5 月 1 至 4 日于荷兰海牙召"
+#~ "开。我们正共同努力使今年的峰会成为难忘的峰会,我们需要您的帮助。"
+
#~ msgid "openSUSE 13.2: green light to freedom!"
#~ msgstr "openSUSE 13.2: 自由绿光!"
Modified: trunk/lcn/zh_CN/po/xen-vm-install.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/xen-vm-install.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/xen-vm-install.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -4,20 +4,20 @@
# This file is distributed under the same license as @PACKAGE@ package. FIRST
#
# Eric Shan , 2008, 2012.
-# 玛格丽特 · 苏 , 2013, 2014.
+# 玛格丽特 · 苏 , 2013, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-05 13:29-0700\n"
-"PO-Revision-Date: 2014-05-07 13:18+0800\n"
-"Last-Translator: 玛格丽特 · 苏 \n"
-"Language-Team: Chinese Simplified \n"
+"POT-Creation-Date: 2015-09-15 08:15-0600\n"
+"PO-Revision-Date: 2015-10-27 20:18+0800\n"
+"Last-Translator: marguerite \n"
+"Language-Team: Chinese \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: src/vminstall/msg.py:22
@@ -365,331 +365,359 @@
msgstr "openSUSE 13"
#: src/vminstall/msg.py:136
+msgid "openSUSE 42"
+msgstr "openSUSE 42"
+
+#: src/vminstall/msg.py:137
+msgid "openSUSE Tumbleweed"
+msgstr "openSUSE Tumbleweed"
+
+#: src/vminstall/msg.py:138
msgid "Other operating system"
msgstr "其它操作系统"
-#: src/vminstall/msg.py:137
+#: src/vminstall/msg.py:139
msgid "RedHat (other)"
msgstr "RedHat(其它)"
-#: src/vminstall/msg.py:138
+#: src/vminstall/msg.py:140
msgid "RedHat Enterprise Linux 3"
msgstr "RedHat Enterprise Linux 3"
-#: src/vminstall/msg.py:139
+#: src/vminstall/msg.py:141
msgid "RedHat Enterprise Linux 4"
msgstr "RedHat Enterprise Linux 4"
-#: src/vminstall/msg.py:140
+#: src/vminstall/msg.py:142
msgid "RedHat Enterprise Linux 5"
msgstr "RedHat Enterprise Linux 5"
-#: src/vminstall/msg.py:141
+#: src/vminstall/msg.py:143
msgid "RedHat Enterprise Linux 6"
msgstr "RedHat Enterprise Linux 6"
-#: src/vminstall/msg.py:142
+#: src/vminstall/msg.py:144
msgid "RedHat Enterprise Linux 7"
msgstr "RedHat Enterprise Linux 7"
-#: src/vminstall/msg.py:143
+#: src/vminstall/msg.py:145
msgid "SUSE Linux Enterprise Desktop 10"
msgstr "SUSE Linux Enterprise Desktop 10"
-#: src/vminstall/msg.py:144
+#: src/vminstall/msg.py:146
msgid "SUSE Linux Enterprise Desktop 11"
msgstr "SUSE Linux Enterprise Desktop 11"
-#: src/vminstall/msg.py:145
+#: src/vminstall/msg.py:147
msgid "SUSE Linux Enterprise Desktop 12"
msgstr "SUSE Linux Enterprise Desktop 12"
-#: src/vminstall/msg.py:146
+#: src/vminstall/msg.py:148
msgid "SUSE Linux Enterprise Server 10"
msgstr "SUSE Linux Enterprise Server 10"
-#: src/vminstall/msg.py:147
+#: src/vminstall/msg.py:149
msgid "SUSE Linux Enterprise Server 11"
msgstr "SUSE Linux Enterprise Server 11"
-#: src/vminstall/msg.py:148
+#: src/vminstall/msg.py:150
msgid "SUSE Linux Enterprise Server 12"
msgstr "SUSE Linux Enterprise Server 12"
-#: src/vminstall/msg.py:149
+#: src/vminstall/msg.py:151
msgid "SUSE Linux Enterprise Server 8"
msgstr "SUSE Linux Enterprise Server 8"
-#: src/vminstall/msg.py:150
+#: src/vminstall/msg.py:152
msgid "SUSE Linux Enterprise Server 9"
msgstr "SUSE Linux Enterprise Server 9"
-#: src/vminstall/msg.py:151
+#: src/vminstall/msg.py:153
msgid "Solaris 10"
msgstr "Solaris 10"
-#: src/vminstall/msg.py:152
+#: src/vminstall/msg.py:154
msgid "Solaris 9 and older"
msgstr "Solaris 9 及更早版本"
-#: src/vminstall/msg.py:153
+#: src/vminstall/msg.py:155
msgid "SUSE (other)"
msgstr "SUSE(其它)"
-#: src/vminstall/msg.py:154
+#: src/vminstall/msg.py:156
msgid "Ubuntu (other)"
msgstr "Ubuntu(其它)"
-#: src/vminstall/msg.py:155
+#: src/vminstall/msg.py:157
msgid "Ubuntu 10 (Lucid Lynx, Maverick Meerkat)"
msgstr "Ubuntu 10 (Lucid Lynx, Maverick Meerkat)"
-#: src/vminstall/msg.py:156
+#: src/vminstall/msg.py:158
msgid "Ubuntu 11 (Natty Narwhal, Oneiric Ocelot)"
msgstr "Ubuntu 11 (Natty Narwhal, Oneiric Ocelot)"
-#: src/vminstall/msg.py:157
+#: src/vminstall/msg.py:159
msgid "Ubuntu 12 (Precise Pangolin)"
msgstr "Ubuntu 12 (Precise Pangolin)"
-#: src/vminstall/msg.py:158
+#: src/vminstall/msg.py:160
msgid "Windows (other)"
msgstr "Windows(其他)"
-#: src/vminstall/msg.py:159
+#: src/vminstall/msg.py:161
msgid "Windows (other, x64)"
msgstr "Windows(其他、x64)"
-#: src/vminstall/msg.py:160
+#: src/vminstall/msg.py:162
msgid "Windows NT"
msgstr "Windows NT"
-#: src/vminstall/msg.py:161
-msgid "Windows Vista, Windows 7"
-msgstr "Windows Vista, Windows 7"
+#: src/vminstall/msg.py:163
+msgid "Windows XP, 2000, 2003"
+msgstr "Windows XP, 2000, 2003"
-#: src/vminstall/msg.py:162
-msgid "Windows Vista, Windows 7 (x64)"
-msgstr "Windows Vista, Windows 7 (x64)"
+#: src/vminstall/msg.py:164
+msgid "Windows XP, 2003 (x64)"
+msgstr "Windows XP, 2003 (x64)"
-#: src/vminstall/msg.py:163
+#: src/vminstall/msg.py:165
+msgid "Windows Vista"
+msgstr "Windows Vista"
+
+#: src/vminstall/msg.py:166
+msgid "Windows Vista (x64)"
+msgstr "Windows Vista (x64)"
+
+#: src/vminstall/msg.py:167
+msgid "Windows 7"
+msgstr "Windows 7"
+
+#: src/vminstall/msg.py:168
+msgid "Windows 7 (x64)"
+msgstr "Windows 7 (x64)"
+
+#: src/vminstall/msg.py:169
msgid "Windows 8"
msgstr "Windows 8"
-#: src/vminstall/msg.py:164
+#: src/vminstall/msg.py:170
msgid "Windows 8 (x64)"
msgstr "Windows 8 (x64)"
-#: src/vminstall/msg.py:165
+#: src/vminstall/msg.py:171
+msgid "Windows 10"
+msgstr "Windows 10"
+
+#: src/vminstall/msg.py:172
+msgid "Windows 10 (x64)"
+msgstr "Windows 10 (x64)"
+
+#: src/vminstall/msg.py:173
msgid "Windows Server 2008"
msgstr "Windows Server 2008"
-#: src/vminstall/msg.py:166
+#: src/vminstall/msg.py:174
msgid "Windows Server 2008 (x64)"
msgstr "Windows Server 2008 (x64)"
-#: src/vminstall/msg.py:167
+#: src/vminstall/msg.py:175
msgid "Windows Server 2012 (x64)"
msgstr "Windows Server 2012 (x64)"
-#: src/vminstall/msg.py:168
-msgid "Windows XP, 2000, 2003"
-msgstr "Windows XP, 2000, 2003"
-
-#: src/vminstall/msg.py:169
-msgid "Windows XP, 2003 (x64)"
-msgstr "Windows XP, 2003 (x64)"
-
-#: src/vminstall/msg.py:172
+#: src/vminstall/msg.py:178
msgid "Gathering settings..."
msgstr "正在收集设置..."
-#: src/vminstall/msg.py:173
+#: src/vminstall/msg.py:179
msgid "Preparing to start the installation..."
msgstr "正在准备启动安装..."
-#: src/vminstall/msg.py:174
+#: src/vminstall/msg.py:180
msgid "Installing..."
msgstr "正在安装..."
-#: src/vminstall/msg.py:175
+#: src/vminstall/msg.py:181
msgid "Please wait..."
msgstr "请稍候..."
-#: src/vminstall/msg.py:176
+#: src/vminstall/msg.py:182
msgid "Waiting for the VM to stop before continuing..."
msgstr "正在等待虚拟机停止后再继续操作..."
-#: src/vminstall/msg.py:177
+#: src/vminstall/msg.py:183
msgid "Performing post-installation checks..."
msgstr "正在执行安装后检查..."
-#: src/vminstall/msg.py:178
+#: src/vminstall/msg.py:184
msgid "Creating the run-time configuration..."
msgstr "正在创建运行时配置..."
-#: src/vminstall/msg.py:179
+#: src/vminstall/msg.py:185
msgid "The configuration file has been written."
msgstr "已写入配置文件。"
-#: src/vminstall/msg.py:180
+#: src/vminstall/msg.py:186
msgid "Finishing the installation..."
msgstr "正在完成安装..."
-#: src/vminstall/msg.py:181
+#: src/vminstall/msg.py:187
msgid "Finished."
msgstr "已完成。"
-#: src/vminstall/msg.py:184
+#: src/vminstall/msg.py:190
msgid "Paravirtualized"
msgstr "已超虚拟化"
-#: src/vminstall/msg.py:185
+#: src/vminstall/msg.py:191
msgid "Fully virtualized"
msgstr "已全虚拟化"
-#: src/vminstall/msg.py:186
+#: src/vminstall/msg.py:192
msgid "Paravirtualization"
msgstr "超虚拟化"
-#: src/vminstall/msg.py:187
+#: src/vminstall/msg.py:193
msgid "Full virtualization"
msgstr "全虚拟化"
-#: src/vminstall/msg.py:188
+#: src/vminstall/msg.py:194
msgid "Name"
msgstr "名称"
-#: src/vminstall/msg.py:189
+#: src/vminstall/msg.py:195
msgid "Type"
msgstr "类型"
-#: src/vminstall/msg.py:190
+#: src/vminstall/msg.py:196
msgid "Source"
msgstr "来源"
-#: src/vminstall/msg.py:191
+#: src/vminstall/msg.py:197
msgid "Browse"
msgstr "浏览"
-#: src/vminstall/msg.py:192
+#: src/vminstall/msg.py:198
msgid "Upgrade"
msgstr "升级"
-#: src/vminstall/msg.py:193
+#: src/vminstall/msg.py:199
msgid "Protocol"
msgstr "协议"
-#: src/vminstall/msg.py:194
+#: src/vminstall/msg.py:200
msgid "Keymap"
msgstr "键盘映射表"
-#: src/vminstall/msg.py:195
+#: src/vminstall/msg.py:201
msgid "Sound"
msgstr "声音"
-#: src/vminstall/msg.py:196
+#: src/vminstall/msg.py:202
msgid "None"
msgstr "无"
-#: src/vminstall/msg.py:197
+#: src/vminstall/msg.py:203
msgid "Username:"
msgstr "用户名:"
-#: src/vminstall/msg.py:198
+#: src/vminstall/msg.py:204
msgid "Password:"
msgstr "密码:"
-#: src/vminstall/msg.py:199
+#: src/vminstall/msg.py:205
msgid "Description"
msgstr "描述"
-#: src/vminstall/msg.py:200
+#: src/vminstall/msg.py:206
msgid "Enabled"
msgstr "已启用"
-#: src/vminstall/msg.py:201
+#: src/vminstall/msg.py:207
msgid "Option"
msgstr "选项"
-#: src/vminstall/msg.py:202
+#: src/vminstall/msg.py:208
msgid "Random"
msgstr "随机"
-#: src/vminstall/msg.py:203
+#: src/vminstall/msg.py:209
msgid "Managed"
msgstr "管理"
-#: src/vminstall/msg.py:206
+#: src/vminstall/msg.py:210
+msgid "Storage Format"
+msgstr "存储格式"
+
+#: src/vminstall/msg.py:213
msgid "Create a Virtual Machine"
msgstr "创建虚拟机"
-#: src/vminstall/msg.py:207
+#: src/vminstall/msg.py:214
msgid "Install an Operating System?"
msgstr "要安装操作系统吗?"
-#: src/vminstall/msg.py:208
+#: src/vminstall/msg.py:215
msgid "Type of Operating System"
msgstr "操作系统类型"
-#: src/vminstall/msg.py:209
+#: src/vminstall/msg.py:216
msgid "Summary"
msgstr "摘要"
-#: src/vminstall/msg.py:210
+#: src/vminstall/msg.py:217
msgid "Virtualization Method"
msgstr "虚拟化方法"
# /opt/kde3/share/applnk/System/ScreenSavers/KVm.desktop
-#: src/vminstall/msg.py:211
+#: src/vminstall/msg.py:218
msgid "Name of Virtual Machine"
msgstr "虚拟机名称"
-#: src/vminstall/msg.py:212
+#: src/vminstall/msg.py:219
msgid "Hardware"
msgstr "硬件"
-#: src/vminstall/msg.py:213
+#: src/vminstall/msg.py:220
msgid "Peripheral Devices"
msgstr "外围设备"
-#: src/vminstall/msg.py:214
+#: src/vminstall/msg.py:221
msgid "Disks"
msgstr "磁盘"
-#: src/vminstall/msg.py:215 src/vminstall/msg.py:295
+#: src/vminstall/msg.py:222 src/vminstall/msg.py:302
msgid "Virtual Disk"
msgstr "虚拟磁盘"
-#: src/vminstall/msg.py:216
+#: src/vminstall/msg.py:223
msgid "Network Adapters"
msgstr "网络适配器"
-#: src/vminstall/msg.py:217
+#: src/vminstall/msg.py:224
msgid "Virtual Network Adapter"
msgstr "虚拟网络适配器"
-#: src/vminstall/msg.py:218
+#: src/vminstall/msg.py:225
msgid "Operating System Installation"
msgstr "操作系统安装"
-#: src/vminstall/msg.py:219
+#: src/vminstall/msg.py:226
msgid "Operating System Settings"
msgstr "操作系统设置"
-#: src/vminstall/msg.py:220
+#: src/vminstall/msg.py:227
msgid "Operating System Upgrade"
msgstr "操作系统升级"
-#: src/vminstall/msg.py:221
+#: src/vminstall/msg.py:228
msgid "Advanced Settings"
msgstr "高级选项"
-#: src/vminstall/msg.py:222 src/vminstall/msg.py:285
+#: src/vminstall/msg.py:229 src/vminstall/msg.py:292
msgid "Host Devices"
msgstr "主机设备"
-#: src/vminstall/msg.py:225
+#: src/vminstall/msg.py:232
msgid ""
"This assistant will guide you through creating a new virtual machine (VM). "
"You will be asked for some information about the VM you'd like to create, "
@@ -698,16 +726,16 @@
"此助手将引导用户完成新虚拟机 (VM) 的创建。将向您询问一些要创建的虚拟机相关信"
"息,比如:"
-#: src/vminstall/msg.py:226
+#: src/vminstall/msg.py:233
msgid "The <b>type of operating system</b> that will run in the new VM"
msgstr "将在新虚拟机中运行的<b>操作系统类型</b>"
-#: src/vminstall/msg.py:227
+#: src/vminstall/msg.py:234
msgid ""
"Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>"
msgstr "要创建<b>全虚拟化</b>还是<b>超虚拟化</b>的虚拟机"
-#: src/vminstall/msg.py:228
+#: src/vminstall/msg.py:235
msgid ""
"The <b>location</b> of the files necessary to install an operating system on "
"the VM, or a <b>disk</b> that already has an operating system"
@@ -715,23 +743,23 @@
"在虚拟机上安装操作系统所必需的文件或已经具有操作系统的<b>磁盘</b>的<b>位置"
"b>"
-#: src/vminstall/msg.py:229
+#: src/vminstall/msg.py:236
msgid ""
"Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, "
"and <b>network adapters</b>."
msgstr "虚拟机的其它特征,比如 <b>内存</b>、<b>处理器</b>和<b>网络适配器</b>。"
#. TRANSLATORS Do not translate %(url)s
-#: src/vminstall/msg.py:231
+#: src/vminstall/msg.py:238
msgid "For the most current information on SUSE VM server technology, see "
msgstr "SUSE 虚拟机服务器技术的最新信息,请参阅"
-#: src/vminstall/msg.py:232
+#: src/vminstall/msg.py:239
#, python-format
msgid "%(url)s"
msgstr "%(url)s"
-#: src/vminstall/msg.py:233
+#: src/vminstall/msg.py:240
msgid ""
"If you are creating this VM from scratch, you will need to install an "
"operating system. When migrating a physical machine to a virtual machine, "
@@ -740,29 +768,29 @@
"如果完全重新创建此虚拟机,则需要安装操作系统。将物理计算机迁移到虚拟计算机"
"时,带现有操作系统的磁盘常常可以复用于虚拟机。"
-#: src/vminstall/msg.py:234
+#: src/vminstall/msg.py:241
msgid "I need to install an operating system."
msgstr "我需要安装操作系统。"
-#: src/vminstall/msg.py:235
+#: src/vminstall/msg.py:242
msgid "I have a disk or disk image with an installed operating system."
msgstr "我拥有已安装操作系统的磁盘或磁盘映像。"
-#: src/vminstall/msg.py:236
+#: src/vminstall/msg.py:243
msgid "I need to upgrade an existing operating system."
msgstr "我需要升级现有操作系统。"
-#: src/vminstall/msg.py:237
+#: src/vminstall/msg.py:244
msgid "Please choose a name for the virtual machine."
msgstr "请为虚拟机选择一个名称。"
-#: src/vminstall/msg.py:238
+#: src/vminstall/msg.py:245
msgid ""
"Click any headline to make changes. When the settings are correct, click "
"<b>OK</b> to create the VM."
msgstr "请单击任意标题,以做出修改。如果设置正确,请单击<b>确定</b>创建虚拟机。"
-#: src/vminstall/msg.py:239
+#: src/vminstall/msg.py:246
msgid ""
"Virtual machines can use paravirtualization or full virtualization. "
"Paravirtualization is faster but requires operating system support. Full "
@@ -772,7 +800,7 @@
"虚拟机可使用超虚拟化或全虚拟化。超虚拟化更快,但要求有操作系统的支持。全虚拟"
"化可运行范围更广泛的操作系统,但要求有硬件支持。要选择哪种虚拟化?"
-#: src/vminstall/msg.py:240
+#: src/vminstall/msg.py:247
msgid ""
"Please specify the type of operating system that will run within the virtual "
"machine. This defines many defaults, and helps decide how to start "
@@ -781,25 +809,25 @@
"请选择将在虚拟机内运行的操作系统的类型。这将定义许多默认值并帮助确定超虚拟化"
"操作系统的启动方法。"
-#: src/vminstall/msg.py:241
+#: src/vminstall/msg.py:248
msgid ""
"Some operating systems support automating the installation by specifying a "
"URL or file(s). Select a directory to include multiple files."
msgstr "有些操作系统支持通过指定网址或文件来自动安装。请选择包含多个文件的目录。"
-#: src/vminstall/msg.py:243
+#: src/vminstall/msg.py:250
msgid ""
"Some operating systems accept additional arguments, used to customize the "
"installation or boot process."
msgstr "有些操作系统还接受额外参数,用于自定义安装或引导进程。"
-#: src/vminstall/msg.py:244
+#: src/vminstall/msg.py:251
msgid ""
"Select the behavior when the operating system exits with power off, reboot "
"or crash. Settings take effect after installation is complete."
msgstr "选择操作系统关机、重启或崩溃时的退出行为。设置将在安装完成后生效。"
-#: src/vminstall/msg.py:247
+#: src/vminstall/msg.py:254
msgid ""
"Specify the bootable virtual disk (often labeled as Disk 1) or the network "
"installation source URL. Each CD, DVD, or ISO image required for "
@@ -808,7 +836,7 @@
"指定可引导的虚拟磁盘(标签经常为 Disk 1)或网络安装来源网址。安装所需的每张 "
"CD、DVD 或 ISO 映像必须被添加为虚拟磁盘。"
-#: src/vminstall/msg.py:250
+#: src/vminstall/msg.py:257
msgid ""
"Create a virtual disk based on a device (CD or other block device), an "
"existing image file (ISO), or a new file. Specify a device by its device "
@@ -817,15 +845,15 @@
"基于一个设备(CD 或者其他块设备)、已有映像文件(ISO)或者新文件,创建一个虚"
"拟磁盘。使用设备节点指定设备,比如 /dev/cdrom,不要使用它的挂载点指定。"
-#: src/vminstall/msg.py:251
+#: src/vminstall/msg.py:258
msgid "Please specify the settings for the virtual network adapter."
msgstr "请指定虚拟网络适配器的设置。"
-#: src/vminstall/msg.py:252
+#: src/vminstall/msg.py:259
msgid "Press 'q' or the Escape key to exit."
msgstr "按 'q' 或 Esc 键退出。"
-#: src/vminstall/msg.py:253
+#: src/vminstall/msg.py:260
msgid ""
"Warning: Vm-install automatically manages these configuration settings "
"depending on the operating system to be installed. It is expected that you "
@@ -835,34 +863,34 @@
"警告:根据将安装的操作系统类型,Vm-install 会自动管理这些配置设置。 希望您能"
"清楚的知道启用或禁用某项设置的后果。"
-#: src/vminstall/msg.py:254
+#: src/vminstall/msg.py:261
msgid "Reset to Defaults"
msgstr "重置为默认"
-#: src/vminstall/msg.py:255
+#: src/vminstall/msg.py:262
msgid ""
"Setting the maximum memory greater than the initial memory requires the VM "
"operating system to have a memory balloon driver."
msgstr "把最大内存设置得比初始内存大需要虚拟机操作系统拥有内存气球驱动。"
-#: src/vminstall/msg.py:258
+#: src/vminstall/msg.py:265
msgid ""
"Specify the amount of memory and number of processors to allocate for the VM."
msgstr "请指定为虚拟机分配的内存量和处理器数量。"
-#: src/vminstall/msg.py:259
+#: src/vminstall/msg.py:266
msgid ""
"For best performance, the number of virtual processors should be less than "
"or equal to the number of physical processors."
msgstr "为了获得最佳性能,虚拟处理器的数量应少于等于物理处理器的数量。"
-#: src/vminstall/msg.py:262
+#: src/vminstall/msg.py:269
msgid ""
"Paravirtualized graphics require that an appropriate driver is installed in "
"the operating system."
msgstr "超虚拟化图形要求操作系统中安装有合适的驱动程序。"
-#: src/vminstall/msg.py:263
+#: src/vminstall/msg.py:270
msgid ""
"The VM will operate like a server without a monitor. You may still access "
"the operating system via the virtualized serial port, or through any "
@@ -871,357 +899,357 @@
"虚拟机将像没有监视器的服务器一样运行。您仍然可以通过虚拟串行端口或通过任何操"
"作系统支持的服务(比如 ssh 或 VNC)来访问操作系统。"
-#: src/vminstall/msg.py:264
+#: src/vminstall/msg.py:271
msgid "Please specify the type of virtualized graphics hardware."
msgstr "请指定虚拟化图形硬件的类型。"
-#: src/vminstall/msg.py:265
+#: src/vminstall/msg.py:272
msgid "Paravirtualized Graphics Adapter"
msgstr "超虚拟化的图形适配器"
-#: src/vminstall/msg.py:266
+#: src/vminstall/msg.py:273
msgid "VESA VGA"
msgstr "VESA VGA"
-#: src/vminstall/msg.py:267
+#: src/vminstall/msg.py:274
msgid "Cirrus Logic GD5446 VGA"
msgstr "Cirrus Logic GD5446 VGA"
-#: src/vminstall/msg.py:268
+#: src/vminstall/msg.py:275
msgid "No Graphics Support"
msgstr "无图形支持"
-#: src/vminstall/msg.py:269
+#: src/vminstall/msg.py:276
msgid "Graphics Adapter"
msgstr "图形适配器"
-#: src/vminstall/msg.py:270
+#: src/vminstall/msg.py:277
msgid "Screen Resolution"
msgstr "屏幕分辨率"
-#: src/vminstall/msg.py:272
+#: src/vminstall/msg.py:279
msgid "Please specify the keyboard translation map file."
msgstr "请指定键盘翻译映射文件。"
-#: src/vminstall/msg.py:275
+#: src/vminstall/msg.py:282
msgid "Please specify the sound device."
msgstr "请指定声音设备。"
-#: src/vminstall/msg.py:276
+#: src/vminstall/msg.py:283
msgid "Intel 82801AA Audio Codec 97"
msgstr "Intel 82801AA 音频编解码器 97"
-#: src/vminstall/msg.py:277
+#: src/vminstall/msg.py:284
msgid "Ensoniq AudioPCI ES1370"
msgstr "Ensoniq AudioPCI ES1370"
-#: src/vminstall/msg.py:278
+#: src/vminstall/msg.py:285
msgid "Intel I/O Controller Hub 6 (ICH6)"
msgstr "Intel 输入/输出控制集群 6(ICH6)"
-#: src/vminstall/msg.py:279
+#: src/vminstall/msg.py:286
msgid "Creative Sound Blaster 16"
msgstr "创新声卡 Blaster 16"
-#: src/vminstall/msg.py:280
+#: src/vminstall/msg.py:287
msgid "No Sound Support"
msgstr "无声音支持"
-#: src/vminstall/msg.py:281
+#: src/vminstall/msg.py:288
msgid "All"
msgstr "全部"
-#: src/vminstall/msg.py:282
+#: src/vminstall/msg.py:289
msgid "Sound Card"
msgstr "声卡"
-#: src/vminstall/msg.py:286
+#: src/vminstall/msg.py:293
msgid ""
"Specify a host device for the VM. This will give the VM direct access to "
"the device."
msgstr "为虚拟机指定一个主机设备。这将给虚拟机这台设备的直接访问权限。"
-#: src/vminstall/msg.py:287
+#: src/vminstall/msg.py:294
msgid "Host devices cannot be shared between VMs or between a VM and the host."
msgstr "主机设备不能为多个虚拟机、虚拟机和主机之间共享。"
-#: src/vminstall/msg.py:288
+#: src/vminstall/msg.py:295
msgid "Manage VM Devices"
msgstr "管理虚拟机设备"
-#: src/vminstall/msg.py:289
+#: src/vminstall/msg.py:296
msgid "Defined VM Devices"
msgstr "已定义的虚拟机设备"
-#: src/vminstall/msg.py:290
+#: src/vminstall/msg.py:297
msgid "PCI Host Devices"
msgstr "PCI 主机设备"
-#: src/vminstall/msg.py:291
+#: src/vminstall/msg.py:298
msgid "USB Host Devices"
msgstr "USB 主机设备"
-#: src/vminstall/msg.py:292
+#: src/vminstall/msg.py:299
msgid ""
"Do not add a PCI or USB device to this VM that is needed by the host to "
"function properly."
msgstr "不要添加主机正常运行所需的 PCI 或 USB 设备给此虚拟机。"
-#: src/vminstall/msg.py:296
+#: src/vminstall/msg.py:303
msgid "Virtual Disks"
msgstr "虚拟磁盘"
-#: src/vminstall/msg.py:297
+#: src/vminstall/msg.py:304
msgid "PXE Boot"
msgstr "PXE 引导"
-#: src/vminstall/msg.py:298
+#: src/vminstall/msg.py:305
msgid "Size (GB)"
msgstr "大小 (GB)"
-#: src/vminstall/msg.py:299
+#: src/vminstall/msg.py:306
msgid "Create Sparse Image File"
msgstr "创建稀疏映像文件"
-#: src/vminstall/msg.py:300
+#: src/vminstall/msg.py:307
msgid "Read-Only Access"
msgstr "只读访问"
# menu entry for hard disk installation
-#: src/vminstall/msg.py:301
+#: src/vminstall/msg.py:308
msgid "Hard Disk"
msgstr "硬盘"
-#: src/vminstall/msg.py:302
+#: src/vminstall/msg.py:309
msgid "CD-ROM or DVD"
msgstr "CD-ROM 或 DVD"
-#: src/vminstall/msg.py:303
+#: src/vminstall/msg.py:310
msgid "Floppy Disk"
msgstr "软盘"
-#: src/vminstall/msg.py:304
+#: src/vminstall/msg.py:311
msgid "PXE"
msgstr "PXE"
-#: src/vminstall/msg.py:305
+#: src/vminstall/msg.py:312
msgid "Relax and Recover"
msgstr "休闲和恢复"
-#: src/vminstall/msg.py:306
+#: src/vminstall/msg.py:313
msgid "Cache Mode"
msgstr "缓存模式"
-#: src/vminstall/msg.py:309
+#: src/vminstall/msg.py:316
msgid ""
"Can't reach the pxe server. Possible reasons are an improperly configured "
"network or firewall restrictions."
msgstr "不能连接 pxe 服务器。可能有不当配置的网络或防火墙限制。"
-#: src/vminstall/msg.py:310
+#: src/vminstall/msg.py:317
msgid "Can't get the pxelinux.cfg/default file from the pxe server."
msgstr "不能获取 pxelinux.cfg/来自 pxe 服务器的默认文件。"
-#: src/vminstall/msg.py:311
+#: src/vminstall/msg.py:318
msgid "Can't download the kernel and initrd from the server."
msgstr "无法从服务器下载内核和 initrd 。"
-#: src/vminstall/msg.py:312
+#: src/vminstall/msg.py:319
msgid ""
"This kernel image may not be a paravirtualized xen kernel required for "
"installation, Continue?"
msgstr "内核映像不是安装需要的超虚拟化的 xen 内核,依然继续?"
-#: src/vminstall/msg.py:313
+#: src/vminstall/msg.py:320
msgid "Unable to identify a configured network bridge."
msgstr "无法识别配置的网桥。"
-#: src/vminstall/msg.py:314
+#: src/vminstall/msg.py:321
msgid ""
"Paravirtualized PXE booting requires the use of tftp or atftp. Please "
"install one of these packages."
msgstr "超虚拟化 PXE 启动需要使用 tftp 或 atftp。请安装任意一个软件包。"
-#: src/vminstall/msg.py:317
+#: src/vminstall/msg.py:324
msgid "Fully Virtualized Intel e100"
msgstr "全虚拟化 Intel e100"
-#: src/vminstall/msg.py:318
+#: src/vminstall/msg.py:325
msgid "Fully Virtualized Intel e1000"
msgstr "全虚拟化 Intel e1000"
-#: src/vminstall/msg.py:319
+#: src/vminstall/msg.py:326
msgid "Fully Virtualized Intel eepro100"
msgstr "全虚拟化 Intel eepro100"
-#: src/vminstall/msg.py:320
+#: src/vminstall/msg.py:327
msgid "Fully Virtualized AMD PCnet 32"
msgstr "全虚拟化 AMD PCnet 32"
-#: src/vminstall/msg.py:321
+#: src/vminstall/msg.py:328
msgid "Fully Virtualized NE2000 (ISA Bus)"
msgstr "全虚拟化 NE2000(ISA 总线)"
-#: src/vminstall/msg.py:322
+#: src/vminstall/msg.py:329
msgid "Fully Virtualized NE2000 (PCI Bus)"
msgstr "全虚拟化 NE2000(PCI 总线)"
-#: src/vminstall/msg.py:323
+#: src/vminstall/msg.py:330
msgid "Fully Virtualized Realtek 8139"
msgstr "全虚拟化 Realtek 8139"
-#: src/vminstall/msg.py:324
+#: src/vminstall/msg.py:331
msgid "MAC Address"
msgstr "MAC 地址"
-#: src/vminstall/msg.py:325
+#: src/vminstall/msg.py:332
msgid "Randomly generated MAC address"
msgstr "随机生成的 MAC 地址"
-#: src/vminstall/msg.py:326
+#: src/vminstall/msg.py:333
msgid "Specified MAC address"
msgstr "指定的 MAC 地址"
-#: src/vminstall/msg.py:329
+#: src/vminstall/msg.py:336
msgid "Additional Arguments"
msgstr "额外参数"
-#: src/vminstall/msg.py:330
+#: src/vminstall/msg.py:337
msgid "Network URL"
msgstr "网络网址"
-#: src/vminstall/msg.py:331
+#: src/vminstall/msg.py:338
msgid "Memory"
msgstr "内存"
-#: src/vminstall/msg.py:332
+#: src/vminstall/msg.py:339
msgid "Processors"
msgstr "处理器 "
-#: src/vminstall/msg.py:333
+#: src/vminstall/msg.py:340
msgid "Automated install file or URL"
msgstr "自动化安装文件或网址"
-#: src/vminstall/msg.py:334
+#: src/vminstall/msg.py:341
msgid "Available Memory"
msgstr "可用内存"
-#: src/vminstall/msg.py:335
+#: src/vminstall/msg.py:342
msgid "Available Processors"
msgstr "可用处理器"
-#: src/vminstall/msg.py:336
+#: src/vminstall/msg.py:343
msgid "Initial Memory"
msgstr "初始内存"
-#: src/vminstall/msg.py:337
+#: src/vminstall/msg.py:344
msgid "Maximum Memory"
msgstr "最大内存"
-#: src/vminstall/msg.py:338
+#: src/vminstall/msg.py:345
msgid "Virtual Processors"
msgstr "虚拟处理器"
-#: src/vminstall/msg.py:339
+#: src/vminstall/msg.py:346
msgid "Installation Source"
msgstr "安装来源"
-#: src/vminstall/msg.py:340
+#: src/vminstall/msg.py:347
msgid "Automated Installation"
msgstr "自动化安装"
-#: src/vminstall/msg.py:341
+#: src/vminstall/msg.py:348
msgid "Operating System"
msgstr "操作系统"
# power off dialog title
-#: src/vminstall/msg.py:342
+#: src/vminstall/msg.py:349
msgid "Power Off"
msgstr "关机"
# reboot button label
-#: src/vminstall/msg.py:343
+#: src/vminstall/msg.py:350
msgid "Reboot"
msgstr "重启"
-#: src/vminstall/msg.py:344
+#: src/vminstall/msg.py:351
msgid "Crash"
msgstr "崩溃"
-#: src/vminstall/msg.py:354
+#: src/vminstall/msg.py:361
msgid "Kickstart file or URL"
msgstr "Kickstart 文件或网址"
-#: src/vminstall/msg.py:355
+#: src/vminstall/msg.py:362
msgid "AutoYaST file"
msgstr "AutoYaST 文件"
-#: src/vminstall/msg.py:356
+#: src/vminstall/msg.py:363
msgid "NetWare response file"
msgstr "NetWare 响应文件"
-#: src/vminstall/msg.py:359
+#: src/vminstall/msg.py:366
msgid "Creating the Virtual Machine"
msgstr "正在创建虚拟机"
-#: src/vminstall/msg.py:360
+#: src/vminstall/msg.py:367
msgid "Writing the configuration file"
msgstr "正在写入配置文件"
-#: src/vminstall/msg.py:361
+#: src/vminstall/msg.py:368
msgid "Locate Operating System Settings File"
msgstr "查找操作系统设置文件"
-#: src/vminstall/msg.py:362
+#: src/vminstall/msg.py:369
msgid "Locate Disk or Disk Image"
msgstr "查找磁盘或磁盘映像"
# power-off message
-#: src/vminstall/msg.py:365
+#: src/vminstall/msg.py:372
msgid "Do you want to add another virtual disk?"
msgstr "是否要添加另一个虚拟磁盘?"
-#: src/vminstall/msg.py:366
+#: src/vminstall/msg.py:373
msgid "Do you want to add another virtual network adapter?"
msgstr "是否要添加另一个虚拟网络适配器?"
-#: src/vminstall/msg.py:367
+#: src/vminstall/msg.py:374
msgid "What type of virtual disk do you want to add?"
msgstr "要添加哪种类型的虚拟磁盘?"
-#: src/vminstall/msg.py:368
+#: src/vminstall/msg.py:375
msgid "Where will the virtual disk physically reside?"
msgstr "虚拟磁盘的物理位置在哪?"
-#: src/vminstall/msg.py:369
+#: src/vminstall/msg.py:376
msgid "What type of virtual network adapter do you want to add?"
msgstr "要添加哪种类型的虚拟网络适配器?"
-#: src/vminstall/msg.py:370
+#: src/vminstall/msg.py:377
msgid "Create a sparse image file for the virtual disk?"
msgstr "为虚拟磁盘创建一个稀疏映像文件?"
-#: src/vminstall/msg.py:372
+#: src/vminstall/msg.py:379
msgid "Default"
msgstr "默认"
-#: src/vminstall/msg.py:375
+#: src/vminstall/msg.py:382
msgid "Operating System Type"
msgstr "操作系统类型"
-#: src/vminstall/msg.py:376
+#: src/vminstall/msg.py:383
msgid "Managed Virtual Machines"
msgstr "管理的虚拟机"
-#: src/vminstall/msg.py:377
+#: src/vminstall/msg.py:384
msgid "Configuration File"
msgstr "配置文件"
-#: src/vminstall/msg.py:378
+#: src/vminstall/msg.py:385
msgid "Specify the URL containing the network installation source."
msgstr "指定包含网络安装来源的网址。"
-#: src/vminstall/msg.py:381
+#: src/vminstall/msg.py:388
msgid ""
"A hypervisor is not running. For kvm, load the kvm kernel modules. If you "
"want to run xen, reboot and load the xen kernel."
@@ -1229,6 +1257,12 @@
"没有正在运行的虚拟机。KVM 请加载 kvm 内核模块。如果您想运行 xen,请重启并加"
"载 xen 内核。"
+#~ msgid "Windows Vista, Windows 7"
+#~ msgstr "Windows Vista, Windows 7"
+
+#~ msgid "Windows Vista, Windows 7 (x64)"
+#~ msgstr "Windows Vista, Windows 7 (x64)"
+
#, fuzzy
#~| msgid "Graphics Card Settings"
#~ msgid "Graphics and Keyboard"
Modified: trunk/lcn/zh_CN/po/zypp.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/zypp.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/zypp.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 01:13+0200\n"
-"PO-Revision-Date: 2015-06-08 22:35+0800\n"
+"POT-Creation-Date: 2015-07-23 01:13+0200\n"
+"PO-Revision-Date: 2015-10-27 20:19+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
"Language: zh_CN\n"
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 2.0\n"
-#: zypp/solver/detail/SATResolver.cc:1145
+#: zypp/solver/detail/SATResolver.cc:1159
msgid ""
"\n"
"uninstallable providers: "
@@ -35,57 +35,57 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr " SSL 证书问题,请校验 '%s' 的 CA 证书。"
-#: zypp/target/TargetImpl.cc:442
+#: zypp/target/TargetImpl.cc:439
msgid " executed"
msgstr " 已执行"
-#: zypp/target/TargetImpl.cc:464
+#: zypp/target/TargetImpl.cc:461
msgid " execution failed"
msgstr " 执行失败"
-#: zypp/target/TargetImpl.cc:591
+#: zypp/target/TargetImpl.cc:588
msgid " execution skipped while aborting"
msgstr " 执行在中止时被跳过"
#. translators: We may find the same script content in files with different names.
#. Only the first occurence is executed, subsequent ones are skipped. It's a one-line
#. message for a log file. Preferably start translation with "%s"
-#: zypp/target/TargetImpl.cc:581
+#: zypp/target/TargetImpl.cc:578
#, c-format, boost-format
msgid "%s already executed as %s)"
msgstr "%s 早已作为 %s 执行了)"
-#: zypp/solver/detail/SATResolver.cc:1087
+#: zypp/solver/detail/SATResolver.cc:1101
#, c-format, boost-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s 与 %s 冲突,后者由 %s 提供"
-#: zypp/solver/detail/SATResolver.cc:1040
+#: zypp/solver/detail/SATResolver.cc:1054
#, c-format, boost-format
msgid "%s does not belong to a distupgrade repository"
msgstr "%s 不属于发行版升级源"
-#: zypp/solver/detail/SATResolver.cc:1044
+#: zypp/solver/detail/SATResolver.cc:1058
#, c-format, boost-format
msgid "%s has inferior architecture"
msgstr "%s 架构不对应"
-#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1086
#, c-format, boost-format
msgid "%s is not installable"
msgstr "%s 不可安装"
-#: zypp/solver/detail/SATResolver.cc:1068
+#: zypp/solver/detail/SATResolver.cc:1082
#, c-format, boost-format
msgid "%s is provided by the system and cannot be erased"
msgstr "%s 由系统提供,无法擦除"
-#: zypp/solver/detail/SATResolver.cc:1092
+#: zypp/solver/detail/SATResolver.cc:1106
#, c-format, boost-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s 淘汰了 %s,后者由 %s 提供"
-#: zypp/solver/detail/SATResolver.cc:1133
+#: zypp/solver/detail/SATResolver.cc:1147
#, c-format, boost-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr "%s 依赖 %s,但无法提供此依赖"
@@ -125,7 +125,7 @@
msgid "Adangme"
msgstr "阿当梅语"
-#: zypp/RepoManager.cc:1505
+#: zypp/RepoManager.cc:1511
#, c-format, boost-format
msgid "Adding repository '%s'"
msgstr "正在添加软件源 '%s'"
@@ -136,7 +136,7 @@
#. report additional rpm output in finish
#. TranslatorExplanation Text is followed by a ':' and the actual output.
-#: zypp/target/rpm/RpmDb.cc:2058 zypp/target/rpm/RpmDb.cc:2205
+#: zypp/target/rpm/RpmDb.cc:2059 zypp/target/rpm/RpmDb.cc:2206
msgid "Additional rpm output"
msgstr "额外的 RPM 输出"
@@ -354,7 +354,7 @@
msgstr "新西兰南岛诸语言 (其它)"
#. !\todo add comma to the message for the next release
-#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1680
+#: zypp/media/MediaCIFS.cc:430 zypp/media/MediaCurl.cc:1692
#, c-format, boost-format
msgid "Authentication required for '%s'"
msgstr "'%s' 需要认证"
@@ -618,7 +618,7 @@
msgid "Buginese"
msgstr "布吉语"
-#: zypp/RepoManager.cc:1205
+#: zypp/RepoManager.cc:1211
#, c-format, boost-format
msgid "Building repository '%s' cache"
msgstr "正在构建软件源 '%s' 的缓存"
@@ -691,12 +691,12 @@
msgid "Can't chroot to '%s' (%s)."
msgstr "无法 chroot 到 '%s' (%s)。"
-#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1219
+#: zypp/RepoManager.cc:1061 zypp/RepoManager.cc:1169 zypp/RepoManager.cc:1225
#, c-format, boost-format
msgid "Can't create %s"
msgstr "无法创建 %s"
-#: zypp/RepoManager.cc:1225
+#: zypp/RepoManager.cc:1231
#, c-format, boost-format
msgid "Can't create cache at %s - no writing permissions."
msgstr "无法在 %s 创建缓存 - 无写入权限。"
@@ -706,7 +706,7 @@
msgstr "无法创建元数据缓存文件夹。"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:1682 zypp/RepoManager.cc:1871
+#: zypp/RepoManager.cc:1688 zypp/RepoManager.cc:1885
#, c-format, boost-format
msgid "Can't delete '%s'"
msgstr "无法删除 '%s'"
@@ -717,11 +717,11 @@
msgid "Can't exec '%s' (%s)."
msgstr "无法执行 '%s' (%s)。"
-#: zypp/RepoManager.cc:1670 zypp/RepoManager.cc:1746
+#: zypp/RepoManager.cc:1676 zypp/RepoManager.cc:1752
msgid "Can't figure out where the repo is stored."
msgstr "找不到软件源存储位置。"
-#: zypp/RepoManager.cc:1859 zypp/RepoManager.cc:2235
+#: zypp/RepoManager.cc:1873 zypp/RepoManager.cc:2249
msgid "Can't figure out where the service is stored."
msgstr "找不到服务存储位置。"
@@ -739,8 +739,8 @@
msgstr "无法初始化递归的 mutex"
#. TranslatorExplanation '%s' is a filename
-#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1544 zypp/RepoManager.cc:1626
-#: zypp/RepoManager.cc:1700 zypp/RepoManager.cc:1765 zypp/RepoManager.cc:1883
+#: zypp/RepoManager.cc:651 zypp/RepoManager.cc:1550 zypp/RepoManager.cc:1632
+#: zypp/RepoManager.cc:1706 zypp/RepoManager.cc:1771 zypp/RepoManager.cc:1897
#, c-format, boost-format
msgid "Can't open file '%s' for writing."
msgstr "无法打开并写入 '%s' 文件。"
@@ -874,7 +874,7 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: zypp/target/rpm/RpmDb.cc:1849
+#: zypp/target/rpm/RpmDb.cc:1850
#, c-format, boost-format
msgid "Changed configuration files for %s:"
msgstr "%s 的有改动的配置文件:"
@@ -1307,9 +1307,9 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr "为 '%s' 设置下载 (curl) 选项时出错:"
-#: zypp/target/TargetImpl.cc:646 zypp/target/TargetImpl.cc:666
-#: zypp/target/TargetImpl.cc:694 zypp/target/TargetImpl.cc:731
-#: zypp/target/TargetImpl.cc:739
+#: zypp/target/TargetImpl.cc:643 zypp/target/TargetImpl.cc:663
+#: zypp/target/TargetImpl.cc:691 zypp/target/TargetImpl.cc:728
+#: zypp/target/TargetImpl.cc:736
msgid "Error sending update message notification."
msgstr "发送更新消息通知出错。"
@@ -1319,7 +1319,7 @@
#. on ftp file-not-found(bnc #335906). Instead we'll check another types
#. before throwing.
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1330 zypp/RepoManager.cc:2301
+#: zypp/RepoManager.cc:1336 zypp/RepoManager.cc:2315
#, c-format, boost-format
msgid "Error trying to read from '%s'"
msgstr "试图读取 '%s' 出错"
@@ -1359,7 +1359,7 @@
msgid "Ewondo"
msgstr "埃翁多语"
-#: zypp/RepoManager.cc:1289
+#: zypp/RepoManager.cc:1295
#, c-format, boost-format
msgid "Failed to cache repo (%d)."
msgstr "缓存软件源 (%d) 失败。"
@@ -1368,7 +1368,7 @@
msgid "Failed to delete key."
msgstr "删除密钥失败。"
-#: zypp/target/rpm/RpmDb.cc:1127
+#: zypp/target/rpm/RpmDb.cc:1128
#, c-format, boost-format
msgid "Failed to import public key from file %s: %s"
msgstr "从文件 %s 中导入公钥失败:%s"
@@ -1379,19 +1379,19 @@
msgstr "未能把 %s 挂载到 %s"
#. TranslatorExplanation %s = name of the package being processed.
-#: zypp/repo/PackageProvider.cc:385
+#: zypp/repo/PackageProvider.cc:386
#, c-format, boost-format
msgid "Failed to provide Package %s. Do you want to retry retrieval?"
msgstr "未能提供软件包 %s。您想要重试撷取吗?"
#. TranslatorExplanation '%s' is a pathname
-#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1417
+#: zypp/RepoManager.cc:235 zypp/RepoManager.cc:696 zypp/RepoManager.cc:1423
#: zypp/repo/PluginServices.cc:49
#, c-format, boost-format
msgid "Failed to read directory '%s'"
msgstr "读取文件夹 '%s' 失败"
-#: zypp/target/rpm/RpmDb.cc:1198
+#: zypp/target/rpm/RpmDb.cc:1199
#, c-format, boost-format
msgid "Failed to remove public key %s: %s"
msgstr "移除公钥 %s 失败:%s"
@@ -1601,7 +1601,7 @@
msgstr "文件 '%s' 未在介质 '%s' 上找到。"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2378
+#: zypp/target/rpm/RpmDb.cc:2379
msgid "File does not exist or signature can't be checked"
msgstr "文件不存在或无法检查其签名"
@@ -1625,8 +1625,7 @@
msgid "Finno-Ugrian (Other)"
msgstr "芬兰乌戈尔语 (其它)"
-#: zypp/solver/detail/ProblemSolutionCombi.cc:85
-#: zypp/solver/detail/ProblemSolutionCombi.cc:104
+#: zypp/ProblemSolution.cc:114
msgid "Following actions will be done:"
msgstr "将执行以下动作:"
@@ -1911,8 +1910,8 @@
msgid "Hausa"
msgstr "豪撒语"
-#: zypp/solver/detail/SATResolver.cc:1058
-#: zypp/solver/detail/SATResolver.cc:1062
+#: zypp/solver/detail/SATResolver.cc:1072
+#: zypp/solver/detail/SATResolver.cc:1076
msgid "Have you enabled all requested repositories?"
msgstr "您启用了全部请求的软件源了吗?"
@@ -2070,8 +2069,8 @@
msgid "Ingush"
msgstr "英古什语"
-#: zypp/target/TargetImpl.cc:1362 zypp/target/TargetImpl.cc:1431
-#: zypp/target/TargetImpl.cc:1760
+#: zypp/target/TargetImpl.cc:1372 zypp/target/TargetImpl.cc:1441
+#: zypp/target/TargetImpl.cc:1770
#: zypp/target/TargetImpl.commitFindFileConflicts.cc:166
msgid "Installation has been aborted as directed."
msgstr "安装已按指示中止。"
@@ -2157,7 +2156,7 @@
msgstr "无效的正则表达式 '%s':regcomp 返回 %d"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1612
+#: zypp/RepoManager.cc:1618
#, c-format, boost-format
msgid "Invalid repo file name at '%s'"
msgstr "无效的源文件名于 '%s'"
@@ -3031,7 +3030,7 @@
msgid "New Zealand"
msgstr "新西兰"
-#: zypp/target/TargetImpl.cc:790
+#: zypp/target/TargetImpl.cc:787
msgid "New update message"
msgstr "新更新消息"
@@ -3456,8 +3455,8 @@
#. TranslatorExplanation after semicolon is error message
#. TranslatorExplanation the colon is followed by an error message
-#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2044
-#: zypp/target/rpm/RpmDb.cc:2191
+#: zypp/target/rpm/RpmDb.cc:850 zypp/target/rpm/RpmDb.cc:2045
+#: zypp/target/rpm/RpmDb.cc:2192
msgid "RPM failed: "
msgstr "RPM 失败:"
@@ -3489,7 +3488,7 @@
msgid "Relative path not allowed if authority exists"
msgstr "若存在认证则不允许相对路径"
-#: zypp/RepoManager.cc:1651
+#: zypp/RepoManager.cc:1657
#, c-format, boost-format
msgid "Removing repository '%s'"
msgstr "正在移除软件源 '%s'"
@@ -3734,7 +3733,7 @@
msgstr "手语"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2372
+#: zypp/target/rpm/RpmDb.cc:2373
msgid "Signature does not verify"
msgstr "无法核实签名"
@@ -3744,21 +3743,21 @@
msgstr "未找到签名文件 %s"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2368
+#: zypp/target/rpm/RpmDb.cc:2369
msgid "Signature is OK"
msgstr "签名正确"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2374
+#: zypp/target/rpm/RpmDb.cc:2375
msgid "Signature is OK, but key is not trusted"
msgstr "签名正确,但密钥是非受信的"
-#: zypp/repo/PackageProvider.cc:215
+#: zypp/repo/PackageProvider.cc:216
msgid "Signature verification failed"
msgstr "签名校验失败"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2376
+#: zypp/target/rpm/RpmDb.cc:2377
msgid "Signatures public key is not available"
msgstr "签名公钥不可用"
@@ -4100,8 +4099,8 @@
msgid "This action is being run by another program already."
msgstr "此动作正在由另一个程序运行着。"
-#: zypp/solver/detail/SATResolver.cc:1280
-#: zypp/solver/detail/SATResolver.cc:1301
+#: zypp/solver/detail/SATResolver.cc:1294
+#: zypp/solver/detail/SATResolver.cc:1315
msgid "This request will break your system!"
msgstr "此请求将破坏您的系统!"
@@ -4313,7 +4312,7 @@
msgid "Undetermined"
msgstr "未确定的语种"
-#: zypp/RepoManager.cc:1300
+#: zypp/RepoManager.cc:1306
msgid "Unhandled repository type"
msgstr "未处理的软件源类型"
@@ -4342,7 +4341,7 @@
msgstr "未知国家或地区:"
#. TranslatorExplanation '%s' is an URL
-#: zypp/RepoManager.cc:1383 zypp/RepoManager.cc:2309
+#: zypp/RepoManager.cc:1389 zypp/RepoManager.cc:2323
#, c-format, boost-format
msgid "Unknown error reading from '%s'"
msgstr "读取 '%s' 遇到未知错误"
@@ -4374,7 +4373,7 @@
msgstr "未知支持选项。描述不可用"
#. translators: possible rpm package signature check result [brief]
-#: zypp/target/rpm/RpmDb.cc:2370
+#: zypp/target/rpm/RpmDb.cc:2371
msgid "Unknown type of signature"
msgstr "未知签名类型"
@@ -4481,7 +4480,7 @@
msgid "Virgin Islands, U.S."
msgstr "美属维尔京群岛"
-#: zypp/media/MediaCurl.cc:994
+#: zypp/media/MediaCurl.cc:1006
msgid ""
"Visit the Novell Customer Center to check whether your registration is valid "
"and has not expired."
@@ -4622,84 +4621,84 @@
msgid "Zuni"
msgstr "祖尼语"
-#: zypp/repo/PackageProvider.cc:514
+#: zypp/repo/PackageProvider.cc:515
msgid "applydeltarpm check failed."
msgstr "应用差异 RPM 检查失败。"
-#: zypp/repo/PackageProvider.cc:524
+#: zypp/repo/PackageProvider.cc:525
msgid "applydeltarpm failed."
msgstr "应用差异 RPM 失败。"
-#: zypp/solver/detail/SATResolver.cc:1388
+#: zypp/solver/detail/SATResolver.cc:1402
#, c-format, boost-format
msgid "architecture change of %s to %s"
msgstr "架构从 %s 变更到 %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:42
#, c-format, boost-format
msgid "break %s by ignoring some of its dependencies"
msgstr "通过忽略一些依赖关系来破坏 %s "
-#: zypp/solver/detail/SATResolver.cc:1082
+#: zypp/solver/detail/SATResolver.cc:1096
#, c-format, boost-format
msgid "cannot install both %s and %s"
msgstr "无法同时安装 %s 和 %s"
-#: zypp/solver/detail/SATResolver.cc:1051
+#: zypp/solver/detail/SATResolver.cc:1065
msgid "conflicting requests"
msgstr "冲突的请求"
-#: zypp/target/rpm/RpmDb.cc:2347
+#: zypp/target/rpm/RpmDb.cc:2348
#, c-format, boost-format
msgid "created backup %s"
msgstr "已创建备份 %s"
-#: zypp/solver/detail/SATResolver.cc:1417
+#: zypp/solver/detail/SATResolver.cc:1431
#, c-format, boost-format
msgid "deinstallation of %s"
msgstr "卸载 %s"
-#: zypp/solver/detail/SATResolver.cc:1135
+#: zypp/solver/detail/SATResolver.cc:1149
msgid "deleted providers: "
msgstr "删除的提供者:"
-#: zypp/solver/detail/SATResolver.cc:1308
+#: zypp/solver/detail/SATResolver.cc:1322
#, c-format, boost-format
msgid "do not ask to delete all solvables providing %s"
msgstr "不询问就删除全部提供 %s 的解析项"
-#: zypp/solver/detail/SATResolver.cc:1286
+#: zypp/solver/detail/SATResolver.cc:1300
#, c-format, boost-format
msgid "do not ask to install a solvable providing %s"
msgstr "不询问就安装一个提供 %s 的解析项"
-#: zypp/solver/detail/SATResolver.cc:1209
-#: zypp/solver/detail/SATResolver.cc:1245
+#: zypp/solver/detail/SATResolver.cc:1223
+#: zypp/solver/detail/SATResolver.cc:1259
#, c-format, boost-format
msgid "do not install %s"
msgstr "不安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1321
+#: zypp/solver/detail/SATResolver.cc:1335
#, c-format, boost-format
msgid "do not install most recent version of %s"
msgstr "不安装最新版本的 %s"
-#: zypp/solver/detail/SATResolver.cc:1381
+#: zypp/solver/detail/SATResolver.cc:1395
#, c-format, boost-format
msgid "downgrade of %s to %s"
msgstr "降级 %s 到 %s"
-#: zypp/solver/detail/ProblemSolutionIgnore.cc:61
-msgid "generally ignore of some dependecies"
+#: zypp/solver/detail/ProblemSolutionIgnore.cc:48
+msgid "generally ignore of some dependencies"
msgstr "通常忽略一些依赖关系"
-#: zypp/solver/detail/SATResolver.cc:1281
-#: zypp/solver/detail/SATResolver.cc:1302
+#: zypp/solver/detail/SATResolver.cc:1295
+#: zypp/solver/detail/SATResolver.cc:1316
msgid "ignore the warning of a broken system"
msgstr "忽略损坏系统的警告"
-#: zypp/solver/detail/SATResolver.cc:1397
+#: zypp/solver/detail/SATResolver.cc:1411
#, c-format, boost-format
msgid ""
"install %s (with vendor change)\n"
@@ -4708,17 +4707,17 @@
"安装 %s (包括厂商变更)\n"
" %s --> %s"
-#: zypp/solver/detail/SATResolver.cc:1347
+#: zypp/solver/detail/SATResolver.cc:1361
#, c-format, boost-format
msgid "install %s despite the inferior architecture"
msgstr "尽管架构不对应仍安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1361
+#: zypp/solver/detail/SATResolver.cc:1375
#, c-format, boost-format
msgid "install %s from excluded repository"
msgstr "从排除的软件源安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1097
+#: zypp/solver/detail/SATResolver.cc:1111
#, c-format, boost-format
msgid "installed %s obsoletes %s provided by %s"
msgstr "已安装的 %s 淘汰了 %s,后者由 %s 提供"
@@ -4727,18 +4726,18 @@
msgid "invalid"
msgstr "无效"
-#: zypp/solver/detail/SATResolver.cc:1224
-#: zypp/solver/detail/SATResolver.cc:1266
+#: zypp/solver/detail/SATResolver.cc:1238
+#: zypp/solver/detail/SATResolver.cc:1280
#, c-format, boost-format
msgid "keep %s"
msgstr "保留 %s"
-#: zypp/solver/detail/SATResolver.cc:1342
+#: zypp/solver/detail/SATResolver.cc:1356
#, c-format, boost-format
msgid "keep %s despite the inferior architecture"
msgstr "保留 %s,即使架构不对应"
-#: zypp/solver/detail/SATResolver.cc:1356
+#: zypp/solver/detail/SATResolver.cc:1370
#, c-format, boost-format
msgid "keep obsolete %s"
msgstr "保留已淘汰的 %s"
@@ -4751,49 +4750,49 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection:无法设置 dbus 连接"
-#: zypp/solver/detail/SATResolver.cc:1077
+#: zypp/solver/detail/SATResolver.cc:1091
#, c-format, boost-format
msgid "nothing provides %s needed by %s"
msgstr "没有什么能提供 %s,而它为 %s 所需"
-#: zypp/solver/detail/SATResolver.cc:1057
+#: zypp/solver/detail/SATResolver.cc:1071
#, c-format, boost-format
msgid "nothing provides requested %s"
msgstr "没有什么能提供所需的 %s"
-#: zypp/solver/detail/SATResolver.cc:1061
+#: zypp/solver/detail/SATResolver.cc:1075
#, c-format, boost-format
msgid "package %s does not exist"
msgstr "软件包 %s 不存在"
-#: zypp/solver/detail/SATResolver.cc:1048
+#: zypp/solver/detail/SATResolver.cc:1062
#, c-format, boost-format
msgid "problem with installed package %s"
msgstr "已安装的 %s 软件包有问题"
-#: zypp/solver/detail/SATResolver.cc:1229
+#: zypp/solver/detail/SATResolver.cc:1243
#, c-format, boost-format
msgid "remove lock to allow installation of %s"
msgstr "移除锁定以允许安装 %s"
-#: zypp/solver/detail/SATResolver.cc:1204
+#: zypp/solver/detail/SATResolver.cc:1218
#, c-format, boost-format
msgid "remove lock to allow removal of %s"
msgstr "移除锁定以允许移除 %s"
-#: zypp/solver/detail/SATResolver.cc:1406
+#: zypp/solver/detail/SATResolver.cc:1420
#, c-format, boost-format
msgid "replacement of %s with %s"
msgstr "将 %s 用 %s 取代"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2030
+#: zypp/target/rpm/RpmDb.cc:2031
#, c-format, boost-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm 已将 %s 创建为 %s,但是无法确定两者的差异"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2032
+#: zypp/target/rpm/RpmDb.cc:2033
#, c-format, boost-format
msgid ""
"rpm created %s as %s.\n"
@@ -4803,13 +4802,13 @@
"以下是前 25 行差异:\n"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2025
+#: zypp/target/rpm/RpmDb.cc:2026
#, c-format, boost-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm 已将 %s 另存为 %s,但是无法确定两者的差异"
#. %s = filenames
-#: zypp/target/rpm/RpmDb.cc:2027
+#: zypp/target/rpm/RpmDb.cc:2028
#, c-format, boost-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4818,16 +4817,16 @@
"rpm 已将 %s 另存为 %s。\n"
"以下是前 25 行差异:\n"
-#: zypp/solver/detail/SATResolver.cc:1101
+#: zypp/solver/detail/SATResolver.cc:1115
#, c-format, boost-format
msgid "solvable %s conflicts with %s provided by itself"
msgstr "可解析项 %s 与自身提供的 %s 冲突"
-#: zypp/solver/detail/SATResolver.cc:1054
+#: zypp/solver/detail/SATResolver.cc:1068
msgid "some dependency problem"
msgstr "一些依赖性问题"
-#: zypp/solver/detail/SATResolver.cc:1147
+#: zypp/solver/detail/SATResolver.cc:1161
msgid "uninstallable providers: "
msgstr "不可安装的提供者:"
@@ -4839,7 +4838,7 @@
msgid "unsupported"
msgstr "不支持"
-#: zypp/solver/detail/SATResolver.cc:1065
+#: zypp/solver/detail/SATResolver.cc:1079
msgid "unsupported request"
msgstr "不支持的请求"
Modified: trunk/lcn/zh_CN/po/zypper.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/zypper.zh_CN.po 2015-10-27 11:10:33 UTC (rev 94010)
+++ trunk/lcn/zh_CN/po/zypper.zh_CN.po 2015-10-27 12:52:19 UTC (rev 94011)
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-04 01:13+0200\n"
-"PO-Revision-Date: 2015-06-08 22:37+0800\n"
+"POT-Creation-Date: 2015-10-08 01:15+0200\n"
+"PO-Revision-Date: 2015-10-27 20:44+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
"Language: zh_TW\n"
@@ -22,133 +22,129 @@
"X-Generator: Lokalize 2.0\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/info.cc:84
+#: src/info.cc:122
msgid "Name: "
msgstr "名称:"
-#: src/info.cc:85
+#: src/info.cc:123
msgid "Version: "
msgstr "版本:"
-#: src/info.cc:86
+#: src/info.cc:124
msgid "Arch: "
msgstr "架构:"
-#: src/info.cc:87
+#: src/info.cc:125
msgid "Vendor: "
msgstr "厂商:"
-#: src/info.cc:92
+#: src/info.cc:130
msgid "Summary: "
msgstr "摘要:"
-#: src/info.cc:93
+#: src/info.cc:131
msgid "Description: "
msgstr "描述:"
#. TranslatorExplanation E.g. "package 'zypper' not found."
-#. ! \todo use a separate string for each kind so that it is translatable.
-#: src/info.cc:127
+#: src/info.cc:175
#, c-format, boost-format
msgid "%s '%s' not found."
msgstr "%s '%s' 未找到。"
-#: src/info.cc:141
+#: src/info.cc:197
#, c-format, boost-format
msgid "Information for %s %s:"
msgstr "%s %s 的信息:"
-#: src/info.cc:160
+#. TranslatorExplanation %s = resolvable type (package, patch, pattern, etc - untranslated).
+#: src/info.cc:213
#, c-format, boost-format
msgid "Info for type '%s' not implemented."
msgstr "类型为 '%s' 的信息尚未实现。"
-#: src/info.cc:201 src/info.cc:344 src/info.cc:423
+#: src/info.cc:254 src/info.cc:391 src/info.cc:463
msgid "Repository: "
msgstr "软件源:"
-#: src/info.cc:210
+#: src/info.cc:262
msgid "Support Level: "
msgstr "支持级别: "
-#: src/info.cc:213 src/info.cc:349
+#: src/info.cc:265 src/info.cc:395
msgid "Installed: "
msgstr "已安装: "
#. autorefresh?
#. is base
-#: src/info.cc:213 src/info.cc:276 src/info.cc:282 src/info.cc:290
-#: src/info.cc:349 src/info.cc:350 src/info.cc:445 src/info.cc:447
-#: src/Table.h:264 src/repos.cc:89 src/repos.cc:117 src/repos.cc:2534
-#: src/solve-commit.cc:260 src/search.cc:660 src/output/Out.h:34
+#: src/info.cc:265 src/info.cc:326 src/info.cc:328 src/info.cc:336
+#: src/info.cc:395 src/info.cc:396 src/info.cc:484 src/info.cc:486
+#: src/Table.h:282 src/repos.cc:89 src/repos.cc:117 src/repos.cc:2481
+#: src/solve-commit.cc:263 src/search.cc:636 src/output/Out.h:35
msgid "Yes"
msgstr "是"
-#: src/info.cc:213 src/info.cc:276 src/info.cc:282 src/info.cc:290
-#: src/info.cc:349 src/info.cc:350 src/info.cc:445 src/info.cc:447
-#: src/Table.h:264 src/repos.cc:95 src/repos.cc:123 src/repos.cc:2534
-#: src/solve-commit.cc:260 src/search.cc:660 src/output/Out.h:34
+#: src/info.cc:265 src/info.cc:326 src/info.cc:328 src/info.cc:336
+#: src/info.cc:395 src/info.cc:396 src/info.cc:484 src/info.cc:486
+#: src/Table.h:282 src/repos.cc:95 src/repos.cc:123 src/repos.cc:2481
+#: src/solve-commit.cc:263 src/search.cc:636 src/output/Out.h:35
msgid "No"
msgstr "否"
-#: src/info.cc:215 src/info.cc:270
+#: src/info.cc:267 src/info.cc:320
msgid "Status: "
msgstr "状态: "
-#: src/info.cc:220
+#: src/info.cc:272
#, c-format, boost-format
msgid "out-of-date (version %s installed)"
msgstr "过时 (已安装版本 %s)"
-#: src/info.cc:226
+#: src/info.cc:276
msgid "up-to-date"
msgstr "最新"
-#: src/info.cc:230
+#: src/info.cc:280
msgid "not installed"
msgstr "未安装"
-#: src/info.cc:232
+#: src/info.cc:282
msgid "Installed Size: "
msgstr "已安装大小:"
-#: src/info.cc:273
+#: src/info.cc:323
msgid "Category: "
msgstr "分类: "
-#: src/info.cc:274
+#: src/info.cc:324
msgid "Severity: "
msgstr "严重性:"
-#: src/info.cc:275
+#: src/info.cc:325
msgid "Created On: "
msgstr "创建于: "
-#: src/info.cc:276
+#: src/info.cc:326
msgid "Reboot Required: "
msgstr "需要重启: "
-#: src/info.cc:279
+#: src/info.cc:327
msgid "Package Manager Restart Required"
msgstr "需要重启软件包管理器"
-#: src/info.cc:281
-msgid "Restart Required: "
-msgstr "需要重启:"
-
-#: src/info.cc:290
+#: src/info.cc:336
msgid "Interactive: "
msgstr "交互的:"
-#: src/info.cc:313 src/search.cc:403
+#: src/info.cc:359 src/search.cc:389
msgid "Recommended"
msgstr "推荐"
-#: src/info.cc:315 src/search.cc:405
+#: src/info.cc:361 src/search.cc:391
msgid "Suggested"
msgstr "建议"
-#: src/info.cc:350
+#: src/info.cc:396
msgid "Visible to User: "
msgstr "对用户可见:"
@@ -159,87 +155,194 @@
#. adapting OutXML::searchResult !
#.
#. translators: S for installed Status
-#: src/info.cc:364 src/update.cc:494 src/search.cc:51 src/search.cc:67
-#: src/search.cc:251 src/search.cc:463 src/search.cc:600 src/search.cc:672
+#: src/info.cc:407 src/update.cc:541 src/search.cc:69 src/search.cc:237
+#: src/search.cc:449 src/search.cc:585 src/search.cc:647
msgid "S"
msgstr "S"
#. translators: name (general header)
-#: src/info.cc:364 src/repos.cc:935 src/repos.cc:1023 src/repos.cc:1163
-#: src/repos.cc:2595 src/update.cc:262 src/update.cc:502 src/update.cc:688
-#: src/Zypper.cc:5162 src/search.cc:57 src/search.cc:69 src/search.cc:252
-#: src/search.cc:345 src/search.cc:464 src/search.cc:606 src/search.cc:678
-#: src/locks.cc:40
+#: src/info.cc:407 src/repos.cc:981 src/repos.cc:1121 src/repos.cc:2542
+#: src/update.cc:314 src/update.cc:546 src/update.cc:681 src/Zypper.cc:5287
+#: src/search.cc:71 src/search.cc:238 src/search.cc:331 src/search.cc:450
+#: src/search.cc:587 src/search.cc:652 src/locks.cc:102
msgid "Name"
msgstr "名称"
#. translators: type (general header)
-#: src/info.cc:364 src/repos.cc:935 src/repos.cc:1063 src/repos.cc:1174
-#: src/repos.cc:2604 src/search.cc:71 src/search.cc:255 src/locks.cc:44
+#: src/info.cc:407 src/repos.cc:1021 src/repos.cc:1132 src/repos.cc:2551
+#: src/search.cc:73 src/search.cc:241 src/locks.cc:105
msgid "Type"
msgstr "类型"
-#: src/info.cc:364 src/search.cc:466
+#: src/info.cc:407 src/search.cc:453
msgid "Dependency"
msgstr "依赖关系"
-#: src/info.cc:382
+#: src/info.cc:422
msgid "Contents"
msgstr "内容"
-#: src/info.cc:384
+#: src/info.cc:424
msgid "(empty)"
msgstr "(空)"
-#: src/info.cc:438
+#: src/info.cc:477
msgid "Flavor"
msgstr "参数"
-#: src/info.cc:443
+#: src/info.cc:482
msgid "Short Name"
msgstr "短名称"
#. translators: used as 'tag:' (i.e. followed by ':')
-#: src/info.cc:445 src/Summary.cc:1217 src/utils/misc.cc:142
+#: src/info.cc:484 src/Summary.cc:1222 src/utils/misc.cc:142
msgid "Installed"
msgstr "已安装 "
-#: src/info.cc:447 src/search.cc:686
+#: src/info.cc:486 src/search.cc:655
msgid "Is Base"
msgstr "是基础"
-#: src/info.cc:451
+#: src/info.cc:490
msgid "End of Support"
msgstr "支持终止"
-#: src/info.cc:451 src/info.cc:459 src/info.cc:490
+#: src/info.cc:490 src/info.cc:498 src/info.cc:529
msgid "undefined"
msgstr "未定义"
-#: src/info.cc:454
+#: src/info.cc:493
msgid "CPE Name"
msgstr "CPE 名称"
-#: src/info.cc:461
+#: src/info.cc:500
msgid "invalid CPE Name"
msgstr "无效的 CPE 名称"
-#: src/info.cc:464
+#: src/info.cc:503
msgid "Update Repositories"
msgstr "更新软件源"
-#: src/info.cc:472
+#: src/info.cc:511
msgid "Content Id"
msgstr "内容 ID"
-#: src/info.cc:479
+#: src/info.cc:518
msgid "Provided by enabled repository"
msgstr "由已启用的软件源提供"
-#: src/info.cc:485
+#: src/info.cc:524
msgid "Not provided by any enabled repository"
msgstr "任何已启用的软件源都没有提供它"
+#: src/subcommand.cc:52
+msgid "none"
+msgstr "无"
+
+#: src/subcommand.cc:276
+#, boost-format
+msgid "cannot exec %1% (%2%)"
+msgstr "无法执行 %1% (%2%)"
+
+#. translators: %1% - command name or path
+#. translators: %2% - system error message
+#: src/subcommand.cc:285
+#, boost-format
+msgid "fork for %1% failed (%2%)"
+msgstr "%1% fork 失败 (%2%)"
+
+#. translators: %1% - command name or path
+#. translators: %2% - system error message
+#: src/subcommand.cc:304
+#, boost-format
+msgid "waitpid for %1% failed (%2%)"
+msgstr "%1% waitpid 失败 (%2%)"
+
+#. translators: %1% - command name or path
+#. translators: %2% - returned PID (number)
+#. translators: %3% - expected PID (number)
+#: src/subcommand.cc:314
+#, boost-format
+msgid "waitpid for %1% returns unexpected pid %2% while waiting for %3%"
+msgstr "%1% waitpid 返回了非预期的 PID %2% 而等待的是 %3%"
+
+#. translators: %1% - command name or path
+#. translators: %2% - signal number
+#. translators: %3% - signal name
+#: src/subcommand.cc:325
+#, boost-format
+msgid "%1% was killed by signal %2% (%3%)"
+msgstr "%1% 被 %2% 信号杀死了 (%3%)"
+
+#: src/subcommand.cc:329
+msgid "core dumped"
+msgstr "核心已转储"
+
+#. translators: %1% - command name or path
+#. translators: %2% - exit code (number)
+#: src/subcommand.cc:339
+#, boost-format
+msgid "%1% exited with status %2%"
+msgstr "%1% 退出,状态为 %2%"
+
+#. translators: %1% - command name or path
+#. translators: %2% - status (number)
+#: src/subcommand.cc:354
+#, boost-format
+msgid "waitpid for %1% returns unexpected exit status %2%"
+msgstr "%1% waitpid 返回了非预期的退出状态 %2%"
+
+#: src/subcommand.cc:387
+#, boost-format
+msgid ""
+"Zypper subcommands are standalone executables that live in the\n"
+"zypper_execdir ('%1%').\n"
+"\n"
+"For subcommands zypper provides a wrapper that knows where the\n"
+"subcommands live, and runs them by passing command-line arguments\n"
+"to them.\n"
+"\n"
+"If a subcommand is not found in the zypper_execdir, the wrapper\n"
+"will look in the rest of your $PATH for it. Thus, it's possible\n"
+"to write local zypper extensions that don't live in system space.\n"
+msgstr ""
+"Zypper 子命令是位于 zypper_execdir ('%1%') 中的标准可执行文件。\n"
+"\n"
+"针对子命令,zypper 提供了一个封装,该封装知道子命令的位置,并通过传递命令行参数给它们来运行它们。\n"
+"\n"
+"若子命令未在 zypper_execdir 中找到,封装将在您 $PATH 中的其它位置查找它。因此,您可以编写不在系统命名空间下的本地 zypper "
+"扩展。\n"
+
+#: src/subcommand.cc:402
+#, boost-format
+msgid ""
+"Using zypper global-options together with subcommands, as well as\n"
+"executing subcommands in '%1%' is currently not supported.\n"
+msgstr "目前,与子命令一起使用 zypper 全局选项,以及在 '%1%' 中执行子命令都是不支持的。\n"
+
+#. translators: headline of an enumeration; %1% is a directory name
+#: src/subcommand.cc:419
+#, boost-format
+msgid "Available zypper subcommands in '%1%'"
+msgstr "'%1%' 中可用的 zypper 子命令"
+
+#. translators: headline of an enumeration
+#: src/subcommand.cc:424
+msgid "Zypper subcommands available from elsewhere on your $PATH"
+msgstr "来自您 $PATH 中其它位置的可用 zypper 子命令"
+
+#. translators: helptext; %1% is a zypper command
+#: src/subcommand.cc:429
+#, boost-format
+msgid "Type '%1%' to get subcommand-specific help if available."
+msgstr "输入 '%1%' 来获取可用的特定子命令帮助。"
+
+#. translators: %1% - command name
+#: src/subcommand.cc:452
+#, boost-format
+msgid "Manual entry for %1% can't be shown"
+msgstr "%1% 的手册项不可显示"
+
#: src/RequestFeedback.cc:36
#, c-format, boost-format
msgid "'%s' not found in package names. Trying capabilities."
@@ -265,7 +368,7 @@
msgid "Pattern '%s' not found."
msgstr "未找到软件集 '%s'。"
-#: src/RequestFeedback.cc:51 src/misc.cc:341
+#: src/RequestFeedback.cc:51 src/misc.cc:338
#, c-format, boost-format
msgid "Source package '%s' not found."
msgstr "未找到源代码包 '%s'。"
@@ -424,550 +527,86 @@
#: src/RequestFeedback.cc:226
#, c-format, boost-format
+msgid "Patch '%s' has not the specified severity."
+msgstr "补丁 '%s' 没有指定的严重性。"
+
+#: src/RequestFeedback.cc:234
+#, c-format, boost-format
msgid "Patch '%s' was issued after the specified date."
msgstr "补丁 '%s' 是在指定的日期之后发布的。"
-#: src/RequestFeedback.cc:232
+#: src/RequestFeedback.cc:240
#, c-format, boost-format
msgid "Selecting '%s' from repository '%s' for installation."
msgstr "正在选择安装 '%s',来自软件源 '%s'。"
-#: src/RequestFeedback.cc:238
+#: src/RequestFeedback.cc:246
#, c-format, boost-format
msgid "Forcing installation of '%s' from repository '%s'."
msgstr "正在强制安装 '%s',来自软件源 '%s'。"
-#: src/RequestFeedback.cc:243
+#: src/RequestFeedback.cc:251
#, c-format, boost-format
msgid "Selecting '%s' for removal."
msgstr "正在选择删除 '%s'。"
-#: src/RequestFeedback.cc:251
+#: src/RequestFeedback.cc:259
#, c-format, boost-format
msgid "'%s' is locked. Use '%s' to unlock it."
msgstr "'%s' 被锁定。请使用 '%s' 解锁它。"
-#: src/RequestFeedback.cc:256
+#: src/RequestFeedback.cc:264
#, c-format, boost-format
msgid "Adding requirement: '%s'."
msgstr "正在添加依赖:'%s'。"
-#: src/RequestFeedback.cc:259
+#: src/RequestFeedback.cc:267
#, c-format, boost-format
msgid "Adding conflict: '%s'."
msgstr "正在添加冲突:'%s'。"
-#: src/Summary.cc:511
-#, c-format, boost-format
-msgid "The following NEW package is going to be installed:"
-msgid_plural "The following %d NEW packages are going to be installed:"
-msgstr[0] "将安装以下 %d 个新软件包:"
-
-#: src/Summary.cc:516
-#, c-format, boost-format
-msgid "The following NEW patch is going to be installed:"
-msgid_plural "The following %d NEW patches are going to be installed:"
-msgstr[0] "将安装以下 %d 个新补丁:"
-
-#: src/Summary.cc:521
-#, c-format, boost-format
-msgid "The following NEW pattern is going to be installed:"
-msgid_plural "The following %d NEW patterns are going to be installed:"
-msgstr[0] "将安装以下 %d 个新软件集:"
-
-#: src/Summary.cc:526
-#, c-format, boost-format
-msgid "The following NEW product is going to be installed:"
-msgid_plural "The following %d NEW products are going to be installed:"
-msgstr[0] "将安装以下 %d 个新产品:"
-
-#: src/Summary.cc:531
-#, c-format, boost-format
-msgid "The following source package is going to be installed:"
-msgid_plural "The following %d source packages are going to be installed:"
-msgstr[0] "将安装以下 %d 个源代码包:"
-
-#: src/Summary.cc:536
-#, c-format, boost-format
-msgid "The following application is going to be installed:"
-msgid_plural "The following %d applications are going to be installed:"
-msgstr[0] "将安装以下 %d 个应用程序:"
-
-#: src/Summary.cc:557
-#, c-format, boost-format
-msgid "The following package is going to be REMOVED:"
-msgid_plural "The following %d packages are going to be REMOVED:"
-msgstr[0] "将移除以下 %d 个软件包:"
-
-#: src/Summary.cc:562
-#, c-format, boost-format
-msgid "The following patch is going to be REMOVED:"
-msgid_plural "The following %d patches are going to be REMOVED:"
-msgstr[0] "将移除以下 %d 个补丁:"
-
-#: src/Summary.cc:567
-#, c-format, boost-format
-msgid "The following pattern is going to be REMOVED:"
-msgid_plural "The following %d patterns are going to be REMOVED:"
-msgstr[0] "将移除以下 %d 个软件集:"
-
-#: src/Summary.cc:572
-#, c-format, boost-format
-msgid "The following product is going to be REMOVED:"
-msgid_plural "The following %d products are going to be REMOVED:"
-msgstr[0] "将移除以下 %d 个产品:"
-
-#: src/Summary.cc:577
-#, c-format, boost-format
-msgid "The following application is going to be REMOVED:"
-msgid_plural "The following %d applications are going to be REMOVED:"
-msgstr[0] "将移除以下 %d 个应用程序:"
-
-#: src/Summary.cc:596
-#, c-format, boost-format
-msgid "The following package is going to be upgraded:"
-msgid_plural "The following %d packages are going to be upgraded:"
-msgstr[0] "将升级以下 %d 个软件包:"
-
-#: src/Summary.cc:601
-#, c-format, boost-format
-msgid "The following patch is going to be upgraded:"
-msgid_plural "The following %d patches are going to be upgraded:"
-msgstr[0] "将升级以下 %d 个补丁:"
-
-#: src/Summary.cc:606
-#, c-format, boost-format
-msgid "The following pattern is going to be upgraded:"
-msgid_plural "The following %d patterns are going to be upgraded:"
-msgstr[0] "将升级以下 %d 个软件集:"
-
-#: src/Summary.cc:611
-#, c-format, boost-format
-msgid "The following product is going to be upgraded:"
-msgid_plural "The following %d products are going to be upgraded:"
-msgstr[0] "将升级以下 %d 个产品:"
-
-#: src/Summary.cc:616
-#, c-format, boost-format
-msgid "The following application is going to be upgraded:"
-msgid_plural "The following %d applications are going to be upgraded:"
-msgstr[0] "将升级以下 %d 个应用程序:"
-
-#: src/Summary.cc:635
-#, c-format, boost-format
-msgid "The following package is going to be downgraded:"
-msgid_plural "The following %d packages are going to be downgraded:"
-msgstr[0] "将降级以下 %d 个软件包:"
-
-#: src/Summary.cc:640
-#, c-format, boost-format
-msgid "The following patch is going to be downgraded:"
-msgid_plural "The following %d patches are going to be downgraded:"
-msgstr[0] "将降级以下 %d 个补丁:"
-
-#: src/Summary.cc:645
-#, c-format, boost-format
-msgid "The following pattern is going to be downgraded:"
-msgid_plural "The following %d patterns are going to be downgraded:"
-msgstr[0] "将降级以下 %d 个软件集:"
-
-#: src/Summary.cc:650
-#, c-format, boost-format
-msgid "The following product is going to be downgraded:"
-msgid_plural "The following %d products are going to be downgraded:"
-msgstr[0] "将降级以下 %d 个产品:"
-
-#: src/Summary.cc:655
-#, c-format, boost-format
-msgid "The following application is going to be downgraded:"
-msgid_plural "The following %d applications are going to be downgraded:"
-msgstr[0] "将降级以下 %d 个应用程序:"
-
-#: src/Summary.cc:674
-#, c-format, boost-format
-msgid "The following package is going to be reinstalled:"
-msgid_plural "The following %d packages are going to be reinstalled:"
-msgstr[0] "将重装以下 %d 个软件包:"
-
-#: src/Summary.cc:679
-#, c-format, boost-format
-msgid "The following patch is going to be reinstalled:"
-msgid_plural "The following %d patches are going to be reinstalled:"
-msgstr[0] "将重装以下 %d 个补丁:"
-
-#: src/Summary.cc:684
-#, c-format, boost-format
-msgid "The following pattern is going to be reinstalled:"
-msgid_plural "The following %d patterns are going to be reinstalled:"
-msgstr[0] "将重装以下 %d 个软件集:"
-
-#: src/Summary.cc:689
-#, c-format, boost-format
-msgid "The following product is going to be reinstalled:"
-msgid_plural "The following %d products are going to be reinstalled:"
-msgstr[0] "将重装以下 %d 个产品:"
-
-#: src/Summary.cc:701
-#, c-format, boost-format
-msgid "The following application is going to be reinstalled:"
-msgid_plural "The following %d applications are going to be reinstalled:"
-msgstr[0] "将重装以下 %d 个应用程序:"
-
-#: src/Summary.cc:843
-#, c-format, boost-format
-msgid "The following recommended package was automatically selected:"
-msgid_plural ""
-"The following %d recommended packages were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐软件包:"
-
-#: src/Summary.cc:848
-#, c-format, boost-format
-msgid "The following recommended patch was automatically selected:"
-msgid_plural ""
-"The following %d recommended patches were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐补丁:"
-
-#: src/Summary.cc:853
-#, c-format, boost-format
-msgid "The following recommended pattern was automatically selected:"
-msgid_plural ""
-"The following %d recommended patterns were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐软件集:"
-
-#: src/Summary.cc:858
-#, c-format, boost-format
-msgid "The following recommended product was automatically selected:"
-msgid_plural ""
-"The following %d recommended products were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐产品:"
-
-#: src/Summary.cc:863
-#, c-format, boost-format
-msgid "The following recommended source package was automatically selected:"
-msgid_plural ""
-"The following %d recommended source packages were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐源代码包:"
-
-#: src/Summary.cc:868
-#, c-format, boost-format
-msgid "The following recommended application was automatically selected:"
-msgid_plural ""
-"The following %d recommended applications were automatically selected:"
-msgstr[0] "自动选中了以下 %d 个推荐的应用程序:"
-
-#: src/Summary.cc:912
-#, c-format, boost-format
-msgid ""
-"The following package is recommended, but will not be installed (only "
-"required packages will be installed):"
-msgid_plural ""
-"The following %d packages are recommended, but will not be installed (only "
-"required packages will be installed):"
-msgstr[0] "推荐以下 %d 个软件包,但不会安装 (仅会安装依赖的软件包):"
-
-#: src/Summary.cc:924
-#, c-format, boost-format
-msgid ""
-"The following package is recommended, but will not be installed because it's "
-"unwanted (was manually removed before):"
-msgid_plural ""
-"The following %d packages are recommended, but will not be installed because "
-"they are unwanted (were manually removed before):"
-msgstr[0] "推荐以下 %d 个软件包,但不会安装,因为它们是不需要的 (曾经手动移除过):"
-
-#: src/Summary.cc:934
-#, c-format, boost-format
-msgid ""
-"The following package is recommended, but will not be installed due to "
-"conflicts or dependency issues:"
-msgid_plural ""
-"The following %d packages are recommended, but will not be installed due to "
-"conflicts or dependency issues:"
-msgstr[0] "推荐以下 %d 个软件包,但由于冲突或依赖问题不会安装:"
-
-#: src/Summary.cc:947
-#, c-format, boost-format
-msgid "The following patch is recommended, but will not be installed:"
-msgid_plural ""
-"The following %d patches are recommended, but will not be installed:"
-msgstr[0] "推荐以下 %d 个补丁,但不会安装:"
-
-#: src/Summary.cc:951
-#, c-format, boost-format
-msgid "The following pattern is recommended, but will not be installed:"
-msgid_plural ""
-"The following %d patterns are recommended, but will not be installed:"
-msgstr[0] "推荐以下 %d 个软件集,但不会安装:"
-
-#: src/Summary.cc:955
-#, c-format, boost-format
-msgid "The following product is recommended, but will not be installed:"
-msgid_plural ""
-"The following %d products are recommended, but will not be installed:"
-msgstr[0] "推荐以下 %d 个产品,但不会安装:"
-
-#: src/Summary.cc:959
-#, c-format, boost-format
-msgid "The following application is recommended, but will not be installed:"
-msgid_plural ""
-"The following %d applications are recommended, but will not be installed:"
-msgstr[0] "推荐以下 %d 个应用程序,但不会安装:"
-
-#: src/Summary.cc:999
-#, c-format, boost-format
-msgid "The following package is suggested, but will not be installed:"
-msgid_plural ""
-"The following %d packages are suggested, but will not be installed:"
-msgstr[0] "建议以下 %d 个软件包,但不会安装:"
-
-#: src/Summary.cc:1004
-#, c-format, boost-format
-msgid "The following patch is suggested, but will not be installed:"
-msgid_plural ""
-"The following %d patches are suggested, but will not be installed:"
-msgstr[0] "建议以下 %d 个补丁,但不会安装:"
-
-#: src/Summary.cc:1009
-#, c-format, boost-format
-msgid "The following pattern is suggested, but will not be installed:"
-msgid_plural ""
-"The following %d patterns are suggested, but will not be installed:"
-msgstr[0] "建议以下 %d 个软件集,但不会安装:"
-
-#: src/Summary.cc:1014
-#, c-format, boost-format
-msgid "The following product is suggested, but will not be installed:"
-msgid_plural ""
-"The following %d products are suggested, but will not be installed:"
-msgstr[0] "建议以下 %d 个产品,但不会安装:"
-
-#: src/Summary.cc:1019
-#, c-format, boost-format
-msgid "The following application is suggested, but will not be installed:"
-msgid_plural ""
-"The following %d applications are suggested, but will not be installed:"
-msgstr[0] "建议以下 %d 个应用程序,但不会安装:"
-
-#: src/Summary.cc:1040
-#, c-format, boost-format
-msgid "The following package is going to change architecture:"
-msgid_plural "The following %d packages are going to change architecture:"
-msgstr[0] "将改变以下 %d 个软件包的架构:"
-
-#: src/Summary.cc:1045
-#, c-format, boost-format
-msgid "The following patch is going to change architecture:"
-msgid_plural "The following %d patches are going to change architecture:"
-msgstr[0] "将改变以下 %d 个补丁的架构:"
-
-#: src/Summary.cc:1050
-#, c-format, boost-format
-msgid "The following pattern is going to change architecture:"
-msgid_plural "The following %d patterns are going to change architecture:"
-msgstr[0] "将改变以下 %d 个软件集的架构:"
-
-#: src/Summary.cc:1055
-#, c-format, boost-format
-msgid "The following product is going to change architecture:"
-msgid_plural "The following %d products are going to change architecture:"
-msgstr[0] "将改变以下 %d 个产品的架构:"
-
-#: src/Summary.cc:1060
-#, c-format, boost-format
-msgid "The following application is going to change architecture:"
-msgid_plural "The following %d applications are going to change architecture:"
-msgstr[0] "将改变以下 %d 个应用程序的架构:"
-
-#: src/Summary.cc:1081
-#, c-format, boost-format
-msgid "The following package is going to change vendor:"
-msgid_plural "The following %d packages are going to change vendor:"
-msgstr[0] "将改变以下 %d 个软件包的厂商:"
-
-#: src/Summary.cc:1086
-#, c-format, boost-format
-msgid "The following patch is going to change vendor:"
-msgid_plural "The following %d patches are going to change vendor:"
-msgstr[0] "将改变以下 %d 个补丁的厂商:"
-
-#: src/Summary.cc:1091
-#, c-format, boost-format
-msgid "The following pattern is going to change vendor:"
-msgid_plural "The following %d patterns are going to change vendor:"
-msgstr[0] "将改变以下 %d 个软件集的厂商:"
-
-#: src/Summary.cc:1096
-#, c-format, boost-format
-msgid "The following product is going to change vendor:"
-msgid_plural "The following %d products are going to change vendor:"
-msgstr[0] "将改变以下 %d 个产品的厂商:"
-
-#: src/Summary.cc:1101
-#, c-format, boost-format
-msgid "The following application is going to change vendor:"
-msgid_plural "The following %d applications are going to change vendor:"
-msgstr[0] "将改变以下 %d 个应用程序的厂商:"
-
-#: src/Summary.cc:1121
-#, c-format, boost-format
-msgid "The following package is not supported by its vendor:"
-msgid_plural "The following %d packages are not supported by their vendor:"
-msgstr[0] "以下 %d 个软件包不被其厂商支持:"
-
-#: src/Summary.cc:1141
-#, c-format, boost-format
-msgid ""
-"The following package needs additional customer contract to get support:"
-msgid_plural ""
-"The following %d packages need additional customer contract to get support:"
-msgstr[0] "以下 %d 个软件包需要额外的客户合同以获取支持:"
-
-#: src/Summary.cc:1159
-#, c-format, boost-format
-msgid "The following package update will NOT be installed:"
-msgid_plural "The following %d package updates will NOT be installed:"
-msgstr[0] "将不会安装以下 %d 个软件包的更新:"
-
-#: src/Summary.cc:1164
-#, c-format, boost-format
-msgid "The following product update will NOT be installed:"
-msgid_plural "The following %d product updates will NOT be installed:"
-msgstr[0] "将不会安装以下 %d 个产品的更新:"
-
-#: src/Summary.cc:1169
-#, c-format, boost-format
-msgid "The following application update will NOT be installed:"
-msgid_plural "The following %d application updates will NOT be installed:"
-msgstr[0] "将不会安装以下 %d 个应用程序的更新:"
-
-#: src/Summary.cc:1199
-#, c-format, boost-format
-msgid "The following item is locked and will not be changed by any action:"
-msgid_plural ""
-"The following %d items are locked and will not be changed by any action:"
-msgstr[0] "以下 %d 个项已被锁定并不会被任何操作改动:"
-
#. always as plain name list
#. translators: used as 'tag:' (i.e. followed by ':')
-#: src/Summary.cc:1211
+#: src/Summary.cc:1213
msgid "Available"
msgstr "可用版本"
-#: src/Summary.cc:1233
+#. withKind
+#. translators: %1% is a zypper command line
+#: src/Summary.cc:1217 src/Summary.cc:1227
#, boost-format
-msgid "Overall download size: %1%. Already cached: %2% "
-msgstr "总下载大小:%1%。已缓存:%2%"
+msgid "Run '%1%' to see the complete list of locked items."
+msgstr "请运行 '%1%' 来查看锁定项的完整列表。"
-#: src/Summary.cc:1236
+#: src/Summary.cc:1255
+#, boost-format
+msgid "Overall download size: %1%. Already cached: %2%."
+msgstr "总下载大小:%1%。已缓存:%2%。"
+
+#: src/Summary.cc:1258
msgid "Download only."
msgstr "仅下载而不安装。"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: src/Summary.cc:1242
+#: src/Summary.cc:1264
#, c-format, boost-format
msgid "After the operation, additional %s will be used."
msgstr "操作完成后,将占用额外的 %s 空间。"
-#: src/Summary.cc:1245
+#: src/Summary.cc:1267
msgid "No additional space will be used or freed after the operation."
msgstr "操作完成后,将不会占用或释放额外的空间。"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: src/Summary.cc:1252
+#: src/Summary.cc:1274
#, c-format, boost-format
msgid "After the operation, %s will be freed."
msgstr "操作完成后,将释放 %s 空间。"
-#. translators: this text will be preceded by a number e.g. "5 packages to ..."
-#: src/Summary.cc:1275
-msgid "package to upgrade"
-msgid_plural "packages to upgrade"
-msgstr[0] "个软件包待升级"
+#: src/Summary.cc:1443
+msgid "System reboot required."
+msgstr "需要重启。"
-#. translators: this text will be preceded by a number e.g. "5 to ..."
-#: src/Summary.cc:1286
-msgid "to downgrade"
-msgid_plural "to downgrade"
-msgstr[0] "个软件包待降级"
-
-#. translators: this text will be preceded by a number e.g. "5 packages to ..."
-#: src/Summary.cc:1289
-msgid "package to downgrade"
-msgid_plural "packages to downgrade"
-msgstr[0] "个软件包待降级"
-
-#. translators: this text will be preceded by a number e.g. "5 new"
-#: src/Summary.cc:1300
-msgid "new"
-msgid_plural "new"
-msgstr[0] "个软件包将新装"
-
-#. translators: this text will be preceded by a number e.g. "5 new to install"
-#: src/Summary.cc:1303
-msgid "new package to install"
-msgid_plural "new packages to install"
-msgstr[0] "个软件包将新装"
-
-#. translators: this text will be preceded by a number e.g. "5 to ..."
-#: src/Summary.cc:1314
-msgid "to reinstall"
-msgid_plural "to reinstall"
-msgstr[0] "个软件包将重装"
-
-#. translators: this text will be preceded by a number e.g. "5 packages to ..."
-#: src/Summary.cc:1317
-msgid "package to reinstall"
-msgid_plural "packages to reinstall"
-msgstr[0] "个软件包将重装"
-
-#. translators: this text will be preceded by a number e.g. "5 to ..."
-#: src/Summary.cc:1328
-msgid "to remove"
-msgid_plural "to remove"
-msgstr[0] "个软件包将移除"
-
-#. translators: this text will be preceded by a number e.g. "5 packages to ..."
-#: src/Summary.cc:1331
-msgid "package to remove"
-msgid_plural "packages to remove"
-msgstr[0] "个软件包将移除"
-
-#. translators: this text will be preceded by a number e.g. "5 to ..."
-#: src/Summary.cc:1342
-msgid "to change vendor"
-msgid_plural " to change vendor"
-msgstr[0] "个软件包将改变厂商"
-
-#. translators: this text will be preceded by a number e.g. "5 packages ..."
-#: src/Summary.cc:1345
-msgid "package will change vendor"
-msgid_plural "packages will change vendor"
-msgstr[0] "个软件包将改变厂商"
-
-#. translators: this text will be preceded by a number e.g. "5 to ..."
-#: src/Summary.cc:1356
-msgid "to change arch"
-msgid_plural "to change arch"
-msgstr[0] "个软件包将改变架构"
-
-#. translators: this text will be preceded by a number e.g. "5 packages ..."
-#: src/Summary.cc:1359
-msgid "package will change arch"
-msgid_plural "packages will change arch"
-msgstr[0] "个软件包将改变架构"
-
-#. translators: this text will be preceded by a number e.g. "5 new"
-#: src/Summary.cc:1370
-msgid "source package"
-msgid_plural "source packages"
-msgstr[0] "个源代码包"
-
-#. translators: this text will be preceded by a number e.g. "5 new to install"
-#: src/Summary.cc:1373
-msgid "source package to install"
-msgid_plural "source packages to install"
-msgstr[0] "个源代码包将安装"
-
#: src/callbacks/keyring.h:37
msgid "Repository:"
msgstr "软件源:"
@@ -997,12 +636,6 @@
msgid "The gpg key signing file '%1%' has expired."
msgstr "gpg 密钥签名文件 '%1%' 已过期。"
-#: src/callbacks/keyring.h:75
-#, boost-format
-msgid "The gpg key signing file '%1%' will expire in %2% day."
-msgid_plural "The gpg key signing file '%1%' will expire in %2% days."
-msgstr[0] "gpg 密钥签名文件 '%1%' 将于 %2% 天后过期。"
-
#: src/callbacks/keyring.h:98
#, c-format, boost-format
msgid "Accepting an unsigned file '%s'."
@@ -1137,7 +770,7 @@
#. translators: help text for 'x' option in the 'Continue?' prompt
#. popts.setOptionHelp(8, _("Explain why the packages are going to be installed."));
#: src/callbacks/keyring.h:309 src/callbacks/keyring.h:319
-#: src/callbacks/rpm.h:124 src/callbacks/rpm.h:406 src/solve-commit.cc:663
+#: src/callbacks/rpm.h:124 src/callbacks/rpm.h:406 src/solve-commit.cc:691
msgid "Continue?"
msgstr "继续吗?"
@@ -1245,24 +878,6 @@
"检查文件冲突不需要预先下载已安装的软件包来访问它们的文件列表。细节请参考 "
"zypper 手册页中的 '%1%' 选项。"
-#. TranslatorExplanation %1%(number of packages); detailed list follows
-#: src/callbacks/rpm.h:379
-#, boost-format
-msgid ""
-"The following package had to be excluded from file conflicts check because "
-"it is not yet downloaded:"
-msgid_plural ""
-"The following %1% packages had to be excluded from file conflicts check "
-"because they are not yet downloaded:"
-msgstr[0] "以下 %1% 个软件包必须从文件冲突检查中排除,因为它们尚未下载:"
-
-#. TranslatorExplanation %1%(number of conflicts); detailed list follows
-#: src/callbacks/rpm.h:390
-#, boost-format
-msgid "Detected %1% file conflict:"
-msgid_plural "Detected %1% file conflicts:"
-msgstr[0] "检测到 %1% 个文件冲突:"
-
#: src/callbacks/rpm.h:398
msgid "Conflicting files will be replaced."
msgstr "冲突文件将会被替换。"
@@ -1457,7 +1072,7 @@
msgid "Accepting package despite the error."
msgstr "尽管有错误仍接受了该软件包。"
-#: src/Command.cc:192
+#: src/Command.cc:199
#, c-format, boost-format
msgid "Unknown command '%s'"
msgstr "未知命令 '%s'"
@@ -1516,8 +1131,8 @@
msgid "Problem retrieving files from '%s'."
msgstr "从 '%s' 撷取文件时出现问题。"
-#: src/repos.cc:279 src/repos.cc:3442 src/solve-commit.cc:781
-#: src/solve-commit.cc:813 src/solve-commit.cc:847
+#: src/repos.cc:279 src/repos.cc:3391 src/solve-commit.cc:827
+#: src/solve-commit.cc:859 src/solve-commit.cc:893
msgid "Please see the above error message for a hint."
msgstr "请参考以上错误消息汲取灵感。"
@@ -1609,7 +1224,7 @@
msgid "Scanning content of disabled repository '%s'."
msgstr "正在扫描已禁用软件源 '%s' 的内容。"
-#: src/repos.cc:780 src/repos.cc:818 src/repos.cc:1382
+#: src/repos.cc:780 src/repos.cc:818 src/repos.cc:1337
#, c-format, boost-format
msgid "Skipping repository '%s' because of the above error."
msgstr "由于以上错误,正在跳过软件源 '%s' 。"
@@ -1653,615 +1268,569 @@
msgid "Target initialization failed:"
msgstr "目标初始化失败:"
-#: src/repos.cc:915 src/Zypper.cc:4254
+#: src/repos.cc:915 src/Zypper.cc:4399
msgid "Running 'zypper refresh' as root might resolve the problem."
msgstr "以 root 身份运行 'zypper refresh' 或许会解决该问题。"
-#: src/repos.cc:935 src/update.cc:262 src/update.cc:584 src/search.cc:348
-msgid "Status"
-msgstr "状态"
-
-#. status
-#. rug's status (active, pending => active, disabled <= enabled, disabled)
-#. this is probably the closest possible compatibility arrangement
-#: src/repos.cc:952
-msgid "Active"
-msgstr "活动的"
-
-#: src/repos.cc:952
-msgid "Disabled"
-msgstr "已禁用"
-
-#: src/repos.cc:1012 src/repos.cc:1162 src/repos.cc:2594 src/Zypper.cc:5162
+#: src/repos.cc:970 src/repos.cc:1120 src/repos.cc:2541 src/Zypper.cc:5287
msgid "Alias"
msgstr "别名"
#. 'enabled' flag
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1031 src/repos.cc:1169 src/repos.cc:1776 src/repos.cc:2596
+#: src/repos.cc:989 src/repos.cc:1127 src/repos.cc:1723 src/repos.cc:2543
msgid "Enabled"
msgstr "已启用"
#. GPG Check
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1035 src/repos.cc:1170 src/repos.cc:1780 src/repos.cc:2597
+#: src/repos.cc:993 src/repos.cc:1128 src/repos.cc:1727 src/repos.cc:2544
msgid "GPG Check"
msgstr "GPG 检查"
#. translators: 'zypper repos' column - whether autorefresh is enabled
#. for the repository
#. translators: 'zypper repos' column - whether autorefresh is enabled for the repository
-#: src/repos.cc:1043 src/repos.cc:2599
+#: src/repos.cc:1001 src/repos.cc:2546
msgid "Refresh"
msgstr "刷新"
#. translators: repository priority (in zypper repos -p or -d)
-#: src/repos.cc:1053 src/repos.cc:1171 src/repos.cc:2603
+#: src/repos.cc:1011 src/repos.cc:1129 src/repos.cc:2550
msgid "Priority"
msgstr "优先级"
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1070 src/repos.cc:1164 src/repos.cc:1782 src/repos.cc:2606
+#: src/repos.cc:1028 src/repos.cc:1122 src/repos.cc:1729 src/repos.cc:2553
msgid "URI"
msgstr "URI"
#. "/etc/init.d/ script that might be used to restart the command (guessed)
-#: src/repos.cc:1080 src/utils/misc.cc:448
+#: src/repos.cc:1038 src/ps.cc:125
msgid "Service"
msgstr "服务"
-#: src/repos.cc:1133
+#: src/repos.cc:1091
msgid "No repositories defined."
msgstr "未定义软件源。"
-#: src/repos.cc:1134
+#: src/repos.cc:1092
msgid "Use the 'zypper addrepo' command to add one or more repositories."
msgstr "请使用 'zypper addrepo' 命令添加一个或更多的软件源。"
-#: src/repos.cc:1172
+#: src/repos.cc:1130
msgid "Auto-refresh"
msgstr "自动刷新"
-#: src/repos.cc:1172 src/repos.cc:1173
+#: src/repos.cc:1130 src/repos.cc:1131
msgid "On"
msgstr "开"
-#: src/repos.cc:1172 src/repos.cc:1173
+#: src/repos.cc:1130 src/repos.cc:1131
msgid "Off"
msgstr "关"
-#: src/repos.cc:1173
+#: src/repos.cc:1131
msgid "Keep Packages"
msgstr "保留软件包"
-#: src/repos.cc:1175
+#: src/repos.cc:1133
msgid "GPG Key URI"
msgstr "GPG 密钥 URI"
-#: src/repos.cc:1176
+#: src/repos.cc:1134
msgid "Path Prefix"
msgstr "路径前缀"
-#: src/repos.cc:1177
+#: src/repos.cc:1135
msgid "Parent Service"
msgstr "父服务"
-#: src/repos.cc:1178
+#: src/repos.cc:1136
msgid "Repo Info Path"
msgstr "软件源信息路径"
-#: src/repos.cc:1179
+#: src/repos.cc:1137
msgid "MD Cache Path"
msgstr "MD 缓存路径"
-#: src/repos.cc:1233 src/repos.cc:1310 src/repos.cc:1469
+#: src/repos.cc:1191 src/repos.cc:1265 src/repos.cc:1424
msgid "Error reading repositories:"
msgstr "读取软件源出错:"
-#: src/repos.cc:1261 src/repos.cc:2745
+#: src/repos.cc:1219 src/repos.cc:2692
#, c-format, boost-format
msgid "Can't open %s for writing."
msgstr "无法打开 %s 进行写操作。"
-#: src/repos.cc:1263 src/repos.cc:2747
+#: src/repos.cc:1221 src/repos.cc:2694
msgid "Maybe you do not have write permissions?"
msgstr "或许您没有写入权限?"
-#: src/repos.cc:1270 src/repos.cc:2754
+#: src/repos.cc:1228 src/repos.cc:2701
#, c-format, boost-format
msgid "Repositories have been successfully exported to %s."
msgstr "已成功导出软件源到 %s。"
-#: src/repos.cc:1328 src/repos.cc:1487
+#: src/repos.cc:1283 src/repos.cc:1442
msgid "Specified repositories: "
msgstr "指定的软件源:"
-#: src/repos.cc:1367
+#: src/repos.cc:1322
#, c-format, boost-format
msgid "Skipping disabled repository '%s'"
msgstr "正在跳过已禁用的软件源 '%s'"
-#: src/repos.cc:1396
+#: src/repos.cc:1351
msgid "Specified repositories are not enabled or defined."
msgstr "指定软件源未启用或未定义。"
-#: src/repos.cc:1398
+#: src/repos.cc:1353
msgid "There are no enabled repositories defined."
msgstr "未定义状态为启用的软件源。"
-#: src/repos.cc:1399
+#: src/repos.cc:1354
#, c-format, boost-format
msgid "Use '%s' or '%s' commands to add or enable repositories."
msgstr "请用 '%s' 或者 '%s' 命令添加或启用软件源。"
-#: src/repos.cc:1404
+#: src/repos.cc:1359
msgid "Could not refresh the repositories because of errors."
msgstr "由于若干错误,无法刷新软件源。"
-#: src/repos.cc:1410
+#: src/repos.cc:1365
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "由于某个错误,未刷新某些软件源。"
-#: src/repos.cc:1415
+#: src/repos.cc:1370
msgid "Specified repositories have been refreshed."
msgstr "指定软件源均已刷新。"
-#: src/repos.cc:1417
+#: src/repos.cc:1372
msgid "All repositories have been refreshed."
msgstr "全部软件源均已刷新。"
-#: src/repos.cc:1544
+#: src/repos.cc:1499
#, c-format, boost-format
msgid "Cleaning metadata cache for '%s'."
msgstr "正在清理 '%s' 的元数据缓存。"
-#: src/repos.cc:1554
+#: src/repos.cc:1509
#, c-format, boost-format
msgid "Cleaning raw metadata cache for '%s'."
msgstr "正在清理 '%s' 的原始元数据缓存。"
-#: src/repos.cc:1561
+#: src/repos.cc:1516
#, c-format, boost-format
msgid "Keeping raw metadata cache for %s '%s'."
msgstr "正在为 %s 保留原始元数据缓存 '%s'。"
#. translators: meaning the cached rpm files
-#: src/repos.cc:1569
+#: src/repos.cc:1524
#, c-format, boost-format
msgid "Cleaning packages for '%s'."
msgstr "正在为 '%s' 清理软件包。"
-#: src/repos.cc:1577
+#: src/repos.cc:1532
#, c-format, boost-format
msgid "Cannot clean repository '%s' because of an error."
msgstr "由于某个错误,无法清理软件源 '%s' 。"
-#: src/repos.cc:1590
+#: src/repos.cc:1545
msgid "Cleaning installed packages cache."
msgstr "正在清理已安装软件包缓存。"
-#: src/repos.cc:1598
+#: src/repos.cc:1553
msgid "Cannot clean installed packages cache because of an error."
msgstr "由于某个错误,无法清理已安装软件包缓存。"
-#: src/repos.cc:1619
+#: src/repos.cc:1574
msgid "Could not clean the repositories because of errors."
msgstr "由于若干错误,无法清理软件源。"
-#: src/repos.cc:1626
+#: src/repos.cc:1581
msgid "Some of the repositories have not been cleaned up because of an error."
msgstr "由于某个错误,未清理某些软件源。"
-#: src/repos.cc:1631
+#: src/repos.cc:1586
msgid "Specified repositories have been cleaned up."
msgstr "指定软件源均已清理。"
-#: src/repos.cc:1633
+#: src/repos.cc:1588
msgid "All repositories have been cleaned up."
msgstr "全部软件源均已清理。"
-#: src/repos.cc:1676
+#: src/repos.cc:1631
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "这是一个可变只读介质 (CD/DVD),正在禁用自动刷新。"
-#: src/repos.cc:1698
+#: src/repos.cc:1653
#, c-format, boost-format
msgid "Invalid repository alias: '%s'"
msgstr "无效的软件源别名:'%s'"
-#: src/repos.cc:1706 src/repos.cc:2007
+#: src/repos.cc:1661 src/repos.cc:1954
#, c-format, boost-format
msgid "Repository named '%s' already exists. Please use another alias."
msgstr "已存在名为 '%s' 的软件源。请使用其它别名。"
-#: src/repos.cc:1717
+#: src/repos.cc:1672
msgid ""
"Could not determine the type of the repository. Please check if the defined "
"URIs (see below) point to a valid repository:"
msgstr "无法确定软件源类型。请检查定义的 URI (见下) 是否指向了有效的软件源:"
-#: src/repos.cc:1727 src/Zypper.cc:3130
+#: src/repos.cc:1682
msgid "Can't find a valid repository at given location:"
msgstr "未能在给定位置找到有效的软件源:"
-#: src/repos.cc:1736
+#: src/repos.cc:1691
msgid "Problem transferring repository data from specified URI:"
msgstr "从指定 URI 传输软件源数据出现问题:"
-#: src/repos.cc:1737
+#: src/repos.cc:1692
msgid "Please check whether the specified URI is accessible."
msgstr "请检查是否可访问指定的 URI。"
-#: src/repos.cc:1745
+#: src/repos.cc:1700
msgid "Unknown problem when adding repository:"
msgstr "添加软件源时出现未知问题:"
#. translators: BOOST STYLE POSITIONAL DIRECTIVES ( %N% )
#. translators: %1% - a repository name
-#: src/repos.cc:1756
+#: src/repos.cc:1711
#, boost-format
msgid ""
"GPG checking is disabled in configuration of repository '%1%'. Integrity and "
"origin of packages cannot be verified."
msgstr "软件源 '%1%' 的配置中禁用了 GPG 检查。无法校验完整性和软件包的出处。"
-#: src/repos.cc:1762
+#: src/repos.cc:1717
#, c-format, boost-format
msgid "Repository '%s' successfully added"
msgstr "成功添加了软件源 '%s' "
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1778
+#: src/repos.cc:1725
msgid "Autorefresh"
msgstr "自动刷新"
-#: src/repos.cc:1796
+#: src/repos.cc:1743
#, c-format, boost-format
msgid "Reading data from '%s' media"
msgstr "正在从介质 '%s' 读取数据"
-#: src/repos.cc:1803
+#: src/repos.cc:1750
#, c-format, boost-format
msgid "Problem reading data from '%s' media"
msgstr "从介质 '%s' 读取数据时出现问题"
-#: src/repos.cc:1804
+#: src/repos.cc:1751
msgid "Please check if your installation media is valid and readable."
msgstr "请检查您的安装介质是否有效和可读。"
-#: src/repos.cc:1811
+#: src/repos.cc:1758
#, c-format, boost-format
msgid "Reading data from '%s' media is delayed until next refresh."
msgstr "推迟从 '%s' 介质读取数据直至下次刷新。"
-#: src/repos.cc:1878
+#: src/repos.cc:1825
msgid "Problem accessing the file at the specified URI"
msgstr "访问指定 URI 处文件时出现问题"
-#: src/repos.cc:1879
+#: src/repos.cc:1826
msgid "Please check if the URI is valid and accessible."
msgstr "请检查该 URI 是否有效且可访问。"
-#: src/repos.cc:1887
+#: src/repos.cc:1834
msgid "Problem parsing the file at the specified URI"
msgstr "解析指定 URI 处文件时出现问题"
#. TranslatorExplanation don't translate the URI if the URI itself is not translated.
#. Also don't translate the '.repo' string.
-#: src/repos.cc:1890
+#: src/repos.cc:1837
msgid ""
"Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for "
"details."
msgstr "它是一个 .repo 文件吗? 细节请参考 http://en.opensuse.org/Standards/RepoInfo"
-#: src/repos.cc:1898
+#: src/repos.cc:1845
msgid "Problem encountered while trying to read the file at the specified URI"
msgstr "尝试读取指定 URI 处文件时遇到问题"
-#: src/repos.cc:1912
+#: src/repos.cc:1859
msgid "Repository with no alias defined found in the file, skipping."
msgstr "在文件中发现了未定义别名的软件源,正在跳过。"
-#: src/repos.cc:1919
+#: src/repos.cc:1866
#, c-format, boost-format
msgid "Repository '%s' has no URI defined, skipping."
msgstr "软件源 '%s' 未定义 URI,正在跳过。"
-#: src/repos.cc:1964
+#: src/repos.cc:1911
#, c-format, boost-format
msgid "Repository '%s' has been removed."
msgstr "已移除软件源 '%s'。"
-#: src/repos.cc:1990
+#: src/repos.cc:1937
#, c-format, boost-format
msgid ""
"Cannot change alias of '%s' repository. The repository belongs to service "
"'%s' which is responsible for setting its alias."
msgstr "无法修改软件源 '%s' 的别名。该软件源属于服务 '%s' ,该服务负责设置其别名。"
-#: src/repos.cc:2001
+#: src/repos.cc:1948
#, c-format, boost-format
msgid "Repository '%s' renamed to '%s'."
msgstr "软件源 '%s' 已重命名为 '%s' 。"
-#: src/repos.cc:2013 src/repos.cc:2273
+#: src/repos.cc:1960 src/repos.cc:2220
msgid "Error while modifying the repository:"
msgstr "修改软件源时出错:"
-#: src/repos.cc:2014
+#: src/repos.cc:1961
#, c-format, boost-format
msgid "Leaving repository '%s' unchanged."
msgstr "软件源 '%s' 未变动。"
-#: src/repos.cc:2163
+#: src/repos.cc:2110
#, c-format, boost-format
msgid ""
"Invalid priority '%s'. Use a positive integer number. The greater the "
"number, the lower the priority."
msgstr "无效的优先级 '%s'。请使用正整数。数字越大,优先级越低。"
-#: src/repos.cc:2171
+#: src/repos.cc:2118
#, c-format, boost-format
msgid "Repository '%s' priority has been left unchanged (%d)"
msgstr "未变动软件源 '%s' 的优先级 (%d)"
-#: src/repos.cc:2205
+#: src/repos.cc:2152
#, c-format, boost-format
msgid "Repository '%s' has been successfully enabled."
msgstr "已成功启用软件源 '%s'。"
-#: src/repos.cc:2208
+#: src/repos.cc:2155
#, c-format, boost-format
msgid "Repository '%s' has been successfully disabled."
msgstr "已成功禁用软件源 '%s'。"
-#: src/repos.cc:2216
+#: src/repos.cc:2163
#, c-format, boost-format
msgid "Autorefresh has been enabled for repository '%s'."
msgstr "已启用软件源 '%s' 的自动刷新。"
-#: src/repos.cc:2219
+#: src/repos.cc:2166
#, c-format, boost-format
msgid "Autorefresh has been disabled for repository '%s'."
msgstr "已禁用软件源 '%s' 的自动刷新。"
-#: src/repos.cc:2227
+#: src/repos.cc:2174
#, c-format, boost-format
msgid "RPM files caching has been enabled for repository '%s'."
msgstr "已启用软件源 '%s' 的 RPM 文件缓存。"
-#: src/repos.cc:2230
+#: src/repos.cc:2177
#, c-format, boost-format
msgid "RPM files caching has been disabled for repository '%s'."
msgstr "已禁用软件源 '%s' 的 RPM 文件缓存。"
-#: src/repos.cc:2238
+#: src/repos.cc:2185
#, c-format, boost-format
msgid "GPG check has been enabled for repository '%s'."
msgstr "已启用了软件源 '%s' 的 GPG 检查。"
-#: src/repos.cc:2241
+#: src/repos.cc:2188
#, c-format, boost-format
msgid "GPG check has been disabled for repository '%s'."
msgstr "已禁用了软件源 '%s' 的 GPG 检查。"
-#: src/repos.cc:2248
+#: src/repos.cc:2195
#, c-format, boost-format
msgid "Repository '%s' priority has been set to %d."
msgstr "软件源 '%s' 的优先级被设为了 %d。"
-#: src/repos.cc:2255
+#: src/repos.cc:2202
#, c-format, boost-format
msgid "Name of repository '%s' has been set to '%s'."
msgstr "软件源 '%s' 名称被设为了 '%s'。"
-#: src/repos.cc:2266
+#: src/repos.cc:2213
#, c-format, boost-format
msgid "Nothing to change for repository '%s'."
msgstr "软件源 '%s' 无需修改。"
-#: src/repos.cc:2274
+#: src/repos.cc:2221
#, c-format, boost-format
msgid "Leaving repository %s unchanged."
msgstr "软件源 %s 未变动。"
-#: src/repos.cc:2312
+#: src/repos.cc:2259
msgid "Error reading services:"
msgstr "读取服务出错:"
-#: src/repos.cc:2407
+#: src/repos.cc:2354
#, c-format, boost-format
msgid "Service '%s' not found by its alias, number, or URI."
msgstr "无法通过别名、编号或 URI 找到服务 '%s'。"
-#: src/repos.cc:2411
+#: src/repos.cc:2358
#, c-format, boost-format
msgid "Use '%s' to get the list of defined services."
msgstr "请使用 '%s' 获取已定义的服务列表。"
-#: src/repos.cc:2659
+#: src/repos.cc:2606
#, c-format, boost-format
msgid "No services defined. Use the '%s' command to add one or more services."
msgstr "未定义服务。请用 '%s' 命令添加一个或多个服务。"
-#: src/repos.cc:2781
+#: src/repos.cc:2728
#, c-format, boost-format
msgid "Service aliased '%s' already exists. Please use another alias."
msgstr "已存在别名为 '%s' 的服务。请使用其它别名。"
-#: src/repos.cc:2791
+#: src/repos.cc:2738
#, c-format, boost-format
msgid "Error occured while adding service '%s'."
msgstr "添加服务 '%s' 时出错。"
-#: src/repos.cc:2797
+#: src/repos.cc:2744
#, c-format, boost-format
msgid "Service '%s' has been successfully added."
msgstr "已成功添加了服务 '%s'。"
-#: src/repos.cc:2836
+#: src/repos.cc:2783
#, c-format, boost-format
msgid "Removing service '%s':"
msgstr "正在移除服务 '%s':"
-#: src/repos.cc:2839
+#: src/repos.cc:2786
#, c-format, boost-format
msgid "Service '%s' has been removed."
msgstr "已移除服务 '%s'。"
-#: src/repos.cc:2855
+#: src/repos.cc:2801
#, c-format, boost-format
msgid "Refreshing service '%s'."
msgstr "正在刷新服务 '%s'。"
-#: src/repos.cc:2868 src/repos.cc:2878
+#: src/repos.cc:2817 src/repos.cc:2827
#, c-format, boost-format
msgid "Problem retrieving the repository index file for service '%s':"
msgstr "撷取服务 '%s' 的软件源索引文件出现问题:"
-#: src/repos.cc:2870 src/repos.cc:2983 src/repos.cc:3043
+#: src/repos.cc:2819 src/repos.cc:2932 src/repos.cc:2992
#, c-format, boost-format
msgid "Skipping service '%s' because of the above error."
msgstr "由于以上错误,正在跳过服务 '%s' 。"
-#: src/repos.cc:2879
+#: src/repos.cc:2828
msgid "Check if the URI is valid and accessible."
msgstr "请检查该 URI 是否有效且可访问。"
-#: src/repos.cc:2937
+#: src/repos.cc:2886
#, c-format, boost-format
msgid "Skipping disabled service '%s'"
msgstr "正在跳过已禁用的服务 '%s'"
-#: src/repos.cc:2997
+#: src/repos.cc:2946
#, c-format, boost-format
msgid "Use '%s' or '%s' commands to add or enable services."
msgstr "请使用 '%s' 或者 '%s' 命令添加或启用服务。"
-#: src/repos.cc:3000
+#: src/repos.cc:2949
msgid "Specified services are not enabled or defined."
msgstr "指定服务未启用或未定义。"
-#: src/repos.cc:3002
+#: src/repos.cc:2951
msgid "There are no enabled services defined."
msgstr "未定义已启用的服务。"
-#: src/repos.cc:3006
+#: src/repos.cc:2955
msgid "Could not refresh the services because of errors."
msgstr "由于若干错误无法刷新服务。"
-#: src/repos.cc:3012
+#: src/repos.cc:2961
msgid "Some of the services have not been refreshed because of an error."
msgstr "由于某个错误,未刷新某些服务。"
-#: src/repos.cc:3017
+#: src/repos.cc:2966
msgid "Specified services have been refreshed."
msgstr "指定服务均已刷新。"
-#: src/repos.cc:3019
+#: src/repos.cc:2968
msgid "All services have been refreshed."
msgstr "全部服务均已刷新。"
-#: src/repos.cc:3168
+#: src/repos.cc:3117
#, c-format, boost-format
-msgid "Service '%s' has been sucessfully enabled."
+msgid "Service '%s' has been successfully enabled."
msgstr "已成功启用服务 '%s'。"
-#: src/repos.cc:3171
+#: src/repos.cc:3120
#, c-format, boost-format
-msgid "Service '%s' has been sucessfully disabled."
+msgid "Service '%s' has been successfully disabled."
msgstr "已成功禁用服务 '%s'。"
-#: src/repos.cc:3178
+#: src/repos.cc:3127
#, c-format, boost-format
msgid "Autorefresh has been enabled for service '%s'."
msgstr "已启用服务 '%s' 的自动刷新。"
-#: src/repos.cc:3181
+#: src/repos.cc:3130
#, c-format, boost-format
msgid "Autorefresh has been disabled for service '%s'."
msgstr "已禁用服务 '%s' 的自动刷新。"
-#: src/repos.cc:3187
+#: src/repos.cc:3136
#, c-format, boost-format
msgid "Name of service '%s' has been set to '%s'."
msgstr "服务 '%s' 名称被设为了 '%s'。"
-#: src/repos.cc:3193
+#: src/repos.cc:3175
#, c-format, boost-format
-msgid "Repository '%s' has been added to enabled repositories of service '%s'"
-msgid_plural ""
-"Repositories '%s' have been added to enabled repositories of service '%s'"
-msgstr[0] "已将软件源 '%s' 加入服务 '%s' 的已启用软件源中。"
-
-#: src/repos.cc:3201
-#, c-format, boost-format
-msgid "Repository '%s' has been added to disabled repositories of service '%s'"
-msgid_plural ""
-"Repositories '%s' have been added to disabled repositories of service '%s'"
-msgstr[0] "已将软件源 '%s' 加入服务 '%s' 的已禁用软件源中。"
-
-#: src/repos.cc:3209
-#, c-format, boost-format
-msgid ""
-"Repository '%s' has been removed from enabled repositories of service '%s'"
-msgid_plural ""
-"Repositories '%s' have been removed from enabled repositories of service '%s'"
-msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已启用软件源中移除。"
-
-#: src/repos.cc:3217
-#, c-format, boost-format
-msgid ""
-"Repository '%s' has been removed from disabled repositories of service '%s'"
-msgid_plural ""
-"Repositories '%s' have been removed from disabled repositories of service "
-"'%s'"
-msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已禁用软件源中移除。"
-
-#: src/repos.cc:3226
-#, c-format, boost-format
msgid "Nothing to change for service '%s'."
msgstr "服务 '%s' 无需修改。"
-#: src/repos.cc:3233
+#: src/repos.cc:3182
msgid "Error while modifying the service:"
msgstr "修改服务时出错:"
-#: src/repos.cc:3234
+#: src/repos.cc:3183
#, c-format, boost-format
msgid "Leaving service %s unchanged."
msgstr "服务 %s 未变动。"
-#: src/repos.cc:3342
+#: src/repos.cc:3291
msgid "Loading repository data..."
msgstr "正在加载软件源数据..."
-#: src/repos.cc:3364
+#: src/repos.cc:3313
#, c-format, boost-format
msgid "Retrieving repository '%s' data..."
msgstr "正在撷取软件源 '%s' 的数据..."
-#: src/repos.cc:3371
+#: src/repos.cc:3320
#, c-format, boost-format
msgid "Repository '%s' not cached. Caching..."
msgstr "未缓存软件源 '%s'。正在缓存中..."
-#: src/repos.cc:3378 src/repos.cc:3416
+#: src/repos.cc:3327 src/repos.cc:3365
#, c-format, boost-format
msgid "Problem loading data from '%s'"
msgstr "从 '%s' 加载数据出现问题"
-#: src/repos.cc:3383
+#: src/repos.cc:3332
#, c-format, boost-format
msgid "Repository '%s' could not be refreshed. Using old cache."
msgstr "无法刷新软件源 '%s'。正在使用旧缓存。"
-#: src/repos.cc:3388 src/repos.cc:3421
+#: src/repos.cc:3337 src/repos.cc:3370
#, c-format, boost-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "由于某个错误,未加载来自 '%s' 的可解析项。"
-#: src/repos.cc:3407
+#: src/repos.cc:3356
#, c-format, boost-format
msgid ""
"Repository '%s' appears to be outdated. Consider using a different mirror or "
@@ -2269,131 +1838,115 @@
msgstr "软件源 '%s' 看起来已过期。请考虑使用一个不同的镜像或服务器。"
#. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m'
-#: src/repos.cc:3418
+#: src/repos.cc:3367
#, c-format, boost-format
msgid "Try '%s', or even '%s' before doing so."
msgstr "这么做前请先尝试 '%s',甚至也可尝试 '%s'。"
-#: src/repos.cc:3430
+#: src/repos.cc:3379
msgid "Reading installed packages..."
msgstr "正在读取已安装的软件包..."
-#: src/repos.cc:3441
-msgid "Problem occured while reading the installed packages:"
+#: src/repos.cc:3390
+msgid "Problem occurred while reading the installed packages:"
msgstr "读取已安装软件包时发生问题:"
-#. translators: %d is the number of needed patches
-#: src/update.cc:71
+#: src/update.cc:93
#, c-format, boost-format
-msgid "%d patch needed"
-msgid_plural "%d patches needed"
-msgstr[0] "需要 %d 个补丁"
+msgid ""
+"Ignoring %s without argument because similar option with an argument has "
+"been specified."
+msgstr "忽略没有参数的 %s 因为已经指定过了类似的有参数的选项。"
-#. translators: %d is the number of security patches
-#: src/update.cc:75
-#, c-format, boost-format
-msgid "%d security patch"
-msgid_plural "%d security patches"
-msgstr[0] "%d 个安全补丁"
-
-#. translators: package's repository (header)
#. translators: package's repository (header)
-#: src/update.cc:261 src/update.cc:496 src/search.cc:53 src/search.cc:77
-#: src/search.cc:344 src/search.cc:466 src/search.cc:605 src/search.cc:674
-#: src/locks.cc:42 src/locks.cc:44
+#: src/update.cc:313 src/update.cc:543 src/search.cc:79 src/search.cc:330
+#: src/search.cc:452 src/search.cc:586 src/search.cc:648 src/locks.cc:105
msgid "Repository"
msgstr "软件源"
-#. translators: product category (base/addon), the rug term
-#: src/update.cc:262 src/update.cc:584 src/update.cc:688 src/search.cc:346
-#: src/search.cc:682
+#: src/update.cc:314 src/update.cc:612 src/update.cc:681 src/search.cc:332
msgid "Category"
msgstr "分类"
-#: src/update.cc:262 src/update.cc:584 src/update.cc:688 src/search.cc:347
+#: src/update.cc:314 src/update.cc:612 src/update.cc:681 src/search.cc:333
msgid "Severity"
msgstr "严重性"
+#: src/update.cc:314 src/update.cc:612 src/update.cc:681
+msgid "Interactive"
+msgstr "交互的"
+
+#: src/update.cc:314 src/update.cc:612 src/search.cc:334
+msgid "Status"
+msgstr "状态"
+
#. translators: package summary (header)
-#: src/update.cc:262 src/update.cc:688 src/search.cc:254
+#: src/update.cc:314 src/update.cc:681 src/search.cc:240
msgid "Summary"
msgstr "摘要"
-#: src/update.cc:296 src/update.cc:679
+#: src/update.cc:343 src/update.cc:673
msgid "needed"
msgstr "需要"
-#: src/update.cc:296 src/update.cc:679
+#: src/update.cc:343 src/update.cc:673
msgid "not needed"
msgstr "不需要"
-#: src/update.cc:315
+#: src/update.cc:362
msgid "The following software management updates will be installed first:"
msgstr "将首先安装以下软件管理更新:"
-#: src/update.cc:324 src/update.cc:558
+#: src/update.cc:371 src/update.cc:599
msgid "No updates found."
msgstr "未找到更新。"
-#: src/update.cc:330
+#: src/update.cc:377
msgid "The following updates are also available:"
msgstr "以下更新也可用:"
-#: src/update.cc:415
+#: src/update.cc:462
msgid "Package updates"
msgstr "软件包更新"
-#: src/update.cc:417
+#: src/update.cc:464
msgid "Patches"
msgstr "补丁"
-#: src/update.cc:419
+#: src/update.cc:466
msgid "Pattern updates"
msgstr "软件集更新"
-#: src/update.cc:421
+#: src/update.cc:468
msgid "Product updates"
msgstr "产品更新"
-#. translators: Bundle is a term used in rug. See rug for how to translate it.
-#: src/update.cc:499 src/search.cc:55 src/search.cc:603
-msgid "Bundle"
-msgstr "系列"
-
-#: src/update.cc:507
+#: src/update.cc:551
msgid "Current Version"
msgstr "当前版本"
-#: src/update.cc:508
+#: src/update.cc:552
msgid "Available Version"
msgstr "可用版本"
#. translators: package architecture (header)
-#: src/update.cc:508 src/search.cc:61 src/search.cc:75 src/search.cc:606
-#: src/search.cc:685
+#: src/update.cc:552 src/search.cc:77 src/search.cc:589 src/search.cc:654
msgid "Arch"
msgstr "架构"
-#: src/update.cc:584
+#: src/update.cc:612
msgid "Issue"
msgstr "问题"
-#: src/update.cc:584
+#: src/update.cc:612
msgid "No."
msgstr "编号"
-#: src/update.cc:584
+#: src/update.cc:612
msgid "Patch"
msgstr "补丁"
-#: src/update.cc:613
-#, c-format, boost-format
-msgid ""
-"Ignoring %s without argument because similar option with an argument has "
-"been specified."
-msgstr "忽略没有参数的 %s 因为已经指定过了类似的有参数的选项。"
-
-#: src/update.cc:721
+#: src/update.cc:722
msgid "No matching issues found."
msgstr "未找到匹配的问题。"
@@ -2401,37 +1954,55 @@
msgid "The following matches in issue numbers have been found:"
msgstr "已找到以下匹配问题编号的补丁:"
-#: src/update.cc:741
+#: src/update.cc:739
msgid "Matches in patch descriptions of the following patches have been found:"
msgstr "已找到以下补丁描述匹配的补丁:"
-#: src/update.cc:820
+#: src/update.cc:807
#, c-format, boost-format
msgid "Fix for bugzilla issue number %s was not found or is not needed."
msgstr "未找到或不需要故障专区问题编号 %s 的修复。"
-#: src/update.cc:824
+#: src/update.cc:809
#, c-format, boost-format
msgid "Fix for CVE issue number %s was not found or is not needed."
msgstr "未找到或不需要 CVE 问题编号 %s 的修复。"
+#. translators: keep '%s issue' together, it's something like 'CVE issue' or 'Bugzilla issue'
+#: src/update.cc:812
+#, c-format, boost-format
+msgid "Fix for %s issue number %s was not found or is not needed."
+msgstr "%s 的修复,修复编号为 %s 未找到或不需要。"
+
#. translators: this will show up if you press ctrl+c twice (but outside of zypper shell)
#: src/main.cc:39
msgid "OK OK! Exiting immediately..."
msgstr "好好!这就退啦 :-)..."
-#: src/Zypper.cc:99
+#: src/Zypper.cc:102
#, boost-format
msgid ""
"Legacy commandline option %1% detected. Please use global option %2% instead."
msgstr "检测到了过时的命令行选项 %1%。请使用全局选项 %2% 代替。"
-#: src/Zypper.cc:100
+#: src/Zypper.cc:103
#, boost-format
msgid "Legacy commandline option %1% detected. Please use %2% instead."
msgstr "检测到了过时的命令行选项 %1%。请使用 %2% 代替。"
-#: src/Zypper.cc:213
+#: src/Zypper.cc:183
+msgid "Command options:"
+msgstr "命令选项:"
+
+#: src/Zypper.cc:186 src/Zypper.cc:2199
+msgid "Expert options:"
+msgstr "专家选项:"
+
+#: src/Zypper.cc:189
+msgid "This command has no additional options."
+msgstr "此命令无额外选项。"
+
+#: src/Zypper.cc:302
msgid ""
" Global Options:\n"
"\t--help, -h\t\tHelp.\n"
@@ -2471,7 +2042,7 @@
"\t--xmlout, -x\t\t切换到 XML 输出。\n"
"\t--ignore-unknown, -i\t忽略未知软件包。\n"
-#: src/Zypper.cc:235
+#: src/Zypper.cc:324
msgid ""
"\t--reposd-dir, -D <dir>\tUse alternative repository definition file\n"
"\t\t\t\tdirectory.\n"
@@ -2486,7 +2057,7 @@
"\t--solv-cache-dir <文件夹>\t使用另一个 solv 文件缓存文件夹。\n"
"\t--pkg-cache-dir <文件夹>\t使用另一个软件包缓存文件夹。\n"
-#: src/Zypper.cc:243
+#: src/Zypper.cc:332
msgid ""
" Repository Options:\n"
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
@@ -2516,7 +2087,7 @@
"\t--no-remote\t忽略远程软件源。\n"
"\t--releasever\t\t设置全部 .repo 文件中 $releasever 的值 (默认:版本号)\n"
-#: src/Zypper.cc:257
+#: src/Zypper.cc:346
msgid ""
" Target Options:\n"
"\t--root, -R <dir>\tOperate on a different root directory.\n"
@@ -2528,7 +2099,7 @@
"\t--disable-system-resolvables\n"
"\t\t\t\t不读取已安装软件包。\n"
-#: src/Zypper.cc:264
+#: src/Zypper.cc:353
msgid ""
" Commands:\n"
"\thelp, ?\t\t\tPrint help.\n"
@@ -2538,7 +2109,7 @@
"\thelp, ?\t\t\t打印帮助。\n"
"\tshell, sh\t\t一次性接受多个命令。\n"
-#: src/Zypper.cc:269
+#: src/Zypper.cc:358
msgid ""
" Repository Management:\n"
"\trepos, lr\t\tList all defined repositories.\n"
@@ -2558,7 +2129,7 @@
"\trefresh, ref\t\t刷新全部软件源。\n"
"\tclean\t\t\t清理本地缓存。\n"
-#: src/Zypper.cc:279
+#: src/Zypper.cc:368
msgid ""
" Service Management:\n"
"\tservices, ls\t\tList all defined services.\n"
@@ -2574,7 +2145,7 @@
"\tremoveservice, rs\t移除指定服务。\n"
"\trefresh-services, refs\t刷新全部服务。\n"
-#: src/Zypper.cc:287
+#: src/Zypper.cc:376
msgid ""
" Software Management:\n"
"\tinstall, in\t\tInstall packages.\n"
@@ -2594,7 +2165,7 @@
"\tinstall-new-recommends, inr\n"
"\t\t\t\t安装已安装软件包推荐的新秀软件包。\n"
-#: src/Zypper.cc:298
+#: src/Zypper.cc:387
msgid ""
" Update Management:\n"
"\tupdate, up\t\tUpdate installed packages with newer versions.\n"
@@ -2612,7 +2183,7 @@
"\tdist-upgrade, dup\t执行发行版升级。\n"
"\tpatch-check, pchk\t检查补丁。\n"
-#: src/Zypper.cc:307
+#: src/Zypper.cc:396
msgid ""
" Querying:\n"
"\tsearch, se\t\tSearch for packages matching a pattern.\n"
@@ -2638,7 +2209,7 @@
"\tproducts, pd\t\t列出全部可用产品。\n"
"\twhat-provides, wp\t列出能够提供指定功能的软件包。\n"
-#: src/Zypper.cc:322
+#: src/Zypper.cc:411
msgid ""
" Package Locks:\n"
"\taddlock, al\t\tAdd a package lock.\n"
@@ -2652,7 +2223,7 @@
"\tlocks, ll\t\t列出当前的软件包锁定。\n"
"\tcleanlocks, cl\t移除无用的锁定。\n"
-#: src/Zypper.cc:329
+#: src/Zypper.cc:418
msgid ""
" Other Commands:\n"
"\tversioncmp, vcmp\tCompare two version strings.\n"
@@ -2671,76 +2242,92 @@
"\tdownload\t\t下载通过命令行指定的 RPM 到本地文件夹。\n"
"\tsource-download\t\t下载全部已安装软件包的源代码 RPM 到本地文件夹。\n"
-#: src/Zypper.cc:340
+#: src/Zypper.cc:428
msgid ""
+" Subcommands:\n"
+"\tsubcommand\t\tLists available subcommands.\n"
+msgstr ""
+" 子命令:\n"
+"\tsubcommand\t\t列出可用子命令。\n"
+
+#: src/Zypper.cc:433
+msgid ""
" Usage:\n"
"\tzypper [--global-options] <command> [--command-options] [arguments]\n"
+"\tzypper <subcommand> [--command-options] [arguments]\n"
msgstr ""
" 用法:\n"
"\tzypper [--全局选项] <命令> [--命令选项] [参数]\n"
+"\tzypper <子命令> [--命令选项] [参数]\n"
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: src/Zypper.cc:366
+#: src/Zypper.cc:461
#, c-format, boost-format
msgid "Type '%s' to get a list of global options and commands."
msgstr "输入 '%s' 获取全局选项和命令的列表。"
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: src/Zypper.cc:375
+#: src/Zypper.cc:470
#, c-format, boost-format
msgid "Type '%s' to get command-specific help."
msgstr "输入 '%s' 获取具体命令的帮助。"
-#: src/Zypper.cc:551
+#: src/Zypper.cc:646
#, c-format, boost-format
msgid "Verbosity: %d"
msgstr "详细程度:%d"
-#: src/Zypper.cc:565
+#: src/Zypper.cc:660
#, c-format, boost-format
msgid "Invalid table style %d."
msgstr "无效的表格样式 %d。"
-#: src/Zypper.cc:566
+#: src/Zypper.cc:661
#, c-format, boost-format
msgid "Use an integer number from %d to %d"
msgstr "请使用一个介于 %d 到 %d 之间的整数"
-#: src/Zypper.cc:669
+#. translators: %1% - is the name of a subcommand
+#: src/Zypper.cc:773
+#, boost-format
+msgid "Subcommand %1% does not support zypper global options."
+msgstr "子命令 %1% 不支持 zypper 全局选项。"
+
+#: src/Zypper.cc:795
msgid "Enforced setting"
msgstr "强制设定"
-#: src/Zypper.cc:679
+#: src/Zypper.cc:805
msgid "User data string must not contain nonprintable or newline characters!"
msgstr "用户数据字符串必须不能包含不可打印的字符或用于另起一行的功能性字符!"
-#: src/Zypper.cc:702 src/Zypper.cc:2865
+#: src/Zypper.cc:828 src/Zypper.cc:3048
msgid "Entering non-interactive mode."
msgstr "正在进入非交互模式。"
-#: src/Zypper.cc:708
+#: src/Zypper.cc:834
msgid ""
"Patches having the flag rebootSuggested set will not be treated as "
"interactive."
msgstr "设置了\"建议重启\"旗标的补丁将不被视为可与用户交互的。"
-#: src/Zypper.cc:714
+#: src/Zypper.cc:840
msgid "Entering 'no-gpg-checks' mode."
msgstr "正在进入无 gpg 检查模式。"
-#: src/Zypper.cc:721
+#: src/Zypper.cc:847
#, c-format, boost-format
msgid ""
"Turning on '%s'. New repository signing keys will be automatically imported!"
msgstr "正在开启 '%s'。将自动导入新软件源签名密钥!"
-#: src/Zypper.cc:734
+#: src/Zypper.cc:860
msgid "The path specified in the --root option must be absolute."
msgstr "在 --root 选项中指定的路径必须是绝对路径。"
-#: src/Zypper.cc:750
+#: src/Zypper.cc:876
msgid ""
"The /etc/products.d/baseproduct symlink is dangling or missing!\n"
"The link must point to your core products .prod file in /etc/products.d.\n"
@@ -2748,51 +2335,51 @@
"/etc/products.d/baseproduct 系统链接不紧密或缺失!\n"
"该链接必须指向位于 /etc/products.d 中您核心系统的 .prod 文件。\n"
-#: src/Zypper.cc:789
+#: src/Zypper.cc:915
msgid "Repositories disabled, using the database of installed packages only."
msgstr "已禁用在线软件源,仅使用已安装软件包的数据库。"
-#: src/Zypper.cc:801
+#: src/Zypper.cc:927
msgid "Autorefresh disabled."
msgstr "已禁用自动刷新。"
-#: src/Zypper.cc:808
+#: src/Zypper.cc:934
msgid "CD/DVD repositories disabled."
msgstr "已禁用 CD/DVD 软件源。"
-#: src/Zypper.cc:815
+#: src/Zypper.cc:941
msgid "Remote repositories disabled."
msgstr "已禁用远程软件源。"
-#: src/Zypper.cc:822
+#: src/Zypper.cc:948
msgid "Ignoring installed resolvables."
msgstr "正在忽略已安装的可解析项。"
#. TranslatorExplanation The %s is "--plus-repo"
#. TranslatorExplanation The %s is "--option-name"
-#: src/Zypper.cc:850 src/Zypper.cc:900
+#: src/Zypper.cc:976 src/Zypper.cc:1026
#, c-format, boost-format
msgid "The %s option has no effect here, ignoring."
msgstr "%s 选项在此无效,忽略。"
-#: src/Zypper.cc:1055
+#: src/Zypper.cc:1186
#, c-format, boost-format
msgid "Command '%s' is replaced by '%s'."
msgstr "命令 '%s' 已被 '%s' 替换。"
-#: src/Zypper.cc:1057
+#: src/Zypper.cc:1188
#, c-format, boost-format
msgid "See '%s' for all available options."
msgstr "全部可用选项请参考 '%s'。"
-#: src/Zypper.cc:1082
+#: src/Zypper.cc:1218
msgid "Unexpected exception."
msgstr "意外异常。"
#. translators: the first %s = "package, patch, pattern, product",
#. second %s = "package",
#. and the third %s = "only, in-advance, in-heaps, as-needed"
-#: src/Zypper.cc:1189
+#: src/Zypper.cc:1325
#, c-format, boost-format
msgid ""
"install (in) [options] ...\n"
@@ -2879,7 +2466,7 @@
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#: src/Zypper.cc:1260
+#: src/Zypper.cc:1396
#, c-format, boost-format
msgid ""
"remove (rm) [options] <capability> ...\n"
@@ -2924,7 +2511,7 @@
"-D, --dry-run 测试移除,并不真正移除。\n"
" --details 显示详细安装摘要。\n"
-#: src/Zypper.cc:1297
+#: src/Zypper.cc:1433
msgid ""
"source-install (si) [options] <name> ...\n"
"\n"
@@ -2947,7 +2534,7 @@
"-r, --repo <别名|#|URI> 仅从指定软件源安装软件包。\n"
" --download-only 仅下载软件包,不安装。\n"
-#: src/Zypper.cc:1334
+#: src/Zypper.cc:1470
#, c-format, boost-format
msgid ""
"verify (ve) [options]\n"
@@ -2983,7 +2570,7 @@
" %s\n"
"-d, --download-only 仅下载软件包,不安装。\n"
-#: src/Zypper.cc:1374
+#: src/Zypper.cc:1510
#, c-format, boost-format
msgid ""
"install-new-recommends (inr) [options]\n"
@@ -3016,7 +2603,7 @@
" --debug-solver 创建依赖关系解决器试例以供调试。\n"
#. translators: the %s = "ris" (the only service type currently supported)
-#: src/Zypper.cc:1404
+#: src/Zypper.cc:1540
#, c-format, boost-format
msgid ""
"addservice (as) [options] <URI> <alias>\n"
@@ -3038,7 +2625,7 @@
"-n, --name <别名> 为服务指定一个描述性名称。\n"
#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
-#: src/Zypper.cc:1427
+#: src/Zypper.cc:1563
msgid ""
"removeservice (rs) [options] \n"
"\n"
@@ -3057,7 +2644,7 @@
" --loose-query 忽略 URI 中的查询字符串。\n"
#. translators: %s is "--all" and "--all"
-#: src/Zypper.cc:1463
+#: src/Zypper.cc:1599
#, c-format, boost-format
msgid ""
"modifyservice (ms) <options> \n"
@@ -3111,7 +2698,7 @@
"-t, --remote 应用修改到全部远程服务。\n"
"-m, --medium-type <类型> 应用修改到指定类型的服务。\n"
-#: src/Zypper.cc:1511
+#: src/Zypper.cc:1647
msgid ""
"services (ls) [options]\n"
"\n"
@@ -3141,7 +2728,7 @@
"-U, --sort-by-uri 按 URL 排序列表。\n"
"-N, --sort-by-name 按名称排序列表。\n"
-#: src/Zypper.cc:1539
+#: src/Zypper.cc:1675
msgid ""
"refresh-services (refs) [options]\n"
"\n"
@@ -3163,7 +2750,7 @@
"-R,--restore-status 也恢复服务软件源的启用/禁用状态。\n"
#. translators: the %s = "yast2, rpm-md, plaindir"
-#: src/Zypper.cc:1571
+#: src/Zypper.cc:1707
#, c-format, boost-format
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
@@ -3204,19 +2791,8 @@
"-G, --no-gpgcheck 禁用此软件源的 GPG 密钥检查。\n"
"-f, --refresh 启用软件源自动刷新。\n"
-#. translators: this is just a legacy command
-#: src/Zypper.cc:1626 src/Zypper.cc:2740
+#: src/Zypper.cc:1752
msgid ""
-"list-resolvables (lr)\n"
-"\n"
-"List available resolvable types.\n"
-msgstr ""
-"list-resolvable (lr)\n"
-"\n"
-"列出可用的解析项类型。\n"
-
-#: src/Zypper.cc:1634
-msgid ""
"repos (lr) [options] [repo] ...\n"
"\n"
"List all defined repositories.\n"
@@ -3257,7 +2833,7 @@
"-A, --sort-by-alias 按别名排序列表。\n"
"-N, --sort-by-name 按名称排序列表。\n"
-#: src/Zypper.cc:1666
+#: src/Zypper.cc:1784
msgid ""
"removerepo (rr) [options] \n"
"\n"
@@ -3275,7 +2851,7 @@
" --loose-auth 忽略 URI 中的用户认证数据。\n"
" --loose-query 忽略 URI 中的查询字符串。\n"
-#: src/Zypper.cc:1685
+#: src/Zypper.cc:1803
msgid ""
"renamerepo (nr) [options] <new-alias>\n"
"\n"
@@ -3291,7 +2867,7 @@
#. translators: %s is "--all|--remote|--local|--medium-type"
#. and "--all, --remote, --local, --medium-type"
-#: src/Zypper.cc:1718
+#: src/Zypper.cc:1836
#, c-format, boost-format
msgid ""
"modifyrepo (mr) <options> ...\n"
@@ -3340,7 +2916,7 @@
"-t, --remote 应用修改到全部远程软件源。\n"
"-m, --medium-type <类型> 应用修改到指定类型的软件源。\n"
-#: src/Zypper.cc:1760
+#: src/Zypper.cc:1878
msgid ""
"refresh (ref) [alias|#|URI] ...\n"
"\n"
@@ -3370,7 +2946,7 @@
"-r, --repo <别名|#|URI> 仅刷新指定软件源。\n"
"-s, --services 刷新软件源之前也刷新服务。\n"
-#: src/Zypper.cc:1789
+#: src/Zypper.cc:1907
msgid ""
"clean (cc) [alias|#|URI] ...\n"
"\n"
@@ -3394,7 +2970,7 @@
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: src/Zypper.cc:1818
+#: src/Zypper.cc:1936
#, c-format, boost-format
msgid ""
"list-updates (lu) [options]\n"
@@ -3431,7 +3007,7 @@
#. translators: the first %s = "package, patch, pattern, product",
#. the second %s = "patch",
#. and the third %s = "only, in-avance, in-heaps, as-needed"
-#: src/Zypper.cc:1878
+#: src/Zypper.cc:1993
#, c-format, boost-format
msgid ""
"update (up) [options] [packagename] ...\n"
@@ -3504,8 +3080,8 @@
" %s\n"
"-d, --download-only 仅下载软件包,不安装。\n"
-#: src/Zypper.cc:1948
-#, c-format, boost-format
+#: src/Zypper.cc:2066
+#, fuzzy, c-format, boost-format
msgid ""
"patch [options]\n"
"\n"
@@ -3522,9 +3098,10 @@
"-b, --bugzilla # Install patch fixing the specified bugzilla "
"issue.\n"
" --cve # Install patch fixing the specified CVE issue.\n"
-"-g --category <category> Install all patches in this category.\n"
-" --date <YYYY-MM-DD> Install patches issued up to, but not including, "
-"the specified date\n"
+"-g --category <category> Install only patches with this category.\n"
+" --severity <severity> Install only patches with this severity.\n"
+" --date <YYYY-MM-DD> Install only patches issued up to, but not "
+"including, the specified date\n"
" --debug-solver Create solver test case for debugging.\n"
" --no-recommends Do not install recommended packages, only "
"required.\n"
@@ -3571,7 +3148,11 @@
" %s\n"
"-d, --download-only 仅下载软件包,不安装。\n"
-#: src/Zypper.cc:1997
+#: src/Zypper.cc:2097
+msgid "Install only patches which affect the package management itself."
+msgstr "仅列出影响软件管理器本身的补丁。"
+
+#: src/Zypper.cc:2119
msgid ""
"list-patches (lp) [options]\n"
"\n"
@@ -3580,12 +3161,13 @@
" Command options:\n"
"-b, --bugzilla[=#] List needed patches for Bugzilla issues.\n"
" --cve[=#] List needed patches for CVE issues.\n"
-"-g --category <category> List all patches in this category.\n"
" --issues[=string] Look for issues matching the specified string.\n"
"-a, --all List all patches, not only the needed ones.\n"
+"-g --category <category> List only patches with this category.\n"
+" --severity <severity> List only patches with this severity.\n"
"-r, --repo List only patches from the specified repository.\n"
-" --date <YYYY-MM-DD> List patches issued up to, but not including, the "
-"specified date\n"
+" --date <YYYY-MM-DD> List only patches issued up to, but not "
+"including, the specified date\n"
msgstr ""
"list-patches (lp) [选项]\n"
"\n"
@@ -3594,13 +3176,15 @@
" 命令选项:\n"
"-b, --bugzilla[=#] 列出故障专区问题所需的补丁。\n"
" --cve[=#] 列出 CVE 问题所需的补丁。\n"
+" --issues[=string] 列出匹配指定字符串的问题。\n"
+"-a, --all 列出全部补丁而不是仅列出需要的补丁。\n"
"-g --category <分类> 列出此分类中的全部补丁。\n"
-" --issues[=string] 查找匹配指定字符串的问题。\n"
+" --severity <严重性> 仅列出此严重性的补丁。\n"
"-a, --all 列出全部补丁,不管需要不需要。\n"
"-r, --repo <别名|#|URI> 仅列出指定软件源中的补丁。\n"
" --date <YYYY-MM-DD> 列出指定日期前发布的补丁。\n"
-#: src/Zypper.cc:2039
+#: src/Zypper.cc:2174
#, c-format, boost-format
msgid ""
"dist-upgrade (dup) [options]\n"
@@ -3655,7 +3239,23 @@
" %s\n"
"-d, --download-only 仅下载软件包,不安装。\n"
-#: src/Zypper.cc:2100
+#: src/Zypper.cc:2200
+msgid "Whether to allow downgrading installed resolvables."
+msgstr "是否允许降级已安装解析项。"
+
+#: src/Zypper.cc:2201
+msgid "Whether to allow changing the names of installed resolvables."
+msgstr "是否允许修改已安装解析项的名称。"
+
+#: src/Zypper.cc:2202
+msgid "Whether to allow changing the architecture of installed resolvables."
+msgstr "是否允许修改已安装解析项的架构。"
+
+#: src/Zypper.cc:2203
+msgid "Whether to allow changing the vendor of installed resolvables."
+msgstr "是否允许修改已安装解析项的厂商。"
+
+#: src/Zypper.cc:2241
msgid ""
"search (se) [options] [querystring] ...\n"
"\n"
@@ -3733,7 +3333,7 @@
"* 和 ? 通配符也可以用于搜索字符串中。\n"
"若搜索字符串以 '/' 结尾,它将被解释为一个正则表达式。\n"
-#: src/Zypper.cc:2147
+#: src/Zypper.cc:2290
msgid ""
"patch-check (pchk) [options]\n"
"\n"
@@ -3752,7 +3352,11 @@
"\n"
"-r, --repo <别名|#|URI> 仅检查指定软件源中的补丁。\n"
-#: src/Zypper.cc:2169
+#: src/Zypper.cc:2298
+msgid "Check only for patches which affect the package management itself."
+msgstr "仅检查影响软件管理器自身的补丁。"
+
+#: src/Zypper.cc:2314
msgid ""
"patches (pch) [repository] ...\n"
"\n"
@@ -3770,7 +3374,7 @@
"\n"
"-r, --repo <别名|#|URI> 指定软件源的另一种方法。\n"
-#: src/Zypper.cc:2200
+#: src/Zypper.cc:2345
msgid ""
"packages (pa) [options] [repository] ...\n"
"\n"
@@ -3805,7 +3409,7 @@
"-N, --sort-by-name 按软件包名称排序列表。\n"
"-R, --sort-by-repo 按软件源排序列表。\n"
-#: src/Zypper.cc:2232
+#: src/Zypper.cc:2377
msgid ""
"patterns (pt) [options] [repository] ...\n"
"\n"
@@ -3827,7 +3431,7 @@
"-i, --installed-only 仅显示已安装的软件集。\n"
"-u, --uninstalled-only 仅显示未安装的软件集。\n"
-#: src/Zypper.cc:2258
+#: src/Zypper.cc:2403
msgid ""
"products (pd) [options] [repository] ...\n"
"\n"
@@ -3849,7 +3453,7 @@
"-i, --installed-only 仅显示已安装的产品。\n"
"-u, --uninstalled-only 仅显示未安装的产品。\n"
-#: src/Zypper.cc:2290
+#: src/Zypper.cc:2435
#, c-format, boost-format
msgid ""
"info (if) [options] <name> ...\n"
@@ -3891,7 +3495,7 @@
" --recommends 显示该软件包推荐的软件包。\n"
" --suggests 显示该软件包建议的软件包。\n"
-#: src/Zypper.cc:2323
+#: src/Zypper.cc:2468
#, c-format, boost-format
msgid ""
"patch-info <patchname> ...\n"
@@ -3906,7 +3510,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2342
+#: src/Zypper.cc:2487
#, c-format, boost-format
msgid ""
"pattern-info ...\n"
@@ -3921,7 +3525,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2361
+#: src/Zypper.cc:2506
#, c-format, boost-format
msgid ""
"product-info ...\n"
@@ -3936,7 +3540,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2378
+#: src/Zypper.cc:2523
msgid ""
"what-provides (wp) <capability>\n"
"\n"
@@ -3950,7 +3554,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2429
+#: src/Zypper.cc:2574
msgid ""
"moo\n"
"\n"
@@ -3964,7 +3568,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2451
+#: src/Zypper.cc:2596
#, c-format, boost-format
msgid ""
"addlock (al) [options] <packagename> ...\n"
@@ -3987,7 +3591,7 @@
"-t, --type <类型> 软件包类型 (%s)。\n"
" 默认:%s。\n"
-#: src/Zypper.cc:2478
+#: src/Zypper.cc:2623
#, c-format, boost-format
msgid ""
"removelock (rl) [options] ...\n"
@@ -4009,21 +3613,27 @@
"-t, --type <类型> 软件包类型 (%s)。\n"
" 默认:%s。\n"
-#: src/Zypper.cc:2500
-msgid ""
-"locks (ll)\n"
-"\n"
-"List current package locks.\n"
-"\n"
-"This command has no additional options.\n"
-msgstr ""
-"locks (ll)\n"
-"\n"
-"列出当前的软件包锁定。\n"
-"\n"
-"此命令无额外选项。\n"
+#. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
+#: src/Zypper.cc:2650
+msgid "locks (ll) [options]"
+msgstr "locks (ll) [选项]"
-#: src/Zypper.cc:2520
+#. translators: command description
+#: src/Zypper.cc:2653
+msgid "List current package locks."
+msgstr "列出当前软件包锁定。"
+
+#. translators: -m, --matches
+#: src/Zypper.cc:2657
+msgid "Show the number of resolvables matched by each lock."
+msgstr "显示每次查询匹配到的解析项数目。"
+
+#. translators: -s, --solvables
+#: src/Zypper.cc:2659
+msgid "List the resolvables matched by each lock."
+msgstr "列出每次查询匹配到的解析项。"
+
+#: src/Zypper.cc:2675
msgid ""
"cleanlocks (cl)\n"
"\n"
@@ -4041,7 +3651,7 @@
"-d, --only-duplicates 仅清理重复的锁定。\n"
"-e, --only-empty 仅清理没有锁定任何东西的锁定。\n"
-#: src/Zypper.cc:2541
+#: src/Zypper.cc:2696
msgid ""
"targetos (tos) [options]\n"
"\n"
@@ -4059,7 +3669,7 @@
" 命令选项:\n"
"-l, --label 显示操作系统标签。\n"
-#: src/Zypper.cc:2562
+#: src/Zypper.cc:2717
msgid ""
"versioncmp (vcmp) <version1> <version2>\n"
"\n"
@@ -4075,7 +3685,7 @@
" 命令选项:\n"
"-m, --match 将缺失的释出号视为任意释出号。\n"
-#: src/Zypper.cc:2581
+#: src/Zypper.cc:2736
msgid ""
"licenses\n"
"\n"
@@ -4089,22 +3699,37 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2600
+#. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
+#: src/Zypper.cc:2760
+msgid "ps [options]"
+msgstr "ps [选项]"
+
+#. translators: command description
+#: src/Zypper.cc:2763
msgid ""
-"ps\n"
-"\n"
-"List running processes which might use files deleted by recent upgrades.\n"
-"\n"
-"This command has no additional options.\n"
+"List running processes which might still use files and libraries deleted by "
+"recent upgrades."
+msgstr "列出可能仍使用着被最近升级删除的文件和函数库的运行中进程。"
+
+#. translators: -s, --short
+#: src/Zypper.cc:2767
+msgid ""
+"Create a short table not showing the deleted files. Given twice, show only "
+"processes which are associated with a system service. Given three times, "
+"list the associated system service names only."
msgstr ""
-"ps\n"
-"\n"
-"列出可能使用着最近升级删除的文件的运行中的进程。\n"
-"\n"
-"此命令无额外选项。\n"
-#: src/Zypper.cc:2623
+#. translators: --print <format>
+#: src/Zypper.cc:2769
+#, c-format, boost-format
msgid ""
+"For each associated system service print <format> on the standard output, "
+"followed by a newline. Any '%s' directive in <format> is replaced by the the "
+"system service name."
+msgstr ""
+
+#: src/Zypper.cc:2788
+msgid ""
"download [options] <packages>...\n"
"\n"
"Download rpms specified on the commandline to a local directory.\n"
@@ -4138,7 +3763,7 @@
"件包的最佳版本。\n"
"--dry-run 不下载任何软件包,仅报告将会发生什么。\n"
-#: src/Zypper.cc:2662
+#: src/Zypper.cc:2827
msgid ""
"source-download\n"
"\n"
@@ -4166,7 +3791,7 @@
"--status 不下载任何源代码 RPM,\n"
" 而是显示缺失或多余的源代码 RPM。\n"
-#: src/Zypper.cc:2689
+#: src/Zypper.cc:2854
msgid ""
"quit (exit, ^D)\n"
"\n"
@@ -4180,7 +3805,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2706
+#: src/Zypper.cc:2871
msgid ""
"shell (sh)\n"
"\n"
@@ -4195,7 +3820,7 @@
"此命令无额外选项。\n"
#. translators: this is just a legacy command
-#: src/Zypper.cc:2724
+#: src/Zypper.cc:2889
msgid ""
"service-types (st)\n"
"\n"
@@ -4205,10 +3830,21 @@
"\n"
"列出可用的服务类型。\n"
+#. translators: this is just a legacy command
+#: src/Zypper.cc:2905
+msgid ""
+"list-resolvables (lr)\n"
+"\n"
+"List available resolvable types.\n"
+msgstr ""
+"list-resolvable (lr)\n"
+"\n"
+"列出可用的解析项类型。\n"
+
#. trunslators: this is a rug-compatibility command (equivalent of
#. 'zypper addrepo -t plaindir URI'). You can refer to rug's translations
#. for how to translate specific terms like channel or service if in doubt.
-#: src/Zypper.cc:2762
+#: src/Zypper.cc:2927
msgid ""
"mount\n"
"\n"
@@ -4228,7 +3864,7 @@
"-n, --name <名称> 使用给定字符串作为服务名称。\n"
"-r, --recurse 递归探测子文件夹。\n"
-#: src/Zypper.cc:2791
+#: src/Zypper.cc:2956
#, c-format, boost-format
msgid ""
"patch-search [options] [querystring...]\n"
@@ -4241,7 +3877,7 @@
"搜索匹配给定搜索字符串的补丁。这是 '%s' 的一个别名。\n"
#. translators: this is just a legacy command
-#: src/Zypper.cc:2808
+#: src/Zypper.cc:2973
msgid ""
"ping [options]\n"
"\n"
@@ -4251,15 +3887,15 @@
"\n"
"此命令的实现是虚假的,总是返回 0。\n"
-#: src/Zypper.cc:2832 src/Zypper.cc:5148
+#: src/Zypper.cc:3016 src/Zypper.cc:5273
msgid "Unexpected program flow."
msgstr "意外程序流。"
-#: src/Zypper.cc:2882
+#: src/Zypper.cc:3065
msgid "Non-option program arguments: "
msgstr "无选项程序参数:"
-#: src/Zypper.cc:2937
+#: src/Zypper.cc:3121
msgid ""
"PackageKit is blocking zypper. This happens if you have an updater applet or "
"other software management application using PackageKit running."
@@ -4267,20 +3903,20 @@
"PackageKit 正屏蔽着 zypper。这发生在若您已运行了一个使用 PackageKit 的升级挂"
"件或其他软件管理程序时。"
-#: src/Zypper.cc:2943
+#: src/Zypper.cc:3127
msgid "Tell PackageKit to quit?"
msgstr "通知 PackageKit 退出吗?"
-#: src/Zypper.cc:2952
+#: src/Zypper.cc:3136
msgid "PackageKit is still running (probably busy)."
msgstr "PackageKit 仍在运行 (或许正忙)。"
-#: src/Zypper.cc:2954
+#: src/Zypper.cc:3138
msgid "Try again?"
msgstr "重试吗?"
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: src/Zypper.cc:3007
+#: src/Zypper.cc:3191
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -4290,26 +3926,20 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: src/Zypper.cc:3035
+#: src/Zypper.cc:3219
msgid "Root privileges are required for refreshing services."
msgstr "刷新服务需要有 root 特权。"
-#: src/Zypper.cc:3062 src/Zypper.cc:3180 src/Zypper.cc:3411
+#: src/Zypper.cc:3246 src/Zypper.cc:3334 src/Zypper.cc:3565
msgid "Root privileges are required for modifying system services."
msgstr "修改系统服务需要有 root 特权。"
-#: src/Zypper.cc:3131
-msgid ""
-"Could not determine the type of the repository. Check if the specified URI "
-"points to a valid repository."
-msgstr "无法确定软件源类型。请检查指定的 URI 是否指向了一个有效的软件源。"
-
-#: src/Zypper.cc:3161
+#: src/Zypper.cc:3315
#, c-format, boost-format
msgid "'%s' is not a valid service type."
msgstr "`%s' 不是一个有效的服务类型。"
-#: src/Zypper.cc:3163
+#: src/Zypper.cc:3317
#, c-format, boost-format
msgid "See '%s' or '%s' to get a list of known service types."
msgstr "请参考 '%s' 或 '%s' 获取已知服务类型列表。"
@@ -4318,116 +3948,116 @@
#. followed by ms command help text which will explain it
#. translators: aggregate option is e.g. "--all". This message will be
#. followed by mr command help text which will explain it
-#: src/Zypper.cc:3192 src/Zypper.cc:3562
+#: src/Zypper.cc:3346 src/Zypper.cc:3716
msgid "Alias or an aggregate option is required."
msgstr "需要别名或者一个合计选项。"
-#: src/Zypper.cc:3226
+#: src/Zypper.cc:3380
#, c-format, boost-format
msgid "Service '%s' not found."
msgstr "未找到服务 '%s'。"
-#: src/Zypper.cc:3258 src/Zypper.cc:3410 src/Zypper.cc:3494 src/Zypper.cc:3549
+#: src/Zypper.cc:3412 src/Zypper.cc:3564 src/Zypper.cc:3648 src/Zypper.cc:3703
msgid "Root privileges are required for modifying system repositories."
msgstr "修改系统软件源需要有 root 特权。"
-#: src/Zypper.cc:3313 src/Zypper.cc:3679
+#: src/Zypper.cc:3467 src/Zypper.cc:3833
msgid "Too few arguments."
msgstr "参数太少。"
-#: src/Zypper.cc:3337
+#: src/Zypper.cc:3491
msgid ""
"If only one argument is used, it must be a URI pointing to a .repo file."
msgstr "如果只用一个参数,那么它必须是一个指向 .repo 文件的 URI。"
-#: src/Zypper.cc:3367
+#: src/Zypper.cc:3521
#, c-format, boost-format
msgid "Cannot use %s together with %s. Using the %s setting."
msgstr "无法同时使用 %s 和 %s。正在使用 %s 设置。"
-#: src/Zypper.cc:3388
+#: src/Zypper.cc:3542
msgid "Specified type is not a valid repository type:"
msgstr "指定的类型不是一个有效的软件源类型:"
-#: src/Zypper.cc:3390
+#: src/Zypper.cc:3544
#, c-format, boost-format
msgid "See '%s' or '%s' to get a list of known repository types."
msgstr "请参考 '%s' 或 '%s' 获取已知软件源类型列表。"
-#: src/Zypper.cc:3418 src/Zypper.cc:4736 src/utils/messages.cc:48
+#: src/Zypper.cc:3572 src/Zypper.cc:4845 src/utils/messages.cc:48
msgid "Required argument missing."
msgstr "缺失所需参数。"
#. translators: %s is the supplied command line argument which
#. for which no repository counterpart was found
-#: src/Zypper.cc:3444
+#: src/Zypper.cc:3598
#, c-format, boost-format
msgid "Repository '%s' not found by alias, number or URI."
msgstr "通过别名、编号或 URI 都未找到软件源 '%s'。"
#. translators: %s is the supplied command line argument which
#. for which no service counterpart was found
-#: src/Zypper.cc:3467
+#: src/Zypper.cc:3621
#, c-format, boost-format
msgid "Service '%s' not found by alias, number or URI."
msgstr "通过别名、编号或 URI 都未找到服务 '%s'。"
-#: src/Zypper.cc:3501
+#: src/Zypper.cc:3655
msgid "Too few arguments. At least URI and alias are required."
msgstr "参数太少。至少需要 URI 和别名。"
-#: src/Zypper.cc:3525
+#: src/Zypper.cc:3679
#, c-format, boost-format
msgid "Repository '%s' not found."
msgstr "未找到软件源 '%s'。"
-#: src/Zypper.cc:3595
+#: src/Zypper.cc:3749
#, c-format, boost-format
msgid "Repository %s not found."
msgstr "未找到软件源 %s。"
-#: src/Zypper.cc:3615
+#: src/Zypper.cc:3769
msgid "Root privileges are required for refreshing system repositories."
msgstr "刷新系统软件源需要有 root 特权。"
-#: src/Zypper.cc:3622
+#: src/Zypper.cc:3776
#, c-format, boost-format
msgid "The '%s' global option has no effect here."
msgstr "全局选项 '%s' 在此无效。"
-#: src/Zypper.cc:3631
+#: src/Zypper.cc:3785
#, c-format, boost-format
msgid "Arguments are not allowed if '%s' is used."
msgstr "若使用 '%s' 则不允许使用参数。"
-#: src/Zypper.cc:3659
+#: src/Zypper.cc:3813
msgid "Root privileges are required for cleaning local caches."
msgstr "清理本地缓存需要有 root 特权。"
-#: src/Zypper.cc:3680
+#: src/Zypper.cc:3834
msgid "At least one package name is required."
msgstr "需要至少一个软件包名称。"
-#: src/Zypper.cc:3690
+#: src/Zypper.cc:3844
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "安装或卸载软件包需要有 root 特权。"
#. translators: rug related message, shown if
#. 'zypper in --entire-catalog foorepo someargument' is specified
-#: src/Zypper.cc:3702
+#: src/Zypper.cc:3856
msgid "Ignoring arguments, marking the entire repository."
msgstr "忽略参数,标记整个软件源。"
-#: src/Zypper.cc:3712
+#: src/Zypper.cc:3866
#, c-format, boost-format
msgid "Unknown package type: %s"
msgstr "未知软件包类型:%s"
-#: src/Zypper.cc:3723
+#: src/Zypper.cc:3877
msgid "Cannot uninstall patches."
msgstr "无法卸载补丁。"
-#: src/Zypper.cc:3724
+#: src/Zypper.cc:3878
msgid ""
"Installed status of a patch is determined solely based on its dependencies.\n"
"Patches are not installed in sense of copied files, database records,\n"
@@ -4436,107 +4066,101 @@
"一款补丁的安装情况完全取决于其依赖关系。\n"
"因此仅仅是复制文件、数据库记录或其它东西并不代表安装了补丁。"
-#: src/Zypper.cc:3735
+#: src/Zypper.cc:3889
msgid "Uninstallation of a source package not defined and implemented."
msgstr "目前未定义也未实现源代码包的卸载。"
-#: src/Zypper.cc:3756
+#: src/Zypper.cc:3910
#, c-format, boost-format
msgid "'%s' looks like an RPM file. Will try to download it."
msgstr "'%s' 貌似是一个 RPM 文件,将尝试下载之。"
-#: src/Zypper.cc:3769
+#: src/Zypper.cc:3923
#, c-format, boost-format
msgid "Problem with the RPM file specified as '%s', skipping."
msgstr "指定为 '%s' 的 RPM 文件有问题,正在跳过。"
-#: src/Zypper.cc:3794
+#: src/Zypper.cc:3948
#, c-format, boost-format
msgid "Problem reading the RPM header of %s. Is it an RPM file?"
msgstr "读取 %s 的 RPM 头部出现问题。它是一个 RPM 文件吗?"
-#: src/Zypper.cc:3819
+#: src/Zypper.cc:3973
msgid "Plain RPM files cache"
msgstr "纯 RPM 文件缓存"
-#: src/Zypper.cc:3836
+#: src/Zypper.cc:3990
msgid "No valid arguments specified."
msgstr "未指定有效的参数。"
-#: src/Zypper.cc:3850 src/Zypper.cc:3988
+#: src/Zypper.cc:4004 src/Zypper.cc:4142
msgid ""
"No repositories defined. Operating only with the installed resolvables. "
"Nothing can be installed."
msgstr "未定义软件源。只能操作已安装的可解析项。不能安装新东西。"
#. translators: meaning --capability contradicts --force/--name
-#: src/Zypper.cc:3888 src/Zypper.cc:4495
+#: src/Zypper.cc:4042 src/Zypper.cc:4646
#, c-format, boost-format
msgid "%s contradicts %s"
msgstr "%s 与 %s 冲突"
#. translators: meaning --force with --capability
-#: src/Zypper.cc:3897
+#: src/Zypper.cc:4051
#, c-format, boost-format
msgid "%s cannot currently be used with %s"
msgstr "%s 目前不能和 %s 一起使用"
-#: src/Zypper.cc:3941
+#: src/Zypper.cc:4095
msgid "Source package name is a required argument."
msgstr "源代码包名称是一个必需的参数。"
-#: src/Zypper.cc:4031
+#: src/Zypper.cc:4185
msgid "Mode is set to 'match-exact'"
msgstr "模式已设为精确匹配"
-#: src/Zypper.cc:4055 src/Zypper.cc:4415 src/Zypper.cc:4516 src/Zypper.cc:4764
-#: src/Zypper.cc:4832 src/Zypper.cc:4877
+#: src/Zypper.cc:4207 src/Zypper.cc:4560 src/Zypper.cc:4667 src/Zypper.cc:4873
+#: src/Zypper.cc:4926 src/Zypper.cc:4971
#, c-format, boost-format
msgid "Unknown package type '%s'."
msgstr "未知软件包类型 '%s'。"
-#: src/Zypper.cc:4078
+#: src/Zypper.cc:4230
#, c-format, boost-format
msgid "Specified repository '%s' is disabled."
msgstr "已禁用指定软件源 '%s'。"
-#: src/Zypper.cc:4209 src/search.cc:594
+#: src/Zypper.cc:4361 src/search.cc:579
msgid "No packages found."
msgstr "未找到软件包。"
-#: src/Zypper.cc:4252
+#: src/Zypper.cc:4397
msgid "Problem occurred initializing or executing the search query"
msgstr "初始化或执行搜索查询出现问题"
-#: src/Zypper.cc:4253
+#: src/Zypper.cc:4398
msgid "See the above message for a hint."
msgstr "请参考以上消息汲取灵感。"
-#. translators: Running as 'rug', cannot use 'best-effort' option.
-#: src/Zypper.cc:4436 src/Zypper.cc:4562
+#: src/Zypper.cc:4580 src/Zypper.cc:4632
#, c-format, boost-format
-msgid "Running as '%s', cannot use '%s' option."
-msgstr "正以 '%s' 运行,无法使用 '%s' 选项。"
-
-#: src/Zypper.cc:4444
-#, c-format, boost-format
msgid "Cannot use %s together with %s."
msgstr "无法同时使用 %s 和 %s。"
-#: src/Zypper.cc:4477
+#: src/Zypper.cc:4613
msgid "Root privileges are required for updating packages."
msgstr "更新软件包需要有 root 特权。"
-#: src/Zypper.cc:4523 src/Zypper.cc:4531 src/Zypper.cc:4648
+#: src/Zypper.cc:4674 src/Zypper.cc:4682 src/Zypper.cc:4757
msgid "Operation not supported."
msgstr "不支持该操作。"
-#: src/Zypper.cc:4524
+#: src/Zypper.cc:4675
#, c-format, boost-format
msgid "To update installed products use '%s'."
msgstr "要更新已安装的产品请使用 '%s'。"
-#: src/Zypper.cc:4533
+#: src/Zypper.cc:4684
#, c-format, boost-format
msgid ""
"Zypper does not keep track of installed source packages. To install the "
@@ -4545,16 +4169,16 @@
"Zypper 不会追踪已安装的源软件包。要安装最新的源软件包和它的编译依赖,请使用 "
"'%s'。"
-#: src/Zypper.cc:4551
+#: src/Zypper.cc:4702
msgid ""
"Cannot use multiple types when specific packages are given as arguments."
msgstr "当指定软件包作为参数给出时不能使用多种类型。"
-#: src/Zypper.cc:4688
+#: src/Zypper.cc:4797
msgid "Root privileges are required for performing a distribution upgrade."
msgstr "执行发行版升级需要有 root 特权。"
-#: src/Zypper.cc:4709
+#: src/Zypper.cc:4818
#, c-format, boost-format
msgid ""
"You are about to do a distribution upgrade with all enabled repositories. "
@@ -4564,97 +4188,79 @@
"您正要使用全部已启用软件源进行发行版升级。继续前请确保这些源之间相互兼容。参"
"考 '%s' 获知更多关于此命令的信息。"
-#: src/Zypper.cc:4739 src/utils/messages.cc:40 src/utils/messages.cc:50
+#: src/Zypper.cc:4848 src/utils/messages.cc:40 src/utils/messages.cc:50
#: src/utils/messages.cc:68
msgid "Usage"
msgstr "用法"
-#: src/Zypper.cc:4794 src/Zypper.cc:4855
+#: src/Zypper.cc:4903 src/Zypper.cc:4949
msgid "Root privileges are required for adding of package locks."
msgstr "添加软件包锁定需要有 root 特权。"
-#: src/Zypper.cc:4923
+#: src/Zypper.cc:5064
#, c-format, boost-format
-msgid "Removed %lu lock."
-msgid_plural "Removed %lu locks."
-msgstr[0] "已移除 %lu 锁定。"
-
-#: src/Zypper.cc:4950
-#, c-format, boost-format
msgid "Distribution Label: %s"
msgstr "发行版标签: %s"
-#: src/Zypper.cc:4952
+#: src/Zypper.cc:5066
#, c-format, boost-format
msgid "Short Label: %s"
msgstr "短标签:%s"
-#: src/Zypper.cc:4998
+#: src/Zypper.cc:5112
#, c-format, boost-format
msgid "%s matches %s"
msgstr "%s 匹配 %s"
-#: src/Zypper.cc:5000
+#: src/Zypper.cc:5114
#, c-format, boost-format
msgid "%s is newer than %s"
msgstr "%s 较 %s 新"
-#: src/Zypper.cc:5002
+#: src/Zypper.cc:5116
#, c-format, boost-format
msgid "%s is older than %s"
msgstr "%s 较 %s 旧"
-#: src/Zypper.cc:5075 src/source-download.cc:217
+#: src/Zypper.cc:5200 src/source-download.cc:217
#, c-format, boost-format
msgid "Insufficient privileges to use download directory '%s'."
msgstr "权限不足以使用下载文件夹 '%s'。"
-#: src/Zypper.cc:5133
+#: src/Zypper.cc:5258
msgid "This command only makes sense in the zypper shell."
msgstr "此命令只有在 zypper 壳层中才有意义。"
-#: src/Zypper.cc:5145
+#: src/Zypper.cc:5270
msgid "You already are running zypper's shell."
msgstr "您已在运行 zypper 的壳层了。"
-#: src/Zypper.cc:5162
+#: src/Zypper.cc:5287
msgid "Description"
msgstr "描述"
-#: src/Zypper.cc:5230
+#: src/Zypper.cc:5356
msgid "Resolvable Type"
msgstr "可解析项类型"
#. translators: meaning 'dependency problem' found during solving
-#: src/solve-commit.cc:45
+#: src/solve-commit.cc:47
msgid "Problem: "
msgstr "问题:"
#. TranslatorExplanation %d is the solution number
-#: src/solve-commit.cc:58
+#: src/solve-commit.cc:60
#, c-format, boost-format
msgid " Solution %d: "
msgstr "解决方案 %d:"
-#: src/solve-commit.cc:77
-msgid "Choose the above solution using '1' or skip, retry or cancel"
-msgid_plural "Choose from above solutions by number or skip, retry or cancel"
-msgstr[0] "请通过数字从以上解决方案中选择,或者跳过、重试或取消"
-
-#. translators: translate 'c' to whatever you translated the 'c' in
-#. "c" and "s/r/c" strings
-#: src/solve-commit.cc:84
-msgid "Choose the above solution using '1' or cancel using 'c'"
-msgid_plural "Choose from above solutions by number or cancel"
-msgstr[0] "请通过数字从以上解决方案中选择,或取消"
-
#. translators: answers for dependency problem solution input prompt:
#. "Choose from above solutions by number or skip, retry or cancel"
#. Translate the letters to whatever is suitable for your language.
#. The anserws must be separated by slash characters '/' and must
#. correspond to skip/retry/cancel in that order.
#. The answers should be lower case letters.
-#: src/solve-commit.cc:103
+#: src/solve-commit.cc:105
msgid "s/r/c"
msgstr "s/r/c"
@@ -4665,77 +4271,81 @@
#. See the "s/r/c" comment for other details.
#. One letter string for translation can be tricky, so in case of problems,
#. please report a bug against zypper at bugzilla.novell.com, we'll try to solve it.
-#: src/solve-commit.cc:115
+#: src/solve-commit.cc:117
msgid "c"
msgstr "c"
#. continue with next problem
-#: src/solve-commit.cc:137
+#: src/solve-commit.cc:139
#, c-format, boost-format
msgid "Applying solution %s"
msgstr "正在应用解决方案 %s"
-#: src/solve-commit.cc:161
-#, c-format, boost-format
-msgid "%d Problem:"
-msgid_plural "%d Problems:"
-msgstr[0] "%d 个问题:"
-
#. should not happen! If solve() failed at least one problem must be set!
-#: src/solve-commit.cc:165
+#: src/solve-commit.cc:167
msgid "Specified capability not found"
msgstr "未找到指定的功能。"
-#: src/solve-commit.cc:176
+#: src/solve-commit.cc:178
#, c-format, boost-format
msgid "Problem: %s"
msgstr "问题:%s"
-#: src/solve-commit.cc:191
+#: src/solve-commit.cc:193
msgid "Resolving dependencies..."
msgstr "正在解决依赖关系..."
#. translators: meaning --force-resolution and --no-force-resolution
-#: src/solve-commit.cc:229
+#: src/solve-commit.cc:234
#, c-format, boost-format
msgid "%s conflicts with %s, will use the less aggressive %s"
msgstr "%s 与 %s 冲突,将使用不太激进的 %s"
-#: src/solve-commit.cc:260
+#: src/solve-commit.cc:263
msgid "Force resolution:"
msgstr "强制解决:"
-#: src/solve-commit.cc:334
+#: src/solve-commit.cc:346
msgid "Verifying dependencies..."
msgstr "正在校验依赖关系..."
#. Here: compute the full upgrade
-#: src/solve-commit.cc:379
+#: src/solve-commit.cc:394
msgid "Computing upgrade..."
msgstr "正在计算升级..."
-#: src/solve-commit.cc:395
+#: src/solve-commit.cc:410
msgid "Generating solver test case..."
msgstr "正在生成解决器试例..."
-#: src/solve-commit.cc:398
+#: src/solve-commit.cc:413
#, c-format, boost-format
msgid "Solver test case generated successfully at %s."
msgstr "在 %s 成功生成了解决器试例。"
-#: src/solve-commit.cc:402
+#: src/solve-commit.cc:417
msgid "Error creating the solver test case."
msgstr "创建解决器试例出错。"
-#: src/solve-commit.cc:435 src/utils/misc.cc:422
+#: src/solve-commit.cc:451
+#, c-format, boost-format
+msgid ""
+"Check for running processes using deleted libraries is disabled in zypper."
+"conf. Run '%s' to check manually."
+msgstr ""
+"检查使用了已删除函数库的运行中进程的功能在 zypper.conf 中禁用了。"
+"运行 '%s' 手动检查。"
+
+#. Here: Table output
+#: src/solve-commit.cc:457 src/ps.cc:104
msgid "Checking for running processes using deleted libraries..."
msgstr "正在检查使用了已删除库文件的运行中进程..."
-#: src/solve-commit.cc:444 src/utils/misc.cc:430
+#: src/solve-commit.cc:466 src/ps.cc:59
msgid "Check failed:"
msgstr "检查失败:"
-#: src/solve-commit.cc:451
+#: src/solve-commit.cc:473
#, c-format, boost-format
msgid ""
"There are some running programs that might use files deleted by recent "
@@ -4745,38 +4355,38 @@
"一些运行中的程序可能使用着最近升级删除的文件。您可能希望检查并重启部分程序。"
"可运行 '%s' 列出这些程序。"
-#: src/solve-commit.cc:462
+#: src/solve-commit.cc:484
msgid "Update notifications were received from the following packages:"
msgstr "接收到了来自以下软件包的更新通知:"
-#: src/solve-commit.cc:474
+#: src/solve-commit.cc:496
#, c-format, boost-format
msgid "Message from package %s:"
msgstr "来自软件包 %s 的消息:"
-#: src/solve-commit.cc:482
+#: src/solve-commit.cc:504
msgid "y/n"
msgstr "y/n"
-#: src/solve-commit.cc:483
+#: src/solve-commit.cc:505
msgid "View the notifications now?"
msgstr "现在查看通知吗?"
-#: src/solve-commit.cc:528
+#: src/solve-commit.cc:550
msgid "Computing distribution upgrade..."
msgstr "正在计算发行版升级..."
-#: src/solve-commit.cc:533
+#: src/solve-commit.cc:555
msgid "Resolving package dependencies..."
msgstr "正在解决软件包依赖关系..."
-#: src/solve-commit.cc:603
+#: src/solve-commit.cc:632
msgid ""
"Some of the dependencies of installed packages are broken. In order to fix "
"these dependencies, the following actions need to be taken:"
msgstr "已安装软件包的某些依赖关系已损坏。要修复这些依赖关系,需要执行以下动作:"
-#: src/solve-commit.cc:611
+#: src/solve-commit.cc:640
msgid "Root privileges are required to fix broken package dependencies."
msgstr "修复受损的软件包依赖关系需要有 root 特权。"
@@ -4790,79 +4400,79 @@
#. The answers should be lower case letters, but in general, any UTF-8
#. string will do.
#. ! \todo add c for changelog and x for explain (show the dep tree)
-#: src/solve-commit.cc:638
+#: src/solve-commit.cc:666
msgid "y/n/p/v/a/r/m/d/g"
msgstr "y/n/p/v/a/r/m/d/g"
#. translators: help text for 'y' option in the 'Continue?' prompt
-#: src/solve-commit.cc:643
+#: src/solve-commit.cc:671
msgid ""
"Yes, accept the summary and proceed with installation/removal of packages."
msgstr "是,接受摘要并继续安装/移除软件包。"
#. translators: help text for 'n' option in the 'Continue?' prompt
-#: src/solve-commit.cc:645
+#: src/solve-commit.cc:673
msgid "No, cancel the operation."
msgstr "否,取消操作。"
#. translators: help text for 'p' option in the 'Continue?' prompt
-#: src/solve-commit.cc:647
+#: src/solve-commit.cc:675
msgid ""
"Restart solver in no-force-resolution mode in order to show dependency "
"problems."
msgstr "以不强制解决模式重启依赖关系解决器来显示依赖关系问题。"
#. translators: help text for 'v' option in the 'Continue?' prompt
-#: src/solve-commit.cc:649
+#: src/solve-commit.cc:677
msgid "Toggle display of package versions."
msgstr "切换显示软件包版本。"
#. translators: help text for 'a' option in the 'Continue?' prompt
-#: src/solve-commit.cc:651
+#: src/solve-commit.cc:679
msgid "Toggle display of package architectures."
msgstr "切换显示软件包架构。"
#. translators: help text for 'r' option in the 'Continue?' prompt
-#: src/solve-commit.cc:653
+#: src/solve-commit.cc:681
msgid ""
"Toggle display of repositories from which the packages will be installed."
msgstr "切换显示待安装软件包所属软件源。"
#. translators: help text for 'm' option in the 'Continue?' prompt
-#: src/solve-commit.cc:655
+#: src/solve-commit.cc:683
msgid "Toggle display of package vendor names."
msgstr "切换显示软件包厂商名称。"
#. translators: help text for 'd' option in the 'Continue?' prompt
-#: src/solve-commit.cc:657
+#: src/solve-commit.cc:685
msgid "Toggle between showing all details and as few details as possible."
msgstr "切换显示全部细节和最少细节。"
#. translators: help text for 'g' option in the 'Continue?' prompt
-#: src/solve-commit.cc:659
+#: src/solve-commit.cc:687
msgid "View the summary in pager."
msgstr "在分页器中查看摘要。"
-#: src/solve-commit.cc:757
+#: src/solve-commit.cc:798
msgid "committing"
msgstr "正在提交"
-#: src/solve-commit.cc:759
+#: src/solve-commit.cc:800
msgid "(dry run)"
msgstr "(演习)"
-#: src/solve-commit.cc:780 src/solve-commit.cc:823
+#: src/solve-commit.cc:826 src/solve-commit.cc:869
msgid "Problem retrieving the package file from the repository:"
msgstr "从软件源撷取软件包文件出现问题:"
#. translators: the first %s is 'zypper refresh' and the second
#. is repo allias
-#: src/solve-commit.cc:819
+#: src/solve-commit.cc:865
#, c-format, boost-format
msgid "Repository '%s' is out of date. Running '%s' might help."
msgstr "软件源 '%s' 已过时。运行 '%s' 可能有帮助。"
-#: src/solve-commit.cc:832
+#: src/solve-commit.cc:878
msgid ""
"The package integrity check failed. This may be a problem with the "
"repository or media. Try one of the following:\n"
@@ -4879,17 +4489,26 @@
"- 使用其它安装介质 (若当前介质已损坏)\n"
"- 使用其它软件源"
-#: src/solve-commit.cc:846
+#: src/solve-commit.cc:892
msgid "Problem occured during or after installation or removal of packages:"
msgstr "安装/移除以下软件包期间或之后发生问题:"
-#: src/solve-commit.cc:862
+#: src/solve-commit.cc:900
+msgid "Installation has completed with error."
+msgstr "安装已完成但有错误。"
+
+#: src/solve-commit.cc:902
+#, boost-format
+msgid "You may run '%1%' to repair any dependency problems."
+msgstr "您可以运行 '%1%' 来修复依赖问题。 "
+
+#: src/solve-commit.cc:917
msgid ""
"One of installed patches requires reboot of your machine. Reboot as soon as "
"possible."
msgstr "已安装的某个补丁需要重启计算机。请尽快重启。"
-#: src/solve-commit.cc:871
+#: src/solve-commit.cc:926
msgid ""
"One of installed patches affects the package manager itself. Run this "
"command once more to install any other needed patches."
@@ -4897,14 +4516,72 @@
"已安装的某个补丁影响到了软件包管理器自身。请再次运行此命令来安装全部其它所需"
"补丁。"
-#: src/solve-commit.cc:891
+#: src/solve-commit.cc:947
msgid "Dependencies of all installed packages are satisfied."
msgstr "已满足全部已安装软件包的依赖关系。"
-#: src/solve-commit.cc:893 src/download.cc:129
+#: src/solve-commit.cc:949 src/download.cc:129
msgid "Nothing to do."
msgstr "无事可做。"
+#. process ID
+#: src/ps.cc:115
+msgid "PID"
+msgstr "进程编号"
+
+#. parent process ID
+#: src/ps.cc:117
+msgid "PPID"
+msgstr "父进程编号"
+
+#. process user ID
+#: src/ps.cc:119
+msgid "UID"
+msgstr "唯一编号"
+
+#. process login name
+#: src/ps.cc:121
+msgid "User"
+msgstr "用户名"
+
+#. process command name
+#: src/ps.cc:123
+msgid "Command"
+msgstr "命令"
+
+# menu item for selecting a file
+#. "list of deleted files or libraries accessed"
+#: src/ps.cc:129
+msgid "Files"
+msgstr "文件"
+
+#: src/ps.cc:160
+msgid "No processes using deleted files found."
+msgstr "未找到使用已删除文件的进程。"
+
+#: src/ps.cc:164
+msgid "The following running processes use deleted files:"
+msgstr "以下运行中进程使用了已删除的文件:"
+
+#: src/ps.cc:167
+msgid "You may wish to restart these processes."
+msgstr "您可能希望重启这些进程。"
+
+#: src/ps.cc:168
+#, c-format, boost-format
+msgid ""
+"See '%s' for information about the meaning of values in the above table."
+msgstr "关于上面表格中的值的意义的信息请参考 '%s'。"
+
+#: src/ps.cc:175
+msgid ""
+"Note: Not running as root you are limited to searching for files you have "
+"permission to examine with the system stat(2) function. The result might be "
+"incomplete."
+msgstr ""
+"注意:不使用根用户运行您只能搜索现有用户有权限使用系统 stat(2) 函数检测的文"
+"件。结果可能不完整。"
+
#: src/source-download.cc:208
#, c-format, boost-format
msgid "Can't create or access download directory '%s'."
@@ -4992,34 +4669,33 @@
msgstr "没有要下载的源代码包。"
#. translators: package version (header)
-#: src/search.cc:59 src/search.cc:73 src/search.cc:464 src/search.cc:606
-#: src/search.cc:679
+#: src/search.cc:75 src/search.cc:451 src/search.cc:588 src/search.cc:653
msgid "Version"
msgstr "版本"
-#: src/search.cc:140 src/search.cc:155
+#: src/search.cc:142
msgid "System Packages"
msgstr "系统软件包"
-#: src/search.cc:427
+#: src/search.cc:413
msgid "No needed patches found."
msgstr "未找到所需补丁。"
-#: src/search.cc:498
+#: src/search.cc:482
msgid "No patterns found."
msgstr "未找到软件集。"
#. translators: used in products. Internal Name is the unix name of the
#. product whereas simply Name is the official full name of the product.
-#: src/search.cc:677
+#: src/search.cc:651
msgid "Internal Name"
msgstr "内部名称"
-#: src/search.cc:762
+#: src/search.cc:731
msgid "No products found."
msgstr "未找到产品。"
-#: src/search.cc:786
+#: src/search.cc:755
#, c-format, boost-format
msgid "No providers of '%s' found."
msgstr "未找到提供了 '%s' 的软件包。"
@@ -5100,24 +4776,24 @@
msgid "'%s' is not a package name or capability."
msgstr "'%s' 不是一个软件包名称或功能。"
-#: src/Zypper.h:421
+#: src/Zypper.h:449
msgid "Finished with error."
msgstr "完成但有错误。"
-#: src/Zypper.h:423
+#: src/Zypper.h:451
msgid "Done."
msgstr "完毕。"
#. translators: the first %s is name of the resolvable,
#. the second is its kind (e.g. 'zypper package')
-#: src/misc.cc:154
+#: src/misc.cc:155
#, c-format, boost-format
msgid "Automatically agreeing with %s %s license."
msgstr "正在自动同意 %s %s 许可。"
#. translators: the first %s is the name of the package, the second
#. is " (package-type)" if other than "package" (patch/product/pattern)
-#: src/misc.cc:180
+#: src/misc.cc:181
#, c-format, boost-format
msgid ""
"In order to install '%s'%s, you must agree to terms of the following license "
@@ -5125,17 +4801,17 @@
msgstr "要安装 '%s'%s,您必须同意以下许可协议条款:"
#. lincense prompt
-#: src/misc.cc:195
+#: src/misc.cc:196
msgid "Do you agree with the terms of the license?"
msgstr "您同意这些许可条款吗?"
-#: src/misc.cc:204
+#: src/misc.cc:205
msgid "Aborting installation due to the need for license confirmation."
msgstr "由于未确认许可,正在中止安装。"
#. translators: %sanslate the '--auto-agree-with-licenses',
#. it is a command line option
-#: src/misc.cc:209
+#: src/misc.cc:210
#, c-format, boost-format
msgid ""
"Please restart the operation in interactive mode and confirm your agreement "
@@ -5144,115 +4820,113 @@
#. translators: e.g. "... with flash package license."
#. ! \todo fix this to allow proper translation
-#: src/misc.cc:221
+#: src/misc.cc:222
#, c-format, boost-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "由于用户不同意 %s %s 许可,正在中止安装"
-#: src/misc.cc:269
+#: src/misc.cc:266
msgid "License"
msgstr "许可"
-#: src/misc.cc:287
+#: src/misc.cc:284
msgid "EULA"
msgstr "最终用户许可协议"
-#: src/misc.cc:299
+#: src/misc.cc:296
msgid "SUMMARY"
msgstr "摘要"
-#: src/misc.cc:300
+#: src/misc.cc:297
#, c-format, boost-format
msgid "Installed packages: %d"
msgstr "已安装软件包:%d"
-#: src/misc.cc:301
+#: src/misc.cc:298
#, c-format, boost-format
msgid "Installed packages with counterparts in repositories: %d"
msgstr "软件源中有替代品的已安装软件包:%d"
-#: src/misc.cc:302
+#: src/misc.cc:299
#, c-format, boost-format
msgid "Installed packages with EULAs: %d"
msgstr "有最终用户许可协议的已安装软件包:%d"
-#: src/misc.cc:332
+#: src/misc.cc:329
#, c-format, boost-format
msgid "Package '%s' has source package '%s'."
msgstr "软件包 '%s' 有源代码包 '%s'。"
-#: src/misc.cc:338
+#: src/misc.cc:335
#, c-format, boost-format
msgid "Source package '%s' for package '%s' not found."
msgstr "未找到源代码包 '%s' 适用于软件包 '%s'。"
-#: src/misc.cc:420
+#: src/misc.cc:417
#, c-format, boost-format
msgid "Installing source package %s-%s"
msgstr "正在安装源代码包 %s-%s"
-#: src/misc.cc:431
+#: src/misc.cc:428
#, c-format, boost-format
msgid "Source package %s-%s successfully retrieved."
msgstr "已成功撷取源代码包 %s-%s。"
-#: src/misc.cc:439
+#: src/misc.cc:436
#, c-format, boost-format
msgid "Source package %s-%s successfully installed."
msgstr "已成功安装源代码包 %s-%s。"
-#: src/misc.cc:447
+#: src/misc.cc:444
#, c-format, boost-format
msgid "Problem installing source package %s-%s:"
msgstr "安装源代码包 %s-%s 出现问题:"
#. translators: locks table value
-#. importance
-#: src/locks.cc:22 src/locks.cc:64 src/locks.cc:77
+#: src/locks.cc:24 src/locks.cc:126
msgid "(any)"
msgstr "(任意)"
#. translators: locks table value
-#: src/locks.cc:24 src/locks.cc:61
+#: src/locks.cc:26 src/locks.cc:123
msgid "(multiple)"
msgstr "(多个)"
-#: src/locks.cc:42
-msgid "Importance"
-msgstr "重要性"
+#. translators: property name; short; used like "Name: value"
+#: src/locks.cc:70
+msgid "Keep installed"
+msgstr "保持安装"
-#: src/locks.cc:96
+#. translators: property name; short; used like "Name: value"
+#: src/locks.cc:78
+msgid "Do not install"
+msgstr "不安装"
+
+#: src/locks.cc:104
+msgid "Matches"
+msgstr "匹配"
+
+#: src/locks.cc:157
msgid "There are no package locks defined."
msgstr "未定义软件包锁定。"
-#: src/locks.cc:103
+#: src/locks.cc:164
msgid "Error reading the locks file:"
msgstr "读取锁定文件出错:"
-#: src/locks.cc:163
-msgid "Specified lock has been successfully added."
-msgid_plural "Specified locks have been successfully added."
-msgstr[0] "已成功添加指定锁定。"
-
-#: src/locks.cc:170
+#: src/locks.cc:231
msgid "Problem adding the package lock:"
msgstr "添加软件包锁定出现问题:"
-#: src/locks.cc:194
+#: src/locks.cc:255
msgid "Specified lock has been successfully removed."
msgstr "已成功移除指定锁定。"
-#: src/locks.cc:239
+#: src/locks.cc:300
msgid "No lock has been removed."
msgstr "未移除任何锁定。"
-#: src/locks.cc:243
-#, c-format
-msgid "%zu lock has been successfully removed."
-msgid_plural "%zu locks have been succesfully removed."
-msgstr[0] "已成功移除 %zu 锁定。"
-
-#: src/locks.cc:250
+#: src/locks.cc:311
msgid "Problem removing the package lock:"
msgstr "移除软件包锁定出现问题:"
@@ -5384,12 +5058,6 @@
msgid "a/r/i"
msgstr "a/r/i"
-#: src/utils/prompt.cc:219
-#, c-format, boost-format
-msgid "Autoselecting '%s' after %u second."
-msgid_plural "Autoselecting '%s' after %u seconds."
-msgstr[0] "自动选择 '%s' 于 %u 秒后。"
-
#: src/utils/prompt.cc:238
msgid "Trying again..."
msgstr "正在重试..."
@@ -5412,42 +5080,6 @@
"option to make zypper use default answers to prompts."
msgstr "若您未使用终端运行 zypper,请用 '%s' 全局选项以使 zypper 对提示使用默认回答。"
-#: src/utils/misc.cc:116
-msgid "package"
-msgid_plural "packages"
-msgstr[0] "软件包"
-
-#: src/utils/misc.cc:118
-msgid "pattern"
-msgid_plural "patterns"
-msgstr[0] "软件集"
-
-#: src/utils/misc.cc:120
-msgid "product"
-msgid_plural "product"
-msgstr[0] "产品"
-
-#: src/utils/misc.cc:122
-msgid "patch"
-msgid_plural "patches"
-msgstr[0] "补丁"
-
-#: src/utils/misc.cc:124
-msgid "srcpackage"
-msgid_plural "srcpackages"
-msgstr[0] "源代码包"
-
-#: src/utils/misc.cc:126
-msgid "application"
-msgid_plural "applications"
-msgstr[0] "应用程序"
-
-#. default
-#: src/utils/misc.cc:128
-msgid "resolvable"
-msgid_plural "resolvables"
-msgstr[0] "可解析项"
-
#: src/utils/misc.cc:137
msgid "Unknown"
msgstr "未知"
@@ -5468,108 +5100,542 @@
msgid "Given URI is invalid"
msgstr "所给的 URL 无效"
-#: src/utils/misc.cc:274
+#. Guess failed:
+#. translators: don't translate '<platform>'
+#: src/utils/misc.cc:303
+msgid "Unable to guess a value for <platform>."
+msgstr "无法为 <platform> 猜测值。"
+
+#: src/utils/misc.cc:304
+msgid "Please use obs://<project>/<platform>"
+msgstr "请使用 obs://<project>/<platform>"
+
+#: src/utils/misc.cc:305 src/utils/misc.cc:334
+#, c-format, boost-format
+msgid "Example: %s"
+msgstr "示例:%s"
+
+#: src/utils/misc.cc:333
msgid "Invalid OBS URI."
msgstr "无效的编译服务 URI。"
-#: src/utils/misc.cc:274
+#: src/utils/misc.cc:333
msgid "Correct form is obs://<project>/[platform]"
msgstr "正确格式为 obs://<项目>/[平台]"
-#: src/utils/misc.cc:275
-#, c-format, boost-format
-msgid "Example: %s"
-msgstr "示例:%s"
-
-#: src/utils/misc.cc:325
+#: src/utils/misc.cc:384
msgid "Problem copying the specified RPM file to the cache directory."
msgstr "复制指定 RPM 文件到缓存文件夹出现问题。"
-#: src/utils/misc.cc:326
+#: src/utils/misc.cc:385
msgid "Perhaps you are running out of disk space."
msgstr "可能您的磁盘空间不足了。"
-#: src/utils/misc.cc:334
+#: src/utils/misc.cc:393
msgid "Problem retrieving the specified RPM file"
msgstr "撷取指定 RPM 文件出现问题"
-#: src/utils/misc.cc:335
+#: src/utils/misc.cc:394
msgid "Please check whether the file is accessible."
msgstr "请检查是否可访问文件。"
-#. process ID
-#: src/utils/misc.cc:438
-msgid "PID"
-msgstr "进程编号"
+#: src/utils/misc.cc:511
+#, c-format, boost-format
+msgid "Unknown download mode '%s'."
+msgstr "未知下载模式 '%s'。"
-#. parent process ID
-#: src/utils/misc.cc:440
-msgid "PPID"
-msgstr "父进程编号"
+#: src/utils/misc.cc:512
+#, c-format, boost-format
+msgid "Available download modes: %s"
+msgstr "可用下载模式:%s"
-#. process user ID
-#: src/utils/misc.cc:442
-msgid "UID"
-msgstr "唯一编号"
+#: src/utils/misc.cc:526
+#, c-format, boost-format
+msgid "Option '%s' overrides '%s'."
+msgstr "选项 '%s' 覆盖了 '%s'。"
-#. process login name
-#: src/utils/misc.cc:444
-msgid "User"
-msgstr "用户名"
+#~ msgid "Restart Required: "
+#~ msgstr "需要重启:"
-#. process command name
-#: src/utils/misc.cc:446
-msgid "Command"
-msgstr "命令"
+#~ msgid "The following NEW package is going to be installed:"
+#~ msgid_plural "The following %d NEW packages are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个新软件包:"
-# menu item for selecting a file
-#. "list of deleted files or libraries accessed"
-#: src/utils/misc.cc:450
-msgid "Files"
-msgstr "文件"
+#~ msgid "The following NEW patch is going to be installed:"
+#~ msgid_plural "The following %d NEW patches are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个新补丁:"
-#: src/utils/misc.cc:470
-msgid "No processes using deleted files found."
-msgstr "未找到使用已删除文件的进程。"
+#~ msgid "The following NEW pattern is going to be installed:"
+#~ msgid_plural "The following %d NEW patterns are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个新软件集:"
-#: src/utils/misc.cc:474
-msgid "The following running processes use deleted files:"
-msgstr "以下运行中进程使用了已删除的文件:"
+#~ msgid "The following NEW product is going to be installed:"
+#~ msgid_plural "The following %d NEW products are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个新产品:"
-#: src/utils/misc.cc:477
-msgid "You may wish to restart these processes."
-msgstr "您可能希望重启这些进程。"
+#~ msgid "The following source package is going to be installed:"
+#~ msgid_plural "The following %d source packages are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个源代码包:"
-#: src/utils/misc.cc:479
-#, c-format, boost-format
-msgid ""
-"See '%s' for information about the meaning of values in the above table."
-msgstr "关于上面表格中的值的意义的信息请参考 '%s'。"
+#~ msgid "The following application is going to be installed:"
+#~ msgid_plural "The following %d applications are going to be installed:"
+#~ msgstr[0] "将安装以下 %d 个应用程序:"
-#: src/utils/misc.cc:487
-msgid ""
-"Note: Not running as root you are limited to searching for files you have "
-"permission to examine with the system stat(2) function. The result might be "
-"incomplete."
-msgstr ""
-"注意:不使用根用户运行您只能搜索现有用户有权限使用系统 stat(2) 函数检测的文"
-"件。结果可能不完整。"
+#~ msgid "The following package is going to be REMOVED:"
+#~ msgid_plural "The following %d packages are going to be REMOVED:"
+#~ msgstr[0] "将移除以下 %d 个软件包:"
-#: src/utils/misc.cc:528
-#, c-format, boost-format
-msgid "Unknown download mode '%s'."
-msgstr "未知下载模式 '%s'。"
+#~ msgid "The following patch is going to be REMOVED:"
+#~ msgid_plural "The following %d patches are going to be REMOVED:"
+#~ msgstr[0] "将移除以下 %d 个补丁:"
-#: src/utils/misc.cc:529
-#, c-format, boost-format
-msgid "Available download modes: %s"
-msgstr "可用下载模式:%s"
+#~ msgid "The following pattern is going to be REMOVED:"
+#~ msgid_plural "The following %d patterns are going to be REMOVED:"
+#~ msgstr[0] "将移除以下 %d 个软件集:"
-#: src/utils/misc.cc:543
-#, c-format, boost-format
-msgid "Option '%s' overrides '%s'."
-msgstr "选项 '%s' 覆盖了 '%s'。"
+#~ msgid "The following product is going to be REMOVED:"
+#~ msgid_plural "The following %d products are going to be REMOVED:"
+#~ msgstr[0] "将移除以下 %d 个产品:"
+#~ msgid "The following application is going to be REMOVED:"
+#~ msgid_plural "The following %d applications are going to be REMOVED:"
+#~ msgstr[0] "将移除以下 %d 个应用程序:"
+
+#~ msgid "The following package is going to be upgraded:"
+#~ msgid_plural "The following %d packages are going to be upgraded:"
+#~ msgstr[0] "将升级以下 %d 个软件包:"
+
+#~ msgid "The following patch is going to be upgraded:"
+#~ msgid_plural "The following %d patches are going to be upgraded:"
+#~ msgstr[0] "将升级以下 %d 个补丁:"
+
+#~ msgid "The following pattern is going to be upgraded:"
+#~ msgid_plural "The following %d patterns are going to be upgraded:"
+#~ msgstr[0] "将升级以下 %d 个软件集:"
+
+#~ msgid "The following product is going to be upgraded:"
+#~ msgid_plural "The following %d products are going to be upgraded:"
+#~ msgstr[0] "将升级以下 %d 个产品:"
+
+#~ msgid "The following application is going to be upgraded:"
+#~ msgid_plural "The following %d applications are going to be upgraded:"
+#~ msgstr[0] "将升级以下 %d 个应用程序:"
+
+#~ msgid "The following package is going to be downgraded:"
+#~ msgid_plural "The following %d packages are going to be downgraded:"
+#~ msgstr[0] "将降级以下 %d 个软件包:"
+
+#~ msgid "The following patch is going to be downgraded:"
+#~ msgid_plural "The following %d patches are going to be downgraded:"
+#~ msgstr[0] "将降级以下 %d 个补丁:"
+
+#~ msgid "The following pattern is going to be downgraded:"
+#~ msgid_plural "The following %d patterns are going to be downgraded:"
+#~ msgstr[0] "将降级以下 %d 个软件集:"
+
+#~ msgid "The following product is going to be downgraded:"
+#~ msgid_plural "The following %d products are going to be downgraded:"
+#~ msgstr[0] "将降级以下 %d 个产品:"
+
+#~ msgid "The following application is going to be downgraded:"
+#~ msgid_plural "The following %d applications are going to be downgraded:"
+#~ msgstr[0] "将降级以下 %d 个应用程序:"
+
+#~ msgid "The following package is going to be reinstalled:"
+#~ msgid_plural "The following %d packages are going to be reinstalled:"
+#~ msgstr[0] "将重装以下 %d 个软件包:"
+
+#~ msgid "The following patch is going to be reinstalled:"
+#~ msgid_plural "The following %d patches are going to be reinstalled:"
+#~ msgstr[0] "将重装以下 %d 个补丁:"
+
+#~ msgid "The following pattern is going to be reinstalled:"
+#~ msgid_plural "The following %d patterns are going to be reinstalled:"
+#~ msgstr[0] "将重装以下 %d 个软件集:"
+
+#~ msgid "The following product is going to be reinstalled:"
+#~ msgid_plural "The following %d products are going to be reinstalled:"
+#~ msgstr[0] "将重装以下 %d 个产品:"
+
+#~ msgid "The following application is going to be reinstalled:"
+#~ msgid_plural "The following %d applications are going to be reinstalled:"
+#~ msgstr[0] "将重装以下 %d 个应用程序:"
+
+#~ msgid "The following recommended package was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended packages were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐软件包:"
+
+#~ msgid "The following recommended patch was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended patches were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐补丁:"
+
+#~ msgid "The following recommended pattern was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended patterns were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐软件集:"
+
+#~ msgid "The following recommended product was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended products were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐产品:"
+
+#~ msgid "The following recommended source package was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended source packages were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐源代码包:"
+
+#~ msgid "The following recommended application was automatically selected:"
+#~ msgid_plural ""
+#~ "The following %d recommended applications were automatically selected:"
+#~ msgstr[0] "自动选中了以下 %d 个推荐的应用程序:"
+
+#~ msgid ""
+#~ "The following package is recommended, but will not be installed (only "
+#~ "required packages will be installed):"
+#~ msgid_plural ""
+#~ "The following %d packages are recommended, but will not be installed "
+#~ "(only required packages will be installed):"
+#~ msgstr[0] "推荐以下 %d 个软件包,但不会安装 (仅会安装依赖的软件包):"
+
+#~ msgid ""
+#~ "The following package is recommended, but will not be installed because "
+#~ "it's unwanted (was manually removed before):"
+#~ msgid_plural ""
+#~ "The following %d packages are recommended, but will not be installed "
+#~ "because they are unwanted (were manually removed before):"
+#~ msgstr[0] ""
+#~ "推荐以下 %d 个软件包,但不会安装,因为它们是不需要的 (曾经手动移除过):"
+
+#~ msgid ""
+#~ "The following package is recommended, but will not be installed due to "
+#~ "conflicts or dependency issues:"
+#~ msgid_plural ""
+#~ "The following %d packages are recommended, but will not be installed due "
+#~ "to conflicts or dependency issues:"
+#~ msgstr[0] "推荐以下 %d 个软件包,但由于冲突或依赖问题不会安装:"
+
+#~ msgid "The following patch is recommended, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d patches are recommended, but will not be installed:"
+#~ msgstr[0] "推荐以下 %d 个补丁,但不会安装:"
+
+#~ msgid "The following pattern is recommended, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d patterns are recommended, but will not be installed:"
+#~ msgstr[0] "推荐以下 %d 个软件集,但不会安装:"
+
+#~ msgid "The following product is recommended, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d products are recommended, but will not be installed:"
+#~ msgstr[0] "推荐以下 %d 个产品,但不会安装:"
+
+#~ msgid "The following application is recommended, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d applications are recommended, but will not be installed:"
+#~ msgstr[0] "推荐以下 %d 个应用程序,但不会安装:"
+
+#~ msgid "The following package is suggested, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d packages are suggested, but will not be installed:"
+#~ msgstr[0] "建议以下 %d 个软件包,但不会安装:"
+
+#~ msgid "The following patch is suggested, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d patches are suggested, but will not be installed:"
+#~ msgstr[0] "建议以下 %d 个补丁,但不会安装:"
+
+#~ msgid "The following pattern is suggested, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d patterns are suggested, but will not be installed:"
+#~ msgstr[0] "建议以下 %d 个软件集,但不会安装:"
+
+#~ msgid "The following product is suggested, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d products are suggested, but will not be installed:"
+#~ msgstr[0] "建议以下 %d 个产品,但不会安装:"
+
+#~ msgid "The following application is suggested, but will not be installed:"
+#~ msgid_plural ""
+#~ "The following %d applications are suggested, but will not be installed:"
+#~ msgstr[0] "建议以下 %d 个应用程序,但不会安装:"
+
+#~ msgid "The following package is going to change architecture:"
+#~ msgid_plural "The following %d packages are going to change architecture:"
+#~ msgstr[0] "将改变以下 %d 个软件包的架构:"
+
+#~ msgid "The following patch is going to change architecture:"
+#~ msgid_plural "The following %d patches are going to change architecture:"
+#~ msgstr[0] "将改变以下 %d 个补丁的架构:"
+
+#~ msgid "The following pattern is going to change architecture:"
+#~ msgid_plural "The following %d patterns are going to change architecture:"
+#~ msgstr[0] "将改变以下 %d 个软件集的架构:"
+
+#~ msgid "The following product is going to change architecture:"
+#~ msgid_plural "The following %d products are going to change architecture:"
+#~ msgstr[0] "将改变以下 %d 个产品的架构:"
+
+#~ msgid "The following application is going to change architecture:"
+#~ msgid_plural ""
+#~ "The following %d applications are going to change architecture:"
+#~ msgstr[0] "将改变以下 %d 个应用程序的架构:"
+
+#~ msgid "The following package is going to change vendor:"
+#~ msgid_plural "The following %d packages are going to change vendor:"
+#~ msgstr[0] "将改变以下 %d 个软件包的厂商:"
+
+#~ msgid "The following patch is going to change vendor:"
+#~ msgid_plural "The following %d patches are going to change vendor:"
+#~ msgstr[0] "将改变以下 %d 个补丁的厂商:"
+
+#~ msgid "The following pattern is going to change vendor:"
+#~ msgid_plural "The following %d patterns are going to change vendor:"
+#~ msgstr[0] "将改变以下 %d 个软件集的厂商:"
+
+#~ msgid "The following product is going to change vendor:"
+#~ msgid_plural "The following %d products are going to change vendor:"
+#~ msgstr[0] "将改变以下 %d 个产品的厂商:"
+
+#~ msgid "The following application is going to change vendor:"
+#~ msgid_plural "The following %d applications are going to change vendor:"
+#~ msgstr[0] "将改变以下 %d 个应用程序的厂商:"
+
+#~ msgid "The following package is not supported by its vendor:"
+#~ msgid_plural "The following %d packages are not supported by their vendor:"
+#~ msgstr[0] "以下 %d 个软件包不被其厂商支持:"
+
+#~ msgid ""
+#~ "The following package needs additional customer contract to get support:"
+#~ msgid_plural ""
+#~ "The following %d packages need additional customer contract to get "
+#~ "support:"
+#~ msgstr[0] "以下 %d 个软件包需要额外的客户合同以获取支持:"
+
+#~ msgid "The following package update will NOT be installed:"
+#~ msgid_plural "The following %d package updates will NOT be installed:"
+#~ msgstr[0] "将不会安装以下 %d 个软件包的更新:"
+
+#~ msgid "The following product update will NOT be installed:"
+#~ msgid_plural "The following %d product updates will NOT be installed:"
+#~ msgstr[0] "将不会安装以下 %d 个产品的更新:"
+
+#~ msgid "The following application update will NOT be installed:"
+#~ msgid_plural "The following %d application updates will NOT be installed:"
+#~ msgstr[0] "将不会安装以下 %d 个应用程序的更新:"
+
+#~ msgid "The following item is locked and will not be changed by any action:"
+#~ msgid_plural ""
+#~ "The following %d items are locked and will not be changed by any action:"
+#~ msgstr[0] "以下 %d 个项已被锁定并不会被任何操作改动:"
+
+#, fuzzy
+#~ msgid "The following patch requires a system reboot:"
+#~ msgid_plural "The following %d patches require a system reboot:"
+#~ msgstr[0] "将升级以下 %d 个补丁:"
+
+#~ msgid "package to upgrade"
+#~ msgid_plural "packages to upgrade"
+#~ msgstr[0] "个软件包待升级"
+
+#~ msgid "to downgrade"
+#~ msgid_plural "to downgrade"
+#~ msgstr[0] "个软件包待降级"
+
+#~ msgid "package to downgrade"
+#~ msgid_plural "packages to downgrade"
+#~ msgstr[0] "个软件包待降级"
+
+#~ msgid "new"
+#~ msgid_plural "new"
+#~ msgstr[0] "个软件包将新装"
+
+#~ msgid "new package to install"
+#~ msgid_plural "new packages to install"
+#~ msgstr[0] "个软件包将新装"
+
+#~ msgid "to reinstall"
+#~ msgid_plural "to reinstall"
+#~ msgstr[0] "个软件包将重装"
+
+#~ msgid "package to reinstall"
+#~ msgid_plural "packages to reinstall"
+#~ msgstr[0] "个软件包将重装"
+
+#~ msgid "to remove"
+#~ msgid_plural "to remove"
+#~ msgstr[0] "个软件包将移除"
+
+#~ msgid "package to remove"
+#~ msgid_plural "packages to remove"
+#~ msgstr[0] "个软件包将移除"
+
+#~ msgid "to change vendor"
+#~ msgid_plural " to change vendor"
+#~ msgstr[0] "个软件包将改变厂商"
+
+#~ msgid "package will change vendor"
+#~ msgid_plural "packages will change vendor"
+#~ msgstr[0] "个软件包将改变厂商"
+
+#~ msgid "to change arch"
+#~ msgid_plural "to change arch"
+#~ msgstr[0] "个软件包将改变架构"
+
+#~ msgid "package will change arch"
+#~ msgid_plural "packages will change arch"
+#~ msgstr[0] "个软件包将改变架构"
+
+#~ msgid "source package"
+#~ msgid_plural "source packages"
+#~ msgstr[0] "个源代码包"
+
+#~ msgid "source package to install"
+#~ msgid_plural "source packages to install"
+#~ msgstr[0] "个源代码包将安装"
+
+#~ msgid "The gpg key signing file '%1%' will expire in %2% day."
+#~ msgid_plural "The gpg key signing file '%1%' will expire in %2% days."
+#~ msgstr[0] "gpg 密钥签名文件 '%1%' 将于 %2% 天后过期。"
+
+#~ msgid ""
+#~ "The following package had to be excluded from file conflicts check "
+#~ "because it is not yet downloaded:"
+#~ msgid_plural ""
+#~ "The following %1% packages had to be excluded from file conflicts check "
+#~ "because they are not yet downloaded:"
+#~ msgstr[0] "以下 %1% 个软件包必须从文件冲突检查中排除,因为它们尚未下载:"
+
+#~ msgid "Detected %1% file conflict:"
+#~ msgid_plural "Detected %1% file conflicts:"
+#~ msgstr[0] "检测到 %1% 个文件冲突:"
+
+#~ msgid "Active"
+#~ msgstr "活动的"
+
+#~ msgid "Disabled"
+#~ msgstr "已禁用"
+
+#~ msgid ""
+#~ "Repository '%s' has been added to enabled repositories of service '%s'"
+#~ msgid_plural ""
+#~ "Repositories '%s' have been added to enabled repositories of service '%s'"
+#~ msgstr[0] "已将软件源 '%s' 加入服务 '%s' 的已启用软件源中。"
+
+#~ msgid ""
+#~ "Repository '%s' has been added to disabled repositories of service '%s'"
+#~ msgid_plural ""
+#~ "Repositories '%s' have been added to disabled repositories of service '%s'"
+#~ msgstr[0] "已将软件源 '%s' 加入服务 '%s' 的已禁用软件源中。"
+
+#~ msgid ""
+#~ "Repository '%s' has been removed from enabled repositories of service '%s'"
+#~ msgid_plural ""
+#~ "Repositories '%s' have been removed from enabled repositories of service "
+#~ "'%s'"
+#~ msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已启用软件源中移除。"
+
+#~ msgid ""
+#~ "Repository '%s' has been removed from disabled repositories of service "
+#~ "'%s'"
+#~ msgid_plural ""
+#~ "Repositories '%s' have been removed from disabled repositories of service "
+#~ "'%s'"
+#~ msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已禁用软件源中移除。"
+
+#~ msgid "%d patch needed"
+#~ msgid_plural "%d patches needed"
+#~ msgstr[0] "需要 %d 个补丁"
+
+#~ msgid "%d security patch"
+#~ msgid_plural "%d security patches"
+#~ msgstr[0] "%d 个安全补丁"
+
+#~ msgid "Bundle"
+#~ msgstr "系列"
+
+#~ msgid ""
+#~ "locks (ll)\n"
+#~ "\n"
+#~ "List current package locks.\n"
+#~ "\n"
+#~ "This command has no additional options.\n"
+#~ msgstr ""
+#~ "locks (ll)\n"
+#~ "\n"
+#~ "列出当前的软件包锁定。\n"
+#~ "\n"
+#~ "此命令无额外选项。\n"
+
+#~ msgid ""
+#~ "Could not determine the type of the repository. Check if the specified "
+#~ "URI points to a valid repository."
+#~ msgstr "无法确定软件源类型。请检查指定的 URI 是否指向了一个有效的软件源。"
+
+#~ msgid "Running as '%s', cannot use '%s' option."
+#~ msgstr "正以 '%s' 运行,无法使用 '%s' 选项。"
+
+#~ msgid "Removed %lu lock."
+#~ msgid_plural "Removed %lu locks."
+#~ msgstr[0] "已移除 %lu 锁定。"
+
+#~ msgid "Choose the above solution using '1' or skip, retry or cancel"
+#~ msgid_plural ""
+#~ "Choose from above solutions by number or skip, retry or cancel"
+#~ msgstr[0] "请通过数字从以上解决方案中选择,或者跳过、重试或取消"
+
+#~ msgid "Choose the above solution using '1' or cancel using 'c'"
+#~ msgid_plural "Choose from above solutions by number or cancel"
+#~ msgstr[0] "请通过数字从以上解决方案中选择,或取消"
+
+#~ msgid "%d Problem:"
+#~ msgid_plural "%d Problems:"
+#~ msgstr[0] "%d 个问题:"
+
+#~ msgid "Importance"
+#~ msgstr "重要性"
+
+#~ msgid "Specified lock has been successfully added."
+#~ msgid_plural "Specified locks have been successfully added."
+#~ msgstr[0] "已成功添加指定锁定。"
+
+#~ msgid "%zu lock has been successfully removed."
+#~ msgid_plural "%zu locks have been successfully removed."
+#~ msgstr[0] "已成功移除 %zu 锁定。"
+
+#~ msgid "Autoselecting '%s' after %u second."
+#~ msgid_plural "Autoselecting '%s' after %u seconds."
+#~ msgstr[0] "自动选择 '%s' 于 %u 秒后。"
+
+#~ msgid "package"
+#~ msgid_plural "packages"
+#~ msgstr[0] "软件包"
+
+#~ msgid "pattern"
+#~ msgid_plural "patterns"
+#~ msgstr[0] "软件集"
+
+#~ msgid "product"
+#~ msgid_plural "product"
+#~ msgstr[0] "产品"
+
+#~ msgid "patch"
+#~ msgid_plural "patches"
+#~ msgstr[0] "补丁"
+
+#~ msgid "srcpackage"
+#~ msgid_plural "srcpackages"
+#~ msgstr[0] "源代码包"
+
+#~ msgid "application"
+#~ msgid_plural "applications"
+#~ msgstr[0] "应用程序"
+
+#~ msgid "resolvable"
+#~ msgid_plural "resolvables"
+#~ msgstr[0] "可解析项"
+
#~ msgid "GPG check"
#~ msgstr "GPG 检查"