[opensuse-translation-commit] r95508 - trunk/lcn/zh_CN/po

7 Dec 2015

Author: minton
Date: 2015-12-07 20:18:21 +0100 (Mon, 07 Dec 2015)
New Revision: 95508

Modified:
   trunk/lcn/zh_CN/po/zypper.zh_CN.po
Log:
Merged zypper.pot for zh_CN

Modified: trunk/lcn/zh_CN/po/zypper.zh_CN.po
===================================================================

--- trunk/lcn/zh_CN/po/zypper.zh_CN.po	2015-12-07 19:18:18 UTC (rev 95507)
+++ trunk/lcn/zh_CN/po/zypper.zh_CN.po	2015-12-07 19:18:21 UTC (rev 95508)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-08 01:15+0200\n"
+"POT-Creation-Date: 2015-11-29 01:13+0100\n"
 "PO-Revision-Date: 2015-10-27 20:44+0800\n"
 "Last-Translator: marguerite <marguerite@opensuse.org>\n"
 "Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
@@ -46,6 +46,12 @@
 msgid "Description: "
 msgstr "描述："
 
+#: src/info.cc:144
+#, boost-format
+msgid "There would be %1% match for '%2%'."
+msgid_plural "There would be %1% matches for '%2%'."
+msgstr[0] ""
+
 #. TranslatorExplanation E.g. "package 'zypper' not found."
 #: src/info.cc:175
 #, c-format, boost-format
@@ -79,14 +85,14 @@
 #. is base
 #: 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/Table.h:282 src/repos.cc:114 src/repos.cc:142 src/repos.cc:2511
 #: src/solve-commit.cc:263 src/search.cc:636 src/output/Out.h:35
 msgid "Yes"
 msgstr "是"
 
 #: 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/Table.h:282 src/repos.cc:120 src/repos.cc:148 src/repos.cc:2511
 #: src/solve-commit.cc:263 src/search.cc:636 src/output/Out.h:35
 msgid "No"
 msgstr "否"
@@ -155,22 +161,22 @@
 #. adapting OutXML::searchResult !
 #.
 #. translators: S for installed Status
-#: src/info.cc:407 src/update.cc:541 src/search.cc:69 src/search.cc:237
+#: src/info.cc:407 src/update.cc:623 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: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/info.cc:407 src/repos.cc:1006 src/repos.cc:1146 src/repos.cc:2572
+#: src/update.cc:393 src/update.cc:628 src/update.cc:763 src/Zypper.cc:5289
 #: 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
+#: src/search.cc:587 src/search.cc:652 src/locks.cc:104
 msgid "Name"
 msgstr "名称"
 
 #. translators: type (general header)
-#: 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
+#: src/info.cc:407 src/repos.cc:1046 src/repos.cc:1157 src/repos.cc:2581
+#: src/search.cc:73 src/search.cc:241 src/locks.cc:107
 msgid "Type"
 msgstr "类型"
 
@@ -195,7 +201,7 @@
 msgstr "短名称"
 
 #. translators: used as 'tag:' (i.e. followed by ':')
-#: src/info.cc:484 src/Summary.cc:1222 src/utils/misc.cc:142
+#: src/info.cc:484 src/Summary.cc:1219 src/utils/misc.cc:142
 msgid "Installed"
 msgstr "已安装 "
 
@@ -310,8 +316,7 @@
 "\n"
 "针对子命令，zypper 提供了一个封装，该封装知道子命令的位置，并通过传递命令行参数给它们来运行它们。\n"
 "\n"
-"若子命令未在 zypper_execdir 中找到，封装将在您 $PATH 中的其它位置查找它。因此，您可以编写不在系统命名空间下的本地 zypper "
-"扩展。\n"
+"若子命令未在 zypper_execdir 中找到，封装将在您 $PATH 中的其它位置查找它。因此，您可以编写不在系统命名空间下的本地 zypper 扩展。\n"
 
 #: src/subcommand.cc:402
 #, boost-format
@@ -445,9 +450,7 @@
 
 #: src/RequestFeedback.cc:107
 #, c-format, boost-format
-msgid ""
-"No update candidate for '%s'. The highest available version is already "
-"installed."
+msgid "No update candidate for '%s'. The highest available version is already installed."
 msgstr "没有 '%s' 的更新候选。已安装了可获取的最高版本。"
 
 #: src/RequestFeedback.cc:112
@@ -457,46 +460,32 @@
 
 #: src/RequestFeedback.cc:119
 #, c-format, boost-format
-msgid ""
-"There is an update candidate '%s' for '%s', but it does not match the "
-"specified version, architecture, or repository."
+msgid "There is an update candidate '%s' for '%s', but it does not match the specified version, architecture, or repository."
 msgstr "有一个更新候选 '%s' 可供 '%s' 使用，但它不匹配指定的版本、架构或软件源。"
 
 #: src/RequestFeedback.cc:132
 #, 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."
+msgid "There is an update candidate for '%s', but it is from a different vendor. Use '%s' to install this candidate."
 msgstr "有一个 '%s' 的更新候选，但它来自一个不同的厂商。请使用 '%s' 安装此候选。"
 
 #: src/RequestFeedback.cc:145
 #, 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' 安装此候"
-"选。"
+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' 安装此候选。"
 
 #: src/RequestFeedback.cc:157
 #, c-format, boost-format
-msgid ""
-"There is an update candidate for '%s', but it is locked. Use '%s' to unlock "
-"it."
+msgid "There is an update candidate for '%s', but it is locked. Use '%s' to unlock it."
 msgstr "有一个 '%s' 的更新候选，但它被锁定了。请使用 '%s' 解锁它。"
 
 #: src/RequestFeedback.cc:165
 #, c-format, boost-format
-msgid ""
-"Package '%s' is not available in your repositories. Cannot reinstall, "
-"upgrade, or downgrade."
+msgid "Package '%s' is not available in your repositories. Cannot reinstall, upgrade, or downgrade."
 msgstr "在您的软件源中未找到软件包 '%s'。无法重装、升级或降级。"
 
 #: src/RequestFeedback.cc:178
 #, c-format, boost-format
-msgid ""
-"The selected package '%s' from repository '%s' has lower version than the "
-"installed one."
+msgid "The selected package '%s' from repository '%s' has lower version than the installed one."
 msgstr "所选软件包 '%s'，来自软件源 '%s'，的版本比当前安装的版本低。"
 
 #. translators: %s = "zypper install --oldpackage package-version.arch"
@@ -565,45 +554,505 @@
 msgid "Adding conflict: '%s'."
 msgstr "正在添加冲突：'%s'。"
 
+#: src/Summary.cc:426 src/Summary.cc:497
+#, boost-format
+msgid "... and %1% more item."
+msgid_plural "... and %1% more items."
+msgstr[0] ""
+
+#: src/Summary.cc:516
+#, 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:521
+#, 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:526
+#, 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:531
+#, 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:536
+#, 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:541
+#, 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:562
+#, 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:567
+#, 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:572
+#, 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:577
+#, 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:582
+#, 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:601
+#, 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:606
+#, 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:611
+#, 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:616
+#, 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:621
+#, 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:640
+#, 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:645
+#, 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:650
+#, 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:655
+#, 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:660
+#, 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:679
+#, 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:684
+#, 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:689
+#, 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:694
+#, 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:706
+#, 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:845
+#, 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:850
+#, 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:855
+#, 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:860
+#, 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:865
+#, 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:870
+#, 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:914
+#, 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:926
+#, 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:936
+#, 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:949
+#, 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:953
+#, 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:957
+#, 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:961
+#, 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:1001
+#, 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:1006
+#, 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:1011
+#, 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:1016
+#, 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:1021
+#, 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:1042
+#, 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:1047
+#, 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:1052
+#, 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:1057
+#, 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:1062
+#, 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:1083
+#, 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:1088
+#, 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:1093
+#, 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:1098
+#, 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:1103
+#, 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:1123
+#, 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:1143
+#, 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:1161
+#, 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:1166
+#, 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:1171
+#, 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:1200
+#, 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:1213
 msgid "Available"
 msgstr "可用版本"
 
-#. withKind
-#. translators: %1% is a zypper command line
-#: src/Summary.cc:1217 src/Summary.cc:1227
+#: src/Summary.cc:1224
 #, boost-format
 msgid "Run '%1%' to see the complete list of locked items."
 msgstr "请运行 '%1%' 来查看锁定项的完整列表。"
 
-#: src/Summary.cc:1255
+#: src/Summary.cc:1234
+#, fuzzy, c-format, boost-format
+msgid "The following patch requires a system reboot:"
+msgid_plural "The following %d patches require a system reboot:"
+msgstr[0] "将升级以下 %d 个补丁："
+
+#: src/Summary.cc:1252
 #, boost-format
 msgid "Overall download size: %1%. Already cached: %2%."
 msgstr "总下载大小：%1%。已缓存：%2%。"
 
-#: src/Summary.cc:1258
+#: src/Summary.cc:1255
 msgid "Download only."
 msgstr "仅下载而不安装。"
 
 #. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: src/Summary.cc:1264
+#: src/Summary.cc:1261
 #, c-format, boost-format
 msgid "After the operation, additional %s will be used."
 msgstr "操作完成后，将占用额外的 %s 空间。"
 
-#: src/Summary.cc:1267
+#: src/Summary.cc:1264
 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:1274
+#: src/Summary.cc:1271
 #, c-format, boost-format
 msgid "After the operation, %s will be freed."
 msgstr "操作完成后，将释放 %s 空间。"
 
-#: src/Summary.cc:1443
+#. translators: this text will be preceded by a number e.g. "5 packages to ..."
+#: src/Summary.cc:1294
+msgid "package to upgrade"
+msgid_plural "packages to upgrade"
+msgstr[0] "个软件包待升级"
+
+#. translators: this text will be preceded by a number e.g. "5 to ..."
+#: src/Summary.cc:1305
+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:1308
+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:1319
+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:1322
+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:1333
+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:1336
+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:1347
+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:1350
+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:1361
+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:1364
+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:1375
+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:1378
+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:1389
+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:1392
+msgid "source package to install"
+msgid_plural "source packages to install"
+msgstr[0] "个源代码包将安装"
+
+#: src/Summary.cc:1440
 msgid "System reboot required."
 msgstr "需要重启。"
 
@@ -636,6 +1085,12 @@
 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'."
@@ -665,8 +1120,7 @@
 
 #: src/callbacks/keyring.h:144
 #, c-format, boost-format
-msgid ""
-"Accepting file '%s' from repository '%s' signed with an unknown key '%s'."
+msgid "Accepting file '%s' from repository '%s' signed with an unknown key '%s'."
 msgstr "正在接受文件 '%s'，来自软件源 '%s'，该文件以未知的密钥 '%s' 签署。"
 
 #. translators: the last %s is gpg key ID
@@ -678,8 +1132,7 @@
 #. translators: the last %s is gpg key ID
 #: src/callbacks/keyring.h:158
 #, c-format, boost-format
-msgid ""
-"File '%s' from repository '%s' is signed with an unknown key '%s'. Continue?"
+msgid "File '%s' from repository '%s' is signed with an unknown key '%s'. Continue?"
 msgstr "文件 '%s'，来自软件源 '%s'，以未知的密钥 '%s' 签署。继续吗？"
 
 #: src/callbacks/keyring.h:174
@@ -735,8 +1188,7 @@
 
 #: src/callbacks/keyring.h:261
 #, c-format, boost-format
-msgid ""
-"Ignoring failed signature verification for file '%s' from repository '%s'!"
+msgid "Ignoring failed signature verification for file '%s' from repository '%s'!"
 msgstr "正在忽略文件 '%s' 来自软件源 '%s' 的版本的失败的签名校验！"
 
 #: src/callbacks/keyring.h:267
@@ -795,20 +1247,15 @@
 "  得到的是 %4%\n"
 
 #: src/callbacks/keyring.h:348
-msgid ""
-"Accepting packages with wrong checksums can lead to a corrupted system and "
-"in extreme cases even to a system compromise."
+msgid "Accepting packages with wrong checksums can lead to a corrupted system and in extreme cases even to a system compromise."
 msgstr "接受校验和错误的软件包可能导致系统损坏，在极端情况下甚至会导致系统被入侵。"
 
 #: src/callbacks/keyring.h:356
 #, boost-format
 msgid ""
-"However if you made certain that the file with checksum '%1%..' is secure, "
-"correct\n"
-"and should be used within this operation, enter the first 4 characters of "
-"the checksum\n"
-"to unblock using this file on your own risk. Empty input will discard the "
-"file.\n"
+"However if you made certain that the file with checksum '%1%..' is secure, correct\n"
+"and should be used within this operation, enter the first 4 characters of the checksum\n"
+"to unblock using this file on your own risk. Empty input will discard the file.\n"
 msgstr ""
 "然而若您确定具有校验和 '%1%..' 的文件是安全、正确的，应在此操作中使用，\n"
 "请输入该校验和的前 4 个字符来取消屏蔽、使用该文件并风险自负。\n"
@@ -870,27 +1317,31 @@
 #. TranslatorExplanation %1%(commandline option)
 #: src/callbacks/rpm.h:372
 #, boost-format
-msgid ""
-"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%' 选项。"
+msgid "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%' 选项。"
 
+#. 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 "冲突文件将会被替换。"
 
 #. TranslatorExplanation Problem description before asking whether to "Continue? [yes/no] (no):"
 #: src/callbacks/rpm.h:404
-msgid ""
-"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 ""
-"当两个软件包试图安装同名但不同内容的文件时就会产生文件冲突。若您继续，冲突的"
-"文件将被替换，之前的内容将会丢失。"
+msgid "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 "当两个软件包试图安装同名但不同内容的文件时就会产生文件冲突。若您继续，冲突的文件将被替换，之前的内容将会丢失。"
 
 #. help text for the "Abort, retry, ignore?" prompt for media errors
 #: src/callbacks/media.cc:30
@@ -904,9 +1355,7 @@
 
 #. help text for the "Abort, retry, ignore?" prompt for media errors
 #: src/callbacks/media.cc:34
-msgid ""
-"Skip retrieval of the file and try to continue with the operation without "
-"the file."
+msgid "Skip retrieval of the file and try to continue with the operation without the file."
 msgstr "跳过撷取该文件并尝试在没有该文件的情况下继续当前操作。"
 
 #. help text for the "Abort, retry, ignore?" prompt for media errors
@@ -993,9 +1442,7 @@
 #. /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES
 #: src/callbacks/media.cc:230
 #, c-format, boost-format
-msgid ""
-"Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the "
-"operation."
+msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."
 msgstr "请插入介质 [%s] #%d 并输入 'y'  继续或者输入 'n' 取消操作。"
 
 #. translators: a/r/i/u are replies to the "Abort, retry, ignore?" prompt
@@ -1007,9 +1454,7 @@
 
 #: src/callbacks/media.cc:313
 #, c-format, boost-format
-msgid ""
-"Authentication required to access %s. You need to be root to be able to read "
-"the credentials from %s."
+msgid "Authentication required to access %s. You need to be root to be able to read the credentials from %s."
 msgstr "需要认证才能访问 %s。您需要 root 身份以从 %s 读取机要信息。"
 
 #: src/callbacks/media.cc:338 src/callbacks/media.cc:345
@@ -1022,8 +1467,7 @@
 msgstr "密码"
 
 #: src/callbacks/locks.h:27
-msgid ""
-"The following query locks the same objects as the one you want to remove:"
+msgid "The following query locks the same objects as the one you want to remove:"
 msgstr "以下查询锁定了您想要移除的对象："
 
 #: src/callbacks/locks.h:30
@@ -1085,891 +1529,920 @@
 #. translators: 'Volatile' refers to changes we previously tagged as 'XYZ changed to SOMETHING [volatile]'
 #: src/repos.cc:59
 #, boost-format
-msgid ""
-"Repo '%1%' is managed by service '%2%'. Volatile changes are reset by the "
-"next service refresh!"
+msgid "Repo '%1%' is managed by service '%2%'. Volatile changes are reset by the next service refresh!"
 msgstr "软件源 '%1%' 由服务 '%2%' 管理。下次服务刷新将重置暂态的变动！"
 
+#: src/repos.cc:88
+#, c-format, boost-format
+msgid "Invalid priority '%s'. Use a positive integer number. The greater the number, the lower the priority."
+msgstr "无效的优先级 '%s'。请使用正整数。数字越大，优先级越低。"
+
 #. check whether libzypp indicates a refresh is needed, and if so,
 #. print a message
