Author: marguerite
Date: 2016-06-05 20:47:25 +0200 (Sun, 05 Jun 2016)
New Revision: 95901
Modified:
trunk/lcn/zh_CN/po/zypper.zh_CN.po
Log:
[cn]merged
Modified: trunk/lcn/zh_CN/po/zypper.zh_CN.po
===================================================================
--- trunk/lcn/zh_CN/po/zypper.zh_CN.po 2016-06-05 16:43:05 UTC (rev 95900)
+++ trunk/lcn/zh_CN/po/zypper.zh_CN.po 2016-06-05 18:47:25 UTC (rev 95901)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-07 01:14+0100\n"
+"POT-Creation-Date: 2016-04-14 01:14+0200\n"
"PO-Revision-Date: 2016-03-30 17:43+0800\n"
"Last-Translator: marguerite \n"
"Language-Team: Chinese \n"
@@ -151,15 +151,15 @@
msgstr "S"
#. translators: name (general header)
-#: src/info.cc:402 src/repos.cc:961 src/repos.cc:1094 src/repos.cc:2408
-#: src/update.cc:383 src/update.cc:618 src/update.cc:753 src/Zypper.cc:5239
+#: src/info.cc:402 src/repos.cc:961 src/repos.cc:1094 src/repos.cc:2403
+#: src/update.cc:383 src/update.cc:618 src/update.cc:753 src/Zypper.cc:5277
#: src/search.cc:67 src/search.cc:233 src/search.cc:325 src/search.cc:440
#: src/search.cc:577 src/search.cc:639 src/locks.cc:104
msgid "Name"
msgstr "名称"
#. translators: type (general header)
-#: src/info.cc:402 src/repos.cc:999 src/repos.cc:1105 src/repos.cc:2417
+#: src/info.cc:402 src/repos.cc:999 src/repos.cc:1105 src/repos.cc:2412
#: src/search.cc:69 src/search.cc:236 src/locks.cc:107
msgid "Type"
msgstr "类型"
@@ -298,17 +298,20 @@
msgstr ""
"Zypper 子命令是驻留在 zypper_execdir ('%1%') 中的独立可执行文件。\n"
"\n"
-"针对子命令，zypper 提供了一个知道子命令所在位置的封装程序，并通过向子命令传递命令行参数来运行这些子命令。\n"
+"针对子命令，zypper 提供了一个知道子命令所在位置的封装程序，并通过向子命令传递"
+"命令行参数来运行这些子命令。\n"
"\n"
-"若未在 zypper_execdir 中找到子命令，该封装将在您 $PATH 中的其它位置查找该子命令。因此，编写一些不存放在系统空间仅供局部使用的"
-" zypper 扩展是可以做到的。\n"
+"若未在 zypper_execdir 中找到子命令，该封装将在您 $PATH 中的其它位置查找该子命"
+"令。因此，编写一些不存放在系统空间仅供局部使用的 zypper 扩展是可以做到的。\n"
#: src/subcommand.cc:401
#, 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"
+msgstr ""
+"当前不支持将 zypper 全局选项与子命令一起使用，也不支持执行 '%1%' 中的子命"
+"令。\n"
#. translators: headline of an enumeration; %1% is a directory name
#: src/subcommand.cc:418
@@ -451,21 +454,25 @@
msgid ""
"There is an update candidate '%s' for '%s', but it does not match the "
"specified version, architecture, or repository."
-msgstr "有一个更新候选 '%s' 可供 '%s' 使用，但它不匹配指定的版本、架构或软件源。"
+msgstr ""
+"有一个更新候选 '%s' 可供 '%s' 使用，但它不匹配指定的版本、架构或软件源。"
#: src/RequestFeedback.cc:112
#, c-format, boost-format
msgid ""
"There is an update candidate for '%s', but it is from a different vendor. "
"Use '%s' to install this candidate."
-msgstr "有一个 '%s' 的更新候选，但它来自一个不同的厂商。请使用 '%s' 安装此候选。"
+msgstr ""
+"有一个 '%s' 的更新候选，但它来自一个不同的厂商。请使用 '%s' 安装此候选。"
#: src/RequestFeedback.cc:121
#, c-format, boost-format
msgid ""
"There is an update candidate for '%s', but it comes from a repository with a "
"lower priority. Use '%s' to install this candidate."
-msgstr "有一个 '%s' 的更新候选，但它来自一个优先级较低的软件源。请使用 '%s' 安装此候选。"
+msgstr ""
+"有一个 '%s' 的更新候选，但它来自一个优先级较低的软件源。请使用 '%s' 安装此候"
+"选。"
#: src/RequestFeedback.cc:131
#, c-format, boost-format
@@ -778,7 +785,8 @@
msgid_plural ""
"The following %d packages are recommended, but will not be installed because "
"they are unwanted (were manually removed before):"
-msgstr[0] "推荐以下 %d 个软件包，但不会安装，因为它们是不需要的 (曾经手动移除过)："
+msgstr[0] ""
+"推荐以下 %d 个软件包，但不会安装，因为它们是不需要的 (曾经手动移除过)："
#: src/Summary.cc:921
#, c-format, boost-format
@@ -1257,7 +1265,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:307 src/callbacks/keyring.h:315
-#: src/callbacks/rpm.h:138 src/callbacks/rpm.h:418 src/solve-commit.cc:662
+#: src/callbacks/rpm.h:138 src/callbacks/rpm.h:418 src/solve-commit.cc:668
msgid "Continue?"
msgstr "继续吗？"
@@ -1285,7 +1293,8 @@
msgid ""
"Accepting packages with wrong checksums can lead to a corrupted system and "
"in extreme cases even to a system compromise."
-msgstr "接受校验和错误的软件包可能导致系统损坏，在极端情况下甚至会导致系统被入侵。"
+msgstr ""
+"接受校验和错误的软件包可能导致系统损坏，在极端情况下甚至会导致系统被入侵。"
#: src/callbacks/keyring.h:352
#, boost-format
@@ -1377,7 +1386,9 @@
"Checking for file conflicts requires not installed packages to be downloaded "
"in advance in order to access their file lists. See option '%1%' in the "
"zypper manual page for details."
-msgstr "检查文件冲突需要提前下载未安装的软件包来访问它们的文件列表。细节请参考 zypper 手册页中的 '%1%' 选项。"
+msgstr ""
+"检查文件冲突需要提前下载未安装的软件包来访问它们的文件列表。细节请参考 "
+"zypper 手册页中的 '%1%' 选项。"
#. TranslatorExplanation %1%(number of packages); detailed list follows
#: src/callbacks/rpm.h:391
@@ -1407,7 +1418,9 @@
"File conflicts happen when two packages attempt to install files with the "
"same name but different contents. If you continue, conflicting files will be "
"replaced losing the previous content."
-msgstr "当两个软件包试图安装同名但内容不同的文件时就会产生文件冲突。若您继续，冲突的文件将会被替换，之前的内容会因此丢失。"
+msgstr ""
+"当两个软件包试图安装同名但内容不同的文件时就会产生文件冲突。若您继续，冲突的"
+"文件将会被替换，之前的内容会因此丢失。"
#. help text for the "Abort, retry, ignore?" prompt for media errors
#: src/callbacks/media.cc:28
@@ -1664,8 +1677,8 @@
msgid "Problem retrieving files from '%s'."
msgstr "从 '%s' 撷取文件时出现问题。"
-#: src/repos.cc:296 src/repos.cc:3176 src/solve-commit.cc:795
-#: src/solve-commit.cc:826 src/solve-commit.cc:850
+#: src/repos.cc:296 src/repos.cc:3171 src/solve-commit.cc:801
+#: src/solve-commit.cc:832 src/solve-commit.cc:856
msgid "Please see the above error message for a hint."
msgstr "请参考以上错误消息汲取灵感。"
@@ -1719,8 +1732,9 @@
"report by following instructions at http://en.opensuse.org/Zypper/"
"Troubleshooting"
msgstr ""
-"这可能是由源中无效的元数据或者元数据解析器的故障导致的。若是后一种情况，或者存疑，请参考"
-" http://zh.opensuse.org/SDB:Zypper_疑难解答 的指南填写一份故障报告。"
+"这可能是由源中无效的元数据或者元数据解析器的故障导致的。若是后一种情况，或者"
+"存疑，请参考 http://zh.opensuse.org/SDB:Zypper_疑难解答 的指南填写一份故障报"
+"告。"
#: src/repos.cc:401
#, c-format, boost-format
@@ -1773,7 +1787,9 @@
msgid ""
"The metadata cache needs to be built for the '%s' repository. You can run "
"'zypper refresh' as root to do this."
-msgstr "需要构建软件源 '%s' 的元数据缓存。您可以 root 身份运行 'zypper refresh' 执行此操作。"
+msgstr ""
+"需要构建软件源 '%s' 的元数据缓存。您可以 root 身份运行 'zypper refresh' 执行"
+"此操作。"
#: src/repos.cc:820
#, c-format, boost-format
@@ -1802,42 +1818,42 @@
msgid "Target initialization failed:"
msgstr "目标初始化失败："
-#: src/repos.cc:898 src/Zypper.cc:4380
+#: src/repos.cc:898 src/Zypper.cc:4418
msgid "Running 'zypper refresh' as root might resolve the problem."
msgstr "以 root 身份运行 'zypper refresh' 或许会解决该问题。"
-#: src/repos.cc:950 src/repos.cc:1093 src/repos.cc:2407 src/Zypper.cc:5239
+#: src/repos.cc:950 src/repos.cc:1093 src/repos.cc:2402 src/Zypper.cc:5277
msgid "Alias"
msgstr "别名"
#. 'enabled' flag
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:968 src/repos.cc:1100 src/repos.cc:1628 src/repos.cc:2409
+#: src/repos.cc:968 src/repos.cc:1100 src/repos.cc:1628 src/repos.cc:2404
msgid "Enabled"
msgstr "已启用"
#. GPG Check
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:972 src/repos.cc:1101 src/repos.cc:1632 src/repos.cc:2410
+#: src/repos.cc:972 src/repos.cc:1101 src/repos.cc:1632 src/repos.cc:2405
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:980 src/repos.cc:2412
+#: src/repos.cc:980 src/repos.cc:2407
msgid "Refresh"
msgstr "刷新"
#. translators: repository priority (in zypper repos -p or -d)
#. translators: property name; short; used like "Name: value"
#. translators: repository priority (in zypper repos -p or -d)
-#: src/repos.cc:990 src/repos.cc:1102 src/repos.cc:1634 src/repos.cc:2416
+#: src/repos.cc:990 src/repos.cc:1102 src/repos.cc:1634 src/repos.cc:2411
msgid "Priority"
msgstr "优先级"
#. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1006 src/repos.cc:1095 src/repos.cc:1636 src/repos.cc:2419
+#: src/repos.cc:1006 src/repos.cc:1095 src/repos.cc:1636 src/repos.cc:2414
msgid "URI"
msgstr "URI"
@@ -2005,7 +2021,7 @@
msgid "Invalid repository alias: '%s'"
msgstr "无效的软件源别名：'%s'"
-#: src/repos.cc:1576 src/repos.cc:1864
+#: src/repos.cc:1576 src/repos.cc:1859
#, c-format, boost-format
msgid "Repository named '%s' already exists. Please use another alias."
msgstr "已存在名为 '%s' 的软件源。请使用其它别名。"
@@ -2088,7 +2104,9 @@
msgid ""
"Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for "
"details."
-msgstr "它是一个 .repo 文件吗？ 细节请参考 http://en.opensuse.org/Standards/RepoInfo。"
+msgstr ""
+"它是一个 .repo 文件吗？ 细节请参考 http://en.opensuse.org/Standards/"
+"RepoInfo。"
#: src/repos.cc:1762
msgid "Problem encountered while trying to read the file at the specified URI"
@@ -2103,234 +2121,235 @@
msgid "Repository '%s' has no URI defined, skipping."
msgstr "软件源 '%s' 未定义 URI，正在跳过。"
-#: src/repos.cc:1827
+#: src/repos.cc:1822
#, c-format, boost-format
msgid "Repository '%s' has been removed."
msgstr "已移除软件源 '%s'。"
-#: src/repos.cc:1849
+#: src/repos.cc:1844
#, 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' ，该服务负责设置其别名。"
+msgstr ""
+"无法修改软件源 '%s' 的别名。该软件源属于服务 '%s' ，该服务负责设置其别名。"
-#: src/repos.cc:1860
+#: src/repos.cc:1855
#, c-format, boost-format
msgid "Repository '%s' renamed to '%s'."
msgstr "软件源 '%s' 已重命名为 '%s' 。"
-#: src/repos.cc:1869 src/repos.cc:2103
+#: src/repos.cc:1864 src/repos.cc:2098
msgid "Error while modifying the repository:"
msgstr "修改软件源时出错："
-#: src/repos.cc:1870
+#: src/repos.cc:1865
#, c-format, boost-format
msgid "Leaving repository '%s' unchanged."
msgstr "软件源 '%s' 未变动。"
-#: src/repos.cc:2007
+#: src/repos.cc:2002
#, c-format, boost-format
msgid "Repository '%s' priority has been left unchanged (%d)"
msgstr "未变动软件源 '%s' 的优先级 (%d)"
-#: src/repos.cc:2045
+#: src/repos.cc:2040
#, c-format, boost-format
msgid "Repository '%s' has been successfully enabled."
msgstr "已成功启用软件源 '%s'。"
-#: src/repos.cc:2047
+#: src/repos.cc:2042
#, c-format, boost-format
msgid "Repository '%s' has been successfully disabled."
msgstr "已成功禁用软件源 '%s'。"
-#: src/repos.cc:2054
+#: src/repos.cc:2049
#, c-format, boost-format
msgid "Autorefresh has been enabled for repository '%s'."
msgstr "已启用自动刷新软件源 '%s'。"
-#: src/repos.cc:2056
+#: src/repos.cc:2051
#, c-format, boost-format
msgid "Autorefresh has been disabled for repository '%s'."
msgstr "已禁用自动刷新软件源 '%s'。"
-#: src/repos.cc:2063
+#: src/repos.cc:2058
#, c-format, boost-format
msgid "RPM files caching has been enabled for repository '%s'."
msgstr "已为软件源 '%s' 启用 RPM 文件缓存。"
-#: src/repos.cc:2065
+#: src/repos.cc:2060
#, c-format, boost-format
msgid "RPM files caching has been disabled for repository '%s'."
msgstr "已为软件源 '%s' 禁用 RPM 文件缓存。"
-#: src/repos.cc:2072
+#: src/repos.cc:2067
#, c-format, boost-format
msgid "GPG check has been enabled for repository '%s'."
msgstr "已对软件源 '%s' 启用 GPG 检查。"
-#: src/repos.cc:2074
+#: src/repos.cc:2069
#, c-format, boost-format
msgid "GPG check has been disabled for repository '%s'."
msgstr "已对软件源 '%s' 禁用 GPG 检查。"
-#: src/repos.cc:2080
+#: src/repos.cc:2075
#, c-format, boost-format
msgid "Repository '%s' priority has been set to %d."
msgstr "软件源 '%s' 的优先级已设为 %d。"
-#: src/repos.cc:2086
+#: src/repos.cc:2081
#, c-format, boost-format
msgid "Name of repository '%s' has been set to '%s'."
msgstr "软件源 '%s' 名称已设为 '%s'。"
-#: src/repos.cc:2097
+#: src/repos.cc:2092
#, c-format, boost-format
msgid "Nothing to change for repository '%s'."
msgstr "软件源 '%s' 无需修改。"
-#: src/repos.cc:2104
+#: src/repos.cc:2099
#, c-format, boost-format
msgid "Leaving repository %s unchanged."
msgstr "软件源 %s 未变动。"
-#: src/repos.cc:2136
+#: src/repos.cc:2131
msgid "Error reading services:"
msgstr "读取服务出错："
-#: src/repos.cc:2225
+#: src/repos.cc:2220
#, c-format, boost-format
msgid "Service '%s' not found by its alias, number, or URI."
msgstr "无法通过别名、编号或 URI 找到服务 '%s'。"
-#: src/repos.cc:2228
+#: src/repos.cc:2223
#, c-format, boost-format
msgid "Use '%s' to get the list of defined services."
msgstr "请使用 '%s' 获取已定义服务的列表。"
-#: src/repos.cc:2470
+#: src/repos.cc:2465
#, c-format, boost-format
msgid "No services defined. Use the '%s' command to add one or more services."
msgstr "未定义服务。请用 '%s' 命令添加一个或多个服务。"
-#: src/repos.cc:2553
+#: src/repos.cc:2548
#, c-format, boost-format
msgid "Service aliased '%s' already exists. Please use another alias."
msgstr "已存在别名为 '%s' 的服务。请使用其它别名。"
-#: src/repos.cc:2560
+#: src/repos.cc:2555
#, c-format, boost-format
msgid "Error occured while adding service '%s'."
msgstr "添加服务 '%s' 时出错。"
-#: src/repos.cc:2566
+#: src/repos.cc:2561
#, c-format, boost-format
msgid "Service '%s' has been successfully added."
msgstr "已成功添加了服务 '%s'。"
-#: src/repos.cc:2604
+#: src/repos.cc:2599
#, c-format, boost-format
msgid "Removing service '%s':"
msgstr "正在移除服务 '%s'："
-#: src/repos.cc:2607
+#: src/repos.cc:2602
#, c-format, boost-format
msgid "Service '%s' has been removed."
msgstr "已移除服务 '%s'。"
-#: src/repos.cc:2621
+#: src/repos.cc:2616
#, c-format, boost-format
msgid "Refreshing service '%s'."
msgstr "正在刷新服务 '%s'。"
-#: src/repos.cc:2636 src/repos.cc:2646
+#: src/repos.cc:2631 src/repos.cc:2641
#, c-format, boost-format
msgid "Problem retrieving the repository index file for service '%s':"
msgstr "撷取服务 '%s' 的软件源索引文件出现问题："
-#: src/repos.cc:2638 src/repos.cc:2746 src/repos.cc:2804
+#: src/repos.cc:2633 src/repos.cc:2741 src/repos.cc:2799
#, c-format, boost-format
msgid "Skipping service '%s' because of the above error."
msgstr "由于以上错误，正在跳过服务 '%s' 。"
-#: src/repos.cc:2648
+#: src/repos.cc:2643
msgid "Check if the URI is valid and accessible."
msgstr "请检查该 URI 是否有效且可访问。"
-#: src/repos.cc:2705
+#: src/repos.cc:2700
#, c-format, boost-format
msgid "Skipping disabled service '%s'"
msgstr "正在跳过已禁用的服务 '%s'"
-#: src/repos.cc:2757
+#: src/repos.cc:2752
#, c-format, boost-format
msgid "Use '%s' or '%s' commands to add or enable services."
msgstr "请使用 '%s' 或者 '%s' 命令添加或启用服务。"
-#: src/repos.cc:2760
+#: src/repos.cc:2755
msgid "Specified services are not enabled or defined."
msgstr "指定服务未启用或未定义。"
-#: src/repos.cc:2762
+#: src/repos.cc:2757
msgid "There are no enabled services defined."
msgstr "未定义已启用的服务。"
-#: src/repos.cc:2766
+#: src/repos.cc:2761
msgid "Could not refresh the services because of errors."
msgstr "由于若干错误无法刷新服务。"
-#: src/repos.cc:2772
+#: src/repos.cc:2767
msgid "Some of the services have not been refreshed because of an error."
msgstr "由于某处出错未刷新某些服务。"
-#: src/repos.cc:2777
+#: src/repos.cc:2772
msgid "Specified services have been refreshed."
msgstr "指定服务均已刷新。"
-#: src/repos.cc:2779
+#: src/repos.cc:2774
msgid "All services have been refreshed."
msgstr "全部服务均已刷新。"
-#: src/repos.cc:2926
+#: src/repos.cc:2921
#, c-format, boost-format
msgid "Service '%s' has been successfully enabled."
msgstr "已成功启用服务 '%s'。"
-#: src/repos.cc:2928
+#: src/repos.cc:2923
#, c-format, boost-format
msgid "Service '%s' has been successfully disabled."
msgstr "已成功禁用服务 '%s'。"
-#: src/repos.cc:2934
+#: src/repos.cc:2929
#, c-format, boost-format
msgid "Autorefresh has been enabled for service '%s'."
msgstr "已启用自动刷新服务 '%s'。"
-#: src/repos.cc:2936
+#: src/repos.cc:2931
#, c-format, boost-format
msgid "Autorefresh has been disabled for service '%s'."
msgstr "已禁用自动刷新服务 '%s'。"
-#: src/repos.cc:2941
+#: src/repos.cc:2936
#, c-format, boost-format
msgid "Name of service '%s' has been set to '%s'."
msgstr "服务 '%s' 的名称已设为 '%s'。"
-#: src/repos.cc:2946
+#: src/repos.cc:2941
#, 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:2953
+#: src/repos.cc:2948
#, 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:2960
+#: src/repos.cc:2955
#, c-format, boost-format
msgid ""
"Repository '%s' has been removed from enabled repositories of service '%s'"
@@ -2338,7 +2357,7 @@
"Repositories '%s' have been removed from enabled repositories of service '%s'"
msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已启用软件源中移除。"
-#: src/repos.cc:2967
+#: src/repos.cc:2962
#, c-format, boost-format
msgid ""
"Repository '%s' has been removed from disabled repositories of service '%s'"
@@ -2347,50 +2366,50 @@
"'%s'"
msgstr[0] "已将软件源 '%s' 从服务 '%s' 的已禁用软件源中移除。"
-#: src/repos.cc:2976
+#: src/repos.cc:2971
#, c-format, boost-format
msgid "Nothing to change for service '%s'."
msgstr "服务 '%s' 无需修改。"
-#: src/repos.cc:2982
+#: src/repos.cc:2977
msgid "Error while modifying the service:"
msgstr "修改服务时出错："
-#: src/repos.cc:2983
+#: src/repos.cc:2978
#, c-format, boost-format
msgid "Leaving service %s unchanged."
msgstr "服务 %s 未变动。"
-#: src/repos.cc:3087
+#: src/repos.cc:3082
msgid "Loading repository data..."
msgstr "正在加载软件源数据..."
-#: src/repos.cc:3107
+#: src/repos.cc:3102
#, c-format, boost-format
msgid "Retrieving repository '%s' data..."
msgstr "正在撷取软件源 '%s' 的数据..."
-#: src/repos.cc:3113
+#: src/repos.cc:3108
#, c-format, boost-format
msgid "Repository '%s' not cached. Caching..."
msgstr "未缓存软件源 '%s'。正在缓存中..."
-#: src/repos.cc:3119 src/repos.cc:3153
+#: src/repos.cc:3114 src/repos.cc:3148
#, c-format, boost-format
msgid "Problem loading data from '%s'"
msgstr "从 '%s' 加载数据出现问题"
-#: src/repos.cc:3123
+#: src/repos.cc:3118
#, c-format, boost-format
msgid "Repository '%s' could not be refreshed. Using old cache."
msgstr "无法刷新软件源 '%s'。正在使用旧缓存。"
-#: src/repos.cc:3127 src/repos.cc:3156
+#: src/repos.cc:3122 src/repos.cc:3151
#, c-format, boost-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "由于某处错误未加载来自 '%s' 的可解析项。"
-#: src/repos.cc:3144
+#: src/repos.cc:3139
#, c-format, boost-format
msgid ""
"Repository '%s' appears to be outdated. Consider using a different mirror or "
@@ -2398,16 +2417,16 @@
msgstr "软件源 '%s' 似乎已过期。请考虑使用一个不同的镜像或服务器。"
#. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m'
-#: src/repos.cc:3155
+#: src/repos.cc:3150
#, c-format, boost-format
msgid "Try '%s', or even '%s' before doing so."
msgstr "这么做前请先尝试 '%s'，甚至在那之前先尝试一下 '%s'。"
-#: src/repos.cc:3166
+#: src/repos.cc:3161
msgid "Reading installed packages..."
msgstr "正在读取已安装的软件包..."
-#: src/repos.cc:3175
+#: src/repos.cc:3170
msgid "Problem occurred while reading the installed packages:"
msgstr "读取已安装软件包时发生问题："
@@ -2571,30 +2590,54 @@
msgid "OK OK! Exiting immediately..."
msgstr "好好！这就退啦 :-)..."
-#: src/Zypper.cc:98
+#: src/Zypper.cc:89
+msgid ""
+"PackageKit is blocking zypper. This happens if you have an updater applet or "
+"other software management application using PackageKit running."
+msgstr ""
+"PackageKit 正屏蔽着 zypper。这发生在若您已运行了一个使用 PackageKit 的升级挂"
+"件或其他软件管理程序时。"
+
+#: src/Zypper.cc:94
+msgid "Tell PackageKit to quit?"
+msgstr "通知 PackageKit 退出吗？"
+
+#: src/Zypper.cc:103
+msgid "PackageKit is still running (probably busy)."
+msgstr "PackageKit 仍在运行 (或许正忙)。"
+
+#: src/Zypper.cc:104
+msgid "Try again?"
+msgstr "重试吗？"
+
+#: src/Zypper.cc:174
#, boost-format
msgid ""
"Legacy commandline option %1% detected. Please use global option %2% instead."
msgstr "检测到了过时的命令行选项 %1%。请使用全局选项 %2% 代替。"
-#: src/Zypper.cc:99
+#: src/Zypper.cc:175
#, boost-format
msgid "Legacy commandline option %1% detected. Please use %2% instead."
msgstr "检测到了过时的命令行选项 %1%。请使用 %2% 代替。"
-#: src/Zypper.cc:178
+#: src/Zypper.cc:254
msgid "Command options:"
msgstr "命令选项："
-#: src/Zypper.cc:181 src/Zypper.cc:2225
+#: src/Zypper.cc:257 src/Zypper.cc:2326
msgid "Expert options:"
msgstr "专家选项："
-#: src/Zypper.cc:184
+#: src/Zypper.cc:260
msgid "This command has no additional options."
msgstr "此命令无额外选项。"
-#: src/Zypper.cc:303
+#: src/Zypper.cc:381 src/Zypper.cc:1320
+msgid "Unexpected exception."
+msgstr "意外异常。"
+
+#: src/Zypper.cc:403
msgid ""
" Global Options:\n"
"\t--help, -h\t\tHelp.\n"
@@ -2634,7 +2677,7 @@
"\t--xmlout, -x\t\t切换到 XML 输出。\n"
"\t--ignore-unknown, -i\t忽略未知软件包。\n"
-#: src/Zypper.cc:325
+#: src/Zypper.cc:425
msgid ""
"\t--reposd-dir, -D <dir>\tUse alternative repository definition file\n"
"\t\t\t\tdirectory.\n"
@@ -2649,7 +2692,7 @@
"\t--solv-cache-dir <文件夹>\t使用另一个 solv 文件缓存文件夹。\n"
"\t--pkg-cache-dir <文件夹>\t使用另一个软件包缓存文件夹。\n"
-#: src/Zypper.cc:333
+#: src/Zypper.cc:433
msgid ""
" Repository Options:\n"
"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
@@ -2677,9 +2720,10 @@
"\t--no-refresh\t\t不刷新软件源。\n"
"\t--no-cd\t\t\t忽略 CD/DVD 软件源。\n"
"\t--no-remote\t\t忽略远程软件源。\n"
-"\t--releasever\t\t设置全部 .repo 文件中 $releasever 的值 (默认：发行版版本号)\n"
+"\t--releasever\t\t设置全部 .repo 文件中 $releasever 的值 (默认：发行版版本"
+"号)\n"
-#: src/Zypper.cc:347
+#: src/Zypper.cc:447
msgid ""
" Target Options:\n"
"\t--root, -R <dir>\tOperate on a different root directory.\n"
@@ -2691,7 +2735,7 @@
"\t--disable-system-resolvables\n"
"\t\t\t\t不读取已安装软件包。\n"
-#: src/Zypper.cc:354
+#: src/Zypper.cc:454
msgid ""
" Commands:\n"
"\thelp, ?\t\t\tPrint help.\n"
@@ -2701,7 +2745,7 @@
"\thelp, ?\t\t\t打印帮助。\n"
"\tshell, sh\t\t一次性接受多个命令。\n"
-#: src/Zypper.cc:359
+#: src/Zypper.cc:459
msgid ""
" Repository Management:\n"
"\trepos, lr\t\tList all defined repositories.\n"
@@ -2721,7 +2765,7 @@
"\trefresh, ref\t\t刷新全部软件源。\n"
"\tclean\t\t\t清理本地缓存。\n"
-#: src/Zypper.cc:369
+#: src/Zypper.cc:469
msgid ""
" Service Management:\n"
"\tservices, ls\t\tList all defined services.\n"
@@ -2737,7 +2781,7 @@
"\tremoveservice, rs\t移除指定服务。\n"
"\trefresh-services, refs\t刷新全部服务。\n"
-#: src/Zypper.cc:377
+#: src/Zypper.cc:477
msgid ""
" Software Management:\n"
"\tinstall, in\t\tInstall packages.\n"
@@ -2757,7 +2801,7 @@
"\tinstall-new-recommends, inr\n"
"\t\t\t\t安装已安装软件包推荐的新增加软件包。\n"
-#: src/Zypper.cc:388
+#: src/Zypper.cc:488
msgid ""
" Update Management:\n"
"\tupdate, up\t\tUpdate installed packages with newer versions.\n"
@@ -2775,7 +2819,7 @@
"\tdist-upgrade, dup\t执行发行版升级。\n"
"\tpatch-check, pchk\t检查补丁。\n"
-#: src/Zypper.cc:397
+#: src/Zypper.cc:497
msgid ""
" Querying:\n"
"\tsearch, se\t\tSearch for packages matching a pattern.\n"
@@ -2801,7 +2845,7 @@
"\tproducts, pd\t\t列出全部可用产品。\n"
"\twhat-provides, wp\t列出能够提供指定功能的软件包。\n"
-#: src/Zypper.cc:412
+#: src/Zypper.cc:512
msgid ""
" Package Locks:\n"
"\taddlock, al\t\tAdd a package lock.\n"
@@ -2815,7 +2859,7 @@
"\tlocks, ll\t\t列出当前的软件包锁定。\n"
"\tcleanlocks, cl\t移除未使用的锁定。\n"
-#: src/Zypper.cc:419
+#: src/Zypper.cc:519
msgid ""
" Other Commands:\n"
"\tversioncmp, vcmp\tCompare two version strings.\n"
@@ -2834,7 +2878,7 @@
"\tdownload\t\t下载通过命令行指定的 RPM 到本地文件夹。\n"
"\tsource-download\t\t下载全部已安装软件包的源代码 RPM 到本地文件夹。\n"
-#: src/Zypper.cc:429
+#: src/Zypper.cc:529
msgid ""
" Subcommands:\n"
"\tsubcommand\t\tLists available subcommands.\n"
@@ -2842,7 +2886,7 @@
" 子命令：\n"
"\tsubcommand\t\t列出可用子命令。\n"
-#: src/Zypper.cc:434
+#: src/Zypper.cc:534
msgid ""
" Usage:\n"
"\tzypper [--global-options] <command> [--command-options] [arguments]\n"
@@ -2854,72 +2898,72 @@
#. translators: %s is "help" or "zypper help" depending on whether
#. zypper shell is running or not
-#: src/Zypper.cc:462
+#: src/Zypper.cc:562
#, 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:471
+#: src/Zypper.cc:571
#, c-format, boost-format
msgid "Type '%s' to get command-specific help."
msgstr "输入 '%s' 获取具体命令的帮助。"
-#: src/Zypper.cc:646
+#: src/Zypper.cc:746
#, c-format, boost-format
msgid "Verbosity: %d"
msgstr "详细程度：%d"
-#: src/Zypper.cc:660
+#: src/Zypper.cc:760
#, c-format, boost-format
msgid "Invalid table style %d."
msgstr "无效的表格样式 %d。"
-#: src/Zypper.cc:661
+#: src/Zypper.cc:761
#, c-format, boost-format
msgid "Use an integer number from %d to %d"
msgstr "请使用一个介于 %d 到 %d 之间的整数"
#. translators: %1% - is the name of a subcommand
-#: src/Zypper.cc:773
+#: src/Zypper.cc:873
#, boost-format
msgid "Subcommand %1% does not support zypper global options."
msgstr "子命令 %1% 不支持 zypper 全局选项。"
-#: src/Zypper.cc:794
+#: src/Zypper.cc:894
msgid "Enforced setting"
msgstr "强制设置"
-#: src/Zypper.cc:804
+#: src/Zypper.cc:904
msgid "User data string must not contain nonprintable or newline characters!"
msgstr "用户数据字符串必须不能包含不可打印的字符或用于另起一行的功能性字符！"
-#: src/Zypper.cc:828 src/Zypper.cc:3073
+#: src/Zypper.cc:928 src/Zypper.cc:3174
msgid "Entering non-interactive mode."
msgstr "正在进入非交互模式。"
-#: src/Zypper.cc:835
+#: src/Zypper.cc:935
msgid ""
"Patches having the flag rebootSuggested set will not be treated as "
"interactive."
msgstr "设置了\"建议重启\"旗标的补丁将不会被视为可与用户交互的。"
-#: src/Zypper.cc:842
+#: src/Zypper.cc:942
msgid "Entering 'no-gpg-checks' mode."
msgstr "正在进入无 gpg 检查模式。"
-#: src/Zypper.cc:850
+#: src/Zypper.cc:950
#, c-format, boost-format
msgid ""
"Turning on '%s'. New repository signing keys will be automatically imported!"
msgstr "正在开启 '%s'。将自动导入新软件源签名密钥！"
-#: src/Zypper.cc:863
+#: src/Zypper.cc:963
msgid "The path specified in the --root option must be absolute."
msgstr "在 --root 选项中指定的路径必须是绝对路径。"
-#: src/Zypper.cc:879
+#: src/Zypper.cc:979
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"
@@ -2927,56 +2971,52 @@
"/etc/products.d/baseproduct 系统链接不紧密或缺失！\n"
"该链接必须指向位于 /etc/products.d 中您核心系统的 .prod 文件。\n"
-#: src/Zypper.cc:919
+#: src/Zypper.cc:1019
msgid "Repositories disabled, using the database of installed packages only."
msgstr "已禁用软件源，仅使用已安装软件包的数据库。"
-#: src/Zypper.cc:931
+#: src/Zypper.cc:1031
msgid "Autorefresh disabled."
msgstr "已禁用自动刷新。"
-#: src/Zypper.cc:938
+#: src/Zypper.cc:1038
msgid "CD/DVD repositories disabled."
msgstr "已禁用 CD/DVD 软件源。"
-#: src/Zypper.cc:945
+#: src/Zypper.cc:1045
msgid "Remote repositories disabled."
msgstr "已禁用远程软件源。"
-#: src/Zypper.cc:952
+#: src/Zypper.cc:1052
msgid "Ignoring installed resolvables."
msgstr "正在忽略已安装的可解析项。"
#. TranslatorExplanation The %s is "--plus-repo"
#. TranslatorExplanation The %s is "--option-name"
-#: src/Zypper.cc:979 src/Zypper.cc:1026
+#: src/Zypper.cc:1079 src/Zypper.cc:1126
#, c-format, boost-format
msgid "The %s option has no effect here, ignoring."
msgstr "%s 选项在此无效，正在忽略。"
#. Currently no concept how to handle global options and ZYPPlock
-#: src/Zypper.cc:1109
+#: src/Zypper.cc:1209
msgid "Zypper shell does not support execution of subcommands."
msgstr "Zypper shell 不支持执行子命令。"
-#: src/Zypper.cc:1188
+#: src/Zypper.cc:1288
#, c-format, boost-format
msgid "Command '%s' is replaced by '%s'."
msgstr "命令 '%s' 已被 '%s' 替换。"
-#: src/Zypper.cc:1189
+#: src/Zypper.cc:1289
#, c-format, boost-format
msgid "See '%s' for all available options."
msgstr "全部可用选项请参考 '%s'。"
-#: src/Zypper.cc:1219
-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:1328
+#: src/Zypper.cc:1429
#, c-format, boost-format
msgid ""
"install (in) [options] ...\n"
@@ -3061,8 +3101,8 @@
" %s\n"
"-d, --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:1369 src/Zypper.cc:1424 src/Zypper.cc:1505 src/Zypper.cc:2052
-#: src/Zypper.cc:2123
+#: src/Zypper.cc:1470 src/Zypper.cc:1525 src/Zypper.cc:1606 src/Zypper.cc:2153
+#: src/Zypper.cc:2224
msgid ""
"Don't require user interaction. Alias for the --non-interactive global "
"option."
@@ -3070,7 +3110,7 @@
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "package"
-#: src/Zypper.cc:1402
+#: src/Zypper.cc:1503
#, c-format, boost-format
msgid ""
"remove (rm) [options] <capability> ...\n"
@@ -3098,7 +3138,8 @@
msgstr ""
"remove (rm) [选项] <功能> ...\n"
"\n"
-"移除具有指定功能的软件包。功能的定义为\"名称[.架构][操作符 <版本>]\"，操作符为 <, <=, =, >=, > 其中之一。\n"
+"移除具有指定功能的软件包。功能的定义为\"名称[.架构][操作符 <版本>]\"，操作符"
+"为 <, <=, =, >=, > 其中之一。\n"
"\n"
" 命令选项\n"
"-r, --repo <别名|#|URI> 仅加载指定软件源。\n"
@@ -3114,7 +3155,7 @@
"-D, --dry-run 测试移除，并不真正移除。\n"
" --details 显示详细安装摘要。\n"
-#: src/Zypper.cc:1442
+#: src/Zypper.cc:1543
msgid ""
"source-install (si) [options] <name> ...\n"
"\n"
@@ -3137,15 +3178,17 @@
"-r, --repo <别名|#|URI> 仅从指定软件源安装软件包。\n"
" --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:1453
+#: src/Zypper.cc:1554
#, boost-format
msgid ""
"The default location where rpm installs source packages to is '%1%', but the "
"value can be changed in your local rpm configuration. In case of doubt try "
"executing '%2%'."
-msgstr "rpm 安装源代码软件包的默认位置是 '%1%'，但该值可在您的本地 rpm 配置中修改。存疑请尝试执行 '%2%'。"
+msgstr ""
+"rpm 安装源代码软件包的默认位置是 '%1%'，但该值可在您的本地 rpm 配置中修改。存"
+"疑请尝试执行 '%2%'。"
-#: src/Zypper.cc:1487
+#: src/Zypper.cc:1588
#, c-format, boost-format
msgid ""
"verify (ve) [options]\n"
@@ -3169,7 +3212,8 @@
msgstr ""
"verify (ve) [选项]\n"
"\n"
-"检查已安装软件包的依赖关系是否满足，并提供安装或移除软件包的建议以修复依赖问题。\n"
+"检查已安装软件包的依赖关系是否满足，并提供安装或移除软件包的建议以修复依赖问"
+"题。\n"
"\n"
" 命令选项：\n"
"-r, --repo <别名|#|URI> 仅加载指定软件源。\n"
@@ -3181,7 +3225,7 @@
" %s\n"
"-d, --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:1529
+#: src/Zypper.cc:1630
#, c-format, boost-format
msgid ""
"install-new-recommends (inr) [options]\n"
@@ -3201,7 +3245,8 @@
msgstr ""
"install-new-recommends (inr) [选项]\n"
"\n"
-"安装由已安装软件包推荐的新添加的软件包。这典型地可用于安装新语言包或新添加硬件的驱动。\n"
+"安装由已安装软件包推荐的新添加的软件包。这典型地可用于安装新语言包或新添加硬"
+"件的驱动。\n"
"\n"
" 命令选项：\n"
"-r, --repo <别名|#|URI> 仅加载指定软件源。\n"
@@ -3213,7 +3258,7 @@
" --debug-solver 创建依赖关系解决器试例以供调试。\n"
#. translators: the %s = "ris" (the only service type currently supported)
-#: src/Zypper.cc:1559
+#: src/Zypper.cc:1660
#, c-format, boost-format
msgid ""
"addservice (as) [options] <URI> <alias>\n"
@@ -3235,7 +3280,7 @@
"-n, --name <别名> 为服务指定描述性名称。\n"
#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir"
-#: src/Zypper.cc:1582
+#: src/Zypper.cc:1683
msgid ""
"removeservice (rs) [options] \n"
"\n"
@@ -3254,7 +3299,7 @@
" --loose-query 忽略 URI 中的查询字符串。\n"
#. translators: %s is "--all" and "--all"
-#: src/Zypper.cc:1618
+#: src/Zypper.cc:1719
#, c-format, boost-format
msgid ""
"modifyservice (ms) <options> \n"
@@ -3308,7 +3353,7 @@
"-t, --remote 应用修改到全部远程服务。\n"
"-m, --medium-type <类型> 应用修改到指定类型的服务。\n"
-#: src/Zypper.cc:1666
+#: src/Zypper.cc:1767
msgid ""
"services (ls) [options]\n"
"\n"
@@ -3338,7 +3383,7 @@
"-U, --sort-by-uri 按 URL 排序列表。\n"
"-N, --sort-by-name 按名称排序列表。\n"
-#: src/Zypper.cc:1694
+#: src/Zypper.cc:1795
msgid ""
"refresh-services (refs) [options]\n"
"\n"
@@ -3360,7 +3405,7 @@
"-R,--restore-status 同时恢复服务软件源的启用/禁用状态。\n"
#. translators: the %s = "yast2, rpm-md, plaindir"
-#: src/Zypper.cc:1727
+#: src/Zypper.cc:1828
#, c-format, boost-format
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
@@ -3387,7 +3432,8 @@
"addrepo (ar) [选项] <URI> <别名>\n"
"addrepo (ar) [选项] <文件.repo>\n"
"\n"
-"向系统中添加一个软件源。软件源可通过其 URI 指定也可从指定的 .repo 文件 (甚至是远程) 中读取。\n"
+"向系统中添加一个软件源。软件源可通过其 URI 指定也可从指定的 .repo 文件 (甚至"
+"是远程) 中读取。\n"
"\n"
" 命令选项：\n"
"-r, --repo <文件名.repo> 指定要读取的 .repo 文件的另一种方法。\n"
@@ -3403,7 +3449,7 @@
"-G, --no-gpgcheck 对此软件源禁用 GPG 密钥检查。\n"
"-f, --refresh 启用软件源自动刷新。\n"
-#: src/Zypper.cc:1773
+#: src/Zypper.cc:1874
msgid ""
"repos (lr) [options] [repo] ...\n"
"\n"
@@ -3445,7 +3491,7 @@
"-A, --sort-by-alias 按别名排序列表。\n"
"-N, --sort-by-name 按名称排序列表。\n"
-#: src/Zypper.cc:1805
+#: src/Zypper.cc:1906
msgid ""
"removerepo (rr) [options] \n"
"\n"
@@ -3463,7 +3509,7 @@
" --loose-auth 忽略 URI 中的用户认证数据。\n"
" --loose-query 忽略 URI 中的查询字符串。\n"
-#: src/Zypper.cc:1824
+#: src/Zypper.cc:1925
msgid ""
"renamerepo (nr) [options] <new-alias>\n"
"\n"
@@ -3479,7 +3525,7 @@
#. translators: %s is "--all|--remote|--local|--medium-type"
#. and "--all, --remote, --local, --medium-type"
-#: src/Zypper.cc:1857
+#: src/Zypper.cc:1958
#, c-format, boost-format
msgid ""
"modifyrepo (mr) <options> ...\n"
@@ -3528,7 +3574,7 @@
"-t, --remote 应用修改到全部远程软件源。\n"
"-m, --medium-type <类型> 应用修改到指定类型的软件源。\n"
-#: src/Zypper.cc:1899
+#: src/Zypper.cc:2000
msgid ""
"refresh (ref) [alias|#|URI] ...\n"
"\n"
@@ -3558,7 +3604,7 @@
"-r, --repo <别名|#|URI> 仅刷新指定软件源。\n"
"-s, --services 刷新软件源之前也刷新服务。\n"
-#: src/Zypper.cc:1928
+#: src/Zypper.cc:2029
msgid ""
"clean (cc) [alias|#|URI] ...\n"
"\n"
@@ -3582,7 +3628,7 @@
#. TranslatorExplanation the first %s = "package, patch, pattern, product"
#. and the second %s = "patch"
-#: src/Zypper.cc:1957
+#: src/Zypper.cc:2058
#, c-format, boost-format
msgid ""
"list-updates (lu) [options]\n"
@@ -3619,7 +3665,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:2015
+#: src/Zypper.cc:2116
#, c-format, boost-format
msgid ""
"update (up) [options] [packagename] ...\n"
@@ -3692,7 +3738,7 @@
" %s\n"
"-d, --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:2091
+#: src/Zypper.cc:2192
#, c-format, boost-format
msgid ""
"patch [options]\n"
@@ -3761,11 +3807,11 @@
" %s\n"
"-d, --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:2122
+#: src/Zypper.cc:2223
msgid "Install only patches which affect the package management itself."
msgstr "仅列出影响软件管理器本身的补丁。"
-#: src/Zypper.cc:2145
+#: src/Zypper.cc:2246
msgid ""
"list-patches (lp) [options]\n"
"\n"
@@ -3796,7 +3842,7 @@
"-r, --repo <别名|#|URI> 仅列出指定软件源中的补丁。\n"
" --date <YYYY-MM-DD> 列出指定日期前发布的补丁。\n"
-#: src/Zypper.cc:2200
+#: src/Zypper.cc:2301
#, c-format, boost-format
msgid ""
"dist-upgrade (dup) [options]\n"
@@ -3851,23 +3897,23 @@
" %s\n"
"-d, --download-only 仅下载软件包，不安装。\n"
-#: src/Zypper.cc:2226
+#: src/Zypper.cc:2327
msgid "Whether to allow downgrading installed resolvables."
msgstr "是否允许降级已安装解析项。"
-#: src/Zypper.cc:2227
+#: src/Zypper.cc:2328
msgid "Whether to allow changing the names of installed resolvables."
msgstr "是否允许修改已安装解析项的名称。"
-#: src/Zypper.cc:2228
+#: src/Zypper.cc:2329
msgid "Whether to allow changing the architecture of installed resolvables."
msgstr "是否允许修改已安装解析项的架构。"
-#: src/Zypper.cc:2229
+#: src/Zypper.cc:2330
msgid "Whether to allow changing the vendor of installed resolvables."
msgstr "是否允许修改已安装解析项的厂商。"
-#: src/Zypper.cc:2267
+#: src/Zypper.cc:2368
msgid ""
"search (se) [options] [querystring] ...\n"
"\n"
@@ -3945,7 +3991,7 @@
"* 和 ? 通配符也可以用于搜索字符串中。\n"
"若搜索字符串以 '/' 结尾，它将被解释为一个正则表达式。\n"
-#: src/Zypper.cc:2316
+#: src/Zypper.cc:2417
msgid ""
"patch-check (pchk) [options]\n"
"\n"
@@ -3964,11 +4010,11 @@
"\n"
"-r, --repo <别名|#|URI> 仅检查指定软件源中的补丁。\n"
-#: src/Zypper.cc:2324
+#: src/Zypper.cc:2425
msgid "Check only for patches which affect the package management itself."
msgstr "仅检查影响软件管理器自身的补丁。"
-#: src/Zypper.cc:2340
+#: src/Zypper.cc:2441
msgid ""
"patches (pch) [repository] ...\n"
"\n"
@@ -3986,7 +4032,7 @@
"\n"
"-r, --repo <别名|#|URI> 指定软件源的另一种方法。\n"
-#: src/Zypper.cc:2371
+#: src/Zypper.cc:2472
msgid ""
"packages (pa) [options] [repository] ...\n"
"\n"
@@ -4021,7 +4067,7 @@
"-N, --sort-by-name 按软件包名称排序列表。\n"
"-R, --sort-by-repo 按软件源排序列表。\n"
-#: src/Zypper.cc:2403
+#: src/Zypper.cc:2504
msgid ""
"patterns (pt) [options] [repository] ...\n"
"\n"
@@ -4043,7 +4089,7 @@
"-i, --installed-only 仅显示已安装的软件集。\n"
"-u, --uninstalled-only 仅显示未安装的软件集。\n"
-#: src/Zypper.cc:2429
+#: src/Zypper.cc:2530
msgid ""
"products (pd) [options] [repository] ...\n"
"\n"
@@ -4065,7 +4111,7 @@
"-i, --installed-only 仅显示已安装的产品。\n"
"-u, --uninstalled-only 仅显示未安装的产品。\n"
-#: src/Zypper.cc:2461
+#: src/Zypper.cc:2562
#, c-format, boost-format
msgid ""
"info (if) [options] <name> ...\n"
@@ -4107,7 +4153,7 @@
" --recommends 显示该软件包推荐的软件包。\n"
" --suggests 显示该软件包建议的软件包。\n"
-#: src/Zypper.cc:2494
+#: src/Zypper.cc:2595
#, c-format, boost-format
msgid ""
"patch-info <patchname> ...\n"
@@ -4122,7 +4168,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2513
+#: src/Zypper.cc:2614
#, c-format, boost-format
msgid ""
"pattern-info ...\n"
@@ -4137,7 +4183,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2532
+#: src/Zypper.cc:2633
#, c-format, boost-format
msgid ""
"product-info ...\n"
@@ -4152,7 +4198,7 @@
"\n"
"这是 '%s' 的一个别名。\n"
-#: src/Zypper.cc:2549
+#: src/Zypper.cc:2650
msgid ""
"what-provides (wp) <capability>\n"
"\n"
@@ -4166,7 +4212,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2600
+#: src/Zypper.cc:2701
msgid ""
"moo\n"
"\n"
@@ -4180,7 +4226,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2622
+#: src/Zypper.cc:2723
#, c-format, boost-format
msgid ""
"addlock (al) [options] <packagename> ...\n"
@@ -4195,14 +4241,15 @@
msgstr ""
"addlock (al) [选项] <软件包名称> ...\n"
"\n"
-"添加一个软件包锁定。通过精确的名称或使用了 '*' 和 '?' 通配符的匹配模式指定要锁定的软件包。\n"
+"添加一个软件包锁定。通过精确的名称或使用了 '*' 和 '?' 通配符的匹配模式指定要"
+"锁定的软件包。\n"
"\n"
" 命令选项：\n"
"-r, --repo <别名|#|URI> 该锁定仅限于指定软件源。\n"
"-t, --type <类型> 软件包类型 (%s)。\n"
" 默认：%s。\n"
-#: src/Zypper.cc:2649
+#: src/Zypper.cc:2750
#, c-format, boost-format
msgid ""
"removelock (rl) [options] ...\n"
@@ -4225,26 +4272,26 @@
" 默认：%s。\n"
#. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
-#: src/Zypper.cc:2676
+#: src/Zypper.cc:2777
msgid "locks (ll) [options]"
msgstr "locks (ll) [选项]"
#. translators: command description
-#: src/Zypper.cc:2679
+#: src/Zypper.cc:2780
msgid "List current package locks."
msgstr "列出当前软件包锁定。"
#. translators: -m, --matches
-#: src/Zypper.cc:2683
+#: src/Zypper.cc:2784
msgid "Show the number of resolvables matched by each lock."
msgstr "显示每个锁定匹配到的解析项数目。"
#. translators: -s, --solvables
-#: src/Zypper.cc:2685
+#: src/Zypper.cc:2786
msgid "List the resolvables matched by each lock."
msgstr "列出每个锁定匹配到的解析项。"
-#: src/Zypper.cc:2701
+#: src/Zypper.cc:2802
msgid ""
"cleanlocks (cl)\n"
"\n"
@@ -4262,7 +4309,7 @@
"-d, --only-duplicates 仅清理重复的锁定。\n"
"-e, --only-empty 仅清理没有锁定任何东西的锁定。\n"
-#: src/Zypper.cc:2722
+#: src/Zypper.cc:2823
msgid ""
"targetos (tos) [options]\n"
"\n"
@@ -4280,7 +4327,7 @@
" 命令选项：\n"
"-l, --label 显示操作系统标签。\n"
-#: src/Zypper.cc:2743
+#: src/Zypper.cc:2844
msgid ""
"versioncmp (vcmp) <version1> <version2>\n"
"\n"
@@ -4296,7 +4343,7 @@
" 命令选项：\n"
"-m, --match 将缺失的释出号视为任意释出号。\n"
-#: src/Zypper.cc:2762
+#: src/Zypper.cc:2863
msgid ""
"licenses\n"
"\n"
@@ -4311,37 +4358,39 @@
"此命令无额外选项。\n"
#. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
-#: src/Zypper.cc:2786
+#: src/Zypper.cc:2887
msgid "ps [options]"
msgstr "ps [选项]"
#. translators: command description
-#: src/Zypper.cc:2789
+#: src/Zypper.cc:2890
msgid ""
"List running processes which might still use files and libraries deleted by "
"recent upgrades."
msgstr "列出可能仍使用着被最近升级删除的文件和函数库的运行中进程。"
#. translators: -s, --short
-#: src/Zypper.cc:2793
+#: src/Zypper.cc:2894
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 "创建一个不显示已删除文件的简短表格。给出两次仅显示关联着系统服务的进程。给出三次则仅列出关联的系统服务名称。"
+msgstr ""
+"创建一个不显示已删除文件的简短表格。给出两次仅显示关联着系统服务的进程。给出"
+"三次则仅列出关联的系统服务名称。"
#. translators: --print <format>
-#: src/Zypper.cc:2795
+#: src/Zypper.cc:2896
#, 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 "
"system service name."
msgstr ""
-"针对每个关联的系统服务在标准输出上打印 <格式> 后接新行。<格式> 中的任"
-"何 '%s' 指示符都将被替换为系统服务名称。"
+"针对每个关联的系统服务在标准输出上打印 <格式> 后接新行。<格式> 中的任何 '%s' "
+"指示符都将被替换为系统服务名称。"
-#: src/Zypper.cc:2814
+#: src/Zypper.cc:2915
msgid ""
"download [options] <packages>...\n"
"\n"
@@ -4365,16 +4414,18 @@
"download [选项] <软件包>...\n"
"下载命令行指定的 RPM 到本地文件夹。\n"
"默认将软件包下载到 libzypp 软件包缓存文件夹\n"
-"(/var/cache/zypp/packages; 非 root 用户则是 $XDG_CACHE_HOME/zypp/packages)，\n"
+"(/var/cache/zypp/packages; 非 root 用户则是 $XDG_CACHE_HOME/zypp/"
+"packages)，\n"
"但这可以使用全局的 --pkg-cache-dir 选项修改。\n"
"在 XML 输出模式下，会为每个 zypper 试图下载的软件包写入一个<下载结果>节点。\n"
"成功后本地路径可在 'download-result/localpath@path' 中找到。\n"
"\n"
" 命令选项：\n"
-"--all-matches 下载匹配命令行参数的全部版本。否则将仅下载每个匹配到的软件包的最佳版本。\n"
+"--all-matches 下载匹配命令行参数的全部版本。否则将仅下载每个匹配到的软"
+"件包的最佳版本。\n"
"--dry-run 不下载任何软件包，仅报告将会发生什么。\n"
-#: src/Zypper.cc:2853
+#: src/Zypper.cc:2954
msgid ""
"source-download\n"
"\n"
@@ -4402,7 +4453,7 @@
"--status 不下载任何源代码 RPM，\n"
" 而是显示缺失或多余的源代码 RPM。\n"
-#: src/Zypper.cc:2880
+#: src/Zypper.cc:2981
msgid ""
"quit (exit, ^D)\n"
"\n"
@@ -4416,7 +4467,7 @@
"\n"
"此命令无额外选项。\n"
-#: src/Zypper.cc:2897
+#: src/Zypper.cc:2998
msgid ""
"shell (sh)\n"
"\n"
@@ -4431,7 +4482,7 @@
"此命令无额外选项。\n"
#. translators: this is just a legacy command
-#: src/Zypper.cc:2915
+#: src/Zypper.cc:3016
msgid ""
"service-types (st)\n"
"\n"
@@ -4442,7 +4493,7 @@
"列出可用的服务类型。\n"
#. translators: this is just a legacy command
-#: src/Zypper.cc:2931
+#: src/Zypper.cc:3032
msgid ""
"list-resolvables (lr)\n"
"\n"
@@ -4455,7 +4506,7 @@
#. 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:2953
+#: src/Zypper.cc:3054
msgid ""
"mount\n"
"\n"
@@ -4475,7 +4526,7 @@
"-n, --name <名称> 使用给定字符串作为服务名称。\n"
"-r, --recurse 递归探测子文件夹。\n"
-#: src/Zypper.cc:2982
+#: src/Zypper.cc:3083
#, c-format, boost-format
msgid ""
"patch-search [options] [querystring...]\n"
@@ -4488,7 +4539,7 @@
"搜索匹配给定搜索字符串的补丁。这是 '%s' 的一个别名。\n"
#. translators: this is just a legacy command
-#: src/Zypper.cc:2999
+#: src/Zypper.cc:3100
msgid ""
"ping [options]\n"
"\n"
@@ -4498,34 +4549,16 @@
"\n"
"此命令的实现是虚假的，总是返回 0。\n"
-#: src/Zypper.cc:3042 src/Zypper.cc:5227
+#: src/Zypper.cc:3143 src/Zypper.cc:5265
msgid "Unexpected program flow."
msgstr "意外程序流。"
-#: src/Zypper.cc:3090
+#: src/Zypper.cc:3191
msgid "Non-option program arguments: "
msgstr "无选项程序参数："
-#: src/Zypper.cc:3145
-msgid ""
-"PackageKit is blocking zypper. This happens if you have an updater applet or "
-"other software management application using PackageKit running."
-msgstr "PackageKit 正屏蔽着 zypper。这发生在若您已运行了一个使用 PackageKit 的升级挂件或其他软件管理程序时。"
-
-#: src/Zypper.cc:3150
-msgid "Tell PackageKit to quit?"
-msgstr "通知 PackageKit 退出吗？"
-
-#: src/Zypper.cc:3159
-msgid "PackageKit is still running (probably busy)."
-msgstr "PackageKit 仍在运行 (或许正忙)。"
-
-#: src/Zypper.cc:3160
-msgid "Try again?"
-msgstr "重试吗？"
-
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: src/Zypper.cc:3214
+#: src/Zypper.cc:3251
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -4535,20 +4568,20 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: src/Zypper.cc:3241
+#: src/Zypper.cc:3278
msgid "Root privileges are required for refreshing services."
msgstr "刷新服务需要有 root 特权。"
-#: src/Zypper.cc:3267 src/Zypper.cc:3358 src/Zypper.cc:3581
+#: src/Zypper.cc:3304 src/Zypper.cc:3395 src/Zypper.cc:3618
msgid "Root privileges are required for modifying system services."
msgstr "修改系统服务需要有 root 特权。"
-#: src/Zypper.cc:3340
+#: src/Zypper.cc:3377
#, c-format, boost-format
msgid "'%s' is not a valid service type."
msgstr "`%s' 不是一个有效的服务类型。"
-#: src/Zypper.cc:3342
+#: src/Zypper.cc:3379
#, c-format, boost-format
msgid "See '%s' or '%s' to get a list of known service types."
msgstr "请参考 '%s' 或 '%s' 获取已知服务类型列表。"
@@ -4557,116 +4590,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:3369 src/Zypper.cc:3726
+#: src/Zypper.cc:3406 src/Zypper.cc:3763
msgid "Alias or an aggregate option is required."
msgstr "需要别名或者一个聚合选项。"
-#: src/Zypper.cc:3401
+#: src/Zypper.cc:3438
#, c-format, boost-format
msgid "Service '%s' not found."
msgstr "未找到服务 '%s'。"
-#: src/Zypper.cc:3432 src/Zypper.cc:3580 src/Zypper.cc:3661 src/Zypper.cc:3715
+#: src/Zypper.cc:3469 src/Zypper.cc:3617 src/Zypper.cc:3698 src/Zypper.cc:3752
msgid "Root privileges are required for modifying system repositories."
msgstr "修改系统软件源需要有 root 特权。"
-#: src/Zypper.cc:3487 src/Zypper.cc:3837
+#: src/Zypper.cc:3524 src/Zypper.cc:3874
msgid "Too few arguments."
msgstr "参数太少。"
-#: src/Zypper.cc:3510
+#: src/Zypper.cc:3547
msgid ""
"If only one argument is used, it must be a URI pointing to a .repo file."
msgstr "如果只用一个参数，那么它必须是一个指向 .repo 文件的 URI。"
-#: src/Zypper.cc:3540
+#: src/Zypper.cc:3577
#, c-format, boost-format
msgid "Cannot use %s together with %s. Using the %s setting."
msgstr "无法同时使用 %s 和 %s。正在使用 %s 设置。"
-#: src/Zypper.cc:3559
+#: src/Zypper.cc:3596
msgid "Specified type is not a valid repository type:"
msgstr "指定的类型不是一个有效的软件源类型："
-#: src/Zypper.cc:3560
+#: src/Zypper.cc:3597
#, c-format, boost-format
msgid "See '%s' or '%s' to get a list of known repository types."
msgstr "请参考 '%s' 或 '%s' 获取已知软件源类型列表。"
-#: src/Zypper.cc:3588 src/Zypper.cc:4813 src/utils/messages.cc:45
+#: src/Zypper.cc:3625 src/Zypper.cc:4851 src/utils/messages.cc:45
msgid "Required argument missing."
msgstr "缺失所需参数。"
#. translators: %s is the supplied command line argument which
#. for which no repository counterpart was found
-#: src/Zypper.cc:3613
+#: src/Zypper.cc:3650
#, 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:3635
+#: src/Zypper.cc:3672
#, c-format, boost-format
msgid "Service '%s' not found by alias, number or URI."
msgstr "通过别名、编号或 URI 都未找到服务 '%s'。"
-#: src/Zypper.cc:3668
+#: src/Zypper.cc:3705
msgid "Too few arguments. At least URI and alias are required."
msgstr "参数太少。至少需要 URI 和别名。"
-#: src/Zypper.cc:3692
+#: src/Zypper.cc:3729
#, c-format, boost-format
msgid "Repository '%s' not found."
msgstr "未找到软件源 '%s'。"
-#: src/Zypper.cc:3758
+#: src/Zypper.cc:3795
#, c-format, boost-format
msgid "Repository %s not found."
msgstr "未找到软件源 %s。"
-#: src/Zypper.cc:3777
+#: src/Zypper.cc:3814
msgid "Root privileges are required for refreshing system repositories."
msgstr "刷新系统软件源需要有 root 特权。"
-#: src/Zypper.cc:3783
+#: src/Zypper.cc:3820
#, c-format, boost-format
msgid "The '%s' global option has no effect here."
msgstr "全局选项 '%s' 在此无效。"
-#: src/Zypper.cc:3791
+#: src/Zypper.cc:3828
#, c-format, boost-format
msgid "Arguments are not allowed if '%s' is used."
msgstr "若使用 '%s' 则不允许使用参数。"
-#: src/Zypper.cc:3817
+#: src/Zypper.cc:3854
msgid "Root privileges are required for cleaning local caches."
msgstr "清理本地缓存需要有 root 特权。"
-#: src/Zypper.cc:3838
+#: src/Zypper.cc:3875
msgid "At least one package name is required."
msgstr "需要至少一个软件包名称。"
-#: src/Zypper.cc:3847
+#: src/Zypper.cc:3884
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:3859
+#: src/Zypper.cc:3896
msgid "Ignoring arguments, marking the entire repository."
msgstr "忽略参数，标记整个软件源。"
-#: src/Zypper.cc:3870
+#: src/Zypper.cc:3907
#, c-format, boost-format
msgid "Unknown package type: %s"
msgstr "未知软件包类型：%s"
-#: src/Zypper.cc:3880
+#: src/Zypper.cc:3917
msgid "Cannot uninstall patches."
msgstr "无法卸载补丁。"
-#: src/Zypper.cc:3881
+#: src/Zypper.cc:3918
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"
@@ -4675,186 +4708,192 @@
"一款补丁的安装情况完全取决于其依赖关系。\n"
"因此仅仅是复制文件、数据库记录或其它东西并不代表安装了补丁。"
-#: src/Zypper.cc:3891
+#: src/Zypper.cc:3928
msgid "Uninstallation of a source package not defined and implemented."
msgstr "目前未定义也未实现源代码包的卸载。"
-#: src/Zypper.cc:3910
+#: src/Zypper.cc:3947
#, c-format, boost-format
msgid "'%s' looks like an RPM file. Will try to download it."
msgstr "'%s' 貌似是一个 RPM 文件，将尝试下载之。"
-#: src/Zypper.cc:3919
+#: src/Zypper.cc:3956
#, c-format, boost-format
msgid "Problem with the RPM file specified as '%s', skipping."
msgstr "指定为 '%s' 的 RPM 文件有问题，正在跳过。"
-#: src/Zypper.cc:3941
+#: src/Zypper.cc:3978
#, c-format, boost-format
msgid "Problem reading the RPM header of %s. Is it an RPM file?"
msgstr "读取 %s 的 RPM 头部出现问题。它是一个 RPM 文件吗？"
-#: src/Zypper.cc:3963
+#: src/Zypper.cc:4000
msgid "Plain RPM files cache"
msgstr "纯 RPM 文件缓存"
-#: src/Zypper.cc:3980
+#: src/Zypper.cc:4017
msgid "No valid arguments specified."
msgstr "未指定有效的参数。"
-#: src/Zypper.cc:3997 src/Zypper.cc:4132
+#: src/Zypper.cc:4034 src/Zypper.cc:4169
msgid ""
"No repositories defined. Operating only with the installed resolvables. "
"Nothing can be installed."
msgstr "未定义软件源。只能操作已安装的可解析项。不能安装新东西。"
#. translators: meaning --capability contradicts --force/--name
-#: src/Zypper.cc:4034 src/Zypper.cc:4622
+#: src/Zypper.cc:4071 src/Zypper.cc:4660
#, c-format, boost-format
msgid "%s contradicts %s"
msgstr "%s 与 %s 冲突"
#. translators: meaning --force with --capability
-#: src/Zypper.cc:4042
+#: src/Zypper.cc:4079
#, c-format, boost-format
msgid "%s cannot currently be used with %s"
msgstr "%s 目前不能和 %s 一起使用"
-#: src/Zypper.cc:4085
+#: src/Zypper.cc:4122
msgid "Source package name is a required argument."
msgstr "源代码包名称是一个必需的参数。"
-#: src/Zypper.cc:4172
+#: src/Zypper.cc:4209
msgid "Mode is set to 'match-exact'"
msgstr "模式已设为精确匹配"
-#: src/Zypper.cc:4192 src/Zypper.cc:4539 src/Zypper.cc:4641 src/Zypper.cc:4841
-#: src/Zypper.cc:4891 src/Zypper.cc:4933
+#: src/Zypper.cc:4229 src/Zypper.cc:4577 src/Zypper.cc:4679 src/Zypper.cc:4879
+#: src/Zypper.cc:4929 src/Zypper.cc:4971
#, c-format, boost-format
msgid "Unknown package type '%s'."
msgstr "未知软件包类型 '%s'。"
-#: src/Zypper.cc:4214
+#: src/Zypper.cc:4251
#, c-format, boost-format
msgid "Specified repository '%s' is disabled."
msgstr "已禁用指定软件源 '%s'。"
-#: src/Zypper.cc:4343 src/search.cc:569
-msgid "No packages found."
-msgstr "未找到软件包。"
+#. translators: empty search result message
+#: src/Zypper.cc:4381
+#, fuzzy
+msgid "No matching items found."
+msgstr "未找到匹配的问题。"
-#: src/Zypper.cc:4378
+#: src/Zypper.cc:4416
msgid "Problem occurred initializing or executing the search query"
msgstr "初始化或执行搜索查询出现问题"
-#: src/Zypper.cc:4379
+#: src/Zypper.cc:4417
msgid "See the above message for a hint."
msgstr "请参考以上消息汲取灵感。"
-#: src/Zypper.cc:4558 src/Zypper.cc:4608
+#: src/Zypper.cc:4596 src/Zypper.cc:4646
#, c-format, boost-format
msgid "Cannot use %s together with %s."
msgstr "无法同时使用 %s 和 %s。"
-#: src/Zypper.cc:4589
+#: src/Zypper.cc:4627
msgid "Root privileges are required for updating packages."
msgstr "更新软件包需要有 root 特权。"
-#: src/Zypper.cc:4648 src/Zypper.cc:4656 src/Zypper.cc:4728
+#: src/Zypper.cc:4686 src/Zypper.cc:4694 src/Zypper.cc:4766
msgid "Operation not supported."
msgstr "不支持该操作。"
-#: src/Zypper.cc:4649
+#: src/Zypper.cc:4687
#, c-format, boost-format
msgid "To update installed products use '%s'."
msgstr "要更新已安装的产品请使用 '%s'。"
-#: src/Zypper.cc:4657
+#: src/Zypper.cc:4695
#, c-format, boost-format
msgid ""
"Zypper does not keep track of installed source packages. To install the "
"latest source package and its build dependencies, use '%s'."
-msgstr "Zypper 不会追踪已安装的源软件包。要安装最新的源软件包和它的编译依赖，请使用 '%s'。"
+msgstr ""
+"Zypper 不会追踪已安装的源软件包。要安装最新的源软件包和它的编译依赖，请使用 "
+"'%s'。"
-#: src/Zypper.cc:4673
+#: src/Zypper.cc:4711
msgid ""
"Cannot use multiple types when specific packages are given as arguments."
msgstr "当指定软件包作为参数给出时不能使用多种类型。"
-#: src/Zypper.cc:4766
+#: src/Zypper.cc:4804
msgid "Root privileges are required for performing a distribution upgrade."
msgstr "执行发行版升级需要有 root 特权。"
-#: src/Zypper.cc:4786
+#: src/Zypper.cc:4824
#, c-format, boost-format
msgid ""
"You are about to do a distribution upgrade with all enabled repositories. "
"Make sure these repositories are compatible before you continue. See '%s' "
"for more information about this command."
-msgstr "您正要使用全部已启用软件源进行发行版升级。继续前请确保这些源之间相互兼容。参考 '%s' 获知更多关于此命令的信息。"
+msgstr ""
+"您正要使用全部已启用软件源进行发行版升级。继续前请确保这些源之间相互兼容。参"
+"考 '%s' 获知更多关于此命令的信息。"
-#: src/Zypper.cc:4816 src/utils/messages.cc:37 src/utils/messages.cc:47
+#: src/Zypper.cc:4854 src/utils/messages.cc:37 src/utils/messages.cc:47
#: src/utils/messages.cc:64
msgid "Usage"
msgstr "用法"
-#: src/Zypper.cc:4870 src/Zypper.cc:4913
+#: src/Zypper.cc:4908 src/Zypper.cc:4951
msgid "Root privileges are required for adding of package locks."
msgstr "添加软件包锁定需要有 root 特权。"
-#: src/Zypper.cc:4998
+#: src/Zypper.cc:5036
#, c-format, boost-format
msgid "Removed %lu lock."
msgid_plural "Removed %lu locks."
msgstr[0] "已移除 %lu 锁定。"
-#: src/Zypper.cc:5011
+#: src/Zypper.cc:5049
msgid "XML output not implemented for this command."
msgstr "此命令未实现 XML 输出。"
-#: src/Zypper.cc:5024
+#: src/Zypper.cc:5062
#, c-format, boost-format
msgid "Distribution Label: %s"
msgstr "发行版标签: %s"
-#: src/Zypper.cc:5025
+#: src/Zypper.cc:5063
#, c-format, boost-format
msgid "Short Label: %s"
msgstr "短标签：%s"
-#: src/Zypper.cc:5068
+#: src/Zypper.cc:5106
#, c-format, boost-format
msgid "%s matches %s"
msgstr "%s 匹配 %s"
-#: src/Zypper.cc:5070
+#: src/Zypper.cc:5108
#, c-format, boost-format
msgid "%s is newer than %s"
msgstr "%s 较 %s 新"
-#: src/Zypper.cc:5072
+#: src/Zypper.cc:5110
#, c-format, boost-format
msgid "%s is older than %s"
msgstr "%s 较 %s 旧"
-#: src/Zypper.cc:5156 src/source-download.cc:217
+#: src/Zypper.cc:5194 src/source-download.cc:217
#, c-format, boost-format
msgid "Insufficient privileges to use download directory '%s'."
msgstr "权限不足以使用下载文件夹 '%s'。"
-#: src/Zypper.cc:5212
+#: src/Zypper.cc:5250
msgid "This command only makes sense in the zypper shell."
msgstr "此命令只有在 zypper 壳层中才有意义。"
-#: src/Zypper.cc:5224
+#: src/Zypper.cc:5262
msgid "You already are running zypper's shell."
msgstr "您已在运行 zypper 的壳层了。"
-#: src/Zypper.cc:5239
+#: src/Zypper.cc:5277
msgid "Description"
msgstr "描述"
-#: src/Zypper.cc:5304
+#: src/Zypper.cc:5342
msgid "Resolvable Type"
msgstr "可解析项类型"
@@ -4965,57 +5004,67 @@
msgid ""
"Check for running processes using deleted libraries is disabled in zypper."
"conf. Run '%s' to check manually."
-msgstr "检查使用了已删除函数库的运行中进程的功能在 zypper.conf 中禁用了。运行 '%s' 手动检查。"
+msgstr ""
+"检查使用了已删除函数库的运行中进程的功能在 zypper.conf 中禁用了。运行 '%s' 手"
+"动检查。"
#. Here: Table output
#: src/solve-commit.cc:436 src/ps.cc:104
msgid "Checking for running processes using deleted libraries..."
msgstr "正在检查使用了已删除库文件的运行中进程..."
-#: src/solve-commit.cc:445 src/ps.cc:59
+#: src/solve-commit.cc:447 src/ps.cc:59
msgid "Check failed:"
msgstr "检查失败："
-#: src/solve-commit.cc:452
+#: src/solve-commit.cc:449
+#, fuzzy
+msgid "Skip check:"
+msgstr "GPG 检查"
+
+#: src/solve-commit.cc:457
#, c-format, boost-format
msgid ""
"There are some running programs that might use files deleted by recent "
"upgrade. You may wish to check and restart some of them. Run '%s' to list "
"these programs."
-msgstr "一些运行中的程序可能使用着最近升级删除的文件。您可能希望检查并重启部分程序。可运行 '%s' 列出这些程序。"
+msgstr ""
+"一些运行中的程序可能使用着最近升级删除的文件。您可能希望检查并重启部分程序。"
+"可运行 '%s' 列出这些程序。"
-#: src/solve-commit.cc:463
+#: src/solve-commit.cc:468
msgid "Update notifications were received from the following packages:"
msgstr "接收到了来自以下软件包的更新通知："
-#: src/solve-commit.cc:472
+#: src/solve-commit.cc:477
#, c-format, boost-format
msgid "Message from package %s:"
msgstr "来自软件包 %s 的消息："
-#: src/solve-commit.cc:480
+#: src/solve-commit.cc:485
msgid "y/n"
msgstr "y/n"
-#: src/solve-commit.cc:481
+#: src/solve-commit.cc:486
msgid "View the notifications now?"
msgstr "现在查看通知吗？"
-#: src/solve-commit.cc:526
+#: src/solve-commit.cc:532
msgid "Computing distribution upgrade..."
msgstr "正在计算发行版升级..."
-#: src/solve-commit.cc:531
+#: src/solve-commit.cc:537
msgid "Resolving package dependencies..."
msgstr "正在解决软件包依赖关系..."
-#: src/solve-commit.cc:608
+#: src/solve-commit.cc:614
msgid ""
"Some of the dependencies of installed packages are broken. In order to fix "
"these dependencies, the following actions need to be taken:"
-msgstr "已安装软件包的某些依赖关系已损坏。要修复这些依赖关系，需要执行以下动作："
+msgstr ""
+"已安装软件包的某些依赖关系已损坏。要修复这些依赖关系，需要执行以下动作："
-#: src/solve-commit.cc:615
+#: src/solve-commit.cc:621
msgid "Root privileges are required to fix broken package dependencies."
msgstr "修复受损的软件包依赖关系需要有 root 特权。"
@@ -5029,78 +5078,78 @@
#. 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:637
+#: src/solve-commit.cc:643
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:642
+#: src/solve-commit.cc:648
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:644
+#: src/solve-commit.cc:650
msgid "No, cancel the operation."
msgstr "否，取消操作。"
#. translators: help text for 'p' option in the 'Continue?' prompt
-#: src/solve-commit.cc:646
+#: src/solve-commit.cc:652
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:648
+#: src/solve-commit.cc:654
msgid "Toggle display of package versions."
msgstr "切换显示软件包版本。"
#. translators: help text for 'a' option in the 'Continue?' prompt
-#: src/solve-commit.cc:650
+#: src/solve-commit.cc:656
msgid "Toggle display of package architectures."
msgstr "切换显示软件包架构。"
#. translators: help text for 'r' option in the 'Continue?' prompt
-#: src/solve-commit.cc:652
+#: src/solve-commit.cc:658
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:654
+#: src/solve-commit.cc:660
msgid "Toggle display of package vendor names."
msgstr "切换显示软件包厂商名称。"
#. translators: help text for 'd' option in the 'Continue?' prompt
-#: src/solve-commit.cc:656
+#: src/solve-commit.cc:662
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:658
+#: src/solve-commit.cc:664
msgid "View the summary in pager."
msgstr "在分页器中查看摘要。"
-#: src/solve-commit.cc:768
+#: src/solve-commit.cc:774
msgid "committing"
msgstr "正在提交"
-#: src/solve-commit.cc:770
+#: src/solve-commit.cc:776
msgid "(dry run)"
msgstr "(演习)"
-#: src/solve-commit.cc:794 src/solve-commit.cc:827
+#: src/solve-commit.cc:800 src/solve-commit.cc:833
msgid "Problem retrieving the package file from the repository:"
msgstr "从软件源撷取软件包文件出现问题："
#. translators: the first %s is 'zypper refresh' and the second is repo alias
-#: src/solve-commit.cc:824
+#: src/solve-commit.cc:830
#, c-format, boost-format
msgid "Repository '%s' is out of date. Running '%s' might help."
msgstr "软件源 '%s' 已过时。运行 '%s' 可能有帮助。"
-#: src/solve-commit.cc:835
+#: src/solve-commit.cc:841
msgid ""
"The package integrity check failed. This may be a problem with the "
"repository or media. Try one of the following:\n"
@@ -5117,36 +5166,38 @@
"－ 使用其它安装介质 (若当前介质已损坏)\n"
"－ 使用其它软件源"
-#: src/solve-commit.cc:849
+#: src/solve-commit.cc:855
msgid "Problem occured during or after installation or removal of packages:"
msgstr "安装/移除以下软件包期间或之后发生问题："
-#: src/solve-commit.cc:857
+#: src/solve-commit.cc:863
msgid "Installation has completed with error."
msgstr "安装已完成但有错误。"
-#: src/solve-commit.cc:859
+#: src/solve-commit.cc:865
#, boost-format
msgid "You may run '%1%' to repair any dependency problems."
msgstr "您可以运行 '%1%' 来修复依赖问题。 "
-#: src/solve-commit.cc:873
+#: src/solve-commit.cc:879
msgid ""
"One of installed patches requires reboot of your machine. Reboot as soon as "
"possible."
msgstr "已安装的某个补丁需要重启计算机。请尽快重启。"
-#: src/solve-commit.cc:881
+#: src/solve-commit.cc:887
msgid ""
"One of installed patches affects the package manager itself. Run this "
"command once more to install any other needed patches."
-msgstr "已安装的某个补丁影响到了软件包管理器自身。请再次运行此命令来安装全部其它所需补丁。"
+msgstr ""
+"已安装的某个补丁影响到了软件包管理器自身。请再次运行此命令来安装全部其它所需"
+"补丁。"
-#: src/solve-commit.cc:899
+#: src/solve-commit.cc:905
msgid "Dependencies of all installed packages are satisfied."
msgstr "已满足全部已安装软件包的依赖关系。"
-#: src/solve-commit.cc:901 src/download.cc:129
+#: src/solve-commit.cc:907 src/download.cc:129
msgid "Nothing to do."
msgstr "无事可做。"
@@ -5204,7 +5255,9 @@
"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) 函数检测的文件。结果可能不完整。"
+msgstr ""
+"注意：不使用根用户运行您只能搜索现有用户有权限使用系统 stat(2) 函数检测的文"
+"件。结果可能不完整。"
#: src/source-download.cc:208
#, c-format, boost-format
@@ -5309,6 +5362,10 @@
msgid "No patterns found."
msgstr "未找到软件集。"
+#: src/search.cc:569
+msgid "No packages 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:638
@@ -5400,11 +5457,11 @@
msgid "'%s' is not a package name or capability."
msgstr "'%s' 不是一个软件包名称或功能。"
-#: src/Zypper.h:461
+#: src/Zypper.h:463
msgid "Finished with error."
msgstr "完成但有错误。"
-#: src/Zypper.h:463
+#: src/Zypper.h:465
msgid "Done."
msgstr "完毕。"
@@ -5609,7 +5666,9 @@
"You have chosen to ignore a problem with download or installation of a "
"package which might lead to broken dependencies of other packages. It is "
"recommended to run '%s' after the operation has finished."
-msgstr "您选择忽略了某个软件包下载或安装时的一个问题，其可能导致损坏其它软件包的依赖关系。推荐在操作完成后运行 '%s'。"
+msgstr ""
+"您选择忽略了某个软件包下载或安装时的一个问题，其可能导致损坏其它软件包的依赖"
+"关系。推荐在操作完成后运行 '%s'。"
#: src/utils/pager.cc:32
#, c-format, boost-format
@@ -5709,7 +5768,8 @@
msgid ""
"If you run zypper without a terminal, use '%s' global\n"
"option to make zypper use default answers to prompts."
-msgstr "若您未使用终端运行 zypper，请用 '%s' 全局选项以使 zypper 对提示使用默认回答。"
+msgstr ""
+"若您未使用终端运行 zypper，请用 '%s' 全局选项以使 zypper 对提示使用默认回答。"
#: src/utils/prompt.cc:321
#, c-format, boost-format
@@ -5868,9 +5928,6 @@
#~ msgid "Importance"
#~ msgstr "重要性"
-#~ msgid "GPG check"
-#~ msgstr "GPG 检查"
-
#~ msgid "Login"
#~ msgstr "登入"