-#: src/repos.cc:154
+#: src/repos.cc:179
 #, c-format, boost-format
 msgid "Checking whether to refresh metadata for %s"
 msgstr "正在检查是否需要刷新 %s 的元数据"
 
-#: src/repos.cc:182
+#: src/repos.cc:207
 #, c-format, boost-format
 msgid "Repository '%s' is up to date."
 msgstr "软件源 '%s' 是最新的。"
 
-#: src/repos.cc:189
+#: src/repos.cc:214
 #, c-format, boost-format
 msgid "The up-to-date check of '%s' has been delayed."
 msgstr "已推延了对 '%s' 的更新检查。"
 
-#: src/repos.cc:211
+#: src/repos.cc:236
 msgid "Forcing raw metadata refresh"
 msgstr "正在强制执行原始元数据刷新"
 
-#: src/repos.cc:218
+#: src/repos.cc:243
 #, c-format, boost-format
 msgid "Retrieving repository '%s' metadata"
 msgstr "正在撷取软件源 '%s' 的元数据"
 
-#: src/repos.cc:244
+#: src/repos.cc:269
 #, c-format, boost-format
 msgid "Do you want to disable the repository %s permanently?"
 msgstr "您想要永久禁用软件源 %s 咩？"
 
-#: src/repos.cc:260
+#: src/repos.cc:285
 #, c-format, boost-format
 msgid "Error while disabling repository '%s'."
 msgstr "禁用软件源 '%s' 时出错。"
 
-#: src/repos.cc:278
+#: src/repos.cc:303
 #, c-format, boost-format
 msgid "Problem retrieving files from '%s'."
 msgstr "从 '%s' 撷取文件时出现问题。"
 
-#: src/repos.cc:279 src/repos.cc:3391 src/solve-commit.cc:827
-#: src/solve-commit.cc:859 src/solve-commit.cc:893
+#: src/repos.cc:304 src/repos.cc:3421 src/solve-commit.cc:826
+#: src/solve-commit.cc:858 src/solve-commit.cc:892
 msgid "Please see the above error message for a hint."
 msgstr "请参考以上错误消息汲取灵感。"
 
-#: src/repos.cc:292
+#: src/repos.cc:317
 #, c-format, boost-format
 msgid "No URIs defined for '%s'."
 msgstr "没有为 '%s' 定义 URI。"
 
 #. TranslatorExplanation the first %s is a .repo file path
-#: src/repos.cc:296
+#: src/repos.cc:321
 #, c-format, boost-format
-msgid ""
-"Please add one or more base URI (baseurl=URI) entries to %s for repository "
-"'%s'."
+msgid "Please add one or more base URI (baseurl=URI) entries to %s for repository '%s'."
 msgstr "请添加一个或者更多的基础 URI 项 (baseurl=URI) 至 %s，为了软件源 '%s'。"
 
-#: src/repos.cc:308
+#: src/repos.cc:333
 msgid "No alias defined for this repository."
 msgstr "此软件源没有定义别名。"
 
-#: src/repos.cc:321
+#: src/repos.cc:346
 #, c-format, boost-format
 msgid "Repository '%s' is invalid."
 msgstr "软件源 '%s' 无效。"
 
-#: src/repos.cc:322
-msgid ""
-"Please check if the URIs defined for this repository are pointing to a valid "
-"repository."
+#: src/repos.cc:347
+msgid "Please check if the URIs defined for this repository are pointing to a valid repository."
 msgstr "请检查此软件源定义的 URI 是否指向了一个有效的软件源。"
 
-#: src/repos.cc:335
+#: src/repos.cc:360
 #, c-format, boost-format
 msgid "Error retrieving metadata for '%s':"
 msgstr "撷取 '%s' 元数据时出错："
 
-#: src/repos.cc:350
+#: src/repos.cc:375
 msgid "Forcing building of repository cache"
 msgstr "正在强制构建软件源缓存"
 
-#: src/repos.cc:376
+#: src/repos.cc:401
 #, c-format, boost-format
 msgid "Error parsing metadata for '%s':"
 msgstr "解析 '%s' 元数据出错："
 
 #. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: src/repos.cc:378
-msgid ""
-"This may be caused by invalid metadata in the repository, or by a bug in the "
-"metadata parser. In the latter case, or if in doubt, please, file a bug "
-"report by following instructions at http://en.opensuse.org/Zypper/"
-"Troubleshooting"
-msgstr ""
-"这可能是由源中无效的元数据或者元数据解析器的故障导致的。若是后一种情况，或者"
-"存疑，请参考 http://zh.opensuse.org/SDB:Zypper_疑难解答 的指南填报一份故障报"
-"告。"
+#: src/repos.cc:403
+msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper/Troubleshooting"
+msgstr "这可能是由源中无效的元数据或者元数据解析器的故障导致的。若是后一种情况，或者存疑，请参考 http://zh.opensuse.org/SDB:Zypper_疑难解答 的指南填报一份故障报告。"
 
-#: src/repos.cc:392
+#: src/repos.cc:417
 #, c-format, boost-format
 msgid "Repository metadata for '%s' not found in local cache."
 msgstr "在本地缓存中未找到 '%s' 的软件源元数据。"
 
-#: src/repos.cc:399
+#: src/repos.cc:424
 msgid "Error building the cache:"
 msgstr "构建缓存出错："
 
-#: src/repos.cc:610
+#: src/repos.cc:635
 #, c-format, boost-format
 msgid "Repository '%s' not found by its alias, number, or URI."
 msgstr "未能通过别名、编号或 URI 找到软件源 '%s'。"
 
-#: src/repos.cc:614
+#: src/repos.cc:639
 #, c-format, boost-format
 msgid "Use '%s' to get the list of defined repositories."
 msgstr "使用 '%s' 获取已定义的软件源列表。"
 
-#: src/repos.cc:637
+#: src/repos.cc:662
 #, c-format, boost-format
 msgid "Ignoring disabled repository '%s'"
 msgstr "正在忽略已禁用的软件源 '%s'"
 
-#: src/repos.cc:724 src/repos.cc:731
+#: src/repos.cc:749 src/repos.cc:756
 #, c-format, boost-format
 msgid "Ignoring repository '%s' because of '%s' option."
 msgstr "正在忽略软件源 '%s'，因为启用了 '%s' 选项。"
 
-#: src/repos.cc:757
+#: src/repos.cc:782
 #, c-format, boost-format
 msgid "Scanning content of disabled repository '%s'."
 msgstr "正在扫描已禁用软件源 '%s' 的内容。"
 
-#: src/repos.cc:780 src/repos.cc:818 src/repos.cc:1337
+#: src/repos.cc:805 src/repos.cc:843 src/repos.cc:1362
 #, c-format, boost-format
 msgid "Skipping repository '%s' because of the above error."
 msgstr "由于以上错误，正在跳过软件源 '%s' 。"
 
-#: src/repos.cc:799
+#: src/repos.cc:824
 #, c-format, boost-format
-msgid ""
-"Repository '%s' is out-of-date. You can run 'zypper refresh' as root to "
-"update it."
+msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
 msgstr "软件源 '%s' 已经过时。您可以 root 身份运行 'zypper refresh' 更新它。"
 
-#: src/repos.cc:836
+#: src/repos.cc:861
 #, c-format, boost-format
-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' 执行"
-"此操作。"
+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' 执行此操作。"
 
-#: src/repos.cc:843
+#: src/repos.cc:868
 #, c-format, boost-format
 msgid "Disabling repository '%s'."
 msgstr "正在禁用软件源 '%s'。"
 
-#: src/repos.cc:856
+#: src/repos.cc:881
 #, c-format, boost-format
 msgid "Temporarily enabling repository '%s'."
 msgstr "正在暂时性激活软件源 '%s'。"
 
-#: src/repos.cc:864
+#: src/repos.cc:889
 #, c-format, boost-format
 msgid "Repository '%s' stays disabled."
 msgstr "软件源 '%s' 保持禁用。"
 
-#: src/repos.cc:903
+#: src/repos.cc:928
 msgid "Initializing Target"
 msgstr "正在初始化目标"
 
-#: src/repos.cc:913
+#: src/repos.cc:938
 msgid "Target initialization failed:"
 msgstr "目标初始化失败："
 
-#: src/repos.cc:915 src/Zypper.cc:4399
+#: src/repos.cc:940 src/Zypper.cc:4401
 msgid "Running 'zypper refresh' as root might resolve the problem."
 msgstr "以 root 身份运行 'zypper refresh' 或许会解决该问题。"
 
-#: src/repos.cc:970 src/repos.cc:1120 src/repos.cc:2541 src/Zypper.cc:5287
+#: src/repos.cc:995 src/repos.cc:1145 src/repos.cc:2571 src/Zypper.cc:5289
 msgid "Alias"
 msgstr "别名"
 
 #. 'enabled' flag
 #. translators: property name; short; used like "Name: value"
-#: src/repos.cc:989 src/repos.cc:1127 src/repos.cc:1723 src/repos.cc:2543
+#: src/repos.cc:1014 src/repos.cc:1152 src/repos.cc:1748 src/repos.cc:2573
 msgid "Enabled"
 msgstr "已启用"
 
 #. GPG Check
 #. translators: property name; short; used like "Name: value"
-#: src/repos.cc:993 src/repos.cc:1128 src/repos.cc:1727 src/repos.cc:2544
+#: src/repos.cc:1018 src/repos.cc:1153 src/repos.cc:1752 src/repos.cc:2574
 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:1001 src/repos.cc:2546
+#: src/repos.cc:1026 src/repos.cc:2576
 msgid "Refresh"
 msgstr "刷新"
 
 #. translators: repository priority (in zypper repos -p or -d)
-#: src/repos.cc:1011 src/repos.cc:1129 src/repos.cc:2550
+#. translators: property name; short; used like "Name: value"
+#. translators: repository priority (in zypper repos -p or -d)
+#: src/repos.cc:1036 src/repos.cc:1154 src/repos.cc:1754 src/repos.cc:2580
 msgid "Priority"
 msgstr "优先级"
 
 #. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1028 src/repos.cc:1122 src/repos.cc:1729 src/repos.cc:2553
+#: src/repos.cc:1053 src/repos.cc:1147 src/repos.cc:1756 src/repos.cc:2583
 msgid "URI"
 msgstr "URI"
 
 #. "/etc/init.d/ script that might be used to restart the command (guessed)
-#: src/repos.cc:1038 src/ps.cc:125
+#: src/repos.cc:1063 src/ps.cc:125
 msgid "Service"
 msgstr "服务"
 
-#: src/repos.cc:1091
+#: src/repos.cc:1116
 msgid "No repositories defined."
 msgstr "未定义软件源。"
 
-#: src/repos.cc:1092
+#: src/repos.cc:1117
 msgid "Use the 'zypper addrepo' command to add one or more repositories."
 msgstr "请使用 'zypper addrepo' 命令添加一个或更多的软件源。"
 
-#: src/repos.cc:1130
+#: src/repos.cc:1155
 msgid "Auto-refresh"
 msgstr "自动刷新"
 
-#: src/repos.cc:1130 src/repos.cc:1131
+#: src/repos.cc:1155 src/repos.cc:1156
 msgid "On"
 msgstr "开"
 
-#: src/repos.cc:1130 src/repos.cc:1131
+#: src/repos.cc:1155 src/repos.cc:1156
 msgid "Off"
 msgstr "关"
 
-#: src/repos.cc:1131
+#: src/repos.cc:1156
 msgid "Keep Packages"
 msgstr "保留软件包"
 
-#: src/repos.cc:1133
+#: src/repos.cc:1158
 msgid "GPG Key URI"
 msgstr "GPG 密钥 URI"
 
-#: src/repos.cc:1134
+#: src/repos.cc:1159
 msgid "Path Prefix"
 msgstr "路径前缀"
 
-#: src/repos.cc:1135
+#: src/repos.cc:1160
 msgid "Parent Service"
 msgstr "父服务"
 
-#: src/repos.cc:1136
+#: src/repos.cc:1161
 msgid "Repo Info Path"
 msgstr "软件源信息路径"
 
-#: src/repos.cc:1137
+#: src/repos.cc:1162
 msgid "MD Cache Path"
 msgstr "MD 缓存路径"
 
-#: src/repos.cc:1191 src/repos.cc:1265 src/repos.cc:1424
+#: src/repos.cc:1216 src/repos.cc:1290 src/repos.cc:1449
 msgid "Error reading repositories:"
 msgstr "读取软件源出错："
 
-#: src/repos.cc:1219 src/repos.cc:2692
+#: src/repos.cc:1244 src/repos.cc:2722
 #, c-format, boost-format
 msgid "Can't open %s for writing."
 msgstr "无法打开 %s 进行写操作。"
 
-#: src/repos.cc:1221 src/repos.cc:2694
+#: src/repos.cc:1246 src/repos.cc:2724
 msgid "Maybe you do not have write permissions?"
 msgstr "或许您没有写入权限？"
 
-#: src/repos.cc:1228 src/repos.cc:2701
+#: src/repos.cc:1253 src/repos.cc:2731
 #, c-format, boost-format
 msgid "Repositories have been successfully exported to %s."
 msgstr "已成功导出软件源到 %s。"
 
-#: src/repos.cc:1283 src/repos.cc:1442
+#: src/repos.cc:1308 src/repos.cc:1467
 msgid "Specified repositories: "
 msgstr "指定的软件源："
 
-#: src/repos.cc:1322
+#: src/repos.cc:1347
 #, c-format, boost-format
 msgid "Skipping disabled repository '%s'"
 msgstr "正在跳过已禁用的软件源 '%s'"
 
-#: src/repos.cc:1351
+#: src/repos.cc:1376
 msgid "Specified repositories are not enabled or defined."
 msgstr "指定软件源未启用或未定义。"
 
-#: src/repos.cc:1353
+#: src/repos.cc:1378
 msgid "There are no enabled repositories defined."
 msgstr "未定义状态为启用的软件源。"
 
-#: src/repos.cc:1354
+#: src/repos.cc:1379
 #, c-format, boost-format
 msgid "Use '%s' or '%s' commands to add or enable repositories."
 msgstr "请用 '%s' 或者 '%s' 命令添加或启用软件源。"
 
-#: src/repos.cc:1359
+#: src/repos.cc:1384
 msgid "Could not refresh the repositories because of errors."
 msgstr "由于若干错误，无法刷新软件源。"
 
-#: src/repos.cc:1365
+#: src/repos.cc:1390
 msgid "Some of the repositories have not been refreshed because of an error."
 msgstr "由于某个错误，未刷新某些软件源。"
 
-#: src/repos.cc:1370
+#: src/repos.cc:1395
 msgid "Specified repositories have been refreshed."
 msgstr "指定软件源均已刷新。"
 
-#: src/repos.cc:1372
+#: src/repos.cc:1397
 msgid "All repositories have been refreshed."
 msgstr "全部软件源均已刷新。"
 
-#: src/repos.cc:1499
+#: src/repos.cc:1524
 #, c-format, boost-format
 msgid "Cleaning metadata cache for '%s'."
 msgstr "正在清理 '%s' 的元数据缓存。"
 
-#: src/repos.cc:1509
+#: src/repos.cc:1534
 #, c-format, boost-format
 msgid "Cleaning raw metadata cache for '%s'."
 msgstr "正在清理 '%s' 的原始元数据缓存。"
 
-#: src/repos.cc:1516
+#: src/repos.cc:1541
 #, c-format, boost-format
 msgid "Keeping raw metadata cache for %s '%s'."
 msgstr "正在为 %s 保留原始元数据缓存 '%s'。"
 
 #. translators: meaning the cached rpm files
-#: src/repos.cc:1524
+#: src/repos.cc:1549
 #, c-format, boost-format
 msgid "Cleaning packages for '%s'."
 msgstr "正在为 '%s' 清理软件包。"
 
-#: src/repos.cc:1532
+#: src/repos.cc:1557
 #, c-format, boost-format
 msgid "Cannot clean repository '%s' because of an error."
 msgstr "由于某个错误，无法清理软件源 '%s' 。"
 
-#: src/repos.cc:1545
+#: src/repos.cc:1570
 msgid "Cleaning installed packages cache."
 msgstr "正在清理已安装软件包缓存。"
 
-#: src/repos.cc:1553
+#: src/repos.cc:1578
 msgid "Cannot clean installed packages cache because of an error."
 msgstr "由于某个错误，无法清理已安装软件包缓存。"
 
-#: src/repos.cc:1574
+#: src/repos.cc:1599
 msgid "Could not clean the repositories because of errors."
 msgstr "由于若干错误，无法清理软件源。"
 
-#: src/repos.cc:1581
+#: src/repos.cc:1606
 msgid "Some of the repositories have not been cleaned up because of an error."
 msgstr "由于某个错误，未清理某些软件源。"
 
-#: src/repos.cc:1586
+#: src/repos.cc:1611
 msgid "Specified repositories have been cleaned up."
 msgstr "指定软件源均已清理。"
 
-#: src/repos.cc:1588
+#: src/repos.cc:1613
 msgid "All repositories have been cleaned up."
 msgstr "全部软件源均已清理。"
 
-#: src/repos.cc:1631
+#: src/repos.cc:1656
 msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
 msgstr "这是一个可变只读介质 (CD/DVD)，正在禁用自动刷新。"
 
-#: src/repos.cc:1653
+#: src/repos.cc:1678
 #, c-format, boost-format
 msgid "Invalid repository alias: '%s'"
 msgstr "无效的软件源别名：'%s'"
 
-#: src/repos.cc:1661 src/repos.cc:1954
+#: src/repos.cc:1686 src/repos.cc:1991
 #, c-format, boost-format
 msgid "Repository named '%s' already exists. Please use another alias."
 msgstr "已存在名为 '%s' 的软件源。请使用其它别名。"
 
-#: 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:"
+#: src/repos.cc:1697
+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:1682
+#: src/repos.cc:1707
 msgid "Can't find a valid repository at given location:"
 msgstr "未能在给定位置找到有效的软件源："
 
-#: src/repos.cc:1691
+#: src/repos.cc:1716
 msgid "Problem transferring repository data from specified URI:"
 msgstr "从指定 URI 传输软件源数据出现问题："
 
-#: src/repos.cc:1692
+#: src/repos.cc:1717
 msgid "Please check whether the specified URI is accessible."
 msgstr "请检查是否可访问指定的 URI。"
 
-#: src/repos.cc:1700
+#: src/repos.cc:1725
 msgid "Unknown problem when adding repository:"
 msgstr "添加软件源时出现未知问题："
 
 #. translators: BOOST STYLE POSITIONAL DIRECTIVES ( %N% )
 #. translators: %1% - a repository name
-#: src/repos.cc:1711
+#: src/repos.cc:1736
 #, boost-format
-msgid ""
-"GPG checking is disabled in configuration of repository '%1%'. Integrity and "
-"origin of packages cannot be verified."
+msgid "GPG checking is disabled in configuration of repository '%1%'. Integrity and origin of packages cannot be verified."
 msgstr "软件源 '%1%' 的配置中禁用了 GPG 检查。无法校验完整性和软件包的出处。"
 
-#: src/repos.cc:1717
+#: src/repos.cc:1742
 #, c-format, boost-format
 msgid "Repository '%s' successfully added"
 msgstr "成功添加了软件源 '%s' "
 
 #. translators: property name; short; used like "Name: value"
-#: src/repos.cc:1725
+#: src/repos.cc:1750
 msgid "Autorefresh"
 msgstr "自动刷新"
 
-#: src/repos.cc:1743
+#: src/repos.cc:1770
 #, c-format, boost-format
 msgid "Reading data from '%s' media"
 msgstr "正在从介质 '%s' 读取数据"
 
-#: src/repos.cc:1750
+#: src/repos.cc:1777
 #, c-format, boost-format
 msgid "Problem reading data from '%s' media"
 msgstr "从介质 '%s' 读取数据时出现问题"
 
-#: src/repos.cc:1751
+#: src/repos.cc:1778
 msgid "Please check if your installation media is valid and readable."
 msgstr "请检查您的安装介质是否有效和可读。"
 
-#: src/repos.cc:1758
+#: src/repos.cc:1785
 #, c-format, boost-format
 msgid "Reading data from '%s' media is delayed until next refresh."
 msgstr "推迟从 '%s' 介质读取数据直至下次刷新。"
 
-#: src/repos.cc:1825
+#: src/repos.cc:1859
 msgid "Problem accessing the file at the specified URI"
 msgstr "访问指定 URI 处文件时出现问题"
 
-#: src/repos.cc:1826
+#: src/repos.cc:1860
 msgid "Please check if the URI is valid and accessible."
 msgstr "请检查该 URI 是否有效且可访问。"
 
-#: src/repos.cc:1834
+#: src/repos.cc:1868
 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:1837
-msgid ""
-"Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for "
-"details."
+#: src/repos.cc:1871
+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:1845
+#: src/repos.cc:1879
 msgid "Problem encountered while trying to read the file at the specified URI"
 msgstr "尝试读取指定 URI 处文件时遇到问题"
 
-#: src/repos.cc:1859
+#: src/repos.cc:1893
 msgid "Repository with no alias defined found in the file, skipping."
 msgstr "在文件中发现了未定义别名的软件源，正在跳过。"
 
-#: src/repos.cc:1866
+#: src/repos.cc:1900
 #, c-format, boost-format
 msgid "Repository '%s' has no URI defined, skipping."
 msgstr "软件源 '%s' 未定义 URI，正在跳过。"
 
-#: src/repos.cc:1911
+#: src/repos.cc:1948
 #, c-format, boost-format
 msgid "Repository '%s' has been removed."
 msgstr "已移除软件源 '%s'。"
 
-#: src/repos.cc:1937
+#: src/repos.cc:1974
 #, c-format, boost-format
-msgid ""
-"Cannot change alias of '%s' repository. The repository belongs to service "
-"'%s' which is responsible for setting its alias."
+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:1948
+#: src/repos.cc:1985
 #, c-format, boost-format
 msgid "Repository '%s' renamed to '%s'."
 msgstr "软件源 '%s' 已重命名为 '%s' 。"
 
-#: src/repos.cc:1960 src/repos.cc:2220
+#: src/repos.cc:1997 src/repos.cc:2250
 msgid "Error while modifying the repository:"
 msgstr "修改软件源时出错："
 
-#: src/repos.cc:1961
+#: src/repos.cc:1998
 #, c-format, boost-format
 msgid "Leaving repository '%s' unchanged."
 msgstr "软件源 '%s' 未变动。"
 
-#: src/repos.cc:2110
+#: src/repos.cc:2142
 #, 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:2118
-#, c-format, boost-format
 msgid "Repository '%s' priority has been left unchanged (%d)"
 msgstr "未变动软件源 '%s' 的优先级 (%d)"
 
-#: src/repos.cc:2152
+#: src/repos.cc:2182
 #, c-format, boost-format
 msgid "Repository '%s' has been successfully enabled."
 msgstr "已成功启用软件源 '%s'。"
 
-#: src/repos.cc:2155
+#: src/repos.cc:2185
 #, c-format, boost-format
 msgid "Repository '%s' has been successfully disabled."
 msgstr "已成功禁用软件源 '%s'。"
 
-#: src/repos.cc:2163
+#: src/repos.cc:2193
 #, c-format, boost-format
 msgid "Autorefresh has been enabled for repository '%s'."
 msgstr "已启用软件源 '%s' 的自动刷新。"
 
-#: src/repos.cc:2166
+#: src/repos.cc:2196
 #, c-format, boost-format
 msgid "Autorefresh has been disabled for repository '%s'."
 msgstr "已禁用软件源 '%s' 的自动刷新。"
 
-#: src/repos.cc:2174
+#: src/repos.cc:2204
 #, c-format, boost-format
 msgid "RPM files caching has been enabled for repository '%s'."
 msgstr "已启用软件源 '%s' 的 RPM 文件缓存。"
 
-#: src/repos.cc:2177
+#: src/repos.cc:2207
 #, c-format, boost-format
 msgid "RPM files caching has been disabled for repository '%s'."
 msgstr "已禁用软件源 '%s' 的 RPM 文件缓存。"
 
-#: src/repos.cc:2185
+#: src/repos.cc:2215
 #, c-format, boost-format
 msgid "GPG check has been enabled for repository '%s'."
 msgstr "已启用了软件源 '%s' 的 GPG 检查。"
 
-#: src/repos.cc:2188
+#: src/repos.cc:2218
 #, c-format, boost-format
 msgid "GPG check has been disabled for repository '%s'."
 msgstr "已禁用了软件源 '%s' 的 GPG 检查。"
 
-#: src/repos.cc:2195
+#: src/repos.cc:2225
 #, c-format, boost-format
 msgid "Repository '%s' priority has been set to %d."
 msgstr "软件源 '%s' 的优先级被设为了 %d。"
 
-#: src/repos.cc:2202
+#: src/repos.cc:2232
 #, c-format, boost-format
 msgid "Name of repository '%s' has been set to '%s'."
 msgstr "软件源 '%s' 名称被设为了 '%s'。"
 
-#: src/repos.cc:2213
+#: src/repos.cc:2243
 #, c-format, boost-format
 msgid "Nothing to change for repository '%s'."
 msgstr "软件源 '%s' 无需修改。"
 
-#: src/repos.cc:2221
+#: src/repos.cc:2251
 #, c-format, boost-format
 msgid "Leaving repository %s unchanged."
 msgstr "软件源 %s 未变动。"
 
-#: src/repos.cc:2259
+#: src/repos.cc:2289
 msgid "Error reading services:"
 msgstr "读取服务出错："
 
-#: src/repos.cc:2354
+#: src/repos.cc:2384
 #, c-format, boost-format
 msgid "Service '%s' not found by its alias, number, or URI."
 msgstr "无法通过别名、编号或 URI 找到服务 '%s'。"
 
-#: src/repos.cc:2358
+#: src/repos.cc:2388
 #, c-format, boost-format
 msgid "Use '%s' to get the list of defined services."
 msgstr "请使用 '%s' 获取已定义的服务列表。"
 
-#: src/repos.cc:2606
+#: src/repos.cc:2636
 #, c-format, boost-format
 msgid "No services defined. Use the '%s' command to add one or more services."
 msgstr "未定义服务。请用 '%s' 命令添加一个或多个服务。"
 
-#: src/repos.cc:2728
+#: src/repos.cc:2758
 #, c-format, boost-format
 msgid "Service aliased '%s' already exists. Please use another alias."
 msgstr "已存在别名为 '%s' 的服务。请使用其它别名。"
 
-#: src/repos.cc:2738
+#: src/repos.cc:2768
 #, c-format, boost-format
 msgid "Error occured while adding service '%s'."
 msgstr "添加服务 '%s' 时出错。"
 
-#: src/repos.cc:2744
+#: src/repos.cc:2774
 #, c-format, boost-format
 msgid "Service '%s' has been successfully added."
 msgstr "已成功添加了服务 '%s'。"
 
-#: src/repos.cc:2783
+#: src/repos.cc:2813
 #, c-format, boost-format
 msgid "Removing service '%s':"
 msgstr "正在移除服务 '%s'："
 
-#: src/repos.cc:2786
+#: src/repos.cc:2816
 #, c-format, boost-format
 msgid "Service '%s' has been removed."
 msgstr "已移除服务 '%s'。"
 
-#: src/repos.cc:2801
+#: src/repos.cc:2831
 #, c-format, boost-format
 msgid "Refreshing service '%s'."
 msgstr "正在刷新服务 '%s'。"
 
-#: src/repos.cc:2817 src/repos.cc:2827
+#: src/repos.cc:2847 src/repos.cc:2857
 #, c-format, boost-format
 msgid "Problem retrieving the repository index file for service '%s':"
 msgstr "撷取服务 '%s' 的软件源索引文件出现问题："
 
-#: src/repos.cc:2819 src/repos.cc:2932 src/repos.cc:2992
+#: src/repos.cc:2849 src/repos.cc:2962 src/repos.cc:3022
 #, c-format, boost-format
 msgid "Skipping service '%s' because of the above error."
 msgstr "由于以上错误，正在跳过服务 '%s' 。"
 
-#: src/repos.cc:2828
+#: src/repos.cc:2858
 msgid "Check if the URI is valid and accessible."
 msgstr "请检查该 URI 是否有效且可访问。"
 
-#: src/repos.cc:2886
+#: src/repos.cc:2916
 #, c-format, boost-format
 msgid "Skipping disabled service '%s'"
 msgstr "正在跳过已禁用的服务 '%s'"
 
-#: src/repos.cc:2946
+#: src/repos.cc:2976
 #, c-format, boost-format
 msgid "Use '%s' or '%s' commands to add or enable services."
 msgstr "请使用 '%s' 或者 '%s' 命令添加或启用服务。"
 
-#: src/repos.cc:2949
+#: src/repos.cc:2979
 msgid "Specified services are not enabled or defined."
 msgstr "指定服务未启用或未定义。"
 
-#: src/repos.cc:2951
+#: src/repos.cc:2981
 msgid "There are no enabled services defined."
 msgstr "未定义已启用的服务。"
 
-#: src/repos.cc:2955
+#: src/repos.cc:2985
 msgid "Could not refresh the services because of errors."
 msgstr "由于若干错误无法刷新服务。"
 
-#: src/repos.cc:2961
+#: src/repos.cc:2991
 msgid "Some of the services have not been refreshed because of an error."
 msgstr "由于某个错误，未刷新某些服务。"
 
-#: src/repos.cc:2966
+#: src/repos.cc:2996
 msgid "Specified services have been refreshed."
 msgstr "指定服务均已刷新。"
 
-#: src/repos.cc:2968
+#: src/repos.cc:2998
 msgid "All services have been refreshed."
 msgstr "全部服务均已刷新。"
 
-#: src/repos.cc:3117
+#: src/repos.cc:3147
 #, c-format, boost-format
 msgid "Service '%s' has been successfully enabled."
 msgstr "已成功启用服务 '%s'。"
 
-#: src/repos.cc:3120
+#: src/repos.cc:3150
 #, c-format, boost-format
 msgid "Service '%s' has been successfully disabled."
 msgstr "已成功禁用服务 '%s'。"
 
-#: src/repos.cc:3127
+#: src/repos.cc:3157
 #, c-format, boost-format
 msgid "Autorefresh has been enabled for service '%s'."
 msgstr "已启用服务 '%s' 的自动刷新。"
 
-#: src/repos.cc:3130
+#: src/repos.cc:3160
 #, c-format, boost-format
 msgid "Autorefresh has been disabled for service '%s'."
 msgstr "已禁用服务 '%s' 的自动刷新。"
 
-#: src/repos.cc:3136
+#: src/repos.cc:3166
 #, c-format, boost-format
 msgid "Name of service '%s' has been set to '%s'."
 msgstr "服务 '%s' 名称被设为了 '%s'。"
 
-#: src/repos.cc:3175
+#: src/repos.cc:3172
 #, 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:3180
+#, 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:3188
+#, 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:3196
+#, 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:3205
+#, c-format, boost-format
 msgid "Nothing to change for service '%s'."
 msgstr "服务 '%s' 无需修改。"
 
-#: src/repos.cc:3182
+#: src/repos.cc:3212
 msgid "Error while modifying the service:"
 msgstr "修改服务时出错："
 
-#: src/repos.cc:3183
+#: src/repos.cc:3213
 #, c-format, boost-format
 msgid "Leaving service %s unchanged."
 msgstr "服务 %s 未变动。"
 
-#: src/repos.cc:3291
+#: src/repos.cc:3321
 msgid "Loading repository data..."
 msgstr "正在加载软件源数据..."
 
-#: src/repos.cc:3313
+#: src/repos.cc:3343
 #, c-format, boost-format
 msgid "Retrieving repository '%s' data..."
 msgstr "正在撷取软件源 '%s' 的数据..."
 
-#: src/repos.cc:3320
+#: src/repos.cc:3350
 #, c-format, boost-format
 msgid "Repository '%s' not cached. Caching..."
 msgstr "未缓存软件源 '%s'。正在缓存中..."
 
-#: src/repos.cc:3327 src/repos.cc:3365
+#: src/repos.cc:3357 src/repos.cc:3395
 #, c-format, boost-format
 msgid "Problem loading data from '%s'"
 msgstr "从 '%s' 加载数据出现问题"
 
-#: src/repos.cc:3332
+#: src/repos.cc:3362
 #, c-format, boost-format
 msgid "Repository '%s' could not be refreshed. Using old cache."
 msgstr "无法刷新软件源 '%s'。正在使用旧缓存。"
 
-#: src/repos.cc:3337 src/repos.cc:3370
+#: src/repos.cc:3367 src/repos.cc:3400
 #, c-format, boost-format
 msgid "Resolvables from '%s' not loaded because of error."
 msgstr "由于某个错误，未加载来自 '%s' 的可解析项。"
 
-#: src/repos.cc:3356
+#: src/repos.cc:3386
 #, c-format, boost-format
-msgid ""
-"Repository '%s' appears to be outdated. Consider using a different mirror or "
-"server."
+msgid "Repository '%s' appears to be outdated. Consider using a different mirror or server."
 msgstr "软件源 '%s' 看起来已过期。请考虑使用一个不同的镜像或服务器。"
 
 #. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m'
-#: src/repos.cc:3367
+#: src/repos.cc:3397
 #, c-format, boost-format
 msgid "Try '%s', or even '%s' before doing so."
 msgstr "这么做前请先尝试 '%s'，甚至也可尝试 '%s'。"
 
-#: src/repos.cc:3379
+#: src/repos.cc:3409
 msgid "Reading installed packages..."
 msgstr "正在读取已安装的软件包..."
 
-#: src/repos.cc:3390
+#: src/repos.cc:3420
 msgid "Problem occurred while reading the installed packages:"
 msgstr "读取已安装软件包时发生问题："
 
-#: src/update.cc:93
+#: src/update.cc:90
 #, c-format, boost-format
-msgid ""
-"Ignoring %s without argument because similar option with an argument has "
-"been specified."
+msgid "Ignoring %s without argument because similar option with an argument has been specified."
 msgstr "忽略没有参数的 %s 因为已经指定过了类似的有参数的选项。"
 
+#: src/update.cc:187
+#, fuzzy, c-format, boost-format
+#| msgid "%d patch needed"
+#| msgid_plural "%d patches needed"
+msgid "%d patch locked"
+msgid_plural "%d patches locked"
+msgstr[0] "需要 %d 个补丁"
+
+#. translators: %d is the number of needed patches
+#: src/update.cc:191
+#, c-format, boost-format
+msgid "%d patch needed"
+msgid_plural "%d patches needed"
+msgstr[0] "需要 %d 个补丁"
+
+#. translators: %d is the number of security patches
+#: src/update.cc:195
+#, c-format, boost-format
+msgid "%d security patch"
+msgid_plural "%d security patches"
+msgstr[0] "%d 个安全补丁"
+
+#: src/update.cc:206
+msgid "unwanted"
+msgstr ""
+
+#: src/update.cc:207
+msgid "needed"
+msgstr "需要"
+
+#: src/update.cc:208
+msgid "applied"
+msgstr ""
+
+#: src/update.cc:209
+msgid "not needed"
+msgstr "不需要"
+
+#: src/update.cc:215
+#, fuzzy
+#| msgid "undefined"
+msgid "undetermined"
+msgstr "未定义"
+
 #. translators: package's repository (header)
-#: 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
+#: src/update.cc:392 src/update.cc:625 src/search.cc:79 src/search.cc:330
+#: src/search.cc:452 src/search.cc:586 src/search.cc:648 src/locks.cc:107
 msgid "Repository"
 msgstr "软件源"
 
-#: src/update.cc:314 src/update.cc:612 src/update.cc:681 src/search.cc:332
+#: src/update.cc:393 src/update.cc:694 src/update.cc:763 src/search.cc:332
 msgid "Category"
 msgstr "分类"
 
-#: src/update.cc:314 src/update.cc:612 src/update.cc:681 src/search.cc:333
+#: src/update.cc:393 src/update.cc:694 src/update.cc:763 src/search.cc:333
 msgid "Severity"
 msgstr "严重性"
 
-#: src/update.cc:314 src/update.cc:612 src/update.cc:681
+#: src/update.cc:393 src/update.cc:694 src/update.cc:763
 msgid "Interactive"
 msgstr "交互的"
 
-#: src/update.cc:314 src/update.cc:612 src/search.cc:334
+#: src/update.cc:393 src/update.cc:694 src/search.cc:334
 msgid "Status"
 msgstr "状态"
 
 #. translators: package summary (header)
-#: src/update.cc:314 src/update.cc:681 src/search.cc:240
+#: src/update.cc:393 src/update.cc:763 src/search.cc:240
 msgid "Summary"
 msgstr "摘要"
 
-#: src/update.cc:343 src/update.cc:673
-msgid "needed"
-msgstr "需要"
-
-#: src/update.cc:343 src/update.cc:673
-msgid "not needed"
-msgstr "不需要"
-
-#: src/update.cc:362
+#: src/update.cc:441
 msgid "The following software management updates will be installed first:"
 msgstr "将首先安装以下软件管理更新："
 
-#: src/update.cc:371 src/update.cc:599
+#: src/update.cc:450 src/update.cc:681
 msgid "No updates found."
 msgstr "未找到更新。"
 
-#: src/update.cc:377
+#: src/update.cc:456
 msgid "The following updates are also available:"
 msgstr "以下更新也可用："
 
-#: src/update.cc:462
+#: src/update.cc:541
 msgid "Package updates"
 msgstr "软件包更新"
 
-#: src/update.cc:464
+#: src/update.cc:543
 msgid "Patches"
 msgstr "补丁"
 
-#: src/update.cc:466
+#: src/update.cc:545
 msgid "Pattern updates"
 msgstr "软件集更新"
 
-#: src/update.cc:468
+#: src/update.cc:547
 msgid "Product updates"
 msgstr "产品更新"
 
-#: src/update.cc:551
+#: src/update.cc:633
 msgid "Current Version"
 msgstr "当前版本"
 
-#: src/update.cc:552
+#: src/update.cc:634
 msgid "Available Version"
 msgstr "可用版本"
 
 #. translators: package architecture (header)
-#: src/update.cc:552 src/search.cc:77 src/search.cc:589 src/search.cc:654
+#: src/update.cc:634 src/search.cc:77 src/search.cc:589 src/search.cc:654
 msgid "Arch"
 msgstr "架构"
 
-#: src/update.cc:612
+#: src/update.cc:694
 msgid "Issue"
 msgstr "问题"
 
-#: src/update.cc:612
+#: src/update.cc:694
 msgid "No."
 msgstr "编号"
 
-#: src/update.cc:612
+#: src/update.cc:694
 msgid "Patch"
 msgstr "补丁"
 
-#: src/update.cc:722
+#: src/update.cc:804
 msgid "No matching issues found."
 msgstr "未找到匹配的问题。"
 
-#: src/update.cc:730
+#: src/update.cc:812
 msgid "The following matches in issue numbers have been found:"
 msgstr "已找到以下匹配问题编号的补丁："
 
-#: src/update.cc:739
+#: src/update.cc:821
 msgid "Matches in patch descriptions of the following patches have been found:"
 msgstr "已找到以下补丁描述匹配的补丁："
 
-#: src/update.cc:807
+#: src/update.cc:889
 #, c-format, boost-format
 msgid "Fix for bugzilla issue number %s was not found or is not needed."
 msgstr "未找到或不需要故障专区问题编号 %s 的修复。"
 
-#: src/update.cc:809
+#: src/update.cc:891
 #, 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
+#: src/update.cc:894
 #, c-format, boost-format
 msgid "Fix for %s issue number %s was not found or is not needed."
 msgstr "%s 的修复，修复编号为 %s 未找到或不需要。"
@@ -1981,8 +2454,7 @@
 
 #: src/Zypper.cc:102
 #, boost-format
-msgid ""
-"Legacy commandline option %1% detected. Please use global option %2% instead."
+msgid "Legacy commandline option %1% detected. Please use global option %2% instead."
 msgstr "检测到了过时的命令行选项 %1%。请使用全局选项 %2% 代替。"
 
 #: src/Zypper.cc:103
@@ -1994,7 +2466,7 @@
 msgid "Command options:"
 msgstr "命令选项："
 
-#: src/Zypper.cc:186 src/Zypper.cc:2199
+#: src/Zypper.cc:186 src/Zypper.cc:2201
 msgid "Expert options:"
 msgstr "专家选项："
 
@@ -2009,8 +2481,7 @@
 "\t--version, -V\t\tOutput the version number.\n"
 "\t--promptids\t\tOutput a list of zypper's user prompts.\n"
 "\t--config, -c <file>\tUse specified config file instead of the default.\n"
-"\t--userdata <string>\tUser defined transaction id used in history and "
-"plugins.\n"
+"\t--userdata <string>\tUser defined transaction id used in history and plugins.\n"
 "\t--quiet, -q\t\tSuppress normal output, print only error\n"
 "\t\t\t\tmessages.\n"
 "\t--verbose, -v\t\tIncrease verbosity.\n"
@@ -2064,16 +2535,13 @@
 "\t--gpg-auto-import-keys\tAutomatically trust and import new repository\n"
 "\t\t\t\tsigning keys.\n"
 "\t--plus-repo, -p <URI>\tUse an additional repository.\n"
-"\t--plus-content <tag>\tAdditionally use disabled repositories providing a "
-"specific keyword.\n"
-"\t\t\t\tTry '--plus-content debug' to enable repos indicating to provide "
-"debug packages.\n"
+"\t--plus-content <tag>\tAdditionally use disabled repositories providing a specific keyword.\n"
+"\t\t\t\tTry '--plus-content debug' to enable repos indicating to provide debug packages.\n"
 "\t--disable-repositories\tDo not read meta-data from repositories.\n"
 "\t--no-refresh\t\tDo not refresh the repositories.\n"
 "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n"
 "\t--no-remote\t\tIgnore remote repositories.\n"
-"\t--releasever\t\tSet the value of $releasever in all .repo files (default: "
-"distribution version)\n"
+"\t--releasever\t\tSet the value of $releasever in all .repo files (default: distribution version)\n"
 msgstr ""
 "    软件源选项：\n"
 "\t--no-gpg-checks\t\t忽略失败的 GPG 检查并继续。\n"
@@ -2230,8 +2698,7 @@
 "\ttargetos, tos\t\tPrint the target operating system ID string.\n"
 "\tlicenses\t\tPrint report about licenses and EULAs of\n"
 "\t\t\t\tinstalled packages.\n"
-"\tdownload\t\tDownload rpms specified on the commandline to a local "
-"directory.\n"
+"\tdownload\t\tDownload rpms specified on the commandline to a local directory.\n"
 "\tsource-download\t\tDownload source rpms for all installed packages\n"
 "\t\t\t\tto a local directory.\n"
 msgstr ""
@@ -2303,14 +2770,12 @@
 msgid "User data string must not contain nonprintable or newline characters!"
 msgstr "用户数据字符串必须不能包含不可打印的字符或用于另起一行的功能性字符！"
 
-#: src/Zypper.cc:828 src/Zypper.cc:3048
+#: src/Zypper.cc:828 src/Zypper.cc:3050
 msgid "Entering non-interactive mode."
 msgstr "正在进入非交互模式。"
 
 #: src/Zypper.cc:834
-msgid ""
-"Patches having the flag rebootSuggested set will not be treated as "
-"interactive."
+msgid "Patches having the flag rebootSuggested set will not be treated as interactive."
 msgstr "设置了\"建议重启\"旗标的补丁将不被视为可与用户交互的。"
 
 #: src/Zypper.cc:840
@@ -2319,8 +2784,7 @@
 
 #: src/Zypper.cc:847
 #, c-format, boost-format
-msgid ""
-"Turning on '%s'. New repository signing keys will be automatically imported!"
+msgid "Turning on '%s'. New repository signing keys will be automatically imported!"
 msgstr "正在开启 '%s'。将自动导入新软件源签名密钥！"
 
 #: src/Zypper.cc:860
@@ -2393,30 +2857,22 @@
 "-r, --repo <alias|#|URI>    Load only the specified repository.\n"
 "-t, --type <type>           Type of package (%s).\n"
 "                            Default: %s.\n"
-"-n, --name                  Select packages by plain name, not by "
-"capability.\n"
+"-n, --name                  Select packages by plain name, not by capability.\n"
 "-C, --capability            Select packages by capability.\n"
-"-f, --force                 Install even if the item is already installed "
-"(reinstall),\n"
+"-f, --force                 Install even if the item is already installed (reinstall),\n"
 "                            downgraded or changes vendor or architecture.\n"
-"    --oldpackage            Allow to replace a newer item with an older "
-"one.\n"
-"                            Handy if you are doing a rollback. Unlike --"
-"force\n"
+"    --oldpackage            Allow to replace a newer item with an older one.\n"
+"                            Handy if you are doing a rollback. Unlike --force\n"
 "                            it will not enforce a reinstall.\n"
-"    --replacefiles          Install the packages even if they replace files "
-"from other,\n"
-"                            already installed, packages. Default is to treat "
-"file conflicts\n"
-"                            as an error. --download-as-needed disables the "
-"fileconflict check.\n"
+"    --replacefiles          Install the packages even if they replace files from other,\n"
+"                            already installed, packages. Default is to treat file conflicts\n"
+"                            as an error. --download-as-needed disables the fileconflict check.\n"
 "-l, --auto-agree-with-licenses\n"
 "                            Automatically say 'yes' to third party license\n"
 "                            confirmation prompt.\n"
 "                            See 'man zypper' for more details.\n"
 "    --debug-solver          Create solver test case for debugging.\n"
-"    --no-recommends         Do not install recommended packages, only "
-"required.\n"
+"    --no-recommends         Do not install recommended packages, only required.\n"
 "    --recommends            Install also recommended packages in addition\n"
 "                            to the required.\n"
 "-R, --no-force-resolution   Do not force the solver to find solution,\n"
@@ -2431,8 +2887,7 @@
 msgstr ""
 "install (in) [选项] <功能|rpm_文件_uri> ...\n"
 "\n"
-"安装具有指定功能的软件包或者指定位置的 RPM 文件。功能的定义为\"名称[.架构][操"
-"作符<版本>]\"，操作符为 <, <=, =, >=, > 其中之一。\n"
+"安装具有指定功能的软件包或者指定位置的 RPM 文件。功能的定义为\"名称[.架构][操作符<版本>]\"，操作符为 <, <=, =, >=, > 其中之一。\n"
 "\n"
 "  命令选项：\n"
 "    --from <别名|#|URI>    从指定软件源选择软件包。\n"
@@ -2444,8 +2899,7 @@
 "-f, --force                用于已安装该软件包仍强制安装 (重装)，\n"
 "                                降级或变更厂商或架构的情况。\n"
 "    --oldpackage      允许使用旧软件包替换新软件包。\n"
-"                                若您正在做回滚那么该选项超有用。不像 --"
-"force \n"
+"                                若您正在做回滚那么该选项超有用。不像 --force \n"
 "                                那样，它不强行重装。\n"
 "    --replacefiles      即使新软件包会替换其它已安装软件包的文件\n"
 "                                也安装它们。默认是将文件冲突视为错误。\n"
@@ -2479,8 +2933,7 @@
 "-r, --repo <alias|#|URI>    Load only the specified repository.\n"
 "-t, --type <type>           Type of package (%s).\n"
 "                            Default: %s.\n"
-"-n, --name                  Select packages by plain name, not by "
-"capability.\n"
+"-n, --name                  Select packages by plain name, not by capability.\n"
 "-C, --capability            Select packages by capability.\n"
 "    --debug-solver          Create solver test case for debugging.\n"
 "-R, --no-force-resolution   Do not force the solver to find solution,\n"
@@ -2494,8 +2947,7 @@
 msgstr ""
 "remove (rm) [选项] <功能> ...\n"
 "\n"
-"移除具有指定功能的软件包。功能的定义为\"名称[.架构][操作符 <版本>]\"，操作符"
-"为 <, <=, =, >=, > 其中之一。\n"
+"移除具有指定功能的软件包。功能的定义为\"名称[.架构][操作符 <版本>]\"，操作符为 <, <=, =, >=, > 其中之一。\n"
 "\n"
 "  命令选项\n"
 "-r, --repo <别名|#|URI>       仅加载指定软件源。\n"
@@ -2518,8 +2970,7 @@
 "Install specified source packages and their build dependencies.\n"
 "\n"
 "  Command options:\n"
-"-d, --build-deps-only    Install only build dependencies of specified "
-"packages.\n"
+"-d, --build-deps-only    Install only build dependencies of specified packages.\n"
 "-D, --no-build-deps      Don't install build dependencies.\n"
 "-r, --repo <alias|#|URI> Install packages only from specified repositories.\n"
 "    --download-only      Only download the packages, do not install.\n"
@@ -2539,15 +2990,12 @@
 msgid ""
 "verify (ve) [options]\n"
 "\n"
-"Check whether dependencies of installed packages are satisfied and suggest "
-"to install or remove packages in order to repair the dependency problems.\n"
+"Check whether dependencies of installed packages are satisfied and suggest to install or remove packages in order to repair the dependency problems.\n"
 "\n"
 "  Command options:\n"
 "-r, --repo <alias|#|URI>    Load only the specified repository.\n"
-"    --no-recommends         Do not install recommended packages, only "
-"required.\n"
-"    --recommends            Install also packages recommended by newly "
-"installed\n"
+"    --no-recommends         Do not install recommended packages, only required.\n"
+"    --recommends            Install also packages recommended by newly installed\n"
 "                            ones.\n"
 "-D, --dry-run               Test the repair, do not actually do anything to\n"
 "                            the system.\n"
@@ -2575,9 +3023,7 @@
 msgid ""
 "install-new-recommends (inr) [options]\n"
 "\n"
-"Install newly added packages recommended by already installed packages. This "
-"can typically be used to install new language packages or drivers for newly "
-"added hardware.\n"
+"Install newly added packages recommended by already installed packages. This can typically be used to install new language packages or drivers for newly added hardware.\n"
 "\n"
 "  Command options:\n"
 "-r, --repo <alias|#|URI>    Load only the specified repositories.\n"
@@ -2590,8 +3036,7 @@
 msgstr ""
 "install-new-recommends (inr) [选项]\n"
 "\n"
-"安装由已安装软件包推荐的新添加的软件包。这典型地可用于安装新语言包或新添加硬"
-"件的驱动。\n"
+"安装由已安装软件包推荐的新添加的软件包。这典型地可用于安装新语言包或新添加硬件的驱动。\n"
 "\n"
 "  命令选项：\n"
 "-r, --repo <别名|#|URI>    仅加载指定软件源。\n"
@@ -2664,10 +3109,8 @@
 "-I, --ar-to-disable <alias>    Add a RIS service repository to disable.\n"
 "-j, --rr-to-enable <alias>     Remove a RIS service repository to enable.\n"
 "-J, --rr-to-disable <alias>    Remove a RIS service repository to disable.\n"
-"-k, --cl-to-enable             Clear the list of RIS repositories to "
-"enable.\n"
-"-K, --cl-to-disable            Clear the list of RIS repositories to "
-"disable.\n"
+"-k, --cl-to-enable             Clear the list of RIS repositories to enable.\n"
+"-K, --cl-to-disable            Clear the list of RIS repositories to disable.\n"
 "\n"
 "-a, --all                      Apply changes to all services.\n"
 "-l, --local                    Apply changes to all local services.\n"
@@ -2737,8 +3180,7 @@
 "  Command options:\n"
 "-f, --force           Force a complete refresh.\n"
 "-r, --with-repos      Refresh also the service repositories.\n"
-"-R, --restore-status  Also restore service repositories enabled/disabled "
-"state.\n"
+"-R, --restore-status  Also restore service repositories enabled/disabled state.\n"
 msgstr ""
 "refresh-services (refs) [选项]\n"
 "\n"
@@ -2750,33 +3192,50 @@
 "-R,--restore-status 也恢复服务软件源的启用/禁用状态。\n"
 
 #. translators: the %s = "yast2, rpm-md, plaindir"
-#: src/Zypper.cc:1707
-#, c-format, boost-format
+#: src/Zypper.cc:1708
+#, fuzzy, c-format, boost-format
+#| msgid ""
+#| "addrepo (ar) [options] <URI> <alias>\n"
+#| "addrepo (ar) [options] <file.repo>\n"
+#| "\n"
+#| "Add a repository to the system. The repository can be specified by its URI or can be read from specified .repo file (even remote).\n"
+#| "\n"
+#| "  Command options:\n"
+#| "-r, --repo <file.repo>  Just another means to specify a .repo file to read.\n"
+#| "-t, --type <type>       Type of repository (%s).\n"
+#| "-d, --disable           Add the repository as disabled.\n"
+#| "-c, --check             Probe URI.\n"
+#| "-C, --no-check          Don't probe URI, probe later during refresh.\n"
+#| "-n, --name <name>       Specify descriptive name for the repository.\n"
+#| "-k, --keep-packages     Enable RPM files caching.\n"
+#| "-K, --no-keep-packages  Disable RPM files caching.\n"
+#| "-g, --gpgcheck          Enable GPG check for this repository.\n"
+#| "-G, --no-gpgcheck       Disable GPG check for this repository.\n"
+#| "-f, --refresh           Enable autorefresh of the repository.\n"
 msgid ""
 "addrepo (ar) [options] <URI> <alias>\n"
 "addrepo (ar) [options] <file.repo>\n"
 "\n"
-"Add a repository to the system. The repository can be specified by its URI "
-"or can be read from specified .repo file (even remote).\n"
+"Add a repository to the system. The repository can be specified by its URI or can be read from specified .repo file (even remote).\n"
 "\n"
 "  Command options:\n"
-"-r, --repo <file.repo>  Just another means to specify a .repo file to read.\n"
-"-t, --type <type>       Type of repository (%s).\n"
-"-d, --disable           Add the repository as disabled.\n"
-"-c, --check             Probe URI.\n"
-"-C, --no-check          Don't probe URI, probe later during refresh.\n"
-"-n, --name <name>       Specify descriptive name for the repository.\n"
-"-k, --keep-packages     Enable RPM files caching.\n"
-"-K, --no-keep-packages  Disable RPM files caching.\n"
-"-g, --gpgcheck          Enable GPG check for this repository.\n"
-"-G, --no-gpgcheck       Disable GPG check for this repository.\n"
-"-f, --refresh           Enable autorefresh of the repository.\n"
+"-r, --repo <file.repo>    Just another means to specify a .repo file to read.\n"
+"-t, --type <type>         Type of repository (%s).\n"
+"-d, --disable             Add the repository as disabled.\n"
+"-c, --check               Probe URI.\n"
+"-C, --no-check            Don't probe URI, probe later during refresh.\n"
+"-n, --name <name>         Specify descriptive name for the repository.\n"
+"-p, --priority <integer>  Set priority of the repository.\n"
+"-k, --keep-packages       Enable RPM files caching.\n"
+"-K, --no-keep-packages    Disable RPM files caching.\n"
+"-g, --gpgcheck            Enable GPG check for this repository.\n"
+"-G, --no-gpgcheck         Disable GPG check for this repository.\n"
+"-f, --refresh             Enable autorefresh of the repository.\n"
 msgstr ""
 "addrepo (ar) [选项] <URI> <别名>\n"
 "addrepo (ar) [选项] <文件名.repo>\n"
 "\n"
-"向系统中添加一个软件源。软件源可通过其 URI 指定也可从指定的 .repo 文件 (可以"
-"为远程) 中读取。\n"
+"向系统中添加一个软件源。软件源可通过其 URI 指定也可从指定的 .repo 文件 (可以为远程) 中读取。\n"
 "\n"
 "  命令选项：\n"
 "-r, --repo <文件名.repo>    指定要读取的 .repo 文件的另一种方法。\n"
@@ -2791,15 +3250,14 @@
 "-G, --no-gpgcheck    禁用此软件源的 GPG 密钥检查。\n"
 "-f, --refresh    启用软件源自动刷新。\n"
 
-#: src/Zypper.cc:1752
+#: src/Zypper.cc:1754
 msgid ""
 "repos (lr) [options] [repo] ...\n"
 "\n"
 "List all defined repositories.\n"
 "\n"
 "  Command options:\n"
-"-e, --export <FILE.repo>  Export all defined repositories as a single local ."
-"repo file.\n"
+"-e, --export <FILE.repo>  Export all defined repositories as a single local .repo file.\n"
 "-a, --alias               Show also repository alias.\n"
 "-n, --name                Show also repository name.\n"
 "-u, --uri                 Show also base URI of repositories.\n"
@@ -2818,8 +3276,7 @@
 "列出全部已定义的软件源。\n"
 "\n"
 "  命令选项：\n"
-"-e, --export <文件名.repo>    将全部已定义的软件源导出为一个本地 .repo 文"
-"件。\n"
+"-e, --export <文件名.repo>    将全部已定义的软件源导出为一个本地 .repo 文件。\n"
 "-a, --alias    也显示软件源别名。\n"
 "-n, --name    也显示软件源名称。\n"
 "-u, --uri   也显示软件源的基础 URI。\n"
@@ -2833,7 +3290,7 @@
 "-A, --sort-by-alias    按别名排序列表。\n"
 "-N, --sort-by-name    按名称排序列表。\n"
 
-#: src/Zypper.cc:1784
+#: src/Zypper.cc:1786
 msgid ""
 "removerepo (rr) [options] <alias|#|URI>\n"
 "\n"
@@ -2851,7 +3308,7 @@
 "    --loose-auth   忽略 URI 中的用户认证数据。\n"
 "    --loose-query  忽略 URI 中的查询字符串。\n"
 
-#: src/Zypper.cc:1803
+#: src/Zypper.cc:1805
 msgid ""
 "renamerepo (nr) [options] <alias|#|URI> <new-alias>\n"
 "\n"
@@ -2867,14 +3324,13 @@
 
 #. translators: %s is "--all|--remote|--local|--medium-type"
 #. and "--all, --remote, --local, --medium-type"
-#: src/Zypper.cc:1836
+#: src/Zypper.cc:1838
 #, c-format, boost-format
 msgid ""
 "modifyrepo (mr) <options> <alias|#|URI> ...\n"
 "modifyrepo (mr) <options> <%s>\n"
 "\n"
-"Modify properties of repositories specified by alias, number, or URI, or by "
-"the\n"
+"Modify properties of repositories specified by alias, number, or URI, or by the\n"
 "'%s' aggregate options.\n"
 "\n"
 "  Command options:\n"
@@ -2916,20 +3372,18 @@
 "-t, --remote              应用修改到全部远程软件源。\n"
 "-m, --medium-type <类型>  应用修改到指定类型的软件源。\n"
 
-#: src/Zypper.cc:1878
+#: src/Zypper.cc:1880
 msgid ""
 "refresh (ref) [alias|#|URI] ...\n"
 "\n"
-"Refresh repositories specified by their alias, number or URI. If none are "
-"specified, all enabled repositories will be refreshed.\n"
+"Refresh repositories specified by their alias, number or URI. If none are specified, all enabled repositories will be refreshed.\n"
 "\n"
 "  Command options:\n"
 "-f, --force              Force a complete refresh.\n"
 "-b, --force-build        Force rebuild of the database.\n"
 "-d, --force-download     Force download of raw metadata.\n"
 "-B, --build-only         Only build the database, don't download metadata.\n"
-"-D, --download-only      Only download raw metadata, don't build the "
-"database.\n"
+"-D, --download-only      Only download raw metadata, don't build the database.\n"
 "-r, --repo <alias|#|URI> Refresh only specified repositories.\n"
 "-s, --services           Refresh also services before refreshing repos.\n"
 msgstr ""
@@ -2946,7 +3400,7 @@
 "-r, --repo <别名|#|URI> 仅刷新指定软件源。\n"
 "-s, --services           刷新软件源之前也刷新服务。\n"
 
-#: src/Zypper.cc:1907
+#: src/Zypper.cc:1909
 msgid ""
 "clean (cc) [alias|#|URI] ...\n"
 "\n"
@@ -2970,7 +3424,7 @@
 
 #. TranslatorExplanation the first %s = "package, patch, pattern, product"
 #. and the second %s = "patch"
-#: src/Zypper.cc:1936
+#: src/Zypper.cc:1938
 #, c-format, boost-format
 msgid ""
 "list-updates (lu) [options]\n"
@@ -2980,14 +3434,11 @@
 "  Command options:\n"
 "-t, --type <type>             Type of package (%s).\n"
 "                              Default: %s.\n"
-"-r, --repo <alias|#|URI>      List only updates from the specified "
-"repository.\n"
-"    --best-effort             Do a 'best effort' approach to update. "
-"Updates\n"
+"-r, --repo <alias|#|URI>      List only updates from the specified repository.\n"
+"    --best-effort             Do a 'best effort' approach to update. Updates\n"
 "                              to a lower than the latest version are\n"
 "                              also acceptable.\n"
-"-a, --all                     List all packages for which newer versions "
-"are\n"
+"-a, --all                     List all packages for which newer versions are\n"
 "                              available, regardless whether they are\n"
 "                              installable or not.\n"
 msgstr ""
@@ -3007,13 +3458,12 @@
 #. 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:1993
+#: src/Zypper.cc:1995
 #, c-format, boost-format
 msgid ""
 "update (up) [options] [packagename] ...\n"
 "\n"
-"Update all or specified installed packages with newer versions, if "
-"possible.\n"
+"Update all or specified installed packages with newer versions, if possible.\n"
 "\n"
 "  Command options:\n"
 "\n"
@@ -3030,16 +3480,12 @@
 "                            to a lower than the latest version are\n"
 "                            also acceptable.\n"
 "    --debug-solver          Create solver test case for debugging.\n"
-"    --no-recommends         Do not install recommended packages, only "
-"required.\n"
+"    --no-recommends         Do not install recommended packages, only required.\n"
 "    --recommends            Install also recommended packages in addition\n"
 "                            to the required.\n"
-"    --replacefiles          Install the packages even if they replace files "
-"from other,\n"
-"                            already installed, packages. Default is to treat "
-"file conflicts\n"
-"                            as an error. --download-as-needed disables the "
-"fileconflict check.\n"
+"    --replacefiles          Install the packages even if they replace files from other,\n"
+"                            already installed, packages. Default is to treat file conflicts\n"
+"                            as an error. --download-as-needed disables the fileconflict check.\n"
 "-R, --no-force-resolution   Do not force the solver to find solution,\n"
 "                            let it ask.\n"
 "    --force-resolution      Force the solver to find a solution (even\n"
@@ -3080,7 +3526,7 @@
 "                          %s\n"
 "-d, --download-only       仅下载软件包，不安装。\n"
 
-#: src/Zypper.cc:2066
+#: src/Zypper.cc:2068
 #, fuzzy, c-format, boost-format
 msgid ""
 "patch [options]\n"
@@ -3095,24 +3541,18 @@
 "                            Automatically say 'yes' to third party license\n"
 "                            confirmation prompt.\n"
 "                            See man zypper for more details.\n"
-"-b, --bugzilla #            Install patch fixing the specified bugzilla "
-"issue.\n"
+"-b, --bugzilla #            Install patch fixing the specified bugzilla issue.\n"
 "    --cve #                 Install patch fixing the specified CVE issue.\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"
+"    --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"
+"    --no-recommends         Do not install recommended packages, only required.\n"
 "    --recommends            Install also recommended packages in addition\n"
 "                            to the required.\n"
-"    --replacefiles          Install the packages even if they replace files "
-"from other,\n"
-"                            already installed, packages. Default is to treat "
-"file conflicts\n"
-"                            as an error. --download-as-needed disables the "
-"fileconflict check.\n"
+"    --replacefiles          Install the packages even if they replace files from other,\n"
+"                            already installed, packages. Default is to treat file conflicts\n"
+"                            as an error. --download-as-needed disables the fileconflict check.\n"
 "-r, --repo <alias|#|URI>    Load only the specified repository.\n"
 "-D, --dry-run               Test the update, do not actually update.\n"
 "    --details               Show the detailed installation summary.\n"
@@ -3148,11 +3588,11 @@
 "                            %s\n"
 "-d, --download-only      仅下载软件包，不安装。\n"
 
-#: src/Zypper.cc:2097
+#: src/Zypper.cc:2099
 msgid "Install only patches which affect the package management itself."
 msgstr "仅列出影响软件管理器本身的补丁。"
 
-#: src/Zypper.cc:2119
+#: src/Zypper.cc:2121
 msgid ""
 "list-patches (lp) [options]\n"
 "\n"
@@ -3166,8 +3606,7 @@
 "-g  --category <category>  List only patches with this category.\n"
 "    --severity <severity>  List only patches with this severity.\n"
 "-r, --repo <alias|#|URI>   List only patches from the specified repository.\n"
-"    --date <YYYY-MM-DD>    List only 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"
@@ -3184,7 +3623,7 @@
 "-r, --repo <别名|#|URI> 仅列出指定软件源中的补丁。\n"
 "    --date <YYYY-MM-DD> 列出指定日期前发布的补丁。\n"
 
-#: src/Zypper.cc:2174
+#: src/Zypper.cc:2176
 #, c-format, boost-format
 msgid ""
 "dist-upgrade (dup) [options]\n"
@@ -3200,16 +3639,12 @@
 "                            confirmation prompt.\n"
 "                            See man zypper for more details.\n"
 "    --debug-solver          Create solver test case for debugging\n"
-"    --no-recommends         Do not install recommended packages, only "
-"required.\n"
+"    --no-recommends         Do not install recommended packages, only required.\n"
 "    --recommends            Install also recommended packages in addition\n"
 "                            to the required.\n"
-"    --replacefiles          Install the packages even if they replace files "
-"from other,\n"
-"                            already installed, packages. Default is to treat "
-"file conflicts\n"
-"                            as an error. --download-as-needed disables the "
-"fileconflict check.\n"
+"    --replacefiles          Install the packages even if they replace files from other,\n"
+"                            already installed, packages. Default is to treat file conflicts\n"
+"                            as an error. --download-as-needed disables the fileconflict check.\n"
 "-D, --dry-run               Test the upgrade, do not actually upgrade\n"
 "    --details               Show the detailed installation summary.\n"
 "    --download              Set the download-install mode. Available modes:\n"
@@ -3239,23 +3674,57 @@
 "                                %s\n"
 "-d, --download-only     仅下载软件包，不安装。\n"
 
-#: src/Zypper.cc:2200
+#: src/Zypper.cc:2202
 msgid "Whether to allow downgrading installed resolvables."
 msgstr "是否允许降级已安装解析项。"
 
-#: src/Zypper.cc:2201
+#: src/Zypper.cc:2203
 msgid "Whether to allow changing the names of installed resolvables."
 msgstr "是否允许修改已安装解析项的名称。"
 
-#: src/Zypper.cc:2202
+#: src/Zypper.cc:2204
 msgid "Whether to allow changing the architecture of installed resolvables."
 msgstr "是否允许修改已安装解析项的架构。"
 
-#: src/Zypper.cc:2203
+#: src/Zypper.cc:2205
 msgid "Whether to allow changing the vendor of installed resolvables."
 msgstr "是否允许修改已安装解析项的厂商。"
 
-#: src/Zypper.cc:2241
+#: src/Zypper.cc:2243
+#, fuzzy
+#| msgid ""
+#| "search (se) [options] [querystring] ...\n"
+#| "\n"
+#| "Search for packages matching any of the given search strings.\n"
+#| "\n"
+#| "  Command options:\n"
+#| "    --match-substrings     Search for a match to partial words (default).\n"
+#| "    --match-words          Search for a match to whole words only.\n"
+#| "    --match-exact          Searches for an exact match of the search strings.\n"
+#| "    --provides             Search for packages which provide the search strings.\n"
+#| "    --recommends           Search for packages which recommend the search strings.\n"
+#| "    --requires             Search for packages which require the search strings.\n"
+#| "    --suggests             Search for packages which suggest the search strings.\n"
+#| "    --conflicts            Search packages conflicting with search strings.\n"
+#| "    --obsoletes            Search for packages which obsolete the search strings.\n"
+#| "-n, --name                 Useful together with dependency options, otherwise\n"
+#| "                           searching in package name is default.\n"
+#| "-f, --file-list            Search for a match in the file list of packages.\n"
+#| "-d, --search-descriptions  Search also in package summaries and descriptions.\n"
+#| "-C, --case-sensitive       Perform case-sensitive search.\n"
+#| "-i, --installed-only       Show only packages that are already installed.\n"
+#| "-u, --uninstalled-only     Show only packages that are not currently installed.\n"
+#| "-t, --type <type>          Search only for packages of the specified type.\n"
+#| "-r, --repo <alias|#|URI>   Search only in the specified repository.\n"
+#| "    --sort-by-name         Sort packages by name (default).\n"
+#| "    --sort-by-repo         Sort packages by repository.\n"
+#| "-s, --details              Show each available version in each repository\n"
+#| "                           on a separate line.\n"
+#| "-v, --verbose              Like --details, with additional information where the\n"
+#| "                           search has matched (useful for search in dependencies).\n"
+#| "\n"
+#| "* and ? wildcards can also be used within search strings.\n"
+#| "If a search string is enclosed in '/', it's interpreted as a regular expression.\n"
 msgid ""
 "search (se) [options] [querystring] ...\n"
 "\n"
@@ -3264,43 +3733,31 @@
 "  Command options:\n"
 "    --match-substrings     Search for a match to partial words (default).\n"
 "    --match-words          Search for a match to whole words only.\n"
-"    --match-exact          Searches for an exact match of the search "
-"strings.\n"
-"    --provides             Search for packages which provide the search "
-"strings.\n"
-"    --recommends           Search for packages which recommend the search "
-"strings.\n"
-"    --requires             Search for packages which require the search "
-"strings.\n"
-"    --suggests             Search for packages which suggest the search "
-"strings.\n"
+"-x, --match-exact          Searches for an exact match of the search strings.\n"
+"    --provides             Search for packages which provide the search strings.\n"
+"    --recommends           Search for packages which recommend the search strings.\n"
+"    --requires             Search for packages which require the search strings.\n"
+"    --suggests             Search for packages which suggest the search strings.\n"
 "    --conflicts            Search packages conflicting with search strings.\n"
-"    --obsoletes            Search for packages which obsolete the search "
-"strings.\n"
-"-n, --name                 Useful together with dependency options, "
-"otherwise\n"
+"    --obsoletes            Search for packages which obsolete the search strings.\n"
+"-n, --name                 Useful together with dependency options, otherwise\n"
 "                           searching in package name is default.\n"
 "-f, --file-list            Search for a match in the file list of packages.\n"
-"-d, --search-descriptions  Search also in package summaries and "
-"descriptions.\n"
+"-d, --search-descriptions  Search also in package summaries and descriptions.\n"
 "-C, --case-sensitive       Perform case-sensitive search.\n"
 "-i, --installed-only       Show only packages that are already installed.\n"
-"-u, --uninstalled-only     Show only packages that are not currently "
-"installed.\n"
+"-u, --uninstalled-only     Show only packages that are not currently installed.\n"
 "-t, --type <type>          Search only for packages of the specified type.\n"
 "-r, --repo <alias|#|URI>   Search only in the specified repository.\n"
 "    --sort-by-name         Sort packages by name (default).\n"
 "    --sort-by-repo         Sort packages by repository.\n"
 "-s, --details              Show each available version in each repository\n"
 "                           on a separate line.\n"
-"-v, --verbose              Like --details, with additional information where "
-"the\n"
-"                           search has matched (useful for search in "
-"dependencies).\n"
+"-v, --verbose              Like --details, with additional information where the\n"
+"                           search has matched (useful for search in dependencies).\n"
 "\n"
 "* and ? wildcards can also be used within search strings.\n"
-"If a search string is enclosed in '/', it's interpreted as a regular "
-"expression.\n"
+"If a search string is enclosed in '/', it's interpreted as a regular expression.\n"
 msgstr ""
 "search (se) [选项] [查询字符串] ...\n"
 "\n"
@@ -3333,7 +3790,7 @@
 "* 和 ? 通配符也可以用于搜索字符串中。\n"
 "若搜索字符串以 '/' 结尾，它将被解释为一个正则表达式。\n"
 
-#: src/Zypper.cc:2290
+#: src/Zypper.cc:2292
 msgid ""
 "patch-check (pchk) [options]\n"
 "\n"
@@ -3341,8 +3798,7 @@
 "\n"
 "  Command options:\n"
 "\n"
-"-r, --repo <alias|#|URI>  Check for patches only in the specified "
-"repository.\n"
+"-r, --repo <alias|#|URI>  Check for patches only in the specified repository.\n"
 msgstr ""
 "patch-check (pchk) [选项]\n"
 "\n"
@@ -3352,11 +3808,11 @@
 "\n"
 "-r, --repo <别名|#|URI>  仅检查指定软件源中的补丁。\n"
 
-#: src/Zypper.cc:2298
+#: src/Zypper.cc:2300
 msgid "Check only for patches which affect the package management itself."
 msgstr "仅检查影响软件管理器自身的补丁。"
 
-#: src/Zypper.cc:2314
+#: src/Zypper.cc:2316
 msgid ""
 "patches (pch) [repository] ...\n"
 "\n"
@@ -3374,7 +3830,7 @@
 "\n"
 "-r, --repo <别名|#|URI>  指定软件源的另一种方法。\n"
 
-#: src/Zypper.cc:2345
+#: src/Zypper.cc:2347
 msgid ""
 "packages (pa) [options] [repository] ...\n"
 "\n"
@@ -3385,8 +3841,7 @@
 "-r, --repo <alias|#|URI>  Just another means to specify repository.\n"
 "-i, --installed-only      Show only installed packages.\n"
 "-u, --uninstalled-only    Show only packages which are not installed.\n"
-"    --orphaned            Show packages which are orphaned (without "
-"repository).\n"
+"    --orphaned            Show packages which are orphaned (without repository).\n"
 "    --suggested           Show packages which are suggested.\n"
 "    --recommended         Show packages which are recommended.\n"
 "    --unneeded            Show packages which are unneeded.\n"
@@ -3409,7 +3864,7 @@
 "-N, --sort-by-name        按软件包名称排序列表。\n"
 "-R, --sort-by-repo        按软件源排序列表。\n"
 
-#: src/Zypper.cc:2377
+#: src/Zypper.cc:2379
 msgid ""
 "patterns (pt) [options] [repository] ...\n"
 "\n"
@@ -3431,7 +3886,7 @@
 "-i, --installed-only      仅显示已安装的软件集。\n"
 "-u, --uninstalled-only    仅显示未安装的软件集。\n"
 
-#: src/Zypper.cc:2403
+#: src/Zypper.cc:2405
 msgid ""
 "products (pd) [options] [repository] ...\n"
 "\n"
@@ -3453,7 +3908,7 @@
 "-i, --installed-only      仅显示已安装的产品。\n"
 "-u, --uninstalled-only    仅显示未安装的产品。\n"
 
-#: src/Zypper.cc:2435
+#: src/Zypper.cc:2437
 #, c-format, boost-format
 msgid ""
 "info (if) [options] <name> ...\n"
@@ -3464,8 +3919,7 @@
 "or use wildcards (*?) in name.\n"
 "\n"
 "  Command options:\n"
-"-s, --match-substrings    Print information for packages partially matching "
-"name.\n"
+"-s, --match-substrings    Print information for packages partially matching name.\n"
 "-r, --repo <alias|#|URI>  Work only with the specified repository.\n"
 "-t, --type <type>         Type of package (%s).\n"
 "                          Default: %s.\n"
@@ -3495,7 +3949,7 @@
 "    --recommends      显示该软件包推荐的软件包。\n"
 "    --suggests              显示该软件包建议的软件包。\n"
 
-#: src/Zypper.cc:2468
+#: src/Zypper.cc:2470
 #, c-format, boost-format
 msgid ""
 "patch-info <patchname> ...\n"
@@ -3510,7 +3964,7 @@
 "\n"
 "这是 '%s' 的一个别名。\n"
 
-#: src/Zypper.cc:2487
+#: src/Zypper.cc:2489
 #, c-format, boost-format
 msgid ""
 "pattern-info <pattern_name> ...\n"
@@ -3525,7 +3979,7 @@
 "\n"
 "这是 '%s' 的一个别名。\n"
 
-#: src/Zypper.cc:2506
+#: src/Zypper.cc:2508
 #, c-format, boost-format
 msgid ""
 "product-info <product_name> ...\n"
@@ -3540,7 +3994,7 @@
 "\n"
 "这是 '%s' 的一个别名。\n"
 
-#: src/Zypper.cc:2523
+#: src/Zypper.cc:2525
 msgid ""
 "what-provides (wp) <capability>\n"
 "\n"
@@ -3554,7 +4008,7 @@
 "\n"
 "此命令无额外选项。\n"
 
-#: src/Zypper.cc:2574
+#: src/Zypper.cc:2576
 msgid ""
 "moo\n"
 "\n"
@@ -3568,13 +4022,12 @@
 "\n"
 "此命令无额外选项。\n"
 
-#: src/Zypper.cc:2596
+#: src/Zypper.cc:2598
 #, c-format, boost-format
 msgid ""
 "addlock (al) [options] <packagename> ...\n"
 "\n"
-"Add a package lock. Specify packages to lock by exact name or by a glob "
-"pattern using '*' and '?' wildcard characters.\n"
+"Add a package lock. Specify packages to lock by exact name or by a glob pattern using '*' and '?' wildcard characters.\n"
 "\n"
 "  Command options:\n"
 "-r, --repo <alias|#|URI>  Restrict the lock to the specified repository.\n"
@@ -3583,21 +4036,19 @@
 msgstr ""
 "addlock (al) [选项] <软件包名称> ...\n"
 "\n"
-"添加一个软件包锁定。通过精确的名称或使用了 '*' 和 '?' 通配符的匹配模式指定要"
-"锁定的软件包。\n"
+"添加一个软件包锁定。通过精确的名称或使用了 '*' 和 '?' 通配符的匹配模式指定要锁定的软件包。\n"
 "\n"
 "  命令选项：\n"
 "-r, --repo <别名|#|URI>   该锁定仅限于指定软件源。\n"
 "-t, --type <类型>         软件包类型 (%s)。\n"
 "                          默认：%s。\n"
 
-#: src/Zypper.cc:2623
+#: src/Zypper.cc:2625
 #, c-format, boost-format
 msgid ""
 "removelock (rl) [options] <lock-number|packagename> ...\n"
 "\n"
-"Remove a package lock. Specify the lock to remove by its number obtained "
-"with '%s' or by package name.\n"
+"Remove a package lock. Specify the lock to remove by its number obtained with '%s' or by package name.\n"
 "\n"
 "  Command options:\n"
 "-r, --repo <alias|#|URI>  Remove only locks with specified repository.\n"
@@ -3614,26 +4065,26 @@
 "                           默认：%s。\n"
 
 #. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
-#: src/Zypper.cc:2650
+#: src/Zypper.cc:2652
 msgid "locks (ll) [options]"
 msgstr "locks (ll) [选项]"
 
 #. translators: command description
-#: src/Zypper.cc:2653
+#: src/Zypper.cc:2655
 msgid "List current package locks."
 msgstr "列出当前软件包锁定。"
 
 #. translators: -m, --matches
-#: src/Zypper.cc:2657
+#: src/Zypper.cc:2659
 msgid "Show the number of resolvables matched by each lock."
 msgstr "显示每次查询匹配到的解析项数目。"
 
 #. translators: -s, --solvables
-#: src/Zypper.cc:2659
+#: src/Zypper.cc:2661
 msgid "List the resolvables matched by each lock."
 msgstr "列出每次查询匹配到的解析项。"
 
-#: src/Zypper.cc:2675
+#: src/Zypper.cc:2677
 msgid ""
 "cleanlocks (cl)\n"
 "\n"
@@ -3651,7 +4102,7 @@
 "-d, --only-duplicates    仅清理重复的锁定。\n"
 "-e, --only-empty         仅清理没有锁定任何东西的锁定。\n"
 
-#: src/Zypper.cc:2696
+#: src/Zypper.cc:2698
 msgid ""
 "targetos (tos) [options]\n"
 "\n"
@@ -3669,7 +4120,7 @@
 " 命令选项：\n"
 "-l, --label                 显示操作系统标签。\n"
 
-#: src/Zypper.cc:2717
+#: src/Zypper.cc:2719
 msgid ""
 "versioncmp (vcmp) <version1> <version2>\n"
 "\n"
@@ -3685,7 +4136,7 @@
 "  命令选项：\n"
 "-m, --match  将缺失的释出号视为任意释出号。\n"
 
-#: src/Zypper.cc:2736
+#: src/Zypper.cc:2738
 msgid ""
 "licenses\n"
 "\n"
@@ -3700,42 +4151,33 @@
 "此命令无额外选项。\n"
 
 #. translators: command synopsis; do not translate the command 'name (abbreviations)' or '-option' names
-#: src/Zypper.cc:2760
+#: src/Zypper.cc:2762
 msgid "ps [options]"
 msgstr "ps [选项]"
 
 #. translators: command description
-#: src/Zypper.cc:2763
-msgid ""
-"List running processes which might still use files and libraries deleted by "
-"recent upgrades."
+#: src/Zypper.cc:2765
+msgid "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."
+#: src/Zypper.cc:2769
+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 ""
 
 #. translators: --print <format>
-#: src/Zypper.cc:2769
+#: src/Zypper.cc:2771
 #, 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."
+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 ""
 
-#: src/Zypper.cc:2788
+#: src/Zypper.cc:2790
 msgid ""
 "download [options] <packages>...\n"
 "\n"
 "Download rpms specified on the commandline to a local directory.\n"
 "Per default packages are downloaded to the libzypp package cache\n"
-"(/var/cache/zypp/packages; for non-root users $XDG_CACHE_HOME/zypp/"
-"packages),\n"
+"(/var/cache/zypp/packages; for non-root users $XDG_CACHE_HOME/zypp/packages),\n"
 "but this can be changed by using the global --pkg-cache-dir option.\n"
 "\n"
 "In XML output a <download-result> node is written for each\n"
@@ -3752,18 +4194,16 @@
 "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"
 "将会为每个 zypper 试图下载的软件包以 XML 输出写入一个<下载结果>节点。\n"
 "成功后本地路径可在 'download-result/localpath@path' 中找到。\n"
 "\n"
 " 命令选项：\n"
-"--all-matches        下载匹配命令行参数的全部版本。否则将仅下载每个匹配到的软"
-"件包的最佳版本。\n"
+"--all-matches        下载匹配命令行参数的全部版本。否则将仅下载每个匹配到的软件包的最佳版本。\n"
 "--dry-run               不下载任何软件包，仅报告将会发生什么。\n"
 
-#: src/Zypper.cc:2827
+#: src/Zypper.cc:2829
 msgid ""
 "source-download\n"
 "\n"
@@ -3791,7 +4231,7 @@
 "--status            不下载任何源代码 RPM，\n"
 "                    而是显示缺失或多余的源代码 RPM。\n"
 
-#: src/Zypper.cc:2854
+#: src/Zypper.cc:2856
 msgid ""
 "quit (exit, ^D)\n"
 "\n"
@@ -3805,7 +4245,7 @@
 "\n"
 "此命令无额外选项。\n"
 
-#: src/Zypper.cc:2871
+#: src/Zypper.cc:2873
 msgid ""
 "shell (sh)\n"
 "\n"
@@ -3820,7 +4260,7 @@
 "此命令无额外选项。\n"
 
 #. translators: this is just a legacy command
-#: src/Zypper.cc:2889
+#: src/Zypper.cc:2891
 msgid ""
 "service-types (st)\n"
 "\n"
@@ -3831,7 +4271,7 @@
 "列出可用的服务类型。\n"
 
 #. translators: this is just a legacy command
-#: src/Zypper.cc:2905
+#: src/Zypper.cc:2907
 msgid ""
 "list-resolvables (lr)\n"
 "\n"
@@ -3844,7 +4284,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:2927
+#: src/Zypper.cc:2929
 msgid ""
 "mount\n"
 "\n"
@@ -3864,20 +4304,19 @@
 "-n, --name <名称>    使用给定字符串作为服务名称。\n"
 "-r, --recurse        递归探测子文件夹。\n"
 
-#: src/Zypper.cc:2956
+#: src/Zypper.cc:2958
 #, c-format, boost-format
 msgid ""
 "patch-search [options] [querystring...]\n"
 "\n"
-"Search for patches matching given search strings. This is an alias for "
-"'%s'.\n"
+"Search for patches matching given search strings. This is an alias for '%s'.\n"
 msgstr ""
 "patch-search [选项] [查询字符串...]\n"
 "\n"
 "搜索匹配给定搜索字符串的补丁。这是 '%s' 的一个别名。\n"
 
 #. translators: this is just a legacy command
-#: src/Zypper.cc:2973
+#: src/Zypper.cc:2975
 msgid ""
 "ping [options]\n"
 "\n"
@@ -3887,36 +4326,32 @@
 "\n"
 "此命令的实现是虚假的，总是返回 0。\n"
 
-#: src/Zypper.cc:3016 src/Zypper.cc:5273
+#: src/Zypper.cc:3018 src/Zypper.cc:5275
 msgid "Unexpected program flow."
 msgstr "意外程序流。"
 
-#: src/Zypper.cc:3065
+#: src/Zypper.cc:3067
 msgid "Non-option program arguments: "
 msgstr "无选项程序参数："
 
-#: 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."
-msgstr ""
-"PackageKit 正屏蔽着 zypper。这发生在若您已运行了一个使用 PackageKit 的升级挂"
-"件或其他软件管理程序时。"
+#: src/Zypper.cc:3123
+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:3127
+#: src/Zypper.cc:3129
 msgid "Tell PackageKit to quit?"
 msgstr "通知 PackageKit 退出吗？"
 
-#: src/Zypper.cc:3136
+#: src/Zypper.cc:3138
 msgid "PackageKit is still running (probably busy)."
 msgstr "PackageKit 仍在运行 (或许正忙)。"
 
-#: src/Zypper.cc:3138
+#: src/Zypper.cc:3140
 msgid "Try again?"
 msgstr "重试吗？"
 
 #. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: src/Zypper.cc:3191
+#: src/Zypper.cc:3193
 msgid ""
 "   \\\\\\\\\\\n"
 "  \\\\\\\\\\\\\\__o\n"
@@ -3926,20 +4361,20 @@
 "  \\\\\\\\\\\\\\__o\n"
 "__\\\\\\\\\\\\\\'/_"
 
-#: src/Zypper.cc:3219
+#: src/Zypper.cc:3221
 msgid "Root privileges are required for refreshing services."
 msgstr "刷新服务需要有 root 特权。"
 
-#: src/Zypper.cc:3246 src/Zypper.cc:3334 src/Zypper.cc:3565
+#: src/Zypper.cc:3248 src/Zypper.cc:3336 src/Zypper.cc:3567
 msgid "Root privileges are required for modifying system services."
 msgstr "修改系统服务需要有 root 特权。"
 
-#: src/Zypper.cc:3315
+#: src/Zypper.cc:3317
 #, c-format, boost-format
 msgid "'%s' is not a valid service type."
 msgstr "`%s' 不是一个有效的服务类型。"
 
-#: src/Zypper.cc:3317
+#: src/Zypper.cc:3319
 #, c-format, boost-format
 msgid "See '%s' or '%s' to get a list of known service types."
 msgstr "请参考 '%s' 或 '%s' 获取已知服务类型列表。"
@@ -3948,116 +4383,115 @@
 #. 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:3346 src/Zypper.cc:3716
+#: src/Zypper.cc:3348 src/Zypper.cc:3718
 msgid "Alias or an aggregate option is required."
 msgstr "需要别名或者一个合计选项。"
 
-#: src/Zypper.cc:3380
+#: src/Zypper.cc:3382
 #, c-format, boost-format
 msgid "Service '%s' not found."
 msgstr "未找到服务 '%s'。"
 
-#: src/Zypper.cc:3412 src/Zypper.cc:3564 src/Zypper.cc:3648 src/Zypper.cc:3703
+#: src/Zypper.cc:3414 src/Zypper.cc:3566 src/Zypper.cc:3650 src/Zypper.cc:3705
 msgid "Root privileges are required for modifying system repositories."
 msgstr "修改系统软件源需要有 root 特权。"
 
-#: src/Zypper.cc:3467 src/Zypper.cc:3833
+#: src/Zypper.cc:3469 src/Zypper.cc:3835
 msgid "Too few arguments."
 msgstr "参数太少。"
 
-#: src/Zypper.cc:3491
-msgid ""
-"If only one argument is used, it must be a URI pointing to a .repo file."
+#: src/Zypper.cc:3493
+msgid "If only one argument is used, it must be a URI pointing to a .repo file."
 msgstr "如果只用一个参数，那么它必须是一个指向 .repo 文件的 URI。"
 
-#: src/Zypper.cc:3521
+#: src/Zypper.cc:3523
 #, c-format, boost-format
 msgid "Cannot use %s together with %s. Using the %s setting."
 msgstr "无法同时使用 %s 和 %s。正在使用 %s 设置。"
 
-#: src/Zypper.cc:3542
+#: src/Zypper.cc:3544
 msgid "Specified type is not a valid repository type:"
 msgstr "指定的类型不是一个有效的软件源类型："
 
-#: src/Zypper.cc:3544
+#: src/Zypper.cc:3546
 #, c-format, boost-format
 msgid "See '%s' or '%s' to get a list of known repository types."
 msgstr "请参考 '%s' 或 '%s' 获取已知软件源类型列表。"
 
-#: src/Zypper.cc:3572 src/Zypper.cc:4845 src/utils/messages.cc:48
+#: src/Zypper.cc:3574 src/Zypper.cc:4847 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:3598
+#: src/Zypper.cc:3600
 #, 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:3621
+#: src/Zypper.cc:3623
 #, c-format, boost-format
 msgid "Service '%s' not found by alias, number or URI."
 msgstr "通过别名、编号或 URI 都未找到服务 '%s'。"
 
-#: src/Zypper.cc:3655
+#: src/Zypper.cc:3657
 msgid "Too few arguments. At least URI and alias are required."
 msgstr "参数太少。至少需要 URI 和别名。"
 
-#: src/Zypper.cc:3679
+#: src/Zypper.cc:3681
 #, c-format, boost-format
 msgid "Repository '%s' not found."
 msgstr "未找到软件源 '%s'。"
 
-#: src/Zypper.cc:3749
+#: src/Zypper.cc:3751
 #, c-format, boost-format
 msgid "Repository %s not found."
 msgstr "未找到软件源 %s。"
 
-#: src/Zypper.cc:3769
+#: src/Zypper.cc:3771
 msgid "Root privileges are required for refreshing system repositories."
 msgstr "刷新系统软件源需要有 root 特权。"
 
-#: src/Zypper.cc:3776
+#: src/Zypper.cc:3778
 #, c-format, boost-format
 msgid "The '%s' global option has no effect here."
 msgstr "全局选项 '%s' 在此无效。"
 
-#: src/Zypper.cc:3785
+#: src/Zypper.cc:3787
 #, c-format, boost-format
 msgid "Arguments are not allowed if '%s' is used."
 msgstr "若使用 '%s' 则不允许使用参数。"
 
-#: src/Zypper.cc:3813
+#: src/Zypper.cc:3815
 msgid "Root privileges are required for cleaning local caches."
 msgstr "清理本地缓存需要有 root 特权。"
 
-#: src/Zypper.cc:3834
+#: src/Zypper.cc:3836
 msgid "At least one package name is required."
 msgstr "需要至少一个软件包名称。"
 
-#: src/Zypper.cc:3844
+#: src/Zypper.cc:3846
 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:3856
+#: src/Zypper.cc:3858
 msgid "Ignoring arguments, marking the entire repository."
 msgstr "忽略参数，标记整个软件源。"
 
-#: src/Zypper.cc:3866
+#: src/Zypper.cc:3868
 #, c-format, boost-format
 msgid "Unknown package type: %s"
 msgstr "未知软件包类型：%s"
 
-#: src/Zypper.cc:3877
+#: src/Zypper.cc:3879
 msgid "Cannot uninstall patches."
 msgstr "无法卸载补丁。"
 
-#: src/Zypper.cc:3878
+#: src/Zypper.cc:3880
 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"
@@ -4066,180 +4500,174 @@
 "一款补丁的安装情况完全取决于其依赖关系。\n"
 "因此仅仅是复制文件、数据库记录或其它东西并不代表安装了补丁。"
 
-#: src/Zypper.cc:3889
+#: src/Zypper.cc:3891
 msgid "Uninstallation of a source package not defined and implemented."
 msgstr "目前未定义也未实现源代码包的卸载。"
 
-#: src/Zypper.cc:3910
+#: src/Zypper.cc:3912
 #, c-format, boost-format
 msgid "'%s' looks like an RPM file. Will try to download it."
 msgstr "'%s' 貌似是一个 RPM 文件，将尝试下载之。"
 
-#: src/Zypper.cc:3923
+#: src/Zypper.cc:3925
 #, c-format, boost-format
 msgid "Problem with the RPM file specified as '%s', skipping."
 msgstr "指定为 '%s' 的 RPM 文件有问题，正在跳过。"
 
-#: src/Zypper.cc:3948
+#: src/Zypper.cc:3950
 #, c-format, boost-format
 msgid "Problem reading the RPM header of %s. Is it an RPM file?"
 msgstr "读取 %s 的 RPM 头部出现问题。它是一个 RPM 文件吗？"
 
-#: src/Zypper.cc:3973
+#: src/Zypper.cc:3975
 msgid "Plain RPM files cache"
 msgstr "纯 RPM 文件缓存"
 
-#: src/Zypper.cc:3990
+#: src/Zypper.cc:3992
 msgid "No valid arguments specified."
 msgstr "未指定有效的参数。"
 
-#: src/Zypper.cc:4004 src/Zypper.cc:4142
-msgid ""
-"No repositories defined. Operating only with the installed resolvables. "
-"Nothing can be installed."
+#: src/Zypper.cc:4006 src/Zypper.cc:4144
+msgid "No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
 msgstr "未定义软件源。只能操作已安装的可解析项。不能安装新东西。"
 
 #. translators: meaning --capability contradicts --force/--name
-#: src/Zypper.cc:4042 src/Zypper.cc:4646
+#: src/Zypper.cc:4044 src/Zypper.cc:4648
 #, c-format, boost-format
 msgid "%s contradicts %s"
 msgstr "%s 与 %s 冲突"
 
 #. translators: meaning --force with --capability
-#: src/Zypper.cc:4051
+#: src/Zypper.cc:4053
 #, c-format, boost-format
 msgid "%s cannot currently be used with %s"
 msgstr "%s 目前不能和 %s 一起使用"
 
-#: src/Zypper.cc:4095
+#: src/Zypper.cc:4097
 msgid "Source package name is a required argument."
 msgstr "源代码包名称是一个必需的参数。"
 
-#: src/Zypper.cc:4185
+#: src/Zypper.cc:4187
 msgid "Mode is set to 'match-exact'"
 msgstr "模式已设为精确匹配"
 
-#: src/Zypper.cc:4207 src/Zypper.cc:4560 src/Zypper.cc:4667 src/Zypper.cc:4873
-#: src/Zypper.cc:4926 src/Zypper.cc:4971
+#: src/Zypper.cc:4209 src/Zypper.cc:4562 src/Zypper.cc:4669 src/Zypper.cc:4875
+#: src/Zypper.cc:4928 src/Zypper.cc:4973
 #, c-format, boost-format
 msgid "Unknown package type '%s'."
 msgstr "未知软件包类型 '%s'。"
 
-#: src/Zypper.cc:4230
+#: src/Zypper.cc:4232
 #, c-format, boost-format
 msgid "Specified repository '%s' is disabled."
 msgstr "已禁用指定软件源 '%s'。"
 
-#: src/Zypper.cc:4361 src/search.cc:579
+#: src/Zypper.cc:4363 src/search.cc:579
 msgid "No packages found."
 msgstr "未找到软件包。"
 
-#: src/Zypper.cc:4397
+#: src/Zypper.cc:4399
 msgid "Problem occurred initializing or executing the search query"
 msgstr "初始化或执行搜索查询出现问题"
 
-#: src/Zypper.cc:4398
+#: src/Zypper.cc:4400
 msgid "See the above message for a hint."
 msgstr "请参考以上消息汲取灵感。"
 
-#: src/Zypper.cc:4580 src/Zypper.cc:4632
+#: src/Zypper.cc:4582 src/Zypper.cc:4634
 #, c-format, boost-format
 msgid "Cannot use %s together with %s."
 msgstr "无法同时使用 %s 和 %s。"
 
-#: src/Zypper.cc:4613
+#: src/Zypper.cc:4615
 msgid "Root privileges are required for updating packages."
 msgstr "更新软件包需要有 root 特权。"
 
-#: src/Zypper.cc:4674 src/Zypper.cc:4682 src/Zypper.cc:4757
+#: src/Zypper.cc:4676 src/Zypper.cc:4684 src/Zypper.cc:4759
 msgid "Operation not supported."
 msgstr "不支持该操作。"
 
-#: src/Zypper.cc:4675
+#: src/Zypper.cc:4677
 #, c-format, boost-format
 msgid "To update installed products use '%s'."
 msgstr "要更新已安装的产品请使用 '%s'。"
 
-#: src/Zypper.cc:4684
+#: src/Zypper.cc:4686
 #, 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'。"
+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'。"
 
-#: src/Zypper.cc:4702
-msgid ""
-"Cannot use multiple types when specific packages are given as arguments."
+#: src/Zypper.cc:4704
+msgid "Cannot use multiple types when specific packages are given as arguments."
 msgstr "当指定软件包作为参数给出时不能使用多种类型。"
 
-#: src/Zypper.cc:4797
+#: src/Zypper.cc:4799
 msgid "Root privileges are required for performing a distribution upgrade."
 msgstr "执行发行版升级需要有 root 特权。"
 
-#: src/Zypper.cc:4818
+#: src/Zypper.cc:4820
 #, 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' 获知更多关于此命令的信息。"
+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' 获知更多关于此命令的信息。"
 
-#: src/Zypper.cc:4848 src/utils/messages.cc:40 src/utils/messages.cc:50
+#: src/Zypper.cc:4850 src/utils/messages.cc:40 src/utils/messages.cc:50
 #: src/utils/messages.cc:68
 msgid "Usage"
 msgstr "用法"
 
-#: src/Zypper.cc:4903 src/Zypper.cc:4949
+#: src/Zypper.cc:4905 src/Zypper.cc:4951
 msgid "Root privileges are required for adding of package locks."
 msgstr "添加软件包锁定需要有 root 特权。"
 
-#: src/Zypper.cc:5064
+#: src/Zypper.cc:5039
 #, c-format, boost-format
+msgid "Removed %lu lock."
+msgid_plural "Removed %lu locks."
+msgstr[0] "已移除 %lu 锁定。"
+
+#: src/Zypper.cc:5066
+#, c-format, boost-format
 msgid "Distribution Label: %s"
 msgstr "发行版标签: %s"
 
-#: src/Zypper.cc:5066
+#: src/Zypper.cc:5068
 #, c-format, boost-format
 msgid "Short Label: %s"
 msgstr "短标签：%s"
 
-#: src/Zypper.cc:5112
+#: src/Zypper.cc:5114
 #, c-format, boost-format
 msgid "%s matches %s"
 msgstr "%s 匹配 %s"
 
-#: src/Zypper.cc:5114
+#: src/Zypper.cc:5116
 #, c-format, boost-format
 msgid "%s is newer than %s"
 msgstr "%s 较 %s 新"
 
-#: src/Zypper.cc:5116
+#: src/Zypper.cc:5118
 #, c-format, boost-format
 msgid "%s is older than %s"
 msgstr "%s 较 %s 旧"
 
-#: src/Zypper.cc:5200 src/source-download.cc:217
+#: src/Zypper.cc:5202 src/source-download.cc:217
 #, c-format, boost-format
 msgid "Insufficient privileges to use download directory '%s'."
 msgstr "权限不足以使用下载文件夹 '%s'。"
 
-#: src/Zypper.cc:5258
+#: src/Zypper.cc:5260
 msgid "This command only makes sense in the zypper shell."
 msgstr "此命令只有在 zypper 壳层中才有意义。"
 
-#: src/Zypper.cc:5270
+#: src/Zypper.cc:5272
 msgid "You already are running zypper's shell."
 msgstr "您已在运行 zypper 的壳层了。"
 
-#: src/Zypper.cc:5287
+#: src/Zypper.cc:5289
 msgid "Description"
 msgstr "描述"
 
-#: src/Zypper.cc:5356
+#: src/Zypper.cc:5358
 msgid "Resolvable Type"
 msgstr "可解析项类型"
 
@@ -4254,6 +4682,18 @@
 msgid " Solution %d: "
 msgstr "解决方案 %d："
 
+#: src/solve-commit.cc:79
+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:86
+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.
@@ -4281,6 +4721,12 @@
 msgid "Applying solution %s"
 msgstr "正在应用解决方案 %s"
 
+#: src/solve-commit.cc:163
+#, 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:167
 msgid "Specified capability not found"
@@ -4329,12 +4775,8 @@
 
 #: 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' 手动检查。"
+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
@@ -4347,13 +4789,8 @@
 
 #: src/solve-commit.cc:473
 #, 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' 列出这些程序。"
+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' 列出这些程序。"
 
 #: src/solve-commit.cc:484
 msgid "Update notifications were received from the following packages:"
@@ -4381,9 +4818,7 @@
 msgstr "正在解决软件包依赖关系..."
 
 #: 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:"
+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:640
@@ -4406,8 +4841,7 @@
 
 #. translators: help text for 'y' option in the 'Continue?' prompt
 #: src/solve-commit.cc:671
-msgid ""
-"Yes, accept the summary and proceed with installation/removal of packages."
+msgid "Yes, accept the summary and proceed with installation/removal of packages."
 msgstr "是，接受摘要并继续安装/移除软件包。"
 
 #. translators: help text for 'n' option in the 'Continue?' prompt
@@ -4417,9 +4851,7 @@
 
 #. translators: help text for 'p' option in the 'Continue?' prompt
 #: src/solve-commit.cc:675
-msgid ""
-"Restart solver in no-force-resolution mode in order to show dependency "
-"problems."
+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
@@ -4434,8 +4866,7 @@
 
 #. translators: help text for 'r' option in the 'Continue?' prompt
 #: src/solve-commit.cc:681
-msgid ""
-"Toggle display of repositories from which the packages will be installed."
+msgid "Toggle display of repositories from which the packages will be installed."
 msgstr "切换显示待安装软件包所属软件源。"
 
 #. translators: help text for 'm' option in the 'Continue?' prompt
@@ -4461,21 +4892,20 @@
 msgid "(dry run)"
 msgstr "(演习)"
 
-#: src/solve-commit.cc:826 src/solve-commit.cc:869
+#: src/solve-commit.cc:825 src/solve-commit.cc:868
 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:865
+#: src/solve-commit.cc:864
 #, c-format, boost-format
 msgid "Repository '%s' is out of date. Running '%s' might help."
 msgstr "软件源 '%s' 已过时。运行 '%s' 可能有帮助。"
 
-#: src/solve-commit.cc:878
+#: src/solve-commit.cc:877
 msgid ""
-"The package integrity check failed. This may be a problem with the "
-"repository or media. Try one of the following:\n"
+"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
 "\n"
 "- just retry previous command\n"
 "- refresh the repositories using 'zypper refresh'\n"
@@ -4489,38 +4919,32 @@
 "－ 使用其它安装介质 (若当前介质已损坏)\n"
 "－ 使用其它软件源"
 
-#: src/solve-commit.cc:892
+#: src/solve-commit.cc:891
 msgid "Problem occured during or after installation or removal of packages:"
 msgstr "安装/移除以下软件包期间或之后发生问题："
 
-#: src/solve-commit.cc:900
+#: src/solve-commit.cc:899
 msgid "Installation has completed with error."
 msgstr "安装已完成但有错误。"
 
-#: src/solve-commit.cc:902
+#: src/solve-commit.cc:901
 #, 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."
+#: src/solve-commit.cc:916
+msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible."
 msgstr "已安装的某个补丁需要重启计算机。请尽快重启。"
 
-#: 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."
-msgstr ""
-"已安装的某个补丁影响到了软件包管理器自身。请再次运行此命令来安装全部其它所需"
-"补丁。"
+#: src/solve-commit.cc:925
+msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches."
+msgstr "已安装的某个补丁影响到了软件包管理器自身。请再次运行此命令来安装全部其它所需补丁。"
 
-#: src/solve-commit.cc:947
+#: src/solve-commit.cc:946
 msgid "Dependencies of all installed packages are satisfied."
 msgstr "已满足全部已安装软件包的依赖关系。"
 
-#: src/solve-commit.cc:949 src/download.cc:129
+#: src/solve-commit.cc:948 src/download.cc:129
 msgid "Nothing to do."
 msgstr "无事可做。"
 
@@ -4569,18 +4993,12 @@
 
 #: src/ps.cc:168
 #, c-format, boost-format
-msgid ""
-"See '%s' for information about the meaning of values in the above table."
+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) 函数检测的文"
-"件。结果可能不完整。"
+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
@@ -4766,9 +5184,7 @@
 
 #: src/PackageArgs.cc:232
 #, c-format, boost-format
-msgid ""
-"Different package type specified in '%s' option and '%s' argument. Will use "
-"the latter."
+msgid "Different package type specified in '%s' option and '%s' argument. Will use the latter."
 msgstr "'%s' 选项和 '%s' 参数分别指定了不同的软件包类型。将使用后者。"
 
 #: src/PackageArgs.cc:249
@@ -4795,9 +5211,7 @@
 #. is " (package-type)" if other than "package" (patch/product/pattern)
 #: src/misc.cc:181
 #, c-format, boost-format
-msgid ""
-"In order to install '%s'%s, you must agree to terms of the following license "
-"agreement:"
+msgid "In order to install '%s'%s, you must agree to terms of the following license agreement:"
 msgstr "要安装 '%s'%s，您必须同意以下许可协议条款："
 
 #. lincense prompt
@@ -4813,9 +5227,7 @@
 #. it is a command line option
 #: src/misc.cc:210
 #, c-format, boost-format
-msgid ""
-"Please restart the operation in interactive mode and confirm your agreement "
-"with required licenses, or use the %s option."
+msgid "Please restart the operation in interactive mode and confirm your agreement with required licenses, or use the %s option."
 msgstr "请以交互模式重启操作并确认您同意所需许可，或使用 %s 选项。"
 
 #. translators: e.g. "... with flash package license."
@@ -4883,50 +5295,61 @@
 msgstr "安装源代码包 %s-%s 出现问题："
 
 #. translators: locks table value
-#: src/locks.cc:24 src/locks.cc:126
+#: src/locks.cc:24 src/locks.cc:128
 msgid "(any)"
 msgstr "(任意)"
 
 #. translators: locks table value
-#: src/locks.cc:26 src/locks.cc:123
+#: src/locks.cc:26 src/locks.cc:125
 msgid "(multiple)"
 msgstr "(多个)"
 
 #. translators: property name; short; used like "Name: value"
-#: src/locks.cc:70
+#: src/locks.cc:72
 msgid "Keep installed"
 msgstr "保持安装"
 
 #. translators: property name; short; used like "Name: value"
-#: src/locks.cc:78
+#: src/locks.cc:80
 msgid "Do not install"
 msgstr "不安装"
 
-#: src/locks.cc:104
+#: src/locks.cc:106
 msgid "Matches"
 msgstr "匹配"
 
-#: src/locks.cc:157
+#: src/locks.cc:159
 msgid "There are no package locks defined."
 msgstr "未定义软件包锁定。"
 
-#: src/locks.cc:164
+#: src/locks.cc:166
 msgid "Error reading the locks file:"
 msgstr "读取锁定文件出错："
 
-#: src/locks.cc:231
+#: src/locks.cc:226
+msgid "Specified lock has been successfully added."
+msgid_plural "Specified locks have been successfully added."
+msgstr[0] "已成功添加指定锁定。"
+
+#: src/locks.cc:233
 msgid "Problem adding the package lock:"
 msgstr "添加软件包锁定出现问题："
 
-#: src/locks.cc:255
+#: src/locks.cc:257
 msgid "Specified lock has been successfully removed."
 msgstr "已成功移除指定锁定。"
 
-#: src/locks.cc:300
+#: src/locks.cc:302
 msgid "No lock has been removed."
 msgstr "未移除任何锁定。"
 
-#: src/locks.cc:311
+#: src/locks.cc:306
+#, c-format
+msgid "%zu lock has been successfully removed."
+msgid_plural "%zu locks have been successfully removed."
+msgstr[0] "已成功移除 %zu 锁定。"
+
+#: src/locks.cc:313
 msgid "Problem removing the package lock:"
 msgstr "移除软件包锁定出现问题："
 
@@ -4956,9 +5379,7 @@
 #. unless you translate the actual page :)
 #: src/utils/messages.cc:25
 msgid "See http://en.opensuse.org/Zypper/Troubleshooting for instructions."
-msgstr ""
-"故障回报指南请参考 https://zh.opensuse.org/SDB:Zypper_%E7%96%91%E9%9A%BE"
-"%E8%A7%A3%E7%AD%94。"
+msgstr "故障回报指南请参考 https://zh.opensuse.org/SDB:Zypper_%E7%96%91%E9%9A%BE%E8%A7%A3%E7%AD%94。"
 
 #: src/utils/messages.cc:41
 msgid "Too many arguments."
@@ -4971,13 +5392,8 @@
 
 #: src/utils/messages.cc:78
 #, c-format, boost-format
-msgid ""
-"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'。"
+msgid "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'。"
 
 #: src/utils/pager.cc:36
 #, c-format, boost-format
@@ -5025,9 +5441,7 @@
 #. translators: speaking of two mutually contradicting command line options
 #: src/utils/getopt.cc:124
 #, c-format, boost-format
-msgid ""
-"%s used together with %s, which contradict each other. This property will be "
-"left unchanged."
+msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
 msgstr "%s 和 %s 同时使用会相互抵触。该属性将保持不变。"
 
 #. translators: Press '?' to see all options embedded in this prompt: "Continue? [y/n/? shows all options] (y):"
@@ -5058,6 +5472,12 @@
 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 "正在重试..."
@@ -5080,6 +5500,42 @@
 "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 "未知"
@@ -5157,401 +5613,12 @@
 #~ msgid "Restart Required: "
 #~ 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 个新软件包："
-
-#~ 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 个新补丁："
-
-#~ 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 个新软件集："
-
-#~ 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 个新产品："
-
-#~ 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 个源代码包："
-
-#~ msgid "The following application is going to be installed:"
-#~ msgid_plural "The following %d applications are going to be installed:"
-#~ msgstr[0] "将安装以下 %d 个应用程序："
-
-#~ msgid "The following package is going to be REMOVED:"
-#~ msgid_plural "The following %d packages are going to be REMOVED:"
-#~ msgstr[0] "将移除以下 %d 个软件包："
-
-#~ msgid "The following patch is going to be REMOVED:"
-#~ msgid_plural "The following %d patches are going to be REMOVED:"
-#~ msgstr[0] "将移除以下 %d 个补丁："
-
-#~ msgid "The following pattern is going to be REMOVED:"
-#~ msgid_plural "The following %d patterns are going to be REMOVED:"
-#~ msgstr[0] "将移除以下 %d 个软件集："
-
-#~ 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 "系列"
 
@@ -5568,74 +5635,15 @@
 #~ "\n"
 #~ "此命令无额外选项。\n"
 
-#~ msgid ""
-#~ "Could not determine the type of the repository. Check if the specified "
-#~ "URI points to a valid repository."
+#~ 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 检查"
 
@@ -5678,8 +5686,7 @@
 #~ msgid "Repository: %s"
 #~ msgstr "软件源：%s"
 
-#~ msgid ""
-#~ "Uninstallation of a pattern is currently not defined and implemented."
+#~ msgid "Uninstallation of a pattern is currently not defined and implemented."
 #~ msgstr "目前未定义也未实现软件集的卸载。"
 
 #~ msgid "None"
@@ -5770,9 +5777,7 @@
 #~ "\n"
 #~ "此命令无附加选项。\n"
 
-#~ msgid ""
-#~ "Specifying architecture when selecting packages by name is not "
-#~ "implemented."
+#~ msgid "Specifying architecture when selecting packages by name is not implemented."
 #~ msgstr "不能实现按名称选择软件包时指定架构。"
 
 #~ msgid "Cannot parse capability '%s'."
@@ -5789,11 +5794,8 @@
 #~ msgstr "-s, --service             同时显示母服务的别名。\n"
 
 #, fuzzy
-#~| msgid ""
-#~| "    --from <alias|#|URI>        Select packages only from specified "
-#~| "repository.\n"
-#~ msgid ""
-#~ "    --from <alias|#|URI>    Restrict upgrade to specified repository.\n"
+#~| msgid "    --from <alias|#|URI>        Select packages only from specified repository.\n"
+#~ msgid "    --from <alias|#|URI>    Restrict upgrade to specified repository.\n"
 #~ msgstr "    --from <alias|#|URI>        从指定的安装源中选择软件包。\n"
 
 #~ msgid ""
@@ -5810,8 +5812,7 @@
 #~ "List all available needed patches.\n"
 #~ "\n"
 #~ "  Command options:\n"
-#~ "-r, --repo <alias|#|URI>        List only patches from the specified "
-#~ "repository.\n"
+#~ "-r, --repo <alias|#|URI>        List only patches from the specified repository.\n"
 #~ msgstr ""
 #~ "patch-check (pchk) [options]\n"
 #~ "\n"

    

[opensuse-translation-commit] r95508 - trunk/lcn/zh_CN/po

minton＠svn2.opensuse.org