[opensuse-translation-commit] r96727 - trunk/yast/zh_CN/po

2 Sep 2016

Author: minton
Date: 2016-09-02 23:45:30 +0200 (Fri, 02 Sep 2016)
New Revision: 96727

Modified:
   trunk/yast/zh_CN/po/add-on.zh_CN.po
   trunk/yast/zh_CN/po/auth-client.zh_CN.po
   trunk/yast/zh_CN/po/auth-server.zh_CN.po
   trunk/yast/zh_CN/po/autoinst.zh_CN.po
   trunk/yast/zh_CN/po/base.zh_CN.po
   trunk/yast/zh_CN/po/bootloader.zh_CN.po
   trunk/yast/zh_CN/po/ca-management.zh_CN.po
   trunk/yast/zh_CN/po/cio.zh_CN.po
   trunk/yast/zh_CN/po/cluster.zh_CN.po
   trunk/yast/zh_CN/po/control.zh_CN.po
   trunk/yast/zh_CN/po/country.zh_CN.po
   trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
   trunk/yast/zh_CN/po/dns-server.zh_CN.po
   trunk/yast/zh_CN/po/docker.zh_CN.po
   trunk/yast/zh_CN/po/drbd.zh_CN.po
   trunk/yast/zh_CN/po/fcoe-client.zh_CN.po
   trunk/yast/zh_CN/po/firewall.zh_CN.po
   trunk/yast/zh_CN/po/firstboot.zh_CN.po
   trunk/yast/zh_CN/po/fonts.zh_CN.po
   trunk/yast/zh_CN/po/geo-cluster.zh_CN.po
   trunk/yast/zh_CN/po/installation.zh_CN.po
   trunk/yast/zh_CN/po/iscsi-client.zh_CN.po
   trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po
   trunk/yast/zh_CN/po/kdump.zh_CN.po
   trunk/yast/zh_CN/po/mail.zh_CN.po
   trunk/yast/zh_CN/po/network.zh_CN.po
   trunk/yast/zh_CN/po/nfs.zh_CN.po
   trunk/yast/zh_CN/po/nfs_server.zh_CN.po
   trunk/yast/zh_CN/po/nis.zh_CN.po
   trunk/yast/zh_CN/po/ntp-client.zh_CN.po
   trunk/yast/zh_CN/po/packager.zh_CN.po
   trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po
   trunk/yast/zh_CN/po/printer.zh_CN.po
   trunk/yast/zh_CN/po/rdp.zh_CN.po
   trunk/yast/zh_CN/po/rear.zh_CN.po
   trunk/yast/zh_CN/po/registration.zh_CN.po
   trunk/yast/zh_CN/po/reipl.zh_CN.po
   trunk/yast/zh_CN/po/samba-client.zh_CN.po
   trunk/yast/zh_CN/po/services-manager.zh_CN.po
   trunk/yast/zh_CN/po/snapper.zh_CN.po
   trunk/yast/zh_CN/po/storage.zh_CN.po
   trunk/yast/zh_CN/po/update.zh_CN.po
   trunk/yast/zh_CN/po/users.zh_CN.po
   trunk/yast/zh_CN/po/vm.zh_CN.po
Log:
zh_CN merged

Modified: trunk/yast/zh_CN/po/add-on.zh_CN.po
===================================================================

--- trunk/yast/zh_CN/po/add-on.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/add-on.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: add-on\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2013-02-02 22:16+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -85,15 +85,16 @@
 msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
 msgstr "<li> 媒体： %1，路径： %2，产品： %3</li>\n"
 
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "请让附加产品 \"%1\" 可通过 \"%2\" 使用。"
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
 msgid "Failed to add add-on product."
 msgstr "未能添加附加产品。"
 
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "请让附加产品 \"%1\" 可通过 \"%2\" 使用。"
-
 #. placeholder for unknown path
 #. summary item, %1 is product name, %2 media URL, %3 directory on media
 #. placeholder for unknown directory

Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/auth-client.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/auth-client.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-06-06 18:16+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -36,8 +36,7 @@
 msgstr "主力密钥分发服务器主机名 (可选)"
 
 #: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
-msgid ""
-"Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
 msgstr "密钥分发中心 (若启用通过 DNS 自动发现则为可选)"
 
 #: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
@@ -68,9 +67,7 @@
 
 #. Add an auth_to_local_names
 #: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
-msgid ""
-"Please type in the principal name and user name in the format of "
-"\"princ_name = user_name\":"
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
 msgstr "请以 \"主体名 = 用户名\" 格式输入主体名和用户名："
 
 #. Save realm settings
@@ -139,48 +136,39 @@
 #: src/lib/authui/ldapkrb/main_dialog.rb:76
 msgid ""
 "This computer is currently using SSSD to authenticate users.\n"
-"Before you may use legacy LDAP authentication (pam_ldap), please disable "
-"SSSD from \"User Logon Management\"."
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在使用 SSSD 认证用户。\n"
 "在您使用传统的 LDAP 认证 (pam_ldap) 前，请在“用户登入管理”中禁用 SSSD。"
 
 #: src/lib/authui/ldapkrb/main_dialog.rb:84
 msgid ""
-"This computer is currently reading user database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP user database (nss_ldap), please disable SSSD user "
-"database from \"User Logon Management\"."
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在从 SSSD 身份提供方读取用户数据库。\n"
 "在您使用 LDAP 用户数据库 (nss_ldap) 前，请在“用户登入管理”中禁用 SSSD 用户数据库。"
 
 #: src/lib/authui/ldapkrb/main_dialog.rb:92
 msgid ""
-"This computer is currently reading group database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP group database (nss_ldap), please disable SSSD group "
-"database from \"User Logon Management\"."
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在从 SSSD 身份提供方读取组数据库。\n"
 "在您使用 LDAP 组数据库 (nss_ldap) 前，请在“用户登入管理”中禁用 SSSD 组数据库。"
 
 #: src/lib/authui/ldapkrb/main_dialog.rb:100
 msgid ""
-"This computer is currently reading sudoers database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD "
-"sudo database from \"User Logon Management\"."
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在从 SSSD 身份提供方读取 sudoers 数据库。\n"
 "在您使用 LDAP sudoers 数据库 (nss_ldap) 前，请在“用户登入管理”中禁用 SSSD sudo 数据库。"
 
 #: src/lib/authui/ldapkrb/main_dialog.rb:108
 msgid ""
-"This computer is currently reading automount database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP automount database (nss_ldap), please disable SSSD "
-"automount database from \"User Logon Management\"."
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在从 SSSD 身份提供方读取自动挂载点数据库。\n"
 "在您使用 LDAP 自动挂载点数据库 (nss_ldap) 前，请在“用户登入管理”中禁用 SSSD 自动挂载点数据库。"
@@ -225,10 +213,8 @@
 
 #: src/lib/authui/ldapkrb/main_dialog.rb:163
 msgid ""
-"The name service cache is should only used with legacy LDAP identity "
-"provider,\n"
-"but your system currently has authentication domain enabled, which is not "
-"compatible with the cache.\n"
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
 "\n"
 "Do you still wish to enable the cache?"
 msgstr ""
@@ -241,8 +227,7 @@
 #: src/lib/authui/ldapkrb/main_dialog.rb:176
 msgid ""
 "This computer is currently using SSSD to authenticate users.\n"
-"Before you may use Kerberos authentication (pam_krb5), please disable SSSD "
-"from \"User Logon Management\"."
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
 msgstr ""
 "此计算机当前正在使用 SSSD 认证用户。\n"
 "在您使用 Kerberos 认证 (pam_krb5) 前，请在“用户登入管理”中禁用 SSSD。"
@@ -614,10 +599,8 @@
 #. Enable/disable SSSD daemon
 #: src/lib/authui/sssd/main_dialog.rb:252
 msgid ""
-"This computer is currently using legacy LDAP or Kerberos method to "
-"authenticate users.\n"
-"Before you may use SSSD to authenticate users, please disable LDAP and "
-"Kerberos authentication from \"LDAP and Kerberos Client\"."
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
 msgstr ""
 "此计算机当前正在使用传统的 LDAP 或 Kerberos 方式认证用户。\n"
 "在您使用 SSSD 认证用户前，请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 和 Kerberos 认证。"
@@ -625,10 +608,8 @@
 #. Enable/disable NSS password database
 #: src/lib/authui/sssd/main_dialog.rb:284
 msgid ""
-"This computer is currently reading user database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD user database, please disable LDAP user database "
-"from \"LDAP and Kerberos Client\"."
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
 msgstr ""
 "此计算机当前正在从 LDAP 身份提供方读取用户数据库。\n"
 "在您使用 SSSD 用户数据库前，请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 用户数据库。"
@@ -636,10 +617,8 @@
 #. Enable/disable NSS group database
 #: src/lib/authui/sssd/main_dialog.rb:302
 msgid ""
-"This computer is currently reading group database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD group database, please disable LDAP group database "
-"from \"LDAP and Kerberos Client\"."
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
 msgstr ""
 "此计算机当前正在从 LDAP 身份提供方读取组数据库。\n"
 "在您使用 SSSD 组数据库前，请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 组数据库。"
@@ -647,10 +626,8 @@
 #. Enable/disable NSS sudoers database
 #: src/lib/authui/sssd/main_dialog.rb:320
 msgid ""
-"This computer is currently reading sudoers database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD sudoers database, please disable LDAP sudoers "
-"database from \"LDAP and Kerberos Client\"."
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
 msgstr ""
 "此计算机当前正在从 LDAP 身份提供方读取 sudoers 数据库。\n"
 "在您使用 SSSD sudoers 数据库前，请在“LDAP 和 Kerberos 客户端”中禁用 LDAP sudoers 数据库。"
@@ -658,8 +635,7 @@
 #: src/lib/authui/sssd/main_dialog.rb:328
 msgid ""
 "Sudo data source has been globally enabled.\n"
-"Please remember to also customise \"sudo_provider\" parameter in Extended "
-"Options of each individual domain that provides sudo data."
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
 msgstr ""
 "Sudo 数据来源已全局启用。\n"
 "请记得在每个提供了 sudo 数据的独立域的扩展选项中自定义 \"sudo_provider\" 参数。"
@@ -667,10 +643,8 @@
 #. Enable/disable NSS automount database
 #: src/lib/authui/sssd/main_dialog.rb:342
 msgid ""
-"This computer is currently reading automount database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD automount database, please disable LDAP automount "
-"database from \"LDAP and Kerberos Client\"."
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
 msgstr ""
 "此计算机当前正在从 LDAP 身份提供方读取自动挂载点数据库。\n"
 "在您使用 SSSD 自动挂载点数据库前，请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 自动挂载点数据库。"
@@ -678,8 +652,7 @@
 #: src/lib/authui/sssd/main_dialog.rb:350
 msgid ""
 "Automount data source has been globally enabled.\n"
-"Please remember to also customise \"autofs_provider\" parameter in Extended "
-"Options of each individual domain that provides automount data."
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
 msgstr ""
 "自动挂载点数据来源已全局启用。\n"
 "请记得在每个提供了自动挂载点数据的独立域的扩展选项中自定义 \"autofs_provider\" 参数。"
@@ -688,10 +661,8 @@
 #: src/lib/authui/sssd/main_dialog.rb:374
 msgid ""
 "MS-PAC data source has been globally enabled.\n"
-"This optional feature depends on the capabilities of your Microsoft Active "
-"Directory domain.\n"
-"SSSD may fail to start if Active Directory domain lacks the support, in "
-"which case please turn off this feature."
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
 msgstr ""
 "MS-PAC 数据已全局启用。\n"
 "此可选功能取决于您的 Miscrosoft 活动目录域的能力。\n"
@@ -709,8 +680,7 @@
 
 #: src/lib/authui/sssd/main_dialog.rb:415
 msgid ""
-"The parameter is important. Removal of the parameter may cause configuration "
-"failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
 "Please consult SSSD manual page before moving on.\n"
 "Do you still wish to remove the parameter?"
 msgstr ""
@@ -725,8 +695,7 @@
 
 #: src/lib/authui/sssd/main_dialog.rb:435
 msgid ""
-"You have not configured any authentication domain, yet you chose to enable "
-"domain authentication.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
 "SSSD will fail to start, and only local authentication will be available.\n"
 "Do you still wish to proceed?"
 msgstr ""
@@ -742,9 +711,7 @@
 #. The frame is shown only if AD server can be discovered or is explicitly specified
 #. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
 #: src/lib/authui/sssd/manage_ad_dialog.rb:68
-msgid ""
-"Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this "
-"computer:"
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
 msgstr "请输入活动目录用户信息 (例 Administrator) 来登记或重登记此计算机："
 
 #: src/lib/authui/sssd/manage_ad_dialog.rb:69
@@ -778,10 +745,8 @@
 
 #: src/lib/authui/sssd/manage_ad_dialog.rb:83
 msgid ""
-"The name resolution service on this computer does not satisfy AD enrollment "
-"requirements.\n"
-"Please configure your network environment to use AD server as the name "
-"resolver."
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
 msgstr ""
 "此计算机上的名称解析服务不满足活动目录登记要求。\n"
 "请配置您的网络使用活动目录服务器作为名称解析服务器。"
@@ -813,9 +778,7 @@
 
 #. join_ad will configure and apply Kerberos and then join AD
 #: src/lib/authui/sssd/manage_ad_dialog.rb:144
-msgid ""
-"AD enrollment details have been saved for AutoYast. Please keep in mind that "
-"AD user password is saved in plain text."
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
 msgstr "已为 AutoYast 保存活动目录登记细节。请留神活动目录用户密码是明文保存的。"
 
 #: src/lib/authui/sssd/manage_ad_dialog.rb:150
@@ -879,9 +842,7 @@
 msgstr "域名 (诸如 example.com)："
 
 #: src/lib/authui/sssd/new_section_dialog.rb:78
-msgid ""
-"Which service provides identity data, such as user names and group "
-"memberships?"
+msgid "Which service provides identity data, such as user names and group memberships?"
 msgstr "提供身份数据诸如用户名和组成员资格的服务"
 
 #: src/lib/authui/sssd/new_section_dialog.rb:83
@@ -898,9 +859,7 @@
 msgstr "请输入域名。"
 
 #: src/lib/authui/sssd/new_section_dialog.rb:109
-msgid ""
-"The domain name collides with a reserved keyword. Please choose a different "
-"name."
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
 msgstr "该域名与保留关键字相抵触。请选择一个不同的名称。"
 
 #: src/lib/authui/sssd/new_section_dialog.rb:112
@@ -914,9 +873,7 @@
 msgstr "配置文件语法版本 (1 或 2)"
 
 #: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
-msgid ""
-"Number of times services should attempt to reconnect in the event of a Data "
-"Provider crash or restart before they give up"
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
 msgstr "当数据提供者崩溃或重启时在放弃前服务应尝试重连的次数"
 
 #: src/lib/authui/sssd/params.rb:119
@@ -924,21 +881,15 @@
 msgstr "正则表达式会将用户名和域名解析到部件中"
 
 #: src/lib/authui/sssd/params.rb:123
-msgid ""
-"The default printf(3)-compatible format that describes translation of a name/"
-"domain tuple into FQDN"
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
 msgstr "默认的 printf(3)-compatible 格式描述了如何转义名称/域数组为完全限定名称。"
 
 #: src/lib/authui/sssd/params.rb:127
-msgid ""
-"Whether or not to use inotify mechanism to monitor resolv.conf to update "
-"internal DNS resolver"
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
 msgstr "是否使用 inotify 机制监视 resolv.conf 来更新内部 DNS 解析器"
 
 #: src/lib/authui/sssd/params.rb:131
-msgid ""
-"Directory on the filesystem where SSSD should store Kerberos replay cache "
-"files"
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
 msgstr "文件系统上 SSSD 应存储 Kerberos 回放缓存文件的文件夹"
 
 #: src/lib/authui/sssd/params.rb:135
@@ -957,9 +908,7 @@
 #: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
 #: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
 #: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
-msgid ""
-"Level of details for logging. Can be numeric (0-9) or a big mask such as "
-"0x0010 (lowest level) or 0xFFF (highest level)"
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
 msgstr "日志详细级别。可为数字 (0-9) 或者一个大掩码诸如 0x0010 (最低级) 或 0xFFF (最高级)"
 
 #: src/lib/authui/sssd/params.rb:151
@@ -975,46 +924,28 @@
 msgstr "此服务心跳间超时秒数"
 
 #: src/lib/authui/sssd/params.rb:171
-msgid ""
-"Maximum number of file descriptors that may be opened at a time by SSSD "
-"service process"
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
 msgstr "SSSD 服务进程同一时间可打开的最大文件描述符数目"
 
 #: src/lib/authui/sssd/params.rb:176
-msgid ""
-"Number of seconds a client of SSSD process can hold onto a file descriptor "
-"without any communication"
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
 msgstr "SSSD 进程客户端可持有文件描述符而不与之通信的秒数"
 
 #: src/lib/authui/sssd/params.rb:181
-msgid ""
-"The service will receive SIGTERM after this number of seconds of consecutive "
-"ping check failure"
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
 msgstr "服务收到 SIGTERM 前连续 ping 检查失败的秒数"
 
 #: src/lib/authui/sssd/params.rb:193
-msgid ""
-"How many seconds should cache nss_sss enumerations (requests for info about "
-"all users)?"
+msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
 msgstr "缓存 nss_css 枚举 (对全部用户信息的请求) 的秒数"
 
 #: src/lib/authui/sssd/params.rb:198
-msgid ""
-"The entry cache can be set to automatically update entries in the background "
-"if they are requested beyond a percentage of the entry_cache_timeout value "
-"for the domain."
-msgstr ""
-"若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比，则可将条目缓存设"
-"为在后台自动更新条目。"
+msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain."
+msgstr "若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比，则可将条目缓存设为在后台自动更新条目。"
 
 #: src/lib/authui/sssd/params.rb:203
-msgid ""
-"Specifies for how many seconds nss_sss should cache negative cache hits "
-"(that is, queries for invalid database entries, like nonexistent ones) "
-"before asking the back end again."
-msgstr ""
-"指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即，针对无效数据库条目如不存"
-"在条目的查询) 的秒数。"
+msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again."
+msgstr "指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即，针对无效数据库条目如不存在条目的查询) 的秒数。"
 
 #: src/lib/authui/sssd/params.rb:209
 msgid "Exclude certain users from being fetched by SSS backend"
@@ -1025,20 +956,15 @@
 msgstr "排除特定组不被 SSS 后端获取"
 
 #: src/lib/authui/sssd/params.rb:220
-msgid ""
-"If you want filtered user to still be group members set this option to false."
+msgid "If you want filtered user to still be group members set this option to false."
 msgstr "若您想使被过滤的用户仍留作组成员则请设置此选项为假。"
 
-#: src/lib/authui/sssd/params.rb:224
-msgid ""
-"Override the user's home directory. You can either provide an absolute value "
-"or a template."
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
+msgid "Override the user's home directory. You can either provide an absolute value or a template."
 msgstr "覆盖用户主文件夹。您可以提供一个绝对值或一个模板。"
 
-#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1209
-msgid ""
-"Set a default template for a user's home directory if one is not specified "
-"explicitly by the domain's data provider."
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
+msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
 msgstr "设置当某域的数据提供者未显式指定用户主文件夹时所用的默认模板。"
 
 #: src/lib/authui/sssd/params.rb:232
@@ -1054,89 +980,61 @@
 msgstr "使用 shell_fallback 替换这些壳层中的任何一种"
 
 #: src/lib/authui/sssd/params.rb:245
-msgid ""
-"The default shell to use if an allowed shell is not installed on the machine."
+msgid "The default shell to use if an allowed shell is not installed on the machine."
 msgstr "机器上未安装获准使用的壳层时所使用的默认壳层。"
 
-#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1213
-msgid ""
-"The default shell to use if the provider does not return one during lookup."
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
+msgid "The default shell to use if the provider does not return one during lookup."
 msgstr "查询时提供者未返回值时所使用的默认壳层。"
 
 #: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
-msgid ""
-"Specifies time in seconds for which the list of subdomains will be "
-"considered valid."
+msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
 msgstr "指定了子域列表被认定有效的秒数 。"
 
 #: src/lib/authui/sssd/params.rb:259
-msgid ""
-"Specifies time in seconds for which records in the in-memory cache will be "
-"valid."
+msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
 msgstr "指定了内存缓存中记录的有效秒数。"
 
 #: src/lib/authui/sssd/params.rb:271
-msgid ""
-"If the authentication provider is offline, how long we should allow cached "
-"logins (in days since the last successful online login)."
+msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
 msgstr "认证提供者离线时应允许缓存登入的天数 (自上次成功在线登入起的天数)"
 
 #: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/params.rb:281
-msgid ""
-"The time in minutes which has to pass after offline_failed_login_attempts "
-"has been reached before a new login attempt is possible."
-msgstr ""
-"触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时"
-"间。"
+msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible."
+msgstr "触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时间。"
 
 #: src/lib/authui/sssd/params.rb:286
-msgid ""
-"Controls what kind of messages are shown to the user during authentication."
+msgid "Controls what kind of messages are shown to the user during authentication."
 msgstr "控制在认证期间展示给用户的消息类型。"
 
 #: src/lib/authui/sssd/params.rb:291
-msgid ""
-"For any PAM request while SSSD is online, the SSSD will attempt to "
-"immediately update the cached identity information for the user in order to "
-"ensure that authentication takes place with the latest information."
-msgstr ""
-"SSSD 在线时对于任何 PAM 请求，SSSD 均会尝试立即更新缓存的该用户身份信息以确保"
-"认证使用了最新信息。"
+msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information."
+msgstr "SSSD 在线时对于任何 PAM 请求，SSSD 均会尝试立即更新缓存的该用户身份信息以确保认证使用了最新信息。"
 
 #. The kerberos domain section
-#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811
-#: src/lib/authui/sssd/params.rb:1096
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
 msgid "Display a warning N days before the password expires."
 msgstr "在密码过期前 N 天展示一条警告。"
 
 #: src/lib/authui/sssd/params.rb:313
-msgid ""
-"Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes "
-"that implement time-dependent sudoers entries."
+msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
 msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。"
 
 #: src/lib/authui/sssd/params.rb:325
-msgid ""
-"Specifies for how many seconds the autofs responder should cache negative "
-"hits before asking the back end again."
+msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
 msgstr "指定了再次询问后端前 autofs 回应者应缓存否定次数的秒数。"
 
 #: src/lib/authui/sssd/params.rb:337
-msgid ""
-"Whether or not to hash host names and addresses in the managed known_hosts "
-"file."
+msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
 msgstr "是否在受管 known_hosts 文件中哈希化主机名和地址。"
 
 #: src/lib/authui/sssd/params.rb:342
-msgid ""
-"How many seconds to keep a host in the managed known_hosts file after its "
-"host keys were requested."
+msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
 msgstr "已请求主机密钥后在受管 known_hosts 文件中保存主机的秒数。"
 
 #: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
-msgid ""
-"UID and GID limits for the domain. If a domain contains an entry that is "
-"outside these limits, it is ignored."
+msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
 msgstr "该域的 UID 和 GID 限制。若某域含有一个超出这些限制的项，则忽略该项。"
 
 #: src/lib/authui/sssd/params.rb:366
@@ -1144,53 +1042,35 @@
 msgstr "从后端数据库读取全部项 (会增加服务器负载)"
 
 #: src/lib/authui/sssd/params.rb:371
-msgid ""
-"If the service does not terminate after “force_timeout” seconds, the monitor "
-"will forcibly shut it down by sending a SIGKILL signal."
-msgstr ""
-"若服务在 \"force_timeout\" 秒后未终止，监控器将发送一个 SIGKILL 信号强制关闭"
-"它。"
+msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
+msgstr "若服务在 \"force_timeout\" 秒后未终止，监控器将发送一个 SIGKILL 信号强制关闭它。"
 
 #: src/lib/authui/sssd/params.rb:376
-msgid ""
-"How many seconds nss_sss should consider entries valid before asking the "
-"backend again."
+msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
 msgstr "再次询问后端前 nss_sss 应认定条目有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:381
-msgid ""
-"How many seconds nss_sss should consider user entries valid before asking "
-"the backend again."
+msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
 msgstr "再次询问后端前 nss_sss 应认定用户项有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:386
-msgid ""
-"How many seconds nss_sss should consider group entries valid before asking "
-"the backend again."
+msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
 msgstr "再次询问后端前 nss_sss 应认定组项有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:391
-msgid ""
-"How many seconds nss_sss should consider netgroup entries valid before "
-"asking the backend again."
+msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
 msgstr "再次询问后端前 nss_sss 应认定网络组项有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:396
-msgid ""
-"How many seconds nss_sss should consider service entries valid before asking "
-"the backend again."
+msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
 msgstr "再次询问后端前 nss_sss 应认定服务项有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:401
-msgid ""
-"How many seconds sudo should consider rules valid before asking the backend "
-"again."
+msgid "How many seconds sudo should consider rules valid before asking the backend again."
 msgstr "再次询问后端前 sudo 应认定规则有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:406
-msgid ""
-"How many seconds the autofs service should consider automounter maps valid "
-"before asking the backend again."
+msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
 msgstr "再次询问后端前 autofs 服务应认定自动挂载器映射有效的秒数。"
 
 #: src/lib/authui/sssd/params.rb:412
@@ -1198,9 +1078,7 @@
 msgstr "缓存机要信息以供离线使用"
 
 #: src/lib/authui/sssd/params.rb:417
-msgid ""
-"Number of days entries are left in cache after last successful login before "
-"being removed during a cleanup of the cache."
+msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
 msgstr "在自缓存清理期间移除前应在缓存中保留条目的从最后成功登入日起计的天数。"
 
 #: src/lib/authui/sssd/params.rb:424
@@ -1208,12 +1086,8 @@
 msgstr "该域所用的标识提供者。"
 
 #: src/lib/authui/sssd/params.rb:429
-msgid ""
-"Use the full name and domain (as formatted by the domain's full_name_format) "
-"as the user's login name reported to NSS."
-msgstr ""
-"使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录"
-"名。"
+msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS."
+msgstr "使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录名。"
 
 #: src/lib/authui/sssd/params.rb:436
 msgid "The authentication provider used for the domain"
@@ -1224,8 +1098,7 @@
 msgstr "该域所用的访问控制提供者。"
 
 #: src/lib/authui/sssd/params.rb:447
-msgid ""
-"The provider which should handle change password operations for the domain."
+msgid "The provider which should handle change password operations for the domain."
 msgstr "应受理该域的密码变更操作的提供者。"
 
 #: src/lib/authui/sssd/params.rb:453
@@ -1249,849 +1122,613 @@
 msgstr "用于撷取主机身份信息的提供者。"
 
 #: src/lib/authui/sssd/params.rb:482
-msgid ""
-"Regular expression for this domain that describes how to parse the string "
-"containing user name and domain into these components."
+msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
 msgstr "用于此域的正则表达式，描述了如何解析包含用户名和域的字符串到这些组件中。"
 
 #: src/lib/authui/sssd/params.rb:487
-msgid ""
-"A printf(3)-compatible format that describes how to translate a (name, "
-"domain) tuple for this domain into a fully qualified name."
-msgstr ""
-"一种 printf(3) 兼容格式，描述了如何转义此域的 (name, domain) 元组为完全限定名"
-"称。"
+msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
+msgstr "一种 printf(3) 兼容格式，描述了如何转义此域的 (name, domain) 元组为完全限定名称。"
 
 #: src/lib/authui/sssd/params.rb:493
-msgid ""
-"Provides the ability to select preferred address family to use when "
-"performing DNS lookups."
+msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
 msgstr "提供了执行 DNS 查询时选择偏好的地址族的能力。"
 
 #: src/lib/authui/sssd/params.rb:498
-msgid ""
-"Defines the amount of time (in seconds) to wait for a reply from the DNS "
-"resolver before assuming that it is unreachable."
+msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
 msgstr "定义了假设其不可达前等待 DNS 解析者回复的以秒计的时间。"
 
 #: src/lib/authui/sssd/params.rb:502
-msgid ""
-"If service discovery is used in the back end, specifies the domain part of "
-"the service discovery DNS query."
+msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
 msgstr "若后端使用了服务发现，则指定了服务发现 DNS 查询的域部分。"
 
 #: src/lib/authui/sssd/params.rb:506
 msgid "Override the primary GID value with the one specified."
 msgstr "使用指定组 ID 值覆盖主要组 ID 值。"
 
-#: src/lib/authui/sssd/params.rb:512
+#: src/lib/authui/sssd/params.rb:516
 msgid "Treat user and group names as case sensitive."
 msgstr "视用户和组名称为大小写敏感的。"
 
-#: src/lib/authui/sssd/params.rb:517
-msgid ""
-"When a user or group is looked up by name in the proxy provider, a second "
-"lookup by ID is performed to 'canonicalize' the name in case the requested "
-"name was an alias."
-msgstr ""
-"当在代理提供者上按名称查询某个用户或组时，也执行按 ID 的二次查询以 '规范化' "
-"该名称以防止所请求的名称是一个别名。"
+#: src/lib/authui/sssd/params.rb:521
+msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias."
+msgstr "当在代理提供者上按名称查询某个用户或组时，也执行按 ID 的二次查询以 '规范化' 该名称以防止所请求的名称是一个别名。"
 
-#: src/lib/authui/sssd/params.rb:522
-msgid ""
-"Use this homedir as default value for all subdomains within this domain."
+#: src/lib/authui/sssd/params.rb:526
+msgid "Use this homedir as default value for all subdomains within this domain."
 msgstr "使用此主文件夹作为此域中全部子域的默认值。"
 
 #. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/authui/sssd/params.rb:528
+#: src/lib/authui/sssd/params.rb:532
 msgid "Comma separated list of users who are allowed to log in."
 msgstr "逗号分隔的允许登入用户列表。"
 
-#: src/lib/authui/sssd/params.rb:533
-msgid ""
-"Comma separated list of groups who are allowed to log in. This applies only "
-"to groups within this SSSD domain."
+#: src/lib/authui/sssd/params.rb:537
+msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
 msgstr "逗号分隔的允许登入组列表。这仅应用于此 SSSD 域中的组。"
 
-#: src/lib/authui/sssd/params.rb:538
-msgid ""
-"Comma separated list of groups that are explicitly denied access. This "
-"applies only to groups within this SSSD domain."
+#: src/lib/authui/sssd/params.rb:542
+msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
 msgstr "逗号分隔的显式拒绝访问组列表。这仅应用于此 SSSD 域中的组。"
 
 #. The local domain section
 #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local.
-#: src/lib/authui/sssd/params.rb:547
-msgid ""
-"The tools append the login name to base_directory and use that as the home "
-"directory."
+#: src/lib/authui/sssd/params.rb:551
+msgid "The tools append the login name to base_directory and use that as the home directory."
 msgstr "此工具会追加登入名到 base_directory 并用其作为主文件夹。"
 
-#: src/lib/authui/sssd/params.rb:552
-msgid ""
-"Indicate if a home directory should be created by default for new users."
+#: src/lib/authui/sssd/params.rb:556
+msgid "Indicate if a home directory should be created by default for new users."
 msgstr "指出是否应为新用户默认创建主文件夹。"
 
-#: src/lib/authui/sssd/params.rb:557
-msgid ""
-"Indicate if a home directory should be removed by default for deleted users."
+#: src/lib/authui/sssd/params.rb:561
+msgid "Indicate if a home directory should be removed by default for deleted users."
 msgstr "指出是否应默认移除已删除用户的主文件夹。"
 
-#: src/lib/authui/sssd/params.rb:562
-msgid ""
-"Used by sss_useradd(8) to specify the default permissions on a newly created "
-"home directory."
+#: src/lib/authui/sssd/params.rb:566
+msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
 msgstr "被 sss_useradd(8) 用来指定新创建的主文件夹的默认权限。"
 
-#: src/lib/authui/sssd/params.rb:567
-msgid ""
-"The skeleton directory, which contains files and directories to be copied in "
-"the user's home directory, when the home directory is created by "
-"sss_useradd(8)"
-msgstr ""
-"骨架文件夹，其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件"
-"和文件夹。"
+#: src/lib/authui/sssd/params.rb:571
+msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)"
+msgstr "骨架文件夹，其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件和文件夹。"
 
-#: src/lib/authui/sssd/params.rb:572
+#: src/lib/authui/sssd/params.rb:576
 msgid "The mail spool directory."
 msgstr "邮件卷文件夹。"
 
-#: src/lib/authui/sssd/params.rb:576
+#: src/lib/authui/sssd/params.rb:580
 msgid "The command that is run after a user is removed."
 msgstr "移除用户后运行的命令。"
 
 #. The ldap domain section
-#: src/lib/authui/sssd/params.rb:585
+#: src/lib/authui/sssd/params.rb:589
 msgid "(Active Directory specific) Use token-groups attribute if available"
 msgstr "(活动目录特定) 若可用则使用 token 组属性"
 
-#: src/lib/authui/sssd/params.rb:591
+#: src/lib/authui/sssd/params.rb:595
 msgid "URIs (ldap://) of LDAP servers (comma separated)"
 msgstr "LDAP 服务器 URI (ldap://) (逗号分隔)"
 
-#: src/lib/authui/sssd/params.rb:597
+#: src/lib/authui/sssd/params.rb:601
 msgid "The default base DN to use for performing LDAP sudo rules."
 msgstr "用于执行 LDAP sudo 规则的默认基本判别名。"
 
-#: src/lib/authui/sssd/params.rb:602
-msgid ""
-"Specifies the comma-separated list of URIs of the LDAP servers to which SSSD "
-"should connect in the order of preference."
+#: src/lib/authui/sssd/params.rb:606
+msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
 msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 LDAP 服务器 URI 列表。"
 
-#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:614
-msgid ""
-"Specifies the comma-separated list of URIs of the LDAP servers to which SSSD "
-"should connect in the order of preference to change the password of a user."
-msgstr ""
-"指定了逗号分隔的 LDAP 服务器 URI 列表，SSSD 应以优先级顺序连接以修改用户密"
-"码。"
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
+msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user."
+msgstr "指定了逗号分隔的 LDAP 服务器 URI 列表，SSSD 应以优先级顺序连接以修改用户密码。"
 
-#: src/lib/authui/sssd/params.rb:620
+#: src/lib/authui/sssd/params.rb:624
 msgid "Base DN for LDAP search"
 msgstr "LDAP 搜索的基础判别名"
 
-#: src/lib/authui/sssd/params.rb:627
+#: src/lib/authui/sssd/params.rb:631
 msgid "LDAP schema type"
 msgstr "LDAP 方案类型"
 
-#: src/lib/authui/sssd/params.rb:631
+#: src/lib/authui/sssd/params.rb:635
 msgid "The default bind DN to use for performing LDAP operations."
 msgstr "指定 LDAP 操作所用的默认绑定判别名。"
 
-#: src/lib/authui/sssd/params.rb:637
+#: src/lib/authui/sssd/params.rb:641
 msgid "The type of the authentication token of the default bind DN."
 msgstr "默认绑定判别名的认证 token 的类型。"
 
-#: src/lib/authui/sssd/params.rb:641
+#: src/lib/authui/sssd/params.rb:645
 msgid "The authentication token of the default bind DN."
 msgstr "默认绑定判别名的认证 token。"
 
-#: src/lib/authui/sssd/params.rb:646
+#: src/lib/authui/sssd/params.rb:650
 msgid "The object class of a user entry in LDAP."
 msgstr "LDAP 中用户项的对象类。"
 
-#: src/lib/authui/sssd/params.rb:651
+#: src/lib/authui/sssd/params.rb:655
 msgid "The LDAP attribute that corresponds to the user's login name."
 msgstr "对应着用户登录名的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:656
+#: src/lib/authui/sssd/params.rb:660
 msgid "The LDAP attribute that corresponds to the user's id."
 msgstr "对应着用户 ID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:661
+#: src/lib/authui/sssd/params.rb:665
 msgid "The LDAP attribute that corresponds to the user's primary group id."
 msgstr "对应着用户的首要组 ID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:666
+#: src/lib/authui/sssd/params.rb:670
 msgid "The LDAP attribute that corresponds to the user's gecos field."
 msgstr "对应着用户 gecos 字段的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:671
-msgid ""
-" The LDAP attribute that contains the name of the user's home directory."
+#: src/lib/authui/sssd/params.rb:675
+msgid " The LDAP attribute that contains the name of the user's home directory."
 msgstr "存放用户主文件夹名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:676
+#: src/lib/authui/sssd/params.rb:680
 msgid "The LDAP attribute that contains the path to the user's default shell."
 msgstr "存放用户默认壳层路径的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:681
+#: src/lib/authui/sssd/params.rb:685
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
 msgstr "存放 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:686
+#: src/lib/authui/sssd/params.rb:690
 msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
 msgstr "存放 LDAP 用户对象的 objectSID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:691 src/lib/authui/sssd/params.rb:896
-msgid ""
-"The LDAP attribute that contains timestamp of the last modification of the "
-"parent object."
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
+msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:696
-msgid ""
-"When using ldap_pwd_policy=shadow, this parameter contains the name of an "
-"LDAP attribute corresponding to its shadow(5) counterpart (date of the last "
-"password change)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(上次"
-"密码变更日期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:700
+msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)."
+msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(上次密码变更日期) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:701
-msgid ""
-"When using ldap_pwd_policy=shadow, this parameter contains the name of an "
-"LDAP attribute corresponding to its shadow(5) counterpart (minimum password "
-"age)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最小"
-"密码有效期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:705
+msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)."
+msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最小密码有效期) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:706
-msgid ""
-"When using ldap_pwd_policy=shadow, this parameter contains the name of an "
-"LDAP attribute corresponding to its shadow(5) counterpart (maximum password "
-"age)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最大"
-"密码有效期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:710
+msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)."
+msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(最大密码有效期) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:711
-msgid ""
-"When using ldap_pwd_policy=shadow, this parameter contains the name of an "
-"LDAP attribute corresponding to its shadow(5) counterpart (password warning "
-"period)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码"
-"告警时间) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:715
+msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)."
+msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码告警时间) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:716
-msgid ""
-"When using ldap_pwd_policy=shadow, this parameter contains the name of an "
-"LDAP attribute corresponding to its shadow(5) counterpart (password "
-"inactivity period)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码"
-"无活动时间) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:720
+msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)."
+msgstr "当使用 ldap_pwd_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(密码无活动时间) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:721
-msgid ""
-"When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this "
-"parameter contains the name of an LDAP attribute corresponding to its "
-"shadow(5) counterpart (account expiration date)."
-msgstr ""
-"当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时，此参数"
-"存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:725
+msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)."
+msgstr "当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时，此参数存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。"
 
-#: src/lib/authui/sssd/params.rb:726
-msgid ""
-"When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of "
-"an LDAP attribute storing the date and time of last password change in "
-"kerberos."
-msgstr ""
-"当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储 kerberos 中上次密码"
-"变更日期和时间的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:730
+msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos."
+msgstr "当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储 kerberos 中上次密码变更日期和时间的 LDAP 属性的名称。"
 
-#: src/lib/authui/sssd/params.rb:731
-msgid ""
-"When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of "
-"an LDAP attribute storing the date and time when current password expires."
-msgstr ""
-"当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储当前密码过期日期和时"
-"间的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:735
+msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires."
+msgstr "当使用 ldap_pwd_policy=mit_kerberos 时，此参数存放了存储当前密码过期日期和时间的 LDAP 属性的名称。"
 
-#: src/lib/authui/sssd/params.rb:736
-msgid ""
-"When using ldap_account_expire_policy=ad, this parameter contains the name "
-"of an LDAP attribute storing the expiration time of the account."
-msgstr ""
-"当使用 ldap_account_expire_policy=ad 时，此参数存放了存储账户过期时间的 LDAP "
-"属性的名称。"
+#: src/lib/authui/sssd/params.rb:740
+msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account."
+msgstr "当使用 ldap_account_expire_policy=ad 时，此参数存放了存储账户过期时间的 LDAP 属性的名称。"
 
-#: src/lib/authui/sssd/params.rb:741
-msgid ""
-"When using ldap_account_expire_policy=ad, this parameter contains the name "
-"of an LDAP attribute storing the user account control bit field."
-msgstr ""
-"当使用 ldap_account_expire_policy=ad 时，此参数存放了存储用户账户控制字节段"
-"的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:745
+msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field."
+msgstr "当使用 ldap_account_expire_policy=ad 时，此参数存放了存储用户账户控制字节段的 LDAP 属性的名称。"
 
-#: src/lib/authui/sssd/params.rb:746
-msgid ""
-"When using ldap_account_expire_policy=rhds or equivalent, this parameter "
-"determines if access is allowed or not."
+#: src/lib/authui/sssd/params.rb:750
+msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
 msgstr "当使用 ldap_account_expire_policy=rhds 或等价物时，此参数确定了是否允许访问。"
 
-#: src/lib/authui/sssd/params.rb:751
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines if "
-"access is allowed or not."
+#: src/lib/authui/sssd/params.rb:755
+msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
 msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了是否允许访问。"
 
-#: src/lib/authui/sssd/params.rb:756
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines until "
-"which date access is granted."
+#: src/lib/authui/sssd/params.rb:760
+msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
 msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了准予访问至的日期。"
 
-#: src/lib/authui/sssd/params.rb:761
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines the "
-"hours of a day in a week when access is granted."
-msgstr ""
-"当使用 ldap_account_expire_policy=nds 时，此属性确定了一周中每天准予访问的小"
-"时数。"
+#: src/lib/authui/sssd/params.rb:765
+msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
+msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了一周中每天准予访问的小时数。"
 
-#: src/lib/authui/sssd/params.rb:766
-msgid ""
-"The LDAP attribute that contains the user's Kerberos User Principal Name "
-"(UPN)."
+#: src/lib/authui/sssd/params.rb:770
+msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
 msgstr "存放用户的 Kerberos 用户实体名称 (UPN) 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:770
+#: src/lib/authui/sssd/params.rb:774
 msgid "The LDAP attribute that contains the user's SSH public keys."
 msgstr "存放用户 SSH 公钥的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:775
-msgid ""
-"Some directory servers, for example Active Directory, might deliver the "
-"realm part of the UPN in lower case, which might cause the authentication to "
-"fail."
-msgstr ""
-"某些目录服务器，例如活动目录服务器，可能会以小写传递 UPN 的领域部分，这可能造"
-"成认证失败。"
+#: src/lib/authui/sssd/params.rb:779
+msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail."
+msgstr "某些目录服务器，例如活动目录服务器，可能会以小写传递 UPN 的领域部分，这可能造成认证失败。"
 
-#: src/lib/authui/sssd/params.rb:776
+#: src/lib/authui/sssd/params.rb:780
 msgid "Set this option to true if you want to use an upper-case realm."
 msgstr "若您想要使用大写领域则请将此选项设为真。"
 
-#: src/lib/authui/sssd/params.rb:781
-msgid ""
-"Specifies how many seconds SSSD has to wait before refreshing its cache of "
-"enumerated records."
+#: src/lib/authui/sssd/params.rb:785
+msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
 msgstr "指定了刷新其枚举记录缓存前 SSSD 必须等待的秒数。"
 
-#: src/lib/authui/sssd/params.rb:786
-msgid ""
-"Determine how often to check the cache for inactive entries (such as groups "
-"with no members and users who have never logged in) and remove them to save "
-"space."
-msgstr ""
-"确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省"
-"空间的频率。"
+#: src/lib/authui/sssd/params.rb:790
+msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space."
+msgstr "确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省空间的频率。"
 
-#: src/lib/authui/sssd/params.rb:791
+#: src/lib/authui/sssd/params.rb:795
 msgid "The LDAP attribute that corresponds to the user's full name."
 msgstr "对应着用户完整名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:796
+#: src/lib/authui/sssd/params.rb:800
 msgid "The LDAP attribute that lists the user's group memberships."
 msgstr "列出了用户的组成员资格的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:801
-msgid ""
-"If access_provider=ldap and ldap_access_order=authorized_service, SSSD will "
-"use the presence of the authorizedService attribute in the user's LDAP entry "
-"to determine access privilege."
-msgstr ""
-"若 access_provider=ldap 且 ldap_access_order=authorized_service，SSSD 将依据 "
-"authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。"
+#: src/lib/authui/sssd/params.rb:805
+msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege."
+msgstr "若 access_provider=ldap 且 ldap_access_order=authorized_service，SSSD 将依据 authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。"
 
-#: src/lib/authui/sssd/params.rb:806
-msgid ""
-"If access_provider=ldap and ldap_access_order=host, SSSD will use the "
-"presence of the host attribute in the user's LDAP entry to determine access "
-"privilege."
-msgstr ""
-"若 access_provider=ldap 且 ldap_access_order=host，SSSD 将依据主机属性是否在"
-"该用户 LDAP 项中出现来确定访问权限。"
+#: src/lib/authui/sssd/params.rb:810
+msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege."
+msgstr "若 access_provider=ldap 且 ldap_access_order=host，SSSD 将依据主机属性是否在该用户 LDAP 项中出现来确定访问权限。"
 
-#: src/lib/authui/sssd/params.rb:816
+#: src/lib/authui/sssd/params.rb:820
 msgid "The object class of a group entry in LDAP."
 msgstr "LDAP 中组项的对象类。"
 
-#: src/lib/authui/sssd/params.rb:821
+#: src/lib/authui/sssd/params.rb:825
 msgid "The LDAP attribute that corresponds to the group name."
 msgstr "对应着组名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:826
+#: src/lib/authui/sssd/params.rb:830
 msgid "The LDAP attribute that corresponds to the group's id."
 msgstr "对应着组 ID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:831
+#: src/lib/authui/sssd/params.rb:835
 msgid "The LDAP attribute that contains the names of the group's members."
 msgstr "存放组成员名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:836
+#: src/lib/authui/sssd/params.rb:840
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
 msgstr "存放某 LDAP 组对象的 UUID/GUID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:841
+#: src/lib/authui/sssd/params.rb:845
 msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
 msgstr "存放某 LDAP 组对象的 objectSID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:846
-msgid ""
-" The LDAP attribute that contains timestamp of the last modification of the "
-"parent object."
+#: src/lib/authui/sssd/params.rb:850
+msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:852
-msgid ""
-"If ldap_schema is set to a schema format that supports nested groups (e.g. "
-"RFC2307bis), then this option controls how many levels of nesting SSSD will "
-"follow."
-msgstr ""
-"若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis)，则此选项控制了 "
-"SSSD 将跟随的嵌套级数。"
+#: src/lib/authui/sssd/params.rb:856
+msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow."
+msgstr "若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis)，则此选项控制了 SSSD 将跟随的嵌套级数。"
 
-#: src/lib/authui/sssd/params.rb:858
-msgid ""
-"This option tells SSSD to take advantage of an Active Directory-specific "
-"feature which may speed up group lookup operations on deployments with "
-"complex or deep nested groups."
-msgstr ""
-"此选项告知 SSSD 利用一项活动目录独有特性，其可能加速在具有复杂或深度嵌套的组"
-"的部署上的组查询操作。"
+#: src/lib/authui/sssd/params.rb:862
+msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups."
+msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速在具有复杂或深度嵌套的组的部署上的组查询操作。"
 
-#: src/lib/authui/sssd/params.rb:864
-msgid ""
-"This option tells SSSD to take advantage of an Active Directory-specific "
-"feature which might speed up initgroups operations (most notably when "
-"dealing with complex or deep nested groups)."
-msgstr ""
-"此选项告知 SSSD 利用一项活动目录独有特性，其可能加速 initgroups 操作 (当处理"
-"复杂或深度嵌套的组时最为显著)。"
+#: src/lib/authui/sssd/params.rb:868
+msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)."
+msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速 initgroups 操作 (当处理复杂或深度嵌套的组时最为显著)。"
 
-#: src/lib/authui/sssd/params.rb:870
+#: src/lib/authui/sssd/params.rb:874
 msgid "           The object class of a netgroup entry in LDAP."
 msgstr "          LDAP 中网络组项的对象类。"
 
-#: src/lib/authui/sssd/params.rb:876
+#: src/lib/authui/sssd/params.rb:880
 msgid "The LDAP attribute that corresponds to the netgroup name."
 msgstr "对应着网络组名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:881
+#: src/lib/authui/sssd/params.rb:885
 msgid "The LDAP attribute that contains the names of the netgroup's members."
 msgstr "存放网络组成员名称的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:886
-msgid ""
-"The LDAP attribute that contains the (host, user, domain) netgroup triples."
+#: src/lib/authui/sssd/params.rb:890
+msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
 msgstr "存放 (主机，用户，域) 网络组铁三角的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:891
-msgid ""
-"The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
+#: src/lib/authui/sssd/params.rb:895
+msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
 msgstr "存放某个 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:901
+#: src/lib/authui/sssd/params.rb:905
 msgid "The object class of a service entry in LDAP."
 msgstr "LDAP 中服务项的对象类。"
 
-#: src/lib/authui/sssd/params.rb:906
-msgid ""
-"The LDAP attribute that contains the name of service attributes and their "
-"aliases."
+#: src/lib/authui/sssd/params.rb:910
+msgid "The LDAP attribute that contains the name of service attributes and their aliases."
 msgstr "存放服务属性名称和其别名的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:911
+#: src/lib/authui/sssd/params.rb:915
 msgid "The LDAP attribute that contains the port managed by this service."
 msgstr "存放此服务管理的端口的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:916
-msgid ""
-"The LDAP attribute that contains the protocols understood by this service."
+#: src/lib/authui/sssd/params.rb:920
+msgid "The LDAP attribute that contains the protocols understood by this service."
 msgstr "存放此服务可解析协议的 LDAP 属性。"
 
-#: src/lib/authui/sssd/params.rb:922
-msgid ""
-"An optional base DN, search scope and LDAP filter to restrict LDAP searches "
-"for this attribute type."
+#: src/lib/authui/sssd/params.rb:926
+msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
 msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器，可限制 LDAP 搜索只搜索此属性类型。"
 
-#: src/lib/authui/sssd/params.rb:927
-msgid ""
-" Specifies the timeout (in seconds) that ldap searches are allowed to run "
-"before they are cancelled and cached results are returned (and offline mode "
-"is entered)."
+#: src/lib/authui/sssd/params.rb:931
+msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 搜索允许运行的以秒计超时。"
 
-#: src/lib/authui/sssd/params.rb:932
-msgid ""
-"Specifies the timeout (in seconds) that ldap searches for user and group "
-"enumerations are allowed to run before they are cancelled and cached results "
-"are returned (and offline mode is entered)."
-msgstr ""
-"指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的"
-"以秒计超时。"
+#: src/lib/authui/sssd/params.rb:936
+msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
+msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的以秒计超时。"
 
-#: src/lib/authui/sssd/params.rb:937
-msgid ""
-"Specifies the timeout (in seconds) after which the poll(2)/select(2) "
-"following a connect(2) returns in case of no activity."
+#: src/lib/authui/sssd/params.rb:941
+msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
 msgstr "指定了无活动时 poll(2)/select(2) 跟随 connect(2) 返回的以秒计超时。"
 
-#: src/lib/authui/sssd/params.rb:942
-msgid ""
-"Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs "
-"will abort if no response is received."
+#: src/lib/authui/sssd/params.rb:946
+msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
 msgstr "指定了无回应时同步 LDAP API 调用中止的以秒计超时。"
 
-#: src/lib/authui/sssd/params.rb:947
-msgid ""
-"Specifies a timeout (in seconds) that a connection to an LDAP server will be "
-"maintained."
+#: src/lib/authui/sssd/params.rb:951
+msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
 msgstr "指定了维持到 LDAP 服务器连接的以秒计超时。"
 
-#: src/lib/authui/sssd/params.rb:952
-msgid ""
-"Specify the number of records to retrieve from LDAP in a single request. "
-"Some LDAP servers enforce a maximum limit per-request."
+#: src/lib/authui/sssd/params.rb:956
+msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
 msgstr "指定了单一请求从 LDAP 撷取的记录数。某些 LDAP 服务器强制单一请求最大限制。"
 
-#: src/lib/authui/sssd/params.rb:957
+#: src/lib/authui/sssd/params.rb:961
 msgid "Disable the LDAP paging control."
 msgstr "禁用 LDAP 分页控制。"
 
-#: src/lib/authui/sssd/params.rb:961
-msgid ""
-"When communicating with an LDAP server using SASL, specify the minimum "
-"security level necessary to establish the connection."
+#: src/lib/authui/sssd/params.rb:965
+msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
 msgstr "当使用 SASL 与 LDAP 服务器通信时，请指定建立连接必需的最小安全级别。"
 
-#: src/lib/authui/sssd/params.rb:966
-msgid ""
-"Specify the number of group members that must be missing from the internal "
-"cache in order to trigger a dereference lookup."
+#: src/lib/authui/sssd/params.rb:970
+msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
 msgstr "指定了为触发解引用查询内部缓存必须缺失的组成员数。"
 
-#: src/lib/authui/sssd/params.rb:973
+#: src/lib/authui/sssd/params.rb:977
 msgid "Validate server certification in LDAP TLS session"
 msgstr "在 LDAP TLS 会话中验证服务器证书"
 
-#: src/lib/authui/sssd/params.rb:977
-msgid ""
-"Specifies the file that contains certificates for all of the Certificate "
-"Authorities that sssd will recognize."
+#: src/lib/authui/sssd/params.rb:981
+msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
 msgstr "指定了包含全部 sssd 应认得的证书授权机构证书的文件。"
 
-#: src/lib/authui/sssd/params.rb:981
-msgid ""
-"Specifies the path of a directory that contains Certificate Authority "
-"certificates in separate individual files."
+#: src/lib/authui/sssd/params.rb:985
+msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
 msgstr "指定了包含以几个单独文件形式存在的证书授权机构证书的文件夹路径。"
 
-#: src/lib/authui/sssd/params.rb:985
+#: src/lib/authui/sssd/params.rb:989
 msgid "Specifies the file that contains the certificate for the client's key."
 msgstr "指定了包含客户端密钥证书的文件。"
 
-#: src/lib/authui/sssd/params.rb:989
+#: src/lib/authui/sssd/params.rb:993
 msgid "Specifies the file that contains the client's key."
 msgstr "指定了包含客户端密钥的文件。"
 
-#: src/lib/authui/sssd/params.rb:994
+#: src/lib/authui/sssd/params.rb:998
 msgid "Specifies acceptable cipher suites."
 msgstr "指定了可接受的密码套件。"
 
-#: src/lib/authui/sssd/params.rb:999
-msgid ""
-"Specifies that the id_provider connection must also use tls to protect the "
-"channel."
+#: src/lib/authui/sssd/params.rb:1003
+msgid "Specifies that the id_provider connection must also use tls to protect the channel."
 msgstr "指定了 id_provider 连接必须也使用 TLS 来保护通道。"
 
-#: src/lib/authui/sssd/params.rb:1004
-msgid ""
-"Specifies that SSSD should attempt to map user and group IDs from the "
-"ldap_user_objectsid and ldap_group_objectsid attributes instead of relying "
-"on ldap_user_uid_number and ldap_group_gid_number."
-msgstr ""
-"指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户"
-"和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。"
-
 #: src/lib/authui/sssd/params.rb:1008
+msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number."
+msgstr "指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。"
+
+#: src/lib/authui/sssd/params.rb:1012
 msgid "Specify the SASL mechanism to use."
 msgstr "指定了要使用的 SASL 机制。"
 
-#: src/lib/authui/sssd/params.rb:1013
+#: src/lib/authui/sssd/params.rb:1017
 msgid "Specify the SASL authorization id to use."
 msgstr "指定了要使用的 SASL 认证 ID。"
 
-#: src/lib/authui/sssd/params.rb:1018
+#: src/lib/authui/sssd/params.rb:1022
 msgid "Specify the SASL realm to use."
 msgstr "指定了要使用的 SASL 领域。"
 
-#: src/lib/authui/sssd/params.rb:1023
-msgid ""
-"If set to true, the LDAP library would perform a reverse lookup to "
-"canonicalize the host name during a SASL bind."
+#: src/lib/authui/sssd/params.rb:1027
+msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
 msgstr "若设为真，LDAP 函数库在 SASL 绑定时应执行一次反向查询以规范化主机名。"
 
-#: src/lib/authui/sssd/params.rb:1028
+#: src/lib/authui/sssd/params.rb:1032
 msgid "Specify the keytab to use when using SASL/GSSAPI."
 msgstr "指定了使用 SASL/GSSAPI 时使用的密钥表。"
 
-#: src/lib/authui/sssd/params.rb:1033
+#: src/lib/authui/sssd/params.rb:1037
 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
 msgstr "指定了 id_provider 应初始化 Kerberos 机要资料 (票据授权票据)。"
 
-#: src/lib/authui/sssd/params.rb:1038
+#: src/lib/authui/sssd/params.rb:1042
 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
 msgstr "指定了使用 GSSAPI 时票据授权票据以秒计的生命周期。"
 
-#: src/lib/authui/sssd/params.rb:1043
-msgid ""
-"Select the policy to evaluate the password expiration on the client side."
+#: src/lib/authui/sssd/params.rb:1047
+msgid "Select the policy to evaluate the password expiration on the client side."
 msgstr "选择客户端方面用于评估密码有效期的策略。"
 
-#: src/lib/authui/sssd/params.rb:1048
+#: src/lib/authui/sssd/params.rb:1052
 msgid "Specifies whether automatic referral chasing should be enabled."
 msgstr "指定了是否应启用自动引用跟踪。"
 
-#: src/lib/authui/sssd/params.rb:1053
+#: src/lib/authui/sssd/params.rb:1057
 msgid "Specifies the service name to use when service discovery is enabled."
 msgstr "制定了当启用了服务发现时使用的服务名称。"
 
-#: src/lib/authui/sssd/params.rb:1057
-msgid ""
-"Specifies the service name to use to find an LDAP server which allows "
-"password changes when service discovery is enabled."
+#: src/lib/authui/sssd/params.rb:1061
+msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
 msgstr "指定了当启用了服务发现时用于查找允许密码变更的 LDAP 服务器的服务名称。"
 
-#: src/lib/authui/sssd/params.rb:1062
-msgid ""
-"Specifies whether to update the ldap_user_shadow_last_change attribute with "
-"days since the Epoch after a password change operation."
-msgstr ""
-"指定了在密码变更操作过后是否使用上次操作天数更新 "
-"ldap_user_shadow_last_change 属性。"
+#: src/lib/authui/sssd/params.rb:1066
+msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
+msgstr "指定了在密码变更操作过后是否使用上次操作天数更新 ldap_user_shadow_last_change 属性。"
 
-#: src/lib/authui/sssd/params.rb:1067
-msgid ""
-"If using access_provider = ldap and ldap_access_order = filter (default), "
-"this option is mandatory. It specifies an LDAP search filter criterion that "
-"must be met for the user to be granted access on this host."
-msgstr ""
-"若使用了 access_provider = ldap 和 ldap_access_order = filter (默认)，则此选"
-"项是必需的。它指定了一个 LDAP 搜索过滤器标准，用户想要获得此主机的访问权就必"
-"须满足此标准。"
+#: src/lib/authui/sssd/params.rb:1071
+msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host."
+msgstr "若使用了 access_provider = ldap 和 ldap_access_order = filter (默认)，则此选项是必需的。它指定了一个 LDAP 搜索过滤器标准，用户想要获得此主机的访问权就必须满足此标准。"
 
-#: src/lib/authui/sssd/params.rb:1072
-msgid ""
-" With this option a client side evaluation of access control attributes can "
-"be enabled."
+#: src/lib/authui/sssd/params.rb:1076
+msgid " With this option a client side evaluation of access control attributes can be enabled."
 msgstr "使用此选项可启用客户端访问控制属性评估。"
 
-#: src/lib/authui/sssd/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1082
 msgid "Comma separated list of access control options."
 msgstr "逗号分隔的访问控制选项列表。"
 
-#: src/lib/authui/sssd/params.rb:1083
+#: src/lib/authui/sssd/params.rb:1087
 msgid "Specifies how alias dereferencing is done when performing a search."
 msgstr "指定了执行搜索时如何解引用别名。"
 
-#: src/lib/authui/sssd/params.rb:1088
-msgid ""
-"Allows to retain local users as members of an LDAP group for servers that "
-"use the RFC2307 schema."
+#: src/lib/authui/sssd/params.rb:1092
+msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
 msgstr "针对使用 RFC2307 方案的服务器允许保留本地用户作为某个 LDAP 组的成员。"
 
-#: src/lib/authui/sssd/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1105
 msgid "IP address or host names of Kerberos servers (comma separated)"
 msgstr "Kerberos 服务器 IP 地址或主机名 (逗号分隔)"
 
-#: src/lib/authui/sssd/params.rb:1105
-msgid ""
-"Specifies the comma-separated list of IP addresses or hostnames of the "
-"Kerberos servers to which SSSD should connect, in the order of preference."
-msgstr ""
-"指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列"
-"表。"
+#: src/lib/authui/sssd/params.rb:1109
+msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference."
+msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列表。"
 
-#: src/lib/authui/sssd/params.rb:1110
+#: src/lib/authui/sssd/params.rb:1114
 msgid "Kerberos realm (e.g. EXAMPLE.COM)"
 msgstr "Kerberos 领域 (例如 EXAMPLE.COM)"
 
-#: src/lib/authui/sssd/params.rb:1114 src/lib/authui/sssd/params.rb:1119
-msgid ""
-"If the change password service is not running on the KDC, alternative "
-"servers can be defined here."
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
+msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
 msgstr "若 KDC 上未运行密码变更服务，则可在此定义替代服务器。"
 
-#: src/lib/authui/sssd/params.rb:1124
+#: src/lib/authui/sssd/params.rb:1128
 msgid "Directory to store credential caches."
 msgstr "存储机要缓存的文件夹。"
 
-#: src/lib/authui/sssd/params.rb:1129
+#: src/lib/authui/sssd/params.rb:1133
 msgid "Location of the user's credential cache."
 msgstr "用户机要缓存的位置。"
 
-#: src/lib/authui/sssd/params.rb:1134
-msgid ""
-" Timeout in seconds after an online authentication request or change "
-"password request is aborted."
+#: src/lib/authui/sssd/params.rb:1138
+msgid " Timeout in seconds after an online authentication request or change password request is aborted."
 msgstr "在线认证请求或密码变更请求以秒计的超时。"
 
-#: src/lib/authui/sssd/params.rb:1139
-msgid ""
-"Verify with the help of krb5_keytab that the TGT obtained has not been "
-"spoofed."
+#: src/lib/authui/sssd/params.rb:1143
+msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
 msgstr "在 krb5_keytab 的帮助下校验获取的票据授权票据未被冒名顶替。"
 
-#: src/lib/authui/sssd/params.rb:1144
-msgid ""
-"The location of the keytab to use when validating credentials obtained from "
-"KDCs."
+#: src/lib/authui/sssd/params.rb:1148
+msgid "The location of the keytab to use when validating credentials obtained from KDCs."
 msgstr "当认证从 KDC 获取的机要资料时所用的密钥表的位置。"
 
-#: src/lib/authui/sssd/params.rb:1149
-msgid ""
-"Store the password of the user if the provider is offline and use it to "
-"request a TGT when the provider comes online again."
+#: src/lib/authui/sssd/params.rb:1153
+msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again."
 msgstr "若提供者离线则存储用户密码并在提供者再次上线时用其请求票据授权票据。"
 
-#: src/lib/authui/sssd/params.rb:1153
-msgid ""
-"Request a renewable ticket with a total lifetime, given as an integer "
-"immediately followed by a time unit."
+#: src/lib/authui/sssd/params.rb:1157
+msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
 msgstr "请求可续期票据和其完整生命期，以整数后接时间单位的形式给出。"
 
-#: src/lib/authui/sssd/params.rb:1157
-msgid ""
-"Request ticket with a with a lifetime, given as an integer immediately "
-"followed by a time unit."
+#: src/lib/authui/sssd/params.rb:1161
+msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
 msgstr "请求票据和其生命期，以整数后接时间单位的形式给出。"
 
-#: src/lib/authui/sssd/params.rb:1161
+#: src/lib/authui/sssd/params.rb:1165
 msgid "The time in seconds between two checks if the TGT should be renewed."
 msgstr "当票据授权票据应续期时两次检查间的秒数。"
 
-#: src/lib/authui/sssd/params.rb:1166
-msgid ""
-"Enables flexible authentication secure tunneling (FAST) for Kerberos pre-"
-"authentication."
+#: src/lib/authui/sssd/params.rb:1170
+msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
 msgstr "为 Kerberos 预认证启用灵活认证安全隧道 (FAST)。"
 
-#: src/lib/authui/sssd/params.rb:1170
+#: src/lib/authui/sssd/params.rb:1174
 msgid "Specifies the server principal to use for FAST."
 msgstr "指定了用于灵活认证安全隧道的服务器实体。"
 
-#: src/lib/authui/sssd/params.rb:1175
+#: src/lib/authui/sssd/params.rb:1179
 msgid "Specifies if the host and user principal should be canonicalized."
 msgstr "指定了是否应规范化主机和用户实体。"
 
 #. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1187
+#: src/lib/authui/sssd/params.rb:1191
 msgid "Specifies the name of the Active Directory domain."
 msgstr "指定了活动目录域的名称。"
 
-#: src/lib/authui/sssd/params.rb:1192
+#: src/lib/authui/sssd/params.rb:1196
 msgid "IP addresses or host names of AD servers (comma separated)"
 msgstr "AD 服务器 IP 地址或主机名 (逗号分隔)"
 
-#: src/lib/authui/sssd/params.rb:1196
-msgid ""
-"The comma-separated list of IP addresses or hostnames of the AD servers to "
-"which SSSD should connect in order of preference."
-msgstr ""
-"以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名"
-"列表。"
+#: src/lib/authui/sssd/params.rb:1200
+msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
+msgstr "以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名列表。"
 
-#: src/lib/authui/sssd/params.rb:1201
-msgid ""
-"AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN "
-"used by AD to identify this host."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
 msgstr "活动目录主机名(可选) - 可在 hostname(5) 未反映活动目录用于识别此主机的完全限定名称时设置。"
 
-#: src/lib/authui/sssd/params.rb:1205
+#: src/lib/authui/sssd/params.rb:1209
 msgid "Override the user's home directory."
 msgstr "覆盖用户主文件夹。"
 
-#: src/lib/authui/sssd/params.rb:1218
-msgid ""
-" Specifies the lower bound of the range of POSIX IDs to use for mapping "
-"Active Directory user and group SIDs."
+#: src/lib/authui/sssd/params.rb:1222
+msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的下界。"
 
-#: src/lib/authui/sssd/params.rb:1223
-msgid ""
-"Specifies the upper bound of the range of POSIX IDs to use for mapping "
-"Active Directory user and group SIDs."
+#: src/lib/authui/sssd/params.rb:1227
+msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的上界。"
 
-#: src/lib/authui/sssd/params.rb:1228
+#: src/lib/authui/sssd/params.rb:1232
 msgid "Specifies the number of IDs available for each slice."
 msgstr "指定了每一切片可用的 ID 数。"
 
-#: src/lib/authui/sssd/params.rb:1232
+#: src/lib/authui/sssd/params.rb:1236
 msgid "Specify the domain SID of the default domain."
 msgstr "指定默认域的域 SID。"
 
-#: src/lib/authui/sssd/params.rb:1236
+#: src/lib/authui/sssd/params.rb:1240
 msgid "Specify the name of the default domain."
 msgstr "指定默认域的名称。"
 
-#: src/lib/authui/sssd/params.rb:1241
-msgid ""
-"Changes the behavior of the ID-mapping algorithm to behave more similarly to "
-"winbind's “idmap_autorid” algorithm."
+#: src/lib/authui/sssd/params.rb:1245
+msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
 msgstr "修改 ID 映射算法的行为以与 winbind 的 \"idmap_autorid\" 算法更加相似。"
 
 #. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1257
 msgid "Specifies the name of the IPA domain."
 msgstr "指定 IPA 域的名称。"
 
-#: src/lib/authui/sssd/params.rb:1258
+#: src/lib/authui/sssd/params.rb:1262
 msgid "IP addresses or host names of IPA servers (comma separated)"
 msgstr "IPA 服务器 IP 地址或主机名 (逗号分隔)"
 
-#: src/lib/authui/sssd/params.rb:1263
-msgid ""
-"IPA hostname (optional) - may be set if hostname(5) does not reflect the "
-"FQDN used by IPA to identify this host."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
 msgstr "IPA 主机名 (可选) - 可在 hostname(5) 未反映 IPA 用于识别此主机的完全限定名称时设置。"
 
-#: src/lib/authui/sssd/params.rb:1268
+#: src/lib/authui/sssd/params.rb:1272
 msgid "The automounter location this IPA client will be using."
 msgstr "将使用此 IPA 客户端的自动挂载器位置。"
 
-#: src/lib/authui/sssd/params.rb:1273
-msgid ""
-"This option tells SSSD to automatically update the DNS server built into "
-"FreeIPA v2 with the IP address of this client."
-msgstr ""
-"此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务"
-"器。"
+#: src/lib/authui/sssd/params.rb:1277
+msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
+msgstr "此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务器。"
 
-#: src/lib/authui/sssd/params.rb:1278
+#: src/lib/authui/sssd/params.rb:1282
 msgid "The TTL to apply to the client DNS record when updating it."
 msgstr "更新客户端 DNS 记录时应用的 TTL。"
 
-#: src/lib/authui/sssd/params.rb:1282
-msgid ""
-"Choose the interface whose IP address should be used for dynamic DNS updates."
+#: src/lib/authui/sssd/params.rb:1286
+msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
 msgstr "选择其 IP 地址应用于动态 DNS 更新的接口。"
 
 #~ msgid "Authentication client configuration module"
@@ -2158,8 +1795,7 @@
 #~ msgid "Indicates what is the syntax of the config file."
 #~ msgstr "揭示了配置文件的语法。"
 
-#~ msgid ""
-#~ "Comma separated list of services that are started when sssd itself starts."
+#~ msgid "Comma separated list of services that are started when sssd itself starts."
 #~ msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。"
 
 #~ msgid ""
@@ -2169,49 +1805,28 @@
 #~ "\n"
 #~ "支持的服务：nss, pam, sudo, autofs, ssh"
 
-#~ msgid ""
-#~ "SSSD can use more domains at the same time, but at least one must be "
-#~ "configured or SSSD won't start."
+#~ msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
 #~ msgstr "SSSD 可同时使用更多域，但必须配置至少一个否则 SSSD 不会启动。"
 
-#~ msgid ""
-#~ "This parameter contains the list of domains in the order these will be "
-#~ "queried."
+#~ msgid "This parameter contains the list of domains in the order these will be queried."
 #~ msgstr "此参数包含了以查询顺序排列的域列表。"
 
-#~ msgid ""
-#~ "By default, we will attempt to use inotify for this, and will fall back "
-#~ "to polling resolv.conf every five seconds if inotify cannot be used."
-#~ msgstr ""
-#~ "默认我们将尝试使用 inotify，若 inotify 不可用则回退为每五秒轮询 resolv."
-#~ "conf 一次。"
+#~ msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used."
+#~ msgstr "默认我们将尝试使用 inotify，若 inotify 不可用则回退为每五秒轮询 resolv.conf 一次。"
 
-#~ msgid ""
-#~ "Bit mask that indicates which debug levels will be visible. 0x0010 is the "
-#~ "default value as well as the lowest allowed value, 0xFFF0 is the most "
-#~ "verbose mode."
-#~ msgstr ""
-#~ "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值，0xFFF0是最详尽"
-#~ "模式。"
+#~ msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode."
+#~ msgstr "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值，0xFFF0是最详尽模式。"
 
-#~ msgid ""
-#~ "If a service is not responding to ping checks (see the “timeout” option), "
-#~ "it is first sent the SIGTERM signal that instructs it to quit gracefully."
-#~ msgstr ""
-#~ "若服务不响应 ping 检查 (参考「超时」选项) ，它将会先发送 SIGTERM 信号引导"
-#~ "服务优雅地退出。"
+#~ msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully."
+#~ msgstr "若服务不响应 ping 检查 (参考「超时」选项) ，它将会先发送 SIGTERM 信号引导服务优雅地退出。"
 
-#~ msgid ""
-#~ "May be set on machines where the hostname(5) does not reflect the fully "
-#~ "qualified name."
+#~ msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
 #~ msgstr "可以在 hostname(5) 未反映完全限定名称的机器上设置。"
 
 #~ msgid "Failed to enable %s service. Please use system journal to diagnose."
 #~ msgstr "启用 %s 服务失败。请使用系统日志进行诊断。"
 
-#~ msgid ""
-#~ "Failed to start %s service. Please use system journal (journalctl -n -u "
-#~ "%s) to diagnose."
+#~ msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
 #~ msgstr "启动 %s 服务失败。请使用系统日志 (journalctl -n -u %s) 进行诊断。"
 
 #~ msgid "System is configured for using nss_ldap.\n"
@@ -2304,44 +1919,13 @@
 #~ msgid "Edit"
 #~ msgstr "编辑"
 
-#~ msgid ""
-#~ "SSSD provides a set of daemons to manage access to remote directories and "
-#~ "authentication mechanisms.<br>You have to confiugre at least one "
-#~ "authentication domain.<br>The first you have to set for a authentication "
-#~ "domain is the identification and auth provider used for the domain.<br>In "
-#~ "the next step you have to set some mandatory parameter for the selected "
-#~ "providers.You can select later all parameters available for the selected "
-#~ "identification and auth provider.SSSD provides following id_provider:"
-#~ "<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD "
-#~ "internal provider for local users.<br><b>ldap</b>: LDAP provider. See "
-#~ "sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: "
-#~ "FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad: Active Directory provider.<br>Supported auth providers are:"
-#~ "<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for "
-#~ "Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise "
-#~ "Identity Management provider.<br><b>ad</b> Active Directory provider."
-#~ "<br><b>proxy</b> for relaying authentication to some other PAM target."
-#~ "<br><b>none</b> disables authentication explicitly.<br>The default auth "
-#~ "provider is the id_provider.<br>"
-#~ msgstr ""
-#~ "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须"
-#~ "配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供"
-#~ "方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于"
-#~ "所选身份和认证提供方的参数。SSSD 提供了以下 id_provider：<br><b>proxy: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供"
-#~ "方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 "
-#~ "LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提"
-#~ "供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有：<br><b>ldap 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> "
-#~ "FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活"
-#~ "动目录提供方。<br><b>proxy</b> 用于对某些其它 PAM 对象的延迟认证。"
-#~ "<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>"
+#~ msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Ident
 ity Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>"
+#~ msgstr "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于所选身份和认证提供方的参数。SSSD 提供了以下 id_provider：<br><b>proxy</b>: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有：<br><b>ldap</b> 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活动目录提供方。<br><b>proxy</b> 用于对某�
 �其它 PAM 对象的延迟认证。<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>"
 
 #~ msgid "Determines if a domain can be enumerated."
 #~ msgstr "确定某域是否可枚举。"
 
-#~ msgid ""
-#~ "Determines if user credentials are also cached in the local LDB cache."
+#~ msgid "Determines if user credentials are also cached in the local LDB cache."
 #~ msgstr "确定是否也在本地 LDB 缓存中缓存用户机要。"
 
 #~ msgid "The authentication provider used for the domain."
@@ -2359,20 +1943,14 @@
 #~ msgid "Specifies the Schema Type in use on the target LDAP server."
 #~ msgstr "指定了目标 LDAP 服务器上使用的方案类型。"
 
-#~ msgid ""
-#~ "Specifies what checks to perform on server certificates in a TLS session, "
-#~ "if any."
+#~ msgid "Specifies what checks to perform on server certificates in a TLS session, if any."
 #~ msgstr "指定了若需要检查则在 TLS 会话中对服务器证书要进行的检查。"
 
 #~ msgid "The name of the Kerberos realm."
 #~ msgstr "Kerberos 领域的名称。"
 
-#~ msgid ""
-#~ "The comma-separated list of IP addresses or hostnames of the IPA servers "
-#~ "to which SSSD should connect in the order of preference."
-#~ msgstr ""
-#~ "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列"
-#~ "表。"
+#~ msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference."
+#~ msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列表。"
 
 #~ msgid "SPAM Prevention"
 #~ msgstr "SPAM 防护"

Modified: trunk/yast/zh_CN/po/auth-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/auth-server.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/auth-server.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2014-10-30 17:17+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -299,8 +299,7 @@
 msgstr "于 &SLP 守护进程注册"
 
 #. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
 msgid "Firewall Settings"
 msgstr "防火墙设置"
 
@@ -445,12 +444,12 @@
 msgid "Configure Account for Replication"
 msgstr "配置用于复制的账户"
 
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
 msgid "is not a valid LDAP DN"
 msgstr "不是一个有效的 LDAP 判别名"
 
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
 msgid "Password"
 msgstr "密码"
 
@@ -476,8 +475,8 @@
 msgid "Provider Details"
 msgstr "提供者细节"
 
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
 msgid "Protocol"
 msgstr "协议"
 
@@ -485,7 +484,7 @@
 msgid "Provider Hostname"
 msgstr "提供者主机名"
 
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
 msgid "Use StartTLS"
 msgstr "使用 StartTLS"
 
@@ -568,8 +567,8 @@
 msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
 msgstr "检查提供者服务器上的复制配置中定义的认证资料失败。\n"
 
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
 msgid "The test returned the following error messages:"
 msgstr "测试返回了以下错误消息："
 
@@ -1953,8 +1952,7 @@
 #. Initialization dialog contents
 #. Initialization dialog contents
 #: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
 #: src/include/auth-server/wizards.rb:207
 #: src/include/auth-server/wizards.rb:300
 msgid "Initializing..."
@@ -2328,7 +2326,7 @@
 msgid "Index Cache (IDL cache)"
 msgstr "索引缓存 (IDL 缓存)"
 
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
 msgid "Checkpoint Settings"
 msgstr "检查点设置"
 
@@ -2396,7 +2394,7 @@
 msgstr "添加索引"
 
 #. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
 msgid "Password Policy Settings"
 msgstr "密码策略设置"
 
@@ -2559,237 +2557,237 @@
 msgstr "文件夹不存在。创建它吗？"
 
 #. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
 msgid "Authentication failed. The password is probably incorrect.\n"
 msgstr "认证失败。密码可能不正确。\n"
 
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
 msgid "The error message was: '"
 msgstr "错误消息为：'"
 
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
 msgid "Try again?"
 msgstr "重试吗？"
 
 #. PasswordPolicyDialog only returns the changes made to the original
 #. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
 msgid "Available Attribute Types"
 msgstr "可用属性类型"
 
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
 msgid "Selected Attribute Types"
 msgstr "所选属性类型"
 
 #. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
 msgid "Who should this rule apply to"
 msgstr "规则应用对象"
 
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
 msgid "Entry DN"
 msgstr "条目判别名"
 
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
 msgid "Select"
 msgstr "选择"
 
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
 msgid "Define the Access Level"
 msgstr "定义访问级别"
 
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
 msgid "Stop access control evaluation here (default)"
 msgstr "在此停止访问控制评估 (默认)"
 
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
 msgid "Continue with next access control rule (\"break\")"
 msgstr "继续下一条访问控制规则 (\"断点\")"
 
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
 msgid "Continue evaluation of this rule (\"continue\")"
 msgstr "继续评估此规则 (\"继续\")"
 
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
 msgid "Please enter a DN in the textfield"
 msgstr "请在文本框中输入一个判别名"
 
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
 msgid "Subtree DN"
 msgstr "子树判别名"
 
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
 msgid "Group DN"
 msgstr "组判别名"
 
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
 msgid "Edit Access Control Rule"
 msgstr "编辑访问控制规则"
 
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
 msgid "Target Objects"
 msgstr "目标对象"
 
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
 msgid "Matching the filter:"
 msgstr "匹配过滤器："
 
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
 msgid "LDAP Filter"
 msgstr "LDAP 过滤器"
 
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
 msgid "Apply this rule only to the listed attribute"
 msgstr "仅将此规则应用到列出的属性"
 
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
 msgid "Attributes"
 msgstr "属性"
 
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
 msgid "Edit"
 msgstr "编辑"
 
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
 msgid "Access Level"
 msgstr "访问级别"
 
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
 msgid "Who"
 msgstr "谁"
 
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
 msgid "DN"
 msgstr "判别名"
 
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
 msgid "Flow Control"
 msgstr "流程控制"
 
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
 msgid "Up"
 msgstr "向上"
 
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
 msgid "Down"
 msgstr "向下"
 
 #. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
 msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
 msgstr "在<b>属性</b>文本框中输入有效属性列表"
 
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
 msgid "Enter valid a LDAP filter in the textfield"
 msgstr "在文本框中输入一个有效的 LDAP 过滤器"
 
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
 msgid "You must add at least one item to the \"Access Level\" list."
 msgstr "您必须添加至少一个条目到 \"访问级别\" 列表。"
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Target"
 msgstr "目标"
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Filter"
 msgstr "过滤器"
 
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
 msgid ""
 "The selected database contains access control rules that are currently\n"
 "not supported by YaST. The Access Control Dialog will be disabled.\n"
 msgstr "所选数据库包含目前 YaST 不支持的访问控制规则。将禁用访问控制对话框。\n"
 
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
 msgid "This database is a Replication Consumer."
 msgstr "此数据库是一个复制使用者。"
 
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
 msgid "Provider Name"
 msgstr "提供者名称"
 
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
 msgid "Port"
 msgstr "端口"
 
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
 msgid "Replication Type"
 msgstr "复制类型"
 
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
 msgid "Replication Interval"
 msgstr "复制周期"
 
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
 msgid "Days"
 msgstr "天"
 
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
 msgid "Hours"
 msgstr "小时"
 
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
 msgid "Minutes"
 msgstr "分钟"
 
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
 msgid "Seconds"
 msgstr "秒"
 
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
 msgid "Authentication DN"
 msgstr "认证判别名"
 
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
 msgid "Custom update referral"
 msgstr "自定义更新来源"
 
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
 msgid "Target Host"
 msgstr "目标主机"
 
 #. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
 msgid "Invalid replication interval specified"
 msgstr "指定了无效的复制周期"
 
 #. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
 msgid "Checking LDAP connectivity to the provider failed."
 msgstr "检查提供者的 LDAP 连通性失败。"
 
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
 msgid "Do you still want to continue?"
 msgstr "您仍然想要继续吗？"
 
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
 msgid "Checking the LDAPsync capabilities of the provider failed."
 msgstr "检查提供者的 LDAPsync 能力失败。"
 
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
 msgid "Please verify that the target server is enabled to be a LDAPsync provider"
 msgstr "请验证目标服务器是否已启用为一个 LDAPsync 提供者"
 
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
 msgid "Enable ldapsync provider for this database"
 msgstr "启用此数据库作为 ldapsync 提供者"
 
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
 msgid "Operations"
 msgstr "操作"
 
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
 msgid "Session Log"
 msgstr "会话日志"
 
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
 msgid "Enable Session Log"
 msgstr "启用会话日志"
 
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
 msgid "Replication Settings"
 msgstr "复制设置"
 

Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/autoinst.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/autoinst.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2015-10-18 12:20+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -37,7 +37,7 @@
 
 #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
 #: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
 msgid "This may take a while"
 msgstr "这可能要花费一点时间"
 
@@ -57,14 +57,13 @@
 
 #. command line options
 #. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. unique id
 #. Backup
 #. Now check if there any classes defined in theis pre final control file
 #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
 msgid ""
 "Error while parsing the control file.\n"
 "Check the log files for more details or fix the\n"
@@ -127,8 +126,7 @@
 
 #. if we get no argument or map of options we are not in command line
 #: src/clients/clone_system.rb:66
-msgid ""
-"Client for creating an AutoYaST profile based on the currently running system"
+msgid "Client for creating an AutoYaST profile based on the currently running system"
 msgstr "基于当前运行中系统创建 AutoYaST 方案的客户端"
 
 #: src/clients/clone_system.rb:76
@@ -157,20 +155,15 @@
 #: src/clients/files_auto.rb:170
 msgid ""
 "<p>Using this dialog, copy the contents of the file and specify the final\n"
-"path on the installed system. YaST will copy this file to the specified "
-"location.</p>"
-msgstr ""
-"<p>使用此对话框复制文件内容并指定其在安装好的系统上的最终路径。YaST2 会把此文"
-"件复制到指定的位置。</p>"
+"path on the installed system. YaST will copy this file to the specified location.</p>"
+msgstr "<p>使用此对话框复制文件内容并指定其在安装好的系统上的最终路径。YaST2 会把此文件复制到指定的位置。</p>"
 
 #. help 2/2
 #: src/clients/files_auto.rb:177
 msgid ""
 "<p>To protect copied files, set the owner and the permissions of the files.\n"
-"Set the owner using the syntax <i>userid:groupid</i>.  Permissions can be a "
-"symbolic\n"
-"representation of changes to make or an octal  number  representing  the bit "
-"pattern for the\n"
+"Set the owner using the syntax <i>userid:groupid</i>.  Permissions can be a symbolic\n"
+"representation of changes to make or an octal  number  representing  the bit pattern for the\n"
 "new permissions.</p>"
 msgstr ""
 "<p>为了保护所复制的文件，请设置文件的所有者和权限。\n"
@@ -246,10 +239,8 @@
 #: src/clients/files_auto.rb:321
 msgid ""
 "<p>For many applications and services, you might have prepared\n"
-"a configuration file that should be copied in a complete form to a location "
-"in the\n"
-"installed system. For example, this is the case if you are installing a web "
-"server\n"
+"a configuration file that should be copied in a complete form to a location in the\n"
+"installed system. For example, this is the case if you are installing a web server\n"
 "and have an httpd.conf configuration file prepared.</p>"
 msgstr ""
 "<p>对于许多应用程序和服务，您可能早就优化出了一个配置文件，\n"
@@ -262,7 +253,7 @@
 msgstr "请先从表中选择一个文件。"
 
 #. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
 msgid ""
 "<p>\n"
 "Please wait while the system is being configured.\n"
@@ -273,43 +264,27 @@
 "</p>"
 
 #. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
 msgid "Progress"
 msgstr "进度"
 
 #. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
 msgid "Configuring System according to auto-install settings"
 msgstr "正在根据自动安装设置配置系统"
 
 #. TRANSLATORS: Error message, %s is replaced by newline-separated
-#. list of unsupported sections of the profile
-#. Do not translate words in brackets
-#: src/clients/inst_autoconfigure.rb:88
-msgid ""
-"These sections of AutoYaST profile are not supported anymore:\n"
-"\n"
-"%s\n"
-"\n"
-"Please, use, e.g., <scripts/> or <files/> to change the configuration."
-msgstr ""
-"AutoYaST 方案的这些部分不再支持了：\n"
-"\n"
-"%s\n"
-"\n"
-"请使用，例如 <scripts/> 或 <files/> 来修改配置。"
-
-#. TRANSLATORS: Error message, %s is replaced by newline-separated
 #. list of unknown sections of the profile
 #. Do not translate words in brackets
-#: src/clients/inst_autoconfigure.rb:103
-msgid ""
-"These sections of AutoYaST profile cannot be processed on this system:\n"
-"\n"
-"%s\n"
-"\n"
-"Maybe they were misspelled or your profile does not contain all the needed "
-"YaST packages in <software/> section."
+#: src/clients/inst_autoconfigure.rb:94
+#, fuzzy
+#| msgid ""
+#| "These sections of AutoYaST profile cannot be processed on this system:\n"
+#| "\n"
+#| "%s\n"
+#| "\n"
+#| "Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section."
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section."
 msgstr ""
 "AutoYaST 方案的这些部分无法在此系统上进行：\n"
 "\n"
@@ -319,25 +294,28 @@
 
 #. determine name of client, if not use default name
 #. Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[])   ]);
-#: src/clients/inst_autoconfigure.rb:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
 msgid "Configuring %1"
 msgstr "配置 %1"
 
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
 msgid "Not Configuring %1"
 msgstr "未配置 %1"
 
 #. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
 msgid "Executing Post-Scripts"
 msgstr "正在执行安装后脚本"
 
-#: src/clients/inst_autoconfigure.rb:303
+#. Do not restart NetworkManager* services
+#. bnc#955260
+#: src/clients/inst_autoconfigure.rb:304
 msgid "Restarting all running services"
 msgstr "正在重启全部运行中的服务"
 
+#. Filtering out all services which must not to be restarted
 #: src/clients/inst_autoconfigure.rb:326
 msgid "Activating systemd default target"
 msgstr "正在激活 systemd 默认对象"
@@ -348,7 +326,7 @@
 msgstr "正在完成配置"
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:444
+#: src/clients/inst_autoconfigure.rb:447
 msgid "Processing resource %1"
 msgstr "正在处理资源 %1"
 
@@ -408,8 +386,15 @@
 "运行映像脚本失败：\n"
 "%1"
 
-#. import "Arch";
 #. encoding: utf-8
+#. File:	clients/inst_autoinit.ycp
+#. Package:	Auto-installation
+#. Summary:	Parses XML Profile for automatic installation
+#. Authors:	Anas Nashif 
+#.
+#. $Id$
+#.
+#. encoding: utf-8
 #. File:	clients/autoinst_post.ycp
 #. Package:	Auto-installation
 #. Author:      Anas Nashif 
@@ -417,7 +402,7 @@
 #. the system as described in the profile file.
 #.
 #. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
 msgid ""
 "<p>\n"
 "Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -425,59 +410,57 @@
 "<p>\n"
 "系统正在准备自动安装，请稍候。</p>\n"
 
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
 msgid "Probe hardware"
 msgstr "检测硬件"
 
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
 msgid "Retrieve & Read Control File"
 msgstr "撷取并读取控制文件"
 
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
 msgid "Parse control file"
 msgstr "解析控制文件"
 
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
 msgid "Initial Configuration"
 msgstr "初始配置"
 
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
 msgid "Preparing System for Automatic Installation"
 msgstr "准备系统以进行自动安装"
 
 #. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
 msgid "Preprobing stage"
 msgstr "预检测阶段"
 
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
 msgid "Probing hardware..."
 msgstr "正在检测硬件..."
 
+#. TRANSLATORS: Error message, %s is replaced by newline-separated
+#. list of unsupported sections of the profile
+#. Do not translate words in brackets
+#: src/clients/inst_autoinit.rb:128
+#, fuzzy
+#| msgid ""
+#| "These sections of AutoYaST profile are not supported anymore:\n"
+#| "\n"
+#| "%s\n"
+#| "\n"
+#| "Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+"AutoYaST 方案的这些部分不再支持了：\n"
+"\n"
+"%s\n"
+"\n"
+"请使用，例如 <scripts/> 或 <files/> 来修改配置。"
+
 #. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
 msgid "Parsing control file"
 msgstr "正在解析控制文件"
 
@@ -521,92 +504,126 @@
 #. Uwe Gansert 
 #.
 #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
 msgstr "<P>系统正在准备自动安装，请稍候。</P>"
 
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
 msgid "Execute pre-install user scripts"
 msgstr "执行安装前用户脚本"
 
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
 msgid "Configure General Settings "
 msgstr "配置常规设置"
 
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
 msgid "Set up language"
 msgstr "设置语言"
 
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:58
 msgid "Create partition plans"
 msgstr "创建分区计划"
 
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
 msgid "Configure Bootloader"
 msgstr "配置引导加载器"
 
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
 msgid "Registration"
 msgstr "注册"
 
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
 msgid "Configure Software selections"
 msgstr "配置软件选集"
 
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:62
 msgid "Configure Systemd Default Target"
 msgstr "配置 Systemd 默认对象"
 
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:63
+msgid "Configure users and groups"
+msgstr "配置用户和组"
+
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "配置驱动器"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
 msgid "Executing pre-install user scripts..."
 msgstr "正在执行安装前用户脚本..."
 
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
 msgid "Configuring general settings..."
 msgstr "正在配置常规设置..."
 
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
 msgid "Setting up language..."
 msgstr "正在设置语言..."
 
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
 msgid "Creating partition plans..."
 msgstr "正在创建分区计划..."
 
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
 msgid "Configuring Bootloader..."
 msgstr "正在配置引导加载器..."
 
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
 msgid "Registering the system..."
 msgstr "正在注册系统..."
 
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
 msgid "Configuring Software selections..."
 msgstr "正在配置软件选集..."
 
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
 msgid "Configuring Systemd Default Target..."
 msgstr "正在配置 Systemd 默认对象..."
 
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:77
+msgid "Importing users and groups configuration..."
+msgstr "正在导入用户和组配置..."
+
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "正在导入 Kickstart 文件..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "正在配置语言..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
 msgid "Preparing System for Automated Installation"
 msgstr "准备系统以进行自动安装"
 
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. Second stage of installation will not be called but a
+#. network configuration is available. So this will be written
+#. while the general inst_finish process at the end of the
+#. first stage. But for the installation workflow the linuxrc
+#. network settings will be taken. (bnc#944942)
+#: src/clients/inst_autosetup.rb:185
 msgid "Handling Add-On Products..."
 msgstr "正在处理附加产品..."
 
 #. Set it in the Language module.
 #.
 #. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
 msgid "Configuring language..."
 msgstr "正在配置语言..."
 
 #. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:298
 msgid ""
 "Error while configuring partitions.\n"
 "Try again.\n"
@@ -614,8 +631,9 @@
 "配置分区时出错。\n"
 "请重试。\n"
 
-#. Software
-#: src/clients/inst_autosetup.rb:331
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
 msgid ""
 "Error while configuring software selections.\n"
 "Try again.\n"
@@ -675,8 +693,7 @@
 
 #: src/clients/report_auto.rb:217
 msgid ""
-"<p>Depending on your experience, you can skip, log, and show (with time-"
-"out)\n"
+"<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
 "installation messages.</p> \n"
 msgstr "<p>取决于您的经验，您可以跳过、记录和显示 (允许超时) 安装消息。</p> \n"
 
@@ -684,9 +701,7 @@
 msgid ""
 "<p>It is recommended to show all  <b>messages</b> with time-out.\n"
 "Warnings can be skipped in some places, but should not be ignored.</p>\n"
-msgstr ""
-"<p>推荐显示全部<b>消息</b>并允许超时。在某些地方可以跳过警告，但不应忽略它"
-"们。</p>\n"
+msgstr "<p>推荐显示全部<b>消息</b>并允许超时。在某些地方可以跳过警告，但不应忽略它们。</p>\n"
 
 #: src/clients/report_auto.rb:230
 msgid "Messages and Logging"
@@ -694,40 +709,37 @@
 
 #. Select packages
 #. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
 msgid "Software Selection"
 msgstr "软件选集"
 
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
 msgid ""
 "<p>\n"
-"Select one of the following <b>base</b> selections and click <i>Detailed<i> "
-"to add\n"
+"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
 "more <b>add-on</b> selections and packages.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
-"请选择以下<b>基本</b>选集之一并点击<i>细节<i>添加更多<b>附加</b>选集和软件"
-"包。\n"
+"请选择以下<b>基本</b>选集之一并点击<i>细节<i>添加更多<b>附加</b>选集和软件包。\n"
 "</p>\n"
 
 #. AutoinstSoftware::pmInit();
 #. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
 #. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
 msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
 msgstr "安装来源位置 (如 http://myhost/13.1/DVD1/)"
 
-#: src/clients/software_auto.rb:128
-msgid ""
-"The inst-source of this system (you can't create images if you choose this)"
+#: src/clients/software_auto.rb:129
+msgid "The inst-source of this system (you can't create images if you choose this)"
 msgstr "此系统的安装来源 (若您选了则不能创建映像，因为映像不是动态的)"
 
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
 msgid "using that installation source failed"
 msgstr "使用该安装来源失败"
 
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
 msgid "Reading package database..."
 msgstr "正在读取软件包数据库..."
 
@@ -736,12 +748,9 @@
 msgid ""
 "<p><b>Mount in /etc/fstab By:</b>\n"
 "\tNormally, a file system to mount is identified in /etc/fstab\n"
-"\tby the device name. This identification can be changed so the file system "
-"to mount\n"
-"\tis found by searching for a UUID or a volume label. Not all file systems "
-"can be\n"
-"\tmounted by UUID or a volume label. If an option is disabled, it is not "
-"possible.\n"
+"\tby the device name. This identification can be changed so the file system to mount\n"
+"\tis found by searching for a UUID or a volume label. Not all file systems can be\n"
+"\tmounted by UUID or a volume label. If an option is disabled, it is not possible.\n"
 "\t"
 msgstr ""
 "<p><b>挂载在 /etc/fstab 中的方式：</b>\n"
@@ -755,8 +764,7 @@
 #: src/include/autoinstall/AdvancedPartitionDialog.rb:71
 msgid ""
 "<p><b>Volume Label:</b>\n"
-"\t  The name entered in this field is used as the volume label. This usually "
-"makes sense only \n"
+"\t  The name entered in this field is used as the volume label. This usually makes sense only \n"
 "\t  when you activate the option for mounting by volume label.\n"
 "\t  A volume label cannot contain the / character or spaces.\n"
 "\t  "
@@ -862,9 +870,7 @@
 msgid ""
 "You selected to create the partition, but you did not select a valid file\n"
 "system. Select a valid filesystem to continue.\n"
-msgstr ""
-"您选择了创建分区，但您未选择有效的文件系统。请选择一个有效的文件系统以继"
-"续。\n"
+msgstr "您选择了创建分区，但您未选择有效的文件系统。请选择一个有效的文件系统以继续。\n"
 
 #. We don't use the return value of the check, because we
 #. currently can't stop the dialog switch from happening, so we
@@ -932,8 +938,7 @@
 
 #. user selected this partition to be part of volgroup
 #: src/include/autoinstall/PartitionDialog.rb:592
-msgid ""
-"Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected."
+msgid "Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected."
 msgstr "大小 \"auto\" 仅在选中挂载点 \"/boot\" 或者 \"swap\" 时有效。"
 
 #: src/include/autoinstall/PartitionDialog.rb:600
@@ -984,6 +989,11 @@
 msgid "Volgroup device name"
 msgstr "卷组设备名"
 
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
 #. Shows a dialog when 'control file' can't be found
 #. @param [String] original Original value
 #. @return [String] new value
@@ -1037,8 +1047,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 "
-"&product;。\n"
+"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 &product;。\n"
 "</p>"
 
 #. force help text width
@@ -1117,8 +1126,7 @@
 msgid ""
 "<p>For example, you can define a class of configurations for\n"
 "a specific  department, group, or site in your company environment.</p>\n"
-msgstr ""
-"<p>例如，您可以为您所处公司环境中的特定部门、小组或地点定义一类配置。</p>\n"
+msgstr "<p>例如，您可以为您所处公司环境中的特定部门、小组或地点定义一类配置。</p>\n"
 
 #: src/include/autoinstall/classes.rb:213
 msgid ""
@@ -1190,8 +1198,7 @@
 "creating the classes.</P>\n"
 msgstr ""
 "<p>若您已定义并创建了<b>类</b>，您将能够使用此界面合并这些类来创建一个\n"
-"新<i>方案</i>，该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。\n"
+"新<i>方案</i>，该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。</P>\n"
 
 #: src/include/autoinstall/classes.rb:497
 msgid ""
@@ -1389,9 +1396,7 @@
 #. Some configuration modules removes/exchange the menu bar.
 #. So we have to reset. (bnc#872711)
 #: src/include/autoinstall/conftree.rb:569
-msgid ""
-"Do you really want to apply the settings of the module '%1' to your current "
-"system?"
+msgid "Do you really want to apply the settings of the module '%1' to your current system?"
 msgstr "您真的想要应用模块 '%1' 的设置到您当前系统吗？"
 
 #. opening/parsing the xml file failed
@@ -1406,9 +1411,7 @@
 
 #. FIXME: sucks sucks sucks sucks sucks
 #: src/include/autoinstall/conftree.rb:749
-msgid ""
-"Do you really want to apply the settings of the profile to your current "
-"system?"
+msgid "Do you really want to apply the settings of the profile to your current system?"
 msgstr "您真的想要应用方案中的设置到您当前系统吗？"
 
 #. EXIT
@@ -1545,8 +1548,7 @@
 #: src/include/autoinstall/dialogs.rb:348
 msgid ""
 "Kickstart file was imported.\n"
-"Check the imported syntax and make sure the package selection and "
-"partitioning\n"
+"Check the imported syntax and make sure the package selection and partitioning\n"
 "were imported correctly."
 msgstr ""
 "已导入 Kickstart 文件。\n"
@@ -1584,7 +1586,7 @@
 #. list<any> l = [ "key1",0,"key3" ];
 #. m[ l ] = v;
 #. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
 msgid "Checking XML with RNG validation..."
 msgstr "正在进行 RNG 校验以检查 XML..."
 
@@ -1594,7 +1596,7 @@
 msgstr "部分 %1："
 
 #. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
 msgid "Checking XML with RNC validation..."
 msgstr "正在进行 RNC 校验以检查 XML..."
 
@@ -1633,7 +1635,7 @@
 msgstr "第二阶段后重启计算机"
 
 #: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:121
+#: src/modules/AutoinstGeneral.rb:126
 msgid "Signature Handling"
 msgstr "签名处理"
 
@@ -1678,8 +1680,7 @@
 "The installation confirmation option is selected by default\n"
 "to avoid unwanted installation. It stops the system\n"
 "during installation and shows a summary of requested operations in the\n"
-"usual proposal screen.  Uncheck this option to install automatically without "
-"interruption.\n"
+"usual proposal screen.  Uncheck this option to install automatically without interruption.\n"
 "</P>\n"
 msgstr ""
 "<P>\n"
@@ -1691,14 +1692,12 @@
 #: src/include/autoinstall/general_dialogs.rb:155
 msgid ""
 "<P>\n"
-"If you turn off the second stage of AutoYaST, the installation continues in "
-"manual mode\n"
+"If you turn off the second stage of AutoYaST, the installation continues in manual mode\n"
 "after the first reboot (after package installation).\n"
 "</P>\n"
 msgstr ""
 "<P>\n"
-"若您关闭了 AutoYaST 第二阶段，安装将在首次引导后以手动模式继续 (软件包安装"
-"后)。\n"
+"若您关闭了 AutoYaST 第二阶段，安装将在首次引导后以手动模式继续 (软件包安装后)。\n"
 "</P>\n"
 
 #: src/include/autoinstall/general_dialogs.rb:165
@@ -1842,14 +1841,12 @@
 
 #: src/include/autoinstall/helps.rb:17
 msgid ""
-"<p>This tool uses <em>xmllint</em> to validate the profile against the DTD "
-"and\n"
+"<p>This tool uses <em>xmllint</em> to validate the profile against the DTD and\n"
 "it checks for missing data. Some missing data might be intentional and any\n"
 "reported errors can be ignored, for example, when creating classes.</p>\n"
 msgstr ""
 "<p>此工具使用 <em>xmllint</em> 根据 DTD 校验该方案并检查缺失的数据。\n"
-"某些数据的缺失可能是故意的，任何报告的错误都可以忽略，例如，创建类时的此类错"
-"误。</p>\n"
+"某些数据的缺失可能是故意的，任何报告的错误都可以忽略，例如，创建类时的此类错误。</p>\n"
 
 #: src/include/autoinstall/helps.rb:22
 msgid ""
@@ -1868,15 +1865,13 @@
 "to add more configuration options available with SUSE.</p>\n"
 msgstr ""
 "<p>要导入 Kickstart 文件，请输入配置文件的路径。\n"
-"导入的数据将被加载到配置管理系统中以添加更多可通过 SUSE 使用的配置选项。\n"
+"导入的数据将被加载到配置管理系统中以添加更多可通过 SUSE 使用的配置选项。</p>\n"
 
 #: src/include/autoinstall/helps.rb:31
 msgid ""
 "<p>This tool creates a reference profile by reading\n"
 "information from this system. Select the resources to read from this system\n"
-"in addition to the default resources, like partitioning and package "
-"selections.</p>\n"
+"in addition to the default resources, like partitioning and package selections.</p>\n"
 msgstr ""
 "<p>此工具通过从此系统读取信息创建一个参考方案。\n"
 "请在默认资源外选择一些要从此系统读取的资源，诸如分区和软件包选集。</p>\n"
@@ -1887,8 +1882,7 @@
 
 #: src/include/autoinstall/helps.rb:37
 msgid ""
-"<p>The table to the right shows the partitions to create on the target "
-"system.\n"
+"<p>The table to the right shows the partitions to create on the target system.\n"
 "</p>\n"
 msgstr ""
 "<p>右侧的表显示了要在目标系统上创建的分区。\n"
@@ -1929,12 +1923,9 @@
 #: src/include/autoinstall/helps.rb:53
 msgid ""
 "If no partitions are defined and the specified drive is also\n"
-"the drive where the root partition should reside, the following partitions "
-"are\n"
+"the drive where the root partition should reside, the following partitions are\n"
 "created automatically:"
-msgstr ""
-"若未定义分区且指定的驱动器还是根分区应驻留的驱动器，则系统会自动创建以下分"
-"区："
+msgstr "若未定义分区且指定的驱动器还是根分区应驻留的驱动器，则系统会自动创建以下分区："
 
 #: src/include/autoinstall/helps.rb:58
 msgid ""
@@ -1949,30 +1940,20 @@
 msgstr "<p><b>高级选项</b></p>"
 
 #: src/include/autoinstall/helps.rb:62
-msgid ""
-"By default, AutoYaST will create an extended partition and adds all new "
-"partitions as logical devices. It is possible, however, to instruct AutoYaST "
-"to create a certain partition as a primary partition or as extended "
-"partition. Additionally, it is possible to specify the size of a partition "
-"using sectors rather than size in MBytes."
-msgstr ""
-"默认情况下，AutoYaST2 将创建一个扩展分区并将全部新分区作为逻辑设备进行添加。"
-"但是，可以指示 AutoYaST2 创建一个特定分区作为主分区或扩展分区。另外，也可以使"
-"用扇区而不是 MB 表示的大小来指定分区的大小。"
+msgid "By default, AutoYaST will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes."
+msgstr "默认情况下，AutoYaST2 将创建一个扩展分区并将全部新分区作为逻辑设备进行添加。但是，可以指示 AutoYaST2 创建一个特定分区作为主分区或扩展分区。另外，也可以使用扇区而不是 MB 表示的大小来指定分区的大小。"
 
 #: src/include/autoinstall/helps.rb:65
 msgid ""
 "These options and other advanced options cannot be configured using this\n"
 "interface.  Instead, add them manually to the control file.\n"
-msgstr ""
-"使用此界面无法配置这些选项和其它高级选项。它们只能手动添加到控制文件中。\n"
+msgstr "使用此界面无法配置这些选项和其它高级选项。它们只能手动添加到控制文件中。\n"
 
 #: src/include/autoinstall/helps.rb:68
 msgid ""
 "<p>\n"
 "For LVM and RAID setup, consult the documentation and add the configuration\n"
-"to an existing control file. You can only create unformatted LVM and RAID "
-"partitions as\n"
+"to an existing control file. You can only create unformatted LVM and RAID partitions as\n"
 "a preparation.\n"
 "</p>\n"
 msgstr ""
@@ -1981,67 +1962,6 @@
 "您只可以创建未格式化的 LVM 和 RAID 分区为安装做好准备。\n"
 "</p>\n"
 
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "无法通过 HTTP(S) 协议找到 URL '%1'。服务器返回了代码 %2。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "无法通过 FTP 协议找到 URL '%1'。服务器返回了代码 %2。"
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "读取 %1/%2 上的文件失败。\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "读取 %1 上的文件失败。\n"
-
-#. autoyast tried to mount the CD but had no success.
-#. autoyast tried to mount a NFS directory which failed
-#. autoyast tried to mount a NFS directory which failed
-#: src/include/autoinstall/io.rb:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "挂载 %1 失败。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "读取 CD 上的文件失败。路径：%1/%2."
-
-#. autoyast tried to copy a file via NFS which failed
-#. autoyast tried to copy a file via NFS which failed
-#: src/include/autoinstall/io.rb:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "无法撷取远程文件 %1"
-
-#. this is workaround for bnc#849767
-#. because of changes in autoyast startup this code is now
-#. called much sooner (before Storage stuff is initialized)
-#. call dummy method to trigger Storage initialization
-#: src/include/autoinstall/io.rb:485
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 未挂载，尝试挂载但失败了"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-msgid "File %1 cannot be found"
-msgstr "未找到文件 %1"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "无法通过 TFTP 协议找到 URL '%1'。"
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "未知协议 %1。"
-
 #. Script Configuration
 #. @return  script configuration dialog
 #: src/include/autoinstall/script_dialogs.rb:30
@@ -2076,8 +1996,7 @@
 msgid ""
 "\n"
 "<h3>Postinstallation Scripts</h3>\n"
-"<P>You can also add commands to execute on the system after the "
-"installation\n"
+"<P>You can also add commands to execute on the system after the installation\n"
 "is completed. These scripts are run outside the chroot environment.\n"
 "</P>"
 msgstr ""
@@ -2095,15 +2014,13 @@
 "<P>For your postinstallation script to run inside the chroot\n"
 "environment, choose the <i>chroot scripts</i> options. Those scripts are\n"
 "run before the system reboots for the first time. By default, the chroot \n"
-"scripts are run in the installation system. To access files in the "
-"installed \n"
+"scripts are run in the installation system. To access files in the installed \n"
 "system, always use the mount point \"/mnt\" in your scripts.\n"
 "</P>\n"
 msgstr ""
 "\n"
 "<H3>Chroot 脚本</H3>\n"
-"<P>为了让您的安装后脚本在 chroot 环境中运行，请选择 <i>chroot 脚本</i> 选"
-"项。\n"
+"<P>为了让您的安装后脚本在 chroot 环境中运行，请选择 <i>chroot 脚本</i> 选项。\n"
 "这些脚本将在系统首次重启前运行。chroot 脚本默认是在安装系统中运行的。\n"
 "要访问安装好的系统中的文件，请总是在您的脚本中使用 \"/mnt\" 挂载点。\n"
 "</P>\n"
@@ -2113,14 +2030,12 @@
 msgid ""
 "\n"
 "<p>It is possible to run chroot scripts in a later stage after\n"
-"the boot loader has been configured using the special boolean tag \"chrooted"
-"\".\n"
+"the boot loader has been configured using the special boolean tag \"chrooted\".\n"
 "This runs the scripts in the installed system. \n"
 "</p>\n"
 msgstr ""
 "\n"
-"<p>可以使用特殊布尔标签 \"chrooted\" 让 chroot 脚本在引导加载器已配置好的稍后"
-"阶段运行。\n"
+"<p>可以使用特殊布尔标签 \"chrooted\" 让 chroot 脚本在引导加载器已配置好的稍后阶段运行。\n"
 "这将在安装好的系统中运行这些脚本。\n"
 "</p>\n"
 
@@ -2148,15 +2063,13 @@
 msgid ""
 "\n"
 "<H3>Interpreter:</H3>\n"
-"<P>Preinstallation scripts can only be shell scripts. Do not use <i>Perl</i> "
-"or \n"
+"<P>Preinstallation scripts can only be shell scripts. Do not use <i>Perl</i> or \n"
 "<i>Python</i> for preinstallation scripts.\n"
 "</P>\n"
 msgstr ""
 "\n"
 "<H3>解释器：</H3>\n"
-"<P>安装前脚本只可以是壳层脚本。请不要对安装前脚本使用 <i>Perl</i> 或 "
-"<i>Python</i> 解释器。\n"
+"<P>安装前脚本只可以是壳层脚本。请不要对安装前脚本使用 <i>Perl</i> 或 <i>Python</i> 解释器。\n"
 "因为它们在安装前的计算机中并不存在。</P>\n"
 
 #: src/include/autoinstall/script_dialogs.rb:133
@@ -2165,19 +2078,15 @@
 "<H3>Network Access:</H3>\n"
 "<P>While executing postinstallation scripts, the network is disabled and\n"
 "requires initialization in the scripts to make the network accessible. An\n"
-"alternative for postinstallation scripts with network is using init scripts, "
-"which\n"
-"guarantee a fully configured system when running the scripts. If you did an "
-"installation\n"
-"over a network, you can use the <b>Network</b> option for the postscript, "
-"too.\n"
+"alternative for postinstallation scripts with network is using init scripts, which\n"
+"guarantee a fully configured system when running the scripts. If you did an installation\n"
+"over a network, you can use the <b>Network</b> option for the postscript, too.\n"
 "</P>\n"
 msgstr ""
 "\n"
 "<H3>网络访问：</H3>\n"
 "<P>执行安装后脚本时，网络是禁用的，需要在脚本中进行初始化以使网络可访问。\n"
-"带网络访问的安装后脚本的替代品就是启动脚本，其保证了脚本运行时系统已经完全配"
-"置好了。\n"
+"带网络访问的安装后脚本的替代品就是启动脚本，其保证了脚本运行时系统已经完全配置好了。\n"
 "若您正在通过网络执行安装，您也可以为安装后脚本使用<b>网络</b>选项。\n"
 " </P>\n"
 
@@ -2185,17 +2094,14 @@
 msgid ""
 "\n"
 "<H3>Feedback and Debug:</H3>\n"
-"<P>All scripts except the init scripts can show STDOUT+STDERR in a pop-up "
-"box as feedback.\n"
-"If you turn on debugging, you get more output in the feedback dialog that "
-"might help\n"
+"<P>All scripts except the init scripts can show STDOUT+STDERR in a pop-up box as feedback.\n"
+"If you turn on debugging, you get more output in the feedback dialog that might help\n"
 "you to debug your script.</P>\n"
 msgstr ""
 "\n"
 "<H3>反馈和调试：</H3>\n"
 "<P>除启动脚本外的全部脚本都能在弹出框中显示 STDOUT + STDERR 作为反馈。\n"
-"若您打开了调试，您会在反馈对话框中获得更多输出，这可能会对您调试脚本有所帮"
-"助。</P>\n"
+"若您打开了调试，您会在反馈对话框中获得更多输出，这可能会对您调试脚本有所帮助。</P>\n"
 
 #: src/include/autoinstall/script_dialogs.rb:155
 msgid "Script Editor"
@@ -2280,13 +2186,11 @@
 #: src/include/autoinstall/script_dialogs.rb:474
 msgid ""
 "<p>\n"
-"By adding scripts to the autoinstallation process, customize the "
-"installation for\n"
+"By adding scripts to the autoinstallation process, customize the installation for\n"
 "your needs and take control in different stages of the installation.</p>\n"
 msgstr ""
 "<p>\n"
-"通过将脚本添加到自动安装过程，您可根据您的需要自定义安装并在安装的不同阶段实"
-"施控制。</p>\n"
+"通过将脚本添加到自动安装过程，您可根据您的需要自定义安装并在安装的不同阶段实施控制。</p>\n"
 
 #: src/include/autoinstall/script_dialogs.rb:480
 msgid "User Script Management"
@@ -2312,14 +2216,12 @@
 #. @param [String] result_profile the resulting control file path
 #. @return [Boolean] true on success
 #. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:744
-msgid ""
-"The XML parser reported an error while parsing the autoyast profile. The "
-"error message is:\n"
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
+msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为：\n"
 
 #. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
 msgid ""
 "\n"
 "User-defined classes could not be retrieved.  Make sure all classes \n"
@@ -2328,51 +2230,50 @@
 "file without using classes.\n"
 msgstr ""
 "\n"
-"无法撷取用户定义的类。请确认全部类均定义正确并可通过网络或本地在此系统上使"
-"用。\n"
+"无法撷取用户定义的类。请确认全部类均定义正确并可通过网络或本地在此系统上使用。\n"
 "无法使用不带类的原始控制文件安装系统。\n"
 
 #. The line above needs to be fixed when we have more attributes
 #. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:273
+#: src/modules/AutoinstConfig.rb:279
 msgid "Choose Profile"
 msgstr "选择方案"
 
 #. SetProtocolMessage ()
 #. @return [void]
-#: src/modules/AutoinstConfig.rb:329
+#: src/modules/AutoinstConfig.rb:335
 msgid "Retrieving control file from floppy."
 msgstr "正在软盘中撷取控制文件。"
 
-#: src/modules/AutoinstConfig.rb:332
+#: src/modules/AutoinstConfig.rb:338
 msgid "Retrieving control file (%1) from TFTP server: %2."
 msgstr "正在从 TFTP 服务器中撷取控制文件(%1)：%2。"
 
-#: src/modules/AutoinstConfig.rb:338
+#: src/modules/AutoinstConfig.rb:344
 msgid "Retrieving control file (%1) from NFS server: %2."
 msgstr "正在从 NFS 服务器中撷取控制文件(%1)：%2。"
 
-#: src/modules/AutoinstConfig.rb:344
+#: src/modules/AutoinstConfig.rb:350
 msgid "Retrieving control file (%1) from HTTP server: %2."
 msgstr "正在从 HTTP 服务器中撷取控制文件(%1)：%2。"
 
-#: src/modules/AutoinstConfig.rb:350
+#: src/modules/AutoinstConfig.rb:356
 msgid "Retrieving control file (%1) from FTP server: %2."
 msgstr "正在从 FTP 服务器中撷取控制文件(%1)：%2。"
 
-#: src/modules/AutoinstConfig.rb:356
+#: src/modules/AutoinstConfig.rb:362
 msgid "Copying control file from file: %1."
 msgstr "正在从文件中复制控制文件：%1。"
 
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:367
 msgid "Copying control file from device: /dev/%1."
 msgstr "正在从设备中复制控制文件：/dev/%1。"
 
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:371
 msgid "Copying control file from default location."
 msgstr "正在从默认位置复制控制文件。"
 
-#: src/modules/AutoinstConfig.rb:367
+#: src/modules/AutoinstConfig.rb:373
 msgid "Source unknown."
 msgstr "未知来源。"
 
@@ -2382,7 +2283,7 @@
 #. {
 #. local_rules_file = (string)WFM::Args(1);
 #. }
-#: src/modules/AutoinstConfig.rb:447
+#: src/modules/AutoinstConfig.rb:453
 msgid ""
 "<h3>AutoYaST Configuration Management System</h3>\n"
 "<p>Almost all resources of the control file can be\n"
@@ -2391,12 +2292,10 @@
 "<h3>AutoYaST 配置管理系统</h3>\n"
 "<p>使用配置管理系统几乎可以配置控制文件的全部资源。</p>\n"
 
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:458
 msgid ""
-"<p>Most of the modules used to create the configuration are identical to "
-"those available\n"
-"through the YaST Control Center. Instead of configuring this system, the "
-"data\n"
+"<p>Most of the modules used to create the configuration are identical to those available\n"
+"through the YaST Control Center. Instead of configuring this system, the data\n"
 "entered is collected and exported to the control file that can be used to\n"
 "install another system using AutoYaST.\n"
 "</p>\n"
@@ -2406,15 +2305,12 @@
 "而该文件可通过 AutoYaST 用于安装另一个系统。\n"
 "</p>\n"
 
-#: src/modules/AutoinstConfig.rb:459
+#: src/modules/AutoinstConfig.rb:465
 msgid ""
 "<p>In addition to the existing and familiar modules,\n"
-"new interfaces were created for special and complex configurations, "
-"including\n"
+"new interfaces were created for special and complex configurations, including\n"
 "partitioning, general options, and software.</p>\n"
-msgstr ""
-"<p>除已有模块和大家都熟悉的模块外，我们还为特殊和复杂的配置创建了新的接口，这"
-"些接口包括分区、常规选项和软件。</p>\n"
+msgstr "<p>除已有模块和大家都熟悉的模块外，我们还为特殊和复杂的配置创建了新的接口，这些接口包括分区、常规选项和软件。</p>\n"
 
 #. Construct node name for display in tree.
 #.
@@ -2440,79 +2336,97 @@
 
 #. string language_name		= "";
 #. string keyboard_name		= "";
-#: src/modules/AutoinstGeneral.rb:85
+#: src/modules/AutoinstGeneral.rb:90
 msgid "Confirm installation?"
 msgstr "确认安装吗？"
 
-#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
-#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110
-#: src/modules/AutoinstGeneral.rb:117
+#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:108 src/modules/AutoinstGeneral.rb:115
+#: src/modules/AutoinstGeneral.rb:122
 msgid "Yes"
 msgstr "是"
 
-#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
-#: src/modules/AutoinstGeneral.rb:103
+#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:108
 msgid "No"
 msgstr "否"
 
-#: src/modules/AutoinstGeneral.rb:91
+#: src/modules/AutoinstGeneral.rb:96
 msgid "Second Stage of AutoYaST"
 msgstr "AutoYaST 第二阶段"
 
-#: src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:104
 msgid "Halting the machine after stage one"
 msgstr "第一阶段后挂起计算机"
 
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:113
 msgid "Halting the machine after stage two"
 msgstr "第二阶段后挂起计算机"
 
-#: src/modules/AutoinstGeneral.rb:115
+#: src/modules/AutoinstGeneral.rb:120
 msgid "Reboot the machine after stage two"
 msgstr "第二阶段后重启计算机"
 
-#: src/modules/AutoinstGeneral.rb:125
+#: src/modules/AutoinstGeneral.rb:130
 msgid "Accepting unsigned files"
 msgstr "接受未签名文件"
 
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:131
 msgid "Not accepting unsigned files"
 msgstr "不接受未签名文件"
 
-#: src/modules/AutoinstGeneral.rb:135
+#: src/modules/AutoinstGeneral.rb:140
 msgid "Accepting files without a checksum"
 msgstr "接受没有校验和的文件"
 
-#: src/modules/AutoinstGeneral.rb:136
+#: src/modules/AutoinstGeneral.rb:141
 msgid "Not accepting files without a checksum"
 msgstr "不接受没有校验和的文件"
 
-#: src/modules/AutoinstGeneral.rb:145
+#: src/modules/AutoinstGeneral.rb:150
 msgid "Accepting failed verifications"
 msgstr "接受失败的验证"
 
-#: src/modules/AutoinstGeneral.rb:146
+#: src/modules/AutoinstGeneral.rb:151
 msgid "Not accepting failed verifications"
 msgstr "不接受失败的验证"
 
-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:156
 msgid "Accepting unknown GPG keys"
 msgstr "接受未知 GPG 密钥"
 
-#: src/modules/AutoinstGeneral.rb:152
+#: src/modules/AutoinstGeneral.rb:157
 msgid "Not accepting unknown GPG Keys"
 msgstr "不接受未知 GPG 密钥"
 
-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:162
 msgid "Importing new GPG keys"
 msgstr "导入新 GPG 密钥"
 
-#: src/modules/AutoinstGeneral.rb:158
+#: src/modules/AutoinstGeneral.rb:163
 msgid "Not importing new GPG Keys"
 msgstr "不导入新 GPG 密钥"
 
+#. NTP syncing
+#: src/modules/AutoinstGeneral.rb:419
+msgid "Syncing time..."
+msgstr "正在同步时间..."
+
+#. TRANSLATORS: %s is the name of the ntp server
+#: src/modules/AutoinstGeneral.rb:421
+msgid "Syncing time with %s."
+msgstr "正与 %s 同步时间。"
+
+#: src/modules/AutoinstGeneral.rb:425
+msgid "Time syncing failed."
+msgstr "时间同步失败。"
+
+#: src/modules/AutoinstGeneral.rb:429
+msgid "Cannot update system time."
+msgstr "无法更新系统时间。"
+
 #. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:111
+#: src/modules/AutoinstLVM.rb:113
 msgid "Cannot reuse volume group %1. The volume group does not exist."
 msgstr "无法复用卷组 %1。该卷组不存在。"
 
@@ -2528,71 +2442,71 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
 msgid "Drives"
 msgstr "驱动器"
 
 #. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
 msgid "%s drive in total"
 msgid_plural "%s drives in total"
 msgstr[0] "共 %s 个驱动器"
 
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
 msgid "Not yet cloned."
 msgstr "尚未克隆。"
 
 #. Return Summary
 #. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
 msgid "Preinstallation Scripts"
 msgstr "安装前脚本"
 
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
 msgid "Postinstallation Scripts"
 msgstr "安装后脚本"
 
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
 msgid "Chroot Scripts"
 msgstr "Chroot 脚本"
 
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
 msgid "Init Scripts"
 msgstr "启动脚本"
 
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
 msgid "Postpartitioning Scripts"
 msgstr "分区后脚本"
 
 #. return type of script as formatted string
 #. @param script type
 #. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
 msgid "Pre"
 msgstr "安装前"
 
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
 msgid "Post"
 msgstr "安装后"
 
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
 msgid "Init"
 msgstr "启动"
 
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
 msgid "Chroot"
 msgstr "Chroot"
 
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
 msgid "Postpartitioning"
 msgstr "分区后"
 
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
 msgid "Unknown"
 msgstr "未知"
 
 #. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:171
+#: src/modules/AutoinstSoftware.rb:174
 msgid ""
 "These packages could not be found in the software repositories:\n"
 "%1"
@@ -2602,53 +2516,48 @@
 
 #. 4 means "already exists"
 #. Add add-ons
-#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
 msgid "Adding repo %1 failed"
 msgstr "添加软件源 %1 失败"
 
 #. Install
-#: src/modules/AutoinstSoftware.rb:373
-msgid ""
-"Image creation failed while pattern installation. Please check /tmp/ay_image."
-"log"
+#: src/modules/AutoinstSoftware.rb:377
+msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
 msgstr "映像创建失败于软件集安装环节。请检查 /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:381
+#: src/modules/AutoinstSoftware.rb:385
 msgid "Creating Image - installing packages"
 msgstr "正在创建映像 - 安装软件包"
 
-#: src/modules/AutoinstSoftware.rb:391
-msgid ""
-"Image creation failed while package installation. Please check /tmp/ay_image."
-"log"
+#: src/modules/AutoinstSoftware.rb:395
+msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
 msgstr "映像创建失败于软件包安装环节。请检查 /tmp/ay_image.log"
 
 #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:402
+#: src/modules/AutoinstSoftware.rb:406
 msgid "Store image to ..."
 msgstr "存储映像到..."
 
 #. Compress image:
 #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*"  .
-#: src/modules/AutoinstSoftware.rb:431
+#: src/modules/AutoinstSoftware.rb:435
 msgid ""
 "You can do changes to the image now in %1/\n"
-"If you press the ok-button, the image will be compressed and can't be "
-"changed anymore."
+"If you press the ok-button, the image will be compressed and can't be changed anymore."
 msgstr ""
 "您现在可以在 %1/ 修改映像。\n"
 "您若按下确认按钮，%1/ 将被压缩成映像，便再也不能修改了。"
 
-#: src/modules/AutoinstSoftware.rb:445
+#: src/modules/AutoinstSoftware.rb:449
 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
 msgstr "映像压缩失败于 '%1'。请检查 /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:452
+#: src/modules/AutoinstSoftware.rb:456
 msgid "Image created successfully"
 msgstr "已成功创建映像"
 
 #. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:488
+#: src/modules/AutoinstSoftware.rb:492
 msgid ""
 "can not get the directory.yast file at `%1`.\n"
 "You can create that file with 'ls -F > directory.yast' if it's missing."
@@ -2657,33 +2566,32 @@
 "若缺失了它，您可以通过 'ls -F > directory.yast' 命令创建该文件。"
 
 #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:522
+#: src/modules/AutoinstSoftware.rb:526
 msgid "can not read '%1'. Try again?"
 msgstr "无法读取 '%1'。重试吗？"
 
 #. copy a file
-#: src/modules/AutoinstSoftware.rb:540
+#: src/modules/AutoinstSoftware.rb:544
 msgid "can not read '%1'. ISO creation failed"
 msgstr "无法读取 '%1'。创建 ISO 失败"
 
 #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:570
+#: src/modules/AutoinstSoftware.rb:574
 msgid "Preparing ISO Filestructure ..."
 msgstr "正在准备 ISO 文件结构..."
 
 #. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:619
+#: src/modules/AutoinstSoftware.rb:623
 msgid "boot config for the DVD"
 msgstr "DVD 引导配置"
 
-#: src/modules/AutoinstSoftware.rb:623
+#: src/modules/AutoinstSoftware.rb:627
 msgid "Ok"
 msgstr "好呢"
 
-#: src/modules/AutoinstSoftware.rb:626
+#: src/modules/AutoinstSoftware.rb:630
 msgid ""
-"You can do changes to the ISO now in %1, like adding a complete different "
-"AutoYaST XML file.\n"
+"You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
 "If you press the ok-button, the iso will be created."
 msgstr ""
 "您现在可以在 %1 修改 ISO，比如添加一个完全不同的 AutoYaST XML 文件。\n"
@@ -2691,53 +2599,49 @@
 
 #. create the actual ISO file
 #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:645
+#: src/modules/AutoinstSoftware.rb:649
 msgid "Store ISO image to ..."
 msgstr "存储 ISO 映像到..."
 
-#: src/modules/AutoinstSoftware.rb:646
+#: src/modules/AutoinstSoftware.rb:650
 msgid "Creating ISO File ..."
 msgstr "正在创建 ISO 文件..."
 
-#: src/modules/AutoinstSoftware.rb:667
+#: src/modules/AutoinstSoftware.rb:671
 msgid "ISO successfully created at %1"
 msgstr "ISO 成功创建于 %1"
 
 #. Summary
 #. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:743
+#: src/modules/AutoinstSoftware.rb:753
 msgid "Selected Patterns"
 msgstr "所选软件集"
 
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:763
 msgid "Individually Selected Packages"
 msgstr "单选的软件包"
 
-#: src/modules/AutoinstSoftware.rb:759
+#: src/modules/AutoinstSoftware.rb:769
 msgid "Packages to Remove"
 msgstr "待移除软件包"
 
-#: src/modules/AutoinstSoftware.rb:766
+#: src/modules/AutoinstSoftware.rb:776
 msgid "Force Kernel Package"
 msgstr "强制内核软件包"
 
 #. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:856
+#: src/modules/AutoinstSoftware.rb:871
 msgid "Could not set patterns: %1."
 msgstr "无法设置软件集：%1。"
 
 #. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:917
-msgid ""
-"The package resolver run failed. Please check your software section in the "
-"autoyast profile."
+#: src/modules/AutoinstSoftware.rb:932
+msgid "The package resolver run failed. Please check your software section in the autoyast profile."
 msgstr "软件包依赖关系解决器运行失败。请检查 autoyast 方案中的软件部分。"
 
 #. 1 cyl buffer per partition
 #: src/modules/AutoinstStorage.rb:494
-msgid ""
-"The partition plan configured in your XML profile does not fit on the hard "
-"disk. %1MB missing"
+msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"
 msgstr "在您的 XML 方案中配置的分区计划并不适合该硬盘。缺少 %1MB"
 
 #: src/modules/AutoinstStorage.rb:917
@@ -2774,14 +2678,14 @@
 
 #. Prepare Profile for saving and remove empty data structs
 #. @return [void]
-#: src/modules/Profile.rb:357
+#: src/modules/Profile.rb:363
 msgid "Collecting configuration data..."
 msgstr "正在嵬集配置数据..."
 
 #. Save YCP data into XML
 #. @param  path to file
 #. @return	[Boolean] true on success
-#: src/modules/Profile.rb:460
+#: src/modules/Profile.rb:466
 msgid "Encrypted AutoYaST profile. Enter the password twice."
 msgstr "加密的 AutoYaST 方案。请输入两次密码。"
 
@@ -2789,14 +2693,14 @@
 #.
 #. @param [String] dir - directory to store section xml files in
 #. @return	  - list of filenames
-#: src/modules/Profile.rb:534
+#: src/modules/Profile.rb:540
 msgid "Could not write section %1 to file %2."
 msgstr "无法将部分 %1 写入到文件 %2。"
 
 #. Read XML into  YCP data
 #. @param  path to file
 #. @return	[Boolean]
-#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
 msgid "Encrypted AutoYaST profile. Enter the correct password."
 msgstr "加密的 AutoYaST 方案。请输入正确的密码。"
 
@@ -2814,24 +2718,39 @@
 msgid "&OK"
 msgstr "好呢(&O)"
 
-#~ msgid "Configure users and groups"
-#~ msgstr "配置用户和组"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "无法通过 HTTP(S) 协议找到 URL '%1'。服务器返回了代码 %2。"
 
-#~ msgid "Importing users and groups configuration..."
-#~ msgstr "正在导入用户和组配置..."
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "无法通过 FTP 协议找到 URL '%1'。服务器返回了代码 %2。"
 
-#~ msgid "Syncing time..."
-#~ msgstr "正在同步时间..."
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "读取 %1/%2 上的文件失败。\n"
 
-#~ msgid "Syncing time with %s."
-#~ msgstr "正与 %s 同步时间。"
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "读取 %1 上的文件失败。\n"
 
-#~ msgid "Time syncing failed."
-#~ msgstr "时间同步失败。"
+#~ msgid "Mounting %1 failed."
+#~ msgstr "挂载 %1 失败。"
 
-#~ msgid "Cannot update system time."
-#~ msgstr "无法更新系统时间。"
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "读取 CD 上的文件失败。路径：%1/%2."
 
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "无法撷取远程文件 %1"
+
+#~ msgid "%1 is not mounted and mount failed"
+#~ msgstr "%1 未挂载，尝试挂载但失败了"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "未找到文件 %1"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "无法通过 TFTP 协议找到 URL '%1'。"
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "未知协议 %1。"
+
 #~ msgid "Configure runlevel"
 #~ msgstr "配置运行级别"
 
@@ -2853,25 +2772,18 @@
 #~ msgid ""
 #~ "\n"
 #~ "<P>Enter the partition information according to your\n"
-#~ "needs. To reuse an existing partition, enter the partition number of the "
-#~ "existing partition to reuse (counting starts with partition number 1) and "
-#~ "no size.</P>\n"
+#~ "needs. To reuse an existing partition, enter the partition number of the existing partition to reuse (counting starts with partition number 1) and no size.</P>\n"
 #~ "<p>\n"
-#~ "For partitions that are part of a volume group (not the logical "
-#~ "partitions inside a volume group), set the partition ID to 0x8e then "
-#~ "choose the volume group. The volume group must already be set up with "
-#~ "AutoYaST.\n"
+#~ "For partitions that are part of a volume group (not the logical partitions inside a volume group), set the partition ID to 0x8e then choose the volume group. The volume group must already be set up with AutoYaST.\n"
 #~ "</p>\n"
 #~ "<P>For more information, refer to the online documentation.\n"
 #~ "</P>\n"
 #~ msgstr ""
 #~ "\n"
 #~ "<P>根据需要输入分区信息。\n"
-#~ " 要重新使用现有分区，请输入要重新使用的现有分区的分区号(从分区号 1 开始计"
-#~ "数)，但不输入大小。</P>\n"
+#~ " 要重新使用现有分区，请输入要重新使用的现有分区的分区号(从分区号 1 开始计数)，但不输入大小。</P>\n"
 #~ " <p>\n"
-#~ " 对于卷组中包含的分区(不是卷组中的逻辑分区)，需要将分区 ID 设置为 0x8e，然"
-#~ "后选择卷组。卷组必须已用 AutoYaST 设置。\n"
+#~ " 对于卷组中包含的分区(不是卷组中的逻辑分区)，需要将分区 ID 设置为 0x8e，然后选择卷组。卷组必须已用 AutoYaST 设置。\n"
 #~ " </p>\n"
 #~ " <P>有关更多信息，请参阅联机文档。\n"
 #~ " </P>\n"
@@ -2930,15 +2842,12 @@
 #~ msgid ""
 #~ "\n"
 #~ "<P>\n"
-#~ "Create and edit your volume groups here. After that, assign physical "
-#~ "partitions to this volume group in the partition dialog of a physical "
-#~ "hard disk. Set the partition ID to 0x8e for those partitions.\n"
+#~ "Create and edit your volume groups here. After that, assign physical partitions to this volume group in the partition dialog of a physical hard disk. Set the partition ID to 0x8e for those partitions.\n"
 #~ "</P>\n"
 #~ msgstr ""
 #~ "\n"
 #~ "<P>\n"
-#~ " 在此处创建和编辑卷组。此后，需要在物理硬盘的分区对话框中向此卷组指定物理"
-#~ "分区。将那些分区的分区 ID 设置为 0x8e。\n"
+#~ " 在此处创建和编辑卷组。此后，需要在物理硬盘的分区对话框中向此卷组指定物理分区。将那些分区的分区 ID 设置为 0x8e。\n"
 #~ " </P>\n"
 
 #~ msgid "&Volume Group"
@@ -2973,9 +2882,6 @@
 #~ "有关更多信息，请参考文档。\n"
 #~ "</P>\n"
 
-#~ msgid "Configure Drives"
-#~ msgstr "配置驱动器"
-
 #~ msgid "&Drive"
 #~ msgstr "驱动器(&D)"
 

Modified: trunk/yast/zh_CN/po/base.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/base.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/base.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2016-06-05 16:52+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -86,79 +86,79 @@
 msgstr "此 YaST2 模块不支持命令行界面。"
 
 #. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
 msgid "Use 'help' for a complete list of available commands."
 msgstr "请使用 'help' 来查看可用命令的完整列表。"
 
 #. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
 msgid "Use 'yast2 %1 help' for a complete list of available commands."
 msgstr "请使用 'yast2 %1 help' 来查看可用命令的完整列表。"
 
 #. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
 msgid "Unknown Command: %1"
 msgstr "未知命令：%1"
 
 #. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
 msgid "Option '%1' is missing value."
 msgstr "选项 '%1' 缺少值。"
 
 #. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
 msgid "Unknown option for command '%1': %2"
 msgstr "命令 '%1' 的选项未知：%2"
 
 #. translators: error message, %2 is the value given
 #. translators: error message, %2 is the value given
 #. translators: error message, %2 is the value given
-#: library/commandline/src/modules/CommandLine.rb:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
 msgid "Invalid value for option '%1': %2"
 msgstr "选项 '%1' 的值无效：%2"
 
 #. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
 msgid "Invalid value for option '%1' -- expected '%2', received %3"
 msgstr "选项 '%1' 的值无效 -- 预期为 '%2'，收到了 %3"
 
 #. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
 msgid "Option '%1' cannot have a value. Given value: %2"
 msgstr "选项 '%1' 无法赋值。给定值：%2"
 
 #. translators: error message, how to get command line help for interactive mode
 #. %1 is the module name, %2 is the action name
-#: library/commandline/src/modules/CommandLine.rb:541
+#: library/commandline/src/modules/CommandLine.rb:533
 msgid "Use '%1 %2 help' for a complete list of available options."
 msgstr "请使用 '%1 %2 help' 来查看可用选项的完整列表。"
 
 #. translators: error message, how to get command line help for non-interactive mode
 #. %1 is the module name, %2 is the action name
-#: library/commandline/src/modules/CommandLine.rb:551
+#: library/commandline/src/modules/CommandLine.rb:543
 msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
 msgstr "请使用 'yast2 %1 %2 help' 来查看可用选项的完整列表。"
 
 #. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
 msgid "YaST Configuration Module %1\n"
 msgstr "YaST 配置模块 %1\n"
 
 #. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
 msgid "No help available"
 msgstr "无帮助可用"
 
 #. Process <command> "help"
 #. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
 msgid "Command '%1'"
 msgstr "命令 '%1'"
 
 #. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
 msgid ""
 "\n"
 "    Options:"
@@ -167,7 +167,7 @@
 "    选项："
 
 #. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
 msgid ""
 "\n"
 "    Options of the [string] type must be written in the form 'option=value'."
@@ -176,7 +176,7 @@
 "    [string] 类型的选项必须以 '选项=值' 的格式书写。"
 
 #. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
 msgid ""
 "\n"
 "    Example:"
@@ -185,141 +185,137 @@
 "    示例："
 
 #. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
 msgid "This is a YaST module."
 msgstr "这是一个 YaST 模块。"
 
 #. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
 msgid "Basic Syntax:"
 msgstr "基本语法："
 
 #. translators: module command line help, %1 is the module name
 #. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
 msgid "    yast2 %1 <command> [verbose] [options]"
 msgstr "    yast2 %1 <命令> [详细命令] [选项]"
 
 #. translators: module command line help, %1 is the module name
 #. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
 msgid "    yast2 %1 <command> help"
 msgstr "    yast2 %1 <命令> help"
 
 #. translators: module command line help
 #. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
 msgid "    <command> [options]"
 msgstr "    <命令> [选项]"
 
 #. translators: module command line help
 #. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
 msgid "    <command> help"
 msgstr "    <命令> help"
 
 #. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
 msgid "Commands:"
 msgstr "命令："
 
 #. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
 msgid "No help available."
 msgstr "无帮助可用。"
 
 #. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
 msgid ""
 msgstr "<错误：无效帮助>"
 
 #. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
 msgid "Run 'yast2 %1 <command> help' for a list of available options."
 msgstr "请运行 'yast2 %1 <命令> help' 来查看可用选项的列表。"
 
 #. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
-msgid ""
-"Target file name ('xmlfile' option) is missing. Use "
-"xmlfile= command line option."
+#: library/commandline/src/modules/CommandLine.rb:930
+msgid "Target file name ('xmlfile' option) is missing. Use xmlfile= command line option."
 msgstr "缺少目标文件名 ('xmlfile' 选项)。请使用 xmlfile=<目标_XML_文件> 命令行选项。"
 
 #. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
-msgid ""
-"Target file name ('xmlfile' option) is empty. Use xmlfile= "
-"command line option."
+#: library/commandline/src/modules/CommandLine.rb:942
+msgid "Target file name ('xmlfile' option) is empty. Use xmlfile= command line option."
 msgstr "目标文件名 ('xmlfile' 选项) 为空。请使用 xmlfile=<目标_XML_文件> 命令行选项。"
 
 #. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
 msgid "unknown"
 msgstr "未知"
 
 #. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
 msgid "or '%1'"
 msgstr "或 '%1'"
 
 #. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
 msgid "Specify the command '%1'."
 msgstr "请指定命令 '%1'。"
 
 #. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
 msgid "Specify one of the commands: %1."
 msgstr "请仅指定以下命令之一：%1。"
 
 #. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
 msgid "Specify only one of the commands: %1."
 msgstr "请仅指定以下命令之一：%1。"
 
 #. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
 msgid "There is no user interface available for this module."
 msgstr "此模块没有可用的用户界面。"
 
 #. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
 msgid "Ready"
 msgstr "就绪"
 
 #. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
 msgid "Initializing"
 msgstr "正在初始化"
 
 #. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
 msgid "Finishing"
 msgstr "正在完成"
 
 #. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
 msgid "Done"
 msgstr "完毕"
 
 #. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
 msgid "Quitting (without changes)"
 msgstr "退出(不修改)"
 
 #. prompt message displayed in the commandline mode
 #. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
 msgid "yes or no?"
 msgstr "是或否？"
 
 #. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
 msgid "yes"
 msgstr "是"
 
 #. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
 msgid "no"
 msgstr "否"
 
@@ -400,7 +396,7 @@
 #. for translators: use the localized page for your language if it exists,
 #. check the combo box "In other laguages" on top of the page
 #: library/control/src/modules/InstError.rb:167
-#: library/control/src/modules/ProductControl.rb:1450
+#: library/control/src/modules/ProductControl.rb:1435
 msgid "http://en.opensuse.org/Bugs/YaST"
 msgstr "http://en.opensuse.org/Bugs/YaST"
 
@@ -413,7 +409,7 @@
 #. from YaST logs.
 #.
 #. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
 msgid "Installation Error"
 msgstr "安装出错"
 
@@ -436,7 +432,7 @@
 msgstr "正在从内存中移除软件包 '%s'"
 
 #. error report
-#: library/control/src/modules/ProductControl.rb:1259
+#: library/control/src/modules/ProductControl.rb:1244
 msgid "No workflow defined for this installation mode."
 msgstr "没有为此安装方式定义工作流程。"
 
@@ -495,7 +491,7 @@
 
 #. make sure that every workflow is merged only once
 #. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
 msgid "An internal error occurred when integrating additional workflow."
 msgstr "整合附加工作流程时发生内部错误。"
 
@@ -547,7 +543,7 @@
 #. radio button
 #: library/cwm/src/modules/CWMServiceStart.rb:255
 #: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
 msgid "During Boot"
 msgstr "引导期间"
 
@@ -556,7 +552,7 @@
 #. radio button
 #: library/cwm/src/modules/CWMServiceStart.rb:257
 #: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
 msgid "Manually"
 msgstr "手动"
 
@@ -566,22 +562,22 @@
 msgstr "通过 xinetd"
 
 #. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
 msgid "Via &xinetd"
 msgstr "通过 &xinetd"
 
 #. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
 msgid "Service Start"
 msgstr "启动服务"
 
 #. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
 msgid "Service is running"
 msgstr "服务正在运行"
 
 #. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
 msgid "Service is not running"
 msgstr "服务未运行"
 
@@ -590,7 +586,7 @@
 #. %1 is eg. "Start the Service Now"
 #. %2 is eg. "Stop the Service Now"
 #. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
 msgid ""
 "<p><b><big>Switch On or Off</big></b><br>\n"
 "To start or stop the service immediately, use \n"
@@ -603,55 +599,55 @@
 #. %3 is push button label, eg. "Save Changes and Restart Service Now"
 #. (without quotes)
 #. note: %3 is correct, do not replace with %1!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
 msgid ""
 "<p>To save all changes and restart the\n"
 "service immediately, use <b>%3</b>.</p>\n"
 msgstr "<p>要立即保存全部修改并重启服务，请使用 <b>%3</b>。</p>\n"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
 msgid "Start the Service Now"
 msgstr "立即启动服务"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
 msgid "Stop the Service Now"
 msgstr "立即停止服务"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
 msgid "Save Changes and Restart Service Now"
 msgstr "立即保存修改并重启服务"
 
 #. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
 msgid "&Start the Service Now"
 msgstr "立即启动服务(&S)"
 
 #. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
 msgid "S&top the Service Now"
 msgstr "立即停止服务(&T)"
 
 #. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
 msgid "S&ave Changes and Restart Service Now"
 msgstr "立即保存修改并重启服务(&A)"
 
 #. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
 msgid "Switch On and Off"
 msgstr "打开和关闭"
 
 #. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
 msgid "Current Status: "
 msgstr "当前状态："
 
 #. help text for LDAP enablement widget
 #. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
 msgid ""
 "<p><b><big>LDAP Support</big></b><br>\n"
 "To store the settings in LDAP instead of native configuration files,\n"
@@ -661,12 +657,12 @@
 "要将设置存放在 LDAP 而非原生配置文件中，请设定 <b>%1</b>。</p>"
 
 #. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
 msgid "LDAP Support Active"
 msgstr "LDAP 支持处于活动状态"
 
 #. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
 msgid "&LDAP Support Active"
 msgstr "&LDAP 支持处于活动状态"
 
@@ -678,7 +674,7 @@
 #. push button
 #. push button
 #. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
 #: library/cwm/src/modules/TablePopup.rb:940
 #: library/general/src/modules/Label.rb:166
 msgid "&Up"
@@ -686,7 +682,7 @@
 
 #. push button
 #. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
 #: library/cwm/src/modules/TablePopup.rb:942
 msgid "&Down"
 msgstr "向下(&D)"
@@ -728,12 +724,12 @@
 msgstr "指定文件已存在。覆盖它吗？"
 
 #. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
 msgid "The TSIG key ID was not specified."
 msgstr "未指定事务数字签名 (TSIG) 密钥 ID。"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
 msgid ""
 "The key with the specified ID exists and is used.\n"
 "Remove it?"
@@ -742,7 +738,7 @@
 "移除它吗？"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
 msgid ""
 "A key with the specified ID was found\n"
 "on your disk. Remove it?"
@@ -751,27 +747,27 @@
 "移除它吗？"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
 msgid "The key will be created now. Continue?"
 msgstr "现在将创建密钥。继续吗？"
 
 #. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
 msgid "Creating the TSIG key failed."
 msgstr "创建事务数字签名 (TSIG) 密钥失败。"
 
 #. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
 msgid "The specified file does not exist."
 msgstr "指定文件不存在。"
 
 #. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
 msgid "The specified file does not contain any TSIG key."
 msgstr "指定文件不包含任何事务数字签名 (TSIG) 密钥。"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
 msgid ""
 "The specified file contains a TSIG key with the same\n"
 "identifier as some of already present keys.\n"
@@ -782,7 +778,7 @@
 "旧密钥将被移除。继续吗？"
 
 #. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
 msgid ""
 "<p><big><b>TSIG Key Management</b></big><br>\n"
 "Use this dialog to manage the TSIG keys.</p>\n"
@@ -791,19 +787,18 @@
 "使用此对话框管理事务数字签名密钥。</p>\n"
 
 #. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
 msgid ""
 "<p><big><b>Adding an Existing TSIG Key</b></big><br>\n"
 "To add an already created TSIG key, select a <b>Filename</b> of the file\n"
 "containing the key and click <b>Add</b>.</p>\n"
 msgstr ""
 "<p><big><b>添加已有的事务数字签名 (TSIG) 密钥</b></big><br>\n"
-"要添加一个已创建的事务数字签名 (TSIG) 密钥，请选择存有该密钥的文件的<b>文件名"
-"</b>，\n"
+"要添加一个已创建的事务数字签名 (TSIG) 密钥，请选择存有该密钥的文件的<b>文件名</b>，\n"
 "并点击<b>添加</b>。</p>\n"
 
 #. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
 msgid ""
 "<p><big><b>Creating a New TSIG Key</b></big><br>\n"
 "To create a new TSIG key, set the <b>Filename</b> of the file in which to\n"
@@ -811,12 +806,11 @@
 "<b>Generate</b>.</p>\n"
 msgstr ""
 "<p><big><b>创建新的事务数字签名 (TSIG) 密钥</b></big><br>\n"
-"要创建一个新的事务数字签名密钥，请设定将在其中创建密钥的文件的<b>文件名，\n"
+"要创建一个新的事务数字签名密钥，请设定将在其中创建密钥的文件的<b>文件名</b>，\n"
 "以及用以识别密钥的<b>密钥 ID</b>，然后点击<b>生成</b>。</p>\n"
 
 #. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
 msgid ""
 "<p><big><b>Removing a TSIG Key</b></big><br>\n"
 "To remove a configured TSIG key, select it and click <b>Delete</b>.\n"
@@ -832,27 +826,27 @@
 "服务器必须先在配置中停止使用该密钥。</p>\n"
 
 #. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
 msgid "Add an Existing TSIG Key"
 msgstr "添加已有的事务数字签名 (TSIG) 密钥"
 
 #. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
 msgid "Create a New TSIG Key"
 msgstr "创建新的事务数字签名 (TSIG) 密钥"
 
 #. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
 msgid "&Key ID"
 msgstr "密钥 ID(&K)"
 
 #. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
 msgid "&Generate"
 msgstr "生成(&G)"
 
 #. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
 msgid "Current TSIG Keys"
 msgstr "当前事务数字签名 (TSIG) 密钥"
 
@@ -860,7 +854,7 @@
 #. table header - GPG key ID
 #. table header - GPG key ID
 #. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
 #: library/gpg/src/modules/GPGWidgets.rb:192
 #: library/gpg/src/modules/GPGWidgets.rb:224
 #: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -868,22 +862,22 @@
 msgstr "密钥 ID"
 
 #. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
 msgid "Filename"
 msgstr "文件名"
 
 #. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
 msgid "&Selected Option"
 msgstr "已选选项(&S)"
 
 #. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
 msgid "Current Option: "
 msgstr "当前选项："
 
 #. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
 msgid "The selected option is already present."
 msgstr "所选选项已存在。"
 
@@ -921,9 +915,7 @@
 msgid ""
 "<p>To add a new option, click <b>Add</b>. To remove\n"
 "an option, select it and click <b>Delete</b>.</p>"
-msgstr ""
-"<p>要添加新选项，请点击<b>添加</b>。要移除某选项，请选择该选项并点击<b>删除。</p>"
+msgstr "<p>要添加新选项，请点击<b>添加</b>。要移除某选项，请选择该选项并点击<b>删除</b>。</p>"
 
 #. help 3/4, optional
 #: library/cwm/src/modules/TablePopup.rb:918
@@ -938,24 +930,22 @@
 "<p>To reorder the options, select an option\n"
 "and use <b>Up</b> and <b>Down</b> to move it up or down\n"
 "in the list.</p>"
-msgstr ""
-"<p>要重新排序选项，请选择一个选项并使用<b>向上</b>或<b>向下</b>来将其在列表中"
-"上下移动。</p>"
+msgstr "<p>要重新排序选项，请选择一个选项并使用<b>向上</b>或<b>向下</b>来将其在列表中上下移动。</p>"
 
 #. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
 msgid "&Other"
 msgstr "其它(&O)"
 
 #. translators: message for hardware configuration without any configured
 #. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
 msgid "The device is not configured"
 msgstr "设备未配置"
 
 #. translators: message for hardware configuration without any configured
 #. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
 msgid "Press <B>Edit</B> to configure"
 msgstr "请按<B>编辑</B>进行配置"
 
@@ -1004,15 +994,8 @@
 
 #. NCurses Control Center help 2/10
 #: library/desktop/src/clients/menu.rb:331
-msgid ""
-"<p>Tree navigation is also done by arrow keys. To open or close a branch use "
-"[SPACE]. For modules showing a tree (might look like a list) of "
-"configuration items on the left side use [ENTER] to get corresponding dialog "
-"on the right.</p>"
-msgstr ""
-"<p>树形导航也可以使用箭头键完成。要打开或关闭一个分支请使用 [空格]。对于在左"
-"侧显示树形配置项 (可能看起来像一个列表) 的模块可使用 [回车] 来在右侧获得相应"
-"的对话框。</p>"
+msgid "<p>Tree navigation is also done by arrow keys. To open or close a branch use [SPACE]. For modules showing a tree (might look like a list) of configuration items on the left side use [ENTER] to get corresponding dialog on the right.</p>"
+msgstr "<p>树形导航也可以使用箭头键完成。要打开或关闭一个分支请使用 [空格]。对于在左侧显示树形配置项 (可能看起来像一个列表) 的模块可使用 [回车] 来在右侧获得相应的对话框。</p>"
 
 #. NCurses Control Center help 3/10
 #: library/desktop/src/clients/menu.rb:338
@@ -1028,9 +1011,7 @@
 msgid ""
 "<p>Press [ESC] to close selection pop-ups (e.g., from\n"
 "menu buttons) without choosing anything.</p>\n"
-msgstr ""
-"<p>按 [ESC] 键可关闭选区弹窗 (例如，菜单按钮的弹窗) 而无需选择任何东西。\n"
+msgstr "<p>按 [ESC] 键可关闭选区弹窗 (例如，菜单按钮的弹窗) 而无需选择任何东西。</p>\n"
 
 #. NCurses Control Center help 5/10
 #: library/desktop/src/clients/menu.rb:346
@@ -1043,8 +1024,7 @@
 msgstr ""
 "<p>2) <i>按键替代</i><br>\n"
 "<p>因为环境可以影响键盘的使用，所以有多于一种方法来在对话页面间导航。\n"
-"若 [TAB] 和 [SHIFT] (或 [ALT])+ [TAB] 无效，可用 [CTRL] + [F] 使焦点前移，用 "
-"[CTRL] + [B] 使焦点后移。</p>"
+"若 [TAB] 和 [SHIFT] (或 [ALT])+ [TAB] 无效，可用 [CTRL] + [F] 使焦点前移，用 [CTRL] + [B] 使焦点后移。</p>"
 
 #. NCurses Control Center help 6/10
 #: library/desktop/src/clients/menu.rb:354
@@ -1061,8 +1041,7 @@
 #: library/desktop/src/clients/menu.rb:360
 msgid ""
 "<p>3) <i>Function Keys</i><br>\n"
-"F keys provide a quick access to main functions. The function key bindings "
-"for the current dialog are shown in the bottom line.</p>"
+"F keys provide a quick access to main functions. The function key bindings for the current dialog are shown in the bottom line.</p>"
 msgstr ""
 "<p>3) <i>功能键</i><br>\n"
 "功能键提供了对主要功能的快速访问。\n"
@@ -1132,62 +1111,54 @@
 msgid "Service Status"
 msgstr "服务状态"
 
-#. rubocop:enable Style/TrivialAccessors
 #. Content for the help
-#: library/general/src/lib/ui/service_status.rb:133
+#: library/general/src/lib/ui/service_status.rb:129
 msgid ""
 "<p><b><big>Current status</big></b><br>\n"
-"Displays the current status of the service. The status will remain the same "
-"after saving the settings, independently of the value of 'start service "
-"during boot'.</p>\n"
+"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n"
 "<p><b><big>%{reload_label}</big></b><br>\n"
-"Only applicable if the service is currently running. Ensures the running "
-"service reloads the new configuration after saving it (either finishing the "
-"dialog or pressing the apply button).</p>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</p>\n"
 "<p><b><big>Start During System Boot</big></b><br>\n"
-"Check this field to enable the service at system boot. Un-check it to "
-"disable the service. This does not affect the current status of the service "
-"in the already running system.</p>\n"
+"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n"
 msgstr ""
 "<p><b><big>当前状态</big></b><br>\n"
 "显示服务当前状态。保存设置后状态仍不变，独立于 '引导期间启动服务' 的值。</p>\n"
 "<p><b><big>%{reload_label}</big></b><br>\n"
-"仅在服务当前正在运行时应用。会确保运行中的服务在保存设置后重新加载新的配置 "
-"(通过 '好' 或 '保存' 按钮)。</p>\n"
+"仅在服务当前正在运行时应用。会确保运行中的服务在保存设置后重新加载新的配置 (通过 '好' 或 '保存' 按钮)。</p>\n"
 "<p><b><big>系统引导期间启动</big></b><br>\n"
 "勾选此框在系统引导时启用服务。反选禁用服务。这不会影响运行中系统上服务的当前状态。</p>\n"
 
 #. Widget displaying the status and associated buttons
-#: library/general/src/lib/ui/service_status.rb:159
+#: library/general/src/lib/ui/service_status.rb:155
 msgid "Current status:"
 msgstr "当前状态："
 
 #. Widget to configure the status on boot
-#: library/general/src/lib/ui/service_status.rb:172
+#: library/general/src/lib/ui/service_status.rb:168
 msgid "Start During System Boot"
 msgstr "系统引导期间启动"
 
 #. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:196
+#: library/general/src/lib/ui/service_status.rb:192
 msgid "running"
 msgstr "正在运行"
 
-#: library/general/src/lib/ui/service_status.rb:198
+#: library/general/src/lib/ui/service_status.rb:194
 msgid "Stop now"
 msgstr "立即停止"
 
 #. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:203
+#: library/general/src/lib/ui/service_status.rb:199
 msgid "stopped"
 msgstr "已停止"
 
-#: library/general/src/lib/ui/service_status.rb:205
+#: library/general/src/lib/ui/service_status.rb:201
 msgid "Start now"
 msgstr "立即启动"
 
 #. TRANSLATORS: popup question (with continue / cancel buttons)
 #. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
 msgid ""
 "Although the path %1 exists, it is not a directory.\n"
 "Continue or cancel the operation?\n"
@@ -1197,7 +1168,7 @@
 
 #. TRANSLATORS: question popup (with yes / no buttons). A user entered non-existent path
 #. for a share, %1 is entered path
-#: library/general/src/modules/FileUtils.rb:306
+#: library/general/src/modules/FileUtils.rb:300
 msgid ""
 "The path %1 does not exist.\n"
 "Create it now?\n"
@@ -1207,7 +1178,7 @@
 
 #. TRANSLATORS: popup question (with continue / cancel buttons)
 #. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
 msgid ""
 "Failed to create the directory %1.\n"
 "Continue or cancel the current operation?\n"
@@ -1408,7 +1379,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2231
+#: library/packages/src/modules/PackageCallbacks.rb:2221
 msgid "&Password"
 msgstr "密码(&P)"
 
@@ -1719,7 +1690,7 @@
 #: library/general/src/modules/Report.rb:157
 #: library/general/src/modules/Report.rb:171
 #: library/general/src/modules/Report.rb:187
-#: library/network/src/modules/NetworkPopup.rb:86
+#: library/network/src/modules/NetworkPopup.rb:90
 #: library/types/src/modules/String.rb:101
 msgid "Yes"
 msgstr "是"
@@ -1730,7 +1701,7 @@
 #: library/general/src/modules/Report.rb:157
 #: library/general/src/modules/Report.rb:171
 #: library/general/src/modules/Report.rb:187
-#: library/network/src/modules/NetworkPopup.rb:85
+#: library/network/src/modules/NetworkPopup.rb:89
 #: library/types/src/modules/String.rb:101
 msgid "No"
 msgstr "否"
@@ -1794,19 +1765,19 @@
 msgstr "日志错误：%1"
 
 #. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
 msgid "Warning:"
 msgstr "警告："
 
 #. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
 msgid "Error:"
 msgstr "错误："
 
 #. translators: message summary header
 #. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
 msgid "Message:"
 msgstr "消息："
 
@@ -1859,7 +1830,7 @@
 msgstr "删除(&L)"
 
 #. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
 msgid "&Variable"
 msgstr "变量(&V)"
 
@@ -1925,8 +1896,7 @@
 #: library/gpg/src/modules/GPGWidgets.rb:285
 msgid ""
 "<p><big><b>Create a new GPG key</b></big><br>\n"
-"<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more "
-"information.\n"
+"<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n"
 "Press Ctrl+C to cancel.\n"
 "</p>"
 msgstr ""
@@ -1956,7 +1926,7 @@
 msgstr "输入密码"
 
 #. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
 msgid "Enter Passphrase to Unlock GPG Key %1: "
 msgstr "输入密码以解锁 GPG 密钥 %1："
 
@@ -2059,6 +2029,233 @@
 msgid "Error occurred while reading the log."
 msgstr "读取日志时出错。"
 
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "未知区域"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"接口 '%1' 未指派到任何防火墙区域。\n"
+"请运行 YaST2 防火墙并指派它。\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "外部区域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "内部区域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "隔离区域"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr "TCP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr "UDP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr "RPC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr "IP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"接口 '%1' 包含在多个防火墙区域中。\n"
+"继续配置可能产生错误。\n"
+"\n"
+"建议保留配置并\n"
+"在 '/etc/sysconfig/SuSEFirewall' 文件中手动修复它。"
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "初始化防火墙配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "检查网络设备"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "读取当前配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "检查可能冲突的服务"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "正在检查网络设备..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "正在读取当前配置..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "正在检查可能冲突的服务..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "写入防火墙配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "写入防火墙设置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "调整防火墙服务"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "正在写入防火墙设置..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "正在调整防火墙服务..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "写入设置失败"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+msgid "Unknown protocol (%1)"
+msgstr "未知协议 (%1)"
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports"      => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports"      => [ ],
+#. "rpc_ports"      => [ "portmap", "ypbind" ],
+#. "ip_protocols"   => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr "名为 '%{service_name}' 的服务不存在"
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+msgid "Service: %{filename}"
+msgstr "服务：%{filename}"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "GPG 公共密钥"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "未知服务 '%1'"
+
 #. label
 #: library/network/src/modules/CWMFirewallInterfaces.rb:109
 msgid "Firewall cannot be adjusted during first stage installation."
@@ -2100,13 +2297,13 @@
 msgstr "未将接口指派到任何区域"
 
 #. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
 msgid "&Network Interfaces with Open Port in Firewall"
 msgstr "有打开的防火墙端口的网络接口(&N)"
 
 #. Check the INT zone, it's not protected by default
 #. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
 msgid ""
 "These network interfaces assigned to internal network cannot be deselected:\n"
 "%1\n"
@@ -2115,7 +2312,7 @@
 "%1\n"
 
 #. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
 msgid ""
 "No interface is selected. Service will not\n"
 "be available for other computers.\n"
@@ -2127,7 +2324,7 @@
 "继续吗？"
 
 #. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
 msgid ""
 "Because of SuSE Firewall settings, the port\n"
 "on the following interfaces will additionally be open:\n"
@@ -2142,8 +2339,8 @@
 
 #. yes-no popup
 #. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
 msgid ""
 "Because of SuSE Firewall settings, the port\n"
 "on the following interfaces cannot be opened:\n"
@@ -2157,22 +2354,22 @@
 "继续吗？"
 
 #. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
 msgid "Network &Interfaces with Open Port in Firewall"
 msgstr "有打开的防火墙端口的网络接口(&I)"
 
 #. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
 msgid "Select &All"
 msgstr "全选(&A)"
 
 #. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
 msgid "Select &None"
 msgstr "全不选(&N)"
 
 #. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
 msgid ""
 "Error checking service status:\n"
 "%{details}"
@@ -2181,7 +2378,7 @@
 "%{details}"
 
 #. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
 msgid ""
 "Error setting service status:\n"
 "%{details}"
@@ -2191,7 +2388,7 @@
 
 #. help text for firewall settings widget 1/3,
 #. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/modules/CWMFirewallInterfaces.rb:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
 msgid ""
 "<p><b><big>Firewall Settings</big></b><br>\n"
 "To open the firewall to allow access to the service from remote computers,\n"
@@ -2203,60 +2400,62 @@
 #. help text for firewall port openning widget 2/3, optional
 #. %1 is push button label, eg. "Firewall &Details" (without quotes)
 #. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
 msgid ""
 "To select interfaces on which to open the port,\n"
 "click <b>%2</b>.<br>"
 msgstr "要选择将在其上打开端口的接口，请点击 <b>%2</b>。<br>"
 
 #. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
 msgid ""
 "This option is available only if the firewall\n"
 "is enabled.</p>"
 msgstr "此选项只有启用了防火墙时才可用。</p>"
 
 #. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
 msgid "Open Port in Firewall"
 msgstr "打开防火墙中的端口"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
 msgid "Firewall Details"
 msgstr "防火墙细节"
 
 #. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
 msgid "Open Port in &Firewall"
 msgstr "打开防火墙中的端口(&F)"
 
 #. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
 msgid "Firewall &Details..."
 msgstr "防火墙细节(&D)..."
 
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
 msgstr "防火墙设置"
 
 #. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
 msgid "Firewall is open"
 msgstr "防火墙已打开"
 
 #. pppN must be tried before pN, modem before netcard
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 #: library/system/src/include/hwinfo/classnames.rb:108
 #: library/system/src/include/hwinfo/classnames.rb:198
 msgid "Modem"
 msgstr "调制解调器"
 
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
 msgid "Network Card"
 msgstr "网卡"
 
@@ -2264,27 +2463,27 @@
 #. Device type label
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:416
-#: library/network/src/modules/NetworkInterfaces.rb:1146
-#: library/network/src/modules/NetworkInterfaces.rb:1184
+#: library/network/src/modules/NetworkInterfaces.rb:425
 #: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
 msgid "ISDN"
 msgstr "综合业务数字网 (ISDN)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
 msgid "DSL"
 msgstr "数字用户线路 (DSL, 电话拨号)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:423
-#: library/packages/src/modules/SignatureCheckDialogs.rb:487
-#: library/packages/src/modules/SignatureCheckDialogs.rb:488
-#: library/packages/src/modules/SignatureCheckDialogs.rb:760
-#: library/packages/src/modules/SignatureCheckDialogs.rb:761
-#: library/packages/src/modules/SignatureCheckDialogs.rb:996
-#: library/packages/src/modules/SignatureCheckDialogs.rb:998
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
 msgid "Unknown"
 msgstr "未知"
 
@@ -2294,389 +2493,389 @@
 #. are represented as its sub-interfaces.
 #. And also we frequently confuse "device" and "interface"
 #. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
 msgid "Additional Address"
 msgstr "附加地址"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
 msgid "ARCnet"
 msgstr "ARCnet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
 msgid "ARCnet Network Card"
 msgstr "ARCnet 网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
 msgid "ATM"
 msgstr "ATM"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
 msgid "Asynchronous Transfer Mode (ATM)"
 msgstr "异步传输模式 (ATM)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
 msgid "Bluetooth Connection"
 msgstr "蓝牙连接"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
 msgid "Bond"
 msgstr "绑定"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
 msgid "Bond Network"
 msgstr "绑定网络"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
 msgid "CLAW"
 msgstr "CLAW"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
 msgid "Common Link Access for Workstation (CLAW)"
 msgstr "工作站通用链接访问 (CLAW)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
 msgid "ISDN Card"
 msgstr "ISDN 综合业务数字网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 #: library/system/src/include/hwinfo/classnames.rb:223
 msgid "CTC"
 msgstr "CTC"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
 msgid "Channel to Channel Interface (CTC)"
 msgstr "通道到通道接口 (CTC)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
 msgid "DSL Connection"
 msgstr "DSL 电话拨号连接"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Dummy"
 msgstr "虚设"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Dummy Network Device"
 msgstr "虚设网络设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 #: library/system/src/include/hwinfo/classnames.rb:227
 msgid "ESCON"
 msgstr "ESCON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
 msgid "Enterprise System Connector (ESCON)"
 msgstr "企业系统连接器 (ESCON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
 #: library/system/src/include/hwinfo/classnames.rb:220
 msgid "Ethernet"
 msgstr "有线网"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 msgid "Ethernet Network Card"
 msgstr "有线网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
 #: library/system/src/include/hwinfo/classnames.rb:222
 msgid "FDDI"
 msgstr "FDDI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
 msgid "FDDI Network Card"
 msgstr "光纤分布式数据接口 (FDDI) 网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
 msgid "FICON"
 msgstr "FICON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
 msgid "Fiberchannel System Connector (FICON)"
 msgstr "光纤通道系统连接器 (FICON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
 msgid "HIPPI"
 msgstr "HIPPI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
 msgid "HIgh Performance Parallel Interface (HIPPI)"
 msgstr "高性能并行接口 (HIPPI)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
 msgid "Hipersockets"
 msgstr "Hipersockets"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
 msgid "Hipersockets Interface (HSI)"
 msgstr "超高速套接字接口 (HSI)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
 msgid "ISDN Connection"
 msgstr "ISDN 综合业务数字网连接"
 
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
 msgid "IrDA"
 msgstr "IrDA"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
 msgid "Infrared Network Device"
 msgstr "红外网络设备"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
 msgid "Infrared Device"
 msgstr "红外设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
 #: library/system/src/include/hwinfo/classnames.rb:224
 msgid "IUCV"
 msgstr "IUCV"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
 msgid "Inter User Communication Vehicle (IUCV)"
 msgstr "用户间通讯载体 (IUCV)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "OSA LCS"
 msgstr "OSA LCS"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "OSA LCS Network Card"
 msgstr "OSA 本地通道站 (LCS) 网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
 #: library/system/src/include/hwinfo/classnames.rb:219
 msgid "Loopback"
 msgstr "回路"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
 msgid "Loopback Device"
 msgstr "回路设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
 #: library/system/src/include/hwinfo/classnames.rb:228
 msgid "Myrinet"
 msgstr "Myrinet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
 msgid "Myrinet Network Card"
 msgstr "Myrinet 网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 msgid "Parallel Line"
 msgstr "并行线路"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
 msgid "Parallel Line Connection"
 msgstr "并行线路连接"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
 #: library/system/src/include/hwinfo/classnames.rb:226
 msgid "QETH"
 msgstr "QETH"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
 msgid "OSA-Express or QDIO Device (QETH)"
 msgstr "OSA-Express 或 QDIO 设备 (QETH)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
 msgid "IPv6-in-IPv4"
 msgstr "IPv6-in-IPv4"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
 msgid "IPv6-in-IPv4 Encapsulation Device"
 msgstr "IPv6-in-IPv4 封装设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
 msgid "Serial Line"
 msgstr "串行线路"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
 msgid "Serial Line Connection"
 msgstr "串行线路连接"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
 msgid "Token Ring"
 msgstr "令牌环"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
 msgid "Token Ring Network Card"
 msgstr "令牌环网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
 msgid "USB"
 msgstr "USB"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
 msgid "USB Network Device"
 msgstr "USB 网络设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
 msgid "VMWare"
 msgstr "VMWare"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
 msgid "VMWare Network Device"
 msgstr "VMWare 网络设备"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
 msgid "Wireless"
 msgstr "无线"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
 msgid "Wireless Network Card"
 msgstr "无线网卡"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
 msgid "XPNET"
 msgstr "XPNET"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
 msgid "XP Network"
 msgstr "XP 网络"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
 msgid "VLAN"
 msgstr "VLAN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
 msgid "Virtual LAN"
 msgstr "虚拟局域网"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
 #: library/system/src/include/hwinfo/classnames.rb:89
 #: library/system/src/include/hwinfo/classnames.rb:101
 msgid "Bridge"
 msgstr "网桥"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
 msgid "Network Bridge"
 msgstr "网桥"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
 msgid "TUN"
 msgstr "TUN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
 msgid "Network TUNnel"
 msgstr "网络隧道"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
 msgid "TAP"
 msgstr "TAP"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
 msgid "Network TAP"
 msgstr "网络复写 (TAP)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
 #: library/system/src/include/hwinfo/classnames.rb:152
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
 msgid "InfiniBand Device"
 msgstr "无限宽带 (InfiniBand) 设备"
 
 #. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
 msgid "Unknown device"
 msgstr "未知设备"
 
 #. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
 msgid "DHCP address"
 msgstr "DHCP 地址"
 
 #. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
 msgid "No IP address assigned"
 msgstr "未指派 IP 地址"
 
 #. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
 msgid "Device Type"
 msgstr "设备类型"
 
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
 msgid "Device Name"
 msgstr "设备名称"
 
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
 msgid "Device ID"
 msgstr "设备 ID"
 
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
 msgid "Connected"
 msgstr "已连接"
 
 #. label message
 #. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
 msgid "Scanning for hosts on this LAN..."
 msgstr "正在扫描此局域网中的主机..."
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
 msgid "&NFS Servers"
 msgstr "&NFS 服务器"
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
 msgid "Re&mote Hosts"
 msgstr "远程主机(&M)"
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
 msgid "&Exported Directories"
 msgstr "导出文件夹(&E)"
 
 #. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
 msgid ""
 "Your network interfaces are currently controlled by NetworkManager\n"
 "but the service to configure might not work well with it.\n"
@@ -2691,7 +2890,7 @@
 #. If there is network running, return true.
 #. Otherwise show error popup depending on Stage and return false
 #. @return true if network running
-#: library/network/src/modules/NetworkService.rb:348
+#: library/network/src/modules/NetworkService.rb:346
 msgid ""
 "No running network detected.\n"
 "Restart installation and configure network in Linuxrc\n"
@@ -2701,7 +2900,7 @@
 "请重启安装程序并在 Linuxrc 中配置网络\n"
 "或无网络继续。"
 
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
 msgid ""
 "No running network detected.\n"
 "Configure network with YaST or Network Manager plug-in\n"
@@ -2723,142 +2922,6 @@
 "端口号可以是一个从 0 到 65535 的数字。\n"
 "不允许使用空格。\n"
 
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:116
-msgid "External Zone"
-msgstr "外部区域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:120
-msgid "Internal Zone"
-msgstr "内部区域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:124
-msgid "Demilitarized Zone"
-msgstr "隔离区域"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:247
-msgid "TCP"
-msgstr "TCP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:249
-msgid "UDP"
-msgstr "UDP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:251
-msgid "RPC"
-msgstr "RPC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:253
-msgid "IP"
-msgstr "IP"
-
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1159
-msgid "Unknown Zone"
-msgstr "未知区域"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1508
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"接口 '%1' 包含在多个防火墙区域中。\n"
-"继续配置可能产生错误。\n"
-"\n"
-"建议保留配置并\n"
-"在 '/etc/sysconfig/SuSEFirewall' 文件中手动修复它。"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1973
-#: library/network/src/modules/SuSEFirewall.rb:2049
-msgid ""
-"Interface '%1' is not assigned to any firewall zone.\n"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"接口 '%1' 未指派到任何防火墙区域。\n"
-"请运行 YaST2 防火墙并指派它。\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2480
-msgid "Initializing Firewall Configuration"
-msgstr "初始化防火墙配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Check for network devices"
-msgstr "检查网络设备"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Read current configuration"
-msgstr "读取当前配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2492
-msgid "Check possibly conflicting services"
-msgstr "检查可能冲突的服务"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Checking for network devices..."
-msgstr "正在检查网络设备..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Reading current configuration..."
-msgstr "正在读取当前配置..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
-msgid "Checking possibly conflicting services..."
-msgstr "正在检查可能冲突的服务..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2643
-msgid "Writing Firewall Configuration"
-msgstr "写入防火墙配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2651
-msgid "Write firewall settings"
-msgstr "写入防火墙设置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2653
-msgid "Adjust firewall service"
-msgstr "调整防火墙服务"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2657
-msgid "Writing firewall settings..."
-msgstr "正在写入防火墙设置..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2659
-msgid "Adjusting firewall service..."
-msgstr "正在调整防火墙服务..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2678
-msgid "Writing settings failed"
-msgstr "写入设置失败"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3471
-msgid "Unknown protocol (%1)"
-msgstr "未知协议 (%1)"
-
 #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
 #: library/network/src/modules/SuSEFirewallProposal.rb:167
 msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2877,39 +2940,32 @@
 #. TRANSLATORS: Proposal informative text "Firewall is enabled (disable)" with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:565
-msgid ""
-"Firewall is enabled (disable</a>)"
+msgid "Firewall is enabled (disable</a>)"
 msgstr "防火墙已启用 (禁用</a>)"
 
 #. TRANSLATORS: Proposal informative text "Firewall is disabled (enable)" with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:571
-msgid ""
-"Firewall is disabled (enable</a>)"
+msgid "Firewall is disabled (enable</a>)"
 msgstr "防火墙已禁用 (启用</a>)"
 
 #. TRANSLATORS: Network proposal informative text with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:606
-msgid ""
-"SSH port is open (close</a>)"
+msgid "SSH port is open (close</a>)"
 msgstr "SSH 端口已打开(关闭</a>)"
 
 #. TRANSLATORS: Network proposal informative text with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:612
-msgid ""
-"SSH port is blocked (open</a>)"
+msgid "SSH port is blocked (open</a>)"
 msgstr "SSH 端口已屏蔽 (打开</a>)"
 
 #. TRANSLATORS: Network proposal informative text with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:633
 msgid ""
-"SSH port is open (close</a>), "
-"but\n"
+"SSH port is open (close</a>), but\n"
 "there are no network interfaces configured"
 msgstr ""
 "SSH 端口已打开 (关闭</a>), \n"
@@ -2917,36 +2973,24 @@
 
 #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
 #: library/network/src/modules/SuSEFirewallProposal.rb:648
-msgid ""
-"You are installing a system over SSH, but you have not opened the SSH port "
-"on the firewall."
+msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
 msgstr "您正在通过 SSH 安装系统，但您尚未打开防火墙上的 SSH 端口。"
 
 #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:690
-msgid ""
-"Remote Administration (VNC) ports are open (close</a>)"
-msgstr ""
-"远程管理 (VNC) 端口已打开 (关闭"
-"</a>)"
+msgid "Remote Administration (VNC) ports are open (close</a>)"
+msgstr "远程管理 (VNC) 端口已打开 (关闭</a>)"
 
 #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
 #: library/network/src/modules/SuSEFirewallProposal.rb:696
-msgid ""
-"Remote Administration (VNC) ports are blocked (open</a>)"
-msgstr ""
-"远程管理 (VNC) 端口已屏蔽 (打开"
-"</a>)"
+msgid "Remote Administration (VNC) ports are blocked (open</a>)"
+msgstr "远程管理 (VNC) 端口已屏蔽 (打开</a>)"
 
 #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
 #: library/network/src/modules/SuSEFirewallProposal.rb:707
-msgid ""
-"You are installing a system using remote administration (VNC), but you have "
-"not opened the VNC ports on the firewall."
+msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
 msgstr "您正在通过远程管理 (VNC) 安装系统，但您尚未打开防火墙上的 VNC 端口。"
 
 #. TRANSLATORS: Network proposal informative text
@@ -2961,67 +3005,17 @@
 
 #. TRANSLATORS: This is a warning message. Installation to iSCSI without iSCSI allowed on firewall
 #: library/network/src/modules/SuSEFirewallProposal.rb:737
-msgid ""
-"You are installing a system using iSCSI Target, but you have not opened the "
-"needed ports on the firewall."
+msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
 msgstr "您正在通过 iSCSI 目标安装系统，但您尚未在防火墙上打开需要的端口。"
 
-#. Returns service definition.
-#. See @services for the format.
-#. If *silent* is `false` (the default), the method throws an exception
-#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
-#.
-#. @param [String] service name (including the "service:" prefix)
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. @api private
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param [Hash{String => Array<String>] store_definition of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService
-#. @see #ServiceDefinedByPackage
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. {
-#. "tcp_ports"      => [ "22", "ftp-data", "400:420" ],
-#. "udp_ports"      => [ ],
-#. "rpc_ports"      => [ "portmap", "ypbind" ],
-#. "ip_protocols"   => [ "esp" ],
-#. "broadcast_ports"=> [ ],
-#. }
-#. )
-#: library/network/src/modules/SuSEFirewallServices.rb:356
-#: library/network/src/modules/SuSEFirewallServices.rb:640
-msgid "Service with name '%{service_name}' does not exist"
-msgstr "名为 '%{service_name}' 的服务不存在"
-
-#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:434
-msgid "Service: %{filename}"
-msgstr "服务：%{filename}"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:505
-msgid "Unknown service '%1'"
-msgstr "未知服务 '%1'"
-
 #. the message is followed by list of required packages
 #. Popup Text
-#: library/packages/src/include/packages/common.rb:107
+#: library/packages/src/include/packages/common.rb:106
 #: library/packages/src/include/packages/common.rb:135
 msgid "These packages need to be installed:"
 msgstr "需要安装这些软件包："
 
+#. the message is followed by list of required packages
 #. Popup Text
 #: library/packages/src/include/packages/common.rb:109
 #: library/packages/src/include/packages/common.rb:137
@@ -3036,17 +3030,17 @@
 msgstr "卸载(&U)"
 
 #. TRANSLATORS: progress bar label
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
 msgid "Checking file conflicts..."
 msgstr "正在检查文件冲突..."
 
 #. TRANSLATORS: help text for the file conflict detection progress
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:87
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
 msgid "<p>Detecting the file conflicts is in progress.</p>"
 msgstr "<p>正在检测文件冲突。</p>"
 
 #. TRANSLATORS: An error message, %s is the actual list of detected conflicts
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:132
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
 msgid ""
 "File conflicts detected, these conflicting files will be overwritten:\n"
 "\n"
@@ -3057,7 +3051,7 @@
 "%s"
 
 #. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:168
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
 msgid ""
 "File conflicts happen when two packages attempt to install\n"
 "files with the same name but different contents. If you continue\n"
@@ -3067,7 +3061,7 @@
 "若您选择继续将覆盖冲突的文件，以前的内容将会丢失。"
 
 #. TRANSLATORS: Popup heading
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:173
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
 msgid "A File Conflict Detected"
 msgid_plural "File Conflicts Detected"
 msgstr[0] "检测到文件冲突"
@@ -3118,7 +3112,7 @@
 #. detail string is appended to the end
 #: library/packages/src/modules/PackageCallbacks.rb:269
 #: library/packages/src/modules/PackageCallbacks.rb:303
-#: library/packages/src/modules/PackageCallbacks.rb:2144
+#: library/packages/src/modules/PackageCallbacks.rb:2136
 msgid "Error: %1:"
 msgstr "错误：%1："
 
@@ -3164,8 +3158,7 @@
 #: library/packages/src/modules/PackageCallbacks.rb:507
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
-"The system should be later verified by running the Software Management "
-"module."
+"The system should be later verified by running the Software Management module."
 msgstr ""
 "忽略失败的软件包可能导致系统损坏。\n"
 "稍后应运行软件管理模块校验系统。"
@@ -3174,10 +3167,8 @@
 #: library/packages/src/modules/PackageCallbacks.rb:576
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
-"If the URL is correct, this indicates that the repository content has "
-"changed. To \n"
-"continue using this repository, start <b>Installation Repositories</b> "
-"from \n"
+"If the URL is correct, this indicates that the repository content has changed. To \n"
+"continue using this repository, start <b>Installation Repositories</b> from \n"
 "the YaST control center and refresh the repository.</p>\n"
 msgstr ""
 "<p>指定 URL 上的软件源现在提供了一个不同的介质 ID。\n"
@@ -3245,7 +3236,7 @@
 #. wrong media id, offer "Ignore"
 #. push button label
 #: library/packages/src/modules/PackageCallbacks.rb:660
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:1835
 msgid "Skip Autorefresh"
 msgstr "跳过自动刷新"
 
@@ -3331,7 +3322,7 @@
 #: library/packages/src/modules/PackageCallbacks.rb:1099
 #: library/packages/src/modules/PackageCallbacks.rb:1229
 #: library/packages/src/modules/PackageCallbacks.rb:1333
-#: library/packages/src/modules/PackageCallbacks.rb:2098
+#: library/packages/src/modules/PackageCallbacks.rb:2090
 msgid "Retry?"
 msgstr "重试吗？"
 
@@ -3383,7 +3374,7 @@
 
 #. popup heading
 #: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:3082
+#: library/packages/src/modules/PackageCallbacks.rb:3070
 msgid "Package: "
 msgstr "软件包："
 
@@ -3448,24 +3439,24 @@
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
 #: library/packages/src/modules/PackageCallbacks.rb:1724
-#: library/packages/src/modules/PackageCallbacks.rb:1772
+#: library/packages/src/modules/PackageCallbacks.rb:1770
 msgid "Downloading: %1"
 msgstr "正在下载：%1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1876
-#: library/packages/src/modules/PackageCallbacks.rb:1942
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
 msgid "Checking Package Database"
 msgstr "正在检查软件包数据库"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1879
+#: library/packages/src/modules/PackageCallbacks.rb:1875
 msgid "Rebuilding package database. This process can take some time."
 msgstr "正在重建软件包数据库。此过程要花费一点时间。"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1912
+#: library/packages/src/modules/PackageCallbacks.rb:1908
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3474,16 +3465,16 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1945
+#: library/packages/src/modules/PackageCallbacks.rb:1941
 msgid "Converting package database. This process can take some time."
 msgstr "正在转换软件包数据库。此过程要花费一点时间。"
 
-#: library/packages/src/modules/PackageCallbacks.rb:1958
+#: library/packages/src/modules/PackageCallbacks.rb:1954
 msgid "Status"
 msgstr "状态"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1982
+#: library/packages/src/modules/PackageCallbacks.rb:1978
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3492,12 +3483,12 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2018
+#: library/packages/src/modules/PackageCallbacks.rb:2014
 msgid "Reading RPM database..."
 msgstr "正在读取 RPM 数据库..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2028
+#: library/packages/src/modules/PackageCallbacks.rb:2023
 msgid "Reading Installed Packages"
 msgstr "正在读取已安装的软件包"
 
@@ -3508,27 +3499,27 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2034
-#: library/packages/src/modules/PackageCallbacks.rb:2050
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
 msgid "Scanning RPM database..."
 msgstr "正在扫描 RPM 数据库..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2087
+#: library/packages/src/modules/PackageCallbacks.rb:2079
 msgid "Initialization of the target failed."
 msgstr "目标初始化失败。"
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2179
+#: library/packages/src/modules/PackageCallbacks.rb:2171
 msgid "RPM database read"
 msgstr "已读取 RPM 数据库"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2213
+#: library/packages/src/modules/PackageCallbacks.rb:2203
 msgid "User Authentication"
 msgstr "用户认证"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2219
+#: library/packages/src/modules/PackageCallbacks.rb:2209
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3539,20 +3530,20 @@
 "%2"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2228
+#: library/packages/src/modules/PackageCallbacks.rb:2218
 msgid "&User Name"
 msgstr "用户名(&U)"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3017
+#: library/packages/src/modules/PackageCallbacks.rb:3005
 msgid "Show &details"
 msgstr "显示细节(&D)"
 
-#: library/packages/src/modules/PackageCallbacks.rb:3083
+#: library/packages/src/modules/PackageCallbacks.rb:3071
 msgid "Size: "
 msgstr "大小："
 
-#: library/packages/src/modules/PackageCallbacks.rb:3106
+#: library/packages/src/modules/PackageCallbacks.rb:3094
 msgid "Remaining time to automatic retry: %1"
 msgstr "自动重试前剩余时间：%1"
 
@@ -3600,9 +3591,7 @@
 "Would you like to retry accessing the software manager,\n"
 "continue without having access to the software management,\n"
 "or abort?\n"
-msgstr ""
-"您愿意重试访问软件管理器，在无法访问软件管理的情况下继续，还是中止本程序"
-"呢？\n"
+msgstr "您愿意重试访问软件管理器，在无法访问软件管理的情况下继续，还是中止本程序呢？\n"
 
 #. TRANSLATORS: an error message with question
 #: library/packages/src/modules/PackageLock.rb:187
@@ -3624,12 +3613,12 @@
 msgstr "有未解决的依赖关系，需要在软件管理器中手动解决。"
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:417
+#: library/packages/src/modules/PackageSystem.rb:418
 msgid "Installing required packages failed."
 msgstr "安装必需的软件包失败。"
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:421
+#: library/packages/src/modules/PackageSystem.rb:422
 msgid ""
 "Installing required packages failed. If you continue\n"
 "without installing required packages,\n"
@@ -3669,8 +3658,7 @@
 "<p><b><big>License Confirmation</big></b><br>\n"
 "The package in the headline of the dialog requires an explicit confirmation\n"
 "of acceptance of its license.\n"
-"If you reject the license of the package, the package will not be "
-"installed.\n"
+"If you reject the license of the package, the package will not be installed.\n"
 "<br>\n"
 "To accept the license of the package, click <b>I Agree</b>.\n"
 "To reject the license of the package, click <b>I Disagree</b></p>."
@@ -3686,10 +3674,8 @@
 #: library/packages/src/modules/PackagesUI.rb:347
 msgid ""
 "<p>\n"
-"\t\t This dialog allows you to define this system's tasks and what software "
-"to install.\n"
-"\t\t Available tasks and software for this system are shown by category in "
-"the left\n"
+"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
 "\t\t column.  To view a description for an item, select it in the list.\n"
 "\t\t </p>"
 msgstr ""
@@ -3728,8 +3714,7 @@
 #: library/packages/src/modules/PackagesUI.rb:367
 msgid ""
 "<p>\n"
-"\t\t The disk usage display in the lower right corner shows the remaining "
-"disk space\n"
+"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
 "\t\t after all requested changes will have been performed.\n"
 "\t\t Hard disk partitions that are full or nearly full can degrade\n"
 "\t\t system performance and in some cases even cause serious problems.\n"
@@ -3813,7 +3798,7 @@
 
 #. display installation log
 #: library/packages/src/modules/PackagesUI.rb:624
-#: library/packages/src/modules/PackagesUI.rb:712
+#: library/packages/src/modules/PackagesUI.rb:713
 msgid "Installation log"
 msgstr "安装日志"
 
@@ -3826,46 +3811,44 @@
 msgid "After Installing Packages"
 msgstr "在安装软件包后"
 
-#: library/packages/src/modules/PackagesUI.rb:680
+#: library/packages/src/modules/PackagesUI.rb:681
 msgid "Show This Report"
 msgstr "显示此报告"
 
-#: library/packages/src/modules/PackagesUI.rb:681
+#: library/packages/src/modules/PackagesUI.rb:682
 msgid "Finish"
 msgstr "已完成"
 
-#: library/packages/src/modules/PackagesUI.rb:682
+#: library/packages/src/modules/PackagesUI.rb:683
 msgid "Continue in the Software Manager"
 msgstr "在软件管理器中继续"
 
-#: library/packages/src/modules/PackagesUI.rb:687
-msgid ""
-"<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed "
-"or removed packages.</P>"
+#: library/packages/src/modules/PackagesUI.rb:688
+msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
 msgstr "<P><BIG><B>安装报告</B><BIG></P><P>这里是一份已安装或已移除软件包的摘要。</P>"
 
-#: library/packages/src/modules/PackagesUI.rb:695
+#: library/packages/src/modules/PackagesUI.rb:696
 msgid "Installation Report"
 msgstr "安装报告"
 
-#: library/packages/src/modules/PackagesUI.rb:717
+#: library/packages/src/modules/PackagesUI.rb:718
 msgid "Installed Packages"
 msgstr "已安装的软件包"
 
-#: library/packages/src/modules/PackagesUI.rb:722
+#: library/packages/src/modules/PackagesUI.rb:723
 msgid "Updated Packages"
 msgstr "已更新的软件包"
 
-#: library/packages/src/modules/PackagesUI.rb:727
+#: library/packages/src/modules/PackagesUI.rb:728
 msgid "Removed Packages"
 msgstr "已移除的软件包"
 
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:733
 msgid "Remaining Packages"
 msgstr "其余软件包"
 
 #. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:753
+#: library/packages/src/modules/PackagesUI.rb:754
 msgid ""
 "If you want to show this report dialog again edit\n"
 "\n"
@@ -3883,7 +3866,7 @@
 #. popup question, %1 stands for the package name
 #. %2 is a repository name
 #. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
 msgid ""
 "The package %1 from repository %2\n"
 "%3\n"
@@ -3904,7 +3887,7 @@
 #. popup question, %1 stands for the filename
 #. %2 is a repository name
 #. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
 msgid ""
 "The file %1 from repository %2\n"
 "%3\n"
@@ -3923,16 +3906,16 @@
 "无论如何都使用该文件吗？\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
 msgid "Unsigned Package"
 msgstr "未签名的软件包"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
 msgid "Unsigned File"
 msgstr "未签名的文件"
 
 #. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
 msgid ""
 "No checksum for package %1 was found in the repository.\n"
 "While the package is part of the signed repository, it is not contained \n"
@@ -3949,80 +3932,78 @@
 "无论如何都安装该软件包吗？\n"
 
 #. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
 msgid ""
 "No checksum for file %1 was found in the repository.\n"
 "This means that the file is part of the signed repository,\n"
-"but the list of checksums in this repository does not mention this file. "
-"Using the file\n"
+"but the list of checksums in this repository does not mention this file. Using the file\n"
 "may put the integrity of your system at risk.\n"
 "\n"
 "Use it anyway?"
 msgstr ""
 "未在源中找到文件 %1 的校验码。\n"
 "这表明，虽然该文件属于一个已签名的软件源，\n"
-"但此源中的校验码列表并未提到该文件。使用该文件可能会使您的系统完整性面临风"
-"险。\n"
+"但此源中的校验码列表并未提到该文件。使用该文件可能会使您的系统完整性面临风险。\n"
 "\n"
 "无论如何都使用该文件吗？"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
 msgid "No Checksum Found"
 msgstr "未找到校验码"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID
-#: library/packages/src/modules/SignatureCheckDialogs.rb:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
 msgid "ID: %1"
 msgstr "ID：%1"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
-#: library/packages/src/modules/SignatureCheckDialogs.rb:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
 msgid "Fingerprint: %1"
 msgstr "指纹：%1"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
 msgid "Name: %1"
 msgstr "名称：%1"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
 msgid "Created: %1"
 msgstr "创建于：%1"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
 msgid "Expires: %1"
 msgstr "失效于：%1"
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
 msgid "ID: "
 msgstr "ID："
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
 msgid "Name: "
 msgstr "名称："
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
 msgid "Fingerprint: "
 msgstr "指纹："
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
 msgid "Created: "
 msgstr "创建于："
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
 msgid "Expires: "
 msgstr "失效于："
 
 #. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
 msgid ""
 "Package %1 from repository %2\n"
 "%3\n"
@@ -4039,13 +4020,12 @@
 "由以下 GnuPG 密钥签名，但完整性检查失败：%4\n"
 "\n"
 "这意味着在该软件源创建者签名该软件包之后，\n"
-"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性"
-"是一个巨大的风险。\n"
+"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性是一个巨大的风险。\n"
 "\n"
 "无论如何都安装该软件包吗？\n"
 
 #. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
 msgid ""
 "File %1 from repository %2\n"
 "%3\n"
@@ -4068,12 +4048,12 @@
 "无论如何都使用该文件吗？\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
 msgid "Validation Check Failed"
 msgstr "校验检查失败"
 
 #. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
 msgid ""
 "The package %1 is digitally signed\n"
 "with the following unknown GnuPG key: %2.\n"
@@ -4092,7 +4072,7 @@
 "无论如何都安装该软件包吗？"
 
 #. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
 msgid ""
 "The file %1\n"
 "is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4112,12 +4092,12 @@
 "无论如何都使用该文件吗？"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
 msgid "Unknown GnuPG Key"
 msgstr "未知 GnuPG 密钥"
 
 #. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
 msgid ""
 "The package %1 is digitally signed\n"
 "with key '%2 (%3)'.\n"
@@ -4138,7 +4118,7 @@
 "最保险的方法是跳过该软件包。\n"
 
 #. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
 msgid ""
 "The file %1 is digitally signed\n"
 "with key '%2 (%3)'.\n"
@@ -4159,17 +4139,17 @@
 "最保险的方法是跳过该文件。\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
 msgid "Signed with Untrusted Public Key"
 msgstr "经未信任公共密钥签名"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
 msgid "&Trust and Import the Key"
 msgstr "信任并导入该密钥(&T)"
 
 #. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
 msgid ""
 "<p>The owner of the key may distribute updates,\n"
 "packages, and package repositories that your system will trust and offer\n"
@@ -4183,18 +4163,17 @@
 "将允许该密钥的所有者拥有对您系统上的软件的一定量的控制权。</p>"
 
 #. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
 msgid ""
 "<p>A warning dialog opens for every package that\n"
 "is not signed by a trusted (imported) key. If you do not trust the key,\n"
-"the packages or repositories created by the owner of the key will not be "
-"used.</p>"
+"the packages or repositories created by the owner of the key will not be used.</p>"
 msgstr ""
 "<p>每个未经可信 (导入的) 密钥签名的软件包都会触发一个警告对话框。\n"
 "若您不信任该密钥，将不会使用由该密钥的所有者创建的软件包或软件源。</p>"
 
 #. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
 msgid ""
 "The following GnuPG key has been found in repository\n"
 "%1\n"
@@ -4205,7 +4184,7 @@
 "(%2)："
 
 #. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
 msgid ""
 "You can choose to import it into your keyring of trusted\n"
 "public keys, meaning that you trust the owner of the key.\n"
@@ -4216,23 +4195,23 @@
 "导入前应确保您可以信任该所有者，并且该密钥确实属于该所有者。"
 
 #. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
 msgid "WARNING: The key has expired!"
 msgstr "警告：该密钥已过期！"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
 msgid "Import Untrusted GnuPG Key"
 msgstr "导入未信任 GnuPG 密钥"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
 msgid "&Trust"
 msgstr "信任(&T)"
 
 #. popup question, %1 stands for the filename, %2 is expected checksum
 #. %3 is the current checksum (e.g. "803a8ff00d00c9075a1bd223a480bcf92d2481c1")
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
 msgid ""
 "The expected checksum of file %1\n"
 "is %2,\n"
@@ -4255,20 +4234,19 @@
 "无论如何都使用该文件吗？\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
 msgid "Wrong Digest"
 msgstr "错误摘要"
 
 #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
 msgid ""
 "The checksum of file %1\n"
 "is %2,\n"
 "but the expected checksum is not known.\n"
 "\n"
 "This means that the origin and integrity of the file\n"
-"cannot be verified. Using the file puts the integrity of your system at "
-"risk.\n"
+"cannot be verified. Using the file puts the integrity of your system at risk.\n"
 "\n"
 "Use it anyway?\n"
 msgstr ""
@@ -4282,7 +4260,7 @@
 "无论如何都使用该文件吗？\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
 msgid "Unknown Digest"
 msgstr "未知摘要"
 
@@ -4326,14 +4304,8 @@
 msgstr "<p>正在安装软件包。</p>"
 
 #: library/packages/src/modules/SlideShow.rb:635
-msgid ""
-"<P><B>Aborting Installation</B> Package installation can be aborted using "
-"the <B>Abort</B> button. However, the system then can be in an inconsistent "
-"or unusable state or it may not boot if the basic system component is not "
-"installed.</P>"
-msgstr ""
-"<P><B>中止安装</B>可用<B>中止</B>按钮中止安装软件包。然而，之后系统可能处于不"
-"连贯或不稳定的状态，若未安装基础系统组件，它甚至可能无法引导。</P>"
+msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"
+msgstr "<P><B>中止安装</B>可用<B>中止</B>按钮中止安装软件包。然而，之后系统可能处于不连贯或不稳定的状态，若未安装基础系统组件，它甚至可能无法引导。</P>"
 
 #. Translators: Tab name, keep short, %s is product name, e.g. SLES
 #: library/packages/src/modules/SlideShow.rb:653
@@ -4342,38 +4314,38 @@
 
 #. tab
 #: library/packages/src/modules/SlideShow.rb:665
-msgid "Slide Sho&w"
-msgstr "幻灯片演示(&W)"
-
-#. tab
-#: library/packages/src/modules/SlideShow.rb:667
 msgid "&Details"
 msgstr "细节(&D)"
 
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
+msgid "Slide Sho&w"
+msgstr "幻灯片演示(&W)"
+
 #. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:706
+#: library/packages/src/modules/SlideShow.rb:708
 msgid "Performing Upgrade"
 msgstr "正在执行升级"
 
 #. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:709
+#: library/packages/src/modules/SlideShow.rb:711
 msgid "Performing Installation"
 msgstr "正在执行安装"
 
 #. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:744
+#: library/packages/src/modules/SlideShow.rb:746
 msgid "Package Installation"
 msgstr "软件包安装"
 
 #. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:816
+#: library/packages/src/modules/SlideShow.rb:818
 msgid ""
 "Do you really want\n"
 "to quit the installation?"
 msgstr "您真的想要退出安装吗？"
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:828
+#: library/packages/src/modules/SlideShow.rb:830
 msgid "Aborted"
 msgstr "已中止"
 
@@ -4981,45 +4953,44 @@
 "退出代码：%{exitcode}\n"
 "错误输出：%{stderr}"
 
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Continue/Cancel question, %1 is a coma separated list of file names
+#: library/system/src/modules/FileChanges.rb:178
 msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Files %1 have been changed manually.\n"
+"YaST might lose some of the changes"
 msgstr ""
 "文件 %1 已被手动修改。\n"
-"YaST 可能会丢失一些修改。\n"
+"YaST 可能会丢失一些修改"
 
-#. Continue/Cancel question, %1 is a coma separated list of file names
+#. Continue/Cancel question, %1 is a file name
 #: library/system/src/modules/FileChanges.rb:180
 msgid ""
-"Files %1 have been changed manually.\n"
-"YaST might lose some of the changes"
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
 msgstr ""
 "文件 %1 已被手动修改。\n"
-"YaST 可能会丢失一些修改"
+"YaST 可能会丢失一些修改。\n"
 
-#: library/system/src/modules/FileChanges.rb:193
+#: library/system/src/modules/FileChanges.rb:192
 msgid "Do not show this message anymore"
 msgstr "不再显示此消息"
 
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
+#, fuzzy
+#| msgid ""
+#| "File %s has been created manually.\n"
+#| "YaST might lose this file."
 msgid ""
 "File %s has been created manually.\n"
 "YaST might lose this file."
-msgstr ""
-"文件 %s 已被手动创建。\n"
-"YaST 或许会丢失此文件。"
-
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
+msgid_plural ""
 "Files %s have been created manually.\n"
 "YaST might lose these files."
-msgstr ""
+msgstr[0] ""
 "文件 %s 已被手动创建。\n"
-"YaST 或许会丢失这些文件。"
+"YaST 或许会丢失此文件。"
 
 #. error report
 #: library/system/src/modules/Initrd.rb:415
@@ -5027,7 +4998,7 @@
 msgstr "initrd 创建过程中出错。"
 
 #. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
 msgid ""
 "Reboot your system\n"
 "to activate the new kernel.\n"
@@ -5147,13 +5118,13 @@
 
 #. ellipsis - used to replace part of text to make it shorter
 #. example: "/really/very/long/file/name", "/.../file/name")
-#: library/types/src/modules/String.rb:738
+#: library/types/src/modules/String.rb:730
 msgid "..."
 msgstr "..."
 
 #. covert a number to download rate string
 #. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB
-#: library/types/src/modules/String.rb:855
+#: library/types/src/modules/String.rb:846
 msgid "%1/s"
 msgstr "%1/秒"
 
@@ -5232,8 +5203,8 @@
 
 #. fallback name for the dialog title
 #. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
 msgid "Module"
 msgstr "模块"
 
@@ -5880,13 +5851,11 @@
 "\n"
 "A valid reverse IPv4 consists of four integers in the range 0-255\n"
 "separated by a dot then followed by the string '.in-addr.arpa.'.\n"
-"For example, '1.32.168.192.in-addr.arpa.' for the IPv4 address "
-"'192.168.32.1'.\n"
+"For example, '1.32.168.192.in-addr.arpa.' for the IPv4 address '192.168.32.1'.\n"
 msgstr ""
 "反向 IPv4 地址 %1 无效。\n"
 "\n"
-"有效的反向 IPv4 包含由英文句号分隔的 4 个范围在 0-255 之间的整数，后面再跟字"
-"符串 '.in-addr.arpa.'。\n"
+"有效的反向 IPv4 包含由英文句号分隔的 4 个范围在 0-255 之间的整数，后面再跟字符串 '.in-addr.arpa.'。\n"
 "例如，IPv4 地址 '192.168.32.1' 的反向地址是 '1.32.168.192.in-addr.arpa.'。\n"
 
 #. TRANSLATORS: Popup error message, user can't use hostname %1 because it doesn't make
@@ -6011,6 +5980,13 @@
 "DNS 服务器管理的 %1 没有反向区域。\n"
 "无法添加主机名 %2。"
 
+#~ msgid ""
+#~ "Files %s have been created manually.\n"
+#~ "YaST might lose these files."
+#~ msgstr ""
+#~ "文件 %s 已被手动创建。\n"
+#~ "YaST 或许会丢失这些文件。"
+
 #~ msgid "The correct repository medium could not be mounted."
 #~ msgstr "无法挂载正确的软件源介质。"
 
@@ -6044,9 +6020,7 @@
 #~ "Yast has automatically added or removed some packages,\n"
 #~ "check the changes scheduled to fix the system\n"
 #~ "in the software manager."
-#~ msgstr ""
-#~ "YaST 自动添加或移除了一些软件包，请到软件管理器中检查计划的变更以修复系"
-#~ "统。"
+#~ msgstr "YaST 自动添加或移除了一些软件包，请到软件管理器中检查计划的变更以修复系统。"
 
 #~ msgid ""
 #~ "Start the software manager and fix the problems\n"

Modified: trunk/yast/zh_CN/po/bootloader.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/bootloader.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/bootloader.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-06-05 17:01+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -24,96 +24,56 @@
 "X-Generator: Lokalize 2.0\n"
 
 #. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
 msgid "Boot loader configuration module"
 msgstr "引导加载器配置模块"
 
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "引导加载器配置摘要"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "引导分区类型是 NFS。无法安装引导加载器。"
 
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "删除全局选项或某引导项的选项"
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "引导加载器设置"
 
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "设置全局选项或某引导项的选项"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr "设备映射必须包含至少一个设备"
 
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr "添加新引导项 - 请使用交互模式"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
+msgid "Disk order settings"
+msgstr "磁盘顺序设置"
 
-#. command line help text for print action
-#: src/clients/bootloader.rb:82
-msgid "Print value of specified option"
-msgstr "打印指定选项的值"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "磁盘(&I)"
 
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "引导项名称"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "设备(&D)"
 
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
-msgid "The key of the option"
-msgstr "选项的键"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+#, fuzzy
+#| msgid "Selected custom bootloader partition %s is not available any more."
+msgid "Selected bootloader partition %s is not available any more."
+msgstr "所选自定义引导分区 %s 不再可用。"
 
-#. command line help text for an option
-#: src/clients/bootloader.rb:104
-msgid "The value of the option"
-msgstr "选项的值"
-
-#. command line error report, %1 is section name
-#. command line error report, %1 is section name
-#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225
-msgid "Section %1 not found."
-msgstr "未找到引导项 %1。"
-
-#. command line error report
-#: src/clients/bootloader.rb:201
-msgid "Value was not specified."
-msgstr "未指定值。"
-
-#. Add a new bootloader section with specified name
-#. @param [Hash] options a list of parameters passed as args
-#. @return [Boolean] true on success
-#: src/clients/bootloader.rb:239
-msgid "Add option is available only in commandline interactive mode"
-msgstr "添加选项只在命令行交互模式中可用"
-
-#. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "必须指定引导项名称。"
-
-#. command line error report
-#: src/clients/bootloader.rb:265
-msgid "Option was not specified."
-msgstr "未指定选项。"
-
-#. command line error report
-#: src/clients/bootloader.rb:284
-msgid "Specified option does not exist."
-msgstr "指定选项不存在。"
-
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
-msgid "Value: %1"
-msgstr "值：%1"
-
-#. progress step title
-#: src/clients/bootloader_finish.rb:52
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
 msgid "Saving bootloader configuration..."
 msgstr "正在保存引导加载器配置..."
 
 #. TRANSLATORS: reboot message
 #. %1 is replaced with additional message from reIPL
-#: src/clients/bootloader_finish.rb:133
+#: src/lib/bootloader/finish_client.rb:102
 msgid ""
 "\n"
 "Your system will now shut down.%1\n"
@@ -128,2083 +88,1537 @@
 #. and we're ready to start (boot into) the installed system
 #. Message that will be displayed along with information
 #. how the boot loader was installed
-#: src/clients/bootloader_finish.rb:146
+#: src/lib/bootloader/finish_client.rb:115
 msgid "The system will reboot now..."
 msgstr "系统将立即重引导..."
 
-#. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:116
-msgid ""
-"No boot loader is selected for installation. Your system might not be "
-"bootable."
-msgstr "未选择安装任何引导加载器。您的系统可能无法引导。"
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "引导加载器(&B)"
 
-#. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
-msgid ""
-"Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "出于分区原因，无法正确安装引导加载器"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
+msgstr ""
 
-#. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
-msgid "Booting"
-msgstr "引导"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
+msgstr ""
 
-#. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
-msgid "&Booting"
-msgstr "引导(&B)"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
+msgstr ""
 
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:41
-#: src/include/bootloader/grub2/dialogs.rb:221
-msgid "Disk Order"
-msgstr "磁盘顺序"
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (默认)"
 
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-msgid "Disk order settings"
-msgstr "磁盘顺序设置"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-msgid "Boot Menu"
-msgstr "引导菜单"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "引导加载器选项"
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>引导菜单</b></big><br></p>"
-
-#: src/include/bootloader/grub/helps.rb:24
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
 msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR "
-"code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active "
-"even\n"
-"if the boot loader is installed in the MBR.</p>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
 msgstr ""
-"<b>在分区表中为引导分区设置活动旗标</b><br>\n"
-"激活包含引导加载器的分区。\n"
-"之后通用 MBR 代码将引导活动分区。\n"
-"较旧的 BIOS 要求有一个活动分区，\n"
-"即使引导加载器安装在主引导记录中也是如此。</p>"
+"\n"
+"您若不安装任何引导加载器，系统可能无法启动。\n"
+"\n"
+"继续咩？后果很严重哦\n"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
+#: src/lib/bootloader/generic_widgets.rb:75
 msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is "
-"loaded.</p>\n"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
 msgstr ""
-"<p><b>超时(以秒计)</b><br>\n"
-"指定在默认内核加载前引导加载器将等待的时间。</p>\n"
+"<p><b>引导加载器类型</b><br>\n"
+"要选择是否安装引导加载器以及安装哪个引导加载器，请使用<b>引导加载器</b>。</p>"
 
-#: src/include/bootloader/grub/helps.rb:33
-msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
-msgstr ""
-"<p>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时，引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
-"统。\n"
-"若超时前没有按下任何键，将引导默认内核或操作系统。\n"
-"引导加载器菜单中的引导项顺序可使用<b>向上</b>和<b>向下</b>按钮调整。</p>\n"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "引导加载器类型：%1"
 
-#: src/include/bootloader/grub/helps.rb:41
-msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of "
-"your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
-msgstr ""
-"<p><b>将通用引导代码写入主引导记录</b>将使用通用代码 (用于引导活动分区的独立"
-"于操作系统的代码) 替换您磁盘的主引导记录。</p>"
+#: src/lib/bootloader/grub2.rb:109
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "启用安全引导：%1"
 
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the "
-"other is\n"
-"<b>Boot from Root Partition</b>.</p>"
-msgstr "<p><b>从引导分区引导</b>是一个推荐选项，另一个是<b>从根分区引导</b>。</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+#, fuzzy
+#| msgid "Yes"
+msgid "yes"
+msgstr "是"
 
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option "
-"<i>Graphical Menu File</i> will be ignored.\n"
-"It is recommended to install grub to MBR</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
 msgstr ""
-"<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将"
-"被忽略。\n"
-"推荐将 grub 安装到主引导记录。</p>"
 
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have "
-"another operating system\n"
-"installed on your computer</p>"
-msgstr ""
-"<p>若您计算机上还安装着另一个操作系统，则不推荐使用<b>从主引导记录引导</b>。"
-"</p>"
+#: src/lib/bootloader/grub2.rb:116
+msgid "Status Location: %1"
+msgstr "状态位置：%1"
 
-#: src/include/bootloader/grub/helps.rb:53
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there "
-"is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot "
-"Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is "
-"needed or configure your other boot manager\n"
-"to start this section.</p>"
-msgstr ""
-"<p>当有合适的分区时，<b>从根分区引导</b>是推荐选项。\n"
-"若需要更新主引导记录，可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区"
-"设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的"
-"引导管理器去启动此引导项。</p>"
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "硬盘顺序：%1"
 
-#: src/include/bootloader/grub/helps.rb:59
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root "
-"partition is on \n"
-"logical partition and the /boot partition is missing</p>"
-msgstr ""
-"若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</p>"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr " (扩展分区)"
 
-#: src/include/bootloader/grub/helps.rb:62
-msgid ""
-"<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>自定义引导分区</b>可让您选择要从之引导的分区。</p>"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr " (主引导记录)"
 
-#: src/include/bootloader/grub/helps.rb:65
-msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
-msgstr ""
-"<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 "
-"GRUB 写入两个磁盘的主引导记录。</p>"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (do not install</a>)"
+msgstr "安装引导代码至 MBR(不安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:68
-msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub) for details.</p>"
-msgstr ""
-"<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n"
-"细节请参考 grub 文档 (<code>info grub</code>)。</p>"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (install</a>)"
+msgstr "不安装引导代码至 MBR(安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:71
-msgid ""
-"<p><b>Terminal Definition</b></p><br>\n"
-"Defines the type of terminal you want to use. For a serial terminal (eg. a "
-"serial console),\n"
-"you have to specify <code>serial</code>. You can also pass <code>console to the\n"
-"command, as <code>serial console</code>. In this case, a terminal in which "
-"you\n"
-"press any key will be selected as a GRUB terminal.</p>"
-msgstr ""
-"<p><b>定义终端</b></p><br>\n"
-"定义您想要使用的终端类型。 \n"
-"对于串行终端 (如串行控制台)，您必须指定 <code>serial</code>。\n"
-"您也可以向命令传递 <code>console</code> 参数，如 <code>serial console</code>。\n"
-"在这种情况下，将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (do not install</a>)"
+msgstr "安装引导代码至 /boot 分区(不安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:78
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section "
-"numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
-"<p><b>默认项失败时的备用引导项</b>包含了一个引导项编号列表，\n"
-"当默认引导项无法引导时，可使用该列表来引导。</p>"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (install</a>)"
+msgstr "不安装引导代码至 /boot 分区(安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:81
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (do not install</a>)"
+msgstr "安装引导代码至 \"/\" 分区(不安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:84
-msgid ""
-"<p><b>Graphical Menu File</b> defines the file to use for the graphical boot "
-"menu.</p>"
-msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (install</a>)"
+msgstr "不安装引导代码至 \"/\" 分区(安装</a>)"
 
-#: src/include/bootloader/grub/helps.rb:87
-msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr "警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。"
 
-#: src/include/bootloader/grub/helps.rb:90
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"Define the password that will be required to access the boot menu. YaST will "
-"only accept the password if you repeat\n"
-"it in <b>Retype Password</b>.</p>"
-msgstr ""
-"<p><b>使用密码保护引导加载器</b><br>\n"
-"定义用于访问引导菜单的密码。\n"
-"若您在 <b>重输密码</b> 中重复了它，YaST 将只接受该密码。</p>"
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
+msgid "Change Location: %s"
+msgstr "变动位置：%s"
 
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr "超时 (以秒计)(&T)"
+
+#: src/lib/bootloader/grub2_widgets.rb:57
 msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"To specify the order of the disks according to the order in BIOS, use\n"
-"the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
 msgstr ""
-"<p><big><b>磁盘顺序</b></big><br>\n"
-"要根据 BIOS 中的顺序指定磁盘顺序，请使用\n"
-"<b>向上</b>和<b>向下</b>按钮来重新排列磁盘。\n"
-"要添加磁盘，请按<b>添加</b>。\n"
-"要移除磁盘，请按<b>移除</b>。</p>"
+"<p><b>超时(以秒计)</b><br>\n"
+"指定在默认内核加载前引导加载器将等待的时间。</p>\n"
 
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Boot Loader Locations"
-msgstr "引导加载器位置"
-
-#: src/include/bootloader/grub/helps.rb:109
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr "在分区表中为引导分区设置活动旗标(&A)"
 
-#: src/include/bootloader/grub/helps.rb:112
-#: src/include/bootloader/routines/common_helps.rb:29
-msgid "&Timeout in Seconds"
-msgstr "超时 (以秒计)(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
+"<b>在分区表中为引导分区设置活动旗标</b><br>\n"
+"激活包含引导加载器的分区。\n"
+"之后通用 MBR 代码将引导活动分区。\n"
+"较旧的 BIOS 要求有一个活动分区，\n"
+"即使引导加载器安装在主引导记录中也是如此。</p>"
 
-#: src/include/bootloader/grub/helps.rb:113
-msgid "&Default Boot Section"
-msgstr "默认引导项(&D)"
-
-#: src/include/bootloader/grub/helps.rb:114
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
 msgid "Write &generic Boot Code to MBR"
 msgstr "将通用引导代码写入主引导记录(&G)"
 
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr "使用信任的 Grub(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr "<p><b>将通用引导代码写入主引导记录</b>将使用通用代码 (用于引导活动分区的独立于操作系统的代码) 替换您磁盘的主引导记录。</p>"
 
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Custom Boot Partition"
-msgstr "自定义引导分区"
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
+msgstr "引导时隐藏菜单(&H)"
 
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Boot from Master Boot Record"
-msgstr "从主引导记录引导"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>"
 
-#: src/include/bootloader/grub/helps.rb:118
-msgid "Boot from Root Partition"
-msgstr "从根分区引导"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+#, fuzzy
+#| msgid "Probe Foreign OS"
+msgid "Pro&be Foreign OS"
+msgstr "探测外来操作系统"
 
-#: src/include/bootloader/grub/helps.rb:119
-msgid "Boot from Boot Partition"
-msgstr "从引导分区引导"
+#: src/lib/bootloader/grub2_widgets.rb:176
+msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+msgstr "<p>可通过 os-prober <b>探测外来操作系统</b>以与其它外来操作系统多重引导</p>"
 
-#: src/include/bootloader/grub/helps.rb:120
-msgid "Boot from Extended Partition"
-msgstr "从扩展分区引导"
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
+msgid "O&ptional Kernel Command Line Parameter"
+msgstr "可选内核命令行参数(&P)"
 
-#: src/include/bootloader/grub/helps.rb:121
-msgid "Serial Connection &Parameters"
-msgstr "串行连接参数(&P)"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p><b>可选内核命令行参数</b>可让您定义要传递给内核的额外参数。</p>"
 
-#: src/include/bootloader/grub/helps.rb:122
-msgid "Fallback Sections if Default fails"
-msgstr "默认引导项失败时的备用引导项"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+#, fuzzy
+#| msgid "Protective MBR flag"
+msgid "&Protective MBR flag"
+msgstr "保护性 MBR 旗标"
 
-#: src/include/bootloader/grub/helps.rb:123
-msgid "&Hide Menu on Boot"
-msgstr "引导时隐藏菜单(&H)"
+#: src/lib/bootloader/grub2_widgets.rb:232
+msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
+msgstr "<p><b>保护性 MBR 旗标</b>是一个专家设置，仅在一些诡异的硬件上需要。细节请参考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>"
 
-#: src/include/bootloader/grub/helps.rb:124
-msgid "Graphical &Menu File"
-msgstr "图形菜单文件(&M)"
+#. TRANSLATORS: set flag on disk
+#: src/lib/bootloader/grub2_widgets.rb:246
+msgid "set"
+msgstr "设置"
 
-#: src/include/bootloader/grub/helps.rb:125
-msgid "Pa&ssword for the Menu Interface"
-msgstr "菜单界面密码(&S)"
+#. TRANSLATORS: remove flag from disk
+#: src/lib/bootloader/grub2_widgets.rb:248
+msgid "remove"
+msgstr "移除"
 
-#: src/include/bootloader/grub/helps.rb:126
-msgid "Debugg&ing Flag"
-msgstr "调试旗标(&I)"
+#. TRANSLATORS: do not change flag on disk
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
+msgid "do not change"
+msgstr "不变动"
 
-#. encoding: utf-8
-#. File:
-#. modules/BootGRUB.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Module containing specific functions for GRUB configuration
-#. and installation
-#.
-#. Authors:
-#. Jiri Srain 
-#. Joachim Plack 
-#. Olaf Dabrunz 
-#. Philipp Thomas 
-#.
-#. $Id$
-#: src/include/bootloader/grub/options.rb:68
-msgid "Choose new graphical menu file"
-msgstr "选择新图形菜单文件"
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
+msgid "Enable &Secure Boot Support"
+msgstr "启用安全引导支持 (Secure Boot)"
 
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-msgid "Enable Acoustic &Signals"
-msgstr "启用声音信号(&S)"
+#: src/lib/bootloader/grub2_widgets.rb:272
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "启用安全引导：%1"
 
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:254
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+#| msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
+msgstr "启用安全引导支持 (Secure Boot)"
+
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
+msgstr ""
+
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
 msgid "Prot&ect Boot Loader with Password"
 msgstr "使用密码保护引导加载器(&E)"
 
-#. text entry
-#: src/include/bootloader/grub/options.rb:259
-msgid "&Password"
-msgstr "密码(&P)"
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
+msgstr "仅保护启动项不受修改(&r)"
 
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
+msgstr ""
+
 #. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/lib/bootloader/grub2_widgets.rb:339
 msgid "Re&type Password"
 msgstr "再次键入密码(&T)"
 
-#. Common widget of a console
-#. @return [Hash{String => Object}] CWS widget
-#: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:295
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "密码不能为空。"
+
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
+msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。"
+
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
+msgstr ""
+
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
+msgid "Choose new graphical theme file"
+msgstr "选择新图形主题文件"
+
+#: src/lib/bootloader/grub2_widgets.rb:498
+msgid "Use &graphical console"
+msgstr "使用图形控制台(&G)"
+
+#: src/lib/bootloader/grub2_widgets.rb:503
+msgid "&Console resolution"
+msgstr "控制台分辨率(&C)"
+
+#: src/lib/bootloader/grub2_widgets.rb:508
+msgid "&Console theme"
+msgstr "控制台主题(&C)"
+
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
+msgstr "由 grub2 自动检测"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
 msgid "Use &serial console"
 msgstr "使用串行控制台(&S)"
 
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
+#: src/lib/bootloader/grub2_widgets.rb:554
 msgid "&Console arguments"
 msgstr "控制台参数(&C)"
 
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-msgid "&Device"
-msgstr "设备(&D)"
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+msgid "&Default Boot Section"
+msgstr "默认引导项(&D)"
 
-#. disabling & enabling up/down, do it after change
-#: src/include/bootloader/grub/options.rb:534
-msgid "Device map must contain at least one device"
-msgstr "设备映射必须包含至少一个设备"
+#: src/lib/bootloader/grub2_widgets.rb:575
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+msgstr ""
+"<p>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
+"当引导时，引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+"若超时前没有按下任何键，将引导默认内核或操作系统。\n"
+"引导加载器菜单中的引导项顺序可使用<b>向上</b>和<b>向下</b>按钮调整。</p>\n"
 
-#: src/include/bootloader/grub/options.rb:543
-msgid "D&isks"
-msgstr "磁盘(&I)"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "引导加载器位置"
 
-#: src/include/bootloader/grub/options.rb:555
-msgid "&Up"
-msgstr "向上(&U)"
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
 
-#: src/include/bootloader/grub/options.rb:556
-msgid "&Down"
-msgstr "向下(&D)"
-
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:730
-msgid "Boot from &Root Partition"
-msgstr "从根分区引导(&R)"
-
-#: src/include/bootloader/grub/options.rb:731
+#: src/lib/bootloader/grub2_widgets.rb:692
 msgid "Boo&t from Boot Partition"
 msgstr "从引导分区引导(&T)"
 
-#: src/include/bootloader/grub/options.rb:739
-#: src/include/bootloader/grub/options.rb:766
-#: src/include/bootloader/grub/options.rb:801
-msgid "Boot Loader Location"
-msgstr "引导加载器位置"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "从根分区引导"
 
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:772
-#: src/include/bootloader/grub/options.rb:807
+#: src/lib/bootloader/grub2_widgets.rb:694
 msgid "Boot from &Master Boot Record"
 msgstr "从主引导记录引导(&M)"
 
-#: src/include/bootloader/grub/options.rb:752
+#: src/lib/bootloader/grub2_widgets.rb:695
 msgid "Boot from &Extended Partition"
 msgstr "从扩展分区引导(&E)"
 
-#: src/include/bootloader/grub/options.rb:778
-#: src/include/bootloader/grub/options.rb:819
+#: src/lib/bootloader/grub2_widgets.rb:706
 msgid "C&ustom Boot Partition"
 msgstr "自定义引导分区(&U)"
 
-#: src/include/bootloader/grub/options.rb:812
-msgid "Enable Red&undancy for MD Array"
-msgstr "启用多设备 (MD) 阵列冗余(&U)"
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "磁盘顺序"
 
-#. push button
-#. push button
-#: src/include/bootloader/grub/options.rb:871
-#: src/include/bootloader/routines/global_widgets.rb:831
-msgid "Boot Loader Installation &Details"
-msgstr "引导加载器安装细节(&D)"
+#: src/lib/bootloader/grub2_widgets.rb:725
+msgid ""
+"<p><big><b>Disks Order</b></big><br>\n"
+"To specify the order of the disks according to the order in BIOS, use\n"
+"the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
+msgstr ""
+"<p><big><b>磁盘顺序</b></big><br>\n"
+"要根据 BIOS 中的顺序指定磁盘顺序，请使用\n"
+"<b>向上</b>和<b>向下</b>按钮来重新排列磁盘。\n"
+"要添加磁盘，请按<b>添加</b>。\n"
+"要移除磁盘，请按<b>移除</b>。</p>"
 
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
-msgid "Boot Code Options"
-msgstr "引导代码选项"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:82
-msgid "Kernel Parameters"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Kernel Parameters"
+msgid "&Kernel Parameters"
 msgstr "内核参数"
 
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:102
-msgid "Bootloader Options"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Code Options"
+msgid "Boot Co&de Options"
+msgstr "引导代码选项"
+
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Bootloader Options"
+msgid "Boot&loader Options"
 msgstr "引导加载器选项"
 
-#: src/include/bootloader/grub2/dialogs.rb:183
-msgid "Secure Boot"
-msgstr "安全引导 (Secure Boot)"
+#: src/lib/bootloader/grub2efi.rb:81
+msgid "Enable Secure Boot: %1"
+msgstr "启用安全引导：%1"
 
-#: src/include/bootloader/grub2/dialogs.rb:189
-msgid "Enable &Secure Boot Support"
-msgstr "启用安全引导支持 (Secure Boot)"
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "出于分区原因，无法正确安装引导加载器。"
 
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
-msgid "Boot &Loader Location"
-msgstr "引导加载器位置(&L)"
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "不安装任何引导加载器"
 
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
-msgid "Choose partition where is boot sequence installed."
-msgstr "请选择将安装引导程序的分区。"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "引导"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-#: src/include/bootloader/routines/section_helps.rb:33
-msgid ""
-"<p><b>Optional Kernel Command Line Parameter</b> lets you define additional "
-"parameters to pass to the kernel.</p>"
-msgstr "<p><b>可选内核命令行参数</b>可让您定义要传递给内核的额外参数。</p>"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "引导(&B)"
 
-#: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
-msgid ""
-"<p><b>Vga Mode</b> defines the VGA mode the kernel should set the "
-"<i>console</i> to when booting.</p>"
-msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>"
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "未选择安装任何引导加载器。您的系统可能无法引导。"
 
-#: src/include/bootloader/grub2/helps.rb:29
-msgid ""
-"<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe "
-"parameters to pass to the kernel.</p>"
-msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>"
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "出于分区原因，无法正确安装引导加载器"
 
-#: src/include/bootloader/grub2/helps.rb:32
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
 msgid ""
-"<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other "
-"foreign distribution </p>"
-msgstr "<p>可通过 os-prober <b>探测外来操作系统</b>以与其它外来操作系统多重引导</p>"
+"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+"Reading current configuration...</P>"
+msgstr ""
+"<P><BIG><B>引导加载器配置工具</B></BIG><BR>\n"
+"修改您引导加载器的设置。</P>"
 
-#: src/include/bootloader/grub2/helps.rb:35
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
 msgid ""
-"<p><b>Protective MBR flag</b> is expert only settings, that is needed only "
-"on exotic hardware. For details see Protective MBR in GPT disks. Do not "
-"touch if you are not sure.</p>"
+"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b>保护性 MBR 旗标</b>是一个专家设置，仅在一些诡异的硬件上需要。细节请参"
-"考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>"
+"<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n"
+"请稍候...<br></p>"
 
-#: src/include/bootloader/grub2/helps.rb:38
-msgid ""
-"<p><b>Distributor</b> specifies name of distributor of kernel used to create "
-"boot entry name. </p>"
-msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合"
 
-#: src/include/bootloader/grub2/helps.rb:44
-#: src/include/bootloader/routines/section_helps.rb:99
-msgid "O&ptional Kernel Command Line Parameter"
-msgstr "可选内核命令行参数(&P)"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
+msgstr "从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使用。要修复此问题，可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区，或不要把 stage 1 安装到 MBR。"
 
-#: src/include/bootloader/grub2/helps.rb:45
-msgid "D&istributor"
-msgstr "发行方(&I)"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。"
 
-#: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
-msgid "&Vga Mode"
-msgstr "&VGA 模式"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置，例如，主引导记录"
 
-#: src/include/bootloader/grub2/helps.rb:47
-msgid "&Failsafe Kernel Command Line Parameter"
-msgstr "安全模式内核命令行参数(&F)"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
+msgstr "缺失用于引导的 ext 分区。无法安装引导代码。"
 
-#: src/include/bootloader/grub2/helps.rb:48
-msgid "Probe Foreign OS"
-msgstr "探测外来操作系统"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
+msgstr "安装器未设置激活旗标。若根本未设置该旗标，某些 BIOS 可能会拒绝引导。"
 
-#: src/include/bootloader/grub2/helps.rb:49
-msgid "Protective MBR flag"
-msgstr "保护性 MBR 旗标"
+#: src/modules/BootSupportCheck.rb:207
+#, fuzzy
+#| msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
+msgstr "安装器将不会修改磁盘 MBR。除非它已包含了引导代码，否则 BIOS 将无法引导磁盘。"
 
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-#: src/include/bootloader/routines/section_widgets.rb:523
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2，%3 位 (模式 %4)"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "检查引导加载器"
 
-#: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
-msgid "Standard 8-pixel font mode."
-msgstr "标准 8 像素字体模式。"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "读取分区"
 
-#. item of a combo box
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-#: src/include/bootloader/routines/section_widgets.rb:540
-msgid "Text Mode"
-msgstr "文本模式"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "加载引导加载器设置"
 
-#: src/include/bootloader/grub2/options.rb:72
-#: src/include/bootloader/routines/section_widgets.rb:541
-msgid "Unspecified"
-msgstr "未指定"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "正在检查引导加载器..."
 
-#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
-msgid "set"
-msgstr "设置"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "正在读取分区..."
 
-#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
-msgid "remove"
-msgstr "移除"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "正在加载引导加载器设置..."
 
-#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
-msgid "do not change"
-msgstr "不变动"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "正在初始化引导加载器配置"
 
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:174
-msgid "Autodetect by grub2"
-msgstr "由 grub2 自动检测"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "创建 initrd"
 
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:249
-msgid "Choose new graphical theme file"
-msgstr "选择新图形主题文件"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
+#, fuzzy
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "保存引导加载器配置文件"
 
-#: src/include/bootloader/grub2/options.rb:261
-msgid "Use &graphical console"
-msgstr "使用图形控制台(&G)"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "正在创建 initrd..."
 
-#: src/include/bootloader/grub2/options.rb:268
-msgid "&Console resolution"
-msgstr "控制台分辨率(&C)"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "正在保存引导加载器配置..."
 
-#: src/include/bootloader/grub2/options.rb:276
-msgid "&Console theme"
-msgstr "控制台主题(&C)"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "正在保存引导加载器配置"
 
-#. FIXME this should be better handled by exception and show it properly, but it require too big change now
-#: src/include/bootloader/routines/autoinstall.rb:169
-msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
-msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "引导加载器配置摘要"
 
-#. file open popup caption
-#. file open popup caption
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:102
-#: src/include/bootloader/routines/section_widgets.rb:265
-#: src/include/bootloader/routines/section_widgets.rb:279
-msgid "Select File"
-msgstr "选择文件"
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "删除全局选项或某引导项的选项"
 
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "引导分区类型是 NFS。无法安装引导加载器。"
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "设置全局选项或某引导项的选项"
 
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
-msgid "Boot Loader Settings"
-msgstr "引导加载器设置"
+#~ msgid "Add a new section - please use interactive mode"
+#~ msgstr "添加新引导项 - 请使用交互模式"
 
-#. message
-#: src/include/bootloader/routines/dialogs.rb:159
-msgid "There are no options to set for the current boot loader."
-msgstr "没有要为当前引导加载器设置的选项。"
+#~ msgid "Print value of specified option"
+#~ msgstr "打印指定选项的值"
 
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-msgid "Kernel Section"
-msgstr "内核项"
+#~ msgid "The name of the section"
+#~ msgstr "引导项名称"
 
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#: src/include/bootloader/routines/dialogs.rb:183
-#: src/include/bootloader/routines/dialogs.rb:261
-#: src/include/bootloader/routines/dialogs.rb:331
-#: src/include/bootloader/routines/dialogs.rb:399
-#: src/include/bootloader/routines/dialogs.rb:474
-#: src/include/bootloader/routines/dialogs.rb:522
-#: src/include/bootloader/routines/dialogs.rb:581
-#: src/include/bootloader/routines/dialogs.rb:636
-msgid "Section Settings"
-msgstr "引导项设置"
+#~ msgid "The key of the option"
+#~ msgstr "选项的键"
 
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:231
-#: src/include/bootloader/routines/dialogs.rb:302
-#: src/include/bootloader/routines/dialogs.rb:370
-#: src/include/bootloader/routines/dialogs.rb:445
-#: src/include/bootloader/routines/dialogs.rb:494
-#: src/include/bootloader/routines/dialogs.rb:542
-#: src/include/bootloader/routines/dialogs.rb:605
-#: src/include/bootloader/routines/dialogs.rb:683
-#: src/include/bootloader/routines/dialogs.rb:721
-msgid "Boot Loader Settings: Section Management"
-msgstr "引导加载器设置：引导项管理"
+#~ msgid "The value of the option"
+#~ msgstr "选项的值"
 
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:393
-#: src/include/bootloader/routines/section_helps.rb:108
-#: src/include/bootloader/routines/section_widgets.rb:585
-msgid "Xen Section"
-msgstr "Xen 项"
+#~ msgid "Section %1 not found."
+#~ msgstr "未找到引导项 %1。"
 
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:468
-#: src/include/bootloader/routines/section_helps.rb:111
-#: src/include/bootloader/routines/section_helps.rb:121
-#: src/include/bootloader/routines/section_widgets.rb:591
-msgid "Menu Section"
-msgstr "菜单项"
+#~ msgid "Value was not specified."
+#~ msgstr "未指定值。"
 
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-msgid "Dump Section"
-msgstr "转储项"
+#~ msgid "Add option is available only in commandline interactive mode"
+#~ msgstr "添加选项只在命令行交互模式中可用"
 
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-msgid "Other System Section"
-msgstr "其它系统项"
+#~ msgid "Section name must be specified."
+#~ msgstr "必须指定引导项名称。"
 
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-msgid "&Filename"
-msgstr "文件名(&F)"
+#~ msgid "Option was not specified."
+#~ msgstr "未指定选项。"
 
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "文件名：%1"
+#~ msgid "Specified option does not exist."
+#~ msgstr "指定选项不存在。"
 
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-msgid "Fi&le Contents"
-msgstr "文件内容(&L)"
+#~ msgid "Value: %1"
+#~ msgstr "值：%1"
 
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-msgid "Expert Manual Configuration"
-msgstr "专家手动配置"
+#~ msgid "Boot Menu"
+#~ msgstr "引导菜单"
 
-#. sections list widget
-#. Refresh and redraw widget wits sections
-#. @param [Array Object>}] sects list of current sections
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:114
-#: src/include/bootloader/routines/global_widgets.rb:641
-msgid "Other"
-msgstr "其它"
+#~ msgid "Boot Loader Options"
+#~ msgstr "引导加载器选项"
 
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "映像"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>引导菜单</b></big><br></p>"
 
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr "Xen"
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr "<p><b>从引导分区引导</b>是一个推荐选项，另一个是<b>从根分区引导</b>。</p>"
 
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "软盘"
+#~ msgid ""
+#~ "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
+#~ "It is recommended to install grub to MBR</p>"
+#~ msgstr ""
+#~ "<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将被忽略。\n"
+#~ "推荐将 grub 安装到主引导记录。</p>"
 
-#: src/include/bootloader/routines/global_widgets.rb:154
-msgid "Menu"
-msgstr "菜单"
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr "<p>若您计算机上还安装着另一个操作系统，则不推荐使用<b>从主引导记录引导</b>。</p>"
 
-#: src/include/bootloader/routines/global_widgets.rb:161
-msgid "Dump"
-msgstr "转储"
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p>当有合适的分区时，<b>从根分区引导</b>是推荐选项。\n"
+#~ "若需要更新主引导记录，可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的引导管理器去启动此引导项。</p>"
 
-#. table header, Def stands for default
-#: src/include/bootloader/routines/global_widgets.rb:255
-msgid "Def."
-msgstr "默认"
+#~ msgid ""
+#~ "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
+#~ "logical partition and the /boot partition is missing</p>"
+#~ msgstr "若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</b></p>"
 
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "标签"
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>自定义引导分区</b>可让您选择要从之引导的分区。</p>"
 
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-msgid "Type"
-msgstr "类型"
+#~ msgid ""
+#~ "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
+#~ "enable to write GRUB to MBR of both disks.</p>"
+#~ msgstr "<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 GRUB 写入两个磁盘的主引导记录。</p>"
 
-#. table header; header for section details, either
-#. the specification of the kernel image to load,
-#. or the specification of device to boot from
-#: src/include/bootloader/routines/global_widgets.rb:263
-msgid "Image / Device"
-msgstr "映像 / 设备"
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n"
+#~ "细节请参考 grub 文档 (<code>info grub</code>)。</p>"
 
-#: src/include/bootloader/routines/global_widgets.rb:271
-msgid "Set as De&fault"
-msgstr "设置为默认(&F)"
+#~ msgid ""
+#~ "<p><b>Terminal Definition</b></p><br>\n"
+#~ "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
+#~ "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
+#~ "command, as <code>serial console</code>. In this case, a terminal in which you\n"
+#~ "press any key will be selected as a GRUB terminal.</p>"
+#~ msgstr ""
+#~ "<p><b>定义终端</b></p><br>\n"
+#~ "定义您想要使用的终端类型。 \n"
+#~ "对于串行终端 (如串行控制台)，您必须指定 <code>serial</code>。\n"
+#~ "您也可以向命令传递 <code>console</code> 参数，如 <code>serial console</code>。\n"
+#~ "在这种情况下，将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>"
 
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
-msgid "&Boot Loader"
-msgstr "引导加载器(&B)"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>默认项失败时的备用引导项</b>包含了一个引导项编号列表，\n"
+#~ "当默认引导项无法引导时，可使用该列表来引导。</p>"
 
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
-msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
-msgstr ""
-"\n"
-"您若不安装任何引导加载器，系统可能无法启动。\n"
-"\n"
-"继续咩？后果很严重哦\n"
+#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+#~ msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>"
 
-#. warning - popup, followed by radio buttons
-#: src/include/bootloader/routines/global_widgets.rb:377
-msgid ""
-"\n"
-"You chose to change your boot loader. When converting \n"
-"the configuration, some settings might be lost.\n"
-"\n"
-"The current configuration will be saved and you can\n"
-"restore it if you return to the current boot loader.\n"
-"\n"
-"Select a course of action:\n"
-msgstr ""
-"\n"
-"您选择了修改您的引导加载器。\n"
-"当转换配置时，可能丢失一些设置。\n"
-"\n"
-"当前配置将被保存，若您后面再使用现在这个引导加载器时可以恢复当前配置。\n"
-"\n"
-"请选择一个动作：\n"
+#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+#~ msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
 
-#. radiobutton
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
-msgid "&Propose New Configuration"
-msgstr "建议新配置(&P)"
+#~ msgid ""
+#~ "<p><b>Protect Boot Loader with Password</b><br>\n"
+#~ "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
+#~ "it in <b>Retype Password</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>使用密码保护引导加载器</b><br>\n"
+#~ "定义用于访问引导菜单的密码。\n"
+#~ "若您在 <b>重输密码</b> 中重复了它，YaST 将只接受该密码。</p>"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "转换当前配置(&N)"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "引导加载器位置"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-msgid "&Start New Configuration from Scratch"
-msgstr "从零开始新配置(&S)"
+#~ msgid "Use &Trusted Grub"
+#~ msgstr "使用信任的 Grub(&T)"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-msgid "&Read Configuration Saved on Disk"
-msgstr "读取保存在磁盘上的配置(&R)"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "自定义引导分区"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "恢复转换前保存的配置(&T)"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "从主引导记录引导"
 
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-msgid "Select the boot loader before editing sections."
-msgstr "在编辑各项前请选择引导加载器。"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "从引导分区引导"
 
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-msgid "E&dit Configuration Files"
-msgstr "编辑配置文件(&D)"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "从扩展分区引导"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
-msgid "&Start from Scratch"
-msgstr "从零开始(&S)"
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "串行连接参数(&P)"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
-msgid "&Reread Configuration from Disk"
-msgstr "从磁盘重新读取配置(&R)"
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "默认引导项失败时的备用引导项"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
-msgid "Restore MBR of Hard Disk"
-msgstr "恢复硬盘的主引导记录"
+#~ msgid "Graphical &Menu File"
+#~ msgstr "图形菜单文件(&M)"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:633
-msgid "Write bootloader boot code to disk"
-msgstr "将引导加载器引导代码写入磁盘"
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "菜单界面密码(&S)"
 
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
-msgid "MBR restored successfully."
-msgstr "已成功恢复主引导记录。"
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "调试旗标(&I)"
 
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
-msgid "Failed to restore MBR."
-msgstr "恢复主引导记录失败。"
+#~ msgid "Choose new graphical menu file"
+#~ msgstr "选择新图形菜单文件"
 
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
-msgid "Writing bootloader settings failed."
-msgstr "写入引导加载器设置失败。"
+#~ msgid "Enable Acoustic &Signals"
+#~ msgstr "启用声音信号(&S)"
 
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-msgid "&Section Management"
-msgstr "引导项管理(&S)"
+#~ msgid "&Password"
+#~ msgstr "密码(&P)"
 
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-msgid "Boot Loader &Installation"
-msgstr "引导加载器安装(&I)"
+#~ msgid "&Up"
+#~ msgstr "向上(&U)"
 
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
-msgid "Boot &Loader Options"
-msgstr "引导加载器选项(&L)"
+#~ msgid "&Down"
+#~ msgstr "向下(&D)"
 
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
-msgid ""
-"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
-msgstr ""
-"<P><BIG><B>引导加载器配置工具</B></BIG><BR>\n"
-"修改您引导加载器的设置。</P>"
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "从根分区引导(&R)"
 
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
-msgid ""
-"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
-"Please wait...<br></p>"
-msgstr ""
-"<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n"
-"请稍候...<br></p>"
+#~ msgid "Enable Red&undancy for MD Array"
+#~ msgstr "启用多设备 (MD) 阵列冗余(&U)"
 
-#. help text, optional part of following
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-msgstr "若您安装了多个 Linux 系统，YaST 可以尝试查找它们并合并它们的菜单。"
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "引导加载器安装细节(&D)"
 
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:58
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the "
-"current \n"
-"configuration and propose a new configuration, start from scratch, or "
-"reread\n"
-"the configuration saved on your disk. %1</P>"
-msgstr ""
-"<P>从<B>其它</B>中，您可以手动编辑引导加载器配置文件，清除当前配置并提出一个"
-"新方案，从零开始新配置，或重新读取保存在您磁盘上的配置。%1</P>"
+#~ msgid "Secure Boot"
+#~ msgstr "安全引导 (Secure Boot)"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
-msgstr "<P>要手动编辑引导加载器配置文件，请点击<B>编辑配置文件</B>。</P>"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "引导加载器位置(&L)"
 
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>"
+#~ msgid "Choose partition where is boot sequence installed."
+#~ msgstr "请选择将安装引导程序的分区。"
 
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
-msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>"
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>"
 
-#. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
-msgid ""
-"<P> By pressing <b>Set as Default</b>, mark the selected \n"
-"section as default. When booting, the boot loader will provide \n"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
-msgstr ""
-"<P>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时，引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
-"统。\n"
-"若超时前没有按下任何键，将引导默认内核或操作系统。\n"
-"引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>"
+#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
+#~ msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>"
 
-#. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
-msgid ""
-"<P>Press <B>Add</B> to create a new boot loader section\n"
-"or <B>Delete</B> to delete the selected section.</P>"
-msgstr ""
-"<P>按<B>添加</B>可创建一个新引导加载器引导项，\n"
-"按<B>删除</B>可删除所选引导项。</P>"
+#~ msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
+#~ msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>"
 
-#. help text for the custom boot manager installation, 1 of 7
-#. %1 = name of boot loader (e.g. "LILO")
-#. this should be per architecture
-#: src/include/bootloader/routines/helps.rb:115
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
-msgstr ""
-"<p><big><b>引导加载器位置</b></big><br>\n"
-"引导管理器 (%1) 可以以下方式安装：</p>"
+#~ msgid "D&istributor"
+#~ msgstr "发行方(&I)"
 
-#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
-msgid ""
-"<p>- In the <b>Master Boot Record</b> (MBR).\n"
-"This is not recommended if there is another operating system installed\n"
-"on the computer.</p>"
-msgstr ""
-"<p>- 在<b>主引导记录</b> (MBR) 中。\n"
-"若计算机上安装了其它操作系统则不推荐此方法。</p>"
+#~ msgid "&Vga Mode"
+#~ msgstr "&VGA 模式"
 
-#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
-msgid ""
-"<p>\n"
-"- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
-"partition.  This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- 在 <tt>/boot</tt> 或 <tt>/</tt>(根) 分区的<b>引导扇区</b>中。\n"
-"这是当有合适的分区存在时的推荐选项。\n"
-"若需要更新主引导记录，可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器"
-"分区</b>\n"
-"和<b>使用通用代码替换主引导记录</b>。\n"
-"或者也可以配置您其它的引导管理器去启动 &product;。</p>"
+#~ msgid "&Failsafe Kernel Command Line Parameter"
+#~ msgstr "安全模式内核命令行参数(&F)"
 
-#. custom bootloader help text, 4 of 7
-#. this part will only be shown if a floppy drive is attached.
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>\n"
-"- On a <b>Floppy Disk</b>.\n"
-"Use this to avoid the risk of interfering with an already existing\n"
-"boot mechanism. Enable booting from floppy disk in\n"
-"the BIOS of your machine to use this option.</p>"
-msgstr ""
-"<p>\n"
-"- 在<b>软盘</b>上。\n"
-"可使用此选项规避干扰已存在的引导机制的风险。\n"
-"请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>"
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2，%3 位 (模式 %4)"
 
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- 在某些<b>其它</b>分区中。\n"
-"当选择此选项时请考虑到您系统的限制。</p>"
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "标准 8 像素字体模式。"
 
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>例如，多数 PC 均有 BIOS 限制只能引导硬盘柱面小于 1024 的分区。\n"
-"取决于所用的引导管理器，您可能能够也可能不能从一个逻辑分区引导。</p>"
+#~ msgid "Text Mode"
+#~ msgstr "文本模式"
 
-#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
-msgid ""
-"<p>\n"
-"Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"请在输入字段中输入分区的设备名 (例如，<tt>/dev/hda3</tt> 或 <tt>/dev/sdb)。</p>"
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b>引导加载器安装细节</b><br>\n"
-"要调整高级引导加载器安装选项 (诸如设备映射)，\n"
-"请点击<b>引导加载器安装细节</b>。</p>"
+#~ msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+#~ msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b>引导加载器类型</b><br>\n"
-"要选择是否安装引导加载器以及安装哪个引导加载器，请使用<b>引导加载器</b>。</p>"
+#~ msgid "Select File"
+#~ msgstr "选择文件"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b>引导加载器选项</b><br>\n"
-"要调整引导加载器的选项，诸如超时，请点击<b>引导加载器选项</b>。</p>"
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "没有要为当前引导加载器设置的选项。"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
-msgid ""
-"<P><B>Expert Manual Configuration</B><BR>\n"
-"Here, manually edit the boot loader configuration.</P>\n"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>专家手动配置</B><BR>\n"
-"在此处手动编辑引导加载器配置。</P>\n"
-"<P>注意：最终配置文件中的缩进可能有所不同。</P>"
+#~ msgid "Kernel Section"
+#~ msgstr "内核项"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The "
-"section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b>引导项名称</b><br>\n"
-"请使用<b>引导项名称</b>来指定引导加载器引导项的名称。\n"
-"引导项必须是唯一。</p>"
+#~ msgid "Section Settings"
+#~ msgstr "引导项设置"
 
-#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
-msgid ""
-"<p><big><b>Type of the New Section</b></big><br>\n"
-"Select the type of the new section to create.</p>"
-msgstr ""
-"<p><big><b>新引导项类型</b></big><br>\n"
-"选择要创建的新引导项类型。</p>"
+#~ msgid "Boot Loader Settings: Section Management"
+#~ msgstr "引导加载器设置：引导项管理"
 
-#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
-msgid ""
-"<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
-"section. Then modify the options that should differ from the\n"
-"selected section.</p>"
-msgstr ""
-"<p>可选择<b>克隆所选引导项</b>克隆当前所选引导项目。\n"
-"然后再修改应与所选引导项不同的选项。</p>"
+#~ msgid "Xen Section"
+#~ msgstr "Xen 项"
 
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>"
+#~ msgid "Menu Section"
+#~ msgstr "菜单项"
 
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像，但需要在 XEN 环境中启"
-"动它。</p>"
+#~ msgid "Dump Section"
+#~ msgstr "转储项"
 
-#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
-msgid ""
-"<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
-"loads and starts a boot sector of a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区"
-"的项。\n"
-"这用于引导其它操作系统。</p>"
+#~ msgid "Other System Section"
+#~ msgstr "其它系统项"
 
-#: src/include/bootloader/routines/helps.rb:278
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the "
-"disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>选择<b>菜单项</b>可添加一个从磁盘某分区加载配置文件 (引导项列表)的项。\n"
-"这用于引导其它操作系统。</p>"
+#~ msgid "&Filename"
+#~ msgstr "文件名(&F)"
 
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:697
-msgid "Order of Hard Disks: %1"
-msgstr "硬盘顺序：%1"
+#~ msgid "Filename: %1"
+#~ msgstr "文件名：%1"
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:48
-msgid "Do not install any boot loader"
-msgstr "不安装任何引导加载器"
+#~ msgid "Fi&le Contents"
+#~ msgstr "文件内容(&L)"
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:50
-msgid "Do Not Install Any Boot Loader"
-msgstr "不安装任何引导加载器"
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "专家手动配置"
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:55
-msgid "Install the default boot loader"
-msgstr "安装默认引导加载器"
+#~ msgid "Other"
+#~ msgstr "其它"
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:57
-msgid "Install Default Boot Loader"
-msgstr "安装默认引导加载器"
+#~ msgid "Image"
+#~ msgstr "映像"
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:61
-msgid "Boot loader"
-msgstr "引导加载器"
+#~ msgid "Xen"
+#~ msgstr "Xen"
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Boot Loader"
-msgstr "引导加载器"
+#~ msgid "Floppy"
+#~ msgstr "软盘"
 
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "已将 %1 引导扇区写入软盘。"
+#~ msgid "Menu"
+#~ msgstr "菜单"
 
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr "请将软盘留在驱动器中。"
+#~ msgid "Dump"
+#~ msgstr "转储"
 
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr "若未指定引导加载器则此功能不可用。"
+#~ msgid "Def."
+#~ msgstr "默认"
 
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"真的不保存就离开引导加载器配置界面吗？\n"
-"全部修改均将不复存在。\n"
+#~ msgid "Label"
+#~ msgstr "标签"
 
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-msgid "Really delete section %1?"
-msgstr "真的删除引导项 %1 吗？"
+#~ msgid "Type"
+#~ msgstr "类型"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:65
-msgid "The password must not be empty."
-msgstr "密码不能为空。"
+#~ msgid "Image / Device"
+#~ msgstr "映像 / 设备"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:74
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。"
+#~ msgid "Set as De&fault"
+#~ msgstr "设置为默认(&F)"
 
-#. message popup, %1 is sectino label
-#: src/include/bootloader/routines/popups.rb:88
-msgid ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-msgstr ""
-"磁盘设置已修改。\n"
-"请检查引导项 %1 的设置。\n"
+#~ msgid ""
+#~ "\n"
+#~ "You chose to change your boot loader. When converting \n"
+#~ "the configuration, some settings might be lost.\n"
+#~ "\n"
+#~ "The current configuration will be saved and you can\n"
+#~ "restore it if you return to the current boot loader.\n"
+#~ "\n"
+#~ "Select a course of action:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "您选择了修改您的引导加载器。\n"
+#~ "当转换配置时，可能丢失一些设置。\n"
+#~ "\n"
+#~ "当前配置将被保存，若您后面再使用现在这个引导加载器时可以恢复当前配置。\n"
+#~ "\n"
+#~ "请选择一个动作：\n"
 
-#. message popup
-#: src/include/bootloader/routines/popups.rb:100
-msgid ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-msgstr ""
-"磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n"
-"请检查引导加载器设置。\n"
+#~ msgid "&Propose New Configuration"
+#~ msgstr "建议新配置(&P)"
 
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:116
-msgid "%1Set default boot loader location?\n"
-msgstr "%1 设置默认引导装载器位置吗？\n"
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "转换当前配置(&N)"
 
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-msgid "Do Not Create a File System"
-msgstr "不创建文件系统"
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "从零开始新配置(&S)"
 
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-msgid "Create an ext2 File System"
-msgstr "创建 ext2 文件系统"
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "读取保存在磁盘上的配置(&R)"
 
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-msgid "Create a FAT File System"
-msgstr "创建 FAT 文件系统"
+#~ msgid "Res&tore Configuration Saved before Conversion"
+#~ msgstr "恢复转换前保存的配置(&T)"
 
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-msgid ""
-"The boot loader boot sector will be written\n"
-"to a floppy disk. Insert a floppy disk\n"
-"and confirm with OK.\n"
-msgstr ""
-"引导加载器引导扇区将被写入到一张软盘。\n"
-"请插入软盘并按「好呢」确认。\n"
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "在编辑各项前请选择引导加载器。"
 
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr "低级格式化(&L)"
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "编辑配置文件(&D)"
 
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-msgid "&Create File System"
-msgstr "创建文件系统(&C)"
+#~ msgid "&Start from Scratch"
+#~ msgstr "从零开始(&S)"
 
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr "低级格式化失败。重试吗？"
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "从磁盘重新读取配置(&R)"
 
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-msgid "Creating file system failed."
-msgstr "创建文件系统失败。"
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "恢复硬盘的主引导记录"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:218
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"所选名称已在使用。\n"
-"请使用其它名称。\n"
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "将引导加载器引导代码写入磁盘"
 
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"引导加载器安装期间出错。\n"
-"重试引导加载器配置吗？\n"
+#~ msgid "MBR restored successfully."
+#~ msgstr "已成功恢复主引导记录。"
 
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-msgid "Unable to install the boot loader."
-msgstr "无法安装引导加载器。"
+#~ msgid "Failed to restore MBR."
+#~ msgstr "恢复主引导记录失败。"
 
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"警告！\n"
-"\n"
-"目前 %1 主引导记录将被保存在 %2 的主引导记录覆盖。\n"
-"\n"
-"只有主引导记录中的引导代码会被覆盖。\n"
-"分区表仍将保持不变。\n"
-"\n"
-"继续吗？\n"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "写入引导加载器设置失败。"
 
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:305
-msgid "&Yes, Rewrite"
-msgstr "是，覆盖(&Y)"
+#~ msgid "&Section Management"
+#~ msgstr "引导项管理(&S)"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/routines/section_helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader section widgets
-#.
-#. Authors:
-#. Josef Reidinger 
-#.
-#. $Id$
-#: src/include/bootloader/routines/section_helps.rb:23
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>映像项</b></p>"
+#~ msgid "Boot Loader &Installation"
+#~ msgstr "引导加载器安装(&I)"
 
-#: src/include/bootloader/routines/section_helps.rb:24
-msgid ""
-"<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name "
-"directly or choose via <b>Browse</b>.</p>"
-msgstr ""
-"<p><b>内核映像</b>定义了要引导的内核。可直接输入名称，或通过<b>浏览</b>选择。"
-"</p>"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "引导加载器选项(&L)"
 
-#: src/include/bootloader/routines/section_helps.rb:27
-msgid ""
-"<p><b>Root Device</b> sets the device to pass to the kernel as root device."
-msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"
+#~ msgid ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+#~ msgstr "若您安装了多个 Linux 系统，YaST 可以尝试查找它们并合并它们的菜单。"
 
-#: src/include/bootloader/routines/section_helps.rb:36
-msgid ""
-"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to "
-"use. Either enter the path and file name\n"
-"directly or choose by using <b>Browse</b>.</p>\n"
-msgstr ""
-"<p><b>初始内存磁盘</b>，若非空则定义了要使用的初始 ramdisk。\n"
-"可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n"
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr "<P>从<B>其它</B>中，您可以手动编辑引导加载器配置文件，清除当前配置并提出一个新方案，从零开始新配置，或重新读取保存在您磁盘上的配置。%1</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:39
-msgid ""
-"<p>Select <b>Chainloader Section</b> if you want to define a section for "
-"booting an OS other than Linux.</p>"
-msgstr ""
-"<p>若您想要定义一个引导非 Linux 操作系统的引导项，请选择<b>链式加载器项</b>。"
-"</p>"
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr "<P>要手动编辑引导加载器配置文件，请点击<B>编辑配置文件</B>。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:42
-msgid ""
-"<p>Setting <b>Use Password Protection</p> will require a password to select "
-"this section.</p>"
-msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>"
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:45
-msgid ""
-"<p><b>Other System</b> lets you choose among the non-Linux operating systems "
-"found on your computer.</p>"
-msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>"
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:48
-msgid ""
-"<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS "
-"needs this flag set in order to boot it</p>"
-msgstr ""
-"<p>若您 BIOS 需要设置此旗标才能引导之，请选择<b>当选为引导分区时激活此分区</p>"
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
+#~ "当引导时，引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+#~ "若超时前没有按下任何键，将引导默认内核或操作系统。\n"
+#~ "引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:51
-msgid ""
-"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks "
-"to boot. In most cases you want\n"
-"to specify <code>+1</code> here. For specifics on blocklist notation see the "
-"grub documentation.</p>\n"
-msgstr ""
-"<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n"
-"在多数情况下您需要在此指定 <code>+1</code>。 \n"
-"有关块列表的规范请参考 grub 文档。</p>\n"
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>按<B>添加</B>可创建一个新引导加载器引导项，\n"
+#~ "按<B>删除</B>可删除所选引导项。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:54
-msgid ""
-"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other "
-"image \n"
-"and start it in a Xen environment.</p>\n"
-msgstr ""
-"<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之，请选择 "
-"<b>Xen 项</b>。</p>\n"
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>引导加载器位置</b></big><br>\n"
+#~ "引导管理器 (%1) 可以以下方式安装：</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- 在<b>主引导记录</b> (MBR) 中。\n"
+#~ "若计算机上安装了其它操作系统则不推荐此方法。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:60
-msgid ""
-"<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional "
-"parameters to pass to the xen hypervisor.</p>"
-msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition.  This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在 <tt>/boot</tt> 或 <tt>/</tt>(根) 分区的<b>引导扇区</b>中。\n"
+#~ "这是当有合适的分区存在时的推荐选项。\n"
+#~ "若需要更新主引导记录，可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器分区</b>\n"
+#~ "和<b>使用通用代码替换主引导记录</b>。\n"
+#~ "或者也可以配置您其它的引导管理器去启动 &product;。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:63
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>菜单项</b></p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- On a <b>Floppy Disk</b>.\n"
+#~ "Use this to avoid the risk of interfering with an already existing\n"
+#~ "boot mechanism. Enable booting from floppy disk in\n"
+#~ "the BIOS of your machine to use this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在<b>软盘</b>上。\n"
+#~ "可使用此选项规避干扰已存在的引导机制的风险。\n"
+#~ "请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:64
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>菜单文件的分区</b></p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在某些<b>其它</b>分区中。\n"
+#~ "当选择此选项时请考虑到您系统的限制。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:65
-msgid ""
-"<p><b>Menu Description File</b> specifies path on root device from which is "
-"loaded menu file.</p>"
-msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>"
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>例如，多数 PC 均有 BIOS 限制只能引导硬盘柱面小于 1024 的分区。\n"
+#~ "取决于所用的引导管理器，您可能能够也可能不能从一个逻辑分区引导。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:68
-msgid ""
-"<p><b>Map Section to the First Disk from Device Map</b> Windows usually need "
-"to be on the first disk.</p>"
-msgstr ""
-"<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。"
-"</p>l"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "请在输入字段中输入分区的设备名 (例如，<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</tt>)。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:71
-msgid ""
-"<p><b>Measures</b> includes measured files with PCR. Change table is "
-"possible via buttons: <b>Add</b> , \n"
-"<b>Edit</b> and <b>Delete</b></p>"
-msgstr ""
-"<p><b>测量</b> 包含了用于 PCR 的测量文件。\n"
-"可通过 <b>添加</b>，<b>编辑</b>和<b>删除</b>修改表格。</p>"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>引导加载器安装细节</b><br>\n"
+#~ "要调整高级引导加载器安装选项 (诸如设备映射)，\n"
+#~ "请点击<b>引导加载器安装细节</b>。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:74
-msgid ""
-"<p><b>Allow attempt to relocate</b>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>允许尝试重新定位</b>\n"
-"通常在全局项中指定</p>"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>引导加载器选项</b><br>\n"
+#~ "要调整引导加载器的选项，诸如超时，请点击<b>引导加载器选项</b>。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:77
-msgid ""
-"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>强制只读挂载根文件系统</b><br>\n"
-"通常在全局项中指定</p>"
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>专家手动配置</B><BR>\n"
+#~ "在此处手动编辑引导加载器配置。</P>\n"
+#~ "<P>注意：最终配置文件中的缩进可能有所不同。</P>"
 
-#: src/include/bootloader/routines/section_helps.rb:80
-msgid ""
-"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-"create a system dump either on a DASD disk partition or tape device or to a\n"
-"file on a SCSI disk partition.</p>"
-msgstr ""
-"<p>选择<b>转储项</b>来添加一个指定了如何\n"
-"在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>"
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b>引导项名称</b><br>\n"
+#~ "请使用<b>引导项名称</b>来指定引导加载器引导项的名称。\n"
+#~ "引导项必须是唯一。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:85
-msgid ""
-"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-"Menu sections represent a list of tasks which are grouped together.</p>\n"
-msgstr ""
-"<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n"
-"菜单项代表了一系列组合在一起的任务。</p>\n"
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>新引导项类型</b></big><br>\n"
+#~ "选择要创建的新引导项类型。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:88
-msgid ""
-"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to "
-"enable the SELinux security framework. \n"
-"Please note that this will also disable AppArmor.</p>"
-msgstr ""
-"<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框"
-"架。\n"
-"请注意这也将禁用 AppArmor。</p>"
+#~ msgid ""
+#~ "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
+#~ "section. Then modify the options that should differ from the\n"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>可选择<b>克隆所选引导项</b>克隆当前所选引导项目。\n"
+#~ "然后再修改应与所选引导项不同的选项。</p>"
 
-#. radio button
-#: src/include/bootloader/routines/section_helps.rb:95
-#: src/include/bootloader/routines/section_widgets.rb:583
-msgid "Image Section"
-msgstr "映像项"
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:96
-msgid "&Kernel Image"
-msgstr "内核映像(&K)"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr "<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像，但需要在 XEN 环境中启动它。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:97
-msgid "&Root Device"
-msgstr "根设备(&R)"
+#~ msgid ""
+#~ "<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
+#~ "loads and starts a boot sector of a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区的项。\n"
+#~ "这用于引导其它操作系统。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
-msgstr "初始内存磁盘(&I)"
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>菜单项</b>可添加一个从磁盘某分区加载配置文件 (引导项列表)的项。\n"
+#~ "这用于引导其它操作系统。</p>"
 
-#: src/include/bootloader/routines/section_helps.rb:101
-msgid "Chainloader Section"
-msgstr "链式加载器项"
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "不安装任何引导加载器"
 
-#: src/include/bootloader/routines/section_helps.rb:102
-msgid "Use Password Protection"
-msgstr "使用密码保护"
+#~ msgid "Install the default boot loader"
+#~ msgstr "安装默认引导加载器"
 
-#: src/include/bootloader/routines/section_helps.rb:103
-msgid "&Other System"
-msgstr "其它系统(&O)"
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "安装默认引导加载器"
 
-#: src/include/bootloader/routines/section_helps.rb:104
-msgid "Do not &verify Filesystem before Booting"
-msgstr "引导前不校验文件系统(&V)"
+#~ msgid "Boot loader"
+#~ msgstr "引导加载器"
 
-#: src/include/bootloader/routines/section_helps.rb:105
-msgid "&Activate this Partition when selected for Boot"
-msgstr "当选为引导分区时激活此分区(&A)"
+#~ msgid "Boot Loader"
+#~ msgstr "引导加载器"
 
-#: src/include/bootloader/routines/section_helps.rb:106
-msgid "B&lock Offset for Chainloading"
-msgstr "阻止链式加载的偏移(&L)"
+#~ msgid "The %1 boot sector has been written to the floppy disk."
+#~ msgstr "已将 %1 引导扇区写入软盘。"
 
-#: src/include/bootloader/routines/section_helps.rb:107
-msgid "&Map Section to the First Disk in Device Map"
-msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
+#~ msgid "Leave the floppy disk in the drive."
+#~ msgstr "请将软盘留在驱动器中。"
 
-#: src/include/bootloader/routines/section_helps.rb:109
-msgid "&Hypervisor"
-msgstr "管理程序(&H)"
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr "若未指定引导加载器则此功能不可用。"
 
-#: src/include/bootloader/routines/section_helps.rb:110
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr "Xen 管理程序额外参数(&A)"
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "真的不保存就离开引导加载器配置界面吗？\n"
+#~ "全部修改均将不复存在。\n"
 
-#: src/include/bootloader/routines/section_helps.rb:112
-msgid "&Partition of Menu File"
-msgstr "菜单文件的分区(&P)"
+#~ msgid "Really delete section %1?"
+#~ msgstr "真的删除引导项 %1 吗？"
 
-#: src/include/bootloader/routines/section_helps.rb:113
-msgid "&Menu Description File"
-msgstr "菜单描述文件(&M)"
+#~ msgid ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+#~ msgstr ""
+#~ "磁盘设置已修改。\n"
+#~ "请检查引导项 %1 的设置。\n"
 
-#: src/include/bootloader/routines/section_helps.rb:114
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "强制只读挂载根文件系统(&F)"
+#~ msgid ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+#~ msgstr ""
+#~ "磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n"
+#~ "请检查引导加载器设置。\n"
 
-#: src/include/bootloader/routines/section_helps.rb:115
-msgid "Allow attempt to &relocate"
-msgstr "允许尝试重新定位(&R)"
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "%1 设置默认引导装载器位置吗？\n"
 
-#: src/include/bootloader/routines/section_helps.rb:116
-msgid "Tar&get Directory for Section"
-msgstr "引导项目标文件夹(&G)"
+#~ msgid "Do Not Create a File System"
+#~ msgstr "不创建文件系统"
 
-#: src/include/bootloader/routines/section_helps.rb:117
-msgid "Op&tional Parameter File"
-msgstr "可选参数文件(&T)"
+#~ msgid "Create an ext2 File System"
+#~ msgstr "创建 ext2 文件系统"
 
-#: src/include/bootloader/routines/section_helps.rb:118
-msgid "Dump Section (obsolete)"
-msgstr "转储项目(淘汰)"
+#~ msgid "Create a FAT File System"
+#~ msgstr "创建 FAT 文件系统"
 
-#: src/include/bootloader/routines/section_helps.rb:119
-msgid "&Dump Device"
-msgstr "转储设备(&D)"
+#~ msgid ""
+#~ "The boot loader boot sector will be written\n"
+#~ "to a floppy disk. Insert a floppy disk\n"
+#~ "and confirm with OK.\n"
+#~ msgstr ""
+#~ "引导加载器引导扇区将被写入到一张软盘。\n"
+#~ "请插入软盘并按「好呢」确认。\n"
 
-#: src/include/bootloader/routines/section_helps.rb:120
-msgid "&SCSI Dump Device"
-msgstr "&SCSI 转储设备"
+#~ msgid "&Low Level Format"
+#~ msgstr "低级格式化(&L)"
 
-#: src/include/bootloader/routines/section_helps.rb:122
-msgid "&List of Menu Entries"
-msgstr "菜单项列表(&L)"
+#~ msgid "&Create File System"
+#~ msgstr "创建文件系统(&C)"
 
-#: src/include/bootloader/routines/section_helps.rb:123
-msgid "&Number of Default Entry"
-msgstr "默认项数量(&N)"
+#~ msgid "Low level format failed. Try again?"
+#~ msgstr "低级格式化失败。重试吗？"
 
-#: src/include/bootloader/routines/section_helps.rb:124
-msgid "&Timeout in seconds"
-msgstr "超时(以秒计)(&S)"
+#~ msgid "Creating file system failed."
+#~ msgstr "创建文件系统失败。"
 
-#: src/include/bootloader/routines/section_helps.rb:125
-msgid "&Show boot menu"
-msgstr "显示引导菜单(&S)"
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "所选名称已在使用。\n"
+#~ "请使用其它名称。\n"
 
-#: src/include/bootloader/routines/section_helps.rb:126
-msgid "C&opy Image to Boot Partition"
-msgstr "复制映像到引导分区(&C)"
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "引导加载器安装期间出错。\n"
+#~ "重试引导加载器配置吗？\n"
 
-#: src/include/bootloader/routines/section_helps.rb:127
-msgid "&Skip Section gracefully on Errors"
-msgstr "出错时优雅地跳过该项(&S)"
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "无法安装引导加载器。"
 
-#: src/include/bootloader/routines/section_helps.rb:128
-msgid "Boot &Partition of Other System"
-msgstr "其它系统的引导分区(&P)"
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "警告！\n"
+#~ "\n"
+#~ "目前 %1 主引导记录将被保存在 %2 的主引导记录覆盖。\n"
+#~ "\n"
+#~ "只有主引导记录中的引导代码会被覆盖。\n"
+#~ "分区表仍将保持不变。\n"
+#~ "\n"
+#~ "继续吗？\n"
 
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr "映像项必须指定内核映像"
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "是，覆盖(&Y)"
 
-#: src/include/bootloader/routines/section_widgets.rb:65
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr "映像文件目前不存在。您真的想要使用它吗？"
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>映像项</b></p>"
 
-#: src/include/bootloader/routines/section_widgets.rb:82
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr "Initrd 文件目前不存在。您真的想要使用它吗？"
+#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+#~ msgstr "<p><b>内核映像</b>定义了要引导的内核。可直接输入名称，或通过<b>浏览</b>选择。</p>"
 
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-msgid "Enable &SELinux"
-msgstr "启用 &SELinux"
+#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+#~ msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"
 
-#. bnc#456362 filter out special chars like diacritics china chars etc.
-#: src/include/bootloader/routines/section_widgets.rb:401
-msgid "The name includes unallowable char(s)"
-msgstr "名称包含了不允许的字符"
+#~ msgid ""
+#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+#~ "directly or choose by using <b>Browse</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b>初始内存磁盘</b>，若非空则定义了要使用的初始 ramdisk。\n"
+#~ "可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n"
 
-#: src/include/bootloader/routines/section_widgets.rb:533
-msgid "Ask for resolution during boot."
-msgstr "引导期间询问分辨率。"
+#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#~ msgstr "<p>若您想要定义一个引导非 Linux 操作系统的引导项，请选择<b>链式加载器项</b>。</p>"
 
-#. radio button
-#: src/include/bootloader/routines/section_widgets.rb:573
-msgid "Clone Selected Section"
-msgstr "克隆所选引导项"
+#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+#~ msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>"
 
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-msgid "Other System (Chainloader)"
-msgstr "其它系统 (链式加载器)"
+#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+#~ msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>"
 
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "引导项类型"
+#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+#~ msgstr "<p>若您 BIOS 需要设置此旗标才能引导之，请选择<b>当选为引导分区时激活此分区</b></p>"
 
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-msgid "Section &Name"
-msgstr "引导项名称(&N)"
+#~ msgid ""
+#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
+#~ msgstr ""
+#~ "<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n"
+#~ "在多数情况下您需要在此指定 <code>+1</code>。 \n"
+#~ "有关块列表的规范请参考 grub 文档。</p>\n"
 
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid ""
-"Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "出于分区原因，无法正确安装引导加载器。"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
+#~ "and start it in a Xen environment.</p>\n"
+#~ msgstr "<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之，请选择 <b>Xen 项</b>。</p>\n"
 
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#.
-#. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
-msgid ""
-"Install bootcode into MBR (do not install</a>)"
-msgstr "安装引导代码至 MBR(不安装</a>)"
+#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+#~ msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"
 
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
-msgid ""
-"Do not install bootcode into MBR (install</a>)"
-msgstr "不安装引导代码至 MBR(安装</a>)"
+#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+#~ msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>"
 
-#. check for separated boot partition, use root otherwise
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
-msgid ""
-"Install bootcode into /boot partition (do not "
-"install</a>)"
-msgstr "安装引导代码至 /boot 分区(不安装</a>)"
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>菜单项</b></p>"
 
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
-msgid ""
-"Do not install bootcode into /boot partition (install</a>)"
-msgstr "不安装引导代码至 /boot 分区(安装</a>)"
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>菜单文件的分区</b></p>"
 
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
-msgid ""
-"Install bootcode into \"/\" partition (do not "
-"install</a>)"
-msgstr "安装引导代码至 \"/\" 分区(不安装</a>)"
+#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>"
 
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
-msgid ""
-"Do not install bootcode into \"/\" partition (install</a>)"
-msgstr "不安装引导代码至 \"/\" 分区(安装</a>)"
+#~ msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
+#~ msgstr "<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。</p>l"
 
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
-msgid "Change Location: %s"
-msgstr "变动位置：%s"
+#~ msgid ""
+#~ "<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
+#~ "<b>Edit</b> and <b>Delete</b></p>"
+#~ msgstr ""
+#~ "<p><b>测量</b> 包含了用于 PCR 的测量文件。\n"
+#~ "可通过 <b>添加</b>，<b>编辑</b>和<b>删除</b>修改表格。</p>"
 
-#. summary text, %1 is bootloader name (eg. LILO)
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
-#: src/modules/BootGRUB2EFI.rb:96
-msgid "Boot Loader Type: %1"
-msgstr "引导加载器类型：%1"
+#~ msgid ""
+#~ "<p><b>Allow attempt to relocate</b>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>允许尝试重新定位</b>\n"
+#~ "通常在全局项中指定</p>"
 
-#. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718
-msgid " (\"/boot\")"
-msgstr " (\"/boot\")"
+#~ msgid ""
+#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>强制只读挂载根文件系统</b><br>\n"
+#~ "通常在全局项中指定</p>"
 
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
-msgid " (extended)"
-msgstr " (扩展分区)"
+#~ msgid ""
+#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
+#~ "file on a SCSI disk partition.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>转储项</b>来添加一个指定了如何\n"
+#~ "在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>"
 
-#: src/modules/BootGRUB.rb:730
-msgid " (\"/\")"
-msgstr " (根分区)"
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+#~ "Menu sections represent a list of tasks which are grouped together.</p>\n"
+#~ msgstr ""
+#~ "<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n"
+#~ "菜单项代表了一系列组合在一起的任务。</p>\n"
 
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
-msgid " (MBR)"
-msgstr " (主引导记录)"
+#~ msgid ""
+#~ "<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
+#~ "Please note that this will also disable AppArmor.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框架。\n"
+#~ "请注意这也将禁用 AppArmor。</p>"
 
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
-msgid "Status Location: %1"
-msgstr "状态位置：%1"
+#~ msgid "Image Section"
+#~ msgstr "映像项"
 
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr " (默认)"
+#~ msgid "&Kernel Image"
+#~ msgstr "内核映像(&K)"
 
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "项：<br>%1"
+#~ msgid "&Root Device"
+#~ msgstr "根设备(&R)"
 
-#. summary text
-#: src/modules/BootGRUB.rb:788
-msgid "Do not install boot loader; just create configuration files"
-msgstr "不安装引导加载器；仅创建配置文件"
+#~ msgid "&Initial RAM Disk"
+#~ msgstr "初始内存磁盘(&I)"
 
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr "建议并与已有 GRUB 菜单合并(&M)"
+#~ msgid "Chainloader Section"
+#~ msgstr "链式加载器项"
 
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:230
-msgid ""
-"Warning: No location for bootloader stage1 selected.Unless you know what you "
-"are doing please select above location."
-msgstr ""
-"警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面"
-"的位置。"
+#~ msgid "Use Password Protection"
+#~ msgstr "使用密码保护"
 
-#: src/modules/BootGRUB2EFI.rb:104
-msgid "Enable Secure Boot: %1"
-msgstr "启用安全引导：%1"
+#~ msgid "&Other System"
+#~ msgstr "其它系统(&O)"
 
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:70
-msgid "Unknown bootloader: %1"
-msgstr "未知引导加载器：%1"
+#~ msgid "Do not &verify Filesystem before Booting"
+#~ msgstr "引导前不校验文件系统(&V)"
 
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:101
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合"
+#~ msgid "&Activate this Partition when selected for Boot"
+#~ msgstr "当选为引导分区时激活此分区(&A)"
 
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:140
-msgid ""
-"Boot from MBR does not work together with btrfs filesystem and GPT disk "
-"label without bios_grub partition.To fix this issue, create bios_grub "
-"partition or use any ext filesystem for boot partition or do not install "
-"stage 1 to MBR."
-msgstr ""
-"从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使"
-"用。要修复此问题，可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区，"
-"或不要把 stage 1 安装到 MBR。"
+#~ msgid "B&lock Offset for Chainloading"
+#~ msgstr "阻止链式加载的偏移(&L)"
 
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:168
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。"
+#~ msgid "&Map Section to the First Disk in Device Map"
+#~ msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
 
-#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:188
-msgid ""
-"The boot device is on software RAID1. Select other bootloader location, e.g. "
-"Master Boot Record"
-msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置，例如，主引导记录"
+#~ msgid "&Hypervisor"
+#~ msgstr "管理程序(&H)"
 
-#. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:243
-msgid ""
-"YaST could not determine the exact boot order of disks needed for the device "
-"map. Review and possibly adjust the boot order of disks in \"Boot Loader "
-"Installation Details\""
-msgstr ""
-"YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复"
-"核并调整磁盘的引导顺序"
+#~ msgid "&Additional Xen Hypervisor Parameters"
+#~ msgstr "Xen 管理程序额外参数(&A)"
 
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:263
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr "缺失用于引导的 ext 分区。无法安装引导代码。"
+#~ msgid "&Partition of Menu File"
+#~ msgstr "菜单文件的分区(&P)"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:170
-msgid "Check boot loader"
-msgstr "检查引导加载器"
+#~ msgid "&Menu Description File"
+#~ msgstr "菜单描述文件(&M)"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
-msgid "Read partitioning"
-msgstr "读取分区"
+#~ msgid "&Force root filesystem to be mounted read-only"
+#~ msgstr "强制只读挂载根文件系统(&F)"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
-msgid "Load boot loader settings"
-msgstr "加载引导加载器设置"
+#~ msgid "Allow attempt to &relocate"
+#~ msgstr "允许尝试重新定位(&R)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
-msgid "Checking boot loader..."
-msgstr "正在检查引导加载器..."
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "引导项目标文件夹(&G)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
-msgid "Reading partitioning..."
-msgstr "正在读取分区..."
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "可选参数文件(&T)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
-msgid "Loading boot loader settings..."
-msgstr "正在加载引导加载器设置..."
+#~ msgid "Dump Section (obsolete)"
+#~ msgstr "转储项目(淘汰)"
 
-#. dialog header
-#: src/modules/Bootloader.rb:186
-msgid "Initializing Boot Loader Configuration"
-msgstr "正在初始化引导加载器配置"
+#~ msgid "&Dump Device"
+#~ msgstr "转储设备(&D)"
 
-#. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:307
-msgid "Added Kernel Parameters: %1"
-msgstr "添加的内核参数：%1"
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "&SCSI 转储设备"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
-msgid "Create initrd"
-msgstr "创建 initrd"
+#~ msgid "&List of Menu Entries"
+#~ msgstr "菜单项列表(&L)"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
-msgid "Save boot loader configuration files"
-msgstr "保存引导加载器配置文件"
+#~ msgid "&Number of Default Entry"
+#~ msgstr "默认项数量(&N)"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
-msgid "Install boot loader"
-msgstr "安装引导加载器"
+#~ msgid "&Timeout in seconds"
+#~ msgstr "超时(以秒计)(&S)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
-msgid "Creating initrd..."
-msgstr "正在创建 initrd..."
+#~ msgid "&Show boot menu"
+#~ msgstr "显示引导菜单(&S)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
-msgid "Saving boot loader configuration files..."
-msgstr "正在保存引导加载器配置文件..."
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "复制映像到引导分区(&C)"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
-msgid "Installing boot loader..."
-msgstr "正在安装引导加载器..."
+#~ msgid "&Skip Section gracefully on Errors"
+#~ msgstr "出错时优雅地跳过该项(&S)"
 
-#. progress line
-#: src/modules/Bootloader.rb:385
-msgid "Saving Boot Loader Configuration"
-msgstr "正在保存引导加载器配置"
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "其它系统的引导分区(&P)"
 
+#~ msgid "Image section must have specified kernel image"
+#~ msgstr "映像项必须指定内核映像"
+
+#~ msgid "Image file doesn't exist now. Do you really want use it?"
+#~ msgstr "映像文件目前不存在。您真的想要使用它吗？"
+
+#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
+#~ msgstr "Initrd 文件目前不存在。您真的想要使用它吗？"
+
+#~ msgid "Enable &SELinux"
+#~ msgstr "启用 &SELinux"
+
+#~ msgid "The name includes unallowable char(s)"
+#~ msgstr "名称包含了不允许的字符"
+
+#~ msgid "Ask for resolution during boot."
+#~ msgstr "引导期间询问分辨率。"
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "克隆所选引导项"
+
+#~ msgid "Other System (Chainloader)"
+#~ msgstr "其它系统 (链式加载器)"
+
+#~ msgid "Section Type"
+#~ msgstr "引导项类型"
+
+#~ msgid "Section &Name"
+#~ msgstr "引导项名称(&N)"
+
+#~ msgid " (\"/boot\")"
+#~ msgstr " (\"/boot\")"
+
+#~ msgid " (\"/\")"
+#~ msgstr " (根分区)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "项：<br>%1"
+
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "不安装引导加载器；仅创建配置文件"
+
+#~ msgid "Propose and &Merge with Existing GRUB Menus"
+#~ msgstr "建议并与已有 GRUB 菜单合并(&M)"
+
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "未知引导加载器：%1"
+
+#~ msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
+#~ msgstr "YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复核并调整磁盘的引导顺序"
+
+#~ msgid "Added Kernel Parameters: %1"
+#~ msgstr "添加的内核参数：%1"
+
+#~ msgid "Install boot loader"
+#~ msgstr "安装引导加载器"
+
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "正在保存引导加载器配置文件..."
+
+#~ msgid "Installing boot loader..."
+#~ msgstr "正在安装引导加载器..."
+
 #~ msgid "Delete a global option"
 #~ msgstr "删除一个全局选项"
 
 #~ msgid "Set a global option"
 #~ msgstr "设置全局选项"
 
-#~ msgid "P&rotect Entry Modification Only"
-#~ msgstr "仅保护启动项不受修改(&r)"
-
-#~ msgid "Selected custom bootloader partition %s is not available any more."
-#~ msgstr "所选自定义引导分区 %s 不再可用。"
-
 #~ msgid "Selected bootloader location %{path} is not on %{device} any more."
 #~ msgstr "所选引导加载器位置 %{path} 不再在 %{device} 上。"
 
-#~ msgid ""
-#~ "Activate flag is not set by installer. If it is not set at all, some "
-#~ "BIOSes could refuse to boot."
-#~ msgstr ""
-#~ "安装器未设置激活旗标。若根本未设置该旗标，某些 BIOS 可能会拒绝引导。"
-
-#~ msgid ""
-#~ "The installer will not modify the MBR of the disk. Unless it already "
-#~ "contains boot code, the BIOS won't be able to boot disk."
-#~ msgstr ""
-#~ "安装器将不会修改磁盘 MBR。除非它已包含了引导代码，否则 BIOS 将无法引导磁"
-#~ "盘。"
-
-#~ msgid ""
-#~ "Partition number > 3 is being used for booting with GPT partition table"
+#~ msgid "Partition number > 3 is being used for booting with GPT partition table"
 #~ msgstr ">3 的分区号正用于引导 GPT 分区表"
 
-#~ msgid ""
-#~ "The bootloader is installed on a partition that does not lie entirely "
-#~ "below %1 GB. The system might not boot if BIOS support only lba24 (result "
-#~ "is error 18 during install grub MBR)."
-#~ msgstr ""
-#~ "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 "
-#~ "grub 主引导记录时出现 error 18 即为表象)，则系统可能无法引导。"
+#~ msgid "The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot if BIOS support only lba24 (result is error 18 during install grub MBR)."
+#~ msgstr "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 grub 主引导记录时出现 error 18 即为表象)，则系统可能无法引导。"
 
 #~ msgid ""
 #~ "Configure a valid boot loader location before continuing.<br/>\n"
-#~ "The device map includes more than 8 devices and the boot device is out of "
-#~ "range.\n"
-#~ "The range is limited by BIOS to the first 8 devices. Adjust BIOS boot "
-#~ "order ( or if it already set, then correct order in bootloader "
-#~ "configuration)"
+#~ "The device map includes more than 8 devices and the boot device is out of range.\n"
+#~ "The range is limited by BIOS to the first 8 devices. Adjust BIOS boot order ( or if it already set, then correct order in bootloader configuration)"
 #~ msgstr ""
 #~ "继续前请配置一个有效的引导加载器位置。<br>\n"
 #~ "该设备映射包含了多于 8 个设备，引导设备落在了范围以外。\n"
@@ -2214,23 +1628,19 @@
 #~ msgid "The LILO is not supported now."
 #~ msgstr "目前不支持 LILO。"
 
-#~ msgid ""
-#~ "The selected boot path will not be activated for your installation. Your "
-#~ "system may not be bootable."
+#~ msgid "The selected boot path will not be activated for your installation. Your system may not be bootable."
 #~ msgstr "所选引导路径在您的安装过程中不会被激活。您的系统可能无法引导。"
 
 #~ msgid ""
 #~ "Configure a valid boot loader location before continuing.<br>\n"
-#~ "In case that no selection can be made it may be necessary to create a "
-#~ "small primary Apple HFS partition."
+#~ "In case that no selection can be made it may be necessary to create a small primary Apple HFS partition."
 #~ msgstr ""
 #~ "继续前请配置一个有效的引导加载器位置。<br>\n"
 #~ "若无法选择，可能有必要创建一个小的 Apple HFS 主分区。"
 
 #~ msgid ""
 #~ "Configure a valid boot loader location before continuing.<br>\n"
-#~ "In case that no selection can be made it may be necessary to create a "
-#~ "PReP Boot partition."
+#~ "In case that no selection can be made it may be necessary to create a PReP Boot partition."
 #~ msgstr ""
 #~ "继续前请配置一个有效的引导加载器位置。<br>\n"
 #~ "若无法选择，可能有必要创建一个 PReP 引导分区。"
@@ -2241,9 +1651,7 @@
 #~ msgid "Convert Settings and Install &GRUB"
 #~ msgstr "转换设置并安装 &GRUB"
 
-#~ msgid ""
-#~ "LILO is not supported. The recommended option is select convert LILO to "
-#~ "GRUB"
+#~ msgid "LILO is not supported. The recommended option is select convert LILO to GRUB"
 #~ msgstr "不支持 LILO。推荐选项是将 LILO 转换为 GRUB"
 
 #~ msgid "&ELILO Global Options"
@@ -2276,15 +1684,11 @@
 #~ msgid ""
 #~ "<p><b>Set level of verbosity [0-5]</b><br> Increase verbosity of ELILO\n"
 #~ "in case of boot problems.</p>"
-#~ msgstr ""
-#~ "<p><b>设置调试级别 [0-5]</b><br>若遇到引导问题可增加 ELILO 的调试级别。"
+#~ msgstr "<p><b>设置调试级别 [0-5]</b><br>若遇到引导问题可增加 ELILO 的调试级别。</p>"
 
 #~ msgid ""
-#~ "<p><b>Append string for.global options to pass to kernel command line<br>\n"
-#~ "Lets you define additional global parameters to pass to the kernel. These "
-#~ "are\n"
+#~ "<p><b>Append string for.global options to pass to kernel command line</b><br>\n"
+#~ "Lets you define additional global parameters to pass to the kernel. These are\n"
 #~ "used if no 'append' appears in a given section.</p>\n"
 #~ msgstr ""
 #~ "<p><b>要传递给内核命令行的全局选项追加字符串</b><br>\n"
@@ -2292,10 +1696,8 @@
 #~ "要是给定项中未出现 'append' 那就会使用它们。</p>\n"
 
 #~ msgid ""
-#~ "<p><b>Name of the default initrd file</b>, if not empty, defines the "
-#~ "initial\n"
-#~ "ramdisk to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "<p><b>Name of the default initrd file</b>, if not empty, defines the initial\n"
+#~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
 #~ "<b>Browse</b></p>\n"
 #~ msgstr ""
 #~ "<p><b>默认 initrd 文件名称</b>，若非空，则定义了要使用的初始 ramdisk。\n"
@@ -2303,8 +1705,7 @@
 
 #~ msgid ""
 #~ "<p><b>Name of default image file</b>, if not empty, defines the image\n"
-#~ "file to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "file to use. Either enter the path and file name directly or choose by using\n"
 #~ "<b>Browse</b></p>"
 #~ msgstr ""
 #~ "<p><b>默认映像文件名称</b>，若非空，则定义了要使用的映像文件。\n"
@@ -2319,8 +1720,7 @@
 
 #~ msgid ""
 #~ "<p><b>Prevent EDD30 mode</b><br>\n"
-#~ "By default, if EDD30 is off, ELILO will try and set the variable to "
-#~ "TRUE.\n"
+#~ "By default, if EDD30 is off, ELILO will try and set the variable to TRUE.\n"
 #~ "However, some controllers do not support EDD30 and forcing the variable\n"
 #~ "may cause problems. Therefore, as of elilo-3.2, there is an option to \n"
 #~ "avoid forcing the variable.</p>\n"
@@ -2338,8 +1738,7 @@
 #~ "</p>"
 #~ msgstr ""
 #~ "<p><b>允许尝试重新定位</b><br>\n"
-#~ "若在内核的初始加载点遇到了内存分配错误，则允许尝试重新定位 (假设此内核可重"
-#~ "新定位)。\n"
+#~ "若在内核的初始加载点遇到了内存分配错误，则允许尝试重新定位 (假设此内核可重新定位)。\n"
 #~ "</p>"
 
 #~ msgid ""
@@ -2371,8 +1770,7 @@
 #~ "function keys F1 to F12</p>"
 #~ msgstr ""
 #~ "<p><b>通过功能键显示文件内容</b>\n"
-#~ "一些选择器可能利用此选项来在某特定功能键按下时显示文件内容。功能键为 F1 "
-#~ "到 F12。</p>"
+#~ "一些选择器可能利用此选项来在某特定功能键按下时显示文件内容。功能键为 F1 到 F12。</p>"
 
 #~ msgid ""
 #~ "<p><b>Specify the Filename for a Specific FPSWA to Load</b>\n"
@@ -2402,9 +1800,7 @@
 #~ msgid "Boot Image Location"
 #~ msgstr "引导映像位置"
 
-#~ msgid ""
-#~ "Delay to wait before auto booting in seconds (used if not in interactive "
-#~ "mode)"
+#~ msgid "Delay to wait before auto booting in seconds (used if not in interactive mode)"
 #~ msgstr "自动引导前等待延迟(以秒计)(仅在非交互模式使用)"
 
 #~ msgid "Force interactive mode"
@@ -2470,9 +1866,7 @@
 #~ msgid "&Set the User Interface for ELILO (\"simple\" or \"textmenu\")"
 #~ msgstr "指定 ELILO 用户界面('简单' 或 '文本菜单')(&S)"
 
-#~ msgid ""
-#~ "&Delay to Wait before Auto Booting in Seconds (Used if not in Interactive "
-#~ "Mode)"
+#~ msgid "&Delay to Wait before Auto Booting in Seconds (Used if not in Interactive Mode)"
 #~ msgstr "自动引导前等待延迟(以秒计)(仅在非交互模式使用)(&D)"
 
 #~ msgid "Display the Content of a File by Function &Keys"
@@ -2514,10 +1908,8 @@
 #~ msgstr ""
 #~ "<p><b>引导位置</b>\n"
 #~ "这是您引导分区的分区编号。\n"
-#~ "在 PowerMac 上它必须是 HFS 格式因为我们使用 hfsutils 来向那个分区复制文"
-#~ "件。\n"
-#~ "在 CHRP (通用硬件参考平台) 上您需要一个 41 PReP (PowerPC 参考平台) 引导分"
-#~ "区，quik 软件包的 /boot/second 将存放到那儿。</p>"
+#~ "在 PowerMac 上它必须是 HFS 格式因为我们使用 hfsutils 来向那个分区复制文件。\n"
+#~ "在 CHRP (通用硬件参考平台) 上您需要一个 41 PReP (PowerPC 参考平台) 引导分区，quik 软件包的 /boot/second 将存放到那儿。</p>"
 
 #~ msgid ""
 #~ "<p><b>Boot Folder Path</b>\n"
@@ -2525,14 +1917,11 @@
 #~ "folder will be blessed to mark it bootable.</p>"
 #~ msgstr ""
 #~ "<p><b>引导文件夹路径</b>\n"
-#~ "只用于 PowerMac。包含您的引导文件的文件夹，这个文件夹将被宇宙神秘力量赐福"
-#~ "使其可引导。</p>"
+#~ "只用于 PowerMac。包含您的引导文件的文件夹，这个文件夹将被宇宙神秘力量赐福使其可引导。</p>"
 
 #~ msgid ""
-#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line<br>\n"
-#~ "Lets you define additional global parameters to pass to the kernel. These "
-#~ "are\n"
+#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line</b><br>\n"
+#~ "Lets you define additional global parameters to pass to the kernel. These are\n"
 #~ "used if no 'append' appears in a given section.</p>\n"
 #~ msgstr ""
 #~ "<p><b>要传递给内核命令行的全局选项追加字符串</b><br>\n"
@@ -2540,10 +1929,8 @@
 #~ "要是给定项里未出现 'append' 那就会使用它们。</p>\n"
 
 #~ msgid ""
-#~ "<p><b>Name of the Default Initrd File</b>, if not empty, defines the "
-#~ "initial\n"
-#~ "ramdisk to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "<p><b>Name of the Default Initrd File</b>, if not empty, defines the initial\n"
+#~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
 #~ "<b>Browse</b></p>\n"
 #~ msgstr ""
 #~ "<p><b>默认 initrd 文件名称</b>，若非空，则定义了要使用的初始 ramdisk。\n"
@@ -2551,12 +1938,9 @@
 
 #~ msgid ""
 #~ "<p><b>Name of Default Image File</b>, if not empty, defines the image\n"
-#~ "file to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "file to use. Either enter the path and file name directly or choose by using\n"
 #~ "<b>Browse</b></p>"
-#~ msgstr ""
-#~ "<p><b>默认映像文件名称</b>，若非空，则定义了要使用的映像文件。 可直接输入"
-#~ "路径和文件名或通过<b>浏览</b>选择。</p>"
+#~ msgstr "<p><b>默认映像文件名称</b>，若非空，则定义了要使用的映像文件。 可直接输入路径和文件名或通过<b>浏览</b>选择。</p>"
 
 #~ msgid ""
 #~ "<p><b>Set Default Root Filesystem</b>\n"
@@ -2569,8 +1953,7 @@
 #~ "<p><b>Partition for Boot Loader Duplication</b>\n"
 #~ "specifies other Linux device nodes where the bootinfo should be stored.\n"
 #~ "If this option is given, the boot partition will be converted to FAT. \n"
-#~ "The intend of this option is to write the boot files to all members of a "
-#~ "RAID1 or RAID5 system.</p>"
+#~ "The intend of this option is to write the boot files to all members of a RAID1 or RAID5 system.</p>"
 #~ msgstr ""
 #~ "<p><b>引导加载器副本所在分区</b>\n"
 #~ "指定应存储引导信息的其它 Linux 设备节点。\n"
@@ -2580,62 +1963,49 @@
 #~ msgid ""
 #~ "<p><b>Change Boot Device in NV-RAM</b>\n"
 #~ "this option will tell lilo to update the OpenFirmware \"boot-device\" \n"
-#~ "variable with the full OpenFirmware path pointing to the device specified "
-#~ "in\n"
+#~ "variable with the full OpenFirmware path pointing to the device specified in\n"
 #~ "\"boot=\". If this option is missing, the system may not boot.</p>"
 #~ msgstr ""
 #~ "<p><b>修改 NV-RAM 中的引导设备</b>\n"
-#~ "此选项将通知 lilo 更新开源固件的 \"boot-device\" 变量为指向 \"boot=\" 中指"
-#~ "定的设备的完整开源固件路径。\n"
+#~ "此选项将通知 lilo 更新开源固件的 \"boot-device\" 变量为指向 \"boot=\" 中指定的设备的完整开源固件路径。\n"
 #~ "若缺失此选项，系统可能无法引导。</p>"
 
 #~ msgid ""
 #~ "<p><b>Do not Use OS-chooser</b>\n"
-#~ " will tell lilo to use yaboot as boot file instead of a Forth script "
-#~ "named \"os-chooser\". \n"
-#~ "The OpenFirmware driver in the nVidia graphics card as shipped with Apple "
-#~ "G5 systems \n"
+#~ " will tell lilo to use yaboot as boot file instead of a Forth script named \"os-chooser\". \n"
+#~ "The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems \n"
 #~ "will crash if there is no monitor attached.</p>"
 #~ msgstr ""
 #~ "<p><b>不使用 OS-chooser</b>\n"
-#~ "将通知 lilo 使用 yaboot 作为引导文件而不是名为 \"os-chooser\" 的 Forth 脚"
-#~ "本。\n"
-#~ "苹果 G5 系统携带的英伟达图形卡的开源固件驱动在未连接显示器的情况下会崩溃。"
-#~ "</p>"
+#~ "将通知 lilo 使用 yaboot 作为引导文件而不是名为 \"os-chooser\" 的 Forth 脚本。\n"
+#~ "苹果 G5 系统携带的英伟达图形卡的开源固件驱动在未连接显示器的情况下会崩溃。</p>"
 
 #~ msgid ""
 #~ "<p><b>Timeout in Seconds for MacOS/Linux</b>\n"
-#~ "It contains the timeout between MacOS/Linux in seconds until Linux boots "
-#~ "automatically \n"
+#~ "It contains the timeout between MacOS/Linux in seconds until Linux boots automatically \n"
 #~ "if no key is pressed to boot MacOS</p>"
 #~ msgstr ""
 #~ "<p><b>MacOS/Linux 超时</b>\n"
-#~ "这包含了若未按任何键以引导 MacOS 时直到 Linux 成功引导前以秒计的 MacOS/"
-#~ "Linux 间超时。(要不设置该选项的话，Mac OS X 会启动自己...)</p>"
+#~ "这包含了若未按任何键以引导 MacOS 时直到 Linux 成功引导前以秒计的 MacOS/Linux 间超时。(要不设置该选项的话，Mac OS X 会启动自己...)</p>"
 
 #~ msgid ""
 #~ "<p><b>Always Boot from FAT Partition</b>\n"
-#~ "Normally the lilo script would automatically select the boot partition "
-#~ "format\n"
-#~ "to either be a PReP boot partition or a FAT formatted file system for "
-#~ "more\n"
+#~ "Normally the lilo script would automatically select the boot partition format\n"
+#~ "to either be a PReP boot partition or a FAT formatted file system for more\n"
 #~ "complex setups. This option forces the lilo script to use\n"
 #~ "the FAT formatted file system</p>"
 #~ msgstr ""
 #~ "<p><b>始终从 FAT 分区引导</b>\n"
-#~ "通常 lilo 脚本会为更复杂的设置自动选择引导分区格式为 PReP 引导分区或经 "
-#~ "FAT 格式化的文件系统。\n"
+#~ "通常 lilo 脚本会为更复杂的设置自动选择引导分区格式为 PReP 引导分区或经 FAT 格式化的文件系统。\n"
 #~ "这个选项强制 lilo 脚本使用经 FAT 格式化的文件系统。</p>"
 
 #~ msgid ""
 #~ "<p><b>Install Boot Loader Even on Errors</b>\n"
 #~ "Install the bootloader even if it is unsure whether your firmware is\n"
-#~ "buggy so that next boot will fail. This results in an unsupported setup."
+#~ "buggy so that next boot will fail. This results in an unsupported setup.</p>"
 #~ msgstr ""
 #~ "<p><b>即使有错误仍安装引导加载器</b>\n"
-#~ "即使不能确定您的固件是否故障重重是否会造成下次引导失败，仍然安装引导加载"
-#~ "器。\n"
+#~ "即使不能确定您的固件是否故障重重是否会造成下次引导失败，仍然安装引导加载器。\n"
 #~ "这可能导致配置出引导程序支持不了的设置。</p>"
 
 #~ msgid "PPC Boot Loader Location"
@@ -2821,8 +2191,7 @@
 #~ msgid ""
 #~ "System was not booted via EFI firmware. To boot your\n"
 #~ "computer, you need to load ELILO via the EFI shell."
-#~ msgstr ""
-#~ "系统未通过 EFI 固件引导。为引导您的计算机，您需要通过 EFI 壳层加载 ELILO。"
+#~ msgstr "系统未通过 EFI 固件引导。为引导您的计算机，您需要通过 EFI 壳层加载 ELILO。"
 
 #~ msgid "LILO bootloader is not supported"
 #~ msgstr "不支持 LILO 引导加载器。"
@@ -2936,8 +2305,7 @@
 
 #~ msgid ""
 #~ "You chose to install the boot loader to the hard disk.\n"
-#~ "The menu of the boot loader contains an entry to boot from the hard "
-#~ "disk.\n"
+#~ "The menu of the boot loader contains an entry to boot from the hard disk.\n"
 #~ "Replace it with an entry  to boot from the floppy?"
 #~ msgstr ""
 #~ "您已选择将 Boot Loader 安装到硬盘。\n"
@@ -2967,9 +2335,6 @@
 #~ msgid "image"
 #~ msgstr "映象"
 
-#~ msgid "Yes"
-#~ msgstr "是"
-
 #~ msgid "No"
 #~ msgstr "否"
 
@@ -3006,9 +2371,7 @@
 #~ "但需要在 XEN 环境中启动它。</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "The /boot directory is on an ext4 filesystem. Create separate /boot "
-#~ "partition with ext2 filesytem"
+#~ msgid "The /boot directory is on an ext4 filesystem. Create separate /boot partition with ext2 filesytem"
 #~ msgstr "/boot 目录在 XFS 文件系统上。系统将不会启动。"
 
 #~ msgid ""
@@ -3108,19 +2471,15 @@
 #~ msgid "Section Editor"
 #~ msgstr "部分编辑器"
 
-#~ msgid ""
-#~ "<p>Selecting <b>Do not verify Filesystem before Booting</b> will skip all "
-#~ "file system checks.</p>"
+#~ msgid "<p>Selecting <b>Do not verify Filesystem before Booting</b> will skip all file system checks.</p>"
 #~ msgstr "<p>选择<b>引导前不校验文件系统</b>将跳过所有文件系统检查。</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Initial RAM Disk</b>,if not empty, defines the initial ramdisk to "
-#~ "use. Either enter the path and file name\n"
+#~ "<p><b>Initial RAM Disk</b>,if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
 #~ "directly or choose by using <b>Browse</b>.</p>\n"
 #~ msgstr ""
-#~ "<p><b>默认 RAM 磁盘</b>，如果非空，定义要使用的初始 ramdisk。 直接输入路径"
-#~ "和文件名或通过使用\n"
+#~ "<p><b>默认 RAM 磁盘</b>，如果非空，定义要使用的初始 ramdisk。 直接输入路径和文件名或通过使用\n"
 #~ "<b>浏览</b>选择</p>"
 
 #~ msgid "Former default Image Flavor"
@@ -3203,19 +2562,16 @@
 
 #~ msgid ""
 #~ "<p><big><b>Initial RAM Disk</b></big><br>\n"
-#~ "Use <b>Initial RAM Disk</b> to specify the initial RAM disk (initrd) to "
-#~ "load. If it is\n"
+#~ "Use <b>Initial RAM Disk</b> to specify the initial RAM disk (initrd) to load. If it is\n"
 #~ "left empty, no initial RAM disk is loaded during boot.</p>"
 #~ msgstr ""
 #~ "<p><big><b>初始 RAM 磁盘</b></big><br>\n"
-#~ "请使用<b>初始 RAM 磁盘</b>来指定要装载的初始 RAM 磁盘 (initrd)。如果这是空"
-#~ "的，\n"
+#~ "请使用<b>初始 RAM 磁盘</b>来指定要装载的初始 RAM 磁盘 (initrd)。如果这是空的，\n"
 #~ "在引导期间将不装载任何初始 RAM 磁盘。</p>"
 
 #~ msgid ""
 #~ "<p><big><b>Root Device<b></big><br>\n"
-#~ "Use <b>Root Device</b> to specify the root file system to mount after the "
-#~ "kernel is\n"
+#~ "Use <b>Root Device</b> to specify the root file system to mount after the kernel is\n"
 #~ "loaded.</p>\n"
 #~ msgstr ""
 #~ "<p><big><b>根设备<b></big><br>\n"
@@ -3224,8 +2580,7 @@
 
 #~ msgid ""
 #~ "<p><big><b>VGA Mode</b></big><br>\n"
-#~ "Use <b>VGA Mode</b> to specify the resolution and color depth to set "
-#~ "after\n"
+#~ "Use <b>VGA Mode</b> to specify the resolution and color depth to set after\n"
 #~ "the kernel has booted.</p>"
 #~ msgstr ""
 #~ "<p><big><b>VGA 方式</b></big><br>\n"
@@ -3243,8 +2598,7 @@
 
 #~ msgid ""
 #~ "<p><big><b>Device</b></big><br>\n"
-#~ "Use <b>Device</b> to set the device from which to load the operating "
-#~ "system.\n"
+#~ "Use <b>Device</b> to set the device from which to load the operating system.\n"
 #~ "In most cases, it is the disk partition in which \n"
 #~ "the other system is installed.</p>"
 #~ msgstr ""
@@ -3256,12 +2610,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Trusted GRUB Details</b><br>\n"
-#~ "allows to add aditional measured files and also to define own PCR for "
-#~ "kernel, initrd or chainloader</p>"
+#~ "allows to add aditional measured files and also to define own PCR for kernel, initrd or chainloader</p>"
 #~ msgstr ""
 #~ "<p><b>信任的 GRUB 细节</b><br>\n"
-#~ "allows to add aditional measured files and also to define own PCR for "
-#~ "kernel, initrd or chainloader</p>"
+#~ "allows to add aditional measured files and also to define own PCR for kernel, initrd or chainloader</p>"
 
 #~ msgid ""
 #~ "<p>To add a disk, push <b>Add</b>.\n"
@@ -3276,8 +2628,7 @@
 #~ "boots the active partition), set <b>Replace MBR with Generic Code</b>.</p>"
 #~ msgstr ""
 #~ "<p><big><b>使用通用代码替换 MBR</b></big><br>\n"
-#~ "要使用通用代码(引导活动分区)替换磁盘的主引导记录，请设置<b>使用通用代码替"
-#~ "换 MBR</b>。</p>"
+#~ "要使用通用代码(引导活动分区)替换磁盘的主引导记录，请设置<b>使用通用代码替换 MBR</b>。</p>"
 
 #~ msgid ""
 #~ "<p><big><b>Activating Bootloader Partition</b></big><br>\n"
@@ -3289,8 +2640,7 @@
 #~ "<p><big><b>激活引导程序分区</b></big><br>\n"
 #~ "要激活含引导程序的分区，请设置\n"
 #~ "<b>激活引导程序分区</b>。通用 MBR 代码\n"
-#~ "引导活动分区。较旧的 BIOS 要求有一个分区是活动的，即使引导程序安装在 MBR "
-#~ "中也是如此。"
+#~ "引导活动分区。较旧的 BIOS 要求有一个分区是活动的，即使引导程序安装在 MBR 中也是如此。"
 
 #~ msgid ""
 #~ "<p><big><b>Dedicated Boot Loader Area</b></big><br>\n"

Modified: trunk/yast/zh_CN/po/ca-management.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/ca-management.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/ca-management.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2014-06-08 10:25+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -138,8 +138,7 @@
 #: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
 #: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
 #: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
 msgid "&Password:"
 msgstr "密码(&P)："
 
@@ -211,8 +210,7 @@
 #: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
 #: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
 #: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
 msgid "New passwords do not match."
 msgstr "新密码不匹配。"
 
@@ -1921,42 +1919,41 @@
 
 #. Creating default CA/Certificate
 #. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
 msgid "Creating certificate..."
 msgstr "正在创建证书..."
 
 #. Creating server certificate
 #. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
 msgid ""
 "The default certificate can also be created in\n"
 "the CA Management module.\n"
 msgstr "默认证书也可以在 CA 管理模块中创建。\n"
 
 #. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
 msgid "Finish"
 msgstr "完成"
 
 #. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
 msgid "Really save configuration ?"
 msgstr "真的保存配置吗？"
 
 #. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
 msgid "Exit"
 msgstr "退出"
 
 #. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
 msgid "Really exit configuration without saving ?"
 msgstr "真的退出配置而不保存吗？"
 
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
 msgid "Details"
 msgstr "细节"
 
@@ -2241,8 +2238,7 @@
 msgid "LDAP P&assword:"
 msgstr "LDAP 密码(&A)："
 
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
 #: src/include/ca-management/util.rb:1388
 msgid "Certificate &Password:"
 msgstr "证书密码(&P)："
@@ -2290,28 +2286,23 @@
 msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
 msgstr "证书和以 PEM 格式解密的密钥(&R)"
 
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
 msgid "C&ertificate and the Key Encrypted in PEM Format"
 msgstr "证书和以 PEM 格式加密的密钥(&E)"
 
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
 msgid "&Certificate in DER Format"
 msgstr "DER 格式的证书(&C)"
 
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
 msgid "Cer&tificate and the Key in PKCS12 Format"
 msgstr "证书和 PKCS12 格式的密钥(&T)"
 
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
 msgid "&Like PKCS12 and Include the CA Chain"
 msgstr "偏好 PKCS12 并包含 CA 链(&L)"
 
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
 msgid "&New Password"
 msgstr "新密码(&N)"
 

Modified: trunk/yast/zh_CN/po/cio.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/cio.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/cio.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2014-06-08 10:32+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -43,13 +43,13 @@
 msgstr "已用"
 
 #: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "否"
+
+#: src/lib/iochannel/channels_dialog.rb:142
 msgid "yes"
 msgstr "是"
 
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "否"
-
 #. filter can be empty if dialog is not yet created
 #: src/lib/iochannel/channels_dialog.rb:160
 msgid "Filter channels"

Modified: trunk/yast/zh_CN/po/cluster.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/cluster.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/cluster.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-03-04 00:01+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -125,13 +125,11 @@
 
 #. BNC#880242, expected_votes must have value when "udp"
 #: src/include/cluster/dialogs.rb:222
-#| msgid "The Expected Votes has to be fulfilled when udp is configured"
-msgid ""
-"The Expected Votes has to be fulfilled when multicast transport is configured"
+msgid "The Expected Votes has to be fulfilled when multicast transport is configured"
 msgstr "当配置了多播传输时必须填写期望票数"
 
 #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
 msgid "The Multicast Address has to be fulfilled"
 msgstr "必须填写多播地址"
 
@@ -140,9 +138,7 @@
 msgstr "多播端口必须为正整数"
 
 #: src/include/cluster/dialogs.rb:272
-msgid ""
-"Only passive or active can be chosen if multiple interface used. Set to"
-" passive."
+msgid "Only passive or active can be chosen if multiple interface used. Set to passive."
 msgstr "若使用了多个接口则只能选择主动或被动。设置为被动。"
 
 #. BNC#871970, change member address struct to memberaddr
@@ -159,7 +155,7 @@
 msgstr "绑定网络地址："
 
 #: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
 msgid "Multicast Address:"
 msgstr "多播地址："
 
@@ -209,127 +205,123 @@
 " 请重新配置成员列表并确认全部其它设置。"
 
 #. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
 msgid "Enable Security Auth"
 msgstr "启用安全认证"
 
-#: src/include/cluster/dialogs.rb:719
-msgid ""
-"For a newly created cluster, push the button below to generate"
-" /etc/corosync/authkey."
+#: src/include/cluster/dialogs.rb:721
+msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr "新创建的集群，请按下面按钮生成 /etc/corosync/authkey。"
 
-#: src/include/cluster/dialogs.rb:724
-msgid ""
-"To join an existing cluster, please copy /etc/corosync/authkey from other"
-" nodes manually."
+#: src/include/cluster/dialogs.rb:726
+msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr "要加入一个已有集群，请从其他节点手动复制 /etc/corosync/authkey。"
 
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
 msgid "Failed to create /etc/corosync/authkey"
 msgstr "创建 /etc/corosync/authkey 失败"
 
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
 msgid "Create /etc/corosync/authkey succeeded"
 msgstr "创建 /etc/corosync/authkey 成功"
 
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
 msgid "Running"
 msgstr "运行中"
 
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
 msgid "Not running"
 msgstr "未运行"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
 msgid "Booting"
 msgstr "引导时"
 
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
 msgid "On -- Start pacemaker during boot"
 msgstr "开 -- 引导时启动 pacemaker"
 
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
 msgid "Off -- Start pacemaker manually"
 msgstr "关 -- 手动启动 pacemaker"
 
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
 msgid "Switch On and Off"
 msgstr "打开和关闭"
 
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
 msgid "Current Status: "
 msgstr "当前状态："
 
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
 msgid "Start pacemaker Now"
 msgstr "立即启动 pacemaker"
 
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
 msgid "Stop pacemaker Now"
 msgstr "立即停止 pacemaker"
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
 msgid "Sync Host"
 msgstr "同步主机"
 
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
 msgid "Add"
 msgstr "添加"
 
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
 msgid "Del"
 msgstr "删除"
 
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
 msgid "Edit"
 msgstr "编辑"
 
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
 msgid "Sync File"
 msgstr "同步文件"
 
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
 msgid "Add Suggested Files"
 msgstr "添加建议的文件"
 
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
 msgid "Generate Pre-Shared-Keys"
 msgstr "生成预共享密钥"
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
 msgid "Csync2 Status Unknown"
 msgstr "Csync2 状态未知"
 
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
 msgid "Turn csync2 ON"
 msgstr "开启 csync2"
 
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
 msgid "Turn csync2 OFF"
 msgstr "关闭 csync2"
 
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
 msgid "Enter a hostname"
 msgstr "请输入一个主机名"
 
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
 msgid "Edit the hostname"
 msgstr "编辑主机名"
 
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
 msgid "Enter a filename to synchronize"
 msgstr "请输入要同步的文件名"
 
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
 msgid "Edit the filename"
 msgstr "编辑文件名"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
@@ -338,12 +330,12 @@
 "您想要覆盖它吗？"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
 msgid "Delete key file %1 failed."
 msgstr "未能删除密钥文件 %1。"
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -351,15 +343,14 @@
 "已生成密钥文件 %1。\n"
 "点击\"添加建议的文件\"按钮将它添加到同步列表。"
 
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
 msgid "Key generation failed."
 msgstr "未能生成密钥。"
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
 msgid ""
-"Conntrackd is a daemon which helps to duplicate firewall status between"
-" cluster nodes.\n"
+"Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
 "YaST can help to configure some basic aspects of conntrackd.\n"
 "You need to start it with the ocf:heartbeat:conntrackd."
 msgstr ""
@@ -367,146 +358,60 @@
 "YaST 可辅助配置 conntrackd 的一些基础部分。\n"
 "您需要与 ocf:heartbeat:conntrackd 一起启动它。"
 
-#: src/include/cluster/dialogs.rb:1358
+#: src/include/cluster/dialogs.rb:1360
 msgid "Dedicated Interface:"
 msgstr "专用接口："
 
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
 msgid "IP:"
 msgstr "IP："
 
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
 msgid "Group Number:"
 msgstr "组编号："
 
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr "生成 /etc/conntrackd/conntrackd.conf"
 
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
 msgid "The Group Number must be a positive integer"
 msgstr "组编号必须为正整数"
 
 #. All helps are here
 #: src/include/cluster/helps.rb:35
-#| msgid ""
-#| "<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
-#| "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
-#| "<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
-#| "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n"
-#| "<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
-#| "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
-#| "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n"
-#| "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgid ""
-"<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address"
-" which the openais executive should bind.  This address should always end in "
-" zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set"
-" bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which"
-" case IPV6  networking will  be used.  In this case, the full address must be"
-" specified and there is no automatic selection  of  the  network  interface"
-" within a specific subnet as with IPv4. If IPv6 networking is used, the"
-" nodeid field must be specified.<br></p>\n"
-"<p><b><big>Multicast Address</big></b><br>This is the multicast address used"
-" by  openais  executive.   The default  should work for most networks, but"
-" the network administrator should be queried  about  a  multicast  address "
-" to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.This  may  also be an IPV6 multicast address, in which case IPV6 networking"
-" will be used.  If IPv6 networking is used, the nodeid field must be"
-" specified.</p>\n"
-"<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is"
-" possible to use the same multicast address on a network with  the  openais "
-" services configured for different UDP ports.<br></p>\n"
-"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in"
-" the cluster by IP address. This could be configurable when using"
-" udpu(Unicast). <br></p>\n"
-"<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional "
-" when  using  IPv4 and required when using IPv6.  This is a 32 bit value"
-" specifying the node identifier delivered to the cluster membership service. "
-" If this is not specified with IPv4, the node id will be  determined from "
-" the  32  bit  IP address the system to which the system is bound with ring"
-" identifier of 0.  The node identifier  value  of zero is reserved and should"
-" not be used.<br></p>\n"
-"<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring,"
-" which  may  be  none, active,  or  passive.   Active replication offers"
-" slightly lower latency from transmit to delivery in faulty network"
-" environments but  with less performance.  Passive replication may nearly"
-" double the speed of the totem  protocol  if  the  protocol  doesn't become "
-" cpu bound.  The final option is none, in which case only one network"
-" interface will be used to operate the  totem  protocol.  If  only one"
-" interface directive is specified, none is automatically chosen.  If multiple"
-" interface directives  are  specified, only active or passive may be chosen.<"
-"br></p>\n"
-"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. "
-" Will be automatically calculated when the nodelist {} section is present in"
-" corosync.conf (the list will be generated when using unicast transport) or"
-" can be specified in the quorum {} section (Expect votes should use the total"
-" node numble of the cluster). If Expected votes presents in unicast"
-" transport, the value will override the one automatically calculated.<br>\n"
-"<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using"
-" IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
+"<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
+"<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
+"<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
+"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n"
+"<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
+"<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
+"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<br></p>\n"
+"<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgstr ""
-"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem"
-" 流量应通过 192.168.5.92 中转，则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6"
-" 地址，那样将会使用 IPV6 网络。这种情况下，必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6"
-" 网络，则必须指定节点 ID 字段。<br></p>\n"
-"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络，但也应询问网络管理员要使用的"
-"多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址，那样将会使用 IPV6"
-" 网络。若使用了 IPV6 网络，则必须指定节点 ID 字段。</p>\n"
-"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais"
-" 服务使用相同的多播地址。<br></p>\n"
-"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast)"
-" 时这里是可以配置的。<br></p>\n"
-"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选，IPv6 时为必选。这是一个 32"
-" 位值，指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定，将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0"
-" 是预留的，不应该使用。<br></p>\n"
-"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式，可以为无，主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低"
-"，但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无，仅使用一个网络接口来运行 totem"
-" 协议。若只指定了一个接口指令，则将自动选无。若指定了多个接口指令，则只能选择主动或被动。<br></p>\n"
-"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{}"
-" 部分时将自动计算  (当使用 unicast 传输时将生成该列表)，也可以在 quorum{} 部分指定 (期望票数应使用集群的全部节点数)。若"
-" unicast 传输中存在期望票数，该值将覆盖自动计算出的值。<br></p>\n"
-"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<"
-"br></p>\n"
+"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem 流量应通过 192.168.5.92 中转，则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6 地址，那样将会使用 IPV6 网络。这种情况下，必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6 网络，则必须指定节点 ID 字段。<br></p>\n"
+"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络，但也应询问网络管理员要使用的多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址，那样将会使用 IPV6 网络。若使用了 IPV6 网络，则必须指定节点 ID 字段。</p>\n"
+"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais 服务使用相同的多播地址。<br></p>\n"
+"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast) 时这里是可以配置的。<br></p>\n"
+"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选，IPv6 时为必选。这是一个 32 位值，指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定，将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0 是预留的，不应该使用。<br></p>\n"
+"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式，可以为无，主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低，但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无，仅使用一个网络接口来运行 totem 协议。若只指定了一个接口指令，则将自动选无。若指定了多个接口指令，则只能选择主动或被动。<br></p>\n"
+"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{} 部分时将自动计算  (当使用 unicast 传输时将生成该列表)，也可以在 quorum{} 部分指定 (期望票数应使用集群的全部节点数)。若 unicast 传输中存在期望票数，该值将覆盖自动计算出的值。<br></p>\n"
+"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<br></p>\n"
 
 #: src/include/cluster/helps.rb:45
-#| msgid ""
-#| "\n"
-#| "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages.  If secauth is off, the  protocol  will never  use  threaded  sending.  If secauth is on, this directive allows systems to be  configured  to  use  multiple  threads  to encrypt and send multicast messages.  A  thread  directive of 0 indicates that no threaded send should be used.  This mode offers best performance for non-SMP systems.  The default is 0. <br></p>\n"
-#| "<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on.
  <br></p>\n"
 msgid ""
 "\n"
-"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1"
-" authentication should be used to authenticate all messages.  It further"
-" specifies that  all  data should  be  encrypted  with the sober128"
-" encryption algorithm to protect data from eavesdropping.  Enabling this"
-" option adds a 36 byte header to every message sent by totem which reduces"
-" total throughput.  Encryption and authentication consume 75% of CPU cycles"
-" in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks "
-" with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible"
-" with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A"
-" throughput of 10Mb/s is possible wth 20% cpu utilization when this option is"
-"  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions:"
-" A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz"
-" cpus.   A throughput of 60Mb/s is possible when this option is disabled on"
-" 3GHz cpus.  The default is on. <br></p>\n"
+"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on. <b
 r></p>\n"
 msgstr ""
 "\n"
-"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用"
-" sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 totem"
-" 发送的消息，这将降低总吞吐量。启用后，据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU"
-" 帧传输的 100mbit 网络来说，在开启了此选项的 3ghz CPU 上，100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的"
-" 3ghz CPU 上，20% 的 CPU 使用率可以达到 10mb/秒的吞吐量。对于帧传输很大的 gig-e 网络来说：在启用了此选项的 3ghz"
-" CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n"
+"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用 sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 totem 发送的消息，这将降低总吞吐量。启用后，据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU 帧传输的 100mbit 网络来说，在开启了此选项的 3ghz CPU 上，100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的 3ghz CPU 上，20% 的 CPU 使用率可以达到 10mb/秒的吞吐量。对于帧传输很大的 gig-e 网络来说：在启用了此选项的 3ghz CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n"
 
 #: src/include/cluster/helps.rb:49
 msgid ""
 "\n"
-"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot"
-" or not</p>\n"
-"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall"
-" is enabled</p>\n"
+"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n"
+"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall is enabled</p>\n"
 "\t\t\t"
 msgstr ""
 "\n"
@@ -517,42 +422,28 @@
 #: src/include/cluster/helps.rb:55
 msgid ""
 "\n"
-"\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the"
-" local hostnames of the cluster nodes. That means you must use exactly the"
-" same string as printed out by the hostname command.</p>\n"
-"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be"
-" synced.</p>\n"
-"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using"
-" the IP addresses and pre-shared-keys in Csync2. The key file is generated"
-" with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be"
-" copied to all members of the cluster manually after it's created.</p>\n"
+"\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n"
+"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be synced.</p>\n"
+"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created.</p>\n"
 "\t"
 msgstr ""
 "\n"
-"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname"
-" 命令的打印输出完全相同的内容。</p>\n"
+"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname 命令的打印输出完全相同的内容。</p>\n"
 "\t\t<p><b><big>同步文件</big></b><br>要同步的完整绝对文件名。</p>\n"
-"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k"
-" /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n"
+"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n"
 "\t"
 
 #: src/include/cluster/helps.rb:62
 msgid ""
 "\n"
-"\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface"
-" for syncing. The interface must support multicast, and is UP for using. You"
-" may have to have it pre-configured. </p>\n"
-"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated"
-" network interface. This is detected automatically.</p>\n"
-"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be"
-" used for syncing.</p>\n"
-"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for"
-" syncing.</p>\n"
+"\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n"
+"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated network interface. This is detected automatically.</p>\n"
+"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be used for syncing.</p>\n"
+"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for syncing.</p>\n"
 "\t"
 msgstr ""
 "\n"
-"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播，并且是在线可使用的。您或许需要预先配置它。<"
-"/p>\n"
+"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播，并且是在线可使用的。您或许需要预先配置它。</p>\n"
 "\t\t<p><b><big>IP</big></b><br>指派给专用网络接口的 IPv4 地址。这是自动检测的。</p>\n"
 "\t\t<p><b><big>多播地址</big></b><br>用于同步的多播地址。</p>\n"
 "\t\t<p><b><big>组编号</big></b><br>同步时表示组的一个数字 ID。</p>\n"
@@ -609,97 +500,97 @@
 msgstr "正在初始化..."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
 msgid "Initializing cluster Configuration"
 msgstr "正在初始化集群配置"
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
 msgid "Read the database"
 msgstr "读取数据库"
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
 msgid "Read the previous settings"
 msgstr "读取以前的设置"
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
 msgid "Read SuSEFirewall Settings"
 msgstr "读取 SuSEFirewall 设置"
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
 msgid "Reading the database..."
 msgstr "正在读取数据库..."
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
 msgid "Reading the previous settings..."
 msgstr "正在读取以前的设置..."
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
 msgid "Reading SuSEFirewall settings..."
 msgstr "正在读取 SuSEFirewall 设置..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
 msgid "Finished"
 msgstr "已完成"
 
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
 msgid "Cannot install required package"
 msgstr "无法安装所需的软件包"
 
 #. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
 msgid "Cannot load existing configuration"
 msgstr "无法加载已有配置"
 
 #. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
 msgid "Cannot read database1."
 msgstr "无法读取数据库 1。"
 
 #. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
 msgid "Cannot read database2."
 msgstr "无法读取数据库 2。"
 
 #. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
 msgid "Cannot detect devices."
 msgstr "无法检测设备。"
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
 msgid "Saving cluster Configuration"
 msgstr "正在保存集群配置"
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
 msgid "Write the settings"
 msgstr "写入设置"
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
 msgid "Save changes to SuSEFirewall"
 msgstr "保存修改到 SuSEFirewall"
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
 msgid "Writing the settings..."
 msgstr "正在写入设置..."
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
 msgid "Saving changes to SuSEFirewall..."
 msgstr "正在保存修改到 SuSEFirewall..."
 
 #. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
 msgid "Cannot write settings."
 msgstr "无法写入设置。"
 

Modified: trunk/yast/zh_CN/po/control.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/control.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/control.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-06-05 16:45+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -49,266 +49,631 @@
 "        "
 
 #: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
 msgid "CIM Server"
 msgstr "通用信息模型 (CIM) 服务器"
 
 #: control/control.SLED.glade.translations.glade:16
 #: control/control.SLED.glade.translations.glade:17
 #: control/control.SLED.glade.translations.glade:22
-#: control/control.SLED.glade.translations.glade:56
-#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
 msgid "Installation Settings"
 msgstr "安装设置"
 
 #: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
 msgid "Overview"
 msgstr "概览"
 
 #: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
 msgid "Expert"
 msgstr "专家"
 
 #: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
 msgid "Live Installation Settings"
 msgstr "Live 安装设置"
 
 #: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
 msgid "Update Settings"
 msgstr "更新设置"
 
 #: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
 msgid "Network Configuration"
 msgstr "网络配置"
 
 #: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
 msgid "Hardware Configuration"
 msgstr "硬件配置"
 
 #: control/control.SLED.glade.translations.glade:25
-#: control/control.SLED.glade.translations.glade:63
-#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
 msgid "Preparation"
 msgstr "准备"
 
 #: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:50
-#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
 msgid "Load linuxrc Network Configuration"
 msgstr "加载 Linuxrc 网络配置"
 
 #: control/control.SLED.glade.translations.glade:27
-#: control/control.SLED.glade.translations.glade:51
-#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
 msgid "Network Autosetup"
 msgstr "自动网络设置"
 
 #: control/control.SLED.glade.translations.glade:28
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
 msgid "Welcome"
 msgstr "欢迎"
 
 #: control/control.SLED.glade.translations.glade:29
-#: control/control.SLED.glade.translations.glade:53
-#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
 msgid "Network Activation"
 msgstr "网络激活"
 
 #: control/control.SLED.glade.translations.glade:30
-#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
 msgid "Disk Activation"
 msgstr "磁盘激活"
 
 #: control/control.SLED.glade.translations.glade:31
-#: control/control.SLED.glade.translations.glade:32
-#: control/control.SLED.glade.translations.glade:69
-#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
 msgid "System Analysis"
 msgstr "系统分析"
 
-#: control/control.SLED.glade.translations.glade:33
-#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
+#, fuzzy
+#| msgid "Online Update"
+msgid "Installer Update"
+msgstr "在线更新"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
 msgid "Add-On Products"
 msgstr "附加产品"
 
-#: control/control.SLED.glade.translations.glade:34
-#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
 msgid "Disk"
 msgstr "磁盘"
 
-#: control/control.SLED.glade.translations.glade:35
-#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
 msgid "Time Zone"
 msgstr "时区"
 
-#: control/control.SLED.glade.translations.glade:36
 #: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
 msgid "User Settings"
 msgstr "用户设置"
 
-#: control/control.SLED.glade.translations.glade:38
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
 msgid "Installation Overview"
 msgstr "安装概览"
 
-#: control/control.SLED.glade.translations.glade:39
 #: control/control.SLED.glade.translations.glade:40
 #: control/control.SLED.glade.translations.glade:41
 #: control/control.SLED.glade.translations.glade:42
-#: control/control.SLED.glade.translations.glade:43
 #: control/control.SLED.glade.translations.glade:44
 #: control/control.SLED.glade.translations.glade:45
 #: control/control.SLED.glade.translations.glade:46
 #: control/control.SLED.glade.translations.glade:47
 #: control/control.SLED.glade.translations.glade:48
-#: control/control.SLED.glade.translations.glade:58
-#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
 #: control/control.SLED.glade.translations.glade:60
 #: control/control.SLED.glade.translations.glade:61
 #: control/control.SLED.glade.translations.glade:62
-#: control/control.SLED.glade.translations.glade:83
-#: control/control.SLED.glade.translations.glade:84
-#: control/control.SLED.glade.translations.glade:85
-#: control/control.SLED.glade.translations.glade:86
-#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
 #: control/control.SLED.glade.translations.glade:88
 #: control/control.SLED.glade.translations.glade:89
-#: control/control.SLED.glade.translations.glade:104
-#: control/control.SLED.glade.translations.glade:105
-#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
+#: control/control.openSUSE.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:58
+#: control/control.openSUSE.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:60
+#: control/control.openSUSE.glade.translations.glade:61
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.openSUSE.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:76
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.openSUSE.glade.translations.glade:102
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
 msgid "Perform Installation"
 msgstr "执行安装"
 
-#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "安装"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
 msgid "Installation"
 msgstr "安装"
 
-#: control/control.SLED.glade.translations.glade:70
-#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
 msgid "System for Update"
 msgstr "待更新系统"
 
-#: control/control.SLED.glade.translations.glade:72
-#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
 msgid "Update"
 msgstr "更新"
 
-#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
 msgid "Update Summary"
 msgstr "更新摘要"
 
-#: control/control.SLED.glade.translations.glade:74
-#: control/control.SLED.glade.translations.glade:75
-#: control/control.SLED.glade.translations.glade:76
 #: control/control.SLED.glade.translations.glade:77
 #: control/control.SLED.glade.translations.glade:78
-#: control/control.SLED.glade.translations.glade:97
-#: control/control.SLED.glade.translations.glade:98
-#: control/control.SLED.glade.translations.glade:99
-#: control/control.SLED.glade.translations.glade:100
-#: control/control.SLED.glade.translations.glade:101
-#: control/control.SLED.glade.translations.glade:102
-#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
 #: control/control.SLED.glade.translations.glade:109
 #: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
+#: control/control.openSUSE.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:122
+#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
 msgid "Base Installation"
 msgstr "基本安装"
 
-#: control/control.SLED.glade.translations.glade:80
-#: control/control.SLED.glade.translations.glade:81
-#: control/control.SLED.glade.translations.glade:82
-#: control/control.SLED.glade.translations.glade:93
-#: control/control.SLED.glade.translations.glade:94
-#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
 msgid "AutoYaST Settings"
 msgstr "AutoYaST 设置"
 
-#: control/control.SLED.glade.translations.glade:107
-#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
 msgid "Configuration"
 msgstr "配置"
 
-#: control/control.SLED.glade.translations.glade:108
-#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
 msgid "System Configuration"
 msgstr "系统配置"
 
-#~ msgid ""
-#~ "\n"
-#~ "<p><b>Congratulations!</b></p>\n"
-#~ "<p>The installation of openSUSE on your machine is complete.\n"
-#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#~ "<p>Visit us at %1.</p>\n"
-#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#~ "            "
-#~ msgstr ""
-#~ "\n"
-#~ "<p><b>恭喜！</b></p>\n"
-#~ "<p>openSUSE 已在您的计算机上安装完毕。\n"
-#~ "点击<b>完成</b>后，您就可以登入系统了。</p>\n"
-#~ "<p>欢迎访问我们的站点：%1。</p>\n"
-#~ "<p>祝您使用愉快！<br>您的 openSUSE 开发团队</p>\n"
-#~ "            "
+#: control/control.SLES.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click <b>Finish</b> to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.suse.com/.\n"
+#| "</p>\n"
+#| "        "
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+"        "
+msgstr ""
+"\n"
+"<p>\n"
+"安装已成功完成。\n"
+"您的系统已经可以使用了。\n"
+"请点击<b>完成</b>来登入系统。\n"
+"</p>\n"
+"<p>\n"
+"欢迎访问我们的站点 http://www.suse.com/。\n"
+"</p>\n"
+"        "
 
-#~ msgid ""
-#~ "The desktop environment on your computer provides the graphical user\n"
-#~ "interface for your computer, as well as a suite of applications for\n"
-#~ "email, Web browsing, office productivity, games, and utilities to\n"
-#~ "manage your computer.\n"
-#~ "\n"
-#~ "openSUSE offers a choice of desktop environments.  The most widely\n"
-#~ "used desktop environments are GNOME and KDE, and they are equally\n"
-#~ "supported under openSUSE. Both desktop environments are easy to use,\n"
-#~ "highly integrated, and have an attractive look and feel. Each desktop\n"
-#~ "environment has a distinct style, so personal taste determines which\n"
-#~ "is the most appropriate desktop for you."
-#~ msgstr ""
-#~ "您计算机上的桌面环境为您的计算机提供了图形用户界面，以及用于\n"
-#~ "电子邮件、网络浏览、办公生产、游戏的一套应用程序\n"
-#~ "和管理计算机的实用工具。\n"
-#~ "\n"
-#~ "openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n"
-#~ "桌面环境是 GNOME 和 KDE，它们在 openSUSE 下有着平等\n"
-#~ "的支持。两者均易于使用、高度集成、外观诱人。\n"
-#~ "每种桌面环境都有独特的风格，因此个人品味决定了哪款\n"
-#~ "桌面最适合您。"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
+#, fuzzy
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "待更新系统"
 
-#~ msgid "GNOME Desktop"
-#~ msgstr "GNOME 桌面"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
 
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE 桌面"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
 
-#~ msgid "XFCE Desktop"
-#~ msgstr "XFCE 桌面"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
 
-#~ msgid "LXDE Desktop"
-#~ msgstr "LXDE 桌面"
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
 
-#~ msgid "Minimal X Window"
-#~ msgstr "极简 X 窗口系统"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "KVM Virtualization Host"
+msgstr "XEN 虚拟主机"
 
-#~ msgid "Enlightenment Desktop"
-#~ msgstr "Enlightenment 桌面"
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
 
-#~ msgid "Minimal Server Selection (Text Mode)"
-#~ msgstr "极简服务器选集 (文本模式)"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "Xen Virtualization Host"
+msgstr "XEN 虚拟主机"
 
-#~ msgid "Online Repositories"
-#~ msgstr "在线软件源"
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
 
-#~ msgid "Desktop Selection"
-#~ msgstr "桌面选择"
+#: control/control.SLES.glade.translations.glade:48
+msgid "Network Services Configuration"
+msgstr "网络服务配置"
 
-#~ msgid "Network Services Configuration"
-#~ msgstr "网络服务配置"
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Load linuxrc Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "加载 Linuxrc 网络配置"
 
-#~ msgid "Installation Summary"
-#~ msgstr "安装摘要"
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "安装摘要"
 
+#: control/control.openSUSE.glade.translations.glade:3
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+"            "
+msgstr ""
+"\n"
+"<p><b>恭喜！</b></p>\n"
+"<p>openSUSE 已在您的计算机上安装完毕。\n"
+"点击<b>完成</b>后，您就可以登入系统了。</p>\n"
+"<p>欢迎访问我们的站点：%1。</p>\n"
+"<p>祝您使用愉快！<br>您的 openSUSE 开发团队</p>\n"
+"            "
+
+#: control/control.openSUSE.glade.translations.glade:10
+#, fuzzy
+#| msgid ""
+#| "The desktop environment on your computer provides the graphical user\n"
+#| "interface for your computer, as well as a suite of applications for\n"
+#| "email, Web browsing, office productivity, games, and utilities to\n"
+#| "manage your computer.\n"
+#| "\n"
+#| "openSUSE offers a choice of desktop environments.  The most widely\n"
+#| "used desktop environments are GNOME and KDE, and they are equally\n"
+#| "supported under openSUSE. Both desktop environments are easy to use,\n"
+#| "highly integrated, and have an attractive look and feel. Each desktop\n"
+#| "environment has a distinct style, so personal taste determines which\n"
+#| "is the most appropriate desktop for you."
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"您计算机上的桌面环境为您的计算机提供了图形用户界面，以及用于\n"
+"电子邮件、网络浏览、办公生产、游戏的一套应用程序\n"
+"和管理计算机的实用工具。\n"
+"\n"
+"openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n"
+"桌面环境是 GNOME 和 KDE，它们在 openSUSE 下有着平等\n"
+"的支持。两者均易于使用、高度集成、外观诱人。\n"
+"每种桌面环境都有独特的风格，因此个人品味决定了哪款\n"
+"桌面最适合您。"
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Plasma Desktop"
+msgstr "KDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+#| msgid "Minimal Server Selection (Text Mode)"
+msgid "Server (Text Mode)"
+msgstr "极简服务器选集 (文本模式)"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+#| msgid "XFCE Desktop"
+msgid "Xfce Desktop"
+msgstr "XFCE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr "LXDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr "极简 X 窗口系统"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Enlightenment Desktop"
+msgstr "Enlightenment 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "极简服务器选集 (文本模式)"
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+msgid "Online Repositories"
+msgstr "在线软件源"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "桌面选择"
+
 #~ msgid "Add-On Product Installation"
 #~ msgstr "附加产品安装"
 
@@ -368,9 +733,6 @@
 #~ msgid "Customer Center"
 #~ msgstr "客户中心"
 
-#~ msgid "Online Update"
-#~ msgstr "在线更新"
-
 #~ msgid "Release Notes"
 #~ msgstr "版本资讯"
 
@@ -442,13 +804,10 @@
 
 #~ msgid ""
 #~ "openSUSE offers you a choice of user interfaces. The two major complete \n"
-#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a "
-#~ "full \n"
-#~ "suite of applications including email, a file manager, games and "
-#~ "utilities. \n"
+#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n"
+#~ "suite of applications including email, a file manager, games and utilities. \n"
 #~ " \n"
-#~ "As desktop selection is a matter of taste, we do not give a "
-#~ "recommendation."
+#~ "As desktop selection is a matter of taste, we do not give a recommendation."
 #~ msgstr ""
 #~ "openSUSE 让您选择用户界面。两种完整的桌面环境是\n"
 #~ "KDE 和 GNOME。两者都很易用，并带有一整套应用程序，\n"
@@ -491,6 +850,3 @@
 
 #~ msgid "Virtual Machine"
 #~ msgstr "虚拟机"
-
-#~ msgid "XEN Virtualization Host"
-#~ msgstr "XEN 虚拟主机"

Modified: trunk/yast/zh_CN/po/country.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/country.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/country.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: country\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2015-10-18 12:07+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -665,7 +665,9 @@
 
 #. command line help text for 'set hwclock' option
 #: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
 msgstr "硬件时钟的新值"
 
 #. summary label
@@ -851,49 +853,49 @@
 "无效日期 (DD-MM-YYYY) %1。\n"
 "请输入正确的日期。\n"
 
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
 msgid "Other &Settings..."
 msgstr "其它设置(&S)..."
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
 msgid "Date and Time (NTP is configured)"
 msgstr "日期和时间(NTP 已配置)"
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
 msgid "Date and Time"
 msgstr "日期和时间"
 
 #. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
 msgid "&Hardware Clock Set to UTC"
 msgstr "硬件时钟设置为 UTC (&H)"
 
 #. label text
 #. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
 msgid "&Region"
 msgstr "区域(&R)"
 
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
 msgid "Time &Zone"
 msgstr "时区(&Z)"
 
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
 msgid "Date and Time:"
 msgstr "日期和时间："
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
 msgid ""
 "\n"
 "<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -902,7 +904,7 @@
 "<p><b><big>时区和时钟设置</big></b></p>"
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
 msgid ""
 "<p>\n"
 "To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -917,7 +919,7 @@
 "</p>\n"
 
 #. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
 msgid ""
 "<p>\n"
 "If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -928,12 +930,12 @@
 "</p>"
 
 #. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
 msgid "Clock and Time Zone"
 msgstr "时钟和时区"
 
 #. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
 msgid "Select a valid time zone."
 msgstr "选择有效的时区。"
 
@@ -1021,181 +1023,188 @@
 
 #. keyboard layout
 #: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "西班牙语(拉丁美洲)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
 msgid "Italian"
 msgstr "意大利语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙语(巴西)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
 msgid "Portuguese (Brazil -- US accents)"
 msgstr "葡萄牙语(巴西 -- 美国口音)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
 msgid "Greek"
 msgstr "希腊语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
 msgid "Dutch"
 msgstr "荷兰语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
 msgid "Danish"
 msgstr "丹麦语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
 msgid "Norwegian"
 msgstr "挪威语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
 msgid "Swedish"
 msgstr "瑞典语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
 msgid "Finnish"
 msgstr "芬兰语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
 msgid "Czech"
 msgstr "捷克语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
 msgid "Czech (qwerty)"
 msgstr "捷克语 (qwerty)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
 msgid "Slovak (qwerty)"
 msgstr "斯洛伐克语 (qwerty)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
 msgid "Slovene"
 msgstr "斯洛文尼亚语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
 msgid "Hungarian"
 msgstr "匈牙利语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
 msgid "Polish"
 msgstr "波兰语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
 msgid "Russian"
 msgstr "俄语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
 msgid "Turkish"
 msgstr "土耳其语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
 msgid "Croatian"
 msgstr "克罗地亚语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
 msgid "Japanese"
 msgstr "日语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
 msgid "Belgian"
 msgstr "比利时语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
 msgid "Dvorak"
 msgstr "德沃夏克键盘"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
 msgid "Icelandic"
 msgstr "冰岛语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
 msgid "Khmer"
 msgstr "高棉语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
 msgid "Korean"
 msgstr "韩语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
 msgid "Arabic"
 msgstr "阿拉伯语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
 msgid "Tajik"
 msgstr "塔吉克语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
 msgid "US International"
 msgstr "美国国际"
 

Modified: trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/dhcp-server.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/dhcp-server.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dhcp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-06-05 16:30+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -513,8 +513,7 @@
 #. at least minimal configuration
 #: src/include/dhcp-server/dialogs2.rb:577
 msgid ""
-"One or more selected network interfaces is not configured (no assigned IP "
-"address \n"
+"One or more selected network interfaces is not configured (no assigned IP address \n"
 "and netmask)."
 msgstr "一个或多个所选网络接口尚未配置 (无指派的 IP 地址和网关)。"
 
@@ -717,8 +716,7 @@
 #: src/include/dhcp-server/dialogs2.rb:1546
 #: src/include/dhcp-server/dialogs2.rb:1569
 msgid ""
-"The dynamic DHCP address range must be in the same network as the DHCP "
-"server.\n"
+"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
 "IP %1 does not match the network %2/%3."
 msgstr ""
 "动态 DHCP 地址范围必须与 DHCP 服务器在同一网络。\n"
@@ -877,8 +875,7 @@
 msgid ""
 "You have specified an alternate configuration file for the DHCP server.\n"
 "\n"
-"YaST does not supported this. The DHCP server module can only read and "
-"write\n"
+"YaST does not supported this. The DHCP server module can only read and write\n"
 "/etc/dhcpd.conf. The new configuration from %1 will not be imported. All\n"
 "changes will be saved to the default configuration file.\n"
 " \n"
@@ -906,8 +903,7 @@
 "<p><b><big>Adding a New Range of DNS Records</big></b><br />\n"
 "<b>First IP Address</b> defines\n"
 "the starting address of the range and <b>Last IP Address</b> defines\n"
-"the last one. <b>Hostname Base</b> is a string that determines how "
-"hostnames\n"
+"the last one. <b>Hostname Base</b> is a string that determines how hostnames\n"
 "are created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>).\n"
 "<tt>%i</tt> is replaced with the number of the host in the range.\n"
 "If no <tt>%i</tt> is defined, the number is added at the end of the\n"
@@ -947,8 +943,7 @@
 #: src/include/dhcp-server/dns-helps.rb:42
 msgid ""
 "<p><b>New Zone Name</b> or <b>Reverse Zone Name</b>\n"
-"are taken from your current DHCP server and network settings and cannot be "
-"changed.</p>\n"
+"are taken from your current DHCP server and network settings and cannot be changed.</p>\n"
 msgstr ""
 "<p><b>新区域名称</b>或<b>反向区域名称</b>，\n"
 "取自当前的 DHCP 服务器和网络设置，所以不能更改。</p>\n"
@@ -986,8 +981,7 @@
 "the zone name servers.</p>\n"
 msgstr ""
 "<p><b><big>DNS 查询</big></b><br />\n"
-"每个 DNS 查询 (例如在一个 DNS 区域查询一个主机名的 IP 地址) 先询问当前区域名"
-"称服务器的父区域\n"
+"每个 DNS 查询 (例如在一个 DNS 区域查询一个主机名的 IP 地址) 先询问当前区域名称服务器的父区域\n"
 "（对于 <tt>example.com</tt> 为 <tt>com</tt>），\n"
 "然后向这些名称服务器发送一个 DNS 查询，\n"
 "以获取包含所需 IP 地址的答复。<br />\n"
@@ -998,8 +992,7 @@
 #: src/include/dhcp-server/dns-helps.rb:67
 msgid ""
 "<p>To add a <b>New Name Server</b>, click <b>Add</b>, complete the form,\n"
-"then click <b>Ok</b>. If the new name server name is included in the "
-"current\n"
+"then click <b>Ok</b>. If the new name server name is included in the current\n"
 "DNS zone, also enter its IP address. This is mandatory because it is used\n"
 "during the zone creation.</p>\n"
 msgstr ""
@@ -1025,8 +1018,7 @@
 "<p><b><big>DNS Records</big></b><br />\n"
 "Define DNS hostnames for all DHCP clients. You do not need to define\n"
 "all hostnames one by one. Set simple rules for how\n"
-"the hostnames are created. These rules define the ranges of IP addresses to "
-"use\n"
+"the hostnames are created. These rules define the ranges of IP addresses to use\n"
 "and the string from which hostnames are generated for a range.</p>\n"
 msgstr ""
 "<p><b><big>DNS 记录</big></b><br />\n"
@@ -1122,13 +1114,10 @@
 "<p>\n"
 " To create or remove a single DNS record,\n"
 "click <b>Add</b> or <b>Delete</b>.\n"
-"To synchronize the DNS entries with their reverse forms in the "
-"corresponding\n"
+"To synchronize the DNS entries with their reverse forms in the corresponding\n"
 "reverse zone, select <b>Synchronize with Reverse Zone</b>.\n"
 "Use <b>Remove DNS Records Matching Range</b> \n"
-"from <b>Special Tasks</b> to delete any information relating to this range "
-"of IP addresses from the DNS server. To create a new range of DNS records, "
-"select\n"
+"from <b>Special Tasks</b> to delete any information relating to this range of IP addresses from the DNS server. To create a new range of DNS records, select\n"
 "<b>Add New Range of DNS Records</b> from <b>Special Tasks</b>.</p>\n"
 msgstr ""
 "<p>\n"
@@ -1137,8 +1126,7 @@
 "要将 DNS 项与相应反向区域中的\n"
 "反向形式同步，请选择<b>与反向区域同步</b>。\n"
 "使用<b>特殊任务</b>中的\n"
-"<b>去除 DNS 记录匹配范围</b>可从该 DNS 服务器删除任何与此 IP 地址范围相关的信"
-"息。要创建新的 DNS 记录范围，请从<b>特殊任务</b>中\n"
+"<b>去除 DNS 记录匹配范围</b>可从该 DNS 服务器删除任何与此 IP 地址范围相关的信息。要创建新的 DNS 记录范围，请从<b>特殊任务</b>中\n"
 "选择<b>添加新的 DNS 记录范围</b>。</p>\n"
 
 #. old_range: $[
@@ -1417,8 +1405,7 @@
 #: src/include/dhcp-server/dns-server-wizard.rb:234
 msgid ""
 "No IP address has been provided for a name server in the current DNS zone.\n"
-"This may not work because each zone needs the name and IP of its name server "
-"defined. \n"
+"This may not work because each zone needs the name and IP of its name server defined. \n"
 "Really use the current settings?\n"
 msgstr ""
 "在当前 DNS 区域中未提供名称服务器的 IP 地址。\n"
@@ -1893,8 +1880,7 @@
 msgid ""
 "<p><b><big>Zones to Update</big></b><br>\n"
 "Specify forward and reverse zones to update. For both, also specify \n"
-"their primary name server. If the name server runs on the same host as the "
-"DHCP\n"
+"their primary name server. If the name server runs on the same host as the DHCP\n"
 "server, you can leave the fields empty.</p>"
 msgstr ""
 "<p><b><big>要更新的区域</big></b><br>\n"
@@ -1906,10 +1892,8 @@
 #: src/include/dhcp-server/helps.rb:143
 msgid ""
 "<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
-"Here you can specify parameters that you want DHCP Server to be started "
-"with \n"
-"(e.g. \"-p 1234\") for a non-standard port to listen on). For all possible "
-"options,\n"
+"Here you can specify parameters that you want DHCP Server to be started with \n"
+"(e.g. \"-p 1234\") for a non-standard port to listen on). For all possible options,\n"
 "consult dhcpd manual page. If left blank, default values will be used.</p>"
 msgstr ""
 "<p><b><big>DHCP 服务器启动参数</big></b><br>\n"
@@ -1921,8 +1905,7 @@
 #: src/include/dhcp-server/helps.rb:150
 msgid ""
 "<p><b><big>Network Card Selection</big></b><br>\n"
-"Select one or more of the listed network cards to use for the DHCP server.\n"
+"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
 msgstr ""
 "<p><b><big>网卡选择</big></b><br>\n"
 "选择用于 DHCP 服务器的列出的一张或多张网卡。</p>\n"
@@ -1986,8 +1969,7 @@
 
 #. Wizard Installation - Step 2 7/9
 #: src/include/dhcp-server/helps.rb:183
-msgid ""
-"<p><b>Print Server</b> offers this server as the default print server.</p>"
+msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
 msgstr "<p><b>打印服务器</b>提供此服务器作为默认打印服务器。</p>"
 
 #. Wizard Installation - Step 2 8/9
@@ -2002,8 +1984,7 @@
 #. Wizard Installation - Step 2 9/9
 #: src/include/dhcp-server/helps.rb:191
 msgid ""
-"<p><b>Default Lease Time</b> sets the time after which the leased IP "
-"expires\n"
+"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
 "and the client must ask for an IP again.</p>"
 msgstr ""
 "<p><b>默认租用时间</b>用于设置租用的 IP 在多长时间后失效，\n"
@@ -2027,8 +2008,7 @@
 msgid ""
 "<p><b><big>IP Address Range</big></b><br>\n"
 "Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
-"of the address range to be leased to clients. These addresses must have the "
-"same netmask.\n"
+"of the address range to be leased to clients. These addresses must have the same netmask.\n"
 "For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the <b>\n"
 "Allow Dynamic BOOTP</b> flag if the specified range may be dynamically\n"
 "assigned to BOOTP clients as well as DHCP clients</p>.\n"
@@ -2526,7 +2506,7 @@
 " \n"
 "现在正在中止。"
 
-#. error report
+#. error report 
 #: src/modules/DhcpServer.pm:1488
 msgid ""
 "Cannot determine hostname. LDAP-based configuration of \n"
@@ -2634,7 +2614,7 @@
 msgid "Error occurred while creating %1."
 msgstr "创建 %1 时出错。"
 
-#. error report, %1 is LDAP record key
+#. error report, %1 is LDAP record key 
 #: src/modules/DhcpServer.pm:2754
 msgid "Error occurred while updating %1."
 msgstr "更新 %1 时出错。"

Modified: trunk/yast/zh_CN/po/dns-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/dns-server.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/dns-server.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: dns server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2016-03-03 23:17+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -164,14 +164,12 @@
 
 #. TRANSLATORS: commandline short help for command
 #: src/include/dns-server/cmdline.rb:294
-msgid ""
-"Name server (in fully qualified format finished with a dot or relative name)"
+msgid "Name server (in fully qualified format finished with a dot or relative name)"
 msgstr "名称服务器 (使用以一个点结尾的完全限定格式或相对名称)"
 
 #. TRANSLATORS: commandline short help for command
 #: src/include/dns-server/cmdline.rb:301
-msgid ""
-"Mail server (in fully qualified format finished with a dot or relative name)"
+msgid "Mail server (in fully qualified format finished with a dot or relative name)"
 msgstr "邮件服务器 (使用以一个点结尾的完全限定格式或相对名称)"
 
 #. TRANSLATORS: commandline short help for command
@@ -221,8 +219,7 @@
 
 #. TRANSLATORS: commandline short help for command
 #: src/include/dns-server/cmdline.rb:371
-msgid ""
-"DNS resource record value, such as 192.0.34.166 for example.org's A record"
+msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record"
 msgstr "DNS 资源记录值，诸如表示 example.org 的 A 记录的 192.0.34.166"
 
 #. TRANSLATORS: commandline short help for command
@@ -307,8 +304,7 @@
 #. TRANSLATORS: commandline error message
 #. Both Add and Remove defined => Error!
 #: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867
-#: src/include/dns-server/cmdline.rb:999
-#: src/include/dns-server/cmdline.rb:1049
+#: src/include/dns-server/cmdline.rb:999 src/include/dns-server/cmdline.rb:1049
 #: src/include/dns-server/cmdline.rb:1108
 #: src/include/dns-server/cmdline.rb:1244
 #: src/include/dns-server/cmdline.rb:1303
@@ -379,11 +375,10 @@
 #. Table header item - ACL-options
 #. Table menu item - Records listing
 #: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743
-#: src/include/dns-server/cmdline.rb:944
-#: src/include/dns-server/cmdline.rb:1157
-#: src/include/dns-server/dialog-main.rb:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
 msgid "Value"
 msgstr "值"
 
@@ -401,7 +396,7 @@
 #. TRANSLATORS: commandline table header item
 #. Textentry - DNS adding zone - Name
 #: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
 msgid "Name"
 msgstr "名称"
 
@@ -411,9 +406,9 @@
 #. Table header item - DNS listing zones
 #. Table menu item - Records listing
 #: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
 msgid "Type"
 msgstr "类型"
 
@@ -426,8 +421,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
 msgid "Forwarders"
 msgstr "转发对象"
 
@@ -457,12 +452,11 @@
 #. TRANSLATORS: commandline table header item
 #. TRANSLATORS: commandline table header item
 #. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: src/include/dns-server/cmdline.rb:980 src/include/dns-server/cmdline.rb:1032
 #: src/include/dns-server/cmdline.rb:1089
 #: src/include/dns-server/cmdline.rb:1220
 #: src/include/dns-server/cmdline.rb:1284
-#: src/include/dns-server/dialog-main.rb:1905
+#: src/include/dns-server/dialog-main.rb:1639
 msgid "Zone"
 msgstr "区域"
 
@@ -491,14 +485,14 @@
 #. TRANSLATORS: commandline table header item
 #. Table header item - listing mail servers
 #: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
 msgid "Mail Server"
 msgstr "邮件服务器"
 
 #. TRANSLATORS: commandline table header item
 #. Table header item - listing mail servers
 #: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
 msgid "Priority"
 msgstr "优先级"
 
@@ -560,8 +554,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/dialog-installwizard.rb:79
-#: src/include/dns-server/dialog-main.rb:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
 msgid "DNS Zones"
 msgstr "DNS 区域"
 
@@ -583,7 +577,7 @@
 #. check box
 #. TRANSLATORS: checkbox label, turning LDAP support on or off
 #: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
 msgid "&LDAP Support Active"
 msgstr "激活 &LDAP 支持"
 
@@ -608,132 +602,88 @@
 msgstr "DNS 服务器专家配置(&E)..."
 
 #. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
 msgid "DNS Server"
 msgstr "DNS 服务器"
 
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#| msgid "Apply Changes to Dialog"
-msgid "Apply Changes"
-msgstr "应用修改"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-msgid "Start-Up"
-msgstr "启动"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-msgid "Basic Options"
-msgstr "基本选项"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "日志记录"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: src/include/dns-server/dialog-main.rb:482
-#: src/include/dns-server/dialog-main.rb:485
-#: src/include/dns-server/dialog-masterzone.rb:163
-#: src/include/dns-server/dialog-masterzone.rb:2729
-msgid "ACLs"
-msgstr "访问控制列表"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-msgid "TSIG Keys"
-msgstr "TSIG 密钥"
-
 #. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
 msgid "Local DNS Resolution &Policy"
 msgstr "本地 DNS 解析策略(&P)"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
 msgid "Merging forwarders is disabled"
 msgstr "已禁用了合并转发对象"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
 msgid "Automatic merging"
 msgstr "自动合并"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
 msgid "Merging forwarders is enabled"
 msgstr "已启用了合并转发对象"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
 msgid "Custom configuration"
 msgstr "自定义配置"
 
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
 msgid "Custom policy"
 msgstr "自定义策略"
 
 #. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
 msgid "Local DNS Resolution &Forwarder"
 msgstr "本地 DNS 解析转发对象(&F)"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
 msgid "Using system name servers"
 msgstr "使用系统名称服务器"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
 msgid "This name server (bind)"
 msgstr "此名称服务器 (bind)"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
 msgid "Local dnsmasq server"
 msgstr "本地 dnsmasq 服务器"
 
 #. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
 msgid "Add IP Address"
 msgstr "添加 IP 地址"
 
 #. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
 msgid "IPv4 or IPv6 A&ddress"
 msgstr "IPv4 或 IPv6 地址(&D)"
 
 #. Selectionbox for listing current DNS-Forwarders
 #. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
 msgid "Forwarder &List"
 msgstr "转发对象列表(&L)"
 
 #. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
 msgid "Cannot set local forwarder to %{forwarder}"
 msgstr "无法将本地转发对象设为 %{forwarder}"
 
 #. An error message, %1 is replaced with a variable IP
-#: src/include/dns-server/dialog-main.rb:877
+#: src/include/dns-server/dialog-main.rb:611
 msgid "Cannot find local equivalent for IP %1."
 msgstr "无法找到 IP %1 的本地等价。"
 
 #. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
 msgid ""
 "Forwarding DNS queries to itself would create an infinite loop.\n"
 "IP address %1 is currently used by this server, so it has\n"
@@ -743,64 +693,64 @@
 "IP 地址 %1 目前正由此服务器使用，因此它已被修改为它的本地等价 %2。"
 
 #. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
 msgid "Invalid IPv4 or IPv6 address."
 msgstr "无效的 IPv4 或 IPv6 地址。"
 
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
 msgid ""
 "A valid IPv6 address consists of letters a-f, numbers,\n"
 "and colons."
 msgstr "有效 IPv6 地址由字母 a 到 f，数字，和冒号组成。"
 
 #. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
 msgid "The specified forwarder is already present."
 msgstr "指定转发对象已存在。"
 
 #. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
 msgid "Add or Change Option"
 msgstr "添加或修改选项"
 
 #. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
 msgid "O&ption"
 msgstr "选项(&P)"
 
 #. Textentry for setting the basic-option value
 #. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
 msgid "&Value"
 msgstr "值(&V)"
 
 #. Pushbutton for changing the basic-option
 #. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
 msgid "C&hange"
 msgstr "修改(&H)"
 
 #. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
 msgid "Current Options"
 msgstr "当前选项"
 
 #. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
 msgid "Option"
 msgstr "选项"
 
 #. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
 msgid ""
 "Really set this\n"
 "option without any value?\n"
 msgstr "真的要设置此选项为没有任何值吗？\n"
 
 #. TRANSLATORS: Popup question. Please, do not translate 'yes' and 'no' strings. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1173
+#: src/include/dns-server/dialog-main.rb:907
 msgid ""
 "Option %1 can only have a yes or no value set.\n"
 "Really set it to %2?\n"
@@ -809,7 +759,7 @@
 "真的将它设为 %2 吗？\n"
 
 #. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1190
+#: src/include/dns-server/dialog-main.rb:924
 msgid ""
 "Option %1 can only be a number.\n"
 "Really set it to %2?\n"
@@ -818,7 +768,7 @@
 "真的将它设置为 %2 吗？\n"
 
 #. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
 msgid ""
 "Quotes are not used correctly in this option.\n"
 "Really set it to %1?\n"
@@ -827,7 +777,7 @@
 "真的将它设为 %1 吗？\n"
 
 #. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
 msgid ""
 "Brackets are not used correctly in this option.\n"
 "Really set it to %1?\n"
@@ -836,7 +786,7 @@
 "真的将它设为 %1 吗？\n"
 
 #. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
 msgid ""
 "Option %1 should be set only once.\n"
 "Really add another one?\n"
@@ -845,77 +795,77 @@
 "真的要添加另一个吗？\n"
 
 #. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
 msgid "Log Type"
 msgstr "日志类型"
 
 #. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
 msgid "&System Log"
 msgstr "系统日志(&S)"
 
 #. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
 msgid "&File"
 msgstr "文件(&F)"
 
 #. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
 msgid "Maximum &Size (MB)"
 msgstr "最大大小 (MB)(&S)"
 
 #. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
 msgid "Maximum &Versions"
 msgstr "最大版本数(&V)"
 
 #. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
 msgid "Additional Logging"
 msgstr "额外日志记录"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
 msgid "Log All DNS &Queries"
 msgstr "记录全部 DNS 查询(&Q)"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
 msgid "Log Zone &Updates"
 msgstr "记录区域更新(&U)"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
 msgid "Log Zone &Transfers"
 msgstr "记录区域传输(&T)"
 
 #. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
 msgid "Select File for Log"
 msgstr "选择日志文件"
 
 #. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
 msgid "Option Setup"
 msgstr "选项设置"
 
 #. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
 msgid "&Name"
 msgstr "名称(&N)"
 
 #. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
 msgid "Current ACL List"
 msgstr "当前访问控制列表列表"
 
 #. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
 msgid "ACL"
 msgstr "访问控制列表"
 
 #. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
 msgid ""
 "This ACL is used by %1 zones.\n"
 "Really remove it?\n"
@@ -924,12 +874,12 @@
 "真的移除它吗？\n"
 
 #. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
 msgid "The specified ACL entry already exists."
 msgstr "指定访问控制列表项已存在。"
 
 #. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
 msgid "Add New Zone "
 msgstr "添加新区域"
 
@@ -938,8 +888,8 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
 msgid "Master"
 msgstr "主"
 
@@ -949,9 +899,9 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
 msgid "Slave"
 msgstr "从属"
 
@@ -960,35 +910,34 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
 msgid "Forward"
 msgstr "转发"
 
 #. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
 msgid "Configured DNS Zones"
 msgstr "已配置的 DNS 区域"
 
 #. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
 msgid "A zone with the specified name is already configured."
 msgstr "指定名称的区域已配置。"
 
 #. Write settings dialog
 #. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
 msgid "Saving the configuration failed. Change the settings?"
 msgstr "保存配置失败。修改设置吗？"
 
 #. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
-#| msgid "Save configuration files"
+#: src/include/dns-server/dialog-main.rb:1903
 msgid "Saving the configuration failed"
 msgstr "保存配置失败"
 
 #. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
 msgid ""
 "All changes will be lost.\n"
 "Really leave the DNS server configuration without saving?"
@@ -996,74 +945,117 @@
 "全部修改均将不复存在。\n"
 "真的不保存就离开 DNS 服务器配置吗？"
 
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+msgid "Apply Changes"
+msgstr "应用修改"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+msgid "Start-Up"
+msgstr "启动"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+msgid "Basic Options"
+msgstr "基本选项"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "日志记录"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr "访问控制列表"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+msgid "TSIG Keys"
+msgstr "TSIG 密钥"
+
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
 msgid "A&llow Dynamic Updates"
 msgstr "允许动态更新(&L)"
 
 #. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
 msgid "TSIG &Key"
 msgstr "TSIG 密钥(&K)"
 
 #. check box
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
 msgid "Enable &Zone Transport"
 msgstr "启用区域传输(&Z)"
 
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
 msgid "A&utomatically Generate Records From"
 msgstr "自动生成记录自(&U)"
 
 #. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
 msgid "Zon&e"
 msgstr "区域(&E)"
 
 #. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
 msgid "Connected Reverse Zones"
 msgstr "连接的反向区域"
 
 #. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
 msgid ""
 "This function is not available during\n"
 "preparation for autoinstallation.\n"
 msgstr "此功能在自动安装准备期间不可用。\n"
 
 #. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
 msgid "No TSIG key is defined."
 msgstr "未定义 TSIG 密钥。"
 
 #. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
 msgid "&Name Server to Add"
 msgstr "要添加的名称服务器(&N)"
 
 #. Selectionbox - listing current nameservers
 #. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
 msgid "Na&me Server List"
 msgstr "名称服务器列表(&M)"
 
 #. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
 msgid "The specified name server already exists."
 msgstr "指定名称服务器已存在。"
 
 #. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
 msgid "Mail Server to Add"
 msgstr "要添加的邮件服务器"
 
 #. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
 msgid "&Address"
 msgstr "地址(&A)"
 
@@ -1071,116 +1063,116 @@
 #. IntField - zone settings - Record Value
 #. IntField - zone settings - Record Value
 #. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
 #: src/include/dns-server/options.rb:435
 msgid "&Priority"
 msgstr "优先级(&P)"
 
 #. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
 msgid "Mail Relay List"
 msgstr "邮件中继列表"
 
 #. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "指定值不是一个有效的主机名或 IP 地址。"
 
 #. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
 msgid "The specified mail server already exists."
 msgstr "指定邮件服务器已存在。"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
 msgid "Seconds"
 msgstr "秒"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
 msgid "Minutes"
 msgstr "分钟"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
 msgid "Hours"
 msgstr "小时"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
 msgid "Days"
 msgstr "天"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
 msgid "Weeks"
 msgstr "周"
 
 #. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
 msgid "Seri&al"
 msgstr "序列号(&A)"
 
 #. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
 msgid "TT&L"
 msgstr "TT&L"
 
 #. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
 msgid "&Unit"
 msgstr "单元(&U)"
 
 #. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
 msgid "Re&fresh"
 msgstr "刷新(&F)"
 
 #. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
 msgid "Un&it"
 msgstr "单元(&I)"
 
 #. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
 msgid "Retr&y"
 msgstr "重试(&Y)"
 
 #. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
 msgid "Ex&piration"
 msgstr "失效期(&P)"
 
 #. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
 msgid "U&nit"
 msgstr "单元(&N)"
 
 #. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
 msgid "&Minimum"
 msgstr "最小值(&M)"
 
 #. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
 msgid "Uni&t"
 msgstr "单元(&T)"
 
 #. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
 msgid "The serial number of the zone must be specified."
 msgstr "必须指定该区域的序列号。"
 
 #. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
 msgid "The serial number must be no more than %1 digits long."
 msgstr "序列号的长度不能超过 %1 个数字。"
 
 #. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
 msgid ""
 "The expiration time-out is higher than the time period\n"
 "of zone refreshes. The zone will not be reachable\n"
@@ -1194,104 +1186,104 @@
 #. Textentry - zone settings - Record Name
 #. Textentry - zone settings - Record Name
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
 msgid "&Record Key"
 msgstr "记录键(&R)"
 
 #. Combobox - zone settings - Record Type
 #. Combobox - zone settings - Record Type
 #. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
 msgid "T&ype"
 msgstr "类型(&Y)"
 
 #. Textentry - zone settings - Record Value
 #. IntField - zone settings - Record Value
 #. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
 msgid "Val&ue"
 msgstr "值(&U)"
 
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
 msgid "&Service"
 msgstr "服务(&S)"
 
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
 msgid "&Protocol"
 msgstr "协议(&P)"
 
 #. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
 msgid "&Weight"
 msgstr "权重(&W)"
 
 #. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
 msgid "&Port"
 msgstr "端口(&P)"
 
 #. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
 msgid "A: IPv4 Domain Name Translation"
 msgstr "A：IPv4 域名转译"
 
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
 msgid "AAAA: IPv6 Domain Name Translation"
 msgstr "AAAA：IPv6 域名转译"
 
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
 msgid "CNAME: Alias for Domain Name"
 msgstr "CNAME：域名别名"
 
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
 msgid "NS: Name Server"
 msgstr "NS：名称服务器"
 
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
 msgid "MX: Mail Relay"
 msgstr "MX：邮件中继"
 
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
 msgid "PTR: Reverse Translation"
 msgstr "PTR：反向转译"
 
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
 msgid "SRV: Services Record"
 msgstr "SRV：服务记录"
 
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
 msgid "TXT: Text Record"
 msgstr "TXT：文本记录"
 
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
 msgid "SPF: Sender Policy Framework"
 msgstr "SPF：发件人策略框架"
 
 #. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
 msgid "Record Settings"
 msgstr "记录设置"
 
 #. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
 msgid "Configured Resource Records"
 msgstr "已配置的资源记录"
 
 #. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
 msgid "Record Key"
 msgstr "记录键"
 
 #. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
 msgid ""
 "Invalid IPv6 reverse IP.\n"
 "\n"
@@ -1303,16 +1295,15 @@
 "IPv6 反向记录支持完整格式 (%1) 或当前区域的相对格式。"
 
 #. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
 msgid "Invalid IPv6 address."
 msgstr "无效的 IPv6 地址。"
 
 #. TRANSLATORS: Error message
 #. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
 msgid ""
-"Invalid %{type} record key. It should consist of printable US-ASCII"
-" characters excluding '='\n"
+"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
 "and must be at least one character long."
 msgstr "无效的 %{type} 记录键。它应由可打印的除 '=' 外的 US-ASCII 字符组成并且必须至少有一个字符的长度。"
 
@@ -1320,7 +1311,7 @@
 #. %{type}    - replaced with record type (TXT or SPF)
 #. %{max}     - replaced with the maximal length
 #. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
 msgid ""
 "Maximal length of a %{type} record is %{max} characters.\n"
 "This message is %{current} characters long."
@@ -1329,72 +1320,66 @@
 "该消息的长度为 %{current} 个字符。"
 
 #. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
 msgid "CNAME cannot point to itself."
 msgstr "CNAME 无法指向自身。"
 
 #. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
 msgid "An internal error has occurred."
 msgstr "发生了一个内部错误。"
 
 #. Dialog Caption - Expert Settings - Zone Editor
 #. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
 msgid "Zone Editor"
 msgstr "区域编辑器"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
 msgid "&Basics"
 msgstr "基础(&B)"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
 msgid "NS Recor&ds"
 msgstr "NS 记录(&D)"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
 msgid "&SOA"
 msgstr "授权起始记录(SOA)(&S)"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
 msgid "R&ecords"
 msgstr "记录(&E)"
 
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
 msgid "M&X Records"
 msgstr "M&X 记录"
 
 #. Label - connected with Textentry which shows current edited zone
 #. Label - connected with Textentry which shows current edited zone
 #. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
 msgid "Settings for Zone"
 msgstr "区域设置"
 
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "高级(&V)"
-
 #. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
 msgid "At least one NS server must be set."
 msgstr "必须设置至少一个 NS 服务器。"
 
@@ -1402,27 +1387,26 @@
 #.
 #. Automatically Generate Records From is a feature that makes YaST to generate
 #. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
 msgid ""
 "Current zone records are automatically generated from %1 zone.\n"
-"To change records manually disable the Automatically Generate Records From"
-" feature."
+"To change records manually disable the Automatically Generate Records From feature."
 msgstr ""
 "当前区域记录自动生成自 %1 区域。\n"
 "要手动修改记录，请禁用自动生成记录自这一功能。"
 
 #. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
 msgid "&Master DNS Server IP"
 msgstr "主 DNS 服务器 IP(&M)"
 
 #. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
 msgid "Missing Master Server"
 msgstr "缺少主服务器"
 
 #. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
 msgid ""
 "Every slave zone must have its master server IP defined.\n"
 "Configuration of a DNS server without a master server would fail.\n"
@@ -1433,32 +1417,32 @@
 "您若继续，当前区域将被移除。"
 
 #. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
 msgid "No master DNS server defined."
 msgstr "未定义主 DNS 服务器。"
 
 #. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
 msgid "The specified master name server is not a valid IP address."
 msgstr "指定主名称服务器不是一个有效的 IP 地址。"
 
 #. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
 msgid "New &Forwarder IP Address"
 msgstr "新转发对象 IP 地址(&F)"
 
 #. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
 msgid "Current &Zone Forwarders"
 msgstr "当前区域转发对象(&Z)"
 
 #. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
 msgid "Forward Zone Editor"
 msgstr "转发区域编辑器"
 
 #. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
 msgid ""
 "This forward zone has no forwarders defined, which means\n"
 "that all DNS queries for this zone are denied.\n"
@@ -1629,10 +1613,8 @@
 #: src/include/dns-server/helps.rb:99
 msgid ""
 "<p><b><big>Master Servers</big></b><br>\n"
-"Set the IP addresses of the master name servers for this zone. Use <b>Add\n"
-"to add a new master name server. Select an existing one then click <b>Delete<"
-"/b>\n"
+"Set the IP addresses of the master name servers for this zone. Use <b>Add</b>\n"
+"to add a new master name server. Select an existing one then click <b>Delete</b>\n"
 "to remove an existing one.</p>"
 msgstr ""
 "<p><b><big>主服务器</big></b><br>\n"
@@ -1646,8 +1628,7 @@
 msgid ""
 "<p><b><big>Zone Type</big></b><br>\n"
 "To make this name server the primary source of the data of the zone,\n"
-"select <b>Master</b>. To make it the secondary name server, select <b>Slave<"
-"/b>\n"
+"select <b>Master</b>. To make it the secondary name server, select <b>Slave</b>\n"
 "or <b>Stub</b>, so the data of the zone will be mirrored from the master\n"
 "server.</p>"
 msgstr ""
@@ -1727,8 +1708,7 @@
 #: src/include/dns-server/helps.rb:153
 msgid ""
 "<p><b>Serial</b> number is used for determining if the zone has changed on\n"
-"the master servers (so that slave servers do not always need to synchronize"
-" the\n"
+"the master servers (so that slave servers do not always need to synchronize the\n"
 "entire zone).</p>\n"
 msgstr ""
 "<p><b>序列号</b>用于确定该区域在主服务器上是否有所修改\n"
@@ -1776,10 +1756,8 @@
 "<p><b><big>TSIG Key Management</big></b><br>\n"
 "Define TSIG keys used for dynamic zone updates.\n"
 "To add a new TSIG key, use the \n"
-"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add.\n"
-"To delete an existing TSIG key, select it in the list and click <b>Delete.\n"
+"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b>.\n"
+"To delete an existing TSIG key, select it in the list and click <b>Delete</b>.\n"
 "</p>"
 msgstr ""
 "<p><b><big>TSIG 密钥管理</big></b><br>\n"
@@ -1888,13 +1866,11 @@
 #: src/include/dns-server/helps.rb:242
 msgid ""
 "<p>\n"
-"Select <b>Log to System Log</b> to save DNS server log messages to the system"
-" log. \n"
+"Select <b>Log to System Log</b> to save DNS server log messages to the system log. \n"
 "To save the DNS server log messages to a separate file, select \n"
 "<b>Log to File</b> and set the <b>Filename</b> to which to save the log and \n"
 "the <b>Maximum Size</b> of the log file.\n"
-"The DNS server automatically rotates the log files. Use <b>Maximum Versions<"
-"/b>\n"
+"The DNS server automatically rotates the log files. Use <b>Maximum Versions</b>\n"
 "to specify how many log files should be saved.</p>\n"
 msgstr ""
 "<p>\n"
@@ -1957,8 +1933,7 @@
 "<p>To add an already created key, set the <b>Filename</b>\n"
 "(or use the <b>Browse</b> button to select it) and click <b>Add</b>.\n"
 "To generate a new key, enter the <b>Filename</b> and the <b>Key ID</b>\n"
-"then click <b>Generate</b>. The new key will be generated and also added.\n"
+"then click <b>Generate</b>. The new key will be generated and also added.</p>\n"
 msgstr ""
 "<p>要添加已创建的密钥，请设置<b>文件名</b>\n"
 "(或使用<b>浏览</b>按钮来选择文件名)并点击<b>添加</b>。\n"
@@ -1984,32 +1959,27 @@
 #. Expert Mode Configuration - Zones #2
 #: src/include/dns-server/helps.rb:298
 msgid ""
-"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type,\n"
+"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b>,\n"
 "and click <b>Add</b>.</p>\n"
 msgstr "<p>要添加新的区域，请输入它的<b>区域名称</b>，选择<b>区域类型</b>，并点击<b>添加</b>。</p>\n"
 
 #. Expert Mode Configuration - Zones #3
 #: src/include/dns-server/helps.rb:302
 msgid ""
-"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address"
-" followed by\n"
+"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address followed by\n"
 "<tt>.in-addr.arpa</tt> as its <b>Zone Name</b> (for example, zone name\n"
 "<tt>0.168.192.in-addr.arpa</tt> for network <tt>192.168.0.0/24</tt>), select\n"
 "the <b>Zone Type</b>, and click <b>Add</b>.</p>\n"
 msgstr ""
 "<p>要添加新 IPv4 反向区域，请输入一部分反向 IPv4 地址，加上 <tt>.in-addr.arpa</tt> 作为它的<b>区域名称</b>\n"
-"(例如，网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>)，选择区域类型</t>，并点击 <b>添加</b>。</p>\n"
+"(例如，网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>)，选择<b>区域类型</t>，并点击 <b>添加</b>。</p>\n"
 
 #. Expert Mode Configuration - Zones #4
 #. %1, %2, %3, and %4 are replaced with examples
 #: src/include/dns-server/helps.rb:311
 msgid ""
-"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address"
-" followed by\n"
-"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone"
-" name are\n"
+"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address followed by\n"
+"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone name are\n"
 "supported: Standard form: <tt>%2</tt>;\n"
 "Forward form: <tt>%3</tt>;\n"
 "Forward form without netmask bits: <tt>%4</tt>\n"
@@ -2037,8 +2007,7 @@
 #: src/include/dns-server/helps.rb:334
 msgid ""
 "<p><b><big>DDNS and Zone Transport</big></b><br>\n"
-"Use this dialog to change dynamic DNS settings of the zone and control"
-" access\n"
+"Use this dialog to change dynamic DNS settings of the zone and control access\n"
 "to the zone.</p>\n"
 msgstr ""
 "<p><b><big>DDNS 和区域传输</big></b><br>\n"
@@ -2097,8 +2066,7 @@
 #: src/include/dns-server/helps.rb:371
 msgid ""
 "<p><b><big>NS Records</big></b><br>\n"
-"To add a new name server, enter the name server address and click <b>Add.\n"
+"To add a new name server, enter the name server address and click <b>Add</b>.\n"
 "To remove one of the listed name servers, select it and click\n"
 "<b>Delete</b>.</p>\n"
 msgstr ""
@@ -2239,8 +2207,7 @@
 "<p><b>PTR: Reverse Translation</b>:\n"
 "<b>Record Key</b> is a full reverse zone name (derived from the IP address)\n"
 "followed by a dot\n"
-"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1<"
-"/tt>)\n"
+"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1</tt>)\n"
 " or a part of reverse zone name relative to the current zone\n"
 "(such as <tt>1</tt> for IP address <tt>192.168.0.1</tt> in zone\n"
 "<tt>0.168.192.in-addr.arpa.</tt>).\n"
@@ -2250,8 +2217,7 @@
 "<b>记录键</b>是完整反向区域名称 (派生自 IP 地址) 后跟一个点\n"
 "(例如，IP 地址为 <tt>192.168.0.1</tt>，则记录键为 </tt>1.0.168.192.in-addr.arpa.<tt>)\n"
 "或者是相对于当前区域的反向区域名称的一部分\n"
-"(例如，区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <"
-"tt>1</tt>)。\n"
+"(例如，区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <tt>1</tt>)。\n"
 "<b>值</b>是完全限定主机名后跟一个点。</p>\n"
 
 #. Final step of the installation wizard - 1/5
@@ -2441,56 +2407,56 @@
 msgstr "邮件中继(&M)"
 
 #. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
 msgid "Initializing DNS Server Configuration"
 msgstr "正在初始化 DNS 服务器配置"
 
 #. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
 msgid "Check the environment"
 msgstr "检查环境"
 
 #. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
 msgid "Flush caches of the DNS daemon"
 msgstr "刷新 DNS 守护进程的缓存"
 
 #. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
 msgid "Read the firewall settings"
 msgstr "读取防火墙设置"
 
 #. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
 msgid "Read the settings"
 msgstr "读取设置"
 
 #. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
 msgid "Checking the environment..."
 msgstr "正在检查环境..."
 
 #. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
 msgid "Flushing caches of the DNS daemon..."
 msgstr "正在刷新 DNS 守护进程的缓存..."
 
 #. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
 msgid "Reading the firewall settings..."
 msgstr "正在读取防火墙设置..."
 
 #. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
 msgid "Reading the settings..."
 msgstr "正在读取设置..."
 
 #. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
 msgid "Finished"
 msgstr "已完成"
 
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
 msgid ""
 "Error occurred while calling netconfig.\n"
 "Error: "
@@ -2499,72 +2465,72 @@
 "错误："
 
 #. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
 msgid "Saving DNS Server Configuration"
 msgstr "正在保存 DNS 服务器配置"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
 msgid "Save configuration files"
 msgstr "保存配置文件"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
 msgid "Restart the DNS daemon"
 msgstr "重启 DNS 守护进程"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
 msgid "Update zone files"
 msgstr "更新区域文件"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
 msgid "Adjust the DNS service"
 msgstr "调整 DNS 服务"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
 msgid "Call netconfig"
 msgstr "调用 netconfig"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
 msgid "Write the firewall settings"
 msgstr "写入防火墙设置"
 
 #. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
 msgid "Saving configuration files..."
 msgstr "正在保存配置文件..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
 msgid "Restarting the DNS daemon..."
 msgstr "正在重启 DNS 守护进程..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
 msgid "Updating zone files..."
 msgstr "正在更新区域文件..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
 msgid "Adjusting the DNS service..."
 msgstr "正在调整 DNS 服务..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
 msgid "Calling netconfig..."
 msgstr "正在调用 netconfig..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
 msgid "Writing the firewall settings..."
 msgstr "正在写入防火墙设置..."
 
 #. Cannot start service 'named', because of error that follows Error:.  Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
 msgid ""
 "Error occurred while starting service named.\n"
 "\n"
@@ -2573,43 +2539,43 @@
 "\n"
 
 #. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
 msgid "Stub"
 msgstr "存根"
 
 #. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
 msgid "Hint"
 msgstr "提示"
 
 #. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
 msgid "The DNS server starts when booting the system."
 msgstr "在引导系统时启动 DNS 服务器。"
 
 #. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
 msgid "The DNS server does not start when booting the system."
 msgstr "在引导系统时不启动 DNS 服务器。"
 
 #. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
 #, perl-format
 msgid "Configured Zones: %s"
 msgstr "已配置的区域：%s"
 
 #. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
 msgid "Invalid LDAP configuration. Cannot use LDAP."
 msgstr "无效的 LDAP 配置。无法使用 LDAP。"
 
 #. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
 msgid "Enable LDAP support?"
 msgstr "激活 LDAP 支持吗？"
 
 #. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
 msgid ""
 "Installation of required packages failed.\n"
 "LDAP support will not be active."
@@ -2618,30 +2584,33 @@
 "LDAP 支持将不会激活。"
 
 #. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
 msgid "Unknown LDAP initialization error."
 msgstr "未知的 LDAP 初始化错误。"
 
 #. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
 msgid "Error occurred while creating %1."
 msgstr "创建 %1 时出错。"
 
 #. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
 msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
 msgstr "创建 cn=defaultDNS,%1 时出错。未在使用 LDAP。"
 
 #. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
 msgid "Error occurred while updating %1."
 msgstr "更新 %1 时出错。"
 
 #. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
 msgid "Error occurred while creating %1. Not using LDAP."
 msgstr "创建 %1 时出错。未在使用 LDAP。"
 
+#~ msgid "Ad&vanced"
+#~ msgstr "高级(&V)"
+
 #~ msgid "When &Booting"
 #~ msgstr "引导时(&B)"
 

Modified: trunk/yast/zh_CN/po/docker.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/docker.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/docker.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2015-10-18 12:06+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -19,6 +19,116 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 2.0\n"
 
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid "&Kill Container"
+msgid "Changes in Container"
+msgstr "杀死容器(&K)"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "状态"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr "退出(&E)"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid "&Stop Container"
+msgid "Commit Container"
+msgstr "停止容器(&S)"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr "仓库"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+msgid "Tag"
+msgstr "标签"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Inject &Terminal"
+msgid "Inject Shell"
+msgstr "插入终端(&T)"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
 #. Only root can start process
 #: src/lib/ydocker/main_dialog.rb:74
 msgid "Docker service does not run. Should YaST start docker? Otherwise YaST quits."
@@ -60,14 +170,6 @@
 msgid "Running Docker Containers"
 msgstr "运行中的 Docker 容器"
 
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr "仓库"
-
-#: src/lib/ydocker/main_dialog.rb:218
-msgid "Tag"
-msgstr "标签"
-
 #: src/lib/ydocker/main_dialog.rb:219
 msgid "Image ID"
 msgstr "映像 ID"
@@ -88,15 +190,11 @@
 msgid "Image"
 msgstr "映像"
 
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
 msgid "Command"
 msgstr "命令"
 
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "状态"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
 msgid "Ports"
 msgstr "端口"
 
@@ -132,10 +230,63 @@
 msgid "&Commit"
 msgstr "提交(&C)"
 
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr "退出(&E)"
-
 #: src/lib/ydocker/main_dialog.rb:315
 msgid "Do you really want to delete image \"%s\"?"
 msgstr "您真的想要删除映像 \"%s\" 吗？"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid "&Containers"
+msgid "Run Container"
+msgstr "容器(&C)"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid "&Containers"
+msgid "Container"
+msgstr "容器(&C)"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""

Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/drbd.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/drbd.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-06 18:34+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -235,150 +235,91 @@
 
 #: src/include/drbd/helps.rb:69
 msgid ""
-"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a "
-"resource</p>\n"
+"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a resource</p>\n"
 "\t\t"
 msgstr ""
 "<p>点击 \"添加\"、\"编辑\"、\"删除\" 按钮来添加、编辑或删除一个资源</p>\n"
 "\t\t"
 
 #: src/include/drbd/helps.rb:75
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n"
+#| "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
+#| "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n"
+#| "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
+#| "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
+#| "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+#| "\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
+#| "\t\t"
 msgid ""
 "\n"
-"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) "
-"of one of the nodes. Should not include \".\" in hostname.</p>\n"
-"\t\t<p>\"Address:Port\": A resource needs one IP address per device, which "
-"is used to wait for incoming connections from the partner device to reach "
-"the device. Each DRBD resource needs a TCP port which is used to connect to "
-"the node's partner device.</p>\n"
-"\t\t<p>\"Device\": The name of the block device node of the resource being "
-"described. You must use this device with your application (file system) and "
-"you must not use the low level block device which is specified with the disk "
-"parameter,following its minor number. Otherwise, you may omit the name, or "
-"the word minor and its number. If you omit the name a default of /dev/"
-"drbd'minor number' will be used.\n"
-"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/"
-"drbd{minor drbd number [0...255]}'</p>\n"
-"\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve "
-"the data.  Never access such a device while DRBD is running on top of  it.\n"
-"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the "
-"backing device is used to store the meta-data.</p>\n"
-"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated "
-"by yast automatically. A host can have different \"node-id\" in different "
-"resources.</p>\n"
+"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n"
+"\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</p>\n"
+"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n"
+"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
+"\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
+"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
 "\t\t"
 msgstr ""
 "\n"
-"\t\t<p>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。"
-"主机名中不应包含 \".\"。</p>\n"
-"\t\t<p>\"地址:端口\"：一个资源针对每个设备都需要一个 IP 地址，用于等待来自父"
-"设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口，用于连"
-"接到节点的父设备。</p>\n"
-"\t\t<p>\"设备\"：所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中"
-"您必须使用此设备，而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要"
-"么省略名称，要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/"
-"drbd'minor 编号'。\n"
-"\t\t如：'/dev/drbd{service} minor {minor drbd number [0...255]}' 或 '/dev/"
-"drbd{minor drbd number [0...255]}'</p>\n"
-"\t\t<p>\"磁盘\"：分布式复制块设备使用此块设备来真正存储和撷取数据。当其上正在"
-"运行分布式复制块设备时请永远不要访问这样的设备。</p>\n"
-"\t\t<p>\"元磁盘\"：内部使用。内部使用意味着后备设备的最后一部分用于存储元数"
-"据。</p>\n"
-"\t\t<p>\"节点 ID\"：节点 ID 是分布式复制块设备的一个内部值，将由 YaST 自动生成。"
-"同一主机在不同资源中可以有不同的节点 ID。</p>\n"
+"\t\t<p>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。主机名中不应包含 \".\"。</p>\n"
+"\t\t<p>\"地址:端口\"：一个资源针对每个设备都需要一个 IP 地址，用于等待来自父设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口，用于连接到节点的父设备。</p>\n"
+"\t\t<p>\"设备\"：所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中您必须使用此设备，而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要么省略名称，要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/drbd'minor 编号'。\n"
+"\t\t如：'/dev/drbd{service} minor {minor drbd number [0...255]}' 或 '/dev/drbd{minor drbd number [0...255]}'</p>\n"
+"\t\t<p>\"磁盘\"：分布式复制块设备使用此块设备来真正存储和撷取数据。当其上正在运行分布式复制块设备时请永远不要访问这样的设备。</p>\n"
+"\t\t<p>\"元磁盘\"：内部使用。内部使用意味着后备设备的最后一部分用于存储元数据。</p>\n"
+"\t\t<p>\"节点 ID\"：节点 ID 是分布式复制块设备的一个内部值，将由 YaST 自动生成。同一主机在不同资源中可以有不同的节点 ID。</p>\n"
 "\t\t"
 
 #: src/include/drbd/helps.rb:89
 msgid ""
 "\n"
 "\t\t<p><b>Protocol</b></p>\n"
-"\t\t<p>Protocol A: write IO is reported as completed, if it has reached "
-"local disk and local TCP send buffer.</p>\n"
-"\t\t<p>Protocol B: write IO is reported as completed, if it has reached "
-"local disk and remote buffer cache.</p>\n"
-"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both "
-"local and remote disk.</p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
 "\t\t\t\t\t\t\t\t\t\t  \n"
 "\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
-"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node "
-"was a degraded cluster</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
 "\n"
-"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-"
-"error to the upper layers</p>\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
 "\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
-"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by "
-"DRBD</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
 "\n"
-"\t\t<p><b>timeout</b>: If the partner node fails to send an expected "
-"response packet within time 10ths of a second, the partner node is "
-"considered dead and therefore  the TCP/IP connection is abandoned. This must "
-"be lower than connect-int and ping-int. The default value is 60 = 6 seconds, "
-"the unit 0.1 seconds.</p>\n"
-"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-"
-"alive packet. In case the peer's reply is not received within this time "
-"period, it is considered as dead. The default value is 500ms, the default "
-"unit is 100ms</p>\n"
-"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive "
-"packet</p>\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore  the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
 "\n"
-"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two "
-"write barriers</p>\n"
-"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write "
-"request for count times the timeout, it is expelled from the cluster. The "
-"default value is 0, which disables this feature.</p>\n"
-"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top "
-"of DRBD, it is possible to limit the bandwidth which may be used by "
-"background synchronizations. The default is 250 KB/sec, the default unit is "
-"KB/sec.</p>\n"
-"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= "
-"active set) can get. The default number of extents is 127. (Minimum: 7, "
-"Maximum: 3843)</p>\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
 "\t\t"
 msgstr ""
 "\n"
 "\t\t<p><b>协议</b></p>\n"
-"\t\t<p>Protocol A: write IO is reported as completed, if it has reached "
-"local disk and local TCP send buffer.</p>\n"
-"\t\t<p>Protocol B: write IO is reported as completed, if it has reached "
-"local disk and remote buffer cache.</p>\n"
-"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both "
-"local and remote disk.</p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
 "\t\t\t\t\t\t\t\t\t\t  \n"
 "\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
-"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node "
-"was a degraded cluster</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
 "\n"
-"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-"
-"error to the upper layers</p>\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
 "\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
-"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by "
-"DRBD</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
 "\n"
-"\t\t<p><b>timeout</b>: If the partner node fails to send an expected "
-"response packet within time 10ths of a second, the partner node is "
-"considered dead and therefore  the TCP/IP connection is abandoned. This must "
-"be lower than connect-int and ping-int. The default value is 60 = 6 seconds, "
-"the unit 0.1 seconds.</p>\n"
-"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-"
-"alive packet. In case the peer's reply is not received within this time "
-"period, it is considered as dead. The default value is 500ms, the default "
-"unit is 100ms</p>\n"
-"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive "
-"packet</p>\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore  the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
 "\n"
-"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two "
-"write barriers</p>\n"
-"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write "
-"request for count times the timeout, it is expelled from the cluster. The "
-"default value is 0, which disables this feature.</p>\n"
-"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top "
-"of DRBD, it is possible to limit the bandwidth which may be used by "
-"background synchronizations. The default is 250 KB/sec, the default unit is "
-"KB/sec.</p>\n"
-"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= "
-"active set) can get. The default number of extents is 127. (Minimum: 7, "
-"Maximum: 3843)</p>\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
 "\t\t"
 
 #: src/include/drbd/helps.rb:113
@@ -389,53 +330,27 @@
 msgid ""
 "\n"
 "\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
-"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the "
-"LVM configuration file and to remove stale cache entries on the nodes.</p>\t"
-"\t<p>Refer to 'man lvm.conf' for further information including the file "
-"layout.</p>\n"
+"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n"
 "\t\t\t\t\t\t\t\t\t\t  \n"
-"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the "
-"list of devices LVM scans for Physical Volume signatures. This way, LVM is "
-"instructed to read Physical Volume signatures from DRBD devices, rather than "
-"from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: "
-"According to the configuration of drbd, LVM filter will always be changed "
-"automatically. To change it manually, disable the checkbox of AutoFilter.\n"
-"\t\t<p>The filter consists of an array of regular expressions. These "
-"expressions can be delimited by a character of your choice, and prefixed "
-"with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, "
-"setting filter as [\"r|/dev/sda.*|\"]</p>\n"
+"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n"
+"\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n"
 "\n"
-"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. "
-"Should disable the LVM cache when combined drbd with LVM.</p>\n"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
 "\n"
-"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata "
-"and PV state flags are obtained from the lvmetad instance and no scanning is "
-"done by the individual commands. Because lvmetad's cache cannot be "
-"synchronized between nodes, users are advised to disable lvmetad in cluster "
-"environments.</p>\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
 "\n"
 "\t\t"
 msgstr ""
 "\n"
 "\t\t<p><b>LVM 配置文件 /etc/lvm/lvm.conf</b></p>\n"
-"\t\t<p>要在 DRBD 中使用 LVM，必须修改 LVM 配置文件中的一些选项并移除节点上的"
-"旧缓存项。</p>\t\t<p>更多消息，包括文件布局，请参考 'man lvm.conf'。</p>\n"
+"\t\t<p>要在 DRBD 中使用 LVM，必须修改 LVM 配置文件中的一些选项并移除节点上的旧缓存项。</p>\t\t<p>更多消息，包括文件布局，请参考 'man lvm.conf'。</p>\n"
 "\t\t\t\t\t\t\t\t\t\t  \n"
-"\t\t<p><b>设备过滤器</b>：这标记了来自 LVM 扫描物理卷签名得到的设备列表的底层"
-"块设备。通过这种方式，引导 LVM 从 DRBD 设备读取物理卷签名，而不是从底层后备块设备"
-"读取。</p>\t\t<p><b>自动过滤器</b>：根据 DRBD 的配置，LVM 过滤器将总是自动修"
-"改的。要手动修改，请禁用自动过滤器复选框。</p>\n"
-"\t\t<p>过滤器由一个正则表达式数组组成。这些表达式可由您选择的一个字符分隔，并"
-"带有 'a' (接受) 或 'r' (拒绝) 前缀。</p>\t\t<p>例如，这样设置过滤器 [\"r|/"
-"dev/sda.*|\"]</p>\n"
+"\t\t<p><b>设备过滤器</b>：这标记了来自 LVM 扫描物理卷签名得到的设备列表的底层块设备。通过这种方式，引导 LVM 从 DRBD 设备读取物理卷签名，而不是从底层后备块设备读取。</p>\t\t<p><b>自动过滤器</b>：根据 DRBD 的配置，LVM 过滤器将总是自动修改的。要手动修改，请禁用自动过滤器复选框。</p>\n"
+"\t\t<p>过滤器由一个正则表达式数组组成。这些表达式可由您选择的一个字符分隔，并带有 'a' (接受) 或 'r' (拒绝) 前缀。</p>\t\t<p>例如，这样设置过滤器 [\"r|/dev/sda.*|\"]</p>\n"
 "\n"
-"\t\t<p><b>LVM 缓存</b>：启用/开启写入 LVM 缓存是默认的。当混合使用 DRBD 和 LVM 时"
-"应禁用 LVM 缓存。</p>\n"
+"\t\t<p><b>LVM 缓存</b>：启用/开启写入 LVM 缓存是默认的。当混合使用 DRBD 和 LVM 时应禁用 LVM 缓存。</p>\n"
 "\n"
-"\t\t<p><b>LVMetad</b>：当启用了 lvmetad 时，卷组元数据和 PV 状态旗标是从 lvmetad 实例"
-"获取的，个别命令不会执行扫描。因为 lvmetad 的缓存无法在节点间同步，建议用户在集群环境"
-"中禁用 lvmetad。</p>\n"
+"\t\t<p><b>LVMetad</b>：当启用了 lvmetad 时，卷组元数据和 PV 状态旗标是从 lvmetad 实例获取的，个别命令不会执行扫描。因为 lvmetad 的缓存无法在节点间同步，建议用户在集群环境中禁用 lvmetad。</p>\n"
 "\n"
 "\t\t"
 
@@ -444,27 +359,21 @@
 msgstr "<p><b><big>分布式复制块设备 (DRBD) 全局配置</big></b></p>"
 
 #: src/include/drbd/helps.rb:136
-msgid ""
-"<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's "
-"sanity check</p>"
+msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
 msgstr "<p>勾选<b>\"禁用 IP 验证\"</b>来禁用 drbdadm 的一个合理性检查</p>"
 
 #: src/include/drbd/helps.rb:139
 msgid ""
-"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it "
-"waited so\n"
+"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n"
 "                far. You might want to disable this if you have the console\n"
 "                of your server connected to a serial terminal server with\n"
 "                limited logging capacity.\n"
-"                The Dialog will print the count each 'dialog-refresh' "
-"seconds,\n"
+"                The Dialog will print the count each 'dialog-refresh' seconds,\n"
 "                set it to 0 to disable redrawing completely. </p>"
 msgstr ""
 "<p><b>对话框刷新：</b> 用户对话框计数并显示当前等待的秒数。\n"
-"                若您服务器的终端连接到了一个日志功能有限的串行终端服务器上，"
-"您可能想要禁用此功能。\n"
-"                该对话框每到 '对话框刷新' 秒数时将打印计数，设为 0 将完全禁用"
-"重绘功能。</p>"
+"                若您服务器的终端连接到了一个日志功能有限的串行终端服务器上，您可能想要禁用此功能。\n"
+"                该对话框每到 '对话框刷新' 秒数时将打印计数，设为 0 将完全禁用重绘功能。</p>"
 
 #: src/include/drbd/helps.rb:147
 msgid ""
@@ -475,8 +384,7 @@
 "           as configured mentioned in this file. </p>"
 msgstr ""
 "<p><b>最少次数：</b>\n"
-"            若您想要稍后不用重新加载模块            就定义更多资源，请使用此"
-"选项。\n"
+"            若您想要稍后不用重新加载模块            就定义更多资源，请使用此选项。\n"
 "            默认在加载模块时会加载此文件            中配置的全部设备。</p>"
 
 #. Summary dialog help 1/3
@@ -614,67 +522,86 @@
 msgstr "警告！集群不应使用 lvmetad。"
 
 #. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:143
+#: src/include/drbd/resource_conf.rb:144
 msgid "Resource Name"
 msgstr "资源名称"
 
-#: src/include/drbd/resource_conf.rb:150
+#: src/include/drbd/resource_conf.rb:151
 msgid "Nodes"
 msgstr "节点"
 
-#: src/include/drbd/resource_conf.rb:153
+#: src/include/drbd/resource_conf.rb:154
 msgid "Add"
 msgstr "添加"
 
-#: src/include/drbd/resource_conf.rb:154
+#: src/include/drbd/resource_conf.rb:155
 msgid "Edit"
 msgstr "编辑"
 
-#: src/include/drbd/resource_conf.rb:155
+#: src/include/drbd/resource_conf.rb:156
 msgid "Delete"
 msgstr "删除"
 
-#: src/include/drbd/resource_conf.rb:187
+#: src/include/drbd/resource_conf.rb:188
 msgid "Save"
 msgstr "保存"
 
 #. Since n_name can't be edit, so set direct is OK
-#: src/include/drbd/resource_conf.rb:329
+#: src/include/drbd/resource_conf.rb:336
 msgid "Protocol"
 msgstr "协议"
 
 #. return `cancel or a string
-#: src/include/drbd/resource_conf.rb:569
+#: src/include/drbd/resource_conf.rb:560
 msgid "OK"
 msgstr "好的"
 
-#: src/include/drbd/resource_conf.rb:570
+#: src/include/drbd/resource_conf.rb:561
 msgid "Cancel"
 msgstr "取消"
 
-#: src/include/drbd/resource_conf.rb:584
+#: src/include/drbd/resource_conf.rb:575
 msgid "Node name can not be empty."
 msgstr "节点名称不能为空。"
 
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
 #. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:687
+#: src/include/drbd/resource_conf.rb:719
 msgid "Node names must not include \".\" , using the local hostname."
 msgstr "节点名称必须不包含 \".\"，使用本机主机名。"
 
-#: src/include/drbd/resource_conf.rb:707
+#: src/include/drbd/resource_conf.rb:739
 msgid "Please fill out all fields."
 msgstr "请填写全部字段。"
 
-#: src/include/drbd/resource_conf.rb:716
+#: src/include/drbd/resource_conf.rb:754
 msgid "Please configure at least two nodes."
 msgstr "请配置至少两个节点。"
 
 #. No need to check integrity since it will disabled when configuring
-#: src/include/drbd/resource_conf.rb:751
+#: src/include/drbd/resource_conf.rb:789
 msgid "Enter the node name:"
 msgstr "输入节点名称："
 
-#: src/include/drbd/resource_conf.rb:757
+#: src/include/drbd/resource_conf.rb:795
 msgid "Node name must be different."
 msgstr "节点名称必须不同。"
 
@@ -779,70 +706,70 @@
 #.
 #. Representation of the configuration of drbd.
 #. Input and output routines.
-#: src/modules/Drbd.rb:115
+#: src/modules/Drbd.rb:114
 msgid "Failed to merge separated DRBD conf files\n"
 msgstr "合并独立的 DRBD 配置文件失败\n"
 
-#: src/modules/Drbd.rb:137
+#: src/modules/Drbd.rb:136
 msgid "Failed to write drbd.conf.YaST2prepare"
 msgstr "写入 drbd.conf.YaST2prepare 失败"
 
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:192
+#: src/modules/Drbd.rb:191
 msgid "Initializing DRBD Configuration"
 msgstr "正在初始化分布式复制块设备 (DRBD) 配置"
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:199
 msgid "Read global settings"
 msgstr "读取全局设置"
 
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:200
 msgid "Read resources"
 msgstr "读取资源"
 
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:201
 msgid "Read LVM configurations"
 msgstr "读取 LVM 配置"
 
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:202
 msgid "Read daemon status"
 msgstr "读取守护程序状态"
 
-#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
 msgid "Read SuSEFirewall Settings"
 msgstr "读取 SuSEFirewall 设置。"
 
-#: src/modules/Drbd.rb:207
+#: src/modules/Drbd.rb:206
 msgid "Reading global settings..."
 msgstr "正在读取全局设置..."
 
-#: src/modules/Drbd.rb:208
+#: src/modules/Drbd.rb:207
 msgid "Reading resources..."
 msgstr "正在读取资源..."
 
-#: src/modules/Drbd.rb:209
+#: src/modules/Drbd.rb:208
 msgid "Reading LVM configurations..."
 msgstr "正在读取 LVM 配置..."
 
-#: src/modules/Drbd.rb:210
+#: src/modules/Drbd.rb:209
 msgid "Reading daemon status..."
 msgstr "正在读取守护程序状态..."
 
-#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
 msgid "Finished"
 msgstr "已完成"
 
 #. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:515
+#: src/modules/Drbd.rb:514
 msgid "Failed to backup drbd.conf"
 msgstr "备份 drbd.conf 失败"
 
-#: src/modules/Drbd.rb:524
+#: src/modules/Drbd.rb:523
 msgid "Failed to clean drbd.conf for drbdadm test"
 msgstr "清理 drbd.conf 以进行 drbdadm 测试失败"
 
-#: src/modules/Drbd.rb:548
+#: src/modules/Drbd.rb:547
 msgid ""
 "Invalid configuration of resource %1\n"
 "%2"
@@ -850,12 +777,12 @@
 "无效的资源配置 %1\n"
 "%2"
 
-#: src/modules/Drbd.rb:567
+#: src/modules/Drbd.rb:566
 msgid "Failed to bring drbd.conf back"
 msgstr "恢复 drbd.conf 失败"
 
 #. DRBD write dialog caption
-#: src/modules/Drbd.rb:638
+#: src/modules/Drbd.rb:637
 msgid "Writing DRBD Configuration"
 msgstr "正在写入分布式复制块设备 (DRBD) 配置"
 
@@ -863,47 +790,47 @@
 #. won't change modified flag
 #. return true if !@modified
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:650
+#: src/modules/Drbd.rb:649
 msgid "Write global settings"
 msgstr "写入全局设置"
 
-#: src/modules/Drbd.rb:651
+#: src/modules/Drbd.rb:650
 msgid "Write resources"
 msgstr "写入资源"
 
-#: src/modules/Drbd.rb:652
+#: src/modules/Drbd.rb:651
 msgid "Write LVM configurations"
 msgstr "写入 LVM 配置"
 
-#: src/modules/Drbd.rb:653
+#: src/modules/Drbd.rb:652
 msgid "Set daemon status"
 msgstr "设置守护程序状态"
 
-#: src/modules/Drbd.rb:654
+#: src/modules/Drbd.rb:653
 msgid "Write the SuSEfirewall settings"
 msgstr "写入 SuSEfirewall 设置"
 
-#: src/modules/Drbd.rb:657
+#: src/modules/Drbd.rb:656
 msgid "Writing global settings..."
 msgstr "正在写入全局设置..."
 
-#: src/modules/Drbd.rb:658
+#: src/modules/Drbd.rb:657
 msgid "Writing resources..."
 msgstr "正在写入资源..."
 
-#: src/modules/Drbd.rb:659
+#: src/modules/Drbd.rb:658
 msgid "Writing LVM configurations..."
 msgstr "正在写入 LVM 配置..."
 
-#: src/modules/Drbd.rb:660
+#: src/modules/Drbd.rb:659
 msgid "Setting daemon status..."
 msgstr "正在设置守护程序状态..."
 
-#: src/modules/Drbd.rb:661
+#: src/modules/Drbd.rb:660
 msgid "Writing the SuSEFirewall settings"
 msgstr "正在写入 SuSEFirewall 设置..."
 
-#: src/modules/Drbd.rb:672
+#: src/modules/Drbd.rb:671
 msgid "Failed to make directory /etc/drbd.d"
 msgstr "创建文件夹 /etc/drbd.d 失败"
 

Modified: trunk/yast/zh_CN/po/fcoe-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/fcoe-client.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/fcoe-client.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2014-06-11 13:33+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -528,33 +528,33 @@
 msgstr "<p>现在安装它吗？</p>"
 
 #. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
 msgid "Cannot start service 'lldpad'"
 msgstr "无法启动服务 'lldpad'"
 
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
 msgid "Cannot start service 'fcoe'"
 msgstr "无法启动服务 'fcoe'"
 
 #. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
 msgid "Cannot start lldpad systemd socket"
 msgstr "无法启动 lldpad systemd 套接字"
 
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
 msgid "Cannot start lldpad service."
 msgstr "无法启动 lldpad 服务。"
 
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
 msgid "Cannot start fcoemon systemd socket."
 msgstr "无法启动 fcoemon systemd 套接字。"
 
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
 msgid "Cannot start fcoe service."
 msgstr "无法启动 fcoe 服务。"
 
 #. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
 msgid ""
 "Cannot read config file for %1.\n"
 "You may edit the settings and recreate the FCoE\n"
@@ -564,112 +564,112 @@
 "您或许可以编辑设置并重新创建以太网光纤通道 (FCoE) 虚拟局域网接口以获得一个有效的配置。"
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
 msgid "Initializing fcoe-client Configuration"
 msgstr "正在初始化以太网光纤通道 (FCoE) 客户端配置"
 
 #. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
 msgid "Check installed packages"
 msgstr "检查已安装软件包"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
 msgid "Check services"
 msgstr "检查服务"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
 msgid "Detect network cards"
 msgstr "检测网卡"
 
 #. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
 msgid "Read /etc/fcoe/config"
 msgstr "读取 /etc/fcoe/config"
 
 #. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
 msgid "Checking for installed packages..."
 msgstr "正在检查已安装软件包..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
 msgid "Checking for services..."
 msgstr "正在检查服务..."
 
 #. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
 msgid "Detecting network cards..."
 msgstr "正在检测网卡..."
 
 #. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
 msgid "Reading /etc/fcoe/config"
 msgstr "正在读取 /etc/fcoe/config"
 
 #. Progress finished
 #. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
 msgid "Finished"
 msgstr "已完成"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
 msgid "Starting of services failed."
 msgstr "启动服务失败。"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
 msgid "Cannot detect devices."
 msgstr "无法检测设备。"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
 msgid "Cannot read /etc/fcoe/config."
 msgstr "无法读取 /etc/fcoe/config。"
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
 msgid "Saving fcoe-client Configuration"
 msgstr "正在保存以太网光纤通道 (FCoE) 客户端配置"
 
 #. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
 msgid "Write the settings"
 msgstr "写入设置"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
 msgid "Restart FCoE service"
 msgstr "重启以太网光纤通道 (FCoE) 服务"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
 msgid "Adjust start of services"
 msgstr "调整服务启动状态"
 
 #. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
 msgid "Writing the settings..."
 msgstr "正在写入设置..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
 msgid "Restarting FCoE service..."
 msgstr "正在重启以太网光纤通道 (FCoE) 服务..."
 
 #. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
 msgid "Adjusting start of services..."
 msgstr "正在调整服务启动状态..."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
 msgid "Cannot write settings to /etc/fcoe/config."
 msgstr "无法将设置写入 /etc/fcoe/config。"
 
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
 msgid ""
 "Cannot write settings for FCoE interfaces.\n"
 "For details, see /var/log/YaST2/y2log."
@@ -678,43 +678,43 @@
 "细节请参考 /var/log/YaST2/y2log。"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
 msgid "Restarting of service fcoe failed."
 msgstr "重启以太网光纤通道 (FCoE) 服务失败。"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
 msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
 msgstr "无法写入 /etc/sysconfig/network/ifcfg-files。"
 
 #. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
 msgid "<b>General FCoE configuration</b>"
 msgstr "<b>以太网光纤通道 (FCoE) 常规配置</b>"
 
 #. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
 msgid "<b>Interfaces</b>"
 msgstr "<b>接口</b>"
 
 #. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
 msgid "<i>Netcard</i>:"
 msgstr "<i>网卡</i>："
 
 #. nothing to translate here (abbreviation for
 #. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
 msgid "<b>Starting of services</b>"
 msgstr "<b>服务启动</b>"
 
 #. starting of service "fcoe" at boot time is enabled or disabled
 #. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
 msgid "enabled"
 msgstr "已启用"
 
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
 msgid "disabled"
 msgstr "已禁用"
 

Modified: trunk/yast/zh_CN/po/firewall.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/firewall.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/firewall.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: firewall\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2013-10-14 15:52+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: American English \n"
@@ -23,6 +23,16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
 #. TRANSLATORS: message popup
 #: src/clients/firewall_proposal.rb:113
 msgid ""
@@ -182,7 +192,7 @@
 #. TRANSLATORS: tree menu item
 #: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
 #: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
 msgid "Logging Level"
 msgstr "日志记录级别"
 
@@ -689,7 +699,7 @@
 #: src/include/firewall/subdialogs.rb:349
 #: src/include/firewall/subdialogs.rb:509
 #: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
 msgid "Source Network"
 msgstr "来源网络"
 
@@ -700,8 +710,8 @@
 #: src/include/firewall/subdialogs.rb:351
 #: src/include/firewall/subdialogs.rb:511
 #: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
 msgid "Protocol"
 msgstr "协议"
 
@@ -755,28 +765,28 @@
 #. TRANSLATORS: table header item, Req. == Requested
 #. TRANSLATORS: CommandLine table header item, Req.=Requested
 #: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
 msgid "Req. IP"
 msgstr "请求的 IP"
 
 #. TRANSLATORS: table header item, Req. == Requested
 #. TRANSLATORS: CommandLine table header item, Req.=Requested
 #: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
 msgid "Req. Port"
 msgstr "请求的端口"
 
 #. TRANSLATORS: table header item, Redir. == Redirect
 #. TRANSLATORS: CommandLine table header item, Redir.=Redirect
 #: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
 msgid "Redir. to IP"
 msgstr "重定向到 IP"
 
 #. TRANSLATORS: table header item, Redir. == Redirect
 #. TRANSLATORS: CommandLine table header item, Redir.=Redirect
 #: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
 msgid "Redir. to Port"
 msgstr "重定向到端口"
 
@@ -896,10 +906,10 @@
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
 #: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
 msgid "Zone"
 msgstr "区域"
 
@@ -1397,217 +1407,219 @@
 msgstr "选择要删除的项。"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
 msgid "Firewall configuration"
 msgstr "防火墻设置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
 msgid "Start-up settings"
 msgstr "启动设置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
 msgid "Known firewall zones"
 msgstr "已知防火墙区域"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
 msgid "Network interfaces configuration"
 msgstr "网络接口配置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
 msgid "Allowed services, ports, and protocols"
 msgstr "允许的服务、端口和协议"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
 msgid "Broadcast packet settings"
 msgstr "广播数据包设置"
 
 #. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
 msgid "Masquerading settings"
 msgstr "伪装设置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
 msgid "Redirect requests to masqueraded IP"
 msgstr "将请求重定向到伪装的 IP"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
 msgid "Logging settings"
 msgstr "日志记录设置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
 msgid "Firewall configuration summary"
 msgstr "防火墙配置摘要"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
 msgid "Enables firewall"
 msgstr "启用防火墙"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
 msgid "Disables firewall"
 msgstr "禁用防火墙"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
 msgid "Show current settings"
 msgstr "显示当前设置"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
 msgid "Start firewall in the boot process"
 msgstr "在引导过程中启动防火墙"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
 msgid "Start firewall manually"
 msgstr "手动启动防火墙"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
 msgid "List configured entries"
 msgstr "列出已经配置项"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
 msgid "Zone short name"
 msgstr "区域简称"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
 msgid "Add a new record"
 msgstr "添加新记录"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
 msgid "Remove a record"
 msgstr "删除记录"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
 msgid "Network interface configuration name"
 msgstr "网络接口配置名称"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
 msgid "Logging accepted packets (all|crit|none)"
 msgstr "记录接受的数据包 (all|crit|none)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
 msgid "Logging not accepted packets (all|crit|none)"
 msgstr "记录未接受的数据包 (all|crit|none)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
 msgid "Logging broadcast packets (yes|no)"
 msgstr "记录广播数据包 (yes|no)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
 msgid "Set value"
 msgstr "设置值"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
 msgid "Port name or number; comma-separate multiple ports"
 msgstr "端口名或端口号；逗号分隔的多个端口"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
 msgid "Known firewall service; comma-separate multiple services"
 msgstr "已知防火墙服务；逗号分隔的多个服务"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
 msgid "TCP port name or number; comma-separate multiple ports"
 msgstr "TCP 端口名或端口号；逗号分隔的多个端口"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
 msgid "UDP port name or number; comma-separate multiple ports"
 msgstr "UDP 端口名或端口号；逗号分隔的多个端口"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
 msgid "RPC port name; comma-separate multiple ports"
 msgstr "RPC 端口名；逗号分隔的多个端口"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
 msgid "IP protocol name; comma-separate multiple protocols"
 msgstr "IP 协议名；逗号分隔的多个协议"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
 msgid "Set zone protection (yes|no)"
 msgstr "设置区域保护 (yes|no)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
 msgid "Detailed information"
 msgstr "详细信息"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
 msgid "Enable option"
 msgstr "启用选项"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
 msgid "Disable option"
 msgstr "禁用选项"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
 msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
 msgstr "来源网络，例如 0/0 或 145.12.35.0/255.255.255.0"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
 msgid "Protocol (tcp|udp)"
 msgstr "协议 (tcp|udp)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
 msgid "Requested external IP (optional)"
 msgstr "请求的外部 IP(可选)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
 msgid "Requested port name or number"
 msgstr "请求的端口名或端口号"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
 msgid "Redirect to internal IP"
 msgstr "重定向到内部 IP"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
 msgid "Redirect to port on internal IP (optional)"
 msgstr "重定向到内部 IP 上的端口(可选)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
 msgid "Record number"
 msgstr "记录编号"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
 msgid "Use port names instead of port numbers"
 msgstr "使用端口名而不是端口号"
 
 #. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
 msgid "Unknown zone %1."
 msgstr "未知区域 %1。"
 
@@ -1620,180 +1632,180 @@
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
 msgid "Parameter %1 must be set."
 msgstr "必须设置参数 %1。"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
 msgid "Listing Known Firewall Zones:"
 msgstr "正在列出已知防火墙区域："
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
 msgid "Shortcut"
 msgstr "快捷键"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
 msgid "Zone Name"
 msgstr "区域名"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
 msgid "Summary:"
 msgstr "摘要："
 
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
 msgid "Only one parameter is allowed."
 msgstr "只允许一个参数。"
 
 #. TRANSLATORS: CommandLine header
 #. TRANSLATORS: CommandLine header
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
 msgid "Start-Up:"
 msgstr "启动："
 
 #. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
 msgid "Enabling firewall in the boot process..."
 msgstr "正在引导过程中启用防火墙..."
 
 #. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
 msgid "Removing firewall from the boot process..."
 msgstr "正在从引导过程中移除防火墙..."
 
 #. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
 msgid "Firewall is enabled in the boot process"
 msgstr "防火墙已在引导过程中启用"
 
 #. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
 msgid "Firewall needs manual starting"
 msgstr "防火墙需要手动启动"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
 msgid "Network Interfaces in Firewall Zones:"
 msgstr "防火墙区域中的网络接口："
 
 #. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
 msgid "Special firewall string"
 msgstr "特殊防火墙字符串"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
 msgid "Interface"
 msgstr "接口"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
 msgid "Device Name"
 msgstr "设备名"
 
 #. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
 msgid "Adding special string %1 into zone %2..."
 msgstr "正在将特殊字符串 %1 添加到区域 %2 中..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
 msgid "Adding interface %1 into zone %2..."
 msgstr "正在将接口 %1 添加到区域 %2 中..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
 msgid "Removing special string %1 from zone %2..."
 msgstr "正在将特殊字符串 %1 从区域 %2 中移除..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
 msgid "Removing interface %1 from zone %2..."
 msgstr "正在将接口 %1 从区域 %2 中移除..."
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
 msgid "Log all"
 msgstr "全部记录"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
 msgid "Log only critical"
 msgstr "只记录关键信息"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
 msgid "Do not log any"
 msgstr "不记录任何信息"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
 msgid "Global Logging Settings:"
 msgstr "全局日志记录设置："
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
 msgid "Rule Type"
 msgstr "规则类型"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
 msgid "Value"
 msgstr "值"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
 msgid "Accepted"
 msgstr "已接受"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
 msgid "Not accepted"
 msgstr "未接受"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
 msgid "Logging Broadcast Packets:"
 msgstr "记录广播数据包："
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
 msgid "Logging enabled"
 msgstr "日志记录已启用"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
 msgid "Logging disabled"
 msgstr "日志记录已禁用"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
 msgid "Short"
 msgstr "短"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
 msgid "Logging Status"
 msgstr "日志记录状态"
 
@@ -1802,168 +1814,181 @@
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
 msgid "Value %1 is not allowed for option %2."
 msgstr "选项 %2 不允许值 %1。"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
 msgid "Allowed Broadcast Ports:"
 msgstr "允许的广播端口："
 
 #. TRANSLATORS: CommandLine header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
 msgid "Port"
 msgstr "端口"
 
 #. TRANSLATORS: CommandLine error message
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
 msgid "Only one action command is allowed here."
 msgstr "这里只允许一个动作命令。"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
 msgid "Defined Firewall Services:"
 msgstr "已定义的防火墙服务："
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
 msgid "ID"
 msgstr "ID"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
 msgid "Service Name"
 msgstr "服务名称"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
 msgid "TCP port"
 msgstr "TCP 端口"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
 msgid "UDP port"
 msgstr "UDP 端口"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
 msgid "RPC port"
 msgstr "RPC 端口"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
 msgid "IP protocol"
 msgstr "IP 协议"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
 msgid "Allowed Services in Zones:"
 msgstr "区域中允许的服务："
 
 #. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
 msgid "All services"
 msgstr "全部服务"
 
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
 msgid "Entire zone unprotected"
 msgstr "整个区域不受保护"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
 msgid "Service ID"
 msgstr "服务 ID"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
 msgid "Additional Allowed Ports:"
 msgstr "额外允许的端口："
 
 #. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
 msgid "All ports"
 msgstr "全部端口"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
 msgid "Allowed Additional IP Protocols in Zones:"
 msgstr "区域中允许的额外 IP 协议："
 
 #. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
 msgid "All IP protocols"
 msgstr "全部 IP 协议"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
 msgid "IP Protocol"
 msgstr "IP 协议"
 
 #. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
 msgid "Unknown service %1."
 msgstr "未知服务 %1。"
 
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
 msgid "Protection can only be set for internal zones."
 msgstr "只能为内部区域设置保护。"
 
 #. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
 msgid "At least one of %1 must be set."
 msgstr "至少必须设置一个 %1。"
 
 #. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
 msgid "At least one action command from %1 must be set."
 msgstr "必须设置至少一个来自 %1 的动作命令。"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
 msgid "Redirect Requests to Masqueraded IP:"
 msgstr "将请求重定向到伪装的 IP："
 
 #. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
 msgid "Unknown port name %1."
 msgstr "未知端口名 %1。"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
 msgid "Masquerading Settings:"
 msgstr "伪装设置："
 
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
 #. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
 msgstr "伪装为 %1"
 
 #. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
 msgid "enabled"
 msgstr "已启用"
 
 #. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
 msgid "disabled"
 msgstr "已禁用"
 

Modified: trunk/yast/zh_CN/po/firstboot.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/firstboot.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/firstboot.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: firstboot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2013-02-03 00:40+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -121,13 +121,13 @@
 msgstr "标签"
 
 #: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "状态"
+
+#: src/clients/firstboot_config.rb:68
 msgid "Module Name"
 msgstr "模块名"
 
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "状态"
-
 #. translators: dialog text
 #: src/clients/firstboot_desktop.rb:90
 msgid ""
@@ -293,7 +293,7 @@
 "</p>\n"
 
 #. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
 msgid "There is not enough space to install all additional packages."
 msgstr "磁盘空间不足以安装全部的附加软件包。"
 

Modified: trunk/yast/zh_CN/po/fonts.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/fonts.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/fonts.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-01-17 14:12+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -20,71 +20,59 @@
 #. in case of changing profiles, please reflect
 #. edits in test/data/sysconfig.fonts-config.*
 #. otherwise testsuite will fail
-#: src/lib/fonts/fonts-config-state.rb:58
+#: src/lib/fonts/fonts-config-state.rb:59
 msgid "Bitmap Fonts"
 msgstr "点阵字体"
 
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
 msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed."
-msgstr ""
-"不像'轮廓字体' (通过曲线以数学方式描述的字体，其余方案选择)，'点阵字体'代表一组字体，容纳了每个字形和尺寸的位图。从而，每个字体只存在几种尺寸。它们渲"
-"染起来非常快，因为位图不需要计算，并且被认为是更加可读的，尤其在小尺寸环境 (甚至，某些轮廓字体还容纳了所谓的'嵌入点阵'，为小尺寸设计的其自身的点阵版本)"
-"。点阵字体使用黑白渲染，不能平滑。"
+msgstr "不像'轮廓字体' (通过曲线以数学方式描述的字体，其余方案选择)，'点阵字体'代表一组字体，容纳了每个字形和尺寸的位图。从而，每个字体只存在几种尺寸。它们渲染起来非常快，因为位图不需要计算，并且被认为是更加可读的，尤其在小尺寸环境 (甚至，某些轮廓字体还容纳了所谓的'嵌入点阵'，为小尺寸设计的其自身的点阵版本)。点阵字体使用黑白渲染，不能平滑。"
 
-#: src/lib/fonts/fonts-config-state.rb:106
+#: src/lib/fonts/fonts-config-state.rb:107
 msgid "Black and White Rendering"
 msgstr "黑白渲染"
 
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
 msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability."
-msgstr ""
-"使用黑白渲染、没有反锯齿 (灰阶平滑) 的字体。与平滑字体相比，它们更加可读，没有任何平滑带来的缺陷 (模糊或笔画粗细不均匀等)。针对删格化 (hint) "
-"良好的字体 (例如 Liberation 1 字体)，这一设置可在保持缩放性能的同时给出点阵质量的字体。"
+msgstr "使用黑白渲染、没有反锯齿 (灰阶平滑) 的字体。与平滑字体相比，它们更加可读，没有任何平滑带来的缺陷 (模糊或笔画粗细不均匀等)。针对删格化 (hint) 良好的字体 (例如 Liberation 1 字体)，这一设置可在保持缩放性能的同时给出点阵质量的字体。"
 
-#: src/lib/fonts/fonts-config-state.rb:126
+#: src/lib/fonts/fonts-config-state.rb:127
 msgid "Black and White Rendering for Monospaced Fonts"
 msgstr "针对等宽字体的黑白渲染"
 
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
 msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used."
 msgstr "等宽字体不使用平滑渲染，其它字体 (衬线体，无衬线体和未指定) 使用默认设置。使用默认字族偏好列表。"
 
-#: src/lib/fonts/fonts-config-state.rb:146
+#: src/lib/fonts/fonts-config-state.rb:147
 msgid "Default"
 msgstr "默认"
 
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
 msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)."
-msgstr ""
-"反锯齿平滑渲染字体。不像黑白渲染的字体，这一设置有时通过牺牲一定可读性可以生成 '漂亮的' 字体。已知有较好删格化指令的 TrueType "
-"字体将使用字节码解释器 (bytecode interpreter) 渲染，否则将使用 'hintslight' 删格化级别的 FreeType "
-"自动删格器 (autohinter)。使用字体原生的删格化指令可生成笔画较细的字形。将使用默认字族偏好列表 (目前偏好具有较好删格化指令的 "
-"TrueType 字体)。"
+msgstr "反锯齿平滑渲染字体。不像黑白渲染的字体，这一设置有时通过牺牲一定可读性可以生成 '漂亮的' 字体。已知有较好删格化指令的 TrueType 字体将使用字节码解释器 (bytecode interpreter) 渲染，否则将使用 'hintslight' 删格化级别的 FreeType 自动删格器 (autohinter)。使用字体原生的删格化指令可生成笔画较细的字形。将使用默认字族偏好列表 (目前偏好具有较好删格化指令的 TrueType 字体)。"
 
-#: src/lib/fonts/fonts-config-state.rb:166
+#: src/lib/fonts/fonts-config-state.rb:167
 msgid "CFF Fonts"
 msgstr "CFF 字体"
 
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
 msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs."
-msgstr ""
-"考虑到 Adobe 对 FreeType 库的贡献，紧凑字体格式 (CFF) 的字体可被认为是在渲染出字形的可读性和平滑度之间折中得比较好的字体。"
+msgstr "考虑到 Adobe 对 FreeType 库的贡献，紧凑字体格式 (CFF) 的字体可被认为是在渲染出字形的可读性和平滑度之间折中得比较好的字体。"
 
-#: src/lib/fonts/fonts-config-state.rb:209
+#: src/lib/fonts/fonts-config-state.rb:210
 msgid "Exclusive Autohinter Rendering"
 msgstr "仅使用自动删格器渲染"
 
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
 msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used."
-msgstr ""
-"不像默认方案，即使针对删格化良好的字体也使用 FreeType 的自动删格器 (使用 'hintslight' 级别)。这将生成更厚实，但有时也更模糊 "
-"(因此可读性更差) 的字形。将使用默认字族偏好列表。"
+msgstr "不像默认方案，即使针对删格化良好的字体也使用 FreeType 的自动删格器 (使用 'hintslight' 级别)。这将生成更厚实，但有时也更模糊 (因此可读性更差) 的字形。将使用默认字族偏好列表。"
 
-#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
 msgid "Subpixel Rendering"
 msgstr "次像素渲染"
 
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
 msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
 msgstr "使用 LCD 显示器的次像素渲染功能。需要启用了次像素渲染的 FreeType 库。"
 
@@ -471,9 +459,7 @@
 
 #: src/lib/fonts/fonts-dialog.rb:1090
 msgid "<p>In the default setting, FreeType's autohinter can be used depending on font type and quality of own instructions. Use of autohinter can be forced by <b>Force Autohinting On</b> option.</p>"
-msgstr ""
-"<p>默认设置中，FreeType 的自动删格器的使用取决于字体类型和原生删格化指令质量。可通过<b>强制开启自动删格化</b>选项强制使用自动删格器。<"
-"/p>"
+msgstr "<p>默认设置中，FreeType 的自动删格器的使用取决于字体类型和原生删格化指令质量。可通过<b>强制开启自动删格化</b>选项强制使用自动删格器。</p>"
 
 #: src/lib/fonts/fonts-dialog.rb:1094
 msgid "<p>For each hinting algorithm, hint style (hinting level) is chosen."
@@ -489,8 +475,7 @@
 
 #: src/lib/fonts/fonts-dialog.rb:1102
 msgid "<p>Some outline fonts contain so called bitmap strikes, i. e. bitmap version of given font for certain sizes. In this section it can be turned off entirely, on only for fonts which cover specified languages, or on for every font."
-msgstr ""
-"<p>某些轮廓字体也包含了所谓的点阵笔画，即给定字体特定尺寸的点阵版本。在这里可以将之完全关闭，仅针对覆盖指定语言的字体开启，或针对每个字体都开启。"
+msgstr "<p>某些轮廓字体也包含了所谓的点阵笔画，即给定字体特定尺寸的点阵版本。在这里可以将之完全关闭，仅针对覆盖指定语言的字体开启，或针对每个字体都开启。"
 
 #: src/lib/fonts/fonts-dialog.rb:1109
 msgid "<h3>Subpixel Rendering</h3>"
@@ -542,9 +527,7 @@
 
 #: src/lib/fonts/fonts-dialog.rb:1131
 msgid "<p>System will look for the first <b>installed</b> family in the list, other query elements taking into account of course. Available font packages for SUSE distributions can be browsed and installed from <b>fontinfo.opensuse.org.</b></p>"
-msgstr ""
-"<p>系统将在列表中查找第一个<b>已安装</b>字族，当然也考虑其它查询元素。可至 <b>fontinfo.opensuse.org</b> 浏览和安装 "
-"SUSE 发行版可用的字体软件包。</p>"
+msgstr "<p>系统将在列表中查找第一个<b>已安装</b>字族，当然也考虑其它查询元素。可至 <b>fontinfo.opensuse.org</b> 浏览和安装 SUSE 发行版可用的字体软件包。</p>"
 
 #: src/lib/fonts/fonts-dialog.rb:1138
 msgid "<h3>Forcing Family Preferences</h3>"
@@ -576,8 +559,7 @@
 
 #: src/lib/fonts/fonts-dialog.rb:1150
 msgid "<p>When checked, this option introduces very strong position for here defined preference lists. It pushes families from there before document or GUI requests, if they cover required charset.</p>"
-msgstr ""
-"<p>当勾选后，该选项将为这里定义的偏好列表引入非常强的分量。若字族涵盖了所需字符集，该选项会在文档或图形界面请求字族前就从列表中推送字族。</p>"
+msgstr "<p>当勾选后，该选项将为这里定义的偏好列表引入非常强的分量。若字族涵盖了所需字符集，该选项会在文档或图形界面请求字族前就从列表中推送字族。</p>"
 
 #. delete families, that are part of list for some alias
 #: src/lib/fonts/fpl-add-dialog.rb:57
@@ -608,5 +590,3 @@
 #: src/lib/fonts/select-ebl-dialog.rb:240
 msgid "&Languages"
 msgstr "语言(&L)"
-
-

Modified: trunk/yast/zh_CN/po/geo-cluster.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/geo-cluster.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/geo-cluster.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-05 23:46+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -60,8 +60,8 @@
 #.
 #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
 #. Initialization dialog caption
-#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:470
-#: src/include/geo-cluster/dialogs.rb:819 src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
 #: src/include/geo-cluster/wizards.rb:141
 msgid "Geo Cluster Configuration"
 msgstr "地理集群配置"
@@ -113,17 +113,17 @@
 msgstr "仲裁主机"
 
 #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:809
+#: src/include/geo-cluster/dialogs.rb:819
 msgid "Add"
 msgstr "添加"
 
 #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:810
+#: src/include/geo-cluster/dialogs.rb:820
 msgid "Edit"
 msgstr "编辑"
 
 #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:811
+#: src/include/geo-cluster/dialogs.rb:821
 msgid "Delete"
 msgstr "删除"
 
@@ -169,15 +169,11 @@
 msgstr "要写入到不同的文件夹，请输入一个绝对路径。"
 
 #: src/include/geo-cluster/dialogs.rb:142
-msgid ""
-"For a newly created geo cluster, push the button below to generate /etc/"
-"booth/<key>."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
 msgstr "对于新创建的地理集群，请按下面按钮来生成 /etc/booth/<key>。"
 
 #: src/include/geo-cluster/dialogs.rb:147
-msgid ""
-"To join a existing geo cluster, please copy /etc/booth/<key> from other "
-"nodes manually."
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
 msgstr "要加入一个已有地理集群，请从其它节点手动复制 /etc/booth/<key>。"
 
 #: src/include/geo-cluster/dialogs.rb:151
@@ -254,86 +250,86 @@
 msgstr "票据不能为空"
 
 #. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:412 src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
 msgid "Firewall Configuration"
 msgstr "防火墙配置"
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:559
+#: src/include/geo-cluster/dialogs.rb:569
 msgid "Enter an IP address of your arbitrator"
 msgstr "请输入一个您的仲裁主机的 IP 地址"
 
-#: src/include/geo-cluster/dialogs.rb:570
+#: src/include/geo-cluster/dialogs.rb:580
 msgid "Edit IP address of your arbitrator"
 msgstr "编辑您仲裁主机的 IP 地址"
 
-#: src/include/geo-cluster/dialogs.rb:586
+#: src/include/geo-cluster/dialogs.rb:596
 msgid "Enter an IP address of your site"
 msgstr "请输入您站点的 IP 地址"
 
-#: src/include/geo-cluster/dialogs.rb:597
+#: src/include/geo-cluster/dialogs.rb:607
 msgid "Edit IP address of your site"
 msgstr "编辑您站点的 IP 地址"
 
-#: src/include/geo-cluster/dialogs.rb:619
+#: src/include/geo-cluster/dialogs.rb:629
 msgid "Ticket name already exist!"
 msgstr "票据名称已存在！"
 
 #. Validation check before switch to authentication
 #. Still fall to :authentication or :ok
-#: src/include/geo-cluster/dialogs.rb:651
+#: src/include/geo-cluster/dialogs.rb:661
 msgid "Configuration name can not be empty."
 msgstr "配置名称不能为空。"
 
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:664
 msgid "Configuration name can not be duplicated."
 msgstr "无法复制配置名称。"
 
 #. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:662
+#: src/include/geo-cluster/dialogs.rb:672
 msgid "port is invalid!"
 msgstr "端口无效！"
 
-#: src/include/geo-cluster/dialogs.rb:668
+#: src/include/geo-cluster/dialogs.rb:678
 msgid "transport have to be filled!"
 msgstr "必须填写「传输」！"
 
 #. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:684
 msgid "arbitrator have to be filled!"
 msgstr "必须填写仲裁主机！"
 
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:689
 msgid "site have to be filled!"
 msgstr "必须填写「站点」！"
 
-#: src/include/geo-cluster/dialogs.rb:684
+#: src/include/geo-cluster/dialogs.rb:694
 msgid "ticket have to be filled!"
 msgstr "必须填写票据！"
 
 #. Validation check before switch to basic
 #. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:738
+#: src/include/geo-cluster/dialogs.rb:748
 msgid "Failed to create authentication file "
 msgstr "创建认证文件失败"
 
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:751
 msgid "Authentication file "
 msgstr "认证文件"
 
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:751
 msgid " created successfully."
 msgstr "创建成功。"
 
 #. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:800
+#: src/include/geo-cluster/dialogs.rb:810
 msgid "GeoCluster Configuration Select"
 msgstr "地理集群配置选择"
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:816
 msgid "Choose configuration file:"
 msgstr "请选择配置文件："
 
@@ -486,9 +482,7 @@
 msgid "Configuration summary ..."
 msgstr "配置摘要 ..."
 
-#~ msgid ""
-#~ "A relative path will be saved in /etc/booth, or using absolute path "
-#~ "directly."
+#~ msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
 #~ msgstr "相对路径将被保存在 /etc/booth 中，或直接使用绝对路径。"
 
 #~ msgid "Succeed to created authentification file "

Modified: trunk/yast/zh_CN/po/installation.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/installation.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/installation.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: installation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-06 00:08+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -114,29 +114,29 @@
 "与手册中的屏幕有所不同。\n"
 
 #. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
 msgid "Start service %1"
 msgstr "启动服务 %1"
 
 #. TRANSLATORS: progress stage, %1 stands for service name
 #. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
 #: src/lib/installation/clients/inst_restore_settings.rb:47
 msgid "Starting service %1..."
 msgstr "正在启动服务 %1..."
 
 #. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
 msgid "Adjusting Network Settings"
 msgstr "正在调整网络设置"
 
 #. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
 msgid "Network settings are being adjusted."
 msgstr "正在调整网络设置。"
 
 #. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
 msgid ""
 "The previous installation has failed.\n"
 "Would you like it to continue?\n"
@@ -149,7 +149,7 @@
 "注意：您可能需要再次输入一些信息。"
 
 #. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
 msgid ""
 "The previous installation has been aborted.\n"
 "Would you like it to continue?\n"
@@ -164,7 +164,7 @@
 #. popup headline (#x1)
 #. TRANSLATORS: starting the installation process
 #. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
 #: src/lib/installation/clients/inst_doit.rb:60
 msgid "Starting Installation..."
 msgstr "正在启动安装..."
@@ -263,12 +263,8 @@
 
 #. TRANSLATORS: help text
 #: src/lib/installation/cio_ignore.rb:102
-msgid ""
-"<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to "
-"such devices which will reduce kernel memory footprint.</p>"
-msgstr ""
-"<p>若您想要为某些设备创建黑名单通道以降低内核内存占用，请使用<b>屏蔽设备。</p>"
+msgid "<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to such devices which will reduce kernel memory footprint.</p>"
+msgstr "<p>若您想要为某些设备创建黑名单通道以降低内核内存占用，请使用<b>屏蔽设备</b>。</p>"
 
 #. progress step title
 #: src/lib/installation/cio_ignore.rb:157
@@ -276,7 +272,7 @@
 msgstr "正在屏蔽设备..."
 
 #. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:82
+#: src/lib/installation/clients/copy_files_finish.rb:83
 msgid "Copying files to installed system..."
 msgstr "正在将文件复制到安装好的系统..."
 
@@ -304,9 +300,7 @@
 msgstr "从映像安装"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:121
-msgid ""
-"Here you can choose to use Novell pre-defined images to speed up RPM "
-"installation."
+msgid "Here you can choose to use Novell pre-defined images to speed up RPM installation."
 msgstr "在此您可以选择使用 Novell 预制映像来加速 RPM 安装。"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:135
@@ -318,9 +312,7 @@
 msgstr "不从映像安装(&D)"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:155
-msgid ""
-"Custom images deployment - this needs a URL to be configured as installation "
-"source"
+msgid "Custom images deployment - this needs a URL to be configured as installation source"
 msgstr "自定义映像部署 - 这需要配置一个 URL 作为安装来源"
 
 #. Image name, Image location
@@ -329,15 +321,11 @@
 msgstr "在此您可以创建自定义映像。\n"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:165
-msgid ""
-"You have to configure the software selection first before you can create an "
-"image here"
+msgid "You have to configure the software selection first before you can create an image here"
 msgstr "您必须先配置软件选集才能在此创建映像"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:176
-msgid ""
-"Create an image file (AutoYaST will fetch it from the given location during "
-"installation)"
+msgid "Create an image file (AutoYaST will fetch it from the given location during installation)"
 msgstr "创建一个映像文件 (AutoYaST 将在安装时从给定位置撷取它)"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:183
@@ -363,8 +351,7 @@
 msgid ""
 "<p><b>Installation from Images</b> is used to speed the installation up.\n"
 "Images contain compressed snapshots of an installed system matching your\n"
-"selection of patterns. The rest of the packages which are not contained in "
-"the\n"
+"selection of patterns. The rest of the packages which are not contained in the\n"
 "images will be installed from packages the standard way.</p>\n"
 msgstr ""
 "<p><b>从映像安装</b>用于加快安装速度。\n"
@@ -374,12 +361,9 @@
 #: src/lib/installation/clients/deploy_image_auto.rb:235
 msgid ""
 "<p><b>Creating own Images</b> is used if you\n"
-"want to skip the complete step of RPM installation. Instead AutoYaST will "
-"dump an\n"
-"image on the harddisk which is a lot faster and can be pre-configured "
-"already.\n"
-"Everything else than RPM installation is done like during a normal auto-"
-"installation.</p>"
+"want to skip the complete step of RPM installation. Instead AutoYaST will dump an\n"
+"image on the harddisk which is a lot faster and can be pre-configured already.\n"
+"Everything else than RPM installation is done like during a normal auto-installation.</p>"
 msgstr ""
 "<p>若您想要跳过整个 RPM 安装步骤可使用<b>创建自用映像</b>。\n"
 "AutoYaST 将转储一个安装更快、可预配置好的映像到硬盘。\n"
@@ -393,13 +377,9 @@
 #. TRANSLATORS: help text
 #: src/lib/installation/clients/deploying_proposal.rb:76
 msgid ""
-"<p>Note that when installing from images, the time stamps of all packages "
-"originating from the images will\n"
-"not match the installation date but rather the date the image was created."
-msgstr ""
-"<p>注意当从映像安装时，全部源自映像的软件包的时间戳记将不会匹配安装日期，而是"
-"映像创建日期。</p>"
+"<p>Note that when installing from images, the time stamps of all packages originating from the images will\n"
+"not match the installation date but rather the date the image was created.</p>"
+msgstr "<p>注意当从映像安装时，全部源自映像的软件包的时间戳记将不会匹配安装日期，而是映像创建日期。</p>"
 
 #. TRANSLATORS: help text
 #: src/lib/installation/clients/deploying_proposal.rb:80
@@ -482,7 +462,7 @@
 msgstr "%1 的更新 %2"
 
 #: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:306
+#: src/lib/installation/clients/inst_system_analysis.rb:321
 msgid "Unknown Product"
 msgstr "未知产品"
 
@@ -523,14 +503,14 @@
 #. 7 = Failed to connect to host.
 #. 28 = Operation timeout.
 #. push button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
 #: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:319
 msgid "Re&lease Notes..."
 msgstr "版本资讯(&L)..."
 
 #. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:169
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
 msgid ""
 "<p>\n"
 "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -543,12 +523,11 @@
 
 #. help text, continued
 #. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:177
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
 msgid ""
 "<p>\n"
 "The license must be accepted before the installation continues.\n"
-"Use <b>License Translations...</b> to show the license in all available "
-"translations.\n"
+"Use <b>License Translations...</b> to show the license in all available translations.\n"
 "</p>\n"
 msgstr ""
 "<P>\n"
@@ -557,7 +536,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
 msgid ""
 "<p>\n"
 "Click <b>Next</b> to proceed to the next dialog.\n"
@@ -568,7 +547,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:190
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
 msgid ""
 "<p>\n"
 "Nothing will happen to your computer until you confirm\n"
@@ -580,7 +559,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:197
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
 msgid ""
 "<p>\n"
 "Select <b>Abort</b> to abort the\n"
@@ -592,44 +571,51 @@
 "</p>\n"
 
 #. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:213
-#: src/lib/installation/clients/inst_complex_welcome.rb:415
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
 msgid "License Agreement"
 msgstr "许可协议"
 
 #. combo box label
 #. combobox
 #. TRANSLATORS: Combo box
-#: src/lib/installation/clients/inst_complex_welcome.rb:237
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
 #: src/lib/installation/clients/inst_release_notes.rb:217
-#: src/lib/installation/clients/inst_release_notes.rb:431
+#: src/lib/installation/clients/inst_release_notes.rb:429
 msgid "&Language"
 msgstr "语言(&L)"
 
 #. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:247
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
 msgid "&Keyboard Layout"
 msgstr "键盘布局(&K)"
 
 #. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:261
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
 msgid "I &Agree to the License Terms."
 msgstr "我同意许可条款。(&A)"
 
 #. Report error about missing license acceptance
-#. !/usr/bin/env rspec
-#: src/lib/installation/clients/inst_complex_welcome.rb:287
-#: test/inst_complex_welcome_test.rb:106
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
 msgid "You must accept the license to install this product"
 msgstr "您必须接受许可才能安装本产品"
 
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "正在检查安装好的系统..."
+
 #. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:406
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
 msgid "K&eyboard Test"
 msgstr "键盘测试(&e)"
 
 #. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:436
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
 msgid "License &Translations..."
 msgstr "许可译文(&T)..."
 
@@ -706,24 +692,19 @@
 #: src/lib/installation/clients/inst_congratulate.rb:215
 msgid ""
 "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user "
-"interaction. AutoYaST\n"
-"needs a profile to know what the installed system should look like. If this "
-"option is\n"
-"selected, a profile of the current system is stored in <tt>/root/autoinst."
-"xml</tt>.</p>"
+"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+"needs a profile to know what the installed system should look like. If this option is\n"
+"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
 msgstr ""
 "<p>若您想要创建一个 AutoYaST 方案请使用<b>克隆</b>。\n"
 "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
 "AutoYaST 需要一个方案来了解安装好的系统应该是怎样的。\n"
-"若选中此选项，将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。"
-"</p>"
+"若选中此选项，将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。</p>"
 
 #. #187558
 #. Load Add-On products configured in the fist stage
 #: src/lib/installation/clients/inst_congratulate.rb:310
-msgid ""
-"<p>To clone the current system, the <b>%1</b> package must be installed.</p>"
+msgid "<p>To clone the current system, the <b>%1</b> package must be installed.</p>"
 msgstr "<p>要克隆当前系统，您必须安装 <b>%1</b> 软件包。</p>"
 
 #: src/lib/installation/clients/inst_congratulate.rb:313
@@ -744,16 +725,16 @@
 #. twice more steps
 #. FIXME: 2 minutes
 #. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:109
-#: src/lib/installation/clients/inst_deploy_image.rb:354
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
 #: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
 msgid "Deploying Images..."
 msgstr "正在部署映像..."
 
 #. BNC #444209
 #. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:170
+#: src/lib/installation/clients/inst_deploy_image.rb:168
 msgid ""
 "Deploying images has failed.\n"
 "Aborting the installation...\n"
@@ -762,30 +743,29 @@
 "正在中止安装...\n"
 
 #. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:202
+#: src/lib/installation/clients/inst_deploy_image.rb:200
 msgid ""
 "Debugging has been turned on.\n"
-"YaST will open a software manager for you to check the current status of "
-"packages."
+"YaST will open a software manager for you to check the current status of packages."
 msgstr ""
 "已经打开调试功能。\n"
 "YaST 将打开一个软件包管理器来让您检查软件包当前状态。"
 
 #. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:378
+#: src/lib/installation/clients/inst_deploy_image.rb:376
 msgid "Downloading image at speed %1/s"
 msgstr "正在下载映像，速度：%1/秒"
 
-#: src/lib/installation/clients/inst_deploy_image.rb:383
+#: src/lib/installation/clients/inst_deploy_image.rb:381
 msgid "Downloading image %1 at speed %2/s"
 msgstr "正在下载映像 %1，速度：%2/秒"
 
 #. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:441
 msgid "Deploying image..."
 msgstr "正在部署映像..."
 
-#: src/lib/installation/clients/inst_deploy_image.rb:448
+#: src/lib/installation/clients/inst_deploy_image.rb:444
 msgid "Deploying image %1..."
 msgstr "正在部署映像 %1..."
 
@@ -802,15 +782,11 @@
 msgid "&Disk to Use"
 msgstr "要使用的磁盘(&D)"
 
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
-msgid ""
-"Select the disk, which the image will be deployed to. All data on the disk "
-"will be lost and the disk will be partitioned as defined in the image."
-msgstr ""
-"请选择将部署映像的磁盘。该磁盘上的全部数据均将被摧毁，磁盘将以映像中定义的方"
-"式被重新分区。"
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
+msgid "Select the disk, which the image will be deployed to. All data on the disk will be lost and the disk will be partitioned as defined in the image."
+msgstr "请选择将部署映像的磁盘。该磁盘上的全部数据均将被摧毁，磁盘将以映像中定义的方式被重新分区。"
 
-#: src/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
 msgid "Hard Disk for Image Deployment"
 msgstr "用于部署映像的硬盘"
 
@@ -886,71 +862,74 @@
 msgid "Show &package updates"
 msgstr "显示软件包更新(&P)"
 
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr "正在调用步骤 %1..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr " * %1"
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "安装出错"
+
 #. Adjust a SlideShow dialog if not configured
 #. kilobytes
 #. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
 msgid "Finishing Basic Installation"
 msgstr "正在完成基础安装"
 
 #. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
 msgid "Creating list of finish scripts to call..."
 msgstr "正在创建要调用的收尾脚本列表..."
 
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "已完成"
+
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:203
+#: src/lib/installation/clients/inst_finish.rb:456
 msgid "Copy files to installed system"
 msgstr "复制文件到安装好的系统"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:210
+#: src/lib/installation/clients/inst_finish.rb:463
 msgid "Save configuration"
 msgstr "保存配置"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:217
+#: src/lib/installation/clients/inst_finish.rb:470
 msgid "Save installation settings"
 msgstr "保存安装设置"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:226
+#: src/lib/installation/clients/inst_finish.rb:479
 msgid "Install boot manager"
 msgstr "安装引导管理器"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:233
+#: src/lib/installation/clients/inst_finish.rb:486
 msgid "Prepare system for initial boot"
 msgstr "为首次引导准备系统"
 
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:337
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
 msgid "Checking stage: %1..."
 msgstr "正在检查阶段：%1..."
 
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:424
-msgid "Calling step %1..."
-msgstr "正在调用步骤 %1..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:444
-msgid " * %1"
-msgstr " * %1"
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:481
-msgid "Finished"
-msgstr "已完成"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:613
-msgid "Installation Error"
-msgstr "安装出错"
-
 #. Button to accept a license agreement
 #: src/lib/installation/clients/inst_info.rb:63
 msgid "I &Agree"
@@ -999,26 +978,21 @@
 "<b>Add Online Repositories Before Installation</b>.</p>"
 msgstr ""
 "<p>\n"
-"要在安装或者更新时使用建议的远程软件源，请选择<b>在安装前添加在线软件源</b>。"
-"</p>"
+"要在安装或者更新时使用建议的远程软件源，请选择<b>在安装前添加在线软件源</b>。</p>"
 
 #. help text for installation method
 #: src/lib/installation/clients/inst_installation_options.rb:209
 msgid ""
 "<p>\n"
-"To install an add-on product from separate media together with &product;, "
-"select\n"
+"To install an add-on product from separate media together with &product;, select\n"
 "<b>Include Add-on Products from Separate Media</b>.</p>\n"
 msgstr ""
 "<p>\n"
-"要在安装 &product; 时从独立介质安装附加产品，请选择<b>包括独立介质中的附加产"
-"品</b>。</p>\n"
+"要在安装 &product; 时从独立介质安装附加产品，请选择<b>包括独立介质中的附加产品</b>。</p>\n"
 
 #. help text: additional help for installation
 #: src/lib/installation/clients/inst_installation_options.rb:212
-msgid ""
-"<p>If you need specific hardware drivers for installation, see <i>http://"
-"drivers.suse.com</i> site.</p>"
+msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
 msgstr "<p>若您需要安装特种硬件驱动，请参考 <i>http://drivers.suse.com</i> 站点。</p>"
 
 #. Error message
@@ -1073,8 +1047,7 @@
 #: src/lib/installation/clients/inst_network_check.rb:143
 msgid ""
 "<p>A configured network is needed for using remote repositories\n"
-"or add-on products. If you do not use remote repositories, skip the "
-"configuration.</p>\n"
+"or add-on products. If you do not use remote repositories, skip the configuration.</p>\n"
 msgstr ""
 "<p>您需要配置一个网络连接来使用远程的软件源或附加产品。\n"
 "若您不使用远程软件源也可以跳过该配置。</p>\n"
@@ -1091,31 +1064,23 @@
 #. TRANSLATORS: help text, part 1
 #: src/lib/installation/clients/inst_new_desktop.rb:57
 msgid ""
-"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a "
-"number \n"
-"of different desktop environments. Below you see a list of the 2 major "
-"ones \n"
+"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n"
+"of different desktop environments. Below you see a list of the 2 major ones \n"
 "<b>GNOME</b> and <b>KDE</b>.</p>"
 msgstr ""
-"<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环"
-"境。\n"
+"<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环境。\n"
 "下面您可以看到两种主流的桌面：<b>GNOME</b> 和 <b>KDE</b>。</p>"
 
 #. TRANSLATORS: help text, part 3
 #: src/lib/installation/clients/inst_new_desktop.rb:63
 msgid ""
-"<p>You may select alternative desktop environments (or one of minimal "
-"installation patterns)\n"
-"that could fit your needs better using the <b>Other</b> option . Later in "
-"the software \n"
-"selection or after installation, you can change your selection or add "
-"additional desktop \n"
+"<p>You may select alternative desktop environments (or one of minimal installation patterns)\n"
+"that could fit your needs better using the <b>Other</b> option . Later in the software \n"
+"selection or after installation, you can change your selection or add additional desktop \n"
 "environments. This screen allows you to set the default.</p>"
 msgstr ""
-"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极"
-"简安装软件集)。\n"
-"稍后在软件选择中或安装后，您仍可以修改您的选择或添加额外桌面环境。本屏幕允许"
-"您设置默认桌面环境。</p>"
+"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极简安装软件集)。\n"
+"稍后在软件选择中或安装后，您仍可以修改您的选择或添加额外桌面环境。本屏幕允许您设置默认桌面环境。</p>"
 
 #. TRANSLATORS: dialog caption
 #: src/lib/installation/clients/inst_new_desktop.rb:121
@@ -1148,7 +1113,7 @@
 
 #. Use 'zero' if image installation is not used
 #. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
 msgid "Installing Packages..."
 msgstr "正在安装软件包..."
 
@@ -1180,7 +1145,7 @@
 msgstr "<p>安装好的 Linux 系统的<b>版本资讯</b>摘要说明了其新功能和改动。</p>\n"
 
 #. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
 msgid "<p>No release notes have been installed.</p>"
 msgstr "<p>未安装版本资讯。</p>"
 
@@ -1205,98 +1170,97 @@
 
 #. This dialog in not interactive
 #. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
 msgid "Analyzing the Computer"
 msgstr "正在分析计算机"
 
 #. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
 msgid "Probe USB devices"
 msgstr "检测 USB 设备"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
 msgid "Probing USB devices..."
 msgstr "正在检测 USB 设备..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
 msgid "Probe FireWire devices"
 msgstr "检测火线设备..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
 msgid "Probing FireWire devices..."
 msgstr "正在检测火线设备..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
 msgid "Probe floppy disk devices"
 msgstr "检测软盘设备"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
 msgid "Probing floppy disk devices..."
 msgstr "正在检测软盘设备..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
 msgid "Probe hard disk controllers"
 msgstr "检测硬盘控制器"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
 msgid "Probing hard disk controllers..."
 msgstr "正在检测硬盘控制器..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
 msgid "Load kernel modules for hard disk controllers"
 msgstr "为硬盘控制器加载内核模块"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
 msgid "Loading kernel modules for hard disk controllers..."
 msgstr "正在为硬盘控制器加载内核模块..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
 msgid "Probe hard disks"
 msgstr "检测硬盘"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
 msgid "Probing hard disks..."
 msgstr "正在检测硬盘..."
 
 #. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
 msgid "Search for system files"
 msgstr "搜索系统文件"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
 msgid "Searching for system files..."
 msgstr "正在搜索系统文件..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
 msgid "Initialize software manager"
 msgstr "初始化软件包管理器"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
 msgid "Initializing software manager..."
 msgstr "正在初始化软件包管理器..."
 
 #. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
 msgid "System Probing"
 msgstr "系统检测"
 
 #. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
 msgid "YaST is probing computer hardware and installed systems now."
 msgstr "YaST 现在正在检测计算机硬件和已安装的系统。"
 
 #. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:242
+#: src/lib/installation/clients/inst_system_analysis.rb:257
 msgid ""
 "\n"
-"Check 'drivers.suse.com' if you need specific hardware drivers for "
-"installation."
+"Check 'drivers.suse.com' if you need specific hardware drivers for installation."
 msgstr ""
 "\n"
 "若您需要安装特种硬件驱动请查看 'drivers.suse.com'。"
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:256
+#: src/lib/installation/clients/inst_system_analysis.rb:271
 msgid ""
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
@@ -1306,7 +1270,7 @@
 "请检查您的硬件！\n"
 "%1\n"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:266
+#: src/lib/installation/clients/inst_system_analysis.rb:281
 msgid ""
 "No hard disks were found for the installation.\n"
 "During an automatic installation, they might be detected later.\n"
@@ -1317,7 +1281,7 @@
 "(尤其是在 S/390 或 iSCSI 系统上)\n"
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:277
+#: src/lib/installation/clients/inst_system_analysis.rb:292
 msgid ""
 "No hard disks and no hard disk controllers were\n"
 "found for the installation.\n"
@@ -1329,7 +1293,7 @@
 "%1\n"
 
 #. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:322
+#: src/lib/installation/clients/inst_system_analysis.rb:337
 msgid ""
 "Failed to initialize the software repositories.\n"
 "Aborting the installation."
@@ -1338,7 +1302,7 @@
 "即将中止安装。"
 
 #. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:184
+#: src/lib/installation/clients/inst_update_installer.rb:187
 msgid ""
 "A valid update could not be found at\n"
 "%s.\n"
@@ -1349,7 +1313,7 @@
 "\n"
 
 #. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:190
+#: src/lib/installation/clients/inst_update_installer.rb:193
 msgid ""
 "Could not fetch update from\n"
 "%s.\n"
@@ -1359,19 +1323,35 @@
 "%s。\n"
 "\n"
 
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
 #. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:215
+#: src/lib/installation/clients/inst_update_installer.rb:265
 msgid ""
-"Downloading installer updates from \n"
+"Downloading the optional installer updates from \n"
 "%s\n"
 "failed.\n"
 "\n"
-"Would you like to check your network configuration?"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
 msgstr ""
-"从 %s\n"
-"下载安装器更新失败。\n"
-"\n"
-"您想要检查您的网络配置吗？"
 
 #. TRANSLATORS: Table item status (repository)
 #: src/lib/installation/clients/inst_upgrade_urls.rb:109
@@ -1438,8 +1418,7 @@
 #: src/lib/installation/clients/inst_upgrade_urls.rb:256
 msgid ""
 "<p>Here you see all software repositories found\n"
-"on the system you are upgrading. Enable the ones you want to include in the "
-"upgrade process.</p>"
+"on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>"
 msgstr ""
 "<p>在此您可以看到从您正在升级的系统中发现的全部软件源。\n"
 "请启用您想要在升级过程中使用的软件源。</p>"
@@ -1637,7 +1616,7 @@
 msgstr "<p>请点击<b>下一步</b>执行基本系统配置。</p>\n"
 
 #. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
 msgid "No workflow defined for this kind of installation."
 msgstr "没有为此类安装方式定义安装流程。"
 
@@ -1711,6 +1690,26 @@
 msgid "Saving hardware configuration..."
 msgstr "正在保存硬件配置..."
 
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Clone System Configuration"
+msgid "Import SSH Host Keys and Configuration"
+msgstr "复制系统配置"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Clone System Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "复制系统配置(&C)"
+
 #. progress step title
 #: src/lib/installation/clients/ssh_settings_finish.rb:64
 msgid "Copying SSH settings to installed system..."
@@ -1778,6 +1777,34 @@
 msgid "Copying log files to installed system..."
 msgstr "正在将日志文件复制到安装好的系统..."
 
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "设备"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Export Configuration"
+msgid "Import SSH Configuration"
+msgstr "导出配置(&E)"
+
 #. progress step title
 #: src/lib/installation/prep_shrink.rb:34
 msgid "Shrinking PREP partition..."
@@ -1903,8 +1930,7 @@
 #: src/lib/installation/proposal_store.rb:426
 msgid ""
 "<p>\n"
-"Select <b>Install</b> to perform a new installation with the values "
-"displayed.\n"
+"Select <b>Install</b> to perform a new installation with the values displayed.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1992,13 +2018,8 @@
 msgid "Enabling remote administration..."
 msgstr "正在启用远程管理..."
 
-#. skip forward or backward
-#: src/lib/installation/select_system_role.rb:48
-msgid "System Role"
-msgstr "系统角色"
-
 #. A Continue-Cancel popup
-#: src/lib/installation/select_system_role.rb:82
+#: src/lib/installation/select_system_role.rb:79
 msgid "Changing the system role may undo adjustments you may have done."
 msgstr "修改系统角色可能冲销您已做的调整。"
 
@@ -2013,6 +2034,35 @@
 msgid "Creating root filesystem snapshot..."
 msgstr "正在创建根文件系统快照..."
 
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+msgid "No previous Linux installation found"
+msgstr ""
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
 #. autoyast tried to read a file but had no success.
 #: src/lib/transfer/file_from_url.rb:156
 msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
@@ -2077,12 +2127,12 @@
 #. checking whether images are supported
 #. BNC #409927
 #. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
 msgid "Failed to read information about installation images"
 msgstr "无法读取安装映像信息"
 
 #. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
 msgid "Deploying..."
 msgstr "正在部署..."
 
@@ -2090,19 +2140,19 @@
 #.
 #. @see #all_supported_types
 #. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
 msgid "Storing user preferences..."
 msgstr "正在储存用户偏好..."
 
 #. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
 #.
 #. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
 msgid "Restoring user preferences..."
 msgstr "正在恢复用户偏好..."
 
 #. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
 msgid ""
 "Installation was unable to solve package dependencies automatically.\n"
 "Software manager will be opened for you to solve them manually."
@@ -2110,43 +2160,42 @@
 "安装未能自动解决软件包依赖关系。\n"
 "将打开软件包管理器来让您手动解决那些依赖关系。"
 
+#~ msgid ""
+#~ "Downloading installer updates from \n"
+#~ "%s\n"
+#~ "failed.\n"
+#~ "\n"
+#~ "Would you like to check your network configuration?"
+#~ msgstr ""
+#~ "从 %s\n"
+#~ "下载安装器更新失败。\n"
+#~ "\n"
+#~ "您想要检查您的网络配置吗？"
+
+#~ msgid "System Role"
+#~ msgstr "系统角色"
+
 #~ msgid "Generating AutoYaST profile if needed..."
 #~ msgstr "若需要则生成 AutoYaST 方案..."
 
 #~ msgid ""
-#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST "
-#~ "profile.\n"
-#~ "AutoYaST is a way to do a complete SUSE Linux installation without user "
-#~ "interaction. AutoYaST\n"
-#~ "needs a profile to know what the installed system should look like. If "
-#~ "this option is\n"
-#~ "selected, a profile of the current system is stored in <tt>/root/autoinst."
-#~ "xml</tt>.</p>"
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "needs a profile to know what the installed system should look like. If this option is\n"
+#~ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
 #~ msgstr ""
 #~ "<p>若您想要创建一个 AutoYaST 方案请使用<b>复制系统设置</b>。\n"
 #~ "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
 #~ "AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n"
-#~ "若选择了此选项，将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。"
+#~ "若选择了此选项，将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</p>"
 
-#~ msgid ""
-#~ "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+#~ msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
 #~ msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗？"
 
-#~ msgid "Clone System Configuration"
-#~ msgstr "复制系统配置"
+#~ msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
+#~ msgstr "AutoYaST 方案将被写入在 /root/autoinst.xml 下(不写入</a>)。"
 
-#~ msgid "&Clone System Configuration"
-#~ msgstr "复制系统配置(&C)"
-
-#~ msgid ""
-#~ "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
-#~ msgstr ""
-#~ "AutoYaST 方案将被写入在 /root/autoinst.xml 下(不写入</a>)。"
-
-#~ msgid ""
-#~ "The AutoYaST profile will not be saved (write it</a>)."
+#~ msgid "The AutoYaST profile will not be saved (write it</a>)."
 #~ msgstr "将不会保存 AutoYaST 方案(写入</a>)。"
 
 #~ msgid "Location of Stored Configuration"
@@ -2155,9 +2204,6 @@
 #~ msgid "Failed to store configuration. Details can be found in log."
 #~ msgstr "存储配置失败。可在日志中找到细节。"
 
-#~ msgid "&Export Configuration"
-#~ msgstr "导出配置(&E)"
-
 #~ msgid "ERROR: Missing Title"
 #~ msgstr "错误：缺少标题"
 
@@ -2274,14 +2320,10 @@
 #~ msgid "Network Card"
 #~ msgstr "网卡"
 
-#~ msgid "Device"
-#~ msgstr "设备"
-
 #~ msgid "Hardware Information of the Selected Network Card"
 #~ msgstr "所选网卡的硬件信息"
 
-#~ msgid ""
-#~ "<p>Here you can configure your network cards to be used immediately.</p>"
+#~ msgid "<p>Here you can configure your network cards to be used immediately.</p>"
 #~ msgstr "<p>在此您可以配置您要立即使用的网卡。</p>"
 
 #~ msgid ""
@@ -2402,9 +2444,7 @@
 #~ msgstr ""
 #~ "<p><big><b>代理</b></big>\n"
 #~ "<br>代理是一个基于服务器的网络访问缓存。\n"
-#~ "在大多数情况下，若您能直接连接到互联网，就没有必要使用代理。(注意，这不是"
-#~ "科学上网代理。科学上网的软件需要您另装，具体垂询https://forum.suse.org.cn "
-#~ "请以暗号形式转义掉敏感词！)</p>\n"
+#~ "在大多数情况下，若您能直接连接到互联网，就没有必要使用代理。(注意，这不是科学上网代理。科学上网的软件需要您另装，具体垂询https://forum.suse.org.cn 请以暗号形式转义掉敏感词！)</p>\n"
 
 #~ msgid ""
 #~ "<p>Command: <tt>%1</tt> has failed.</p>\n"
@@ -2483,9 +2523,7 @@
 #~ msgid "Writing Network Setup..."
 #~ msgstr "正在写入网络设置..."
 
-#~ msgid ""
-#~ "<p>Please, wait while network configuration is being written and tested..."
-#~ "</p>"
+#~ msgid "<p>Please, wait while network configuration is being written and tested...</p>"
 #~ msgstr "<p>正在写入和测试网络配置, 请稍候...</p>"
 
 #~ msgid ""
@@ -2569,8 +2607,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Select <b>New Installation</b> if there is no existing Linux system on "
-#~ "your\n"
+#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n"
 #~ "machine or if you want to replace an existing Linux system completely,\n"
 #~ "discarding all its configuration data.\n"
 #~ "</p>\n"
@@ -2595,8 +2632,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Select <b>Use Automatic Configuration</b> to let the installation "
-#~ "program\n"
+#~ "Select <b>Use Automatic Configuration</b> to let the installation program\n"
 #~ "configure your network and hardware automatically. Otherwise you will\n"
 #~ "be offered a configuration proposal with the possibility to tune all the\n"
 #~ "settings manually. Inexperienced users are advised to use automatic\n"
@@ -2734,8 +2770,7 @@
 #~ msgid "Connecting to the inst-sys failed. Debugger cannot continue."
 #~ msgstr "连接 inst-sys 失败，调试工具无法继续。"
 
-#~ msgid ""
-#~ "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>"
+#~ msgid "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>"
 #~ msgstr "<p>要访问 X11 系统，必须安装 <b>%1</b> 软件包。</p>"
 
 #~ msgid "<p>Do you want to install it now?</p>"
@@ -2787,27 +2822,21 @@
 #~ msgstr "正在初始化字体..."
 
 #~ msgid ""
-#~ "<p><b>Installation from Images</b> is used to speed the installation "
-#~ "up. \n"
-#~ "Images contain compressed snapshots of installed system matching your "
-#~ "selection \n"
-#~ "of patterns. The rest of packages which are not in images will be "
-#~ "installed from \n"
+#~ "<p><b>Installation from Images</b> is used to speed the installation up. \n"
+#~ "Images contain compressed snapshots of installed system matching your selection \n"
+#~ "of patterns. The rest of packages which are not in images will be installed from \n"
 #~ "packages the standard way.</p>"
 #~ msgstr ""
 #~ "<p><b>从映像安装</b>可以用来加快安装速度。\n"
 #~ "映像中包含压缩的安装系统快照，和您选择的模式相匹配。\n"
 #~ "其他不在映像中的软件包将以标准方法安装。</p>"
 
-#~ msgid ""
-#~ "<p>Installation is currently writing the automatic configuration. Please "
-#~ "wait...</p>"
+#~ msgid "<p>Installation is currently writing the automatic configuration. Please wait...</p>"
 #~ msgstr "<p>安装程序正在写入自动安装配置。请稍等...</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Select <b>New Installation</b> if there is no existing Linux system on "
-#~ "your\n"
+#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n"
 #~ "machine or if you want to replace an existing Linux system completely,\n"
 #~ "abandoning all its configuration data.\n"
 #~ "</p>"
@@ -2820,8 +2849,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "To install an add-on product from separate media together with &product;, "
-#~ "select\n"
+#~ "To install an add-on product from separate media together with &product;, select\n"
 #~ "<b>Include Add-On Products from Separate Media</b>.</p>"
 #~ msgstr ""
 #~ "<p>\n"
@@ -2833,8 +2861,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Your hard disk has not been modified in any way, so you can still safely "
-#~ "abort.\n"
+#~ "Your hard disk has not been modified in any way, so you can still safely abort.\n"
 #~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
@@ -2863,8 +2890,7 @@
 #~ msgstr "修复已安装系统(&P)"
 
 #~ msgid ""
-#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux "
-#~ "system on\n"
+#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux system on\n"
 #~ "your hard disk. This option can try to fix problems automatically.\n"
 #~ "</p>"
 #~ msgstr ""
@@ -2890,8 +2916,7 @@
 #~ msgid ""
 #~ "Accessing the YaST module %1 has failed.\n"
 #~ "More information can be found in the '%2' file.\n"
-#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' "
-#~ "directory."
+#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' directory."
 #~ msgstr ""
 #~ "访问 YaST 模块 %1 失败。\n"
 #~ "更多信息可以在文件“%2”中找到。\n"
@@ -2934,14 +2959,10 @@
 #~ msgstr "正在运行调试程序..."
 
 #~ msgid ""
-#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a "
-#~ "number\n"
-#~ "of different desktop environments. Below you see a list of the 2 major "
-#~ "ones\n"
-#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a "
-#~ "large number\n"
-#~ "of desktop applications such as email, file browser, games and many "
-#~ "others.</p>"
+#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number\n"
+#~ "of different desktop environments. Below you see a list of the 2 major ones\n"
+#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a large number\n"
+#~ "of desktop applications such as email, file browser, games and many others.</p>"
 #~ msgstr ""
 #~ "<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i>提供了几种\n"
 #~ " 不同的桌面环境。下面您可以看到两种主流的桌面：\n"
@@ -2949,8 +2970,7 @@
 #~ "带有很多桌面软件，比如 Email、文件浏览器、游戏等。</p>"
 
 #~ msgid ""
-#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation "
-#~ "can't be\n"
+#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation can't be\n"
 #~ "given</i>.</p>"
 #~ msgstr "<p>桌面选择，在于品味，所以并<i>没有明确的推荐</i>。</p>"
 
@@ -2987,11 +3007,9 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>Installation from images is faster than installation from RPM "
-#~ "packages\n"
+#~ "<p>Installation from images is faster than installation from RPM packages\n"
 #~ "because it does not need to handle with RPM database, locks etc.\n"
-#~ "One of the images also contains the joint RPM database and other metadata."
-#~ "</p>"
+#~ "One of the images also contains the joint RPM database and other metadata.</p>"
 #~ msgstr ""
 #~ "<p>从映像安装比从 RPM 软件包安装的速度块。\n"
 #~ "因为不需要处理 RPM 数据库，比如锁定等。\n"
@@ -2999,21 +3017,16 @@
 
 #~ msgid ""
 #~ "<p>If there is no direct access to installation images,\n"
-#~ "installation program has to download them first before they are deployed."
-#~ "</p>"
+#~ "installation program has to download them first before they are deployed.</p>"
 #~ msgstr ""
 #~ "<p>如果不能直接访问到安装映像，\n"
 #~ "安装程序必须先下载它们，然后才能部署。<p>"
 
 #~ msgid ""
-#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a "
-#~ "number \n"
-#~ "of different desktop environments. Below you see a list of the 2 major "
-#~ "ones \n"
-#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an "
-#~ "easy to use desktop\n"
-#~ "with a large number of desktop applications such as email, file browser, "
-#~ "games and many others.</p>"
+#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n"
+#~ "of different desktop environments. Below you see a list of the 2 major ones \n"
+#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an easy to use desktop\n"
+#~ "with a large number of desktop applications such as email, file browser, games and many others.</p>"
 #~ msgstr ""
 #~ "<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i>提供了\n"
 #~ "几种不同的桌面环境。下面您可以看到两种主流的桌面：\n"
@@ -3022,13 +3035,10 @@
 
 #~ msgid ""
 #~ "openSUSE offers you a choice of user interfaces. The two major complete \n"
-#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a "
-#~ "full \n"
-#~ "suite of applications including email, a file manager, games and "
-#~ "utilities.\n"
+#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n"
+#~ "suite of applications including email, a file manager, games and utilities.\n"
 #~ "\n"
-#~ "As desktop selection is a matter of taste, we do not give a "
-#~ "recommendation."
+#~ "As desktop selection is a matter of taste, we do not give a recommendation."
 #~ msgstr ""
 #~ "openSUSE 给您用户界面的选择。两种主流桌面 KDE 和 GNOME\n"
 #~ "都容易使用，并带有一整套应用程序，包括 Email、文件管理器、\n"

Modified: trunk/yast/zh_CN/po/iscsi-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/iscsi-client.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/iscsi-client.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-05 17:03+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -110,14 +110,13 @@
 msgid "Add"
 msgstr "添加"
 
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
 #: src/include/iscsi-client/dialogs.rb:160
 msgid "Edit"
 msgstr "编辑"
 
 #: src/include/iscsi-client/dialogs.rb:161
-msgid "Log Out"
-msgstr "注销"
+msgid "Disconnect"
+msgstr "断开"
 
 #: src/include/iscsi-client/dialogs.rb:186
 msgid "Connected"
@@ -128,9 +127,6 @@
 msgstr "发现"
 
 #: src/include/iscsi-client/dialogs.rb:193
-msgid "Log In"
-msgstr "登入"
-
 #: src/include/iscsi-client/dialogs.rb:223
 msgid "Connect"
 msgstr "连接"
@@ -171,58 +167,75 @@
 msgid "Startup"
 msgstr "启动"
 
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "手动"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
 #. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
 msgid "Port"
 msgstr "端口"
 
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
 msgid "Key"
 msgstr "键"
 
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
 msgid "Value"
 msgstr "值"
 
 #. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
 msgid "Service"
 msgstr "服务"
 
 #. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
 msgid "Connected Targets"
 msgstr "已连接目标"
 
 #. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
 msgid "Discovered Targets"
 msgstr "已发现目标"
 
 #. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
 msgid "iSCSI Initiator Overview"
 msgstr "iSCSI 发起端概览"
 
 #. discovery new target
 #. dialog for all targets from portal (connected/disconnected)
 #. authentification dialog for add/discovery target
-#: src/include/iscsi-client/dialogs.rb:404
-#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119
-#: src/include/iscsi-client/helps.rb:126
+#: src/include/iscsi-client/dialogs.rb:407
+#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122
+#: src/include/iscsi-client/helps.rb:129
 msgid "<h1>iSCSI Initiator</h1>"
 msgstr "<h1>iSCSI 发起端</h1>"
 
 #. authentication dialog for add new target
 #. list of connected targets
 #. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
 msgid "iSCSI Initiator Discovery"
 msgstr "iSCSI 发起端发现"
 
@@ -331,57 +344,48 @@
 
 #. table of connected targets
 #: src/include/iscsi-client/helps.rb:90
-msgid ""
-"List of current sessions. To add a new target, select it and press <b>Add.\n"
-"To remove it, press <b>Log Out</b>.\n"
-"To change the start-up status, press <b>Toggle</b>.\n"
-msgstr ""
-"当前会话列表。要添加新目标，请选择它并按<b>添加</b>。\n"
-"要移除某个目标，请按<b>注销</b>。\n"
-"要修改启动状态，请按<b>切换</b>。\n"
+msgid "<p>List of current sessions.</p><p>Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>Use <b>Disconnect</b> to cancel the connection and with it remove the target from the list.<br>To change the start-up status, press <b>Edit</b>.</p>"
+msgstr "<p>当前会话列表。</p><p>使用<b>添加</b>按钮来获取额外目标。将启动探索来检测新目标和已连接目标的启动模式是否保持未变。<br>使用<b>断开连接</b>来取消连接并从列表中移除该目标。<br>要修改启动状态，请按<b>编辑</b>。</p>"
 
 #. Warning
 #. Warning
-#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114
+#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117
 msgid "<h1>Warning</h1>"
 msgstr "<h1>警告</h1>"
 
-#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115
-msgid ""
-"<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that "
-"this access is exclusive. Otherwise there is a potential risk of data "
-"corruption.</p>\n"
-msgstr ""
-"<p>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时，请确保此访问是排它的。否则会有"
-"潜在的数据损坏风险。</p>\n"
+#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118
+msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n"
+msgstr "<p>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时，请确保此访问是排它的。否则会有潜在的数据损坏风险。</p>\n"
 
-#: src/include/iscsi-client/helps.rb:100
+#: src/include/iscsi-client/helps.rb:103
+#, fuzzy
+#| msgid ""
+#| "<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
+#| "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>"
 msgid ""
-"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi. \n"
-"In case you have iBFT, this value will be added from there and you are only "
-"able to change it in the BIOS setup.</p>"
+"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
+"In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>"
 msgstr ""
 "<p><b>发起端名称</b> 是 <tt>/etc/iscsi/initiatorname.iscsi</tt> 中的一个值。\n"
 "若您有 iBFT，此值将从那里添加，并且您只能在 BIOS 设置中修改它。</p>"
 
-#: src/include/iscsi-client/helps.rb:103
+#: src/include/iscsi-client/helps.rb:106
 msgid ""
-"If you want to use <b>iSNS</b> (Internet  Storage  Name Service) for "
-"discovering targets instead of the default SendTargets method,\n"
-"fill in the IP address of the iSNS server and port. The default port should "
-"be 3205.\n"
+"If you want to use <b>iSNS</b> (Internet  Storage  Name Service) for discovering targets instead of the default SendTargets method,\n"
+"fill in the IP address of the iSNS server and port. The default port should be 3205.\n"
 msgstr ""
-"若您想用 <b>iSNS</b> (互联网存储名称服务) 来发现目标，而不是用默认的 "
-"SendTargets 方法，\n"
+"若您想用 <b>iSNS</b> (互联网存储名称服务) 来发现目标，而不是用默认的 SendTargets 方法，\n"
 "请填上 iSNS 服务器的 IP 地址和端口。默认端口应是 3205。\n"
 
-#: src/include/iscsi-client/helps.rb:108
+#: src/include/iscsi-client/helps.rb:111
+#, fuzzy
+#| msgid ""
+#| "Enter the <b>IP Address</b> of the discovered server.\n"
+#| "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n"
+#| "select <b>No Authentication</b>.\n"
 msgid ""
-"Enter the <b>IP Address</b> of the discovered server.\n"
-"Only change <b>Port</b> if needed. For authentication, use <b>Username</b> "
-"and <b>Password</b>. If you do not need authentication,\n"
+"Enter the <b>IP Address</b> of the iSCSI target server.\n"
+"Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n"
 "select <b>No Authentication</b>.\n"
 msgstr ""
 "请输入所发现服务器的 <b>IP 地址</b>。\n"
@@ -389,18 +393,10 @@
 "认证请使用<b>用户名</b>和<b>密码</b>。\n"
 "若您不需要认证，请选择<b>无认证</b>。\n"
 
-#: src/include/iscsi-client/helps.rb:122
-msgid ""
-"List of nodes offered by the iSCSI target. Select one item and click "
-"<b>Connect</b>.  "
+#: src/include/iscsi-client/helps.rb:125
+msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>.  "
 msgstr "iSCSI 目标提供的节点列表。请选择一项并按<b>连接</b>。"
 
-#: src/include/iscsi-client/helps.rb:129
-msgid ""
-"Select the type of authentication and enter the <b>Username</b> and "
-"<b>Password</b>."
-msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。"
-
 #: src/include/iscsi-client/helps.rb:132
 msgid "<h1>Startup</h1>"
 msgstr "<h1>启动</h1>"
@@ -409,26 +405,29 @@
 msgid ""
 "<p><b>manual</b> is for iSCSI targets which are not to be connected by\n"
 "default, the user needs to connect them manually</p>\n"
-"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. "
-"when\n"
+"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. when\n"
 "root is on iSCSI. As such it will be evaluated by the initrd.</p>\n"
-"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI "
-"service\n"
+"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI service\n"
 "starts up.</p>\n"
 msgstr ""
 "<p><b>手动</b>用于默认不连接的 iSCSI 目标，用户需要手动连接它们</p>\n"
-"<p><b>引导时</b>用于在引导时连接的 iSCSI 目标，例如，当 root 在 iSCSI 上时。"
-"因为这样 initrd 就需要评估位于 iSCSI 上的 root 分区了。</p>\n"
+"<p><b>引导时</b>用于在引导时连接的 iSCSI 目标，例如，当 root 在 iSCSI 上时。因为这样 initrd 就需要评估位于 iSCSI 上的 root 分区了。</p>\n"
 "<p><b>自动</b>用于当 iSCSI 服务启动时自动连接的 iSCSI 目标。</p>\n"
 
-#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:141
+msgid "<h1>Authentication</h1>"
+msgstr "<h1>认证</h1>"
+
 #: src/include/iscsi-client/helps.rb:142
-msgid ""
-"List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> "
-"to any target."
-msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"
+msgid "<p>The default setting here is <i>No Authentication</i>. Uncheck the checkbox if authentication is needed for security reasons. Enter <b>Username</b> and <b>Password</b> for 'Incoming Authentication', 'Outgoing Authentication' or for both.</p><p><b>Please note:</b><br>'Incoming Authentication' here correlates to 'Outgoing Authentication' on iSCSI target server side and the other way round.</p>"
+msgstr "<p>这里的默认设置是<i>无认证</i>。若出于安全原因需要认证请反选复选框。在'进站认证'，'出站认证'，或两者中输入<b>用户名</b>和<b>密码</b>。</p><p><b>请注意：</b><br>这里的'进站认证'与 iSCSI 目标服务器端的'出站认证'相关联，反之亦然。</p>"
 
-#: src/include/iscsi-client/helps.rb:145
+#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:151
+msgid "<p>This screen shows the list of discovered targets.</p><p>Use the <b>Discovery</b> button to get available iSCSI targets from a server specified by IP address.<br><b>Connect</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>To remove a target use the <b>Delete</b> button.<br> <b>Hint:</b> Removing of targets is only possible for not connected onces. If required, <b>Disconnect</b> at <i>Connected Targets</i> first.</p><p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual'). Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.</p>"
+msgstr "<p>这个屏幕显示了已发现的目标列表。</p><p>使用<b>发现</b>按钮来从由 IP 地址指定的服务器上获取可用 iSCSI 目标。<br>使用<b>连接</b>来建立到目标的连接。若登录成功，<i>已连接</i>列显示状态为'真'且目标将出现在<i>已连接目标</i>屏幕。<br>要移除目标请使用<b>删除</b>按钮。<br><b>提示：</b>仅可以移除未连接的目标。若需要，请先在<i>已连接目标</i>屏幕点击<b>断开连接</b>。</p><p><b>请注意：</b>再次启动<b>探索</b>意味着重新探索目标，可能会修改已连接目标的启动模式(为默认的'手动')。若您想要添加新目标而不修改启动模式，请切换到<i>已连接目标</i>屏幕并使用<b>添加</b>按钮。</p>"
+
+#: src/include/iscsi-client/helps.rb:167
 msgid "<h1>iBTF</h1>"
 msgstr "<h1>iBTF</h1>"
 
@@ -463,31 +462,44 @@
 msgid "Error occurred while logging out from the selected target."
 msgstr "从所选目标注销时出错。"
 
-#. toggle all 3 possible values (bnc#457252)
 #: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
 msgid "No record found."
 msgstr "未找到记录。"
 
 #. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
 msgid "No valid IP address"
 msgstr "无有效 IP 地址"
 
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
 msgid "Port field cannot be empty"
 msgstr "端口号不能为空"
 
 #. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:423
+#: src/include/iscsi-client/widgets.rb:393
+msgid "Incorrect Initiator Name"
+msgstr "不正确的发起端名称"
+
+#: src/include/iscsi-client/widgets.rb:394
+#, fuzzy
+#| msgid ""
+#| "Incorrect InitiatorName.\n"
+#| "The correct syntax is\n"
+#| "iqn.yyyy-mm.reversed.domain.name[:identifier]\n"
+#| "or eui.yyyy-mm.reversed.domain.name[:identifier]\n"
+#| "\n"
+#| "Example:\n"
+#| "iqn.2007-04.cz.server:storage.disk.sdb\n"
 msgid ""
-"Incorrect InitiatorName.\n"
+"\n"
 "The correct syntax is\n"
 "iqn.yyyy-mm.reversed.domain.name[:identifier]\n"
 "or eui.yyyy-mm.reversed.domain.name[:identifier]\n"
 "\n"
 "Example:\n"
 "iqn.2007-04.cz.server:storage.disk.sdb\n"
+"\n"
+"Do you want to use the name?\n"
 msgstr ""
 "错误的发起端名称。\n"
 "正确的语法为\n"
@@ -497,13 +509,18 @@
 "例如：\n"
 "iqn.2007-04.cz.server:storage.disk.sdb\n"
 
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:625
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
 msgid "Insert the IP address."
 msgstr "请输入 IP 地址。"
 
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:631
+#: src/include/iscsi-client/widgets.rb:596
 msgid "Insert the port."
 msgstr "请输入端口。"
 
@@ -511,38 +528,36 @@
 #. ******************* target table *************************
 #. initialize dialog for all targets from portal (connected/disconnected)
 #. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
-#: src/include/iscsi-client/widgets.rb:866
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
 msgid "True"
 msgstr "真"
 
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
 msgid "False"
 msgstr "假"
 
 #. check if not already connected
 #. check if not already connected
-#: src/include/iscsi-client/widgets.rb:771
-#: src/include/iscsi-client/widgets.rb:891
-msgid ""
-"The target with this TargetName is already connected. Make sure that "
-"multipathing is enabled to prevent data corruption."
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
+msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr "已连接名称为此目标名称的目标。请确保启用了多路径以防止数据损坏。"
 
-#: src/include/iscsi-client/widgets.rb:774
-#: src/include/iscsi-client/widgets.rb:894
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
 msgid "Continue"
 msgstr "继续"
 
-#: src/include/iscsi-client/widgets.rb:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
 msgid "Cancel"
 msgstr "取消"
 
 #. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:885
+#: src/include/iscsi-client/widgets.rb:869
 msgid "The target is already connected."
 msgstr "目标已连接。"
 
@@ -559,9 +574,7 @@
 #. don't check interactively for packages (bnc#367300)
 #. skip it during second stage or when create AY profile
 #: src/modules/IscsiClient.rb:96
-msgid ""
-"<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed."
-"</p>"
+msgid "<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed.</p>"
 msgstr "<p>必须安装 <b>%1</b> 软件包才能配置 iSCSI 发起端。</p>"
 
 #: src/modules/IscsiClient.rb:99
@@ -633,7 +646,7 @@
 msgstr "全部"
 
 #. }
-#: src/modules/IscsiClientLib.rb:694
+#: src/modules/IscsiClientLib.rb:730
 msgid ""
 "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
 "differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -644,75 +657,38 @@
 "旧的发起端名称将替换为 iBFT 中的值并创建备份。\n"
 "您若想要使用不同的发起端名称，请到 BIOS 中修改之。\n"
 
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
+msgid "Target connection failed.\n"
+msgstr "目标连接失败。\n"
+
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1147
+#: src/modules/IscsiClientLib.rb:1208
 msgid "Configuration summary..."
 msgstr "配置摘要..."
 
-#~| msgid "Disconnected"
-#~ msgid "Disconnect"
-#~ msgstr "断开"
+#~ msgid "Log Out"
+#~ msgstr "注销"
 
-#~ msgid ""
-#~ "<p>List of current sessions.</p><p>Use the <b>Add</b> button to get "
-#~ "additional targets. A discovery is started to detect new targets and the "
-#~ "start-up mode of already connected targets keeps unchanged.<br>Use "
-#~ "<b>Disconnect</b> to cancel the connection and with it remove the target "
-#~ "from the list.<br>To change the start-up status, press <b>Edit</b>.</p>"
-#~ msgstr ""
-#~ "<p>当前会话列表。</p><p>使用<b>添加</b>按钮来获取额外目标。将启动探索来检"
-#~ "测新目标和已连接目标的启动模式是否保持未变。<br>使用<b>断开连接</b>来取消"
-#~ "连接并从列表中移除该目标。<br>要修改启动状态，请按<b>编辑</b>。</p>"
+#~ msgid "Log In"
+#~ msgstr "登入"
 
-#~| msgid "Authentication"
-#~ msgid "<h1>Authentication</h1>"
-#~ msgstr "<h1>认证</h1>"
-
 #~ msgid ""
-#~ "<p>The default setting here is <i>No Authentication</i>. Uncheck the "
-#~ "checkbox if authentication is needed for security reasons. Enter "
-#~ "<b>Username</b> and <b>Password</b> for 'Incoming Authentication', "
-#~ "'Outgoing Authentication' or for both.</p><p><b>Please note:<br>'Incoming Authentication' here correlates to 'Outgoing "
-#~ "Authentication' on iSCSI target server side and the other way round.</p>"
+#~ "List of current sessions. To add a new target, select it and press <b>Add</b>.\n"
+#~ "To remove it, press <b>Log Out</b>.\n"
+#~ "To change the start-up status, press <b>Toggle</b>.\n"
 #~ msgstr ""
-#~ "<p>这里的默认设置是<i>无认证</i>。若出于安全原因需要认证请反选复选框。"
-#~ "在'进站认证'，'出站认证'，或两者中输入<b>用户名</b>和<b>密码</b>。<p><b>请注意：</b><br>这里的'进站认证'与 iSCSI 目标服务器端的'出站认"
-#~ "证'相关联，反之亦然。</p>"
+#~ "当前会话列表。要添加新目标，请选择它并按<b>添加</b>。\n"
+#~ "要移除某个目标，请按<b>注销</b>。\n"
+#~ "要修改启动状态，请按<b>切换</b>。\n"
 
-#~ msgid ""
-#~ "<p>This screen shows the list of discovered targets.</p><p>Use the "
-#~ "<b>Discovery</b> button to get available iSCSI targets from a server "
-#~ "specified by IP address.<br><b>Connect</b> to a target to establih the "
-#~ "connection. If login was successful the column <i>Connected</i> shows "
-#~ "status 'True' and the target will appear on the <i>Connected Targets</i> "
-#~ "screen.<br>To remove a target use the <b>Delete</b> button.<br> <b>Hint: Removing of targets is only possible for not connected onces. If "
-#~ "required, <b>Disconnect</b> at <i>Connected Targets</i> first.<p><b>Please note:</b> Starting the <b>Discovery</b> again means doing "
-#~ "a re-discovery of targets which possibly will change the start-up mode of "
-#~ "already connected targets (to default 'manual'). Switch to <i>Connected "
-#~ "Targets</i> screen and use the <b>Add</b> button if you want to add new "
-#~ "targets without changing the start-up mode.</p>"
-#~ msgstr ""
-#~ "<p>这个屏幕显示了已发现的目标列表。</p><p>使用<b>发现</b>按钮来从由 IP 地"
-#~ "址指定的服务器上获取可用 iSCSI 目标。<br>使用<b>连接</b>来建立到目标的连"
-#~ "接。若登录成功，<i>已连接</i>列显示状态为'真'且目标将出现在<i>已连接目标屏幕。<br>要移除目标请使用<b>删除</b>按钮。<br><b>提示：</b>仅可以移除未"
-#~ "连接的目标。若需要，请先在<i>已连接目标</i>屏幕点击<b>断开连接</b>。<p><b>请注意：</b>再次启动<b>探索</b>意味着重新探索目标，可能会修改已连"
-#~ "接目标的启动模式(为默认的'手动')。若您想要添加新目标而不修改启动模式，请切"
-#~ "换到<i>已连接目标</i>屏幕并使用<b>添加</b>按钮。</p>"
+#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
+#~ msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。"
 
-#~| msgid "Initiator Name"
-#~ msgid "Incorrect Initiator Name"
-#~ msgstr "不正确的发起端名称"
+#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
+#~ msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"
 
-#~| msgid "Image creation failed."
-#~ msgid "Target connection failed.\n"
-#~ msgstr "目标连接失败。\n"
-
 #~ msgid "Toggle Start-Up"
 #~ msgstr "转换启动"
 

Modified: trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-05 23:57+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -85,7 +85,7 @@
 msgstr "使用认证"
 
 #: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
 msgid "LUN"
 msgstr "逻辑单元编号"
 
@@ -102,7 +102,7 @@
 #: src/include/iscsi-lio-server/dialogs.rb:238
 #: src/include/iscsi-lio-server/dialogs.rb:326
 #: src/include/iscsi-lio-server/dialogs.rb:373
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/widgets.rb:453
 msgid "Add"
 msgstr "添加"
 
@@ -118,7 +118,7 @@
 #: src/include/iscsi-lio-server/dialogs.rb:240
 #: src/include/iscsi-lio-server/dialogs.rb:328
 #: src/include/iscsi-lio-server/dialogs.rb:375
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/widgets.rb:454
 msgid "Delete"
 msgstr "删除"
 
@@ -149,13 +149,13 @@
 
 #. enable/disable none/incoming/outgoing authentication
 #: src/include/iscsi-lio-server/dialogs.rb:217
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/widgets.rb:218
 #: src/modules/IscsiLioServer.rb:434
 msgid "No Authentication"
 msgstr "无认证"
 
 #: src/include/iscsi-lio-server/dialogs.rb:226
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/widgets.rb:229
 #: src/modules/IscsiLioServer.rb:437
 msgid "Incoming Authentication"
 msgstr "进站认证"
@@ -163,22 +163,22 @@
 #. dialog to add/modify user and password
 #: src/include/iscsi-lio-server/dialogs.rb:233
 #: src/include/iscsi-lio-server/dialogs.rb:254
-#: src/include/iscsi-lio-server/widgets.rb:223
-#: src/include/iscsi-lio-server/widgets.rb:236
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
 msgid "Username"
 msgstr "用户名"
 
 #: src/include/iscsi-lio-server/dialogs.rb:233
 #: src/include/iscsi-lio-server/dialogs.rb:255
-#: src/include/iscsi-lio-server/widgets.rb:224
-#: src/include/iscsi-lio-server/widgets.rb:237
-#: src/include/iscsi-lio-server/widgets.rb:722
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
 msgid "Password"
 msgstr "密码"
 
 #: src/include/iscsi-lio-server/dialogs.rb:249
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/widgets.rb:242
 #: src/modules/IscsiLioServer.rb:440
 msgid "Outgoing Authentication"
 msgstr "出站认证"
@@ -400,58 +400,38 @@
 
 #. discovery authentication
 #: src/include/iscsi-lio-server/helps.rb:119
-msgid ""
-"Select the type of authentication. Use <b>No Authentication</b> or one of "
-"<b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert "
-"<b>User</b> and <b>Password</b>."
-msgstr ""
-"选择认证类型。可使用<b>无认证</b>，或<b>进站</b>和<b>出站</b>之一 (进出站可同"
-"时选)。然后插入<b>用户</b>和<b>密码</b>。"
+msgid "Select the type of authentication. Use <b>No Authentication</b> or one of <b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert <b>User</b> and <b>Password</b>."
+msgstr "选择认证类型。可使用<b>无认证</b>，或<b>进站</b>和<b>出站</b>之一 (进出站可同时选)。然后插入<b>用户</b>和<b>密码</b>。"
 
 #. target client setup.
 #: src/include/iscsi-lio-server/helps.rb:124
 msgid ""
-"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN "
-"imported from\n"
-" target portal group. Specify which initiator is allowed to connect (use "
-"<i>InitiatorName</i>\n"
-" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> "
-"will remove the initiator access to the LUN.</p>"
-msgstr ""
-"<p>使用<b>添加</b>来给予一个发起端 (iSCSI 客户端) 从目标门户组导入的逻辑单元编号的访问权限。"
-"请指定允许连接的发起端 (使用来自 iSCSI 发起端上的 '/etc/"
-"iscsi/initatorname.iscsi' 中的<i>发起端名称</i>)。<b>删除</b>将移除该发起端对"
-"逻辑单元编号的访问权限。</p>"
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
+msgstr "<p>使用<b>添加</b>来给予一个发起端 (iSCSI 客户端) 从目标门户组导入的逻辑单元编号的访问权限。请指定允许连接的发起端 (使用来自 iSCSI 发起端上的 '/etc/iscsi/initatorname.iscsi' 中的<i>发起端名称</i>)。<b>删除</b>将移除该发起端对逻辑单元编号的访问权限。</p>"
 
 #: src/include/iscsi-lio-server/helps.rb:130
+#, fuzzy
+#| msgid ""
+#| "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different values for incoming and outgoing authentication.\n"
+#| " If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
 msgid ""
-"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN "
-"target number must be unique.<br>After pressing <b>Edit Auth</b>, select the "
-"type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both "
-"together. Then insert <b>User</b> and <b>Password</b>. Please make sure to "
-"set different values for incoming and outgoing authentication.\n"
-" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth is disabled here.</p>"
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
 msgstr ""
-"<p>使用<b>编辑逻辑单元编号</b>可修改逻辑单元编号映射。请注意逻辑单元编号目标"
-"数字必须唯一。<br>在按下<b>编辑认证</b>后，请选择认证类型。可使用<b>进站</b>、"
-"<b>出站</b>或两者。然后插入<b>用户</b>和<b>密码</b>。请确保进出站认证设为了"
-"不同的值。\n"
+"<p>使用<b>编辑逻辑单元编号</b>可修改逻辑单元编号映射。请注意逻辑单元编号目标数字必须唯一。<br>在按下<b>编辑认证</b>后，请选择认证类型。可使用<b>进站</b>、<b>出站</b>或两者。然后插入<b>用户</b>和<b>密码</b>。请确保进出站认证设为了不同的值。\n"
 "若在之前对话框禁用了<b>使用认证</b>，那这里的<b>编辑认证</b>也是禁用的。</p>"
 
 #: src/include/iscsi-lio-server/helps.rb:137
-msgid ""
-"<p><b>Copy</b> offers the possibility to give an additional initiator access "
-"to the LUN.</p>"
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
 msgstr "<p><b>复制</b>提供了给予另一个发起端逻辑单元编号访问权限的可能。</p>"
 
 #. target dialog
 #: src/include/iscsi-lio-server/helps.rb:139
 msgid ""
-"List of offered targets and target portal groups. Create a new target by "
-"clicking <b>Add</b>.\n"
-"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete."
+"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
+"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
 msgstr ""
 "所提供的目标和目标门户组列表。点击<b>添加</b>可创建一个新目标。\n"
 "要删除或修改某项，请选择它并按<b>修改</b>或<b>删除</b>。"
@@ -465,11 +445,9 @@
 
 #: src/include/iscsi-lio-server/helps.rb:147
 msgid ""
-"It is possible to make arbitary block devices or files available under a "
-"<b>LUN</b>.\n"
+"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
 "You have to provide <b>path</b> to either block devices or file. \n"
-"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN. \n"
+"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</b>. \n"
 "The name needs to be unique within the target portal group. If the user\n"
 "does not provide a name for LUN, it is generated automatically."
 msgstr ""
@@ -482,13 +460,11 @@
 #: src/include/iscsi-lio-server/helps.rb:154
 #: src/include/iscsi-lio-server/helps.rb:173
 msgid ""
-"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which "
-"address\n"
+"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
 "and port the service will be available. Default for port number is 3260.\n"
 "Only ip addresses assigned to one of the network cards are possible."
 msgstr ""
-"<p>在<b>IP 地址</b>和<b>端口号</b>下您可以指定服务在哪个地址和端口可用。默认"
-"端口号是 3260。\n"
+"<p>在<b>IP 地址</b>和<b>端口号</b>下您可以指定服务在哪个地址和端口可用。默认端口号是 3260。\n"
 "只有指定到一个网卡的 IP 地址才可以。"
 
 #: src/include/iscsi-lio-server/helps.rb:163
@@ -497,11 +473,9 @@
 
 #: src/include/iscsi-lio-server/helps.rb:166
 msgid ""
-"It is possible to make arbitary block devices or files available under a "
-"lun.\n"
+"It is possible to make arbitary block devices or files available under a lun.\n"
 "You have to provide <b>path</b> to either block devices or file. \n"
-"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN. \n"
+"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</b>. \n"
 "The name needs to be unique within the target portal group. If the user\n"
 "does not provide a name for LUN, it is generated automatically."
 msgstr ""
@@ -512,188 +486,183 @@
 "它将自动生成。"
 
 #: src/include/iscsi-lio-server/helps.rb:180
-msgid ""
-"It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional "
-"configuration options."
+msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
 msgstr "可以<b>添加</b>、<b>编辑</b>或<b>删除</b>全部额外配置选项。"
 
 #: src/include/iscsi-lio-server/helps.rb:185
 msgid ""
-"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing "
-"purposes).\n"
-"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and "
-"<b>Sectors</b> are optional."
+"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
+"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
 msgstr ""
 "如有需要可编辑 <b>逻辑单元编号</b>，设置<b>类型</b> (nullio 用于测试目的)。\n"
-"若类型为 fileio，则请设置磁盘设备或文件的<b>路径</b>。<b>SCSI ID</b> 和<b>扇"
-"区</b>为可选项。"
+"若类型为 fileio，则请设置磁盘设备或文件的<b>路径</b>。<b>SCSI ID</b> 和<b>扇区</b>为可选项。"
 
 #. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
 msgid "Problem changing authentication"
 msgstr "修改认证出现问题"
 
 #. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
 msgid "Invalid Username"
 msgstr "无效的用户名"
 
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
 msgid "Invalid Password."
 msgstr "无效的密码。"
 
-#: src/include/iscsi-lio-server/widgets.rb:251
+#: src/include/iscsi-lio-server/widgets.rb:262
 msgid "Selected LUN is already in use!"
 msgstr "所选逻辑单元编号已在使用！"
 
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
 msgid "Selected Name is already in use!"
 msgstr "所选名称 %1 已被使用！"
 
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
 msgid "Selected Path must be either block device or normal file!"
 msgstr "所选路径必须是块设备或常规文件！"
 
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
 msgid "Selected Path is already in use!"
 msgstr "所选路径已被使用！"
 
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
 msgid "Path:"
 msgstr "路径："
 
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
 msgid "Browse"
 msgstr "浏览"
 
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
 msgid "Select file or device"
 msgstr "选择文件或设备"
 
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
 msgid "Initiator LUN"
 msgstr "发起端逻辑单元编号"
 
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
 msgid "Target LUN"
 msgstr "目标逻辑单元编号"
 
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
 msgid "Change:"
 msgstr "修改："
 
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
 msgid "Target LUN %1 used more than once!"
 msgstr "目标逻辑单元编号 %1 使用了不止一次！"
 
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
 msgid "Need to enable at least one Authentification!"
 msgstr "需要至少启用一个认证！"
 
-#: src/include/iscsi-lio-server/widgets.rb:619
+#: src/include/iscsi-lio-server/widgets.rb:630
 msgid "Initiator name:"
 msgstr "发起端名称："
 
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
 msgid "Import LUNs from TPG"
 msgstr "从目标门户组导入逻辑单元编号"
 
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
 msgid "Initiator name must not be empty!"
 msgstr "发起端名称不能为空！"
 
 #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
 #. initiator name. It's allowed to have several LUNs accessable for same initiator.
 #. TODO: verify whether it's necessary to check @changed_lun here?
-#: src/include/iscsi-lio-server/widgets.rb:644
-#: src/include/iscsi-lio-server/widgets.rb:701
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
 msgid "Initiator name already exists!"
 msgstr "发起端名称已存在！"
 
 #. Copy exisiting LUN, i.e. give additional initiator access to the LUN
 #. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:689
 msgid "New initiator name:"
 msgstr "新发起端名称："
 
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
 msgid "OK"
 msgstr "确定"
 
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
 msgid "Cancel"
 msgstr "取消"
 
 #. create items from targets
-#: src/include/iscsi-lio-server/widgets.rb:785
+#: src/include/iscsi-lio-server/widgets.rb:796
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/include/iscsi-lio-server/widgets.rb:785
-#: src/include/iscsi-lio-server/widgets.rb:1263
-#: src/include/iscsi-lio-server/widgets.rb:1366
-#: src/include/iscsi-lio-server/widgets.rb:1403
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
 msgid "Disabled"
 msgstr "已禁用"
 
 #. remove a item
 #. **************** Edit Dialog	*****************************
 #. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:822
-#: src/include/iscsi-lio-server/widgets.rb:936
-#: src/include/iscsi-lio-server/widgets.rb:1290
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
 msgid "Really delete the selected item?"
 msgstr "真的删除所选项吗？"
 
-#: src/include/iscsi-lio-server/widgets.rb:1004
+#: src/include/iscsi-lio-server/widgets.rb:1015
 msgid "Problem creating target %1 with tpg %2"
 msgstr "使用目标门户组 %2 创建目标 %1 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1026
+#: src/include/iscsi-lio-server/widgets.rb:1037
 msgid "Problem setting network portal to %1"
 msgstr "设置网络门户为 %1 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1047
+#: src/include/iscsi-lio-server/widgets.rb:1058
 msgid "Problem removing lun %1"
 msgstr "移除逻辑单元编号 %1 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1072
+#: src/include/iscsi-lio-server/widgets.rb:1083
 msgid "Problem setting lun %1 (name:%2) to path %3"
 msgstr "设置逻辑单元编号 %1 (名称：%2) 到路径 %3 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1086
+#: src/include/iscsi-lio-server/widgets.rb:1097
 msgid "Problem setting auth on %1:%2 to %3"
 msgstr "设置 %1:%2 上的认证为 %3 时出现问题"
 
 #. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1200
+#: src/include/iscsi-lio-server/widgets.rb:1211
 msgid "The target cannot be empty."
 msgstr "目标不能为空。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1204
+#: src/include/iscsi-lio-server/widgets.rb:1215
 msgid "The target portal group cannot be empty."
 msgstr "目标门户组不能为空。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1215
+#: src/include/iscsi-lio-server/widgets.rb:1226
 msgid "The target already exists."
 msgstr "目标已存在。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1235
+#: src/include/iscsi-lio-server/widgets.rb:1246
 msgid "Incoming"
 msgstr "进站"
 
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1249
 msgid "Outgoing"
 msgstr "出站"
 
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1251
 msgid "None"
 msgstr "无"
 
-#: src/include/iscsi-lio-server/widgets.rb:1452
+#: src/include/iscsi-lio-server/widgets.rb:1463
 msgid ""
 "There isn't any initiator specified.\n"
 "To allow an initiator login to the target, please\n"
@@ -706,23 +675,23 @@
 "(可参考发起端上的 /etc/iscsi/initiatorname.iscsi)。\n"
 "真的想要继续而不指定可访问发起端吗？"
 
-#: src/include/iscsi-lio-server/widgets.rb:1466
+#: src/include/iscsi-lio-server/widgets.rb:1477
 msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
 msgstr "在 %1:%2 中为发起端 %3 移除逻辑单元编号 %4 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1481
+#: src/include/iscsi-lio-server/widgets.rb:1492
 msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
 msgstr "在 %1:%2 中为发起端 %3 添加逻辑单元编号 %4:%5 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1502
+#: src/include/iscsi-lio-server/widgets.rb:1513
 msgid "Problem removing initiator %3 from %1:%2"
 msgstr "从 %1:%2 中移除发起端 %3 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1526
+#: src/include/iscsi-lio-server/widgets.rb:1537
 msgid "Problem creating initiator %3 for %1:%2"
 msgstr "为 %1:%2 创建发起端 %3 时出现问题"
 
-#: src/include/iscsi-lio-server/widgets.rb:1561
+#: src/include/iscsi-lio-server/widgets.rb:1572
 msgid "Problem changing auth for initiator %3 in %1:%2"
 msgstr "在 %1:%2 中为发起端 %3 修改认证时出现问题"
 

Modified: trunk/yast/zh_CN/po/kdump.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/kdump.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/kdump.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-05 16:54+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -52,25 +52,17 @@
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:117
-msgid ""
-"The naming scheme is:/boot/vmlinu[zx]-[.gz] Please enter only "
-"\"kernel_string\"."
-msgstr ""
-"命名方式是：/boot/vmlinu[zx]-[.gz] 请只输入 \"kernel_string"
-"\"。"
+msgid "The naming scheme is:/boot/vmlinu[zx]-[.gz] Please enter only \"kernel_string\"."
+msgstr "命名方式是：/boot/vmlinu[zx]-[.gz] 请只输入 \"kernel_string\"。"
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:128
-msgid ""
-"The kdump commandline is the command line that needs to be passed off to the "
-"kdump kernel."
+msgid "The kdump commandline is the command line that needs to be passed off to the kdump kernel."
 msgstr "kdump 命令行是需要被传送到 kdump 内核的命令行。"
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:139
-msgid ""
-"Set this variable if you only want to _append_ values to the default command "
-"line string."
+msgid "Set this variable if you only want to _append_ values to the default command line string."
 msgstr "如果您想要附加值到默认命令行字符串，请设定此变量。"
 
 #. TRANSLATORS: CommandLine help
@@ -100,9 +92,7 @@
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:190
-msgid ""
-"SMTP password for sending notification messages. Path of file which includes "
-"password (plain text file)."
+msgid "SMTP password for sending notification messages. Path of file which includes password (plain text file)."
 msgstr "发送通知消息的 SMTP 密码。密码文件 (普通文本文件) 的路径。"
 
 #. TRANSLATORS: CommandLine help
@@ -147,9 +137,7 @@
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:255
-msgid ""
-"Dump target includes type of target from: file (local filesystem), ftp, ssh, "
-"sftp, nfs, cifs"
+msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, sftp, nfs, cifs"
 msgstr "转储标的包括下列标的类型：文件(本地文件系统), ftp, ssh, sftp, nfs, cifs"
 
 #. TRANSLATORS: CommandLine help
@@ -189,12 +177,8 @@
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:303
-msgid ""
-"The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means "
-"only \"kernel_string\"."
-msgstr ""
-"命名方式是：/boot/vmlinu[zx]-[.gz] 内核只意味着 "
-"\"kernel_string\"。"
+msgid "The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means only \"kernel_string\"."
+msgstr "命名方式是：/boot/vmlinu[zx]-[.gz] 内核只意味着 \"kernel_string\"。"
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:310
@@ -203,9 +187,7 @@
 
 #. TRANSLATORS: CommandLine help
 #: src/clients/kdump.rb:317
-msgid ""
-"Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 "
-"or s are allowed"
+msgid "Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed"
 msgstr "选项意味着引导 kdump 内核的运行级别。只允许如 1,2,3,5 这样的数值或 s"
 
 #. TRANSLATORS: CommandLine help
@@ -386,7 +368,7 @@
 #. Force value to false, so it's actually rewritten
 #. TRANSLATORS: CommandLine printed text
 #. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:496
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
 msgid "To apply changes a reboot is necessary."
 msgstr "需要重启来应用变更。"
 
@@ -433,8 +415,7 @@
 
 #. TRANSLATORS: CommandLine printed text help
 #: src/clients/kdump.rb:813
-msgid ""
-"Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
+msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
 msgstr "选项只能包括 \"none\"、\"ELF\"、\"compressed\" 或 \"lzo\" 值。"
 
 #. TRANSLATORS: CommandLine error message
@@ -757,8 +738,7 @@
 #: src/include/kdump/helps.rb:36
 msgid ""
 "<p><b>Enable/Disable Kdump</b><br>\n"
-"    Enable or disable kdump. The boot option crashkernel parameter is added/"
-"removed. \n"
+"    Enable or disable kdump. The boot option crashkernel parameter is added/removed. \n"
 "    To apply changes, a reboot is necessary.<br></p>\n"
 msgstr ""
 "<p><b>启用/禁用 Kdump</b><br>\n"
@@ -779,17 +759,10 @@
 #: src/include/kdump/helps.rb:46
 msgid ""
 "<p><b>Firmware-Assisted Dump</b><br>\n"
-"    Dumps are not generated before the partition is reinitialized but take "
-"place     when the partition is restarting. When performing a firmware-"
-"assisted dump,     system memory is frozen and the partition rebooted, which "
-"allows a new instance     of the operating system to dump data from the "
-"previous kernel crash.    This feature is suitable only when the system has "
-"more than 1.5 GB of memory.</p>"
+"    Dumps are not generated before the partition is reinitialized but take place     when the partition is restarting. When performing a firmware-assisted dump,     system memory is frozen and the partition rebooted, which allows a new instance     of the operating system to dump data from the previous kernel crash.    This feature is suitable only when the system has more than 1.5 GB of memory.</p>"
 msgstr ""
 "<p><b>固件辅助转储</b><br>\n"
-"    转储在分区重新初始化前不会生成，而是在分区重启时生成。当执行固件辅助转储"
-"时，将冻结系统内存并重启分区，这将允许以一个新操作系统实例来从之前崩溃的内核"
-"中转储数据。此功能只适合于有多于 1.5 GB 内存的系统。</p>"
+"    转储在分区重新初始化前不会生成，而是在分区重启时生成。当执行固件辅助转储时，将冻结系统内存并重启分区，这将允许以一个新操作系统实例来从之前崩溃的内核中转储数据。此功能只适合于有多于 1.5 GB 内存的系统。</p>"
 
 #. Kdump Memor&y [MB] - IntField 1/1
 #: src/include/kdump/helps.rb:57
@@ -810,10 +783,8 @@
 "<p><b>Dump Format</b><br>\n"
 "    <i>No Dump</i> - Only save the kernel log.<br>\n"
 "    <i>ELF Format</i> - Create dump file in the ELF format.<br>\n"
-"    <i>Compressed Format</i> - Compress dump data by each page with gzip."
-"<br>\n"
-"    <i>LZO Compressed Format</i> - Slightly bigger files but much faster."
-"<br>\n"
+"    <i>Compressed Format</i> - Compress dump data by each page with gzip.<br>\n"
+"    <i>LZO Compressed Format</i> - Slightly bigger files but much faster.<br>\n"
 "</p>"
 msgstr ""
 "<p><b>转储格式</b></br>\n"
@@ -827,8 +798,7 @@
 #: src/include/kdump/helps.rb:72
 msgid ""
 "<p><b>Saving Target for Kdump Image</b><br>\n"
-"    The target for saving kdump images. Select type of target for saving "
-"dumps.<br></p>"
+"    The target for saving kdump images. Select type of target for saving dumps.<br></p>"
 msgstr ""
 "<p><b>Kdump 映像的保存标的</b><br>\n"
 "    保存 Kdump 映像的标的。选择保存转储的标的类型。<br></p>"
@@ -838,13 +808,11 @@
 msgid ""
 "<p><b>Local Filestem</b> - Save kdump image in the local filesystem.\n"
 "    <i>Directory for Saving Dumps</i> - The path for saving kdump images.\n"
-"    Selecting directory for saving kdump images via dialog by pressing "
-"<i>Browse</i>\n"
+"    Selecting directory for saving kdump images via dialog by pressing <i>Browse</i>\n"
 "    <br></p>"
 msgstr ""
 "<p><b>本地文件系统</b> - 保存 kdump 映像到本地文件系统。\n"
-"    <i>保存转储的目录</i> - 保存 kdump 映像的路径。n    通过按浏览选择对话框"
-"中的文件夹作为保存 kdump 映像的位置。</i>\n"
+"    <i>保存转储的目录</i> - 保存 kdump 映像的路径。n    通过按浏览选择对话框中的文件夹作为保存 kdump 映像的位置。</i>\n"
 "    <br></p>"
 
 #. Dump Format - RadioButtons  3/7
@@ -855,8 +823,7 @@
 "    <i>Port</i> - The port number for connection.\n"
 "    <i>Directory on Server</i> - The path for saving kdump images.\n"
 "    <i>Enable Anonymous FTP</i> enables anonymous connection to server.\n"
-"    <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection."
-"<br></p>"
+"    <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection.<br></p>"
 msgstr ""
 "<p><b>FTP</b> - 通过 FTP 保存 kdump 映像。\n"
 "     <i>服务器名</i> - FTP 服务器的名称。\n"
@@ -980,12 +947,10 @@
 msgid ""
 "<p><b>Enable Delete Old Dump Images</b> - \n"
 "    Enable Delete Old Dump Images. If the number of dump files in \n"
-"    <i>Number of Old Dumps</i> exceeds this number, older dumps are removed."
-"<br></p>"
+"    <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br></p>"
 msgstr ""
 "<p><b>启用删除旧转储映像</b> - \n"
-"    启用删除旧转储映像。如果转储文件数目超出了 <i>旧转储数目</i> 指定的数字，"
-"将删除旧转储映像。<br></p>"
+"    启用删除旧转储映像。如果转储文件数目超出了 <i>旧转储数目</i> 指定的数字，将删除旧转储映像。<br></p>"
 
 #. Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1
 #: src/include/kdump/helps.rb:157
@@ -997,63 +962,45 @@
 "      everything in place for debugging.<br></p>\n"
 msgstr ""
 "<p><b>启用复制内核到转储目录</b> - \n"
-"   如果选中了此选项，内核和调试信息 (若安装) 将复制到转储目录。默认为 \"关"
-"\"。备份所有文件有助于调试。<br></p>\n"
+"   如果选中了此选项，内核和调试信息 (若安装) 将复制到转储目录。默认为 \"关\"。备份所有文件有助于调试。<br></p>\n"
 
 #. SMTP Server
 #: src/include/kdump/helps.rb:165
-msgid ""
-"<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>"
+msgid "<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>"
 msgstr "<p><b>SMTP 服务器</b>用来在转储后发送通知邮件。</p>"
 
 #. SMTP User Name
 #: src/include/kdump/helps.rb:169
 msgid ""
 "<p><b>User Name</b> for SMTP authetication when <i>SMTP Server</i> is\n"
-"  set. This is optional. If you do not specifiy a username and password, "
-"plain SMTP will be used.</p>\n"
-msgstr ""
-"<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>用户名</b>。可选。如果您不指定"
-"用户名和密码，将使用普通 SMTP。</p>\n"
+"  set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>\n"
+msgstr "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>用户名</b>。可选。如果您不指定用户名和密码，将使用普通 SMTP。</p>\n"
 
 #. SMTP Password
 #: src/include/kdump/helps.rb:173
 msgid ""
-"<p><b>Password</b> for SMTP authetication when <i>SMTP Server</i> is set. "
-"This\n"
-"  is optional. If you do not specify a username and password, plain SMTP "
-"will be used.</p>\n"
-msgstr ""
-"<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>密码</b>。可选。如果您不指定用"
-"户名和密码，将使用普通 SMTP。</p>\n"
+"<p><b>Password</b> for SMTP authetication when <i>SMTP Server</i> is set. This\n"
+"  is optional. If you do not specify a username and password, plain SMTP will be used.</p>\n"
+msgstr "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>密码</b>。可选。如果您不指定用户名和密码，将使用普通 SMTP。</p>\n"
 
 #. Notification To (email addresses)
 #: src/include/kdump/helps.rb:177
-msgid ""
-"<p><b>Notification To</b> Specify the email address to which a notification "
-"email will be sent when a dump has been saved.</p>\n"
+msgid "<p><b>Notification To</b> Specify the email address to which a notification email will be sent when a dump has been saved.</p>\n"
 msgstr "<p><b>通知接收对象</b>指定了当转储保存后发送通知邮件的电子邮件地址。</p>\n"
 
 #. Notification CC (email addresses)
 #: src/include/kdump/helps.rb:181
 msgid ""
-"<p><b>Notification CC</b> Specify a list of space-separated email addresses "
-"to\n"
-" which a notification email will be sent via cc if a dump has been saved.\n"
-msgstr ""
-"<p><b>通知抄送对象</b>指定了当转储保存后，通过抄送方式发送通知电子邮件的以空"
-"格分割的电子邮件地址列表。</p>\n"
+"<p><b>Notification CC</b> Specify a list of space-separated email addresses to\n"
+" which a notification email will be sent via cc if a dump has been saved.</p>\n"
+msgstr "<p><b>通知抄送对象</b>指定了当转储保存后，通过抄送方式发送通知电子邮件的以空格分割的电子邮件地址列表。</p>\n"
 
 #. Number of Old Dumps (number)
 #: src/include/kdump/helps.rb:185
 msgid ""
-"<p><b>Number of Old Dumps</b> specifies how many old dumps are kept. If the "
-"number of dump files \n"
+"<p><b>Number of Old Dumps</b> specifies how many old dumps are kept. If the number of dump files \n"
 "exceeds this number, older dumps are removed.</p>"
-msgstr ""
-"<p><b>旧转储数目</b>指定了保存多少旧转储文件。如果转储文件数目超过了该数字，"
-"旧转储文件将被删除。</p>"
+msgstr "<p><b>旧转储数目</b>指定了保存多少旧转储文件。如果转储文件数目超过了该数字，旧转储文件将被删除。</p>"
 
 #. Read dialog help 1/2
 #: src/include/kdump/helps.rb:189
@@ -1281,131 +1228,129 @@
 "细节请参考 %{log}。"
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:506
+#: src/modules/Kdump.rb:511
 msgid "Initializing kdump Configuration"
 msgstr "初始化 kdump 配置"
 
 #. Progress stage 1/4
 #. Progress step 1/4
-#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
 msgid "Reading the config file..."
 msgstr "正在读取配置文件..."
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:517
+#: src/modules/Kdump.rb:522
 msgid "Reading kernel boot options..."
 msgstr "正在读取内核引导选项..."
 
 #. Progress stage 4/4
-#: src/modules/Kdump.rb:519
+#: src/modules/Kdump.rb:524
 msgid "Calculating memory limits..."
 msgstr "正在计算内存限制..."
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:530
 msgid "Reading partitions of disks..."
 msgstr "正在读取磁盘分区..."
 
 #. Progress finished 3/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:532
 msgid "Reading available memory and calibrating usage..."
 msgstr "正在读取可用内存并校准用量..."
 
 #. Error message
-#: src/modules/Kdump.rb:539
+#: src/modules/Kdump.rb:544
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr "无法读取配置文件 /etc/sysconfig/kdump"
 
 #. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:552
 msgid "Cannot read kernel boot options."
 msgstr "无法读取内核引导选项。"
 
 #. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:560
 msgid "Cannot read available memory."
 msgstr "无法读取可用内存。"
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:581
+#: src/modules/Kdump.rb:586
 msgid "Saving kdump Configuration"
 msgstr "保存 kdump 配置"
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:615
 msgid "Write the settings"
 msgstr "写入设置"
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:617
 msgid "Update boot options"
 msgstr "更新引导选项"
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:621
 msgid "Writing the settings..."
 msgstr "正在写入设置..."
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:623
 msgid "Updating boot options..."
 msgstr "正在更新引导选项..."
 
 #. Progress finished
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:625
 msgid "Finished"
 msgstr "已完成"
 
 #. Error message
-#: src/modules/Kdump.rb:630
+#: src/modules/Kdump.rb:635
 msgid "Cannot write settings."
 msgstr "无法写入设置。"
 
 #. Error message
-#: src/modules/Kdump.rb:639
+#: src/modules/Kdump.rb:644
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr "添加 crashkernel 参数到引导加载器失败。"
 
 #. Create a textual summary
 #. @return summary of the current configuration
-#: src/modules/Kdump.rb:750
+#: src/modules/Kdump.rb:764
 msgid "Kdump status: %1"
 msgstr "Kdump 状态：%1"
 
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:765
 msgid "enabled"
 msgstr "已启用"
 
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:765
 msgid "disabled"
 msgstr "已禁用"
 
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:772
 msgid "Value(s) of crashkernel option: %1"
 msgstr "crashkernel 选项的值：%1"
 
-#: src/modules/Kdump.rb:765
+#: src/modules/Kdump.rb:779
 msgid "Dump format: %1"
 msgstr "转储格式：%1"
 
-#: src/modules/Kdump.rb:772
+#: src/modules/Kdump.rb:786
 msgid "Target of dumps: %1"
 msgstr "转储标的：%1"
 
-#: src/modules/Kdump.rb:779
+#: src/modules/Kdump.rb:793
 msgid "Number of dumps: %1"
 msgstr "转储数目：%1"
 
 #. TRANSLATORS: warning message in installation proposal,
 #. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:871
-msgid ""
-"Warning! There might not be enough free space. %{required} required, but "
-"only %{available} are available."
+#: src/modules/Kdump.rb:885
+msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
 msgstr "警告！可能没有足够的剩余空间。需要 %{required}，但只有 %{available} 可用。"
 
 #. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:958
+#: src/modules/Kdump.rb:972
 msgid ""
 "Cannot use Firmware-assisted dump.\n"
 "It is not supported on this hardware."

Modified: trunk/yast/zh_CN/po/mail.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/mail.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/mail.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2014-10-30 17:33+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -308,69 +308,76 @@
 
 #. Translators: dialog caption
 #. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
 msgid "Outgoing Mail"
 msgstr "外发的邮件"
 
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+#, fuzzy
+#| msgid "You cannot define local domains for the mail server."
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr "您不能为该邮件服务器定义本地域。"
+
 #. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
 msgid "No"
 msgstr "否"
 
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
 msgid "Use"
 msgstr "使用"
 
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
 msgid "Enforce"
 msgstr "强制"
 
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
 msgid "&Masquerading"
 msgstr "掩蔽(&M)"
 
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
 msgid "&Authentication"
 msgstr "身份验证(&A)"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
 msgid "Incoming Mail"
 msgstr "进来的邮件"
 
 #. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
 msgid "&Details..."
 msgstr "细节(&D)..."
 
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
 msgid "Start &fetchmail"
 msgstr "启动 &fetchmail"
 
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
 msgid "manual"
 msgstr "手动"
 
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
 msgid "daemon"
 msgstr "守护进程"
 
 #. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
 msgid "&Downloading"
 msgstr "下载(&D)"
 
 #. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
 msgid "&Aliases..."
 msgstr "别名(&A)..."
 
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
 msgid "&Virtual domains..."
 msgstr "虚拟域(&V)..."
 
@@ -378,7 +385,7 @@
 #. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
 #. %2: file name (eg. /etc/sysconfig/postfix)
 #. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
 msgid ""
 "To be able to deliver mail to your local MTA,\n"
 "the value of %1 in %2 will be set to\n"
@@ -392,7 +399,7 @@
 #. correct and complete.  The login name may contain only
 #. certain characters and must begin with a letter.
 #. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
 msgid ""
 "The user login may contain only\n"
 "lower case letters, digits, \"-\" and \"_\"\n"
@@ -405,39 +412,39 @@
 "请重试。\n"
 
 #. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
 msgid "Sender address rewriting"
 msgstr "寄件人地址重写"
 
 #. Translators: text entry label
 #. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
 #: src/include/mail/widgets.rb:269
 msgid "&Local user"
 msgstr "本地用户(&L)"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
 msgid "&Display as"
 msgstr "显示为(&D)"
 
 #. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
 msgid "The address for this user is already defined."
 msgstr "已定义此用户的地址。"
 
 #. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
 msgid "The mail address format is incorrect."
 msgstr "邮件地址格式不正确。"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
 msgid "Masquerading"
 msgstr "掩蔽(Masquerading)"
 
 #. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
 msgid "Masquerade &local domains"
 msgstr "掩蔽本地域(&L)"
 
@@ -447,23 +454,23 @@
 #. //			`Left (`Label (`opt (`outputField, `hstretch), ld))
 #. ),
 #. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
 msgid "Ma&squerade other domains"
 msgstr "掩蔽其它域(&S)"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
 msgid "Do&mains to masquerade"
 msgstr "要掩蔽的域(&M)"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
 msgid "Local user"
 msgstr "本地用户"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
 msgid "Display as"
 msgstr "显示为"
 
@@ -472,23 +479,23 @@
 #. ["holly", "jane", "tarzan"])),
 #. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly@red.dwarf"))
 #. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
 msgid "A&dd"
 msgstr "添加(&D)"
 
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
 msgid "&Edit"
 msgstr "编辑(&E)"
 
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
 msgid "Dele&te"
 msgstr "删除(&T)"
 
 #. Translators: error popup
 #. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
 msgid "The domain name is incorrect"
 msgstr "域名不正确"
 
@@ -496,106 +503,106 @@
 #. list<string> lmod = [];
 #. list<map> mu = Mail::masquerade_users;
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
 msgid "Outgoing Server Authentication"
 msgstr "外发服务器身份验证"
 
 #. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
 msgid "Outgoing &Server"
 msgstr "外发服务器(&S)"
 
 #. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
 msgid "&User name"
 msgstr "用户名(&U)"
 
 #. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
 msgid "&Password"
 msgstr "密码(&P)"
 
 #. Translators: popup dialog heading
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
 msgid "Mail downloading"
 msgstr "邮件下载"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
 msgid "Server"
 msgstr "服务器"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
 msgid "Protocol"
 msgstr "协议"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
 msgid "User"
 msgstr "用户"
 
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
 msgid "De&lete"
 msgstr "删除(&L)"
 
 #. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
 msgid "Incoming mail redirection"
 msgstr "进来的邮件重定向"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
 msgid "&Alias"
 msgstr "别名(&A)"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
 msgid "&Destinations"
 msgstr "目标(&D)"
 
 #. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
 msgid "The alias format is incorrect."
 msgstr "别名格式不正确。"
 
 #. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
 msgid "The destinations for this alias are already defined."
 msgstr "已定义此别名的目标。"
 
 #. Translators: dialog caption
 #. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
 msgid "Aliases"
 msgstr "别名"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
 msgid "Alias"
 msgstr "别名"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
 msgid "Destinations"
 msgstr "目标"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
 msgid "Virtual domains"
 msgstr "虚拟域"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
 msgid "Mail configuration"
 msgstr "邮件配置"
 
 #. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
 msgid "Initializing..."
 msgstr "正在初始化..."
 
@@ -870,12 +877,12 @@
 msgstr "到 IMAP 服务器"
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
 msgid "AMaViS, a virus scanner, will be installed.\n"
 msgstr "将安装 AMaViS，它是一种病毒扫描程序。\n"
 
 #. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
 msgid ""
 "AMaViS needs a virus scanner such as ClamAV\n"
 "to do the actual scanning, but ClamAV was not found.\n"
@@ -885,56 +892,56 @@
 "请手动配置一个扫描程序。"
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
 msgid "Fetchmail, a mail downloading utility, will be installed.\n"
 msgstr "将安装 Fetchmail，它是一种邮件下载工具。\n"
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
 msgid "Dovecot IMAP server, will be installed.\n"
 msgstr "将安装 Dovecot IMAP 服务器。\n"
 
 #. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
 msgid "Initializing mail configuration"
 msgstr "正在初始化邮件配置"
 
 #. Translators: progress label
 #. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
 msgid "Determining Mail Transport Agent (MTA)"
 msgstr "正在确定邮件传输代理 (MTA)"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
 msgid "Reading general settings"
 msgstr "正在读取一般设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
 msgid "Reading masquerading settings"
 msgstr "正在读取掩蔽设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
 msgid "Reading downloading settings"
 msgstr "正在读取下载设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
 msgid "Reading alias tables"
 msgstr "正在读取别名表"
 
 #. Translators: progress label
 #. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
 msgid "Reading authentication settings..."
 msgstr "正在读取身份验证设置..."
 
 #. Translators: error message,
 #. %1 is a file name,
 #. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
 msgid ""
 "Error reading file %1. The file must have\n"
 "a fixed format to be readable by YaST.  For details, see\n"
@@ -945,161 +952,161 @@
 "%2"
 
 #. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
 msgid "Error writing the fetchmail configuration."
 msgstr "写入 fetchmail 配置时出错。"
 
 #. Translators: error message
 #. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
 msgid "Error writing file %1"
 msgstr "写入文件 %1 时出错"
 
 #. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
 msgid "Error running config.postfix"
 msgstr "运行 config.postfix 时出错"
 
 #. Translators: error message
 #. Translators: error message
 #. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
 msgid "Error starting service %1."
 msgstr "启动服务 %1 时出错。"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
 msgid "Writing general settings"
 msgstr "正在写入一般设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
 msgid "Writing masquerading settings"
 msgstr "正在写入掩蔽设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
 msgid "Writing alias tables"
 msgstr "正在写入别名表"
 
 #. Write them unconditionally, because it is now possible to
 #. enter them also in the Permanent mode. Bug #17417.
 #. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
 msgid "Writing downloading settings"
 msgstr "正在写入下载设置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
 msgid "Writing authentication settings..."
 msgstr "正在写入身份验证设置..."
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
 msgid "Finishing writing configuration files"
 msgstr "正在完成写入配置文件"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
 msgid "Running Config Postfix"
 msgstr "正在运行 Postfix 配置"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
 msgid "Restarting services"
 msgstr "正在重启动服务"
 
 #. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
 msgid "Saving mail configuration"
 msgstr "正在保存邮件配置"
 
 #. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
 msgid "Other"
 msgstr "其它"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
 msgid "Permanent"
 msgstr "永久"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
 msgid "Dial-up"
 msgstr "拨号"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
 msgid "None"
 msgstr "无"
 
 #. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
 msgid "MTA"
 msgstr "邮件传输代理"
 
 #. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
 msgid "Connection Type"
 msgstr "连接类型"
 
 #. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
 msgid "Outgoing Mail Server"
 msgstr "外发邮件服务器"
 
 #. summary header; the "From: foo@bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
 msgid "From Header"
 msgstr "寄件人标头"
 
 #. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
 msgid "Local Domains"
 msgstr "本地域"
 
 #. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
 msgid "Masquerade Other Domains"
 msgstr "掩蔽其它域"
 
 #. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
 msgid "Masquerade Users"
 msgstr "掩蔽用户"
 
 #. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
 msgid "Accept remote SMTP connections"
 msgstr "接受远程 SMTP 连接"
 
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
 msgid "Yes"
 msgstr "是"
 
 #. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
 msgid "Use AMaViS"
 msgstr "使用 AMaViS"
 
 #. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
 msgid "Use DKIM"
 msgstr "使用 DKIM"
 
 #. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
 msgid "Fetchmail"
 msgstr "Fetchmail"
 
 #. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
 msgid "Virtual Users"
 msgstr "虚拟用户"
 
 #. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
 msgid "Authentication"
 msgstr "身份验证"
 
@@ -1572,9 +1579,6 @@
 #~ "密码不匹配。\n"
 #~ "请重试。"
 
-#~ msgid "You cannot define local domains for the mail server."
-#~ msgstr "您不能为该邮件服务器定义本地域。"
-
 #~ msgid "Defined Domains"
 #~ msgstr "定义的域"
 

Modified: trunk/yast/zh_CN/po/network.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/network.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/network.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-03-02 22:27+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -128,10 +128,8 @@
 #: src/clients/firewall_stage1_proposal.rb:195
 msgid ""
 "<p><b><big>Firewall and SSH</big></b><br>\n"
-"Firewall is a defensive mechanism that protects your computer from network "
-"attacks.\n"
-"SSH is a service that allows logging into this computer remotely via "
-"dedicated\n"
+"Firewall is a defensive mechanism that protects your computer from network attacks.\n"
+"SSH is a service that allows logging into this computer remotely via dedicated\n"
 "SSH client</p>"
 msgstr ""
 "<p><b><big>防火墙和 SSH</big></b><br />\n"
@@ -140,21 +138,17 @@
 
 #: src/clients/firewall_stage1_proposal.rb:201
 msgid ""
-"<p>Here you can choose whether the firewall will be enabled or disabled "
-"after\n"
+"<p>Here you can choose whether the firewall will be enabled or disabled after\n"
 "the installation. It is recommended to keep it enabled.</p>"
 msgstr "<p>在此您可以选择在安装后启用或禁用防火墙。推荐保持启用。</p>"
 
 #: src/clients/firewall_stage1_proposal.rb:204
 msgid ""
-"<p>With enabled firewall, you can decide whether to open firewall port for "
-"SSH\n"
-"service and allow remote SSH logins. Independently you can also enable SSH "
-"service (i.e. it\n"
+"<p>With enabled firewall, you can decide whether to open firewall port for SSH\n"
+"service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n"
 "will be started on computer boot).</p>"
 msgstr ""
-"<p>若启用了防火墙，您可以决定是否为 SSH 服务打开防火墙端口并允许远程 SSH 登"
-"入。\n"
+"<p>若启用了防火墙，您可以决定是否为 SSH 服务打开防火墙端口并允许远程 SSH 登入。\n"
 "另外您也可以决定是否启用 SSH 服务(即，它将在计算机引导时启动)。</p>"
 
 #. TRANSLATORS: help text
@@ -339,13 +333,13 @@
 msgstr "安装下载好的版本资讯失败。"
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
 msgid "Opening of Connection"
 msgstr "打开连接"
 
 #. popup to inform user about the failure
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
 msgid ""
 "Connecting to the Internet failed. View\n"
 "the logs for details.\n"
@@ -354,22 +348,19 @@
 "细节请查看日志。\n"
 
 #. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
-msgid ""
-"No URL for the release notes defined. Internet test cannot be performed."
+#: src/clients/inst_do_net_test.rb:870
+msgid "No URL for the release notes defined. Internet test cannot be performed."
 msgstr "未定义版本资讯的 URL。无法执行互联网测试。"
 
 #. popup informing user about the failure to retrieve release notes
 #. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
 msgid ""
 "Download of latest release notes failed due to server-side error. \n"
 "This does not necessarily imply a faulty network configuration.\n"
 "\n"
-"Click 'Continue' to proceed to the next installation step. To skip any "
-"steps\n"
-"requiring an internet connection or to get back to your network "
-"configuration,\n"
+"Click 'Continue' to proceed to the next installation step. To skip any steps\n"
+"requiring an internet connection or to get back to your network configuration,\n"
 "click 'Cancel'.\n"
 msgstr ""
 "由于服务器端错误，下载最新的版本资讯失败。\n"
@@ -380,7 +371,7 @@
 "请点击 '取消'。\n"
 
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
 msgid ""
 "Download of latest release notes failed. View\n"
 "the logs for details."
@@ -389,12 +380,12 @@
 "细节请查看日志。"
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
 msgid "Check for Patches"
 msgstr "检查补丁"
 
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
 msgid ""
 "Check for latest updates failed. View\n"
 "the logs for details.\n"
@@ -403,7 +394,7 @@
 "细节请查看日志。\n"
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
 msgid "Closing of Connection"
 msgstr "关闭连接"
 
@@ -578,7 +569,7 @@
 #. Commandline help title
 #. Main routing dialog
 #. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
 msgid "Routing Configuration"
 msgstr "路由配置"
 
@@ -664,7 +655,7 @@
 msgstr "网关"
 
 #. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
 msgid "Netmask"
 msgstr "网络掩码"
 
@@ -682,78 +673,76 @@
 
 #. Handler for action "list"
 #. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
 msgid "No entry for destination '%1' in routing table"
 msgstr "路由表中无目的地 '%1' 项"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
 msgid "%s forwarding is enabled"
 msgstr "已启用 %s 转发"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
 msgid "%s forwarding is disabled"
 msgstr "已禁用 %s 转发"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
 msgid "Enabling %s forwarding..."
 msgstr "正在启用 %s 转发..."
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
 msgid "Disabling %s forwarding..."
 msgstr "正在禁用 %s 转发..."
 
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
 msgid "IPv4 Forwarding:"
 msgstr "IPv4 转发："
 
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
 msgid "IPv6 Forwarding:"
 msgstr "IPv6 转发："
 
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
 msgid "IPv4 and IPv6 Forwarding:"
 msgstr "IPv4 和 IPv6 转发："
 
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
 msgid "At least destination and gateway IP addresses must be specified."
 msgstr "必须至少指定目的地和网关 IP 地址。"
 
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
 msgid "Adding '%1' destination to routing table ..."
 msgstr "正在将目的地 '%1' 添加到路由表中..."
 
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
 msgid "Destination IP address must be specified."
 msgstr "必须指定目的地 IP 地址。"
 
-#: src/clients/routing.rb:348
-msgid ""
-"At least one of the following parameters (gateway, netmask, device, options) "
-"must be specified"
+#: src/clients/routing.rb:349
+msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
 msgstr "必须指定至少一个以下参数 (网关、网络掩码、设备、选项)"
 
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
 msgid "Updating '%1' destination in routing table ..."
 msgstr "正在更新路由表中的目的地 '%1'..."
 
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
 msgid "Deleting '%1' destination from routing table ..."
 msgstr "正在从路由表中删除目的地 '%1'..."
 
 #. interface summary: WiFi without encryption
 #. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
 msgid "Warning: no encryption is used."
 msgstr "警告：未使用加密。"
 
 #. Hyperlink: Change the configuration of an interface
 #. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
 msgid "Change."
 msgstr "修改。"
 
@@ -854,70 +843,70 @@
 msgstr "USB 无线网卡"
 
 #. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
 msgid "Unknown Network Device"
 msgstr "未知网络设备"
 
 #. Modem status (%1 is device)
 #. ISDN device status (%1 is device)
 #. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
 msgid "Configured as %1"
 msgstr "已配置为 %1"
 
 #. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
 msgid "Configured as %1 with provider %2"
 msgstr "已配置为 %1，服务提供商 %2"
 
 #. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
 msgid "Configured as %1 with provider %2 (protocol %3)"
 msgstr "已配置为%1，服务提供商 %2 (协议 %3)"
 
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
 msgid "Configured without address (NONE)"
 msgstr "已配置为不带地址 (NONE)"
 
 #. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
 msgid "Configured without an address"
 msgstr "已配置为不带地址"
 
 #. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
 msgid "Configured with address %1"
 msgstr "已配置为地址 %1"
 
 #. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
 msgid "Configured with address %1 (remote %2)"
 msgstr "已配置为地址 %1 (远程 %2)"
 
 #. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
 msgid "Configured with %1"
 msgstr "已配置为 %1"
 
 #. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
 msgid "Configured as %1 with address %2"
 msgstr "已配置为 %1，地址 %2"
 
 #. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
 msgid "Configured as %1 with address %2 (remote %3)"
 msgstr "已配置为 %1，地址 %2 (远程 %3)"
 
 #. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
 msgid "Configured as %1 with %2"
 msgstr "已配置为 %1, %2"
 
 #. Abbreviation for "The interface is Managed by NetworkManager"
 #. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
 msgid "Managed"
 msgstr "受管"
 
@@ -1044,18 +1033,18 @@
 msgstr "选择日志(&S)："
 
 #. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
 msgid "Additional Addresses"
 msgstr "附加地址"
 
 #. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
 msgid "IPv4 Address Label"
 msgstr "IPv4 地址标签"
 
 #. Table header label
 #. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
 #: src/include/network/services/host.rb:129
 msgid "IP Address"
 msgstr "IP 地址"
@@ -1063,7 +1052,7 @@
 #. PushButton label
 #. PushButton label
 #. PushButton label
-#: src/include/network/lan/address.rb:106
+#: src/include/network/lan/address.rb:108
 #: src/include/network/services/host.rb:140
 #: src/include/network/services/routing.rb:100
 msgid "Ad&d"
@@ -1073,7 +1062,7 @@
 #. PushButton label
 #. PushButton label
 #. Pushbutton label
-#: src/include/network/lan/address.rb:108
+#: src/include/network/lan/address.rb:110
 #: src/include/network/services/host.rb:142
 #: src/include/network/services/routing.rb:102
 #: src/include/network/summary.rb:69
@@ -1084,156 +1073,156 @@
 #. PushButton label
 #. PushButton label
 #. Pushbutton label
-#: src/include/network/lan/address.rb:110
+#: src/include/network/lan/address.rb:112
 #: src/include/network/services/host.rb:144
 #: src/include/network/services/routing.rb:104
 #: src/include/network/summary.rb:71
 msgid "De&lete"
 msgstr "删除(&L)"
 
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
 msgid "&Name of Interface"
 msgstr "接口名称(&N)"
 
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
 msgid "<p>TODO kind of vague!</p>"
 msgstr "<p>要执行的操作不明确！</p>"
 
 #. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
 msgid "Assign Interface to Firewall &Zone"
 msgstr "将接口指派到防火墙区域(&Z)"
 
 #. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
 msgid "&Mandatory Interface"
 msgstr "必备接口(&M)"
 
 #. ComboBox label
 #. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
 #: src/include/network/lan/hardware.rb:351
 msgid "&Device Type"
 msgstr "设备类型(&D)"
 
 #. ComboBox label
 #. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
 #: src/include/network/lan/hardware.rb:337
 msgid "&Configuration Name"
 msgstr "配置名称(&C)"
 
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
 msgid "Tunnel owner"
 msgstr "隧道所有者"
 
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
 msgid "Tunnel group"
 msgstr "隧道组"
 
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1315
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
 msgid "Bridged Devices"
 msgstr "桥接设备"
 
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
 msgid "Real Interface for &VLAN"
 msgstr "虚拟局域网的真实接口(&V)"
 
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
 msgid "VLAN ID"
 msgstr "虚拟局域网 ID"
 
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
 msgid "Bond Slaves and Order"
 msgstr "绑定从属和顺序"
 
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
 msgid "Up"
 msgstr "向上"
 
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
 msgid "Down"
 msgstr "向下"
 
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
 msgid "Bond &Slaves"
 msgstr "绑定从属(&S)"
 
 #. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
 msgid "&Bond Driver Options"
 msgstr "绑定驱动选项(&B)"
 
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
 msgid "<p>Select the bond driver options and edit them if necessary. </p>"
 msgstr "<p>选择绑定驱动选项并在需要时加以编辑。</p>"
 
 #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
 #. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:816
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
 msgid "No Link and IP Setup (Bonding Slaves)"
 msgstr "无链接和 IP 设置 (绑定从属)"
 
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
 msgid "Use iBFT Values"
 msgstr "使用 iBFT 值"
 
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
 msgid "Dynamic Address"
 msgstr "动态地址"
 
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
 msgid "DHCP both version 4 and 6"
 msgstr "DHCP 版本 4 和 6"
 
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
 msgid "DHCP version 4 only"
 msgstr "仅 DHCP 版本 4"
 
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
 msgid "DHCP version 6 only"
 msgstr "仅 DHCP 版本 6"
 
 #. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
 msgid "Statically Assigned IP Address"
 msgstr "静态指派的 IP 地址"
 
 #. TextEntry label
 #. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:334
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
 msgid "&IP Address"
 msgstr "&IP 地址"
 
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
 msgid "&Subnet Mask"
 msgstr "子网掩码(&S)"
 
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
 msgid "&Hostname"
 msgstr "主机名(&H)"
 
 #. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
 msgid "R&emote IP Address"
 msgstr "远程 IP 地址(&E)"
 
 #. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
 msgid "The remote IP address is invalid."
 msgstr "远程 IP 地址无效。"
 
 #. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
 msgid "&S/390"
 msgstr "&S/390"
 
 #. validate device type, misdetection
-#: src/include/network/lan/address.rb:1036
+#: src/include/network/lan/address.rb:1030
 msgid ""
 "You have changed the interface type from the one\n"
 "that has been detected. This only makes sense\n"
@@ -1243,13 +1232,13 @@
 "这只有在您知道检测有误时才有意义。"
 
 #. Popup text
-#: src/include/network/lan/address.rb:1056
+#: src/include/network/lan/address.rb:1050
 msgid "Configuration %1 already present."
 msgstr "配置 %1 已存在。"
 
 #. If firewall is active and interface in no zone, nothing
 #. gets through (#62309) so warn and redirect to details
-#: src/include/network/lan/address.rb:1080
+#: src/include/network/lan/address.rb:1074
 msgid ""
 "The firewall is active, but this interface is not\n"
 "in any zone. All its traffic would be blocked.\n"
@@ -1263,20 +1252,20 @@
 #. @param [String] key	the widget being validated
 #. @param [Hash] event	the event being handled
 #. @return whether valid
-#: src/include/network/lan/address.rb:1100
+#: src/include/network/lan/address.rb:1094
 msgid "No valid IP address."
 msgstr "无效的 IP 地址。"
 
-#: src/include/network/lan/address.rb:1107
+#: src/include/network/lan/address.rb:1101
 msgid "No valid netmask or prefix length."
 msgstr "无效的网络掩码或前缀长度。"
 
-#: src/include/network/lan/address.rb:1115
+#: src/include/network/lan/address.rb:1109
 msgid "Invalid hostname."
 msgstr "无效的主机名。"
 
 #. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1123
+#: src/include/network/lan/address.rb:1116
 msgid ""
 "No hostname has been specified. We recommend to associate \n"
 "a hostname with a static IP, otherwise the machine name will \n"
@@ -1290,7 +1279,7 @@
 "真的要把主机名留空吗？\n"
 
 #. Popup text
-#: src/include/network/lan/address.rb:1142
+#: src/include/network/lan/address.rb:1134
 msgid ""
 "Duplicate IP address detected.\n"
 "Really continue?\n"
@@ -1300,82 +1289,88 @@
 
 #. @param [Array<String>] types network card types
 #. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1195
+#: src/include/network/lan/address.rb:1187
 msgid "&General"
 msgstr "常规(&G)"
 
 #. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1206
+#: src/include/network/lan/address.rb:1198
 msgid "Device Activation"
 msgstr "设备激活"
 
-#: src/include/network/lan/address.rb:1210
+#: src/include/network/lan/address.rb:1202
 msgid "Firewall Zone"
 msgstr "防火墙区域"
 
-#: src/include/network/lan/address.rb:1215
+#: src/include/network/lan/address.rb:1207
 msgid "Maximum Transfer Unit (MTU)"
 msgstr "最大传输单元 (MTU)"
 
 #. FIXME: we have helps per widget and for the whole
 #. tab set but not for one tab
-#: src/include/network/lan/address.rb:1225
+#: src/include/network/lan/address.rb:1217
 msgid "<p>Configure the detailed network card settings here.</p>"
 msgstr "<p>在此配置详细网卡设置。</p>"
 
 #. FIXME: here it does not complain about missing
 #. shortcuts
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1284
 msgid "&Address"
 msgstr "地址(&A)"
 
 #. Address tab help
-#: src/include/network/lan/address.rb:1295
+#: src/include/network/lan/address.rb:1287
 msgid "<p>Configure your IP address.</p>"
 msgstr "<p>配置您的 IP 地址。</p>"
 
-#: src/include/network/lan/address.rb:1301
+#: src/include/network/lan/address.rb:1293
 msgid "&Hardware"
 msgstr "硬件(&H)"
 
-#: src/include/network/lan/address.rb:1308
+#: src/include/network/lan/address.rb:1300
 msgid "&Bond Slaves"
 msgstr "绑定从属(&B)"
 
-#: src/include/network/lan/address.rb:1322
+#: src/include/network/lan/address.rb:1314
 msgid "&Wireless"
 msgstr "无线(&W)"
 
 #. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1406
+#: src/include/network/lan/address.rb:1398
 msgid "Ifplugd Priority"
 msgstr "Ifplugd 优先级"
 
 #. Device activation main help. The individual parts will be
 #. substituted as %1
-#: src/include/network/lan/address.rb:1412
+#: src/include/network/lan/address.rb:1404
 msgid ""
 "<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
-"<p> All interfaces configured with <b>On Cable Connection</b> and with "
-"IFPLUGD_PRIORITY != 0 will be\n"
-" used mutually exclusive. If more then one of these interfaces is <b>On "
-"Cable Connection</b>\n"
-" then we need a way to decide which interface to take up. Therefore we have "
-"to\n"
+"<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n"
+" used mutually exclusive. If more then one of these interfaces is <b>On Cable Connection</b>\n"
+" then we need a way to decide which interface to take up. Therefore we have to\n"
 " set the priority of each interface.  </p>\n"
 msgstr ""
 "<p><b><big>IFPLUGD 优先级</big></b></p>\n"
-"<p>全部配置为<b>在网线连接时</b>和 IFPLUGD_PRIORITY != 0 的接口都将是互斥"
-"的。\n"
-"若大于一个这样的接口是<b>在网线连接时</b>那么我们需要一种方法决定激活哪个接"
-"口。\n"
+"<p>全部配置为<b>在网线连接时</b>和 IFPLUGD_PRIORITY != 0 的接口都将是互斥的。\n"
+"若大于一个这样的接口是<b>在网线连接时</b>那么我们需要一种方法决定激活哪个接口。\n"
 "因此我们需要设置每个接口的优先级。</p>\n"
 
 #. Address dialog caption
-#: src/include/network/lan/address.rb:1494
+#: src/include/network/lan/address.rb:1486
 msgid "Network Card Setup"
 msgstr "网卡设置"
 
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
 #. remove all aliases (bnc#590167)
 #: src/include/network/lan/bridge.rb:86
 msgid ""
@@ -1566,32 +1561,30 @@
 msgstr "使用 \"id\" 选项确定设备。"
 
 #: src/include/network/lan/cmdline.rb:98
-msgid ""
-"Value of \"id\" is out of range. Use \"list\" option to check max. value of "
-"\"id\"."
+msgid "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"."
 msgstr "\"id\" 的值超出范围。请使用 \"list\" 选项检查 \"id\" 的最大值。"
 
 #. Handler for action "add"
 #. @param [Hash{String => String}] options action options
 #. Handler for action "edit"
 #. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
 msgid "Impossible value for bootproto."
 msgstr "bootproto 的值非法。"
 
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
 msgid "Impossible value for startmode."
 msgstr "startmode 的值非法。"
 
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
 msgid "For static configuration, the \"ip\" option is needed."
 msgstr "静态配置需要 \"ip\" 选项。"
 
 #. Handler for action "delete"
 #. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
 msgid "The device was deleted."
 msgstr "该设备已删除。"
 
@@ -1652,7 +1645,7 @@
 
 #. Write settings dialog
 #. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
 msgid ""
 "Firmware is needed. Install it from \n"
 "the add-on CD.\n"
@@ -1662,7 +1655,7 @@
 "需要固件。请从附加 CD 安装之。\n"
 "首先将附加 CD 添加到 YaST 软件源，然后返回此配置对话框。\n"
 
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
 msgid ""
 "The device needs a firmware to function properly. Usually, it can be\n"
 "downloaded from your driver vendor's Web page. \n"
@@ -1678,23 +1671,20 @@
 #. - kernel modules (InstallKernel): before loaded
 #. - wlan firmware: here, just because it is copied from modems
 #. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
 msgid "Installing firmware"
 msgstr "正在安装固件"
 
-#: src/include/network/lan/complex.rb:233
-msgid ""
-"For successful firmware installation, the 'install_bcm43xx_firmware' script "
-"needs to be executed. Execute it now?"
-msgstr ""
-"为了顺利安装固件，需要执行 'install_bcm43xx_firmware' 脚本。现在执行它吗？"
+#: src/include/network/lan/complex.rb:232
+msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
+msgstr "为了顺利安装固件，需要执行 'install_bcm43xx_firmware' 脚本。现在执行它吗？"
 
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
 msgid "An error occurred during firmware installation."
 msgstr "固件安装时出错。"
 
 #. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
 msgid ""
 "The interface is currently set to be managed\n"
 "by the NetworkManager applet.\n"
@@ -1708,12 +1698,12 @@
 "该接口将不再由 NetworkManager 管理。\n"
 
 #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:454
+#: src/include/network/lan/complex.rb:453
 msgid "Device you select has STARTMODE=nfsroot. Really delete?"
 msgstr "您选择的设备有 STARTMODE=nfsroot。真的删除吗？"
 
 #. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
 msgid "Network Setup Method"
 msgstr "网络设置方法"
 
@@ -1722,7 +1712,7 @@
 #. it is basically useful if user aborts dialog and he has done some
 #. changes already. Calling this function may results in confirmation
 #. popup.
-#: src/include/network/lan/complex.rb:517
+#: src/include/network/lan/complex.rb:515
 msgid "Network Settings"
 msgstr "网络设置"
 
@@ -1766,8 +1756,7 @@
 #: src/include/network/lan/hardware.rb:99
 msgid ""
 "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n"
-"associating the MAC address or BusID of the network device with its name "
-"(for\n"
+"associating the MAC address or BusID of the network device with its name (for\n"
 "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n"
 msgstr ""
 "<p><b>Udev 规则</b> 是内核设备管理器的规则，\n"
@@ -1776,25 +1765,20 @@
 
 #: src/include/network/lan/hardware.rb:105
 msgid ""
-"<p><b>Show visible port identification</b> allows you to physically identify "
-"now configured NIC. \n"
-"Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will "
-"start blinking for selected time.\n"
+"<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n"
+"Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n"
 "</p>"
 msgstr ""
 "<p><b>显示可见端口标识</b>允许您物理识别现在正配置的 NIC。\n"
-"设置适宜的时间，点击<b>闪烁</b>然后您 NIC 上的 LED 二极管将每隔所选时间就闪烁"
-"一次。\n"
+"设置适宜的时间，点击<b>闪烁</b>然后您 NIC 上的 LED 二极管将每隔所选时间就闪烁一次。\n"
 "</p>"
 
 #. Manual network card setup help 2/4
 #: src/include/network/lan/hardware.rb:118
 msgid ""
 "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n"
-"for your network device here. If the device is already configured, see if "
-"there is more than one driver available for\n"
-"your device in the drop-down list. If necessary, choose a driver from the "
-"list, but usually the default value works.</p>\n"
+"for your network device here. If the device is already configured, see if there is more than one driver available for\n"
+"your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works.</p>\n"
 msgstr ""
 "<p><b>内核模块</b>。在此为您的网络设备输入内核模块 (驱动) 名称。\n"
 "若设备已经配置过了，请在下拉列表中查看是否有多个驱动可用于您的设备。\n"
@@ -1804,23 +1788,16 @@
 #: src/include/network/lan/hardware.rb:125
 msgid ""
 "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
-"format: <i>option</i>=<i>value</i>. Each entry should be space-separated, "
-"for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
-"configured with the same module name, the options will be merged while "
-"saving.</p>\n"
+"format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
+"configured with the same module name, the options will be merged while saving.</p>\n"
 msgstr ""
 "<p>另外，也可以指定内核模块的<b>选项</b>。 \n"
-"使用此格式：<i>选项</i>=<i>值</i>。每项之间以空格分隔，例如 <i>io=0x300 "
-"irq=5</i>。\n"
+"使用此格式：<i>选项</i>=<i>值</i>。每项之间以空格分隔，例如 <i>io=0x300 irq=5</i>。\n"
 "<b>注意：</b>若用同一个模块名称配置了两块网卡，则保存时将合并这些选项。</p>\n"
 
 #: src/include/network/lan/hardware.rb:131
-msgid ""
-"<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool "
-"with these options.</p>\n"
-msgstr ""
-"<p>若您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。"
-"</p>\n"
+msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n"
+msgstr "<p>若您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。</p>\n"
 
 #. Manual dialog help 4/4
 #: src/include/network/lan/hardware.rb:140
@@ -1837,17 +1814,14 @@
 msgid ""
 "<p>Here, set up your networking device. The values will be\n"
 "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
-msgstr ""
-"<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/"
-"chandev.conf</i>。</p>\n"
+msgstr "<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/chandev.conf</i>。</p>\n"
 
 #. Manual dialog help 6/4
 #: src/include/network/lan/hardware.rb:153
 msgid ""
 "<p>Options for the module should be written in the format specified\n"
 "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"
-msgstr ""
-"<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>"
+msgstr "<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>"
 
 #. CheckBox label
 #: src/include/network/lan/hardware.rb:281
@@ -1914,7 +1888,7 @@
 #. Selection box label
 #. Selection box title
 #: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
 msgid "&Network Card"
 msgstr "网卡(&N)"
 
@@ -1924,7 +1898,7 @@
 msgstr "搜索(&S)"
 
 #. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
 msgid ""
 "Configuration name %1 already exists.\n"
 "Choose a different one."
@@ -1933,7 +1907,7 @@
 "请选择一个不同的名称。"
 
 #. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
 msgid "S/390 Network Card Configuration"
 msgstr "S/390 网卡配置"
 
@@ -1941,139 +1915,131 @@
 #. Frame label
 #. Frame label
 #. Frame label
-#: src/include/network/lan/hardware.rb:873
-#: src/include/network/lan/hardware.rb:975
-#: src/include/network/lan/hardware.rb:1042
-#: src/include/network/lan/hardware.rb:1079
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
 msgid "S/390 Device Settings"
 msgstr "S/390 设备设置"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
 msgid "&Port Name"
 msgstr "端口名称(&P)"
 
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
 msgid "Port Number"
 msgstr "端口号"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
 msgid "&Enable IPA Takeover"
 msgstr "启用 IPA 接管(&E)"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
 msgid "Enable &Layer 2 Support"
 msgstr "启用第 2 层支持(&L)"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
 msgid "Layer2 &MAC Address"
 msgstr "第 2 层 MAC 地址(&M)"
 
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
 msgid "Read Channel"
 msgstr "读取通道"
 
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
 msgid "Write Channel"
 msgstr "写入通道"
 
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
 msgid "Control Channel"
 msgstr "控制通道"
 
 #. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
 msgstr "<p>输入此接口的<b>端口名称</b>(大小写敏感)。</p>"
 
 #. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
-msgid ""
-"<p>Enter any additional <b>Options</b> for this interface (separated by "
-"spaces).</p>"
+#: src/include/network/lan/hardware.rb:950
+msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
 msgstr "<p>输入此接口的任何附加<b>选项</b> (以空格分隔)。</p>"
 
-#: src/include/network/lan/hardware.rb:954
-msgid ""
-"<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be "
-"enabled for this interface.</p>"
+#: src/include/network/lan/hardware.rb:953
+msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
 msgstr "<p>若应为此接口启用 IP 地址接管，请选择<b>启用 IPA 接管</b>。</p>"
 
-#: src/include/network/lan/hardware.rb:957
-msgid ""
-"<p>Select <b>Enable Layer 2 Support</b> if this card has been configured "
-"with layer 2 support.</p>"
+#: src/include/network/lan/hardware.rb:956
+msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>若此卡已配置了第 2 层支持，请选择<b>启用第 2 层支持</b>。</p>"
 
-#: src/include/network/lan/hardware.rb:960
-msgid ""
-"<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured "
-"with layer 2 support.</p>"
+#: src/include/network/lan/hardware.rb:959
+msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>若此卡已配置了第 2 层支持，请输入<b>第 2 层 MAC 地址</b>。</p>"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
 msgid "&Port Number"
 msgstr "端口号(&P)"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
 msgid "&LANCMD Time-Out"
 msgstr "&LANCMD 超时"
 
 #. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
 msgstr "<p>选择此接口的<b>端口号</b>。</p>"
 
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
 msgstr "<p>为此接口指定 <b>LANCMD 超时</b>。</p>"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
 msgid "Compatibility Mode"
 msgstr "兼容模式"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
 msgid "Extended Mode"
 msgstr "扩展模式"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
 msgid "CTC-Based tty (Linux to Linux Connections)"
 msgstr "基于 CTC 的控制台 (Linux 到 Linux 连接)"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
 msgid "Compatibility Mode with OS/390 and z/OS"
 msgstr "OS/390 和 z/OS 兼容模式"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
 msgid "&Protocol"
 msgstr "协议(&P)"
 
 #. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
 msgstr "<p>选择此接口的<b>协议</b>。</p>"
 
 #. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
 msgid "&Peer Name"
 msgstr "对等点名称(&P)"
 
 #. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
 msgid ""
 "<p>Enter the name of the IUCV peer,\n"
 "for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
@@ -2081,8 +2047,7 @@
 "<p>请输入 IUCV 对等点的名称，\n"
 "例如，要连接的 z/VM 用户名 (大小写敏感)。</p>\n"
 
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
 msgid ""
 "An error occurred while creating device.\n"
 "See YaST log for details."
@@ -2092,7 +2057,7 @@
 
 #. Manual network card configuration dialog
 #. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
 msgid "Hardware Dialog"
 msgstr "硬件对话框"
 
@@ -2200,8 +2165,7 @@
 "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
 "It is possible to use IPv6 together with IPv4. This is the default option.\n"
 "To disable IPv6, uncheck this option. This will blacklist the kernel \n"
-"module for ipv6. If the IPv6 protocol is not used on your network, the "
-"response \n"
+"module for ipv6. If the IPv6 protocol is not used on your network, the response \n"
 "time can be faster.</p>\n"
 msgstr ""
 "<p><b><big>IPv6 协议设置</big></b></p>\n"
@@ -2232,8 +2196,7 @@
 msgid ""
 "<p>For each route, enter destination network IP address, gateway address,\n"
 "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
-"the device through which the traffic to the defined network will be routed."
-"\"-\" is an alias for any interface.</p>\n"
+"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n"
 msgstr ""
 "<p>请为每条路由输入目的地网络的 IP 地址、网关地址和网络掩码。\n"
 "要忽略这些值中的任何一个，请使用破折号 \"-\"。\n"
@@ -2245,9 +2208,7 @@
 msgid ""
 "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
-msgstr ""
-"<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网"
-"络)。\n"
+msgstr "<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网络)。\n"
 
 #: src/include/network/lan/help.rb:109
 msgid ""
@@ -2256,14 +2217,12 @@
 "<b>Warning:</b> IPv6 forwarding disables IPv6 stateless address\n"
 "autoconfiguration (SLAAC)."
 msgstr ""
-"<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网"
-"络)。\n"
+"<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网络)。\n"
 "<b>警告：</b>IPv6 转发将禁用自动配置 IPv6 无状态地址(SLAAC)。"
 
 #: src/include/network/lan/help.rb:115
 msgid ""
-"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone "
-"is not enough. \n"
+"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
 "You should enable masquerading and/or set at least one redirect rule in the\n"
 "firewall configuration. Use the YaST firewall module.</p>\n"
 msgstr ""
@@ -2274,16 +2233,12 @@
 #: src/include/network/lan/help.rb:121
 msgid ""
 "<p>If you are using DHCP to get an IP address, check whether you get\n"
-"also a hostname via DHCP.  The hostname will be set automatically by the "
-"DHCP client.\n"
-"However, changing the hostname at runtime may confuse the graphical "
-"desktop. \n"
-"Therefore, disable this option if you connect to different networks that "
-"assign \n"
+"also a hostname via DHCP.  The hostname will be set automatically by the DHCP client.\n"
+"However, changing the hostname at runtime may confuse the graphical desktop. \n"
+"Therefore, disable this option if you connect to different networks that assign \n"
 "different hostnames.</p> "
 msgstr ""
-"<p>若您正在使用 DHCP 获得 IP 地址，请检查您是否也能通过 DHCP 获得一个主机"
-"名。\n"
+"<p>若您正在使用 DHCP 获得 IP 地址，请检查您是否也能通过 DHCP 获得一个主机名。\n"
 "主机名将被 DHCP 客户端自动设置。\n"
 "然而，运行时修改主机名可能会让图形桌面无所适从。\n"
 "因此，若您要连接到指派了不同主机名的不同网络，请禁用此选项。\n"
@@ -2292,18 +2247,13 @@
 #: src/include/network/lan/help.rb:129
 msgid ""
 "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
-"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is "
-"a \n"
-"useful option if you want to have the hostname resolvable at all times, "
-"even \n"
-"without an active network. In all other cases, use it carefully, "
-"especially \n"
+"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
+"useful option if you want to have the hostname resolvable at all times, even \n"
+"without an active network. In all other cases, use it carefully, especially \n"
 "if this computer provides some network services.</p>\n"
 msgstr ""
-"<p><b>指派主机名到回路 IP</b> 在 <tt>/etc/hosts</tt> 中将您的主机名和 IP 地"
-"址 <tt>127.0.0.2</tt> 关联了起来，这种行为就叫回路。\n"
-"若您想要在任何情况下都能解析主机名，即使在没有活动网络的情况下也能，那么这是"
-"一个有用的选项。\n"
+"<p><b>指派主机名到回路 IP</b> 在 <tt>/etc/hosts</tt> 中将您的主机名和 IP 地址 <tt>127.0.0.2</tt> 关联了起来，这种行为就叫回路。\n"
+"若您想要在任何情况下都能解析主机名，即使在没有活动网络的情况下也能，那么这是一个有用的选项。\n"
 "在其它任何情况下，请谨慎使用之，尤其是当此计算机提供了一些网络服务时。</p>\n"
 
 #: src/include/network/lan/help.rb:137
@@ -2330,8 +2280,7 @@
 msgid ""
 "<p>Search domain is the domain name where hostname searching starts.\n"
 "The primary search domain is usually the same as the domain name of\n"
-"your computer (for example, suse.de). There may be additional search "
-"domains\n"
+"your computer (for example, suse.de). There may be additional search domains\n"
 "(such as suse.com). Separate the domains with commas or white space.</p>\n"
 msgstr ""
 "<p>搜索域是开始主机名搜索时搜索的域名称。\n"
@@ -2340,34 +2289,25 @@
 
 #: src/include/network/lan/help.rb:154
 msgid ""
-"<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the "
-"DNS domain\n"
-"(e.g. <i>example.com</i>) that it belongs to. The domain is especially "
-"important if this \n"
-"computer is a mail server. You can view the hostname of you computer using "
-"the <i>hostname</i> \n"
+"<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
+"(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
+"computer is a mail server. You can view the hostname of you computer using the <i>hostname</i> \n"
 "command.</p>"
 msgstr ""
-"<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 "
-"<i>marguerite.su</i>)。\n"
-"若此计算机是一个邮件服务器，那么域尤其关键。您可以使用 <i>hostname</i> 命令查"
-"看您计算机的主机名。</p>"
+"<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 <i>marguerite.su</i>)。\n"
+"若此计算机是一个邮件服务器，那么域尤其关键。您可以使用 <i>hostname</i> 命令查看您计算机的主机名。</p>"
 
 #: src/include/network/lan/help.rb:161
 msgid ""
 "<p>Select the way how the DNS configuration will be modified (name servers,\n"
-"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is "
-"handled\n"
+"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
 "by the <i>netconfig</i> script, which merges statically defined data with\n"
 "dynamically obtained data (e.g. from the DHCP client, NetworkManager,\n"
-"etc.). This is the default. <b>Use Default Policy</b> is sufficient for "
-"most\n"
+"etc.). This is the default. <b>Use Default Policy</b> is sufficient for most\n"
 "configurations.</p>\n"
 msgstr ""
-"<p>选择修改 DNS 配置的方式 (名称服务器，搜索列表，<i>/etc/resolv.conf</i> 内"
-"容)。\n"
-"通常由 <i>netconfig</i> 脚本处理，该脚本会合并静态定义的数据和动态获得的数据 "
-"(例如，从 DHCP 客户端、NetworkManager 等)。\n"
+"<p>选择修改 DNS 配置的方式 (名称服务器，搜索列表，<i>/etc/resolv.conf</i> 内容)。\n"
+"通常由 <i>netconfig</i> 脚本处理，该脚本会合并静态定义的数据和动态获得的数据 (例如，从 DHCP 客户端、NetworkManager 等)。\n"
 "这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n"
 
 #: src/include/network/lan/help.rb:169
@@ -2381,22 +2321,17 @@
 "Leaving the field blank is the same as using the <b> Only Manually</b>\n"
 "policy.</p>\n"
 msgstr ""
-"<p>若选择<b>仅手动</b>，<i>netconfig</i> 将不再允许修改 <i>/etc/resolv.conf。\n"
-"但您可以手动编辑该文件。若选择<b>使用自定义策略</b>，您可以指定一个自定义策略"
-"字符串，\n"
-"其由一个以逗号分隔的接口名列表组成，可包括通配符以及 STATIC 和 "
-"STATIC_FALLBACK 预定义特殊值。\n"
-"更多信息请参考 <i>netconfig</i> 手册页。注意：该处留空等同于使用<b>仅手动</b>"
-"策略。</p>\n"
+"<p>若选择<b>仅手动</b>，<i>netconfig</i> 将不再允许修改 <i>/etc/resolv.conf</i>。\n"
+"但您可以手动编辑该文件。若选择<b>使用自定义策略</b>，您可以指定一个自定义策略字符串，\n"
+"其由一个以逗号分隔的接口名列表组成，可包括通配符以及 STATIC 和 STATIC_FALLBACK 预定义特殊值。\n"
+"更多信息请参考 <i>netconfig</i> 手册页。注意：该处留空等同于使用<b>仅手动</b>策略。</p>\n"
 
 #. Address dialog help 1-6/8: dynamic address preferred
 #. Address dialog help 1/8
 #: src/include/network/lan/help.rb:181
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
-"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address "
-"to this device.\n"
+"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
 "This is particularly useful for bonding ethernet devices.</p>\n"
 msgstr ""
 "<p><b><big>地址设置</big></b></p>\n"
@@ -2404,9 +2339,7 @@
 "这在绑定以太网设备时特别有用。</p>\n"
 
 #: src/include/network/lan/help.rb:186
-msgid ""
-"<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS."
-"</p>\n"
+msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
 msgstr "<p>若您想要保留在 BIOS 中配置的网络，请勾选 <b>iBFT</b>。</p>\n"
 
 #. Address dialog help 2/8
@@ -2414,9 +2347,7 @@
 msgid ""
 "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
 "assigned by the system administrator or your Internet provider.</p>\n"
-msgstr ""
-"<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址，请选择<b>动态地址"
-"</b>。</p>\n"
+msgstr "<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址，请选择<b>动态地址</b>。</p>\n"
 
 #. Address dialog help 3/8
 #: src/include/network/lan/help.rb:194
@@ -2433,10 +2364,8 @@
 #: src/include/network/lan/help.rb:200
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
-"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + "
-"Zeroconf\n"
-"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.\n"
+"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
+"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</p>\n"
 msgstr ""
 "<p>要搜索并静态指派 IP 地址，请选择<b>Zeroconf</b>。\n"
 "要使用 DHCP，不行再回到 zeroconf，请选择 <b>DHCP + Zeroconf</b>。\n"
@@ -2445,8 +2374,7 @@
 #. Address dialog help 5/8
 #: src/include/network/lan/help.rb:207
 msgid ""
-"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for "
-"your computer, and the \n"
+"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
 " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
 "for your peer.</p>\n"
 msgstr ""
@@ -2456,17 +2384,12 @@
 #. Address dialog help 6/8
 #: src/include/network/lan/help.rb:214
 msgid ""
-"<p>For <b>Static Address Setup</b> enter the static IP address for your "
-"computer (for example: <tt>192.168.100.99</tt>) and\n"
-"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix "
-"<tt>/24</tt>).Optionally, you can enter\n"
-"a fully qualified hostname for this IP address. The hostname will be written "
-"to <tt>/etc/hosts</tt>.</p>\n"
+"<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
+"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
+"a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>\n"
 msgstr ""
-"<p>对于<b>静态地址设置</b>， 请输入您计算机的静态 IP 地址 (例如，"
-"<tt>192.168.100.99</tt>) 和\n"
-"网络掩码 (通常是 <tt>255.255.255.0</tt>或前缀长度 <tt>/24</tt>)。此外，您还可"
-"以为此 IP 地址\n"
+"<p>对于<b>静态地址设置</b>， 请输入您计算机的静态 IP 地址 (例如，<tt>192.168.100.99</tt>) 和\n"
+"网络掩码 (通常是 <tt>255.255.255.0</tt>或前缀长度 <tt>/24</tt>)。此外，您还可以为此 IP 地址\n"
 "输入一个完全限定主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n"
 
 #. Address dialog help 8/8
@@ -2503,11 +2426,8 @@
 "则将禁用防火墙。</p>"
 
 #: src/include/network/lan/help.rb:238
-msgid ""
-"<p><b>Mandatory Interface</b> specifies whether the network service reports "
-"failure if the interface fails to start at boot time.</p>"
-msgstr ""
-"<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>"
+msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
+msgstr "<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>"
 
 #: src/include/network/lan/help.rb:242
 msgid ""
@@ -2515,21 +2435,18 @@
 "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
 "transferred over the network in one frame. Usually, you do not need to\n"
 "set a MTU, but using lower MTU values may improve the network performance,\n"
-"especially on slow dial-up connections. Either select one of the "
-"recommended\n"
+"especially on slow dial-up connections. Either select one of the recommended\n"
 "values or define another one.</p>\n"
 msgstr ""
 "<p><b><big>最大传输单元</big></b></p>\n"
 "<p>最大传输单元 (<b>MTU</b>) 是网络中一帧能够传输的数据包最大大小。\n"
-"通常，您不需要设置 MTU，但使用较小的 MTU 或许会改善网络性能，尤其是在慢速拨号"
-"连接下。\n"
+"通常，您不需要设置 MTU，但使用较小的 MTU 或许会改善网络性能，尤其是在慢速拨号连接下。\n"
 "您可从推荐值中择一，或定义另一个值。</p>\n"
 
 #: src/include/network/lan/help.rb:251
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
-"Only devices with the device activation set to <b>Never</b> and with <b>No "
-"Address Setup</b> are available.</p>"
+"Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
 msgstr ""
 "<p>请选择绑定设备的从属设备。\n"
 "只有设备激活设为<b>从不</b>和设置了<b>无地址设置</b>的设备才可用。</p>"
@@ -2543,8 +2460,7 @@
 #: src/include/network/lan/help.rb:257
 msgid ""
 "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
-"the hardware address of the network interface. It must be different for "
-"each\n"
+"the hardware address of the network interface. It must be different for each\n"
 "DHCP client on a single network. Therefore, specify a unique free-form\n"
 "identifier here if you have several (virtual) machines using the same\n"
 "network interface and thus the same hardware address.</p>"
@@ -2558,25 +2474,18 @@
 #: src/include/network/lan/help.rb:265
 msgid ""
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
-"hostname option field when the DHCP client sends messages to the DHCP "
-"server. Some \n"
+"hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
 "DHCP servers update name server zones (forward and reverse records) \n"
 "according to this hostname (dynamic DNS).</p>\n"
 "Some DHCP servers require the <b>Hostname to Send</b> option field to\n"
-"contain a specific string in the DHCP messages from clients. Leave <b>AUTO\n"
-"to send the current hostname (for example, the one defined in <tt>/etc/"
-"HOSTNAME</tt>). \n"
+"contain a specific string in the DHCP messages from clients. Leave <b>AUTO</b>\n"
+"to send the current hostname (for example, the one defined in <tt>/etc/HOSTNAME</tt>). \n"
 "If you do not want to send a hostname, leave the field empty.</p>\n"
 msgstr ""
-"<p><b>要发送的主机名</b>指定了 DHCP 客户端发送消息到 DHCP 服务器时主机名选项"
-"字段所用的字符串。\n"
-"某些 DHCP 服务器 (动态 DNS) 会根据此主机名来更新名称服务器区域 (转发和反向记"
-"录)。</p>\n"
-"某些 DHCP 服务器则要求客户端发来的 DHCP 消息中的<b>要发送的主机名</b>选项字段"
-"包含某个指定字符串。\n"
-"保持<b>自动</b>则会发送当前主机名 (例如 <tt>/etc/HOSTNAME</tt> 中定义的主机"
-"名)。\n"
+"<p><b>要发送的主机名</b>指定了 DHCP 客户端发送消息到 DHCP 服务器时主机名选项字段所用的字符串。\n"
+"某些 DHCP 服务器 (动态 DNS) 会根据此主机名来更新名称服务器区域 (转发和反向记录)。</p>\n"
+"某些 DHCP 服务器则要求客户端发来的 DHCP 消息中的<b>要发送的主机名</b>选项字段包含某个指定字符串。\n"
+"保持<b>自动</b>则会发送当前主机名 (例如 <tt>/etc/HOSTNAME</tt> 中定义的主机名)。\n"
 "若您不想要发送主机名，请将该字段留空。</p>\n"
 
 #. Aliases dialog help 1/4
@@ -2593,32 +2502,22 @@
 msgid ""
 "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
 "the <b>Netmask</b>.</p>"
-msgstr ""
-"<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。"
+msgstr "<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</p>"
 
 #. Aliases dialog help 3/4
 #: src/include/network/lan/help.rb:284
 msgid ""
-"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and "
-"legacy. The total\n"
+"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n"
 "length of interface name (inclusive of the colon and label) is\n"
-"limited to 15 characters. The obsolete ifconfig utility truncates it after 9 "
-"characters.</p>"
+"limited to 15 characters. The obsolete ifconfig utility truncates it after 9 characters.</p>"
 msgstr ""
-"<p><b>IPv4 地址标签</b>，之前叫做别名，是可选的，并且使用别名是很久以前的事"
-"了。\n"
-"接口名全长 (包括冒号和标签) 的限制为 15 个字符，并且过时的 ifconfig 工具会把"
-"它截断为 9 个字符。</p>"
+"<p><b>IPv4 地址标签</b>，之前叫做别名，是可选的，并且使用别名是很久以前的事了。\n"
+"接口名全长 (包括冒号和标签) 的限制为 15 个字符，并且过时的 ifconfig 工具会把它截断为 9 个字符。</p>"
 
 #. Aliases dialog help 3/4, #83766
 #: src/include/network/lan/help.rb:290
-msgid ""
-"<p>Do not include the interface name in the label. For example, enter "
-"<b>foo</b> instead of <b>eth0:foo</b>.</p>"
-msgstr ""
-"<p>不要在标签中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。"
-"</p>"
+msgid "<p>Do not include the interface name in the label. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
+msgstr "<p>不要在标签中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>"
 
 #. shared between WirelessDialog and WirelessKeyPopup
 #. this is suited to the button-switched key typing
@@ -2674,8 +2573,7 @@
 "<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
 "cells that are part of the same virtual network. All stations in a\n"
 "wireless LAN need the same ESSID to communicate with each other. If\n"
-"you choose the operation mode <b>Managed</b> and no <b>WPA</b> "
-"authentication mode,\n"
+"you choose the operation mode <b>Managed</b> and no <b>WPA</b> authentication mode,\n"
 "you can leave this field empty or set it to <tt>any</tt>. In this\n"
 "case, your WLAN card associates with the access point with the best\n"
 "signal strength.</p>\n"
@@ -2699,8 +2597,7 @@
 "NOTE: Shared key authentication makes it easier for a\n"
 "potential attacker to break into your network. Unless you have\n"
 "specific needs for shared key authentication, use the <b>Open</b>\n"
-"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected "
-"Access)\n"
+"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected Access)\n"
 "was defined to close its security holes, but not all hardware supports\n"
 "WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the\n"
 "authentication mode. This is only possible in the operation mode\n"
@@ -2710,8 +2607,7 @@
 "认证模式取决于所用的保护技术是 WEP 还是 WPA。<b>WEP</b>\n"
 "(有线等效隐私，Wired Equivalent Privacy) 是一种基于所用的加密密钥\n"
 "使用可选认证来加密无线网络流量的系统。\n"
-"在大多数使用 WEP 的情况下，选择 <b>WEP 开放式</b>模式 (根本无需认证) 就可"
-"以。\n"
+"在大多数使用 WEP 的情况下，选择 <b>WEP 开放式</b>模式 (根本无需认证) 就可以。\n"
 "这并不意味着您没有使用 WEP 加密 (那种情况请用<b>无加密</b>)。\n"
 "某些网络可能要求 <b>WEP 共享密钥</b> 认证。\n"
 "注意：共享密钥认证使得潜在攻击者更加容易侵入您的网络。\n"
@@ -2729,8 +2625,7 @@
 "supported by all devices. Of these keys, 24 bits\n"
 "are dynamically generated, so you only need to enter 40 to 232 bits.</p>\n"
 msgstr ""
-"<p>要使用 WEP，请输入要使用的 WEP 加密密钥。密钥长度可以为 64、128、156 或 "
-"256 位，但并非全部设备都支持全部长度。\n"
+"<p>要使用 WEP，请输入要使用的 WEP 加密密钥。密钥长度可以为 64、128、156 或 256 位，但并非全部设备都支持全部长度。\n"
 "在这些密钥中，有 24 位是动态生成的，所以您只需输入 40 到 232 位。</p>\n"
 
 #. Wireless dialog help
@@ -2761,8 +2656,7 @@
 msgid ""
 "<p>These values will be written to the interface configuration file\n"
 "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
-"add them manually. Refer to the file 'wireless' in the same directory for "
-"all\n"
+"add them manually. Refer to the file 'wireless' in the same directory for all\n"
 "available options.</p>"
 msgstr ""
 "<p>这些值将被写入 '/etc/sysconfig/network' 中的接口配置文件 \"ifcfg-*\"。\n"
@@ -2770,29 +2664,29 @@
 "全部可用选项请参考同名文件夹中的 'wireless' 文件。</p>"
 
 #. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
 msgid "IPv4 &Address Label"
 msgstr "IPv4 地址标签(&A)"
 
 #. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
 msgid "Net&mask"
 msgstr "网络掩码(&M)"
 
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
 msgid "Label is too long."
 msgstr "标签太长。"
 
 #. Popup::Error text
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:379
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
 msgid "The IP address is invalid."
 msgstr "IP 地址无效。"
 
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
 msgid "The subnet mask is invalid."
 msgstr "子网掩码无效。"
 
@@ -2858,8 +2752,7 @@
 "<p>For TTLS and PEAP, enter your <b>Identity</b>\n"
 "and <b>Password</b> as configured on the server.\n"
 "If you have special requirements to set the username used as\n"
-"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.\n"
+"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</p>\n"
 msgstr ""
 "<p>对 TTLS 和 PEAP，请按服务器上的配置输入您的<b>身份</b>和<b>密码</b>。\n"
 "若您有特殊需要，要把使用的用户名设为<b>匿名身份</b>，您可以在这里设置。\n"
@@ -2884,8 +2777,7 @@
 #: src/include/network/lan/wireless.rb:127
 msgid ""
 "<p>TLS uses a <b>Client Certificate</b> instead of a username and\n"
-"password combination for authentication. It uses a public and private key "
-"pair\n"
+"password combination for authentication. It uses a public and private key pair\n"
 "to encrypt negotiation communication, therefore you will additionally need\n"
 "a <b>Client Key</b> file that contains your private key and\n"
 "the appropriate <b>Client Key Password</b> for that file.</p>\n"
@@ -2930,8 +2822,7 @@
 msgid ""
 "If you do not know your ID and password or you do not have\n"
 "any certificate or key files, contact your system administrator.\n"
-msgstr ""
-"若您不知道您的 ID 和密码，或者没有证书或密钥文件，请垂询您的系统管理员。\n"
+msgstr "若您不知道您的 ID 和密码，或者没有证书或密钥文件，请垂询您的系统管理员。\n"
 
 #. combo box label
 #: src/include/network/lan/wireless.rb:238
@@ -2970,127 +2861,127 @@
 
 #. Wireless authentication modes:
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
 msgid "No Encryption"
 msgstr "无加密"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
 msgid "WEP - Open"
 msgstr "WEP - 开放式"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
 msgid "WEP - Shared Key"
 msgstr "WEP - 共享密钥"
 
 #. ComboBox item
 #. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
 msgid "WPA-PSK (WPA version 1 or 2)"
 msgstr "WPA-PSK (WPA 版本 1 或 2)"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
 msgid "WPA-EAP (WPA version 1 or 2)"
 msgstr "WPA-EAP (WPA 版本 1 或 2)"
 
 #. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
 msgid "Wireless Network Card Configuration"
 msgstr "无线网卡配置"
 
 #. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
 msgid "Wireless Device Settings"
 msgstr "无线设备设置"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
 msgid "O&perating Mode"
 msgstr "运行模式(&P)"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
 msgid "Ad-Hoc"
 msgstr "点对点 (Ad-Hoc)"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
 msgid "Master"
 msgstr "主控"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
 msgid "Ne&twork Name (ESSID)"
 msgstr "网络名称 (ESSID)(&T)"
 
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
 msgid "Scan Network"
 msgstr "扫描网络"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
 msgid "&Authentication Mode"
 msgstr "认证模式(&A)"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
 msgid "&Encryption Key"
 msgstr "加密密钥(&E)"
 
 #. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
 msgid "E&xpert Settings"
 msgstr "专家设置(&X)"
 
 #. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
 msgid "&WEP Keys"
 msgstr "&WEP 密钥"
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:561
+#: src/include/network/lan/wireless.rb:558
 msgid "WPA authentication mode is only possible in managed operating mode."
 msgstr "WPA 认证模式只能在受管运行模式下使用。"
 
 #. Popup text
 #. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:572
+#: src/include/network/lan/wireless.rb:569
 msgid "Specify the network name for this mode."
 msgstr "请指定此模式的网络名称。"
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:579
+#: src/include/network/lan/wireless.rb:576
 msgid "The network name must be shorter than 32 characters."
 msgstr "网络名称必须短于 32 个字符。"
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:599
+#: src/include/network/lan/wireless.rb:596
 msgid "The passphrase must have between 8 and 63 characters (inclusively)."
 msgstr "密码短语的长度必须在 8 到 63 (包括两者) 个字符之间。"
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:610
+#: src/include/network/lan/wireless.rb:607
 msgid "The key must have %1 hexadecimal digits."
 msgstr "密钥必须有 %1 个十六进制数字。"
 
 #. Popup text
 #. Popup text
-#: src/include/network/lan/wireless.rb:622
+#: src/include/network/lan/wireless.rb:619
 #: src/include/network/lan/wireless.rb:941
 msgid "The encryption key is invalid."
 msgstr "加密密钥无效。"
 
 #. error
 #. Popup text
-#: src/include/network/lan/wireless.rb:630
+#: src/include/network/lan/wireless.rb:627
 msgid "The encryption key must be specified for this authentication mode."
 msgstr "必须为此认证模式指定加密密钥。"
 
 #. warning only
 #. Popup text
-#: src/include/network/lan/wireless.rb:637
+#: src/include/network/lan/wireless.rb:634
 msgid ""
 "Using no encryption is a security risk.\n"
 "Really continue?\n"
@@ -3100,33 +2991,31 @@
 
 #. Wireless expert dialog caption
 #. Frame label
-#: src/include/network/lan/wireless.rb:695
-#: src/include/network/lan/wireless.rb:776
+#: src/include/network/lan/wireless.rb:694
+#: src/include/network/lan/wireless.rb:775
 msgid "Wireless Expert Settings"
 msgstr "无线专家设置"
 
 #. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:698
+#: src/include/network/lan/wireless.rb:697
 msgid ""
 "<p>Here, set additional configuration parameters\n"
 "(rarely needed).</p>"
 msgstr "<p>在此设置额外配置参数 (极少需要)。</p>"
 
 #. Wireless expert dialog help 2/5
-#: src/include/network/lan/wireless.rb:702
+#: src/include/network/lan/wireless.rb:701
 msgid ""
 "<p>To use your wireless LAN card in master or ad-hoc mode,\n"
 "set the <b>Channel</b> the card should use here. This is not needed\n"
-"for managed mode--the card will hop through the channels searching for "
-"access\n"
+"for managed mode--the card will hop through the channels searching for access\n"
 "points in that case.</p>\n"
 msgstr ""
-"<p>要以主控或点对点模式使用您的无线局域网卡，请在此设置该卡应使用的<b>通道。\n"
+"<p>要以主控或点对点模式使用您的无线局域网卡，请在此设置该卡应使用的<b>通道</b>。\n"
 "受管模式下无需这样做 -- 该模式下该卡将在各通道间跳跃以搜索访问点。</p>\n"
 
 #. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:709
+#: src/include/network/lan/wireless.rb:708
 msgid ""
 "<p>In some rare cases, you may want to set a transmission\n"
 "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>"
@@ -3135,53 +3024,50 @@
 "默认值为传输得越快越好。</p>"
 
 #. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:713
+#: src/include/network/lan/wireless.rb:712
 msgid ""
 "<p>In an environment with multiple <b>Access Points</b>, you may want to\n"
 "define the one to which to connect by entering its MAC address.</p>"
-msgstr ""
-"<p>在有多个<b>访问点</b>的环境中，您可能想要通过输入访问点的 MAC 地址定义要连"
-"接的访问点。</p>"
+msgstr "<p>在有多个<b>访问点</b>的环境中，您可能想要通过输入访问点的 MAC 地址定义要连接的访问点。</p>"
 
 #. Wireless expert dialog help 5/5
-#: src/include/network/lan/wireless.rb:717
+#: src/include/network/lan/wireless.rb:716
 msgid ""
 "<p><b>Use Power Management</b> enables power saving mechanisms.\n"
 "This is generally a good idea, especially if you are a laptop user and may\n"
 "be disconnected from AC power.</p>\n"
 msgstr ""
 "<p><b>使用电源管理</b>可启用省电机制。\n"
-"这通常是一个好主意，尤其是当您正在使用便携式计算机且可能未连接交流电源供电"
-"时。</p>\n"
+"这通常是一个好主意，尤其是当您正在使用便携式计算机且可能未连接交流电源供电时。</p>\n"
 
 #. Combobox item
 #. Combobox item
-#: src/include/network/lan/wireless.rb:745
-#: src/include/network/lan/wireless.rb:767
+#: src/include/network/lan/wireless.rb:744
+#: src/include/network/lan/wireless.rb:766
 msgid "Automatic"
 msgstr "自动"
 
 #. Combobox label
-#: src/include/network/lan/wireless.rb:782
+#: src/include/network/lan/wireless.rb:781
 msgid "&Channel"
 msgstr "通道(&C)"
 
 #. Combobox label
-#: src/include/network/lan/wireless.rb:785
+#: src/include/network/lan/wireless.rb:784
 msgid "B&it Rate"
 msgstr "比特率(&I)"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:791
+#: src/include/network/lan/wireless.rb:790
 msgid "&Access Point"
 msgstr "访问点(&A)"
 
 #. CheckBox label
-#: src/include/network/lan/wireless.rb:799
+#: src/include/network/lan/wireless.rb:798
 msgid "Use &Power Management"
 msgstr "使用电源管理(&P)"
 
-#: src/include/network/lan/wireless.rb:808
+#: src/include/network/lan/wireless.rb:807
 msgid "AP ScanMode"
 msgstr "访问点扫描模式"
 
@@ -3209,8 +3095,7 @@
 #: src/include/network/lan/wireless.rb:979
 msgid ""
 "<p>In this dialog, define your WEP keys used\n"
-"to encrypt your data before it is transmitted. You can have up to four "
-"keys,\n"
+"to encrypt your data before it is transmitted. You can have up to four keys,\n"
 "although only one key is used to encrypt the data. This is the default key.\n"
 "The other keys can be used to decrypt data. Usually you have only\n"
 "one key.</p>"
@@ -3265,69 +3150,66 @@
 msgstr "设为默认(&S)"
 
 #. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1213
+#: src/include/network/lan/wireless.rb:1214
 msgid "Choose a Certificate"
 msgstr "选择证书"
 
 #. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1258
+#: src/include/network/lan/wireless.rb:1257
 msgid ""
-"Not using a Certificate Authority (CA) certificate can result in "
-"connections\n"
+"Not using a Certificate Authority (CA) certificate can result in connections\n"
 "to insecure, rogue wireless networks. Continue without CA ?"
-msgstr ""
-"不使用数字证书认证机构 (CA) 证书可能导致连接到不安全、流氓的无线网络。不使用 "
-"CA 继续吗？"
+msgstr "不使用数字证书认证机构 (CA) 证书可能导致连接到不安全、流氓的无线网络。不使用 CA 继续吗？"
 
 #. error popup text
-#: src/include/network/lan/wireless.rb:1286
+#: src/include/network/lan/wireless.rb:1285
 msgid ""
 "Enter either the identity and password\n"
 "or the client certificate."
 msgstr "请输入身份和密码或客户证书。"
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1332
+#: src/include/network/lan/wireless.rb:1331
 msgid "WPA-EAP"
 msgstr "WPA-EAP"
 
 #. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1354
+#: src/include/network/lan/wireless.rb:1353
 msgid "Any"
 msgstr "任意"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1358
+#: src/include/network/lan/wireless.rb:1357
 msgid "MD5"
 msgstr "MD5"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1360
+#: src/include/network/lan/wireless.rb:1359
 msgid "GTC"
 msgstr "GTC"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1362
+#: src/include/network/lan/wireless.rb:1361
 msgid "CHAP"
 msgstr "CHAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1364
+#: src/include/network/lan/wireless.rb:1363
 msgid "PAP"
 msgstr "PAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1366
+#: src/include/network/lan/wireless.rb:1365
 msgid "MSCHAPv1"
 msgstr "MSCHAPv1"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1370
+#: src/include/network/lan/wireless.rb:1369
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1393
+#: src/include/network/lan/wireless.rb:1392
 msgid "WPA-EAP Details"
 msgstr "WPA-EAP 细节"
 
@@ -3342,35 +3224,53 @@
 
 #. RadioButton label
 #: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
 msgstr "允许远程管理(&A)"
 
 #. RadioButton label
 #: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "允许远程管理(&A)"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
 msgid "&Do Not Allow Remote Administration"
 msgstr "不允许远程管理(&D)"
 
 #. Remote Administration dialog help
 #. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Remote Administration Settings</big></b></p>\n"
+#| "<p>If this feature is enabled, you can\n"
+#| "administer this machine remotely from another machine. Use a VNC\n"
+#| "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
+#| "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
+#| "This form of remote administration is less secure than using SSH.</p>\n"
 msgid ""
 "<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
 "administer this machine remotely from another machine. Use a VNC\n"
 "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
 msgstr ""
 "<p><b><big>远程管理设置</big></b></p>\n"
 "<p>若启用了此功能，您将可以从另一台计算机远程管理这台计算机。\n"
 "可以使用 VNC 客户端管理，例如 krdc (连接到 <i><hostname>:%1</i>)，\n"
-"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://<hostname>:%2/)。\n"
+"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://<hostname>:%2/</i>)。\n"
 "与使用 SSH 相比，使用这种形式的远程管理安全性较差。</p>\n"
 
 #. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
 msgid "Remote Administration Settings"
 msgstr "远程管理设置"
 
@@ -3413,7 +3313,7 @@
 #. if listed any items, disable them, if show_popup, show warning popup
 #.
 #. returns true if items were disabled
-#: src/include/network/routines.rb:807
+#: src/include/network/routines.rb:829
 msgid ""
 "Network is currently handled by NetworkManager\n"
 "or completely disabled. YaST is unable to configure some options."
@@ -3422,33 +3322,33 @@
 "YaST 无法配置某些选项。"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:867
+#: src/include/network/routines.rb:889
 msgid "Network Cards"
 msgstr "网卡"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:871
+#: src/include/network/routines.rb:893
 msgid "Modems"
 msgstr "调制解调器"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:875
+#: src/include/network/routines.rb:897
 msgid "ISDN Cards"
 msgstr "ISDN 卡"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:879
+#: src/include/network/routines.rb:901
 msgid "DSL Devices"
 msgstr "DSL 设备"
 
-#: src/include/network/routines.rb:884
+#: src/include/network/routines.rb:906
 msgid "All Network Devices"
 msgstr "全部网络设备"
 
 #. validation error popup
 #. Popup::Error text
 #: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:391
+#: src/include/network/services/host.rb:387
 msgid "The hostname is invalid."
 msgstr "主机名无效。"
 
@@ -3548,9 +3448,7 @@
 #. @param [Hash] event	the event being handled
 #. @return whether valid
 #: src/include/network/services/dns.rb:495
-msgid ""
-"It's not recommended to use .local as domainname due to Multicast DNS. Use "
-"it at your own risk?"
+msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
 msgstr "由于多播 DNS 的原因，不推荐使用 .local 作为域名。风险自担吗？"
 
 #. Popup::Error text
@@ -3599,9 +3497,7 @@
 msgid ""
 "<p>Enter a host <b>IP Address</b>, a <b>Hostname</b>, and optional\n"
 "<b>Host Aliases</b>, separated by spaces.</p>\n"
-msgstr ""
-"<p>输入一个主机 <b>IP 地址</b>、<b>主机名</b>和可选的<b>主机别名</b>，以空格"
-"分隔。</p>\n"
+msgstr "<p>输入一个主机 <b>IP 地址</b>、<b>主机名</b>和可选的<b>主机别名</b>，以空格分隔。</p>\n"
 
 #. Frame label
 #: src/include/network/services/host.rb:119
@@ -3619,12 +3515,12 @@
 msgstr "主机别名"
 
 #. TextEntry label
-#: src/include/network/services/host.rb:344
+#: src/include/network/services/host.rb:340
 msgid "Hos&t Aliases"
 msgstr "主机别名(&T)"
 
 #. Popup::Error text
-#: src/include/network/services/host.rb:407
+#: src/include/network/services/host.rb:403
 msgid "Alias name \"%1\" is invalid."
 msgstr "别名 \"%1\" 无效。"
 
@@ -3664,36 +3560,36 @@
 msgid "&Destination"
 msgstr "目的地(&D)"
 
-#: src/include/network/services/routing.rb:172
+#: src/include/network/services/routing.rb:171
 msgid "Ge&nmask"
 msgstr "网络掩码(&N)"
 
-#: src/include/network/services/routing.rb:182
+#: src/include/network/services/routing.rb:180
 msgid "&Gateway"
 msgstr "网关(&G)"
 
-#: src/include/network/services/routing.rb:191
+#: src/include/network/services/routing.rb:188
 msgid "De&vice"
 msgstr "设备(&V)"
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:252
+#: src/include/network/services/routing.rb:247
 msgid "Destination is invalid."
 msgstr "目的地无效。"
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:260
+#: src/include/network/services/routing.rb:255
 msgid "Gateway IP address is invalid."
 msgstr "网关 IP 地址无效。"
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:268
+#: src/include/network/services/routing.rb:263
 msgid "Subnetmask is invalid."
 msgstr "子网掩码无效。"
 
 #. #178538 - disable routing dialog when NetworkManager is used
 #. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:426
+#: src/include/network/services/routing.rb:422
 msgid "The default gateway is invalid."
 msgstr "默认网关无效。"
 
@@ -3726,8 +3622,7 @@
 #: src/include/network/widgets.rb:57
 msgid ""
 "<p>When <b>Dial Prefix Regular Expression</b> is set, users can\n"
-"change the dial prefix in KInternet provided that it matches the "
-"expression.\n"
+"change the dial prefix in KInternet provided that it matches the expression.\n"
 "A recommended value is <tt>[09]?</tt>, allowing <tt>0</tt>, <tt>9</tt>,\n"
 "and the empty prefix. If the expression is empty, users are not allowed\n"
 "to change the prefix.</p>\n"
@@ -3778,8 +3673,7 @@
 msgid ""
 "<b>By NetworkManager</b>: a desktop applet\n"
 "controls the interface. There is no need to set it up in YaST."
-msgstr ""
-"<b>由 NetworkManager</b>：由一个桌面小程序来控制接口。无需在 YaST 中设置它。"
+msgstr "<b>由 NetworkManager</b>：由一个桌面小程序来控制接口。无需在 YaST 中设置它。"
 
 #. Combo box option for Device Activation
 #: src/include/network/widgets.rb:117
@@ -3836,10 +3730,8 @@
 #. help text for Device Activation
 #: src/include/network/widgets.rb:151
 msgid ""
-"Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this "
-"startmode will never\n"
-"be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still "
-"available.\n"
+"Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this startmode will never\n"
+"be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still available.\n"
 "Use this if you have an NFS or iSCSI root filesystem.\n"
 msgstr ""
 "使用<b>在 NFSroot 时</b>与使用<tt>自动</tt>相似。\n"
@@ -3857,8 +3749,7 @@
 #: src/include/network/widgets.rb:190
 msgid ""
 "<p><b><big>Device Activation</big></b></p> \n"
-"<p>Choose when to bring up the network interface. <b>At Boot Time</b> "
-"activates it during system boot, \n"
+"<p>Choose when to bring up the network interface. <b>At Boot Time</b> activates it during system boot, \n"
 "<b>Never</b> does not start the device.\n"
 "%1</p>\n"
 msgstr ""
@@ -3939,35 +3830,35 @@
 "NetworkManager 由桌面小挂件 (KDE 是 Plasma 挂件，GNOME 是 nm-applet) 控制。\n"
 "请确保该挂件正在运行，若未运行请手动启动之。"
 
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
 msgid "General Network Settings"
 msgstr "常规网络设置"
 
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
 msgid "IPv6 Protocol Settings"
 msgstr "IPn6 协议设置"
 
 #. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
 msgid "Enable IPv6"
 msgstr "启用 IPv6"
 
 #. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
 msgid "Unknown device"
 msgstr "未知设备"
 
 #. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
 msgid "DHCP address"
 msgstr "DHCP 地址"
 
 #. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
 msgid "No IP address assigned"
 msgstr "未指派 IP 地址"
 
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
 msgid ""
 "%1 \n"
 "%2 - %3"
@@ -3976,12 +3867,12 @@
 "%2 - %3"
 
 #. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
 msgid "&Change Device"
 msgstr "修改设备(&C)"
 
 #. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
 msgid "Network Device Select"
 msgstr "网络设备选择"
 
@@ -3990,7 +3881,7 @@
 #. to "0.0.0.0/32"
 #.
 #. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
 msgid "configured"
 msgstr "已配置"
 
@@ -4002,9 +3893,7 @@
 msgstr "确认重启网络"
 
 #: src/lib/network/confirm_virt_proposal.rb:24
-msgid ""
-"Because of the bridged network, YaST2 needs to restart the network to apply "
-"the settings."
+msgid "Because of the bridged network, YaST2 needs to restart the network to apply the settings."
 msgstr "由于是桥接网络，YaST2 需要重启网络以应用设置。"
 
 #. Opens dialog for editing NIC name
@@ -4041,7 +3930,7 @@
 
 #. Progress stage 2
 #. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
 msgid "Update configuration"
 msgstr "更新配置"
 
@@ -4064,7 +3953,7 @@
 
 #. Progress step 2/3
 #. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
 msgid "Updating configuration..."
 msgstr "正在更新配置..."
 
@@ -4114,62 +4003,62 @@
 msgstr "正在更新 /etc/hosts ..."
 
 #. Read dialog caption
-#: src/modules/Lan.rb:271
+#: src/modules/Lan.rb:276
 msgid "Initializing Network Configuration"
 msgstr "正在初始化网络配置"
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:284
+#: src/modules/Lan.rb:289
 msgid "Detect network devices"
 msgstr "检测网络设备"
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:286
+#: src/modules/Lan.rb:291
 msgid "Read driver information"
 msgstr "读取驱动信息"
 
 #. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:293
 msgid "Read device configuration"
 msgstr "读取设备配置"
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:295
 msgid "Read network configuration"
 msgstr "读取网络配置"
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:297
 msgid "Read firewall settings"
 msgstr "读取防火墙设置"
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:299
 msgid "Read hostname and DNS configuration"
 msgstr "读取主机名和 DNS 配置"
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:301
 msgid "Read installation information"
 msgstr "读取安装信息"
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:303
 msgid "Read routing configuration"
 msgstr "读取路由配置"
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:305
 msgid "Detect current status"
 msgstr "检测当前状态"
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:314
+#: src/modules/Lan.rb:319
 msgid "Detecting ndiswrapper..."
 msgstr "正在检测 ndiswrapper..."
 
 #. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:333
+#: src/modules/Lan.rb:338
 msgid ""
 "Detected a ndiswrapper configuration,\n"
 "but the kernel module was not modprobed.\n"
@@ -4179,7 +4068,7 @@
 "但内核模块尚未加载。\n"
 "您想要加载 ndiswrapper 模块吗？\n"
 
-#: src/modules/Lan.rb:341
+#: src/modules/Lan.rb:346
 msgid ""
 "ndiswrapper kernel module has not been loaded.\n"
 "Check configuration manually.\n"
@@ -4188,296 +4077,291 @@
 "请手动检查配置。\n"
 
 #. Progress step 2/9
-#: src/modules/Lan.rb:355
+#: src/modules/Lan.rb:360
 msgid "Detecting network devices..."
 msgstr "正在检测网络设备..."
 
 #. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:363
+#: src/modules/Lan.rb:368
 msgid "Reading device configuration..."
 msgstr "正在读取设备配置..."
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:369
+#: src/modules/Lan.rb:374
 msgid "Reading network configuration..."
 msgstr "正在读取网络配置..."
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:378
+#: src/modules/Lan.rb:383
 msgid "Reading firewall settings..."
 msgstr "正在读取防火墙设置..."
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:386
+#: src/modules/Lan.rb:391
 msgid "Reading hostname and DNS configuration..."
 msgstr "正在读取主机名和 DNS 配置..."
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:393
+#: src/modules/Lan.rb:398
 msgid "Reading installation information..."
 msgstr "正在读取安装信息..."
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:399
+#: src/modules/Lan.rb:404
 msgid "Reading routing configuration..."
 msgstr "正在读取路由配置..."
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:405
+#: src/modules/Lan.rb:410
 msgid "Detecting current status..."
 msgstr "正在检测当前状态..."
 
 #. Final progress step
 #. Final progress step
-#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
 msgid "Finished"
 msgstr "已完成"
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:437
+#: src/modules/Lan.rb:441
 msgid "To apply this change, a reboot is needed."
 msgstr "要应用此改动，需要重启。"
 
 #. Write dialog caption
-#: src/modules/Lan.rb:505
+#: src/modules/Lan.rb:509
 msgid "Saving Network Configuration"
 msgstr "正在保存网络配置"
 
 #. Progress stage 2
-#: src/modules/Lan.rb:512
+#: src/modules/Lan.rb:516
 msgid "Write drivers information"
 msgstr "写入驱动信息"
 
 #. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:514
+#: src/modules/Lan.rb:518
 msgid "Write device configuration"
 msgstr "写入设备配置"
 
 #. Progress stage 4
-#: src/modules/Lan.rb:516
+#: src/modules/Lan.rb:520
 msgid "Write network configuration"
 msgstr "写入网络配置"
 
 #. Progress stage 5
-#: src/modules/Lan.rb:518
+#: src/modules/Lan.rb:522
 msgid "Write routing configuration"
 msgstr "写入路由配置"
 
 #. Progress stage 6
-#: src/modules/Lan.rb:520
+#: src/modules/Lan.rb:524
 msgid "Write hostname and DNS configuration"
 msgstr "写入主机名和 DNS 配置"
 
 #. Progress stage 7
-#: src/modules/Lan.rb:522
+#: src/modules/Lan.rb:526
 msgid "Set up network services"
 msgstr "设置网络服务"
 
 #. Progress stage 8
 #. Progress stage 1
-#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
 msgid "Write firewall settings"
 msgstr "写入防火墙设置"
 
 #. Progress stage 9
-#: src/modules/Lan.rb:530
+#: src/modules/Lan.rb:534
 msgid "Activate network services"
 msgstr "激活网络服务"
 
 #. Progress step 2
-#: src/modules/Lan.rb:546
+#: src/modules/Lan.rb:550
 msgid "Writing /etc/modprobe.conf..."
 msgstr "正在写入 /etc/modprobe.conf..."
 
 #. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:551
+#: src/modules/Lan.rb:555
 msgid "Writing device configuration..."
 msgstr "正在写入设备配置..."
 
 #. Progress step 4
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:561
 msgid "Writing network configuration..."
 msgstr "正在写入网络配置..."
 
 #. Progress step 5
-#: src/modules/Lan.rb:563
+#: src/modules/Lan.rb:567
 msgid "Writing routing configuration..."
 msgstr "正在写入路由配置..."
 
 #. Progress step 6
-#: src/modules/Lan.rb:571
+#: src/modules/Lan.rb:575
 msgid "Writing hostname and DNS configuration..."
 msgstr "正在写入主机名和 DNS 配置..."
 
 #. Progress step 7
-#: src/modules/Lan.rb:584
+#: src/modules/Lan.rb:588
 msgid "Setting up network services..."
 msgstr "正在设置网络服务..."
 
 #. Progress step 8
-#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
 msgid "Writing firewall settings..."
 msgstr "正在写入防火墙设置..."
 
 #. Progress step 9
-#: src/modules/Lan.rb:602
+#: src/modules/Lan.rb:606
 msgid "Activating network services..."
 msgstr "正在激活网络服务..."
 
-#: src/modules/Lan.rb:638
+#: src/modules/Lan.rb:642
 msgid "No network running"
 msgstr "无网络运行"
 
 #. Create a textual summary for the general network settings
 #. proposal (NetworkManager + ipv6)
 #. @return [rich text, links]
-#: src/modules/Lan.rb:755
+#: src/modules/Lan.rb:759
 msgid "Network Mode"
 msgstr "网络模式"
 
 #. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:760
+#: src/modules/Lan.rb:764
 msgid "Interfaces controlled by NetworkManager"
 msgstr "由 NetworkManager 控制的接口"
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:762
+#: src/modules/Lan.rb:766
 msgid "Disable NetworkManager"
 msgstr "禁用 NetworkManager"
 
 #. network mode
-#: src/modules/Lan.rb:766
+#: src/modules/Lan.rb:770
 msgid "Traditional network setup with NetControl - ifup"
 msgstr "使用 NetControl 的传统网络设置 - ifup"
 
 #. enable NetworkManager applet
 #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:769
+#: src/modules/Lan.rb:773
 msgid "Enable NetworkManager"
 msgstr "启用 NetworkManager"
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:775
+#: src/modules/Lan.rb:779
 msgid "Support for IPv6 protocol is enabled"
 msgstr "已启用 IPv6 协议支持"
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:777
+#: src/modules/Lan.rb:781
 msgid "Disable IPv6"
 msgstr "禁用 IPv6"
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:781
+#: src/modules/Lan.rb:785
 msgid "Support for IPv6 protocol is disabled"
 msgstr "禁用了对 IPv6 协议的支持"
 
 #. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:199
+#: src/modules/LanItems.rb:198
 msgid "connected"
 msgstr "已连接"
 
-#: src/modules/LanItems.rb:200
+#: src/modules/LanItems.rb:199
 msgid "datagram"
 msgstr "数据报"
 
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
 msgid "Started automatically at boot"
 msgstr "引导时自动启动"
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1280
 msgid "Started automatically on cable connection"
 msgstr "连接网线时自动启动"
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1284
 msgid "Managed by NetworkManager"
 msgstr "由 NetworkManager 管理"
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1284
+#: src/modules/LanItems.rb:1288
 msgid "Will not be started at all"
 msgstr "根本不会启动"
 
-#: src/modules/LanItems.rb:1290
+#: src/modules/LanItems.rb:1294
 msgid "Started manually"
 msgstr "手动启动"
 
 #. do nothing
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1306
 msgid "IP address assigned using"
 msgstr "IP 地址指派自"
 
-#: src/modules/LanItems.rb:1306
+#: src/modules/LanItems.rb:1310
 msgid "IP address: %s/%s"
 msgstr "IP 地址：%s/%s"
 
-#: src/modules/LanItems.rb:1309
+#: src/modules/LanItems.rb:1313
 msgid "IP address: %s, subnet mask %s"
 msgstr "IP 地址：%s，子网掩码 %s"
 
 #. FIXME: side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1337
 msgid "Not configured"
 msgstr "未配置"
 
 #. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
 msgid "Device Name: %s"
 msgstr "设备名称：%s"
 
-#: src/modules/LanItems.rb:1376
+#: src/modules/LanItems.rb:1380
 msgid "Bonding slaves"
 msgstr "绑定从属"
 
-#: src/modules/LanItems.rb:1390
+#: src/modules/LanItems.rb:1394
 msgid "enslaved in %s"
 msgstr "从属于 %s"
 
-#: src/modules/LanItems.rb:1391
+#: src/modules/LanItems.rb:1395
 msgid "Bonding master"
 msgstr "绑定主体"
 
-#: src/modules/LanItems.rb:1405
+#: src/modules/LanItems.rb:1409
 msgid "Not connected"
 msgstr "未连接"
 
-#: src/modules/LanItems.rb:1406
+#: src/modules/LanItems.rb:1410
 msgid "No hwinfo"
 msgstr "无硬件信息"
 
-#: src/modules/LanItems.rb:1421
-msgid ""
-"Unable to configure the network card because the kernel device (eth0, wlan0) "
-"is not present. This is mostly caused by missing firmware (for wlan "
-"devices). See dmesg output for details."
-msgstr ""
-"由于没有内核设备 (eth0, wlan0)，无法配置网卡。这大多是缺少固件 (对于 wlan 设"
-"备) 造成的。细节请参考 dmesg 输出。"
-
 #: src/modules/LanItems.rb:1427
+msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
+msgstr "由于没有内核设备 (eth0, wlan0)，无法配置网卡。这大多是缺少固件 (对于 wlan 设备) 造成的。细节请参考 dmesg 输出。"
+
+#: src/modules/LanItems.rb:1433
 msgid ""
 "The device is not configured. Press <b>Edit</b>\n"
 "to configure.\n"
 msgstr "设备尚未配置。请按<b>编辑</b>配置。\n"
 
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1440
 msgid "Needed firmware"
 msgstr "所需固件"
 
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1440
 msgid "unknown"
 msgstr "未知"
 
 #. Package containing SuSEfirewall2 services has to be installed before
 #. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:159
+#: src/modules/Remote.rb:158
 msgid ""
 "Package %{package} is not installed\n"
 "firewall settings will be disabled."
@@ -4486,35 +4370,40 @@
 "将禁用防火墙设置。"
 
 #. Progress stage 2
-#: src/modules/Remote.rb:199
+#: src/modules/Remote.rb:203
 msgid "Configure display manager"
 msgstr "配置显示管理器"
 
 #. Progress stage 3
-#: src/modules/Remote.rb:204
+#: src/modules/Remote.rb:208
 msgid "Restart the services"
 msgstr "重启服务"
 
-#: src/modules/Remote.rb:207
+#: src/modules/Remote.rb:211
 msgid "Saving Remote Administration Configuration"
 msgstr "正在保存远程管理配置"
 
-#: src/modules/Remote.rb:216
+#: src/modules/Remote.rb:220
 msgid "Configuring display manager..."
 msgstr "正在配置显示管理器..."
 
-#: src/modules/Remote.rb:220
+#: src/modules/Remote.rb:224
 msgid "Restarting the service..."
 msgstr "正在重启服务..."
 
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
+#. Install required packages
+#: src/modules/Remote.rb:261
 msgid "Enabling service %{service} has failed"
 msgstr "启动服务 %{service} 失败"
 
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Enabling service %{service} has failed"
+msgid "Disabling service %{service} has failed"
+msgstr "启动服务 %{service} 失败"
+
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:281
+#: src/modules/Remote.rb:295
 msgid ""
 "Your display manager must be restarted.\n"
 "To take the changes in remote administration into account, \n"
@@ -4525,11 +4414,11 @@
 "请手动重启显示管理器或重新登录。"
 
 #. description in proposal
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:332
 msgid "Remote administration is enabled."
 msgstr "已启用远程管理。"
 
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:332
 msgid "Remote administration is disabled."
 msgstr "已禁用远程管理。"
 
@@ -4627,9 +4516,7 @@
 #~ msgid "Run configuration of %1?"
 #~ msgstr "运行 %1 的配置吗？"
 
-#~ msgid ""
-#~ "AutoYaST setting networking/managed: NetworkManager is not available, "
-#~ "Wicked will be used."
+#~ msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
 #~ msgstr "AutoYaST 设置网络/受管：NetworkManager 不可用，将使用 Wicked。"
 
 #~ msgid "Device boot protocol"
@@ -4656,8 +4543,7 @@
 #~ msgstr "拔出"
 
 #~ msgid ""
-#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this "
-#~ "startmode will never\n"
+#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n"
 #~ "be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n"
 #~ "Use this when you have a nfs or iscsi root filesystem.\n"
 #~ msgstr ""
@@ -4675,20 +4561,15 @@
 #~ msgstr ""
 #~ "网络目前由 NetworkManager 控制，它的设置不能被 YaST 编辑。\n"
 #~ "\n"
-#~ "要编辑设置，请使用 NetworkManager 连接编辑器或切换网络设置方法为传统的 "
-#~ "ifup 方法。\n"
+#~ "要编辑设置，请使用 NetworkManager 连接编辑器或切换网络设置方法为传统的 ifup 方法。\n"
 
 #~ msgid "Device name:"
 #~ msgstr "设备名称："
 
-#~ msgid ""
-#~ "SSH service will be enabled, SSH port will be open (disable and close</a>)"
+#~ msgid "SSH service will be enabled, SSH port will be open (disable and close</a>)"
 #~ msgstr "将启用 SSH 服务并打开 SSH 端口 (禁用并关闭</a>)"
 
-#~ msgid ""
-#~ "SSH service will be disabled, SSH port will be blocked (enable and open</a>)"
+#~ msgid "SSH service will be disabled, SSH port will be blocked (enable and open</a>)"
 #~ msgstr "将禁用 SSH 服务并屏蔽 SSH 端口 (启用并打开</a>)"
 
 #~ msgid "General &Network Settings"
@@ -4784,8 +4665,7 @@
 #~ msgid "Bond slaves"
 #~ msgstr "绑定从属"
 
-#~ msgid ""
-#~ "<p>The device is not configured. Press <b>Edit</b> for configuration.</p>"
+#~ msgid "<p>The device is not configured. Press <b>Edit</b> for configuration.</p>"
 #~ msgstr "<p>设备尚未配置。请按<b>编辑</b>进行配置。</p>"
 
 #~ msgid ""
@@ -4874,18 +4754,14 @@
 #~ "<p>First, choose your <b>PPP mode</b>. This is either\n"
 #~ "<i>PPP over Ethernet</i> (PPPoE), <i>PPP over ATM</i> (PPPoATM),\n"
 #~ "<i>CAPI for ADSL</i> or <i>Point to Point Tunneling Protocol</i> (PPTP).\n"
-#~ "Use <i>PPP over Ethernet</i> if your DSL modem is connected via ethernet "
-#~ "to your computer.\n"
-#~ "Use <i>Point to Point Tunneling Protocol</i> if you want to connect to a "
-#~ "VPN server.\n"
+#~ "Use <i>PPP over Ethernet</i> if your DSL modem is connected via ethernet to your computer.\n"
+#~ "Use <i>Point to Point Tunneling Protocol</i> if you want to connect to a VPN server.\n"
 #~ "If you are not sure which mode to use, ask your provider. </p>"
 #~ msgstr ""
 #~ "<p>首先，请选择您的 <b>PPP 模式</b>。\n"
-#~ "这可以是 <i>PPP over Ethernet</i> (PPPoE)，<i>PPP over ATM</i> "
-#~ "(PPPoATM)，\n"
+#~ "这可以是 <i>PPP over Ethernet</i> (PPPoE)，<i>PPP over ATM</i> (PPPoATM)，\n"
 #~ "<i>用于 ADSL 的 CAPI</i> 或者<i>点对点隧道协议</i> (PPTP)。\n"
-#~ "若您的 DSL 调制解调器通过以太网与计算机连接，请用 <i>PPP over Ethernet。\n"
+#~ "若您的 DSL 调制解调器通过以太网与计算机连接，请用 <i>PPP over Ethernet</i>。\n"
 #~ "若您想要连接到一个 VPN 服务器，请用<i>点对点隧道协议</i>。\n"
 #~ "若您不确定使用哪种模式，请垂询您的服务提供商。</p>"
 
@@ -4895,10 +4771,8 @@
 #~ msgstr "<p>若您正在使用 <i>PPP over Ethernet</i>，则请先配置以太网卡。</p>"
 
 #~ msgid ""
-#~ "<p>The <b>PPP Mode-Dependent Settings</b> are settings required to set "
-#~ "up\n"
-#~ "your DSL connection. <b>VPI/VCI</b> makes sense only for <i>PPP over ATM\n"
+#~ "<p>The <b>PPP Mode-Dependent Settings</b> are settings required to set up\n"
+#~ "your DSL connection. <b>VPI/VCI</b> makes sense only for <i>PPP over ATM</i>\n"
 #~ "connections, <b>Ethernet Card</b> is needed for <i>PPP over Ethernet</i>\n"
 #~ "connections.</p>\n"
 #~ msgstr ""
@@ -5045,8 +4919,7 @@
 
 #~ msgid ""
 #~ "<P><B><BIG>Adding an ISDN Connection:</BIG></B><BR>\n"
-#~ "If you press <B>Add</B>, you can configure an ISDN dial-up connection.\n"
+#~ "If you press <B>Add</B>, you can configure an ISDN dial-up connection.</P>\n"
 #~ msgstr ""
 #~ "<P><B><BIG>添加 ISDN 连接：</BIG></B><BR>\n"
 #~ "按<B>添加</B>可以配置 ISDN 拨号连接。</P>\n"
@@ -5073,11 +4946,9 @@
 #~ msgstr "ISDN 细节设置"
 
 #~ msgid ""
-#~ "<p>The <b>Remote Phone Number List</b> controls which remote machines "
-#~ "are\n"
+#~ "<p>The <b>Remote Phone Number List</b> controls which remote machines are\n"
 #~ "allowed to connect to this interface.</p>\n"
-#~ msgstr ""
-#~ "<p><b>远程电话号码列表</b>控制了允许哪些远程计算机连接到此接口。</p>\n"
+#~ msgstr "<p><b>远程电话号码列表</b>控制了允许哪些远程计算机连接到此接口。</p>\n"
 
 #~ msgid ""
 #~ "<p>Deselect <b>Only Listed Numbers Allowed</b> \n"
@@ -5085,36 +4956,26 @@
 #~ msgstr "<p>反选<b>只允许列出的号码</b>可允许全部来电 ID。</p>\n"
 
 #~ msgid ""
-#~ "<p>If the callback mode is <b>off</b>,  calls  are handled normally "
-#~ "without special \n"
+#~ "<p>If the callback mode is <b>off</b>,  calls  are handled normally without special \n"
 #~ "processing.</p>\n"
-#~ msgstr ""
-#~ "<p>若回拨模式为<b>关闭</b>，则将以正常方式处理呼叫，而不进行特殊处理。\n"
+#~ msgstr "<p>若回拨模式为<b>关闭</b>，则将以正常方式处理呼叫，而不进行特殊处理。</p>\n"
 
 #~ msgid ""
-#~ "<p>If the callback mode is <b>server</b>, after getting an incoming call, "
-#~ "a callback \n"
+#~ "<p>If the callback mode is <b>server</b>, after getting an incoming call, a callback \n"
 #~ "is triggered.</p>\n"
 #~ msgstr "<p>若回拨模式为<b>服务器</b>，则将在收到来电后触发回拨。</p>\n"
 
 #~ msgid ""
-#~ "<p>If the callback mode is <b>client</b>, the local system does the "
-#~ "initial call then \n"
+#~ "<p>If the callback mode is <b>client</b>, the local system does the initial call then \n"
 #~ "waits for callback from the remote machine.</p>\n"
-#~ msgstr ""
-#~ "<p>若回拨模式为<b>客户端</b>，则本地系统将进行初始呼叫，然后等待来自远程计"
-#~ "算机的回拨。</p>\n"
+#~ msgstr "<p>若回拨模式为<b>客户端</b>，则本地系统将进行初始呼叫，然后等待来自远程计算机的回拨。</p>\n"
 
 #~ msgid ""
-#~ "<p><b>Callback Delay</b> is the number of seconds between the initial "
-#~ "call and the\n"
-#~ "callback (server) or the hang-up (client). It should be greater on the "
-#~ "server than on\n"
+#~ "<p><b>Callback Delay</b> is the number of seconds between the initial call and the\n"
+#~ "callback (server) or the hang-up (client). It should be greater on the server than on\n"
 #~ "the client.</p>\n"
 #~ msgstr ""
-#~ "<p><b>回拨延迟</b>是指在初始呼叫和回拨 (服务器) 或挂断 (客户端) 之间的秒"
-#~ "数。\n"
+#~ "<p><b>回拨延迟</b>是指在初始呼叫和回拨 (服务器) 或挂断 (客户端) 之间的秒数。\n"
 #~ "这段时间在服务器上比在客户端上要长。</p>\n"
 
 #~ msgid ""
@@ -5152,13 +5013,11 @@
 #~ msgstr "ISDN 服务选择"
 
 #~ msgid ""
-#~ "<p>If you have a combined ISDN and DSL CAPI controller, configure your "
-#~ "DSL\n"
+#~ "<p>If you have a combined ISDN and DSL CAPI controller, configure your DSL\n"
 #~ "connection via <b>Add DSL CAPI Interface</b>. You can also do this later\n"
 #~ "in the DSL configuration dialog.</p>\n"
 #~ msgstr ""
-#~ "<p>若您有一个组合式 ISDN 和 DSL CAPI 控制器，请通过<b>添加 DSL CAPI 接口配置您的 DSL 连接。\n"
+#~ "<p>若您有一个组合式 ISDN 和 DSL CAPI 控制器，请通过<b>添加 DSL CAPI 接口</b>配置您的 DSL 连接。\n"
 #~ "您也可以稍后在 DSL 配置对话框中这么做。</p>\n"
 
 #~ msgid ""
@@ -5167,17 +5026,14 @@
 #~ "the default for all common Internet providers.</p>\n"
 #~ msgstr ""
 #~ "<p>通过 ISDN 上网有两种类型的接口：<b>RawIP</b> 和 <b>SyncPPP</b>。\n"
-#~ "大多数情况下使用 SyncPPP。全部常见互联网服务提供商默认均使用 SyncPPP。\n"
+#~ "大多数情况下使用 SyncPPP。全部常见互联网服务提供商默认均使用 SyncPPP。</p>\n"
 
 #~ msgid ""
 #~ "<p>To switch between various Internet providers, an\n"
-#~ "interface for each provider is not required. Simply add multiple "
-#~ "providers to the\n"
+#~ "interface for each provider is not required. Simply add multiple providers to the\n"
 #~ "same interface.</p>\n"
 #~ msgstr ""
-#~ "<p>要在多个互联网服务提供商间切换，不需要为每个服务提供商都指定一个接"
-#~ "口。\n"
+#~ "<p>要在多个互联网服务提供商间切换，不需要为每个服务提供商都指定一个接口。\n"
 #~ "只需要将多个服务提供商添加到同一接口即可。</p>\n"
 
 #~ msgid ""
@@ -5219,19 +5075,14 @@
 
 #~ msgid ""
 #~ "<p>My phone number --  As your own telephone number (MSN), put in your \n"
-#~ "telephone number (without area code) if your ISDN card is connected "
-#~ "directly\n"
-#~ "to the phone company-provided socket. If it is connected to a PBX, put in "
-#~ "the\n"
-#~ "MSN stored in the PBX (e.g., your phone extension or the last digit or "
-#~ "digits\n"
-#~ "of your phone extension) . If this fails, try using 0, which normally "
-#~ "means\n"
+#~ "telephone number (without area code) if your ISDN card is connected directly\n"
+#~ "to the phone company-provided socket. If it is connected to a PBX, put in the\n"
+#~ "MSN stored in the PBX (e.g., your phone extension or the last digit or digits\n"
+#~ "of your phone extension) . If this fails, try using 0, which normally means\n"
 #~ "the default MSN is actually used.</p>"
 #~ msgstr ""
 #~ "<p>我的电话号码 -- 作为您自己的电话号码 (MSN)，\n"
-#~ "若您的 ISDN 卡直接与电话公司提供的插口相连，则请输入您的电话号码 (不带区"
-#~ "号)。\n"
+#~ "若您的 ISDN 卡直接与电话公司提供的插口相连，则请输入您的电话号码 (不带区号)。\n"
 #~ "若您的 ISDN 卡与 PBX 相连，则请输入存储在 PBX 中的 MSN (例如，您的分机或\n"
 #~ "分机的最后一位或几位数字)。\n"
 #~ "若这么做失败了，可尝试使用 0，其通常表示使用默认的 MSN。</p>"
@@ -5246,8 +5097,7 @@
 #~ "</tt>\n"
 #~ "Note: ippp0 is an example</p>"
 #~ msgstr ""
-#~ "<p>若您选择了手动方式，可以发出以下命令启动和停止服务 (当以 'root' 登入"
-#~ "时)：\n"
+#~ "<p>若您选择了手动方式，可以发出以下命令启动和停止服务 (当以 'root' 登入时)：\n"
 #~ "<tt>\n"
 #~ " <br> <b>启动：</b>ifup ippp0\n"
 #~ " <br> <b>停止：</b>ifdown ippp0\n"
@@ -5257,18 +5107,15 @@
 
 #~ msgid ""
 #~ "<p>Selecting <b>channel bundling</b> sets up a 128-kBit connection\n"
-#~ "also known as Multilink PPP. To activate or deactivate the second "
-#~ "channel,\n"
+#~ "also known as Multilink PPP. To activate or deactivate the second channel,\n"
 #~ "use the following commands:\n"
 #~ "<tt>\n"
 #~ " <br> isdnctrl addlink ippp0\n"
 #~ " <br> isdnctrl removelink ippp0\n"
 #~ " <br>\n"
 #~ "</tt>\n"
-#~ "You can also install the package <b>xibod</b> to have this happen "
-#~ "automatically. If\n"
-#~ "there is a demand for more bandwidth, it adds a channel. If the traffic "
-#~ "goes down, it \n"
+#~ "You can also install the package <b>xibod</b> to have this happen automatically. If\n"
+#~ "there is a demand for more bandwidth, it adds a channel. If the traffic goes down, it \n"
 #~ "removes a channel.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -5288,8 +5135,7 @@
 #~ "<p>Selecting\n"
 #~ "<b>External Firewall Interface</b> activates the firewall\n"
 #~ "and sets this interface as external.\n"
-#~ "<b>Restart Firewall</b> restarts the firewall if a connection is "
-#~ "established.\n"
+#~ "<b>Restart Firewall</b> restarts the firewall if a connection is established.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>选择<b>外部防火墙接口</b>可激活防火墙并将此接口设为外部接口。\n"
@@ -5326,9 +5172,7 @@
 #~ msgid ""
 #~ "<p>Enter the IP addresses if you received a fixed IP address\n"
 #~ "from your provider for syncppp or you use raw IP.</p>\n"
-#~ msgstr ""
-#~ "<p>若您从服务提供商处收到了一个用于 syncppp 的固定 IP 地址或您使用裸 IP 请"
-#~ "输入 IP 地址。</p>\n"
+#~ msgstr "<p>若您从服务提供商处收到了一个用于 syncppp 的固定 IP 地址或您使用裸 IP 请输入 IP 地址。</p>\n"
 
 #~ msgid ""
 #~ "<p>Check <b>Dynamic IP Address</b> if your provider\n"
@@ -5337,8 +5181,7 @@
 #~ "This is the default with most providers.\n"
 #~ "</p>\n"
 #~ msgstr ""
-#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址。\n"
+#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址</b>。\n"
 #~ "在这种情况下，外发地址直到链接建立前的那个时刻前都是未知的。\n"
 #~ "这时多数服务提供商的默认设置。\n"
 #~ "</p>\n"
@@ -5410,11 +5253,9 @@
 #~ msgid ""
 #~ "<p>If you have an old legacy ISA card, you can enter values for\n"
 #~ "IO port or memory addresses and the used interrupt.\n"
-#~ "For the correct values, check with your technical manual or contact your "
-#~ "salesman.</p>\n"
+#~ "For the correct values, check with your technical manual or contact your salesman.</p>\n"
 #~ msgstr ""
-#~ "<p>若您有一块旧版 ISA 卡，您可以输入 IO 端口号或内存地址以及所用中断的"
-#~ "值。\n"
+#~ "<p>若您有一块旧版 ISA 卡，您可以输入 IO 端口号或内存地址以及所用中断的值。\n"
 #~ "要获得正确的值，请阅读您 ISA 卡的技术手册或与销售商联系。</p>\n"
 
 #~ msgid ""
@@ -5435,28 +5276,22 @@
 #~ "<p>您的 ISDN 卡存在多个驱动。\n"
 #~ "请从列表中选择一个。</p>\n"
 
-#~ msgid ""
-#~ "<p><b>ISDN Protocol: </b>In most cases, the protocol is Euro-ISDN.</p>"
+#~ msgid "<p><b>ISDN Protocol: </b>In most cases, the protocol is Euro-ISDN.</p>"
 #~ msgstr "<p><b>ISDN 协议：</b>在多数情况下，此协议为 Euro-ISDN。</p>"
 
 #~ msgid ""
 #~ "<p><b>Area Code: </b> Enter your local area code for the ISDN\n"
 #~ "line here, without a leading zero and without a country prefix.</p>\n"
-#~ msgstr ""
-#~ "<p><b>区号：</b>在此输入 ISDN 线路的本地区号，不包括最前面的 0 和国家/地区"
-#~ "前缀。</p>\n"
+#~ msgstr "<p><b>区号：</b>在此输入 ISDN 线路的本地区号，不包括最前面的 0 和国家/地区前缀。</p>\n"
 
 #~ msgid ""
 #~ "<p><b>Dial Prefix: </b> If you need a prefix to get an public line, \n"
-#~ "enter it here. This is only used on a internal S0 bus and the most common "
-#~ "one is \"0\".</p>\n"
+#~ "enter it here. This is only used on a internal S0 bus and the most common one is \"0\".</p>\n"
 #~ msgstr ""
 #~ "<p><b>拨号前缀：</b>若您需要前缀以获取公用线路，请在此输入。\n"
 #~ "此前缀仅在内部 S0 总线上使用，最常见的是 \"0\"。</p>\n"
 
-#~ msgid ""
-#~ "<p>If you do not want to log all your ISDN traffic, uncheck <b>Start ISDN "
-#~ "Log</b>.</p>"
+#~ msgid "<p>If you do not want to log all your ISDN traffic, uncheck <b>Start ISDN Log</b>.</p>"
 #~ msgstr "<p>若您不想要记录全部 ISDN 流量，请反选<b>启动 ISDN 日志</b>。</p>"
 
 #~ msgid "ISDN Protocol"
@@ -5652,10 +5487,8 @@
 #~ msgstr "<p>请输入全部调制解调器配置值。</p>"
 
 #~ msgid ""
-#~ "<p><b>Modem Device</b> specifies to which port your modem is connected. "
-#~ "ttyS0,\n"
-#~ "ttyS1, etc., refer to serial ports and usually correspond to COM1, COM2, "
-#~ "etc.,\n"
+#~ "<p><b>Modem Device</b> specifies to which port your modem is connected. ttyS0,\n"
+#~ "ttyS1, etc., refer to serial ports and usually correspond to COM1, COM2, etc.,\n"
 #~ "in DOS/Windows. ttyACM0 and ttyACM1 refer to USB ports.</p>"
 #~ msgstr ""
 #~ "<p><b>调制解调器设备</b>指定了您调制解调器连接的端口。\n"
@@ -5665,18 +5498,13 @@
 #~ msgid ""
 #~ "<p>If you are on a PBX, you probably need to enter a <b>Dial Prefix</b>.\n"
 #~ "Often, this is <i>9</i> or <i>0</i>.</p>\n"
-#~ msgstr ""
-#~ "<p>若您位于 PBX 上，您可能需要输入一个<b>拨号前缀</b>，通常是 <i>9</i> 或 "
-#~ "<i>0</i>。</p>\n"
+#~ msgstr "<p>若您位于 PBX 上，您可能需要输入一个<b>拨号前缀</b>，通常是 <i>9</i> 或 <i>0</i>。</p>\n"
 
 #~ msgid ""
 #~ "<p>Choose <b>Dial Mode</b> according to your phone link. Most telephone\n"
-#~ "companies use <i>Tone Dial</i> as the <b>Dial Mode</b>. Check the "
-#~ "additional\n"
-#~ "check boxes to turn on your modem speaker (<i>Speaker On</i>) or for "
-#~ "your\n"
-#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).\n"
+#~ "companies use <i>Tone Dial</i> as the <b>Dial Mode</b>. Check the additional\n"
+#~ "check boxes to turn on your modem speaker (<i>Speaker On</i>) or for your\n"
+#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).</p>\n"
 #~ msgstr ""
 #~ "<p>根据您的电话连接方式选择<b>拨号模式</b>。\n"
 #~ "大多数电话公司使用<i>音频拨号</i>作为<b>拨号模式</b>。\n"
@@ -5728,8 +5556,7 @@
 #~ msgid ""
 #~ "<p>All the relevant information about <b>Init Strings</b>\n"
 #~ "should be in your modem manual.</p>\n"
-#~ msgstr ""
-#~ "<p><b>初始化字符串</b>的全部相关信息应该在您的调制解调器手册中。</p>\n"
+#~ msgstr "<p><b>初始化字符串</b>的全部相关信息应该在您的调制解调器手册中。</p>\n"
 
 #~ msgid "B&aud Rate"
 #~ msgstr "波特率(&A)"
@@ -5772,12 +5599,9 @@
 
 #~ msgid ""
 #~ "<p><b>Dial on Demand</b> means that the Internet\n"
-#~ "connection will be established automatically when data from the Internet "
-#~ "is\n"
-#~ "requested. To use this feature, specify at least one <i>name server</i>. "
-#~ "Use\n"
-#~ "this feature only if your Internet connection is inexpensive, because "
-#~ "there are\n"
+#~ "connection will be established automatically when data from the Internet is\n"
+#~ "requested. To use this feature, specify at least one <i>name server</i>. Use\n"
+#~ "this feature only if your Internet connection is inexpensive, because there are\n"
 #~ "programs that periodically request data from the Internet.</p>"
 #~ msgstr ""
 #~ "<p><b>按需拨号</b>意味着当请求来自互联网的数据时自动建立互联网连接。\n"
@@ -5788,9 +5612,7 @@
 #~ msgid ""
 #~ "<p>When <b>Modify DNS</b> is enabled, the <i>name server</i> will be\n"
 #~ "changed automatically when connected to the Internet.</p>"
-#~ msgstr ""
-#~ "<p>若启用了<b>修改 DNS</b>，则会在连接到互联网时自动修改<i>名称服务器。</p>"
+#~ msgstr "<p>若启用了<b>修改 DNS</b>，则会在连接到互联网时自动修改<i>名称服务器</i>。</p>"
 
 #~ msgid ""
 #~ "<p>If the provider does not transmit its domain name server (DNS)\n"
@@ -5802,8 +5624,7 @@
 
 #~ msgid ""
 #~ "<p><b>Name Servers</b> are required to convert hostnames\n"
-#~ "(such as www.suse.com) to IP addresses (for example, 213.95.15.200). You "
-#~ "only\n"
+#~ "(such as www.suse.com) to IP addresses (for example, 213.95.15.200). You only\n"
 #~ "need to specify the name servers if you enable dial on demand or\n"
 #~ "disable <b>DNS Modification</b> when connected.</p>\n"
 #~ msgstr ""
@@ -5813,10 +5634,8 @@
 #~ "则只需指定名称服务器。</p>\n"
 
 #~ msgid ""
-#~ "<p><b>Ignore Prompts</b> disables the detection of any prompts from the "
-#~ "dial-up\n"
-#~ "server. If the connection build-up is slow or does not work at all, try "
-#~ "this\n"
+#~ "<p><b>Ignore Prompts</b> disables the detection of any prompts from the dial-up\n"
+#~ "server. If the connection build-up is slow or does not work at all, try this\n"
 #~ "option.</p>\n"
 #~ msgstr ""
 #~ "<p><b>忽略提示</b>禁用了对来自拨号服务器的任何提示的检测。\n"
@@ -5833,11 +5652,8 @@
 
 #~ msgid ""
 #~ "<p>The <b>Idle Time-Out</b> specifies the time after which an idle\n"
-#~ "connection will be shut down (0 means the connection will not time-out).\n"
-#~ msgstr ""
-#~ "<p><b>空闲超时</b>指定了在多长时间后将关闭空闲连接 (0 意味着连接永不超"
-#~ "时)。</p>\n"
+#~ "connection will be shut down (0 means the connection will not time-out).</p>\n"
+#~ msgstr "<p><b>空闲超时</b>指定了在多长时间后将关闭空闲连接 (0 意味着连接永不超时)。</p>\n"
 
 #~ msgid "min"
 #~ msgstr "分钟"
@@ -5900,23 +5716,18 @@
 
 #~ msgid ""
 #~ "<p>Check <b>Dynamic IP Address</b>\n"
-#~ "if your provider assigns one temporary address per connection. In this "
-#~ "case,\n"
-#~ "the outgoing address is unknown until the moment the link is "
-#~ "established.\n"
+#~ "if your provider assigns one temporary address per connection. In this case,\n"
+#~ "the outgoing address is unknown until the moment the link is established.\n"
 #~ "This is the default with most providers.</p>"
 #~ msgstr ""
-#~ "<p>若您的服务提供商在每次连接时都指派一个临时地址，则请勾选<b>动态 IP 地址"
-#~ "</b>。\n"
+#~ "<p>若您的服务提供商在每次连接时都指派一个临时地址，则请勾选<b>动态 IP 地址</b>。\n"
 #~ "在这种情况下，外发地址直到连接建立前都是未知的。\n"
 #~ "这是大多数服务提供商的默认设置。</p>"
 
 #~ msgid ""
 #~ "<p>Check <b>Use Peer DNS</b> to change\n"
-#~ "your domain name servers after the connection is made. This replaces your "
-#~ "static\n"
-#~ "DNS configuration with the obtained DNS server IP addresses. Today, "
-#~ "almost all\n"
+#~ "your domain name servers after the connection is made. This replaces your static\n"
+#~ "DNS configuration with the obtained DNS server IP addresses. Today, almost all\n"
 #~ "providers support <b>Use Peer DNS</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>连接后，勾选<b>使用对等点 DNS</b> 来修改您的域名服务器。\n"
@@ -5924,28 +5735,23 @@
 #~ "现在几乎全部服务提供商都支持<b>使用对等点 DNS</b>。</p>\n"
 
 #~ msgid ""
-#~ "<p>If callback mode is off,  calls  are handled normally without "
-#~ "special \n"
+#~ "<p>If callback mode is off,  calls  are handled normally without special \n"
 #~ "processing.</p>"
 #~ msgstr "<p>若回拨模式为关，则将正常处理呼叫不作特殊处理。</p>"
 
 #~ msgid ""
-#~ "<p>If callback mode is server, after getting an incoming call, a "
-#~ "callback \n"
+#~ "<p>If callback mode is server, after getting an incoming call, a callback \n"
 #~ "is triggered.</p>"
 #~ msgstr "<p>若回拨模式为服务器，则将在收到来电后触发回拨。</p>"
 
 #~ msgid ""
 #~ "If callback mode is client, the local system does the initial call then \n"
 #~ "waits for callback from the remote machine.\n"
-#~ msgstr ""
-#~ "若回拨模式为客户端，则本地系统将进行初始呼叫，然后等待来自远程计算机的回"
-#~ "拨。\n"
+#~ msgstr "若回拨模式为客户端，则本地系统将进行初始呼叫，然后等待来自远程计算机的回拨。\n"
 
 #~ msgid ""
 #~ "<p>Check <b>Default Route</b> to set the default\n"
-#~ "route for this provider. This is most likely correct unless you want to "
-#~ "reach\n"
+#~ "route for this provider. This is most likely correct unless you want to reach\n"
 #~ "single machines or subnetworks through this provider.</p>"
 #~ msgstr ""
 #~ "<p>勾选<b>默认路由</b>为此服务提供商设置默认路由。\n"
@@ -6076,8 +5882,7 @@
 #~ msgid ""
 #~ "<p>To register for <b>%1</b> and find the best\n"
 #~ "dialing number, call the hot line <b>%2</b>.</p>\n"
-#~ msgstr ""
-#~ "<p>要注册 <b>%1</b> 并找到最佳拨号号码，请拨打热线 <b>%2</b>。</p>\n"
+#~ msgstr "<p>要注册 <b>%1</b> 并找到最佳拨号号码，请拨打热线 <b>%2</b>。</p>\n"
 
 #~ msgid "Provider Parameters"
 #~ msgstr "服务提供商参数"
@@ -6093,17 +5898,13 @@
 #~ msgstr "<p>请为服务提供商输入一个<b>服务提供商名称</b>。</p>"
 
 #~ msgid ""
-#~ "<p>Enter a <b>Provider Name</b> for the provider and a <b>Phone Number\n"
+#~ "<p>Enter a <b>Provider Name</b> for the provider and a <b>Phone Number</b>\n"
 #~ "to access your provider.</p>"
-#~ msgstr ""
-#~ "<p>请为服务提供商输入一个<b>服务提供商名称</b>和一个<b>电话号码</b>以访问"
-#~ "您的服务提供商。</p>"
+#~ msgstr "<p>请为服务提供商输入一个<b>服务提供商名称</b>和一个<b>电话号码</b>以访问您的服务提供商。</p>"
 
 #~ msgid ""
 #~ "<p>Select the type of packet encapsulation.\n"
-#~ "<b>RawIP</b> means that MAC headers are stripped. <b>SyncPPP</b> stands "
-#~ "for\n"
+#~ "<b>RawIP</b> means that MAC headers are stripped. <b>SyncPPP</b> stands for\n"
 #~ "Synchronous PPP.</p>"
 #~ msgstr ""
 #~ "<p>选择包封装类型。\n"
@@ -6123,22 +5924,18 @@
 #~ msgid ""
 #~ "<p>Enter the <b>User Name</b> and the\n"
 #~ "<b>Password</b> to use as the login (ask your provider if unsure).</p>"
-#~ msgstr ""
-#~ "<p>请输入登入时所用的<b>用户名</b>和<b>密码</b> (若不确定请垂询您的服务提"
-#~ "供商)。</p>"
+#~ msgstr "<p>请输入登入时所用的<b>用户名</b>和<b>密码</b> (若不确定请垂询您的服务提供商)。</p>"
 
 #~ msgid ""
 #~ "<p>The <b>User Name</b> will be extended\n"
-#~ "with the <i>t-online-com/</i> at the start and with <i>@t-online-com.de\n"
+#~ "with the <i>t-online-com/</i> at the start and with <i>@t-online-com.de</i>\n"
 #~ "at the end.</p>"
 #~ msgstr ""
 #~ "<p><b>用户名</b>开头将扩展为 <i>t-online-com/</i>，\n"
 #~ "结尾将扩展为 <i>@t-online-com.de</i>。</p>"
 
 #~ msgid ""
-#~ "<p>Check <b>Always Ask for Password</b> to be asked for the password "
-#~ "every time.\n"
+#~ "<p>Check <b>Always Ask for Password</b> to be asked for the password every time.\n"
 #~ "Your\n"
 #~ "Internet service provider might not allow passwords to be saved on\n"
 #~ "disk. If you enter the password here, it is saved in clear text on disk\n"
@@ -6221,8 +6018,7 @@
 #~ "请使用 KInternet (不用 NetworkManager)，或将密码保存在系统上。\n"
 
 #~ msgid ""
-#~ "You have entered some characters that are not numbers in the phone "
-#~ "field.\n"
+#~ "You have entered some characters that are not numbers in the phone field.\n"
 #~ "\n"
 #~ "Continue?"
 #~ msgstr ""
@@ -6236,47 +6032,38 @@
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space\n"
 #~ "(after the <b>/</b>) with your Kamp login. Then enter your password\n"
-#~ "and click <b>Next</b>. Contact your provider if you have difficulties.\n"
+#~ "and click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>在<b>用户名</b>字段中，用您的 Kamp 登录名替换空格 (<b>/</b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
 
 #~ msgid "<p>Access AOL-DSL.</p>"
 #~ msgstr "<p>AOL-DSL 连接</p>"
 
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space (before\n"
-#~ "the <b>@</b>) with your AOL login. Then enter your password and click "
-#~ "<b>Next</b>.\n"
-#~ "If you are a new AOL customer and want to dial up for the first time, you "
-#~ "need\n"
-#~ "to enter your AOL PIN number once. If you have a Windows system, you can "
-#~ "enter\n"
-#~ "the PIN in the AOL dial-up software. If not, call the AOL hot line and "
-#~ "request\n"
+#~ "the <b>@</b>) with your AOL login. Then enter your password and click <b>Next</b>.\n"
+#~ "If you are a new AOL customer and want to dial up for the first time, you need\n"
+#~ "to enter your AOL PIN number once. If you have a Windows system, you can enter\n"
+#~ "the PIN in the AOL dial-up software. If not, call the AOL hot line and request\n"
 #~ "the AOL staff to enter the PIN number for you.</p>\n"
 #~ msgstr ""
 #~ "<p>在<b>用户名</b>字段中，用您的 AOL 登录名替换空格 (<b>@</b> 前面)。\n"
 #~ "然后您的输入密码并点击<b>下一步</b>。\n"
 #~ "您若是 AOL 新客户并想要进行首次拨号，则需要输入一次您的 AOL PIN 号码。\n"
 #~ "您若有 Windows 系统，则可在 AOL 拨号软件中输入 PIN。\n"
-#~ "若没有 Windows 系统，则可拨打 AOL 热线并请求 AOL 工作人员为您输入 PIN 号"
-#~ "码。</p>\n"
+#~ "若没有 Windows 系统，则可拨打 AOL 热线并请求 AOL 工作人员为您输入 PIN 号码。</p>\n"
 
 #~ msgid "<p>Access to Kamp 1&1 DSL.</p>"
 #~ msgstr "<p>Kamp 1&1 DSL 连接</p>"
 
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
-#~ "the <b>/</b>) with your 1&1 login. Then enter your password and click "
-#~ "<b>Next</b>.\n"
+#~ "the <b>/</b>) with your 1&1 login. Then enter your password and click <b>Next</b>.\n"
 #~ "Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>在<b>用户名</b>字段中，用您的 1&1 登录名替换空格 (<b>/</b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
 
 #~ msgid "<p>Access to Kamp Eggenet DSL.</p>"
 #~ msgstr "<p>Kamp Eggenet DSL 连接</p>"
@@ -6293,14 +6080,11 @@
 
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
-#~ "the <b>/</b>) with your T-Online Business login. Then enter your password "
-#~ "and\n"
+#~ "the <b>/</b>) with your T-Online Business login. Then enter your password and\n"
 #~ "click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
-#~ "<p>在<b>用户名</b>字段中，用您的 T-Online Business 登录名替换空格 (<b>/ 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。\n"
+#~ "<p>在<b>用户名</b>字段中，用您的 T-Online Business 登录名替换空格 (<b>/</b> 后面)。\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
 
 #~ msgid "Provider Configuration"
 #~ msgstr "服务提供商配置"
@@ -6311,17 +6095,14 @@
 #~ msgid ""
 #~ "<p><b><big>Device Control</big></b></p>\n"
 #~ "<p>Usually, only the system administrator is allowed to activate and\n"
-#~ "deactivate a network interface. With <b>Enable Device Control for Non-"
-#~ "root User\n"
-#~ "Via QInternet</b>, any user may control the interface via QInternet.This "
-#~ "will require\n"
+#~ "deactivate a network interface. With <b>Enable Device Control for Non-root User\n"
+#~ "Via QInternet</b>, any user may control the interface via QInternet.This will require\n"
 #~ "<b>smpppd</b> installed and running.</p>\n"
 #~ msgstr ""
 #~ "<p><b><big>设备控制</big></b></p>\n"
 #~ "<p>通常只允许系统管理员激活和取消激活网络接口。\n"
 #~ "启用<b>通过 QInternet 为非 root 用户启用设备控制</b>后，\n"
-#~ "任何用户都可以通过 QInternet 控制接口。这需要安装和运行 <b>smpppd</b>。\n"
+#~ "任何用户都可以通过 QInternet 控制接口。这需要安装和运行 <b>smpppd</b>。</p>\n"
 
 #~ msgid "Initializing DSL Configuration"
 #~ msgstr "正在初始化 DSL 配置"
@@ -6664,8 +6445,7 @@
 #~ "万维网 (WWW) 的代理服务器的名称。</p>\n"
 
 #~ msgid ""
-#~ "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your "
-#~ "secured access\n"
+#~ "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n"
 #~ "to the World Wide Web (WWW).</p>\n"
 #~ msgstr ""
 #~ "<p><b>HTTP 代理 URL</b> 是代理服务器的名称，\n"
@@ -6683,8 +6463,7 @@
 
 #, fuzzy
 #~| msgid ""
-#~| "<p>If you have the <b>Use the Same Proxy for All Protocols</b> option "
-#~| "checked, it is\n"
+#~| "<p>If you have the <b>Use the Same Proxy for All Protocols</b> option checked, it is\n"
 #~| "enough to fill in the HTTP proxy URL. It will be used for all protocols\n"
 #~| "(HTTP, HTTPS and FTP).\n"
 #~ msgid ""
@@ -6709,13 +6488,11 @@
 #~| msgid ""
 #~| "<p>If you are using a proxy server with authorization, enter\n"
 #~| "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-#~| "consists of printable ASCII characters (except for quotation marks) only."
-#~| "</p>\n"
+#~| "consists of printable ASCII characters (except for quotation marks) only.</p>\n"
 #~ msgid ""
 #~ "<p>If you are using a proxy server with authorization, enter\n"
 #~ "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-#~ "consists of printable ASCII characters only (except for quotation marks)."
-#~ "</p>\n"
+#~ "consists of printable ASCII characters only (except for quotation marks).</p>\n"
 #~ msgstr ""
 #~ "<p>如果使用的代理服务器需要授权，则输入\n"
 #~ "<b>代理用户名</b>和<b>代理口令</b>。有效用户名\n"
@@ -6800,8 +6577,7 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Udev Rules</b> are rules for the Kernel device manager that allow\n"
-#~ "associating MAC address or BusID of the network device with its name (for "
-#~ "example,\n"
+#~ "associating MAC address or BusID of the network device with its name (for example,\n"
 #~ "eth1, wlan0 ) and assures a persistent device name upon reboot.\n"
 #~ msgstr ""
 #~ "<p><b>Udev 规则</b> 用于内核设备管理器的规则，这允许\n"
@@ -6813,16 +6589,11 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>For <b>Static Address Setup</b> enter the static IP address for your "
-#~ "computer (for example: <tt>192.168.100.99</tt>) and\n"
-#~ "the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix "
-#~ "<tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0 and <tt>/32</tt>.Optionally, you can enter\n"
-#~ "a fully qualified hostname for this IP address. The hostname will be "
-#~ "written to <tt>/etc/hosts</tt>.</p>\n"
+#~ "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
+#~ "the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</tt> and <tt>/32</tt>.Optionally, you can enter\n"
+#~ "a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>\n"
 #~ msgstr ""
-#~ "<p>对于<b>静态地址设置</b>， 请输入您的计算机的 IP 地址(例如，"
-#~ "<tt>192.168.100.99</tt>)、\n"
+#~ "<p>对于<b>静态地址设置</b>， 请输入您的计算机的 IP 地址(例如，<tt>192.168.100.99</tt>)、\n"
 #~ "网络掩码(通常是 <tt>255.255.255.0</tt>)。此外，您可以为这个 IP 地址\n"
 #~ "输入一个合格的主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n"
 
@@ -6843,16 +6614,13 @@
 #~ msgstr "网络掩码(&N)"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>Enable <b>IP Forwarding</b> if the system is a router. This will apply "
-#~ "on both IPv4 and IPv6.</p>"
+#~ msgid "<p>Enable <b>IP Forwarding</b> if the system is a router. This will apply on both IPv4 and IPv6.</p>"
 #~ msgstr "<p>如果系统是路由器，请启用 <b>IP 转发</b>。</p>"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Your hostname will be written to <tt>/etc/hosts</tt> and will be \n"
-#~ "resolvable as <tt>127.0.0.2</tt> IP address. To disable this "
-#~ "modification, \n"
+#~ "resolvable as <tt>127.0.0.2</tt> IP address. To disable this modification, \n"
 #~ "uncheck <b>Write Hostname to /etc/hosts</b> box. In that case your \n"
 #~ "hostname will not be resolvable without an active network.\n"
 #~ "</p> \n"
@@ -6890,8 +6658,7 @@
 
 #~ msgid ""
 #~ "<p>Configure your Internet proxy (caching) settings here.</p>\n"
-#~ "<p><b>Note:</b> In some cases you may need to relogin for the settings to "
-#~ "take effect</p>"
+#~ "<p><b>Note:</b> In some cases you may need to relogin for the settings to take effect</p>"
 #~ msgstr ""
 #~ "<p>在此设置互联网代理(缓存)。</p>\n"
 #~ "<p><b>注意：</b>在某些情况下，您需要重新登录才能让设置生效</p>"
@@ -6912,11 +6679,8 @@
 #~ msgstr "正在运行 KInternet..."
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>The <b>%1</b> packages must be installed because device control for "
-#~ "non-root users has been established.</p>"
-#~ msgstr ""
-#~ "<p>由于要让非 root 用户也能够控制设备，必须安装 <b>%1</b> 软件包。</p>"
+#~ msgid "<p>The <b>%1</b> packages must be installed because device control for non-root users has been established.</p>"
+#~ msgstr "<p>由于要让非 root 用户也能够控制设备，必须安装 <b>%1</b> 软件包。</p>"
 
 #~ msgid "<p>Do you want to install it now?</p>"
 #~ msgstr "<p>是否要立即安装？</p>"
@@ -6926,10 +6690,8 @@
 #~ "Download of latest release notes failed due to server-side error. \n"
 #~ "This does not necessarily mean misconfigured network.\n"
 #~ "\n"
-#~ "Click <b>Continue</b> to proceed to the next installation step. To skip "
-#~ "any steps\n"
-#~ "requiring internet connection or to get back to your network "
-#~ "configuration,\n"
+#~ "Click <b>Continue</b> to proceed to the next installation step. To skip any steps\n"
+#~ "requiring internet connection or to get back to your network configuration,\n"
 #~ "click <b>Cancel</b>."
 #~ msgstr ""
 #~ "由于服务器方面的错误，下载最新的发行说明失败。\n"
@@ -6951,8 +6713,7 @@
 
 #~ msgid ""
 #~ "<p>If you plan to use a dial-up Internet connection and have set up your\n"
-#~ "connection to use dynamic DNS assignment, these values will be "
-#~ "temporarily\n"
+#~ "connection to use dynamic DNS assignment, these values will be temporarily\n"
 #~ "disabled during the connection.</p>"
 #~ msgstr ""
 #~ "<p>如果要使用拨号因特网连接并已建立连接来使用\n"
@@ -6978,8 +6739,7 @@
 
 #~ msgid ""
 #~ "<p>Modify the current version of the file.</p>\n"
-#~ "<p>Press <b>Accept</b> and continue editing other data. You are able to "
-#~ "return to this dialog at a later time, \n"
+#~ "<p>Press <b>Accept</b> and continue editing other data. You are able to return to this dialog at a later time, \n"
 #~ "when the above service has terminated.</p>\n"
 #~ msgstr ""
 #~ "<p>修改文件的当前版本。</p>\n"
@@ -6992,14 +6752,10 @@
 #~ msgid "Search List: Set by DHCP"
 #~ msgstr "搜索列表：由 DHCP 设置"
 
-#~ msgid ""
-#~ "<p>Enter the name for this computer and the DNS domain that it belongs to."
-#~ "</p>"
+#~ msgid "<p>Enter the name for this computer and the DNS domain that it belongs to.</p>"
 #~ msgstr "<p>输入此计算机的名称以及所属的 DNS 域。</p>"
 
-#~ msgid ""
-#~ "<p>The domain is especially important if this computer is a mail server."
+#~ msgid "<p>The domain is especially important if this computer is a mail server.</p>"
 #~ msgstr "<p>如果此计算机是邮件服务器，则该域特别重要。</p>"
 
 #~ msgid "&Change /etc/resolv.conf manually"

Modified: trunk/yast/zh_CN/po/nfs.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nfs.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nfs.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: nfs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2015-10-19 17:47+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -138,14 +138,14 @@
 "有效的域名：%3"
 
 #. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
 msgid ""
 "fstab already contains an entry\n"
 "with mount point '%1'."
 msgstr "fstab 已经包含一个带有挂载点 '%1' 的项。"
 
 #. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
 msgid ""
 "The path entered is invalid.\n"
 "It must be shorter than 70 characters\n"
@@ -374,12 +374,12 @@
 msgstr "网络文件系统客户端配置"
 
 #. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
 msgid "Unable to create directory '%1'."
 msgstr "无法创建目录 '%1'。"
 
 #. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
 msgid ""
 "Unable to write to /etc/fstab.\n"
 "No changes will be made to the\n"
@@ -389,52 +389,52 @@
 "将不会修改网络文件系统客户端配置。\n"
 
 #. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
 msgid "Writing NFS Configuration"
 msgstr "正在写入网络文件系统配置"
 
 #. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
 msgid "Stop services"
 msgstr "停止服务"
 
 #. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
 msgid "Start services"
 msgstr "启动服务"
 
 #. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
 msgid "Stopping services..."
 msgstr "正在停止服务..."
 
 #. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
 msgid "Starting services..."
 msgstr "正在启动服务..."
 
 #. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
 msgid "Finished"
 msgstr "已完成"
 
 #. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
 msgid "Writing NFS client settings. Please wait..."
 msgstr "正在写入网络文件系统客户端设置。请稍候..."
 
 #. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
 msgid "Unable to mount the NFS entries from /etc/fstab."
 msgstr "无法在 /etc/fstab 中挂载网络文件系统项。"
 
 #. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
 msgid "NFS Entries"
 msgstr "网络文件系统项"
 
 #. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
 msgid "%1 entries configured"
 msgstr "已配置 %1 项"
 

Modified: trunk/yast/zh_CN/po/nfs_server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nfs_server.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nfs_server.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: nfs server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2016-06-05 16:56+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -66,9 +66,7 @@
 msgstr "导出选项 (参见 'man exports')"
 
 #: src/clients/nfs_server.rb:113
-msgid ""
-"Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc."
-"com' etc."
+msgid "Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc.com' etc."
 msgstr "第四版网络文件系统 ID 映射的域名规格，如 'localdomain' 或者 'abc.com' 等。"
 
 #: src/clients/nfs_server.rb:119
@@ -80,27 +78,27 @@
 msgstr "启用/禁用安全网络文件系统的是/否选项。"
 
 #. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
 msgid "NFS server is enabled"
 msgstr "已启用网络文件系统服务器"
 
 #. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
 msgid "NFS server is disabled"
 msgstr "已禁用网络文件系统服务器"
 
 #. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
 msgid "Required packages (%1) are not installed."
 msgstr "未安装必需的软件包 (%1)。"
 
 #. error
 #. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
 msgid "No mount point specified."
 msgstr "未指定挂载点。"
 
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
 msgid ""
 "The exports table already\n"
 "contains this directory."
@@ -109,18 +107,13 @@
 #. CLI action handler.
 #. @param [Hash] options command options
 #. @return whether successful
-#: src/clients/nfs_server.rb:325
-msgid ""
-"Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
+#: src/clients/nfs_server.rb:319
+msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
 msgstr "未启用第四版网络文件系统不能设置域。请使用 'set enablev4' 命令。"
 
-#: src/clients/nfs_server.rb:336
-msgid ""
-"Command 'set' must be used in the form 'set option=value'. Use 'set help' to "
-"get information about available options."
-msgstr ""
-"命令 'set' 必须以 'set 选项=值' 格式使用。请使用 'set help' 获知可用选项信"
-"息。"
+#: src/clients/nfs_server.rb:330
+msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
+msgstr "命令 'set' 必须以 'set 选项=值' 格式使用。请使用 'set help' 获知可用选项信息。"
 
 #. Then no need to check for conflict.
 #: src/include/nfs_server/routines.rb:205
@@ -128,9 +121,7 @@
 msgid ""
 "%3 and %4 are both exported with the option fsid=0\n"
 "for the same client '%1' (contained in '%2')"
-msgstr ""
-"同一客户端 '%1' 中 (包含在 '%2' 中)，%3 和 %4 均使用了选项 fsid=0 导出。这是"
-"不允许的。"
+msgstr "同一客户端 '%1' 中 (包含在 '%2' 中)，%3 和 %4 均使用了选项 fsid=0 导出。这是不允许的。"
 
 #. selection box label
 #: src/include/nfs_server/routines.rb:313
@@ -177,65 +168,55 @@
 "配置文件中也可能有伪空格。\n"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
 msgid "&Directory to Export"
 msgstr "要导出的目录(&D)"
 
 #. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
 msgid "&Browse..."
 msgstr "浏览(&B)..."
 
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
 msgid "Enter a non-empty export path. For example, /exports."
 msgstr "请输入非空导出路径。 如： /exports。"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
 msgid "The exports table already contains this directory."
 msgstr "导出表已包含此目录。"
 
-#. message popup; %1, %2 are package names
-#: src/include/nfs_server/ui.rb:113
-msgid ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-msgstr ""
-"用户模式网络文件系统服务器 (%1) 无法导出名称中包含空格的目录。\n"
-"请使用基于内核的服务器 (%2) 完成本操作。"
-
 #. the dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
 msgid "The directory does not exist. Create it?"
 msgstr "该目录不存在。创建它吗？"
 
 #. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
 msgid "Select the Directory to Export"
 msgstr "选择要导出的目录"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
 msgid "&Host Wild Card"
 msgstr "主机通配符(&H)"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
 msgid "O&ptions"
 msgstr "选项(&P)"
 
 #. check to see if user has changed options entry in the dialogue
 #. thrown due to a "Add Hosts" (as opposed to editing existing ones).
 #. If yes, suggest the user with a suitable default option set.
-#: src/include/nfs_server/ui.rb:250
+#: src/include/nfs_server/ui.rb:222
 msgid ""
 "'fsid=0' is not a valid option unless \n"
 "NFSv4 is enabled (previous page).\n"
 msgstr "启用第四版网络文件系统 (见前页) 后 'fsid=0' 才是有效的选项。\n"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
 msgid ""
 "Options for this wild card\n"
 "are already set."
@@ -243,14 +224,12 @@
 
 #. Opening NFS server dialog
 #. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
-msgid ""
-"Unable to read the /etc/idmapd.conf file. Setting the default setting for "
-"the domain to 'localdomain'."
+#: src/include/nfs_server/ui.rb:272
+msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
 msgstr "无法读取 /etc/idmapd.conf 文件。正在将域默认设置设为 'localdomain'。"
 
 #. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
 msgid ""
 "<P>Here, choose whether to start an NFS server on your computer\n"
 "and export some of your directories to others.</P>"
@@ -259,7 +238,7 @@
 "并且将某些目录导出到其它目录中。</P>"
 
 #. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
 msgid ""
 "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
 "a configuration dialog in which to specify the directories to export.</P>"
@@ -267,70 +246,64 @@
 "<P>若您选择了<B>启动网络文件系统服务器</B>，点击<B>下一步</B>将打开一个\n"
 "配置对话框，在其中可指定要导出的目录。</P>"
 
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
 msgid ""
 "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
-"and fill in the NFSv4 domain name you want the ID mapping daemon to use. "
-"Leave\n"
-"it as localdomain or refer to the man page for idmapd and idmapd.conf if you "
-"are not sure.</P>\n"
+"and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
+"it as localdomain or refer to the man page for idmapd and idmapd.conf if you are not sure.</P>\n"
 msgstr ""
-"<P>若服务器需要处理网络文件系统第四版客户端，请勾选<B>启用第四版网络文件系统"
-"</B>，\n"
-"并填写供 ID 映射守护精灵使用的第四版网络文件系统域名。若不确定要填的域名，请"
-"保留为\n"
+"<P>若服务器需要处理网络文件系统第四版客户端，请勾选<B>启用第四版网络文件系统</B>，\n"
+"并填写供 ID 映射守护精灵使用的第四版网络文件系统域名。若不确定要填的域名，请保留为\n"
 "'localdomain' 或参考 idmapd 和 idmapd.conf 的帮助手册。</P>\n"
 
 #. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
 msgid ""
 "<P>If the server and client must authenticate using GSS library, check the\n"
-"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have "
-"Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
+"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
 msgstr ""
 "<P>若服务器和客户端必须使用 GSS 库认证，请勾选<B>启用 GSS 安全</B>\n"
-"复选框。要使用 GSS API，当前系统上必须装有 kerberos 和 gssapi (nfs-utils > "
-"1.0.7)。</P>\n"
+"复选框。要使用 GSS API，当前系统上必须装有 kerberos 和 gssapi (nfs-utils > 1.0.7)。</P>\n"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
 msgid "NFS Server"
 msgstr "网络文件系统服务器"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
 msgid "&Start"
 msgstr "启动(&S)"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
 msgid "Do &Not Start"
 msgstr "不启动(&N)"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
 msgid "Enable NFSv4"
 msgstr "启用第四版网络文件系统"
 
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
 msgid "Enable NFS&v4"
 msgstr "启用第四版网络文件系统(&V)"
 
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
 msgid "Enter NFSv4 do&main name:"
 msgstr "输入第四版网络文件系统域名(&M)："
 
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
 msgid "Enable &GSS Security"
 msgstr "启用 &GSS 安全"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
 msgid "NFS Server Configuration"
 msgstr "网络文件系统服务器配置"
 
 #. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
 msgid ""
 "<P>The upper box contains all the directories to export.\n"
 "If a directory is selected, the lower box shows the hosts allowed to\n"
@@ -341,79 +314,72 @@
 "允许挂载该目录的主机。</P>\n"
 
 #. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
 msgid ""
-"<P><b>Host Wild Card</b> sets which hosts can access the selected "
-"directory.\n"
+"<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
 "It can be a single host, groups, wild cards, or\n"
 "IP networks.</P>\n"
 msgstr ""
 "<P><b>主机通配符</b>设置可访问所选目录的主机。\n"
 "它可以是单个主机、组、通配符或 IP 网络。</P>\n"
 
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
-msgid ""
-"<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
+msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
 msgstr "<p>输入星号 (<tt>*</tt>) 而不是名称可指定全部主机。</p>"
 
-#. Help, part 3 of 4, variant for user space server
-#: src/include/nfs_server/ui.rb:544
-msgid "<p>Leave the field empty to specify all hosts.</p>"
-msgstr "<p>留空字段来指定全部主机。</p>"
-
 #. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
 msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
 msgstr "<P>更多信息请参考 <tt>man exports</tt>。</P>\n"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
 msgid "Add &Directory"
 msgstr "添加目录(&D)"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
 msgid "&Edit"
 msgstr "编辑(&E)"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
 msgid "De&lete"
 msgstr "删除(&L)"
 
 #. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
 msgid "Host Wild Card"
 msgstr "主机通配符"
 
 #. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
 msgid "Options"
 msgstr "选项"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
 msgid "Add &Host"
 msgstr "添加主机(&H)"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
 msgid "Ed&it"
 msgstr "编辑(&I)"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
 msgid "Dele&te"
 msgstr "删除(&T)"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
 msgid "Directories to Export"
 msgstr "要导出的目录"
 
 #. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:181
+#: src/modules/NfsServer.rb:158
 msgid ""
 "Unable to create a missing directory:\n"
 "%1"
@@ -422,7 +388,7 @@
 "%1"
 
 #. error popup message
-#: src/modules/NfsServer.rb:193
+#: src/modules/NfsServer.rb:170
 msgid ""
 "Unable to write to /etc/exports.\n"
 "No changes will be made to the\n"
@@ -432,74 +398,60 @@
 "将不会修改导出目录。\n"
 
 #. dialog label
-#: src/modules/NfsServer.rb:228
+#: src/modules/NfsServer.rb:192
 msgid "Writing NFS Server Configuration"
 msgstr "正在写入网络文件系统服务器配置"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:233
+#: src/modules/NfsServer.rb:197
 msgid "Save /etc/exports"
 msgstr "保存 /etc/exports"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:235
+#: src/modules/NfsServer.rb:199
 msgid "Restart services"
 msgstr "重启服务"
 
 #. progress step label
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:203
 msgid "Saving /etc/exports..."
 msgstr "正在保存 /etc/exports..."
 
 #. progress step label
-#: src/modules/NfsServer.rb:241
+#: src/modules/NfsServer.rb:205
 msgid "Restarting services..."
 msgstr "正在重启服务..."
 
 #. final progress step label
-#: src/modules/NfsServer.rb:243
+#: src/modules/NfsServer.rb:207
 msgid "Finished"
 msgstr "已完成"
 
 #. help text
-#: src/modules/NfsServer.rb:251
+#: src/modules/NfsServer.rb:215
 msgid "Writing NFS server settings. Please wait..."
 msgstr "正在写入网络文件系统服务器设置。请稍候..."
 
 #. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:265
+#: src/modules/NfsServer.rb:229
 msgid "Unable to write to idmapd.conf."
 msgstr "无法写入 idmapd.conf。"
 
-#: src/modules/NfsServer.rb:314
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "无法启动 idmapd。请检查您的域设置。"
-
-#: src/modules/NfsServer.rb:321
-msgid "Unable to restart idmapd."
-msgstr "无法重启 idmapd。"
-
-#: src/modules/NfsServer.rb:328
-msgid "Unable to stop idmapd."
-msgstr "无法停止 idmapd。"
-
 #. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:339
-msgid ""
-"Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup "
-"is correct."
+#: src/modules/NfsServer.rb:266
+msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
 msgstr "无法启动 svcgssd。请确保 kerberos 和 gssapi (nfs-utils) 设置正确。"
 
-#: src/modules/NfsServer.rb:349
-msgid "'svcgssd' is already running. Unable to restart it."
-msgstr "'svcgssd' 已在运行。无法重启它。"
+#: src/modules/NfsServer.rb:275
+msgid "Unable to restart 'svcgssd' service."
+msgstr "无法重启 'svcgssd' 服务。"
 
-#: src/modules/NfsServer.rb:357
+#: src/modules/NfsServer.rb:283
 msgid "'svcgssd' is running. Unable to stop it."
 msgstr "'svcgssd' 正在运行。无法停止它。"
 
 #. error popup message
-#: src/modules/NfsServer.rb:376
+#: src/modules/NfsServer.rb:299
 msgid ""
 "Unable to restart the NFS server.\n"
 "Your changes will be active after reboot.\n"
@@ -508,18 +460,38 @@
 "您的修改将在重引导后生效。\n"
 
 #. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:399
+#: src/modules/NfsServer.rb:322
 msgid "NFS Exports"
 msgstr "网络文件系统导出表"
 
 #. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:417
+#: src/modules/NfsServer.rb:340
 msgid "The NFSv4 domain for idmapping is %1."
 msgstr "用于 ID 映射的第四版网络文件系统域是 %1 。"
 
-#~ msgid "Unable to restart 'svcgssd' service."
-#~ msgstr "无法重启 'svcgssd' 服务。"
+#~ msgid ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+#~ msgstr ""
+#~ "用户模式网络文件系统服务器 (%1) 无法导出名称中包含空格的目录。\n"
+#~ "请使用基于内核的服务器 (%2) 完成本操作。"
 
+#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
+#~ msgstr "<p>留空字段来指定全部主机。</p>"
+
+#~ msgid "Unable to start idmapd. Check your domain setting."
+#~ msgstr "无法启动 idmapd。请检查您的域设置。"
+
+#~ msgid "Unable to restart idmapd."
+#~ msgstr "无法重启 idmapd。"
+
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "无法停止 idmapd。"
+
+#~ msgid "'svcgssd' is already running. Unable to restart it."
+#~ msgstr "'svcgssd' 已在运行。无法重启它。"
+
 #~ msgid "Directories"
 #~ msgstr "目录"
 
@@ -529,27 +501,20 @@
 #~ msgid "Firewall"
 #~ msgstr "防火墙"
 
-#~ msgid ""
-#~ "<p>NFSv4 is enabled. Make sure that only one exported filesystem is "
-#~ "marked with the fsid=0 option for a particular client.</p>"
-#~ msgstr ""
-#~ "<p>已启用第四版网络文件系统。请确保对于一个特定客户端，只有一个导出的文件"
-#~ "系统标记有 fsid=0 选项。</p>"
+#~ msgid "<p>NFSv4 is enabled. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client.</p>"
+#~ msgstr "<p>已启用第四版网络文件系统。请确保对于一个特定客户端，只有一个导出的文件系统标记有 fsid=0 选项。</p>"
 
 #~ msgid ""
 #~ "<p>In case of multiple exports to a NFSv4 client,\n"
-#~ "you need to bind the exported paths with no fsid=0 to the one with "
-#~ "fsid=0.\n"
+#~ "you need to bind the exported paths with no fsid=0 to the one with fsid=0.\n"
 #~ "To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as\n"
 #~ "<tt>/</tt> and <tt>/husband</tt>, respectively, use<br />\n"
 #~ "<pre>/Eve         10.0.0.1(fsid=0,crossmnt,ro,...)\n"
 #~ "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n"
 #~ "</p>"
 #~ msgstr ""
-#~ "<p>若网络文件系统第四版客户端有多个导出表，您需要将不带 fsid=0 选项的导出"
-#~ "路径绑定到带有 fsid=0 选项的导出路径。\n"
-#~ "要将服务器路径 <tt>/Eve</tt> 和 <tt>/Adam</tt> 导出为 <tt>/</tt> 和 <tt>/"
-#~ "husband</tt>，相应地，可使用<br/>\n"
+#~ "<p>若网络文件系统第四版客户端有多个导出表，您需要将不带 fsid=0 选项的导出路径绑定到带有 fsid=0 选项的导出路径。\n"
+#~ "要将服务器路径 <tt>/Eve</tt> 和 <tt>/Adam</tt> 导出为 <tt>/</tt> 和 <tt>/husband</tt>，相应地，可使用<br/>\n"
 #~ "<pre>/Eve          10.0.0.1(fsid=0,crossmnt,ro,...)\n"
 #~ "/Eve/husband  10.0.0.1(bind=/Adam,ro,...)</pre>\n"
 #~ "</p>"

Modified: trunk/yast/zh_CN/po/nis.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nis.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nis.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Nis\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2013-02-04 15:48+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -258,9 +258,10 @@
 msgstr "NIS 服务器地址(&A)"
 
 #. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "广播(&O)"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "广播(&B)"
 
 #. pushbutton label, find nis servers
 #. Shortcut must not conflict with Finish and Next (#29960)
@@ -373,11 +374,6 @@
 msgstr "服务器(用空格或逗号分隔)(&S)"
 
 #. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "广播(&B)"
-
-#. checkbox label
 #: src/include/nis/ui.rb:859
 msgid "&SLP"
 msgstr "&SLP"
@@ -586,6 +582,9 @@
 msgid "NIS server not found."
 msgstr "未找到 NIS 服务器。"
 
+#~ msgid "Br&oadcast"
+#~ msgstr "广播(&O)"
+
 #~ msgid "<p>If you are using <b>DHCP</b> and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module.</p>"
 #~ msgstr "<p>如果您正在使用 <b>DHCP</b> 并且服务器提供 NIS 域名或服务器，则可以在此使用它们。DHCP 本身可以在网络模块中进行设置。</p>"
 

Modified: trunk/yast/zh_CN/po/ntp-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/ntp-client.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/ntp-client.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: Ntp Client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2014-09-04 14:05+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -29,7 +29,7 @@
 msgstr "正在写入 NTP 配置..."
 
 #. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
 msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
 msgstr "<p>按<b>立即同步</b>用所选 NTP 服务器校正您的系统时间。若您想要永久使用 NTP， 请启用<b>保存 NTP 配置</b>选项。</p>"
 
@@ -38,66 +38,66 @@
 msgstr "<p>若启用了<b>以守护进程方式运行 NTP</b>选项，NTP 服务将作为守护进程启动。否则将定时同步系统时间。默认同步周期为 15 分钟。您可在安装完成后通过 <b>yast2 ntp-client 模块</b>修改同步周期。</p>"
 
 #. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
 msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
 msgstr "<p>用<b>配置</b>按钮打开高级 NTP 配置。</p>"
 
 #. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
 msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
 msgstr "<p>只有在网络已经配置好的情况下才能与 NTP 服务器同步。</p>"
 
 #. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
 msgid "Invalid NTP server hostname %1"
 msgstr "无效的 NTP 服务器主机名 %1"
 
 #. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
 msgid "&NTP Server Address"
 msgstr "&NTP 服务器地址"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
 msgid "&Run NTP as daemon"
 msgstr "以守护进程方式运行 NTP(&R)"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
 msgid "&Save NTP Configuration"
 msgstr "保存 NTP 配置(&S)"
 
 #. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
 msgid "S&ynchronize now"
 msgstr "立即同步(&Y)"
 
 #. push button label
 #. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
 msgid "&Configure..."
 msgstr "配置(&C)..."
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
 msgid ""
 "Synchronization with NTP server is not possible\n"
 "without package %1 installed."
 msgstr "未安装软件包 %1，无法与 NTP 服务器同步。"
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
 msgid "Synchronizing with NTP server..."
 msgstr "正在与 NTP 服务器同步..."
 
 #. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
 msgid "Connection to selected NTP server failed."
 msgstr "连接至所选 NTP 服务器失败。"
 
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
 msgid ""
 "Test query to server '%1' failed.\n"
 "If server is not yet accessible or network is not configured\n"
@@ -305,273 +305,267 @@
 msgstr "JJY 接收器"
 
 #. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
 msgid "NTP client configuration module."
 msgstr "NTP 客户端配置模块。"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
 msgid "Print the status of the NTP daemon"
 msgstr "输出 NTP 守护进程的状态"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
 msgid "Print all configured synchronization relationships"
 msgstr "输出全部已配置同步关系"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
 msgid "Enable the NTP daemon"
 msgstr "启用 NTP 守护进程"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
 msgid "Disable the NTP daemon"
 msgstr "禁用 NTP 守护进程"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
 msgid "Add new synchronization relationship"
 msgstr "添加新的同步关系"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
 msgid "Edit existing synchronization relationship"
 msgstr "编辑已有的同步关系"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
 msgid "Delete a synchronization relationship"
 msgstr "删除同步关系"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
 msgid "The address of the server"
 msgstr "服务器地址"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
 msgid "The address of the peer"
 msgstr "对等点地址"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
 msgid "The address to which to broadcast"
 msgstr "发送广播的地址"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
 msgid "The address from which to accept broadcasts"
 msgstr "接受广播的地址"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
 msgid "The options of the relationship"
 msgstr "关系选项"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
 msgid "Options for clock driver calibration"
 msgstr "时钟驱动校准选项"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
 msgid "Use the server for initial synchronization"
 msgstr "将服务器用于初始同步"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
 msgid "Do not use the server for initial synchronization"
 msgstr "不将服务器用于初始同步"
 
 #. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
 msgid "The synchronization peer not specified."
 msgstr "未指定同步对等点。"
 
 #. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
 msgid "Specified synchronization peer not found."
 msgstr "未找到指定的同步对等点。"
 
 #. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
 msgid "NTP daemon is enabled."
 msgstr "已启用 NTP 守护进程。"
 
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
 msgid "NTP daemon is disabled."
 msgstr "已禁用 NTP 守护进程。"
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
 msgid "Server"
 msgstr "服务器"
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
 msgid "Peer"
 msgstr "对等点"
 
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
 msgid "Broadcast"
 msgstr "广播"
 
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
 msgid "Accepting Broadcasts"
 msgstr "接受广播"
 
 #. table cell, %1 is integer 0-3
 #. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
 msgid "Unit Number: %1"
 msgstr "单元编号：%1"
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
 msgid "Local Radio Clock"
 msgstr "本地无线电时钟"
 
 #. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
 msgid "Reading the settings failed."
 msgstr "读取设置失败。"
 
 #. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
 msgid "NTP Server Configuration"
 msgstr "NTP 服务器配置"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
 msgid "NTP Configuration"
 msgstr "NTP 配置"
 
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "防火墙设置"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
 msgid "General Settings"
 msgstr "常规设置"
 
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
 msgid "Security Settings"
 msgstr "安全设置"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
 msgid "Advanced NTP Configuration"
 msgstr "高级 NTP 配置"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
 msgid "New Synchronization"
 msgstr "新同步"
 
 #. Server editing dialog
 #. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
 msgid "Server Settings"
 msgstr "服务器设置"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
 msgid "NTP Server"
 msgstr "NTP 服务器"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
 msgid "Local NTP Server"
 msgstr "本地 NTP 服务器"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
 msgid "Public NTP Server"
 msgstr "公共 NTP 服务器"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
 msgid "NTP Peer"
 msgstr "NTP 对等点"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
 msgid "Local Reference Clock"
 msgstr "本地参考时钟"
 
 #. dialog caption
 #. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
 msgid "Outgoing Broadcast"
 msgstr "出站广播"
 
 #. dialog caption
 #. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
 msgid "Incoming Broadcast"
 msgstr "进站广播"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
 msgid "&Reference ID"
 msgstr "参考 ID(&R)"
 
 #. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
 msgid "&Stratum"
 msgstr "层(&S)"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
 msgid "Calibration Offset 1"
 msgstr "校准偏移 1"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
 msgid "Calibration Offset 2"
 msgstr "校准偏移 2"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
 msgid "Flag &1"
 msgstr "旗标 &1"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
 msgid "Flag &2"
 msgstr "旗标 &2"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
 msgid "Flag &3"
 msgstr "旗标 &3"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
 msgid "Flag &4"
 msgstr "旗标 &4"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
 msgid "Clock Driver Calibration"
 msgstr "时钟驱动校准"
 
 #. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
 msgid ""
 "<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
 "Please wait...<br></p>"
@@ -580,7 +574,7 @@
 "请稍候...<br></p>"
 
 #. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -589,7 +583,7 @@
 "现在按<b>中止</b>安全地中止配置工具。</p>"
 
 #. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
 msgid ""
 "<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
 "Please wait...<br></p>"
@@ -598,7 +592,7 @@
 "请稍候...<br></p>"
 
 #. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing  <b>Abort</b>.\n"
@@ -608,16 +602,23 @@
 "按<b>中止</b>中止保存过程。\n"
 "另一个对话框将告之您这样做是否安全。</p>"
 
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Start NTP Daemon</big></b><br>\n"
+#| "Select whether to start the NTP daemon now and on every system boot. \n"
+#| "The NTP daemon resolves host names when initializing. Your\n"
+#| "network connection must be started before the NTP daemon starts.</p>\n"
+#| "Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
+#| "The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
+#| " You can change this when the system was set up."
 msgid ""
 "<p><b><big>Start NTP Daemon</big></b><br>\n"
 "Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
 msgstr ""
 "<p><b><big>启动 NTP 守护进程</big></b><br>\n"
 "选择是否立即以及在每次系统引导时启动 NTP 守护进程。\n"
@@ -652,7 +653,7 @@
 "访问控制旗标可以在服务器概览表中优化调整。在通过 DHCP 配置 NTP 时此选项不可用。</p>\n"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
 msgid ""
 "<p><b><big>Configuring via DHCP</big></b><br>\n"
 "To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -666,7 +667,7 @@
 "请垂询您的网络管理员看 DHCP 服务器是否提供了有关 NTP 服务器的信息。</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
 msgid ""
 "<p><b><big>Configured Servers</big></b><br>\n"
 "To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -680,7 +681,7 @@
 "要删除已有的同步对等点，请选择该对等点并点击<b>删除</b>。</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
 msgid ""
 "<p><b><big>Display Log</big></b></p>\n"
 "<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
@@ -689,7 +690,7 @@
 "要查看 NTP 守护进程的日志，请点击<b>显示日志</b>。</p>\n"
 
 #. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
 msgid ""
 "<p><b><big>Advanced configuration</big></b><br>\n"
 "To configure this host to synchronize against multiple remote hosts or against\n"
@@ -699,7 +700,7 @@
 "要配置该主机与多个远程主机或本地连接的时钟同步，请使用<b>高级配置</b>。"
 
 #. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
 msgid ""
 "<p><b><big>Clock Type</big></b><br>\n"
 "Select the driver for the clock to configure.</p>"
@@ -708,7 +709,7 @@
 "请选择要配置的时钟的驱动。</p>"
 
 #. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
 msgid ""
 "<p><b><big>Unit Number</big></b><br>\n"
 "If you have multiple clocks of the same type, you must set\n"
@@ -718,7 +719,7 @@
 "若您有多个相同类型的时钟，则必须设定<b>单元编号</b>。</p>"
 
 #. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
 msgid ""
 "<p><b><big>Device</big></b><br>\n"
 "To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -736,7 +737,7 @@
 "</p> "
 
 #. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
 msgid ""
 "<p><b><big>Driver Calibration</big></b><br>\n"
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -745,7 +746,7 @@
 "要校准时钟驱动，请点击<b>驱动校准</b>。</p>"
 
 #. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
 msgid ""
 "<p><b><big>Address of the NTP Server</big></b><br>\n"
 "To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -757,7 +758,7 @@
 "要查找 NTP 服务器，请垂询您的网络管理员或互联网服务提供商。</p>"
 
 #. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
 msgid ""
 "<p><b><big>Selecting a Server</big></b><br>\n"
 "To select an NTP server from those found in the local network\n"
@@ -769,7 +770,7 @@
 "请点击<b>选择</b>并在<b>本地 NTP 服务器</b>和<b>公共 NTP 服务器</b>间进行选择。</p>"
 
 #. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
 msgid ""
 "<p><b><big>Testing Server Accessibility</big></b><br>\n"
 "To test if the selected server is up and responds properly,\n"
@@ -779,7 +780,7 @@
 "要测试所选服务器是否当值并能正常响应，请点击<b>测试</b>。</p>"
 
 #. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address of the host with which to synchronize mutually,\n"
@@ -789,7 +790,7 @@
 "要设定与之彼此同步的主机的地址，请使用<b>地址</b>。</p>"
 
 #. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -799,7 +800,7 @@
 "要设定用于广播的地址，请使用<b>地址</b>文本字段。</p>"
 
 #. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address from which to accept broadcast packets, use \n"
@@ -810,7 +811,7 @@
 
 #. help text 2/4, was removed
 #. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
 msgid ""
 "<p><b><big>Options</big></b><br>\n"
 "To fine-tune the synchronization source, enter the respective options in the\n"
@@ -821,7 +822,7 @@
 "要优化调整同步来源，请将相关选项输入<b>选项</b>文本字段。\n"
 "细节请参阅 <i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>。</p>\n"
 
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
 msgid ""
 "<p><b><big>Access Control Options</big></b><br>\n"
 "Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -837,7 +838,7 @@
 "此选项仅在您在<b>安全设置</b>中勾选了<b>限制 NTP 服务到配置过的服务器</b>选项后方可用。</p>\n"
 
 #. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
 msgid ""
 "<p><b><big>Synchronization Peer Type</big></b><br>\n"
 "Select the kind of synchronization peer to add here.</p>"
@@ -846,42 +847,42 @@
 "选择要添加到此的同步对等点的类型。</p>"
 
 #. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
 msgid ""
 "<p>To add an NTP server to which to synchronize,\n"
 "select <b>Server</b>.</p>"
 msgstr "<p>要添加与之同步的 NTP 服务器，请选择<b>服务器</b>。</p>"
 
 #. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
 msgid ""
 "<p>To add an NTP peer to synchronize mutually, select\n"
 "<b>Peer</b>.</p>"
 msgstr "<p>要添加彼此同步的 NTP 对等点，请选择<b>对等点</b>。</p>"
 
 #. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
 msgid ""
 "<p>To configure a local clock connected directly to your computer,\n"
 "select <b>Radio Clock</b>.</p>"
 msgstr "<p>要配置直接连接到您的计算机的本地时钟，请选择<b>无线电时钟</b>。</p>"
 
 #. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
 msgid ""
 "<p>To broadcast time information through your network, select\n"
 "<b>Outgoing Broadcast</b>.</p>"
 msgstr "<p>要通过网络广播时间信息，请选择<b>出站广播</b>。</p>"
 
 #. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
 msgid ""
 "<p>To accept NTP packets broadcasted by other hosts on the network\n"
 "and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
 msgstr "<p>要接受网络中其它主机广播的 NTP 数据包并将它们用于设定本地时间，请选择<b>进站广播<b>。</p>"
 
 #. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
 msgid ""
 "<p><big><b>Server Location</b></big>\n"
 "Select if you want to find the NTP server in the local network or select\n"
@@ -891,7 +892,7 @@
 "选择是在本地网络中查找 NTP 服务器，还是从已知 NTP 服务器列表中选择 NTP 服务器。</p>"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
 msgid ""
 "<p><big><b>Finding Server in the Local\n"
 "Network</b></big><br>\n"
@@ -904,7 +905,7 @@
 "然后从找到的服务器的列表中选择一个服务器。</p>"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
 msgid ""
 "<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
 "Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -915,7 +916,7 @@
 "要显示只适用于某个特定国家/地区的 NTP 服务器，请在<b>国家/地区</b>中进行选择。</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
 msgid ""
 "<p><big><b>Note</b></big><br>\n"
 "The listed NTP servers may not be available from any country, but only\n"
@@ -934,7 +935,7 @@
 "。</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
 msgid ""
 "<p><big><b>Testing Server Accessibility</b></big><br>\n"
 "To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -944,7 +945,7 @@
 
 #. help text connected with checkbox: "Use Random Server from pool.ntp.org"
 #. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
 msgid ""
 "<p><big><b>Use Random Servers</b></big><br>\n"
 "This service is offered by pool.ntp.org. If you select this option,\n"
@@ -958,7 +959,7 @@
 "这意味着您的 NTP 客户端每小时将与不同的服务器同步。</p>\n"
 
 #. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
 msgid ""
 "<p><big><b>Clock Driver Calibration</b></big><br>\n"
 "The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -970,7 +971,7 @@
 "特定选项的含义取决于特定驱动。某些驱动不使用全部选项。</p>"
 
 #. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
 msgid ""
 "To learn more about available options, install the package\n"
 "<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -988,17 +989,17 @@
 "将丢失全部修改。"
 
 #. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
 msgid "Restart NTP Daemon"
 msgstr "重启 NTP 守护进程"
 
 #. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
 msgid "Save Settings and Restart NTP Daemon"
 msgstr "保存设置并重启 NTP 守护进程"
 
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
 msgid ""
 "Warning!\n"
 "\n"
@@ -1013,14 +1014,14 @@
 "而且该守护进程可能无法正常运行。"
 
 #. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
 msgid ""
 "NTP server '%1' is not a valid hostname,\n"
 "fully qualified hostname, IPv4 address, or IPv6 address."
 msgstr "NTP 服务器 '%1' 不是有效的主机名、完全限定的主机名、Ipv4 地址或 IPv6 地址。"
 
 #. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
 msgid ""
 "Enabling Random Servers from pool.ntp.org would\n"
 "replace the current NTP server.\n"
@@ -1032,44 +1033,44 @@
 "真的替换当前 NTP 服务器吗？"
 
 #. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
 msgid "Select the Device"
 msgstr "请选择设备"
 
 #. selection box header
 #. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
 msgid "Public NTP &Servers"
 msgstr "公共 NTP 服务器(&S)"
 
 #. message report (no server selected)
 #. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
 msgid "Select an NTP server."
 msgstr "请选择一个 NTP 服务器。"
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
 msgid "All Countries"
 msgstr "全部国家/地区"
 
 #. combo box header
 #. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
 msgid "&Country"
 msgstr "国家/地区(&C)"
 
 #. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
 msgid "Scanning for NTP servers on your network..."
 msgstr "正在扫描网络中的 NTP 服务器..."
 
 #. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
 #. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
 msgid ""
 "No NTP server has been found on your network.\n"
 "This could be caused by a running SuSEfirewall2,\n"
@@ -1080,205 +1081,205 @@
 "它可能阻断了网络扫描。"
 
 #. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
 msgid "No NTP server has been found on your network."
 msgstr "在网络中未找到 NTP 服务器。"
 
 #. combo box label
 #. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
 msgid "Address"
 msgstr "地址"
 
 #. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
 msgid "No server is selected."
 msgstr "未选择服务器。"
 
 #. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
 msgid "A&ddress"
 msgstr "地址(&D)"
 
 #. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
 msgid "Ad&vanced Configuration"
 msgstr "高级配置(&V)"
 
 #. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
 msgid "&Driver Calibration"
 msgstr "驱动校准(&D)"
 
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
 msgid "&Interval of the Synchronization in Minutes"
 msgstr "以分钟计的同步周期(&I)"
 
 #. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
 msgid "Start NTP Daemon"
 msgstr "启动 NTP 守护进程"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
 msgid "Only &Manually"
 msgstr "仅手动(&M)"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
 msgid "&Synchronize without Daemon"
 msgstr "不用守护进程同步(&S)"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
 msgid "Now and on &Boot"
 msgstr "立即和在引导时(&B)"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
 msgid "Run NTP Daemon in Chroot &Jail"
 msgstr "在 Chroot 囚牢中运行 NTP 守护进程(&J)"
 
 #. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
 msgid "&Restrict NTP Service to Configured Servers Only "
 msgstr "限制 NTP 服务到配置过的服务器(&R)"
 
 #. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
 msgid "Manual"
 msgstr "手动"
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
 msgid "Auto"
 msgstr "自动"
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
 msgid "Custom"
 msgstr "自定义"
 
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
 msgid "&Runtime Configuration Policy"
 msgstr "运行时配置策略(&R)"
 
 #. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
 msgid "&Custom Policy"
 msgstr "自定义策略(&C)"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
 msgid "&Use Random Servers from pool.ntp.org"
 msgstr "使用来自 pool.ntp.org 的随机服务器(&U)"
 
 #. text entry label
 #. text entry
 #. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
 msgid "&Address"
 msgstr "地址(&A)"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
 msgid "&Select..."
 msgstr "选择(&S)..."
 
 #. push button
 #. push button
 #. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
 msgid "&Test"
 msgstr "测试(&T)"
 
 #. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
 msgid "Synchronization Type"
 msgstr "同步类型"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
 msgid "Display &Log..."
 msgstr "显示日志(&L)..."
 
 #. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
 msgid "Clock &Type"
 msgstr "时钟类型(&T)"
 
 #. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
 msgid "Unit &Number"
 msgstr "单元编号(&N)"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
 msgid "Create &Symlink"
 msgstr "创建符号链接(&S)"
 
 #. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
 msgid "&Device"
 msgstr "设备(&D)"
 
 #. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
 msgid "Access Control Options"
 msgstr "访问控制选项"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
 msgid "&Server"
 msgstr "服务器(&S)"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
 msgid "&Peer"
 msgstr "对等点(&P)"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
 msgid "&Radio Clock"
 msgstr "无线电时钟(&R)"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
 msgid "&Outgoing Broadcast"
 msgstr "出站广播(&O)"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
 msgid "&Incoming Broadcast"
 msgstr "进站广播(&I)"
 
 #. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
 msgid "Type"
 msgstr "类型"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
 msgid "Loc&al Network"
 msgstr "本地网络(&A)"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
 msgid "&Public NTP Server"
 msgstr "公共 NTP 服务器(&P)"
 
 #. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
 msgid "NTP Server Location"
 msgstr "NTP 服务器位置"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
 msgid "&Lookup"
 msgstr "查找(&L)"
 
@@ -1292,151 +1293,162 @@
 msgid "Initializing ..."
 msgstr "正在初始化..."
 
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "正在初始化 NTP 客户端配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "读取网络配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "读取 NTP 设置"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "正在读取网络配置..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "正在读取 NTP 设置..."
-
-#. progress step
 #. While calling "yast clone_system" it is possible that
 #. the ntp server has not already been installed at that time.
 #. (This would be done if yast2-ntp-client will be called in the UI)
 #. In that case the error popup will not be shown. (bnc#889557)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
 #. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
 msgid "Finished"
 msgstr "已完成"
 
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "正在保存 NTP 客户端配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "写入 NTP 设置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "重启 NTP 守护进程"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "正在写入设置..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "正在重启 NTP 守护进程..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr "无法更新动态配置策略。"
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "无法重启 NTP 守护进程。"
-
 #. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
 msgid "The NTP daemon starts when starting the system."
 msgstr "将在系统启动时启动 NTP 守护进程。"
 
 #. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
 msgid "The NTP daemon does not start automatically."
 msgstr "不自动启动 NTP 守护进程。"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
 msgid "Servers: %1"
 msgstr "服务器：%1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
 msgid "Radio Clocks: %1"
 msgstr "无线电时钟：%1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
 msgid "Peers: %1"
 msgstr "对等点：%1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
 msgid "Broadcast time information to: %1"
 msgstr "广播时间信息到：%1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
 msgid "Accept broadcasted time information from: %1"
 msgstr "接受广播的时间信息自：%1"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
 msgid "Combine static and DHCP configuration."
 msgstr "混合静态和 DHCP 配置。"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
 msgid "Static configuration only."
 msgstr "仅静态配置。"
 
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
 msgid "Custom configuration policy."
 msgstr "自定义配置策略。"
 
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
 msgid "Testing the NTP server..."
 msgstr "正在测试 NTP 服务器..."
 
 #. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
 msgid "Server is reachable and responds properly."
 msgstr "服务器可访问且响应正常。"
 
 #. error message  - result of test of connection to NTP server
 #. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
 msgid "Server is unreachable or does not respond properly."
 msgstr "服务器不可访问，或响应不正常。"
 
 #. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
 msgid ""
 "Cannot search for NTP server in local network\n"
 "without package %1 installed.\n"
 msgstr "未安装软件包 %1，无法在本地网络中搜索 NTP 服务器。\n"
 
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "正在初始化 NTP 客户端配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "读取网络配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "读取 NTP 设置"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "正在读取网络配置..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "正在读取 NTP 设置..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "正在保存 NTP 客户端配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "写入 NTP 设置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "重启 NTP 守护进程"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "正在写入设置..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "正在重启 NTP 守护进程..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr "无法更新动态配置策略。"
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "无法重启 NTP 守护进程。"
+
+#~ msgid "Firewall Settings"
+#~ msgstr "防火墙设置"
+
 #~ msgid "Cannot write sysconfig variables."
 #~ msgstr "无法写入系统配置变量。"
 

Modified: trunk/yast/zh_CN/po/packager.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/packager.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/packager.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: packager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2015-10-18 12:15+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -73,8 +73,7 @@
 "Firefox as browser, and Nautilus as file manager.\n"
 msgstr ""
 "GNOME 是一个强大且直观的桌面环境，\n"
-"它使用 Evolution 作为邮件应用，Firefox 作为浏览器，Nautilus 作为文件管理"
-"器。\n"
+"它使用 Evolution 作为邮件应用，Firefox 作为浏览器，Nautilus 作为文件管理器。\n"
 
 #. explanation text for KDE
 #: src/clients/inst_desktop.rb:63
@@ -179,8 +178,7 @@
 "<p>The installation CDs will be copied into the system\n"
 "to create a repository that can be used to install\n"
 "other systems.</p>\n"
-msgstr ""
-"<p>安装 CD 将被复制到系统中以创建一个可用于安装其它系统的软件源。</p>\n"
+msgstr "<p>安装 CD 将被复制到系统中以创建一个可用于安装其它系统的软件源。</p>\n"
 
 #. label for showing repositories
 #: src/clients/inst_mediacopy.rb:57
@@ -190,8 +188,8 @@
 #. force minimum width
 #. table header - name of the repo
 #. table header - name of the repo
-#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:674
-#: src/clients/repositories.rb:687
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
+#: src/clients/repositories.rb:716
 #: src/include/packager/key_manager_dialogs.rb:306
 msgid "Name"
 msgstr "名称"
@@ -372,16 +370,12 @@
 
 #. TRANSLATORS: dialog help 2/3 (version for installation)
 #: src/clients/inst_productsources.rb:1269
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Next</b>.\n"
+msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n"
 msgstr "<p>选择您想要使用的在线软件源并点击<b>下一步</b>。</p>\n"
 
 #. TRANSLATORS: dialog help 2/3 (version for running system)
 #: src/clients/inst_productsources.rb:1273
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Finish</b>.\n"
+msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n"
 msgstr "<p>选择您想要使用的在线软件源并点击<b>完成</b>。</p>\n"
 
 #. TRANSLATORS: dialog help 3/3
@@ -397,7 +391,7 @@
 #. TRANSLATORS: dialog help
 #. TRANSLATORS: dialog help
 #: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:91
+#: src/include/packager/repositories_include.rb:95
 msgid "<p>The repository manager is downloading repository details...</p>"
 msgstr "<p>软件源管理器正在下载软件源详情...</p>"
 
@@ -474,7 +468,7 @@
 
 #. re-initialize package information
 #. force reinitialization
-#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744
+#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739
 msgid "Installing Packages..."
 msgstr "正在安装软件包..."
 
@@ -490,9 +484,7 @@
 
 #. Solve dependencies
 #: src/clients/inst_rpmcopy.rb:368
-msgid ""
-"The package resolver run failed. Check your software section in the AutoYaST "
-"profile."
+msgid "The package resolver run failed. Check your software section in the AutoYaST profile."
 msgstr "软件包依赖关系解决器运行失败。 请检查您的 AutoYaST 方案中的软件部分。"
 
 #. error message - displayed in a scrollable text area
@@ -516,8 +508,8 @@
 #. dialog caption
 #. dialog caption
 #. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
-#: src/modules/AddOnProduct.rb:682
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
+#: src/modules/AddOnProduct.rb:688
 msgid "Initializing..."
 msgstr "正在初始化..."
 
@@ -541,93 +533,101 @@
 msgid "&Media"
 msgstr "介质(&M)"
 
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-msgid "Saving the software manager configuration..."
-msgstr "正在保存软件管理器配置..."
-
 #. default (minimal) priority of a repository
-#: src/clients/repositories.rb:55
+#: src/clients/repositories.rb:58
 msgid "&Priority"
 msgstr "优先级(&P)"
 
-#: src/clients/repositories.rb:57
+#: src/clients/repositories.rb:60
 msgid "Keep Downloaded Packages"
 msgstr "保留已下载的软件包"
 
 #. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:72
-msgid ""
-"Installation Repositories - This module does not support the command line "
-"interface, use '%1' instead."
+#: src/clients/repositories.rb:75
+msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
 msgstr "安装软件源 － 此模块不支持命令行界面，请使用 '%1' 代替。"
 
 #. pad to 3 characters
-#: src/clients/repositories.rb:166
+#: src/clients/repositories.rb:169
 msgid "Default"
 msgstr "默认"
 
 #. unkown name (alias) of the source
 #. get the editable propertis from 'source' parameter,
 #. get the fixed propertis from the package manager
-#: src/clients/repositories.rb:195 src/clients/repositories.rb:260
+#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
 msgid "Unknown Name"
 msgstr "未知名称"
 
 #. displaye only repositories from the selected service
-#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
-#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
+#: src/clients/repositories.rb:334 src/clients/repositories.rb:335
+#: src/clients/repositories.rb:377 src/clients/repositories.rb:383
+#: src/modules/SourceManager.rb:436
 msgid "Unknown"
 msgstr "未知"
 
 #. label to be used instead of URL if not found
-#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1334
+#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
+#: src/modules/AddOnProduct.rb:1351
 msgid "URL: %1"
 msgstr "URL：%1"
 
+#. TRANSLATORS: Raw URL is the address without expanding repo variables
+#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64
+#: src/clients/repositories.rb:342
+msgid "Raw URL: %s"
+msgstr "裸 URL：%s"
+
 #. heading - in case repo name not found
-#: src/clients/repositories.rb:357
+#: src/clients/repositories.rb:372
 msgid "Unknown Repository Name"
 msgstr "未知软件源名称"
 
 #. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:367
+#: src/clients/repositories.rb:382
 msgid "Category: %1"
 msgstr "分类：%1"
 
 #. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:377
+#: src/clients/repositories.rb:392
 msgid "Service: %1"
 msgstr "服务：%1"
 
 #. #176013
-#: src/clients/repositories.rb:625
+#: src/clients/repositories.rb:640
 msgid "All repositories"
 msgstr "全部软件源"
 
-#: src/clients/repositories.rb:628
+#: src/clients/repositories.rb:643
 msgid "All services"
 msgstr "全部服务"
 
-#: src/clients/repositories.rb:637
+#: src/clients/repositories.rb:652
 msgid "Service '%1'"
 msgstr "服务 '%1'"
 
+#. TRANSLATORS: Item in selection box that allow user to see only
+#. repositories not associated with service. Sometimes called also
+#. third party as they are usually repositories not provided by SUSE
+#. within product subscription.
+#: src/clients/repositories.rb:669
+msgid "Only repositories not provided by a service"
+msgstr "只有软件源未由服务提供"
+
 #. combobox label
-#: src/clients/repositories.rb:652
+#: src/clients/repositories.rb:681
 msgid "View"
 msgstr "视图"
 
 #. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:667
+#: src/clients/repositories.rb:696
 msgid "Priority"
 msgstr "优先级"
 
 #. table header - is the repo enabled? - keep the translation as short as possible!
 #. table header - is the repo enabled? - keep the translation as short as possible!
 #. status info, to be used inside summary
-#: src/clients/repositories.rb:669 src/clients/repositories.rb:682
+#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
 #: src/modules/SourceManager.rb:393
 msgid "Enabled"
 msgstr "已启用"
@@ -636,88 +636,88 @@
 #. keep the translation as short as possible!
 #. table header - is autorefresh enabled for the repo?
 #. keep the translation as short as possible!
-#: src/clients/repositories.rb:672 src/clients/repositories.rb:685
+#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
 msgid "Autorefresh"
 msgstr "自动刷新"
 
 #. table header - service to which the repo belongs
-#: src/clients/repositories.rb:676
+#: src/clients/repositories.rb:705
 msgid "Service"
 msgstr "服务"
 
 #. table header - URL of the repo
 #. table header - URL of the repo
-#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
+#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
 msgid "URL"
 msgstr "URL"
 
 #. push button - change URL of the selected repository
-#: src/clients/repositories.rb:789
+#: src/clients/repositories.rb:818
 msgid "&Replace..."
 msgstr "替换(&R)..."
 
 #. push button - refresh the selected repository now
-#: src/clients/repositories.rb:791
+#: src/clients/repositories.rb:820
 msgid "Re&fresh Selected"
 msgstr "刷新所选(&F)"
 
 #. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:793
+#: src/clients/repositories.rb:822
 msgid "Status &on or off"
 msgstr "状态(开或关)(&O)"
 
 #. push button - disable/enable automatic refresh of the selected repository
-#: src/clients/repositories.rb:795
+#: src/clients/repositories.rb:824
 msgid "Refre&sh on or off"
 msgstr "自动刷新或禁止刷新(&S)"
 
 #. push button - set name of the selected repository
-#: src/clients/repositories.rb:797
+#: src/clients/repositories.rb:826
 msgid "Set &Name..."
 msgstr "设置名称(&N)..."
 
 #. label
-#: src/clients/repositories.rb:804
+#: src/clients/repositories.rb:833
 msgid "Properties"
 msgstr "属性"
 
 #. check box
-#: src/clients/repositories.rb:809
+#: src/clients/repositories.rb:838
 msgid "&Enabled"
 msgstr "已启用(&E)"
 
 #. check box
-#: src/clients/repositories.rb:815
+#: src/clients/repositories.rb:844
 msgid "Automatically &Refresh"
 msgstr "自动刷新(&R)"
 
 #. push button label
-#: src/clients/repositories.rb:853
+#: src/clients/repositories.rb:882
 msgid "&GPG Keys..."
 msgstr "&GPG 密钥..."
 
 #. menu button label
-#: src/clients/repositories.rb:858
+#: src/clients/repositories.rb:887
 msgid "Refresh"
 msgstr "刷新"
 
 #. menu button label
-#: src/clients/repositories.rb:862
+#: src/clients/repositories.rb:891
 msgid "Refresh all Autor&efreshed"
 msgstr "刷新全部自动刷新的软件源(&E)"
 
 #. menu button label
-#: src/clients/repositories.rb:864
+#: src/clients/repositories.rb:893
 msgid "Refresh all &Enabled"
 msgstr "刷新全部启用的软件源(&E)"
 
 #. dialog caption
-#: src/clients/repositories.rb:871
+#: src/clients/repositories.rb:900
 msgid "Configured Software Repositories"
 msgstr "已配置软件源"
 
 #. help
-#: src/clients/repositories.rb:874
+#: src/clients/repositories.rb:903
 msgid ""
 "<p>\n"
 "Manage configured software repositories and services.</p>\n"
@@ -725,24 +725,16 @@
 "<p>\n"
 "管理已配置的软件源和服务。</p>\n"
 
-#: src/clients/repositories.rb:880
-msgid ""
-"<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol "
-"for package repository management. A service can offer one or more software "
-"repositories which can be dynamically changed by the service administrator."
-msgstr ""
-"<P><B>服务</B>或<B>软件源索引服务(RIS)</B>是软件源管理的一种协议。一个服务可"
-"提供一个或多个软件源，它们都可被服务管理员动态调整。</P>"
+#: src/clients/repositories.rb:909
+msgid "<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>"
+msgstr "<P><B>服务</B>或<B>软件源索引服务(RIS)</B>是软件源管理的一种协议。一个服务可提供一个或多个软件源，它们都可被服务管理员动态调整。</P>"
 
-#: src/clients/repositories.rb:887
+#: src/clients/repositories.rb:916
 msgid ""
 "<p>\n"
 "<b>Adding a new Repository or a Service</b><br>\n"
-"To add a new repository, use <b>Add</b> and specify the software repository "
-"or service.\n"
-"YaST will automatically detect whether a service or a repository is "
-"available at the entered location.\n"
+"To add a new repository, use <b>Add</b> and specify the software repository or service.\n"
+"YaST will automatically detect whether a service or a repository is available at the entered location.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -752,7 +744,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/clients/repositories.rb:899
+#: src/clients/repositories.rb:928
 msgid ""
 "<p>\n"
 "To install packages from <b>CD</b>,\n"
@@ -765,7 +757,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/clients/repositories.rb:910
+#: src/clients/repositories.rb:939
 msgid ""
 "<p>\n"
 "The CDs can be copied to <b>hard disk</b>\n"
@@ -783,66 +775,48 @@
 "</p>\n"
 
 #. help, continued
-#: src/clients/repositories.rb:926
+#: src/clients/repositories.rb:955
 msgid ""
 "<p>\n"
 "<b>Modifying Status of a Repository or a Service</b><br>\n"
-"To change a repository location, use <b>Edit</b>. To remove a repository, "
-"use\n"
-"<b>Delete</b>. To enable or disable the repository or to change the refresh "
-"status at initialization time, select the repository in the table and use "
-"the check boxes below.\n"
+"To change a repository location, use <b>Edit</b>. To remove a repository, use\n"
+"<b>Delete</b>. To enable or disable the repository or to change the refresh status at initialization time, select the repository in the table and use the check boxes below.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
 "<b>修改软件源或服务状态</b><br>\n"
 "要修改软件源位置，请使用<b>编辑</b>。要移除软件源，请使用<b>删除</b>。\n"
-"要启用或禁用软件源，或者设置初始化时是否刷新，请在表中选中软件源并使用下面的"
-"复选框。\n"
+"要启用或禁用软件源，或者设置初始化时是否刷新，请在表中选中软件源并使用下面的复选框。\n"
 "</p>\n"
 
 #. help text, continued
-#: src/clients/repositories.rb:938
+#: src/clients/repositories.rb:967
 msgid ""
 "<P><B>Priority of a Repository</B><BR>\n"
-"Priority of a repository is an integer value between 0 (the highest "
-"priority) and 200 (the lowest priority). Default is 99. If a package is "
-"available in more repositories, the repository with the highest priority is "
-"used.</P>\n"
+"Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P>\n"
 msgstr ""
 "<P><B>软件源优先级</B><BR>\n"
-"软件源优先级是一个介于 0 (最高优先级) 到 200 (最低优先级) 之间的整数值。默认"
-"优先级为 99。若多个软件源提供了同一个软件包，将使用优先级最高的软件源。</P>\n"
+"软件源优先级是一个介于 0 (最高优先级) 到 200 (最低优先级) 之间的整数值。默认优先级为 99。若多个软件源提供了同一个软件包，将使用优先级最高的软件源。</P>\n"
 
 #. help text, continued
-#: src/clients/repositories.rb:946
-msgid ""
-"<P>Select the appropriate option on top of the window for navigation in "
-"repositories and services.</P>"
+#: src/clients/repositories.rb:975
+msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"
 msgstr "<P>请在软件源和服务中的导航窗口顶部选择合适的选项。</P>"
 
 #. help text, continued
-#: src/clients/repositories.rb:954
+#: src/clients/repositories.rb:983
 msgid ""
 "<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n"
 "packages in a local cache so they can be reused later when the packages are\n"
-"reinstalled. If not checked, the downloaded packages are deleted after "
-"installation.</P>"
-msgstr ""
-"<P><B>保留已下载的软件包</B><BR>选中此选项以在本地缓存中保留已下载的软件包，"
-"从而可在稍后重装软件包时重复使用它们。若未选中，已下载的软件包将在安装后被删"
-"除。</P>"
+"reinstalled. If not checked, the downloaded packages are deleted after installation.</P>"
+msgstr "<P><B>保留已下载的软件包</B><BR>选中此选项以在本地缓存中保留已下载的软件包，从而可在稍后重装软件包时重复使用它们。若未选中，已下载的软件包将在安装后被删除。</P>"
 
-#: src/clients/repositories.rb:960
-msgid ""
-"<P>The default local cache is located in directory <B>/var/cache/zypp/"
-"packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"
-msgstr ""
-"<P>默认本地缓存位于 <B>/var/cache/zypp/packages</B> 文件夹中。可在 <B>/etc/"
-"zypp/zypp.conf</B> 文件中修改该位置。</P>"
+#: src/clients/repositories.rb:989
+msgid "<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"
+msgstr "<P>默认本地缓存位于 <B>/var/cache/zypp/packages</B> 文件夹中。可在 <B>/etc/zypp/zypp.conf</B> 文件中修改该位置。</P>"
 
 #. popup message part 1
-#: src/clients/repositories.rb:1005
+#: src/clients/repositories.rb:1034
 msgid ""
 "Unable to save changes to the repository\n"
 "configuration."
@@ -850,7 +824,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1328
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "细节："
@@ -858,18 +832,18 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1336
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "重试吗？"
 
 #. popup headline
-#: src/clients/repositories.rb:1030
+#: src/clients/repositories.rb:1059
 msgid "Abort Repository Configuration"
 msgstr "中止软件源配置"
 
 #. popup message
-#: src/clients/repositories.rb:1032
+#: src/clients/repositories.rb:1061
 msgid ""
 "Abort the repository configuration?\n"
 "All changes will be lost."
@@ -878,7 +852,7 @@
 "全部修改将不复存在。"
 
 #. refresh also the combobox widget
-#: src/clients/repositories.rb:1329
+#: src/clients/repositories.rb:1364
 msgid ""
 "There is no service at URL:\n"
 "%1"
@@ -887,54 +861,54 @@
 "%1"
 
 #. TODO: add help text
-#: src/clients/repositories.rb:1440
+#: src/clients/repositories.rb:1475
 msgid "Refreshing Repositories"
 msgstr "正在刷新软件源"
 
-#: src/clients/repositories.rb:1441
+#: src/clients/repositories.rb:1476
 msgid "Refreshing Services"
 msgstr "正在刷新服务"
 
-#: src/clients/repositories.rb:1446
+#: src/clients/repositories.rb:1481
 msgid "Refresh Repositories"
 msgstr "刷新软件源"
 
-#: src/clients/repositories.rb:1447
+#: src/clients/repositories.rb:1482
 msgid "Refresh Services"
 msgstr "刷新服务"
 
 #. progress bar label
-#: src/clients/repositories.rb:1479
+#: src/clients/repositories.rb:1514
 msgid "Refreshing Repository %1..."
 msgstr "正在刷新软件源 %1..."
 
 #. refreshing services
 #. progress bar label
-#: src/clients/repositories.rb:1505
+#: src/clients/repositories.rb:1540
 msgid "Refreshing Service %1..."
 msgstr "正在刷新服务 %1..."
 
 #. yes-no popup
-#: src/clients/repositories.rb:1524
+#: src/clients/repositories.rb:1559
 msgid "Delete the selected repository from the list?"
 msgstr "从列表中删除所选软件源吗？"
 
 #. yes-no popup
-#: src/clients/repositories.rb:1538
+#: src/clients/repositories.rb:1573
 msgid ""
 "Delete service %1\n"
 "and its repositories?"
 msgstr "删除服务 %1 及其软件源吗？"
 
 #. popup message
-#: src/clients/repositories.rb:1606
+#: src/clients/repositories.rb:1641
 msgid ""
 "For the selected repository, refresh\n"
 "cannot be set."
 msgstr "无法设置所选软件源的刷新状态。"
 
 #. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1768
+#: src/clients/repositories.rb:1803
 msgid ""
 "Repository %1\n"
 "has been already added. Each repository should be added only once.\n"
@@ -946,7 +920,7 @@
 "真的再次添加该软件源吗？"
 
 #. Error popup
-#: src/clients/repositories.rb:1836
+#: src/clients/repositories.rb:1871
 msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
 msgstr "<p>恢复软件源配置时出错。</p>\n"
 
@@ -961,8 +935,7 @@
 #. warning text
 #: src/clients/software_proposal.rb:103
 #: src/clients/software_simple_proposal.rb:58
-msgid ""
-"Cannot solve dependencies automatically. Manual intervention is required."
+msgid "Cannot solve dependencies automatically. Manual intervention is required."
 msgstr "无法自动解决依赖关系。需手工干预。"
 
 #. this is a heading
@@ -977,9 +950,7 @@
 
 #. Command line help text for the software management module, %1 is "zypper"
 #: src/clients/sw_single.rb:64
-msgid ""
-"Software Installation - This module does not support the command line "
-"interface, use '%1' instead."
+msgid "Software Installation - This module does not support the command line interface, use '%1' instead."
 msgstr "软件安装 － 此模块不支持命令行界面，请使用 '%1' 代替。"
 
 #. error message (%1 is a package file name)
@@ -1061,20 +1032,20 @@
 "现在还安装它们吗？\n"
 
 #. start the repository manager
-#: src/clients/sw_single.rb:619
+#: src/clients/sw_single.rb:614
 msgid ""
 "Cannot configure online update repository \n"
 "without having package %1 installed"
 msgstr "未安装 %1 软件包无法配置在线更新软件源"
 
-#: src/clients/sw_single.rb:645
+#: src/clients/sw_single.rb:640
 msgid ""
 "Cannot search packages in online repositories\n"
 "without having package %1 installed"
 msgstr "未安装 %1 软件包无法在在线软件源中搜索软件包"
 
 #. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:673
+#: src/clients/sw_single.rb:668
 msgid ""
 "The following packages have not been found on the medium:\n"
 "%1\n"
@@ -1115,8 +1086,7 @@
 
 #. wrong MD5
 #: src/include/checkmedia/ui.rb:126
-msgid ""
-"<B>Error</B> -- MD5 sum does not match<BR>This medium should not be used."
+msgid "<B>Error</B> -- MD5 sum does not match<BR>This medium should not be used."
 msgstr "<B>错误</B> -- MD5 校验和不匹配<BR>不应使用此介质。"
 
 #. the correct MD5 is unknown
@@ -1143,17 +1113,14 @@
 #: src/include/checkmedia/ui.rb:304
 msgid ""
 "<P>When you have a problem with\n"
-"the installation and you are using a CD or DVD installation medium, you "
-"should check\n"
+"the installation and you are using a CD or DVD installation medium, you should check\n"
 "whether the medium is broken.</P>\n"
-msgstr ""
-"<P>若您使用 CD 或 DVD 介质安装时遇到了问题，您应检查介质是否损坏。</P>\n"
+msgstr "<P>若您使用 CD 或 DVD 介质安装时遇到了问题，您应检查介质是否损坏。</P>\n"
 
 #. help text - media check 3/8
 #: src/include/checkmedia/ui.rb:310
 msgid ""
-"<P>Select a drive, insert a medium into the drive and press <B>Start Check\n"
+"<P>Select a drive, insert a medium into the drive and press <B>Start Check</B>\n"
 "or use <B>Check ISO File</B> and select an ISO file.\n"
 "The check can take several minutes depending on speed of the\n"
 "drive and size of the medium. The check verifies the MD5 checksum.</P> "
@@ -1166,10 +1133,8 @@
 #. help text - media check 4/8
 #: src/include/checkmedia/ui.rb:317
 msgid ""
-"<P>If the check of the medium fails, you should not continue the "
-"installation.\n"
-"It may fail or you may lose your data. Better replace the broken medium.\n"
+"<P>If the check of the medium fails, you should not continue the installation.\n"
+"It may fail or you may lose your data. Better replace the broken medium.</P>\n"
 msgstr ""
 "<P>若介质检查失败，则不应继续安装。\n"
 "继续安装可能失败或导致丢失数据。您最好更换损坏的介质。</P>\n"
@@ -1185,28 +1150,20 @@
 
 #. help text - media check 6/8
 #: src/include/checkmedia/ui.rb:325
-msgid ""
-"<P><B>Note:</B> You cannot change the medium while it is used by the system."
-"</P>"
+msgid "<P><B>Note:</B> You cannot change the medium while it is used by the system.</P>"
 msgstr "<P><B>注意：</B> 当介质正被系统使用时，您不能更换它。</P>"
 
 #. help text - media check 7/8
 #: src/include/checkmedia/ui.rb:329
-msgid ""
-"<P>To check media before the installation, use the media check item in the "
-"boot menu.</P>"
+msgid "<P>To check media before the installation, use the media check item in the boot menu.</P>"
 msgstr "<P>要在开始安装前检查介质，请使用引导菜单中的介质检查一项。<P>"
 
 #. help text - media check 8/8
 #: src/include/checkmedia/ui.rb:333
 msgid ""
-"<P>If you burn the media yourself, use the <B>pad</B> option in your "
-"recording\n"
-"software. It avoids read errors at the end of the media during the check.\n"
-msgstr ""
-"<P>若自行刻录介质，请使用刻录软件中的 <B>pad</B> 选项。它可避免在检查过程中介"
-"质末尾出现读取错误。</P>\n"
+"<P>If you burn the media yourself, use the <B>pad</B> option in your recording\n"
+"software. It avoids read errors at the end of the media during the check.</P>\n"
+msgstr "<P>若自行刻录介质，请使用刻录软件中的 <B>pad</B> 选项。它可避免在检查过程中介质末尾出现读取错误。</P>\n"
 
 #. advice check of the media
 #. for translators: split the message to more lines if needed, use max. 50 characters per line
@@ -1418,42 +1375,42 @@
 msgstr "真的删除密钥 '%1' '%2' 吗？"
 
 #. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:77
+#: src/include/packager/repositories_include.rb:81
 msgid "Adding a New Repository"
 msgstr "添加新软件源"
 
-#: src/include/packager/repositories_include.rb:81
+#: src/include/packager/repositories_include.rb:85
 msgid "Check Repository Type"
 msgstr "检查软件源类型"
 
-#: src/include/packager/repositories_include.rb:82
+#: src/include/packager/repositories_include.rb:86
 msgid "Add Repository"
 msgstr "添加软件源"
 
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:87
 msgid "Read Repository License"
 msgstr "读取软件源许可"
 
-#: src/include/packager/repositories_include.rb:86
+#: src/include/packager/repositories_include.rb:90
 msgid "Checking Repository Type"
 msgstr "正在检查软件源类型"
 
-#: src/include/packager/repositories_include.rb:87
+#: src/include/packager/repositories_include.rb:91
 msgid "Adding Repository"
 msgstr "正在添加软件源"
 
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:92
 msgid "Reading Repository License"
 msgstr "正在读取软件源许可"
 
 #. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:152
+#: src/include/packager/repositories_include.rb:156
 msgid "Repository"
 msgstr "软件源"
 
 #. continue-back popup
 #. continue-back popup
-#: src/include/packager/repositories_include.rb:224
+#: src/include/packager/repositories_include.rb:228
 #: src/modules/SourceManager.rb:330
 msgid ""
 "There is no product information available at the given location.\n"
@@ -1468,15 +1425,15 @@
 
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
 msgid ""
 "Unable to create repository\n"
 "from URL '%1'."
 msgstr "无法从 URL '%1' 创建软件源。"
 
 #. error message
-#: src/include/packager/repositories_include.rb:331
+#: src/include/packager/repositories_include.rb:335
 msgid ""
 "Using an ISO image over ftp or http protocol is not possible.\n"
 "Change the protocol or unpack the ISO image on the server side."
@@ -1485,17 +1442,22 @@
 "请修改协议或在服务器端解压 ISO 映像。"
 
 #. popup message part 2
-#: src/include/packager/repositories_include.rb:341
+#: src/include/packager/repositories_include.rb:345
 msgid "Change the URL and try again?"
 msgstr "修改 URL 并重试吗？"
 
 #. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:418
+#: src/include/packager/repositories_include.rb:422
 msgid ""
 "Cannot search for SLP repositories\n"
 "without having %1 package installed.\n"
 msgstr "未安装 %1 软件包无法搜索 SLP 软件源。\n"
 
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+msgid "Saving the software manager configuration..."
+msgstr "正在保存软件管理器配置..."
+
 #. New add-on product might add also new agents.
 #. Functions Rereads all available agents.
 #.
@@ -1503,19 +1465,19 @@
 #. error report
 #. popup error
 #. popup error
-#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
 msgid "An error occurred while preparing the installation system."
 msgstr "准备安装系统时出错。"
 
 #. error report
-#: src/modules/AddOnProduct.rb:653
+#: src/modules/AddOnProduct.rb:659
 msgid "Control file %1 not found on media."
 msgstr "在介质上未找到控制文件 %1。"
 
 #. FATE #305578: Add-On Product Requiring Registration
 #. or check the content file
-#: src/modules/AddOnProduct.rb:894
+#: src/modules/AddOnProduct.rb:900
 msgid ""
 "Package '%s' is not installed.\n"
 "The add-on product cannot be registered."
@@ -1523,67 +1485,74 @@
 "软件包 '%s' 未安装。\n"
 "无法注册附加产品。"
 
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+msgid "Unknown Product"
+msgstr "未知产品"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Re&lease Notes..."
+msgstr "请稍候..."
+
 #. TRANSLATORS: error report
 #. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
 msgid "Unable to use additional products."
 msgstr "无法使用附加产品。"
 
 #. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
 msgid "%1, URL: %2"
 msgstr "%1，URL：%2"
 
-#: src/modules/AddOnProduct.rb:1328
+#: src/modules/AddOnProduct.rb:1345
 msgid "URL: %1, Path: %2"
 msgstr "URL：%1，路径：%2"
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1359
+#: src/modules/AddOnProduct.rb:1376
 msgid "Additional Products"
 msgstr "附加产品"
 
 #. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1365
+#: src/modules/AddOnProduct.rb:1382
 msgid ""
-"The installation repository also contains the listed additional "
-"repositories.\n"
+"The installation repository also contains the listed additional repositories.\n"
 "Select the ones you want to use.\n"
 msgstr ""
 "安装软件源还包含了下面列出的额外软件源。\n"
 "请选择您想要使用的软件源。\n"
 
-#: src/modules/AddOnProduct.rb:1376
+#: src/modules/AddOnProduct.rb:1393
 msgid "Additional Products to Select"
 msgstr "供选择的附加产品"
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1383
+#: src/modules/AddOnProduct.rb:1400
 msgid "Add Selected &Products"
 msgstr "添加所选产品(&P)"
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1515
+#: src/modules/AddOnProduct.rb:1532
 msgid "Insert the addon %1 medium"
 msgstr "请插入附加的 %1 介质"
 
 #. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1520
+#: src/modules/AddOnProduct.rb:1537
 msgid "Insert the %1 %2 medium"
 msgstr "请插入 %1 %2 介质"
 
 #. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1572
+#: src/modules/AddOnProduct.rb:1589
 msgid "Unable to add product %1."
 msgstr "无法添加产品 %1。"
 
-#. adding the product to the list of products (BNC #269625)
-#. no such products
-#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
-#: src/modules/Packages.rb:471
-msgid "Unknown Product"
-msgstr "未知产品"
-
 #. update the trusted flag
 #: src/modules/KeyManager.rb:214
 msgid ""
@@ -1610,27 +1579,27 @@
 msgstr "无法将密钥复制到临时文件夹。"
 
 #. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
 msgid "&Show Failed Packages List"
 msgstr "显示失败软件包列表(&S)"
 
 #. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
 msgid "&Show Full Log"
 msgstr "显示完整日志(&S)"
 
 #. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
 msgid "Installation of some Packages Failed"
 msgstr "某些软件包安装失败了"
 
 #. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
 msgid "Installation aborted by user."
 msgstr "用户中止了安装。"
 
 #. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
 msgid "Medium %1"
 msgstr "介质 %1"
 
@@ -1638,13 +1607,13 @@
 #. When data throughput goes downhill (stalled network connection etc.),
 #. cut off the predicted time at a reasonable maximum.
 #. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
 msgid ">%1"
 msgstr ">%1"
 
 #. Nothing more to install from this CD (very concise - little space!!)
 #. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
 msgid "Done."
 msgstr "完毕。"
 
@@ -1652,21 +1621,21 @@
 #. %1: Media type ("CD" / "DVD", ???)
 #. %2: Media name ("SuSE Linux Professional CD 2" )
 #. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
 msgid "Next: %1 -- %2"
 msgstr "下一个：%1 - %2"
 
 #. Status line informing about the next CD that will be used
 #. %1: Media type ("CD" / "DVD", ???)
 #. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
 msgid "Next: %1"
 msgstr "下一个：%1"
 
 #. Add "Total" item - at the top so it is visible by default even if there are many items
 #.
 #. List column header for total remaining MB and time to install
-#: src/modules/PackageSlideShow.rb:918
+#: src/modules/PackageSlideShow.rb:922
 msgid "Total"
 msgstr "总计"
 
@@ -1675,78 +1644,65 @@
 #.
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
 msgid "Downloading %1 (download size %2)"
 msgstr "正在下载 %1 (下载大小 %2)"
 
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
 msgid " (Remaining: %1%2 packages)"
 msgstr " (还剩：%1%2 个软件包)"
 
 #. display download progress in DownloadInAdvance mode
 #. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
 msgid "Downloading Packages..."
 msgstr "正在下载软件包..."
 
 #. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
 msgid " (Downloaded %1 of %2 packages)"
 msgstr " (已下载 %1/%2 个软件包)"
 
 #. Heading for the progress bar for the current package
 #. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
 msgid "Deleting %1"
 msgstr "正在删除 %1"
 
 #. package installation - summary text
 #. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
 msgid "Installing %1 (installed size %2)"
 msgstr "正在安装 %1 (安装后大小 %2)"
 
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
 msgid "Applying delta RPM: %1"
 msgstr "正在应用增量 RPM：%1"
 
 #. warning text
 #: src/modules/Packages.rb:311
-msgid ""
-"Your computer is a 64-bit x86-64 system, but you are trying to install a 32-"
-"bit distribution."
+msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
 msgstr "您的计算机是 64 位 x86-64 系统，但是您正试图安装 32 位发行版。"
 
 #. help text for software proposal
 #: src/modules/Packages.rb:327
-msgid ""
-"<P>The pattern list states which functionality will be available after "
-"installing the system.</P>"
+msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
 msgstr "<P>该软件集列表说明了安装系统后可用的功能。</P>"
 
 #. (see bnc#178357 why these numbers)
 #. translators: help text for software proposal
 #: src/modules/Packages.rb:339
-msgid ""
-"<P>The proposal reports the total size of files which will be installed to "
-"the system. However, the system will contain some other files (temporary and "
-"working files) so the used space will be slightly larger than the proposed "
-"value. Therefore it is a good idea to have at least 25% (or about 300MB) "
-"free space before starting the installation.</P>"
-msgstr ""
-"<P>该提案汇报了将安装到系统的文件总大小。然而，系统将包含一些其它文件 (缓存和"
-"工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 "
-"25% (或大约 300 MB) 的空闲空间。<P>"
+msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>"
+msgstr "<P>该提案汇报了将安装到系统的文件总大小。然而，系统将包含一些其它文件 (缓存和工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 25% (或大约 300 MB) 的空闲空间。<P>"
 
 #. help text for software proposal
 #: src/modules/Packages.rb:344
 msgid ""
 "<P>The total 'size to download' is the size of the packages which will be\n"
-"downloaded from remote (network) repositories. This value is important if "
-"the connection is slow or if there is a data limit for downloading.</P>\n"
+"downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n"
 msgstr ""
 "<P>总'下载大小'是指将从远程 (网络) 软件源中下载的软件包大小。\n"
 "若网速慢或有数据流量限制，该数值至关重要。</P>\n"
@@ -1788,23 +1744,17 @@
 
 #. Warning message when some add-ons are marked to be removed automatically
 #: src/modules/Packages.rb:504
-msgid ""
-"Contact the vendors of these add-ons to provide you with new installation "
-"media."
+msgid "Contact the vendors of these add-ons to provide you with new installation media."
 msgstr "请联系这些附加产品的厂商为您提供新的安装介质。"
 
 #. Warning message when some add-ons are marked to be removed automatically
 #: src/modules/Packages.rb:508
-msgid ""
-"Contact the vendor of the add-on to provide you with a new installation "
-"media."
+msgid "Contact the vendor of the add-on to provide you with a new installation media."
 msgstr "请联系这些附加产品的厂商为您提供新的安装介质。"
 
 #. error message: %1: e.g. "/usr", %2: "/dev/sda2"
 #: src/modules/Packages.rb:549
-msgid ""
-"Error: Cannot check free space in basic directory %1 (device %2), cannot "
-"start installation."
+msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."
 msgstr "错误：无法检查基础文件夹 %1 (设备 %2) 中的空闲空间，无法启动安装。"
 
 #. error message: %1: e.g. "/local", %2: "/dev/sda2"
@@ -1853,7 +1803,9 @@
 msgstr "<b>警告：</b>即将移除产品 <b>%s</b>。"
 
 #: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+#, fuzzy
+#| msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
 msgstr "<b>错误：</b>即将自动移除产品 <b>%s</b>。</font>"
 
 #. TRANSLATORS: update proposal warning, do NOT translate "-release",
@@ -1862,10 +1814,8 @@
 msgid ""
 "<ul><li><b>Some products are marked for automatic removal.</b></li>\n"
 "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n"
-"installation media</li><li>Or select the appropriate online extension or "
-"module\n"
-"in the registration step</li><li>Or to continue with product upgrade go to "
-"the\n"
+"installation media</li><li>Or select the appropriate online extension or module\n"
+"in the registration step</li><li>Or to continue with product upgrade go to the\n"
 "software selection and mark the product (the -release package) for removal.\n"
 "</li></ul></li></ul>"
 msgstr ""
@@ -1876,48 +1826,46 @@
 "</ul></li></ul>"
 
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
 msgid "No repository found at '%1'."
 msgstr "在 '%1' 下找不到软件源。"
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
 msgid ""
-"<p><b>The release notes for the initial release are part of the "
-"installation\n"
+"<p><b>The release notes for the initial release are part of the installation\n"
 "media. If an Internet connection is available during configuration, you can\n"
 "download updated release notes from the SUSE Linux Web server.</b></p>\n"
 msgstr ""
 "<p><b>初始发布时的版本资讯是安装介质的一部分。\n"
-"安装期间若互联网连接可用，您可从 SUSE Linux 网络服务器下载更新的版本资讯。</p>\n"
+"安装期间若互联网连接可用，您可从 SUSE Linux 网络服务器下载更新的版本资讯。</b></p>\n"
 
 #. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
 msgid "Integrating booted media..."
 msgstr "正在集成已引导的介质..."
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
 msgid "Failed to integrate the service pack repository."
 msgstr "集成服务包软件源失败。"
 
 #. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
 msgid "Initializing repositories..."
 msgstr "正在初始化软件源..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
 msgid "Insert %1 CD 1"
 msgstr "请插入 %1 CD 1"
 
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
 msgid "%1 CD 1 not found"
 msgstr "%1 未找到 CD 1"
 
 #. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -1926,7 +1874,7 @@
 "更多细节请检查日志文件 %1。"
 
 #. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
@@ -1935,12 +1883,12 @@
 "将再次调出软件提案。"
 
 #. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
 msgid "Evaluating package selection..."
 msgstr "正在评估软件包选集..."
 
 #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -1951,66 +1899,72 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
 msgid "Cannot read license file %1"
 msgstr "无法读取许可文件 %1"
 
-#: src/modules/ProductLicense.rb:151
-msgid ""
-"To show the product license properly, put the license.tar.gz file to the "
-"root of the live media when building the image."
-msgstr ""
-"要正确显示产品许可，请在构建映像时把 license.tar.gz 文件放到 live 介质的根目"
-"录。"
+#: src/modules/ProductLicense.rb:153
+msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
+msgstr "要正确显示产品许可，请在构建映像时把 license.tar.gz 文件放到 live 介质的根目录。"
 
 #. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
 msgid "&Language"
 msgstr "语言(&L)"
 
 #. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
 msgid "I &Agree to the License Terms."
 msgstr "是，我的大斧已经饥渴难耐了。(&A)"
 
 #. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
 msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+#, fuzzy
+#| msgid ""
+#| "If you want to print this EULA, you can find it\n"
+#| "on the first media in the file %1"
+msgid ""
 "If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
 msgstr "若想打印此最终用户许可协议，您可在第一个介质的 %1 文件中找到许可全文。"
 
 #. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
 msgid ""
 "<p>Read the license agreement carefully and select\n"
 "one of the available options. If you do not agree to the license agreement,\n"
 "the configuration will be aborted.</p>\n"
 msgstr ""
 "<p>请仔细阅读许可协议并在可用选项中择一。\n"
-"当然若您不同意该许可协议 (<del>傲娇的霸王条款</del>...才没有啦)，配置会立即中"
-"止。\n"
+"当然若您不同意该许可协议 (<del>傲娇的霸王条款</del>...才没有啦)，配置会立即中止。\n"
 "您亦无法畅享 openSUSE 这一最低调奢华有内涵的 Linux 发行版。\n"
-"这会是人生中怎样遗憾的事啊！为了避免您的人生有所缺憾，请选择是。这只是您电脑"
-"生涯中的一小步，却会是您精彩人生中的一大步！</p>\n"
+"这会是人生中怎样遗憾的事啊！为了避免您的人生有所缺憾，请选择是。这只是您电脑生涯中的一小步，却会是您精彩人生中的一大步！</p>\n"
 
 #. dialog title
 #. #459391
 #. If a progress is running open another dialog
 #. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
 msgid "License Agreement"
 msgstr "许可协议"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
 msgid "Really abort the add-on product installation?"
 msgstr "真的中止附加产品安装吗？"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
 msgid ""
 "Refusing the license agreement cancels the installation.\n"
 "Really refuse the agreement?"
@@ -2019,7 +1973,7 @@
 "真的拒绝协议吗？你一定会后悔的！"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1048
+#: src/modules/ProductLicense.rb:1044
 msgid ""
 "Refusing the license agreement cancels the add-on\n"
 "product installation. Really refuse the agreement?"
@@ -2028,17 +1982,18 @@
 "真的拒绝协议吗？"
 
 #. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1058
+#: src/modules/ProductLicense.rb:1054
 msgid "The system is shutting down..."
 msgstr "系统正在关机..."
 
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
 #: src/modules/ProductLicense.rb:1153
 msgid "%s License Agreement"
 msgstr "%s 许可协议"
 
 #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
 msgid ""
 "If you want to print this EULA, you can download it from\n"
 "%{license_url}"
@@ -2140,7 +2095,7 @@
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
 msgid "S&MB/CIFS"
 msgstr "S&MB/CIFS"
 
@@ -2185,100 +2140,100 @@
 msgstr "下载软件源描述文件(&D)"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
 msgid ""
 "<p>If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>"
 msgstr "<p>若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
 msgid ""
 "<p>If the repository is on multiple media,\n"
 "set the location of the first media of the set.</p>\n"
 msgstr "<p>若该软件源位于多个介质上，请设置该组介质的第一个介质的位置。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
 msgid "&Server Name"
 msgstr "服务器名称(&S)"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
 msgid "&Path to Directory or ISO Image"
 msgstr "文件夹或 ISO 映像路径(&P)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
 msgid "&ISO Image"
 msgstr "&ISO 映像"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
 msgid "N&FS v4 Protocol"
 msgstr "N&FS v4 协议"
 
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
 msgid "Mount Options"
 msgstr "挂载选项"
 
 #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp
 #. NFS mount option (users can change it to anything else, the field is editable)
-#: src/modules/SourceDialogs.rb:163
+#: src/modules/SourceDialogs.rb:164
 msgid "(default)"
 msgstr "(默认)"
 
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
 msgid "URL of the Repository"
 msgstr "软件源 URL"
 
 #. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
 msgid "P&rotocol"
 msgstr "协议(&R)"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
 msgid "&URL of the Repository"
 msgstr "软件源 &URL"
 
 #. label / dialog caption
 #. bugzilla #219759
 #. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
 msgid "Repository URL"
 msgstr "软件源 URL"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
 msgid "NFS Server"
 msgstr "NFS 服务器"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
 msgid "CD or DVD Media"
 msgstr "CD 或 DVD 介质"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
 msgid "Hard Disk"
 msgstr "硬盘"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
 msgid "USB Stick or Disk"
 msgstr "USB 记忆棒或磁盘"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
 msgid "Local Directory"
 msgstr "本地文件夹"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
 msgid "Local ISO Image"
 msgstr "本地 ISO 映像"
 
@@ -2287,62 +2242,57 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:224 src/modules/SourceDialogs.rb:226
-#: src/modules/SourceDialogs.rb:228 src/modules/SourceDialogs.rb:230
-#: src/modules/SourceDialogs.rb:232
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
 msgid "Server and Directory"
 msgstr "服务器和文件夹"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:461
+#: src/modules/SourceDialogs.rb:469
 msgid "The name of the repository cannot be empty."
 msgstr "软件源名称不能为空。"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:482
 msgid "&Repository Name"
 msgstr "软件源名称(&R)"
 
 #. help text
-#: src/modules/SourceDialogs.rb:488
+#: src/modules/SourceDialogs.rb:497
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is "
-"empty, YaST will use the product name (if available) or the URL as the name."
-"</p>\n"
+"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
 msgstr ""
 "<p><big><b>软件源名称</b></big><br>\n"
-"使用<b>软件源名称</b>指定软件源名称。若留空，YaST 将使用产品名 (若有) 或 URL "
-"作为其名称。</p>\n"
+"使用<b>软件源名称</b>指定软件源名称。若留空，YaST 将使用产品名 (若有) 或 URL 作为其名称。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:502
+#: src/modules/SourceDialogs.rb:511
 msgid "&Service Name"
 msgstr "服务名称(&S)"
 
 #. help text
-#: src/modules/SourceDialogs.rb:510
+#: src/modules/SourceDialogs.rb:519
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
-"Use <b>Service Name</b> to specify the name of the service. If it is empty, "
-"YaST will use part of the service URL as the name.</p>\n"
+"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
 msgstr ""
 "<p><big><b>服务名称</b></big><br>\n"
-"使用<b>服务名称</b>指定服务名。若留空，YaST 将使用服务 URL 的一部分作为其名"
-"称。</p>\n"
+"使用<b>服务名称</b>指定服务名。若留空，YaST 将使用服务 URL 的一部分作为其名称。</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:545
+#: src/modules/SourceDialogs.rb:554
 msgid "URL cannot be empty."
 msgstr "URL 不能为空。"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:559
+#: src/modules/SourceDialogs.rb:568
 msgid "&URL"
 msgstr "&URL"
 
 #. help text
-#: src/modules/SourceDialogs.rb:573
+#: src/modules/SourceDialogs.rb:582
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2354,16 +2304,16 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
 msgid "Edit Parts of the URL"
 msgstr "编辑部分 URL"
 
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
 msgid "Edit Complete URL"
 msgstr "编辑完整 URL"
 
 #. help text
-#: src/modules/SourceDialogs.rb:765
+#: src/modules/SourceDialogs.rb:774
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2373,12 +2323,11 @@
 "使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>\n"
 "指定 NFS 服务器主机名和服务器上的路径。<p>"
 
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:781
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
-"This is an expert option, keeping the default value is recommened. See "
-"<b>man 5 nfs</b>\n"
+"This is an expert option, keeping the default value is recommened. See <b>man 5 nfs</b>\n"
 "for details and the list of supported options."
 msgstr ""
 "<p><big><b>挂载选项</b></big><br>\n"
@@ -2386,16 +2335,16 @@
 "这是一个专家选项，推荐保持默认值。细节和支持选项列表请参考 <b>man 5 nfs</b>。"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:827
+#: src/modules/SourceDialogs.rb:836
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:829
+#: src/modules/SourceDialogs.rb:838
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:843
 msgid ""
 "<p><big><b>CD or DVD Media</b></big><br>\n"
 "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2404,26 +2353,26 @@
 "设置 <b>CD-ROM</b> 或 <b>DVD-ROM</b> 以指定介质类型。</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:934
+#: src/modules/SourceDialogs.rb:943
 msgid "ISO Image File"
 msgstr "ISO 映像文件"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:957
+#: src/modules/SourceDialogs.rb:966
 msgid ""
 "The entered path is not a directory\n"
 "or the directory does not exist.\n"
 msgstr "输入路径不是一个文件夹或该文件夹不存在。\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:987
+#: src/modules/SourceDialogs.rb:996
 msgid ""
 "The entered path is not a file\n"
 "or the file does not exist.\n"
 msgstr "输入路径不是一个文件或该文件不存在。\n"
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1011
+#: src/modules/SourceDialogs.rb:1020
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2434,17 +2383,17 @@
 "仍然使用它吗？\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1032
+#: src/modules/SourceDialogs.rb:1041
 msgid "&Path to Directory"
 msgstr "文件夹路径(&P)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298
-#: src/modules/SourceDialogs.rb:1365
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
 msgid "&Plain RPM Directory"
 msgstr "纯 RPM 文件夹(&P)"
 
-#: src/modules/SourceDialogs.rb:1055
+#: src/modules/SourceDialogs.rb:1064
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2459,20 +2408,20 @@
 "<b>纯 RPM 文件夹</b>选项。</p>\n"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1291
+#: src/modules/SourceDialogs.rb:1300
 msgid "&USB Mass Storage Device"
 msgstr "&USB 大容量存储设备"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
 msgid "&File System"
 msgstr "文件系统(&F)"
 
-#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
 msgid "Dire&ctory"
 msgstr "文件夹(&C)"
 
-#: src/modules/SourceDialogs.rb:1302
+#: src/modules/SourceDialogs.rb:1311
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
@@ -2492,7 +2441,7 @@
 
 #. 'auto' is a value in the combo box widget, do not translate it!
 #. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1312 src/modules/SourceDialogs.rb:1379
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
 msgid ""
 "<p>The file system used on the device will be detected automatically\n"
 "if you select file system 'auto'. If the detection fails or you\n"
@@ -2502,11 +2451,11 @@
 "若检测失败，或您想要使用特定文件系统，还可从列表中选择。</p>\n"
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1362
+#: src/modules/SourceDialogs.rb:1371
 msgid "&Disk Device"
 msgstr "磁盘设备(&D)"
 
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1378
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
@@ -2524,12 +2473,12 @@
 "<b>纯 RPM 文件夹</b>选项。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1395
+#: src/modules/SourceDialogs.rb:1404
 msgid "&Path to ISO Image"
 msgstr "ISO 映像路径(&P)"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1415
+#: src/modules/SourceDialogs.rb:1424
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
 "Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2539,71 +2488,71 @@
 "使用<b>ISO 映像路径</b>指定 ISO 映像文件的路径。</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1596
+#: src/modules/SourceDialogs.rb:1605
 msgid "Server &Name"
 msgstr "服务器名称(&N)"
 
-#: src/modules/SourceDialogs.rb:1600
+#: src/modules/SourceDialogs.rb:1609
 msgid "&Port"
 msgstr "端口(&P)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1605
+#: src/modules/SourceDialogs.rb:1614
 msgid "&Share"
 msgstr "共享(&S)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1618
+#: src/modules/SourceDialogs.rb:1627
 msgid "ISO &Image"
 msgstr "&ISO 映像"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:1630
 msgid "&Directory on Server"
 msgstr "服务器上的文件夹(&D)"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1626
+#: src/modules/SourceDialogs.rb:1635
 msgid "Au&thentication"
 msgstr "认证(&T)"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1642
 msgid "&Anonymous"
 msgstr "匿名(&A)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1642
+#: src/modules/SourceDialogs.rb:1651
 msgid "&Workgroup or Domain"
 msgstr "工作组或域(&W)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1651
+#: src/modules/SourceDialogs.rb:1660
 msgid "&User Name"
 msgstr "用户名(&U)"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1667
 msgid "&Password"
 msgstr "密码(&P)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1733
+#: src/modules/SourceDialogs.rb:1742
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1736
+#: src/modules/SourceDialogs.rb:1745
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1752
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1917
+#: src/modules/SourceDialogs.rb:1926
 msgid ""
 "<p><big><b>Server and Directory</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2611,25 +2560,22 @@
 "To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
 "<b>User Name</b> and the <b>Password</b>.</p>\n"
 "<p>\n"
-"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to "
-"Directory\n"
+"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
 "or ISO Image</b>. \n"
 "If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>\n"
 msgstr ""
 "<p><big><b>服务器和文件夹</b></big><br>\n"
-"使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>指定 NFS 服务器主机名和在"
-"服务器上的路径。\n"
+"使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>指定 NFS 服务器主机名和在服务器上的路径。\n"
 "要启用认证，请反选<b>匿名</b>并指定<b>用户名</b>和<b>密码</b>。<p>\n"
 "<p>\n"
 "要启用 SMB/CIFS 软件源，请指定<b>共享</b>名和<b>文件夹或 ISO 映像路径</b>。\n"
 "若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>\n"
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1930
+#: src/modules/SourceDialogs.rb:1939
 msgid ""
-"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS "
-"repository.\n"
+"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
 "Leave it empty to use the default port.</p>\n"
 msgstr ""
 "<p>可为 HTTP/HTTPS 软件源设置<b>端口</b>号。\n"
@@ -2638,12 +2584,20 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1992
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+#, fuzzy
+#| msgid "I would like to install an additional Add On Product"
+msgid "I would li&ke to install an additional Add On Product"
 msgstr "我想要安装一个额外的附加产品"
 
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+#| msgid "Checking Network Configuration ..."
+msgid "Net&work Configuration..."
+msgstr "正在检查网络配置..."
+
 #. help text
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2136
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
@@ -2653,7 +2607,7 @@
 "软件源可位于 CD、网络服务器或硬盘上。</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2145
 msgid ""
 "<p>\n"
 "To add  <b>CD</b> or <b>DVD</b>,\n"
@@ -2664,7 +2618,7 @@
 "请准备好产品 CD 集或 DVD。</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2155
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
@@ -2678,7 +2632,7 @@
 "若已将全部 CD 复制进了相同文件夹，则只需输入基本路径。</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2150
+#: src/modules/SourceDialogs.rb:2167
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
@@ -2690,30 +2644,29 @@
 "请指定第一张 CD 中的软件包所在的文件夹，诸如 /data1/CD1。</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2165
+#: src/modules/SourceDialogs.rb:2182
 msgid "Select the media type"
 msgstr "选择介质类型"
 
-#: src/modules/SourceDialogs.rb:2171
+#: src/modules/SourceDialogs.rb:2188
 msgid "Insert the add-on product CD"
 msgstr "请插入附加产品 CD"
 
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2189
 msgid "Insert the add-on product DVD"
 msgstr "请插入附加产品 DVD"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2190
+#: src/modules/SourceDialogs.rb:2207
 msgid "No USB disk was detected."
 msgstr "未检测到 USB 磁盘。"
 
-#. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2393
+#. use three slashes as third slash means path
+#: src/modules/SourceDialogs.rb:2415
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
-"repository. Check <b>Download repository description files</b> to download "
-"the\n"
+"repository. Check <b>Download repository description files</b> to download the\n"
 "files when closing this YaST module. If the option is unchecked, YaST will\n"
 "automatically download the files when it needs them later. </p>\n"
 msgstr ""
@@ -2723,19 +2676,19 @@
 "若不选该选项，则 YaST 将在稍后需要这些文件时自动下载它们。</p>\n"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2613
+#: src/modules/SourceDialogs.rb:2635
 msgid "Media Type"
 msgstr "介质类型"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2637
+#: src/modules/SourceDialogs.rb:2659
 msgid "Add On Product"
 msgstr "附加产品"
 
 #. Returns boolean whether user confirmed to abort the configuration
 #.
 #. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2668
+#: src/modules/SourceDialogs.rb:2690
 msgid "URL scheme '%s' is not valid."
 msgstr "URL 方案 '%s' 无效。"
 
@@ -2927,28 +2880,22 @@
 msgstr "没有在您的网络上发现 SLP 软件源。"
 
 #. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
 msgid "Partition \"%1\" needs %2 more disk space."
 msgstr "分区 \"%1\" 需要 %2 更多磁盘空间。"
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
 msgid ""
 "Deselect packages or delete data or temporary files\n"
 "before updating the system.\n"
 msgstr "在更新系统前请反选一些软件包或者删除一些数据或临时文件。\n"
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
 msgid "Deselect some packages."
 msgstr "请反选一些软件包。"
 
-#~ msgid "Raw URL: %s"
-#~ msgstr "裸 URL：%s"
-
-#~ msgid "Only repositories not provided by a service"
-#~ msgstr "只有软件源未由服务提供"
-
 #~ msgid "Downloading patch RPM %1 (download size %2)"
 #~ msgstr "正在下载补丁 RPM %1 (下载大小 %2)"
 
@@ -2989,9 +2936,6 @@
 #~ msgid "Initialize Software Manager"
 #~ msgstr "初始化软件管理器"
 
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "正在检查网络配置..."
-
 #~ msgid "Initializing Software Manager ... "
 #~ msgstr "正在初始化软件管理器..."
 
@@ -3030,22 +2974,16 @@
 
 #~ msgid ""
 #~ "<p><big><b>Package Search</b></big><br>\n"
-#~ "Use the functionality of <i>Webpin package search</i> to search in all "
-#~ "known openSUSE build-service and openSUSE community repositories.</p>\n"
+#~ "Use the functionality of <i>Webpin package search</i> to search in all known openSUSE build-service and openSUSE community repositories.</p>\n"
 #~ msgstr ""
 #~ "<p><big><b>软件包搜索</b></big><br>\n"
-#~ "使用<i>Webpin 软件包搜索</i>功能来搜索全部已知的 openSUSE 编译服务和社区软"
-#~ "件源。</p>\n"
+#~ "使用<i>Webpin 软件包搜索</i>功能来搜索全部已知的 openSUSE 编译服务和社区软件源。</p>\n"
 
 #~ msgid ""
-#~ "<p><big><b>Security</b></big><br> The software found is often not part of "
-#~ "the\n"
+#~ "<p><big><b>Security</b></big><br> The software found is often not part of the\n"
 #~ "distribution itself. You need to decide whether to trust the source of a\n"
-#~ "package. We do not take any responsibility for installing such software.\n"
-#~ msgstr ""
-#~ "<p><big><b>安全性</b></big><br>找到的软件通常不是发行版自身的一部分。您需"
-#~ "要决定是否信任软件包的来源。我们不为安装了这样的软件导致的问题负责。</p>\n"
+#~ "package. We do not take any responsibility for installing such software.</p>\n"
+#~ msgstr "<p><big><b>安全性</b></big><br>找到的软件通常不是发行版自身的一部分。您需要决定是否信任软件包的来源。我们不为安装了这样的软件导致的问题负责。</p>\n"
 
 #~ msgid "Select packages to install."
 #~ msgstr "选择要安装的软件包。"
@@ -3105,10 +3043,8 @@
 #~ msgstr "搜索范围(&I)"
 
 #~ msgid ""
-#~ "<p><b>These are the release notes made for the first initial release. "
-#~ "They are\n"
-#~ "part of the installation media. During the configuration steps, if a "
-#~ "connection\n"
+#~ "<p><b>These are the release notes made for the first initial release. They are\n"
+#~ "part of the installation media. During the configuration steps, if a connection\n"
 #~ "to the Internet is available, you can download updated release notes\n"
 #~ "from the SUSE Linux Web server.</b></p>"
 #~ msgstr ""
@@ -3179,14 +3115,10 @@
 #~ msgid "Synchronizing with ZENworks"
 #~ msgstr "正在与 ZENworks 同步"
 
-#~ msgid ""
-#~ "Your service was added successfully in YaST, but could not be "
-#~ "synchronized with ZENworks."
+#~ msgid "Your service was added successfully in YaST, but could not be synchronized with ZENworks."
 #~ msgstr "您的服务已使用 YaST 成功添加，但无法与 ZenWorks 同步。"
 
-#~ msgid ""
-#~ "Your service was deleted successfully in YaST, but could not be "
-#~ "synchronized with ZENworks."
+#~ msgid "Your service was deleted successfully in YaST, but could not be synchronized with ZENworks."
 #~ msgstr "您的服务已使用 YaST 成功删除，但无法与 ZenWorks 同步。"
 
 #~ msgid "Command timed out after %1 milliseconds."

Modified: trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pkg-bindings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2013-02-01 21:40+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -46,12 +46,12 @@
 msgstr "<P><BIG><B>正在刷新软件源</B></BIG></P><P>软件包管理器正在更新软件源内容...</P>"
 
 #. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
 msgid "The package cannot be selected to install."
 msgstr "不能选择安装该软件包。"
 
 #. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
 msgid "The package is not available."
 msgstr "软件包不可用。"
 

Modified: trunk/yast/zh_CN/po/printer.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/printer.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/printer.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: printer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2016-03-02 21:53+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -73,19 +73,16 @@
 #. If cups is missing, there can be no local running cupsd which is
 #. mandatory to set up local print queues.
 #: src/clients/printer_proposal.rb:92
-msgid ""
-"Cannot configure printing (required package cups-client is not installed)."
+msgid "Cannot configure printing (required package cups-client is not installed)."
 msgstr "无法配置打印 (未安装需要的 cups-client 软件包)。"
 
 #: src/clients/printer_proposal.rb:102
-msgid ""
-"Cannot configure local printers (required package cups is not installed)."
+msgid "Cannot configure local printers (required package cups is not installed)."
 msgstr "无法配置本地打印机 (未安装需要的软件包 cups)。"
 
 #. Skip automated queue setup when it is a client-only config:
 #: src/clients/printer_proposal.rb:117
-msgid ""
-"No local printer accessible (using remote CUPS server '%1' for printing)."
+msgid "No local printer accessible (using remote CUPS server '%1' for printing)."
 msgstr "没有可访问的本地打印机 (使用远程 CUPS 服务器 %1 打印)。"
 
 #. Wait half a minute for a new started cupsd:
@@ -189,17 +186,14 @@
 #. Header for a dialog section where the user can
 #. specify if USB printers are configured automatically:
 #: src/include/printer/autoconfig.rb:61
-msgid ""
-"Specify if automatic USB printer configuration should happen when plug in"
+msgid "Specify if automatic USB printer configuration should happen when plug in"
 msgstr "指定是否在插入 USB 打印机时进行自动配置"
 
 #. CheckBox for automatic configuration of USB printers
 #. by installing or removing the RPM package udev-configure-printer.
 #. Do not change or translate "udev-configure-printer", it is a RPM package name.
 #: src/include/printer/autoconfig.rb:75
-msgid ""
-"&Use the package udev-configure-printer for automatic USB printer"
-" configuration"
+msgid "&Use the package udev-configure-printer for automatic USB printer configuration"
 msgstr "使用 udev-configure-printer 软件包进行自动 USB 打印机配置(&U)"
 
 #. where %1 will be replaced by the server name:
@@ -207,7 +201,7 @@
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
-#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
 #: src/include/printer/policies.rb:135
 #: src/include/printer/printingvianetwork.rb:463
 #: src/include/printer/sharing.rb:639
@@ -217,16 +211,14 @@
 #. PopupYesNoHeadline headline
 #. PopupYesNoHeadline body:
 #: src/include/printer/autoconfig.rb:101
-msgid ""
-"A remote CUPS server setting conflicts with automatic configuration of"
-" printers for the local system."
+msgid "A remote CUPS server setting conflicts with automatic configuration of printers for the local system."
 msgstr "一个远程 CUPS 服务器设置与本地系统的打印机自动配置冲突。"
 
 #. Only a simple message because this error does not happen on a normal system
 #. (i.e. a system which is not totally broken or totally messed up).
 #. Remove the 'ServerName' entry in /etc/cups/client.conf:
-#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220
+#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
 #: src/include/printer/printingvianetwork.rb:478
 #: src/include/printer/sharing.rb:657
 msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -351,7 +343,7 @@
 #: src/include/printer/basicmodify.rb:371
 #: src/include/printer/basicmodify.rb:899
 #: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
 msgid "Description"
 msgstr "描述"
 
@@ -455,8 +447,8 @@
 #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog
 #. does not preselect a connection so that the first connection in the list is preselected
 #. (via Table widget fallback) which is still better than an arbitrary preselected entry:
-#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
 msgid "Nothing Selected"
 msgstr "未选择任何项"
 
@@ -506,9 +498,7 @@
 
 #. Body of a Popup::AnyMessage when a wrong queue name was entered:
 #: src/include/printer/basicadd.rb:379
-msgid ""
-"Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed"
-" for the queue name."
+msgid "Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed for the queue name."
 msgstr "队列名中仅允许使用字母 (a-z 和 A-Z)，数字 (0-9) 和下划线 '_' 。"
 
 #. when a queue name is changed to be valid:
@@ -531,9 +521,7 @@
 #. The 'next dialog' is the overview dialog where the printer configurations are shown
 #. which has a 'Refresh List' button to update the shown printer configurations:
 #: src/include/printer/basicadd.rb:430 src/include/printer/basicadd.rb:821
-msgid ""
-"If the next dialog does not show the new printer configuration as expected,"
-" wait some time and use the 'Refresh List' button."
+msgid "If the next dialog does not show the new printer configuration as expected, wait some time and use the 'Refresh List' button."
 msgstr "如果下一个对话框未如预期的显示新打印机配置，请点击 '刷新列表' 按钮。"
 
 #. Only a simple message because before the RunHpsetup function was called
@@ -580,9 +568,7 @@
 #. Do not change or translate "raw", it is a technical term when no driver is used.
 #. Do not change or translate "System V style interface script", it is a technical term.
 #: src/include/printer/basicmodify.rb:315
-msgid ""
-"No driver is used (it is a 'raw' queue or a 'System V style interface script'"
-" is used)"
+msgid "No driver is used (it is a 'raw' queue or a 'System V style interface script' is used)"
 msgstr "没有使用驱动（在使用一个“原始”队列或者“System V 风格接口脚本”）"
 
 #: src/include/printer/basicmodify.rb:323
@@ -634,9 +620,7 @@
 #. The 'next dialog' is the overview dialog where the printer configurations are shown
 #. which has a 'Refresh List' button to update the shown printer configurations:
 #: src/include/printer/basicmodify.rb:823
-msgid ""
-"If the next dialog does not show the expected modifications, wait some time"
-" and use the 'Refresh List' button."
+msgid "If the next dialog does not show the expected modifications, wait some time and use the 'Refresh List' button."
 msgstr "如果下一个对话框未如预期显示修改内容，请点击 '刷新列表' 按钮。"
 
 #. Exit this dialog in any case:
@@ -662,8 +646,7 @@
 #. Do not change or translate "raw", it is a technical term
 #. when no driver is used for a print queue.
 #: src/include/printer/connectionwizard.rb:432
-msgid ""
-"Keep the model or select a &manufacturer if no 'raw queue' should be set up"
+msgid "Keep the model or select a &manufacturer if no 'raw queue' should be set up"
 msgstr "如果不应该设置 '原始队列‘ 的话，保留打印机型号或选择另一个生产厂商"
 
 #. Header for a ComboBox to select the printer manufacturer:
@@ -780,8 +763,7 @@
 msgstr "停止位(&T)"
 
 #: src/include/printer/connectionwizard.rb:1076
-msgid ""
-"To access a bluetooth printer, the RPM package bluez-cups must be installed."
+msgid "To access a bluetooth printer, the RPM package bluez-cups must be installed."
 msgstr "要访问蓝牙打印机，必须安装 bluez-cups RPM 软件包。"
 
 #. The user can also decide during the actual installation not to install it
@@ -862,8 +844,7 @@
 msgstr "URI（参见打印机手册）[百分号编码]"
 
 #: src/include/printer/connectionwizard.rb:1402
-msgid ""
-"To access a SMB printer share, the RPM package samba-client must be installed."
+msgid "To access a SMB printer share, the RPM package samba-client must be installed."
 msgstr "要访问 SMB 打印机共享，必须安装 samba-client RPM 软件包。"
 
 #. The user can also decide during the actual installation not to install it
@@ -983,7 +964,6 @@
 msgstr "程序 (/到/指令?选项=值/的/路径) [百分号编码]"
 
 #: src/include/printer/connectionwizard.rb:2044
-#| msgid "<p>To configure Heartbeat, the <b>%1</b> package must be installed.</p>"
 msgid "To use 'beh', the RPM package cups-backends must be installed."
 msgstr "要使用 'beh'，必须安装 RPM 软件包 cups-backends。"
 
@@ -1181,8 +1161,7 @@
 msgstr "'space' 奇偶校验只支持 7 个数据位。"
 
 #: src/include/printer/connectionwizard.rb:2509
-msgid ""
-"The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
+msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
 msgstr "'mark' 奇偶校验只支持 7 个数据位和一个停止位。"
 
 #: src/include/printer/connectionwizard.rb:2551
@@ -1351,9 +1330,7 @@
 #. Without a link name /usr/lib[64]/cups/backend/smb (which is provided by samba-client)
 #. the rest makes no sense (in particular the ln commands would create nonsense links in $PWD):
 #: src/include/printer/connectionwizard.rb:3273
-msgid ""
-"To support Active Directory (R), the RPM package samba-krb-printing must be"
-" installed."
+msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed."
 msgstr "要访问活动目录 (R)，必须安装 RPM 软件包 samba-krb-printing。"
 
 #. Show a user notification before it gets disabled:
@@ -1537,8 +1514,7 @@
 #. Simply exit this dialog because it does not make sense to proceed here
 #. and there is nothing else to be done after this:
 #: src/include/printer/driveradd.rb:685
-msgid ""
-"The printer description file is not in compliance with the specification."
+msgid "The printer description file is not in compliance with the specification."
 msgstr "打印机描述文件不符合规格。"
 
 #. when a PPD file is not in compliance:
@@ -1549,8 +1525,7 @@
 #. Body of a Popup::ContinueCancelHeadline
 #. when PPD file is not in compliance:
 #: src/include/printer/driveradd.rb:705
-msgid ""
-"A non-compliant printer description file can lead to arbitrary failures."
+msgid "A non-compliant printer description file can lead to arbitrary failures."
 msgstr "一个不兼容的打印机描述文件可能导致任何错误。"
 
 #: src/include/printer/driveradd.rb:722
@@ -1599,14 +1574,12 @@
 "<b><big>Print Queue Overview</big></b><br>\n"
 "A printer device is not used directly but via a print queue.<br>\n"
 "When various applications submit print jobs simultaneously,\n"
-"these jobs are put in a queue and are sent one after the other to the"
-" printer\n"
+"these jobs are put in a queue and are sent one after the other to the printer\n"
 "device.<br>\n"
 "It is possible to have several different print queues for the same printer\n"
 "device.\n"
 "For example a second queue with a monochrome-only driver for a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL"
-" printer.\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1614,8 +1587,7 @@
 "打印机设备不能直接访问，需要通过打印队列访问。<br>\n"
 "当多种应用程序自发提交打印任务时，这些任务被放队列，一个接一个的发送到打印机设备。<br>\n"
 "相同的打印机设备可以接受一些不同的打印队列。\n"
-"例如彩色设备的一个使用黑白驱动的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列。\n"
+"例如彩色设备的一个使用黑白驱动的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列。</p>\n"
 
 #. Overview dialog help 2/7:
 #: src/include/printer/helps.rb:65
@@ -1729,19 +1701,14 @@
 "<b><big>Set Up a New Queue for a Printer Device</big></b><br>\n"
 "A printer device is not used directly but via a print queue.<br>\n"
 "When various application programs submit print jobs simultaneously,\n"
-"the jobs queue up and are sent one after the other to the printer device.\n"
-"It is possible to have several different print queues for the same printer"
-" device.\n"
-"Usually several print queues are needed when several different printer"
-" drivers\n"
+"the jobs queue up and are sent one after the other to the printer device.<br>\n"
+"It is possible to have several different print queues for the same printer device.\n"
+"Usually several print queues are needed when several different printer drivers\n"
 "should be used for the same printer device.\n"
 "For example a second queue with a monochrome-only driver\n"
 "to enforce black-only printout on a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL"
-" printer\n"
-"because printing via the PCL driver is usually faster (but with less"
-" quality).\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer\n"
+"because printing via the PCL driver is usually faster (but with less quality).\n"
 "</p>"
 msgstr ""
 "<p>\n"
@@ -1750,8 +1717,7 @@
 "当多种应用程序自发提交打印任务时，任务会排队，一个接一个的发送到打印设备。<br>\n"
 "相同的打印机设备可以接受一些不同的打印队列。\n"
 "通常当同一个打印设备使用了一些不同的打印机驱动时，就需要一些不同的打印队列。\n"
-"例如彩色设备的一个使用黑白驱动来强制黑白输出的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL"
-" 驱动的队列，因为通过 PCL 驱动打印通常更快 (但质量会降低)。</p>"
+"例如彩色设备的一个使用黑白驱动来强制黑白输出的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列，因为通过 PCL 驱动打印通常更快 (但质量会降低)。</p>"
 
 #. BasicAddDialog help 2/7:
 #: src/include/printer/helps.rb:143
@@ -1774,8 +1740,7 @@
 #: src/include/printer/helps.rb:152
 msgid ""
 "<p>\n"
-"The <b>connection</b> determines which way data is sent to the printer"
-" device.<br>\n"
+"The <b>connection</b> determines which way data is sent to the printer device.<br>\n"
 "If a wrong connection is selected, no data can be sent to the device\n"
 "so that there cannot be any printout.<br>\n"
 "If a printer device is accessible via more than one connection type,\n"
@@ -1783,10 +1748,8 @@
 "In particular HP devices are often accessible both via the 'usb:/...'\n"
 "and the 'hp:/...' connection.\n"
 "The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything"
-" else\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one"
-" device)\n"
+"For plain printing, both kinds of connections should work, but for anything else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
 "the 'hp:/...' connection must be used.\n"
 "</p>\n"
 msgstr ""
@@ -1807,8 +1770,7 @@
 "The <b>driver</b> determines that the right data is produced for the\n"
 "specific printer model.<br>\n"
 "If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<"
-"br>\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
 "Initially the input field for the driver search string is preset\n"
 "with the autodetected model name of the currently selected connection\n"
 "and those drivers where the driver description matches to the model name\n"
@@ -1833,8 +1795,7 @@
 "and feel free to play around and modify the settings\n"
 "to what you know what works best for your printer.<br>\n"
 "If no driver description matches to the autodetected model name,\n"
-"it does not necessarily mean that there is no driver available for the"
-" model.\n"
+"it does not necessarily mean that there is no driver available for the model.\n"
 "Often only the model name in the driver descriptions\n"
 "is different from the autodetected model name.\n"
 "Therefore you can enter whatever you like as driver search string\n"
@@ -1857,17 +1818,11 @@
 "<b>驱动</b>使指定型号的打印机可以输出正确的数据。<br>\n"
 "如果指定了错误的驱动，会发送错误的数据到打印机，这将造成难看的、混乱的打印输出，或完全没有打印输出。<br>\n"
 "驱动搜索的搜索关键词输入框初始预设为当前选中连接的自动检测到的型号名称，那些驱动描述匹配型号名称的驱动默认自动显示。<br>\n"
-"如果驱动描述匹配自动检测到的型号名称，或所有匹配的驱动描述都属于同一个型号，驱动描述会被分类，最有可能的驱动列示在最上方并被自动预选中。如果没有驱动被自动预"
-"选中，您必须手动查找和选择一个合适的驱动。<br>\n"
-"另外如果一个驱动被自动预选中，也不意味着这个驱动就一定是能满足您特殊需要的最佳驱动。严格的说一个自动预选中的驱动可能在您的特殊打印机型号上完全不能用。原因是"
-"由于自动驱动选择只能基于比较字符串(自动检测到的型号名和驱动描述)来作业，因此结果只是如何设置您的特殊打印机型号的最佳猜想的方案。<br>\n"
+"如果驱动描述匹配自动检测到的型号名称，或所有匹配的驱动描述都属于同一个型号，驱动描述会被分类，最有可能的驱动列示在最上方并被自动预选中。如果没有驱动被自动预选中，您必须手动查找和选择一个合适的驱动。<br>\n"
+"另外如果一个驱动被自动预选中，也不意味着这个驱动就一定是能满足您特殊需要的最佳驱动。严格的说一个自动预选中的驱动可能在您的特殊打印机型号上完全不能用。原因是由于自动驱动选择只能基于比较字符串(自动检测到的型号名和驱动描述)来作业，因此结果只是如何设置您的特殊打印机型号的最佳猜想的方案。<br>\n"
 "因此请检查当前预选中的值是否正确，如果您知道您的打印机使用哪种驱动更好的话也可以任意修改设置。<br>\n"
-"如果没有匹配自动检测到的型号名的驱动描述，这也不意味着没有该型号的驱动可用。通常只是驱动描述中的型号名和自动检测到的型号名不同。因此您可以输入您想要的驱动搜"
-"索关键词并搜索全部可用驱动描述。<br>\n"
-"通常默认驱动选项设置应该是合理的，所以该驱动可以用于您的打印机型号。一些驱动选项设置必须匹配您的打印机。尤其是驱动的默认纸张大小设置必须匹配您打印机中实际装"
-"载的纸张。您可以明确的选择 A4 或 Letter 作为默认纸张大小，或者不选以使用驱动内置的默认纸张大小，该内置选项也是当驱动不支持 A4 和"
-" Letter 时的回退选项 (例如小尺寸相片打印机的驱动)。如果您喜欢调整除了 A4 或 Letter"
-" 以外的驱动选项，您必须先设定好队列，然后在下一步的 '编辑/修改' 对话框中调整所有驱动选项。\n"
+"如果没有匹配自动检测到的型号名的驱动描述，这也不意味着没有该型号的驱动可用。通常只是驱动描述中的型号名和自动检测到的型号名不同。因此您可以输入您想要的驱动搜索关键词并搜索全部可用驱动描述。<br>\n"
+"通常默认驱动选项设置应该是合理的，所以该驱动可以用于您的打印机型号。一些驱动选项设置必须匹配您的打印机。尤其是驱动的默认纸张大小设置必须匹配您打印机中实际装载的纸张。您可以明确的选择 A4 或 Letter 作为默认纸张大小，或者不选以使用驱动内置的默认纸张大小，该内置选项也是当驱动不支持 A4 和 Letter 时的回退选项 (例如小尺寸相片打印机的驱动)。如果您喜欢调整除了 A4 或 Letter 以外的驱动选项，您必须先设定好队列，然后在下一步的 '编辑/修改' 对话框中调整所有驱动选项。\n"
 "</p>"
 
 #. BasicAddDialog help 5/7:
@@ -1933,8 +1888,7 @@
 "<p>\n"
 "另外一种设置惠普设备的方法是运行 <b>hp-setup</b>。<br>\n"
 "惠普自有工具 'hp-setup' 提供了需要从惠普下载私有驱动插件并在最终用户系统中正确安装的惠普打印机和惠普多合一设备的设置支持。\n"
-"另外 'hp-setup' 可以为惠普的网络打印机和惠普的多合一网络设备提供更好的支持，因为惠普的自有工具可以实现针对特殊惠普网络设备的特殊处理。\n"
+"另外 'hp-setup' 可以为惠普的网络打印机和惠普的多合一网络设备提供更好的支持，因为惠普的自有工具可以实现针对特殊惠普网络设备的特殊处理。<br>\n"
 "详情请见 openSUSE 支持数据库文章 '如何设置惠普打印机' 于<br>\n"
 "http://zh.opensuse.org/SDB:How_to_set_up_a_HP_printer\n"
 "</p>"
@@ -1964,10 +1918,8 @@
 "In particular HP devices are often accessible both via the 'usb:/...'\n"
 "and the 'hp:/...' connection.\n"
 "The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything"
-" else\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one"
-" device)\n"
+"For plain printing, both kinds of connections should work, but for anything else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
 "the 'hp:/...' connection must be used.<br>\n"
 "When you exchange the currently used connection with another one,\n"
 "the input field for the driver search string is preset\n"
@@ -2006,12 +1958,9 @@
 "使用惠普多合一设备扫描) 就必须使用 'hp:/...' 连接。\n"
 "当您变更目前使用的连接为另一个时，驱动搜索关键词输入框将预设为新选择的连接的自动检测到型号名。\n"
 "驱动描述匹配型号名称的驱动也将默认显示。<br>\n"
-"如果驱动描述匹配自动检测到的型号名，或者所有匹配的驱动描述属于同一型号，驱动描述将被分类，最有可能的驱动列示在最顶部"
-" (但依然在当前使用的驱动下面)。另一方面，它并不意味着该驱动能合理的满足您的特殊需求。最顶部列示的驱动可能在您的打印机型号上完全不能用。自动驱动选择基于自"
-"动检测到的型号名称和驱动描述的字符串对比，因此结果只是如何设置您的打印机型号的最佳猜想方案。<br>\n"
+"如果驱动描述匹配自动检测到的型号名，或者所有匹配的驱动描述属于同一型号，驱动描述将被分类，最有可能的驱动列示在最顶部 (但依然在当前使用的驱动下面)。另一方面，它并不意味着该驱动能合理的满足您的特殊需求。最顶部列示的驱动可能在您的打印机型号上完全不能用。自动驱动选择基于自动检测到的型号名称和驱动描述的字符串对比，因此结果只是如何设置您的打印机型号的最佳猜想方案。<br>\n"
 "因此请检查当前预选中的值满足需求，如果您知道哪款驱动最适合您的打印机，请随意修改设置。<br>\n"
-"如果没有驱动描述匹配自动检测到的型号名，它也不意味着该型号没有驱动。通常是驱动描述中的型号名和自动检测到的型号名不符。因此您可以输入你喜欢的驱动搜索字符串并"
-"搜索所有可用驱动描述。\n"
+"如果没有驱动描述匹配自动检测到的型号名，它也不意味着该型号没有驱动。通常是驱动描述中的型号名和自动检测到的型号名不符。因此您可以输入你喜欢的驱动搜索字符串并搜索所有可用驱动描述。\n"
 "</p>\n"
 
 #. BasicModifyDialog help 3/4:
@@ -2021,12 +1970,9 @@
 "The <b>driver</b> determines that the right data is produced for the\n"
 "specific printer model.<br>\n"
 "If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<"
-"br>\n"
-"You can either select another driver and modify its driver option settings"
-" later\n"
-"or keep the currently used driver and modify its driver option settings now.<"
-"br>\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
+"You can either select another driver and modify its driver option settings later\n"
+"or keep the currently used driver and modify its driver option settings now.<br>\n"
 "Some driver option settings must match to your particular printer.\n"
 "For example the default paper size setting of the driver\n"
 "must match to the paper which is actually loaded in your printer.<br>\n"
@@ -2043,8 +1989,7 @@
 "and then in a second step you can adjust all driver options\n"
 "by using this dialog again.<br>\n"
 "Initially the input field for the driver search string is preset\n"
-"with the description of the currently used driver when the connection was not"
-" changed.\n"
+"with the description of the currently used driver when the connection was not changed.\n"
 "This results usually only one single driver which matches\n"
 "so that you would have to enter a less specific driver search string\n"
 "to get also other drivers or you use the 'Find More' button.\n"
@@ -2060,8 +2005,7 @@
 "一些驱动选项设置必须匹配您的打印机。例如驱动的默认纸张大小设置必须匹配您打印机中实际装载的纸张。\n"
 "其它驱动选项您可以选择您喜欢的。例如任何可用打印分辨率都能够用在该驱动上。除非您的驱动在高分辨率下不能打印。\n"
 "例如镭射打印机的内置内存不足以处理高分辨率的页面。<br>\n"
-"当您变更了当前使用的驱动到另一个时，您必须先应用此修改到队列 (例如您必须完成此对话框以作为第一步)，然后在第二步您可以再次使用此对话框调整所有的驱动选项。"
-"<br>\n"
+"当您变更了当前使用的驱动到另一个时，您必须先应用此修改到队列 (例如您必须完成此对话框以作为第一步)，然后在第二步您可以再次使用此对话框调整所有的驱动选项。<br>\n"
 "通常当连接没有变更时，驱动搜索字符串输入框初始预设为当前使用中的驱动的描述。\n"
 "此结果通常是一个匹配的驱动，因此您可以输入一个更宽泛的驱动搜索字符串来获取其他驱动，或者可以使用 '查找更多' 按钮。\n"
 "如果没有驱动匹配，也不意味着没有驱动。因此您可以输入你喜欢的字符串作为驱动搜索字符串并搜索全部可用驱动描述。\n"
@@ -2072,10 +2016,8 @@
 msgid ""
 "<p>\n"
 "In contrast to connection and driver where you must select the right one,\n"
-"you are free to enter arbitrary strings for <b>description</b> and location</b>.\n"
-"Application programs often show description and location in the print"
-" dialog.\n"
+"you are free to enter arbitrary strings for <b>description</b> and <b>location</b>.\n"
+"Application programs often show description and location in the print dialog.\n"
 "To make sure that those strings look correct in any language\n"
 "which a particular user of a particular application program may use,\n"
 "it is safe when you use only plain ASCII text without\n"
@@ -2089,10 +2031,8 @@
 msgstr ""
 "<p>\n"
 "不同于连接和驱动，您必须选择正确的哪个，您可以自由的输入任何字符串来作为 <b>描述</b> 和 <b>位置</b>。\n"
-"应用程序通常在打印对话框中显示描述和位置。n为了确保这些字符串能正确的以任何应用程序的用户可能使用的语言显示，您只使用不带特殊字符的普通 ASCII"
-" 文本会更安全，例如，纯 ASCII 字符 (a-z 和 A-Z)，ASCII 数字 (0-9)，和 ASCII 空格字符 (20 hex)。\n"
-"通常描述描述了型号，偶尔也描述驱动 (例如 '使用通用 PCL 驱动的 ACME FunPrinter 1000 ')，位置描述了打印机的物理位置 (例如"
-" '房间 123' 或 '前台')。\n"
+"应用程序通常在打印对话框中显示描述和位置。n为了确保这些字符串能正确的以任何应用程序的用户可能使用的语言显示，您只使用不带特殊字符的普通 ASCII 文本会更安全，例如，纯 ASCII 字符 (a-z 和 A-Z)，ASCII 数字 (0-9)，和 ASCII 空格字符 (20 hex)。\n"
+"通常描述描述了型号，偶尔也描述驱动 (例如 '使用通用 PCL 驱动的 ACME FunPrinter 1000 ')，位置描述了打印机的物理位置 (例如 '房间 123' 或 '前台')。\n"
 "</p>"
 
 #. DriverOptionsDialog help 1/3:
@@ -2215,10 +2155,8 @@
 "对于非 PostScript 打印机来说，只有 PPD 文件是不足以设置一个能够工作的打印机配置的。\n"
 "尤其是，非 PostScript 打印机无法从互联网下载 PPD 文件，然后使用该 PPD 文件设置打印机。\n"
 "一般打印机可以设置但无法实际打印，因为驱动可能缺失。\n"
-"对于非 PostScript 打印机来说，您需要一个打印机驱动和一个匹配驱动的 PPD 文件。当您安装上述打印机驱动包时，匹配的 PPD"
-" 文件会自动安装到正确的位置.<br>\n"
-"只有 PostScript 打印机才可以只用 PPD 文件设定一个可工作的 PostScript 打印机配置。尤其是当 PPD 文件不包含"
-" 'cupsFilter' 项时，因为这样的条目会指向一个打印机驱动。<br>\n"
+"对于非 PostScript 打印机来说，您需要一个打印机驱动和一个匹配驱动的 PPD 文件。当您安装上述打印机驱动包时，匹配的 PPD 文件会自动安装到正确的位置.<br>\n"
+"只有 PostScript 打印机才可以只用 PPD 文件设定一个可工作的 PostScript 打印机配置。尤其是当 PPD 文件不包含 'cupsFilter' 项时，因为这样的条目会指向一个打印机驱动。<br>\n"
 "</p>\n"
 
 #. ConnectionWizardDialog help 1/7:
@@ -2239,57 +2177,23 @@
 
 #. ConnectionWizardDialog help 2/7:
 #: src/include/printer/helps.rb:450
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>Printer Device URI</big></b><br>\n"
-#| "A connection is specified as so called <b>device URI</b>.<br>\n"
-#| "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n"
-#| "for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
-#| "After the scheme there are more or less additional components\n"
-#| "which specify the details for this kind of data-transfer.<br>\n"
-#| "Space characters are not allowed in an URI.\n"
-#| "Therefore a space character in a value of an URI component\n"
-#| "is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
-#| "The components of an URI are separated by special reserved characters like\n"
-#| "colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
-#| "Finally there could be optional parameters (separated by a question mark '?')\n"
-#| "of the form 'option1=value1&option2=value2&option3=value3' so that\n"
-#| "a full device URI could be for example:<br>\n"
-#| "ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
-#| "Some examples:<br>\n"
-#| "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
-#| "with serial number 'A1B2C3' may have a device URI like:<br>\n"
-#| "usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
-#| "A network printer with IP 192.168.100.1 which is accessible\n"
-#| "via port 9100 may have a device URI like:<br>\n"
-#| "socket://192.168.100.1:9100<br>\n"
-#| "A network printer with IP 192.168.100.2 which is accessible\n"
-#| "via LPD protocol with a remote LPD queue name 'LPT1'\n"
-#| "may have a device URI like:<br>\n"
-#| "lpd://192.168.100.2/LPT1\n"
-#| "</p>"
 msgid ""
 "<p>\n"
 "<b><big>Printer Device URI</big></b><br>\n"
 "A connection is specified as so called <b>device URI</b>.<br>\n"
-"Its first word (the so called URI scheme) specifies the kind of"
-" data-transfer,\n"
+"Its first word (the so called URI scheme) specifies the kind of data-transfer,\n"
 "for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
 "After the scheme there are more or less additional components\n"
 "which specify the details for this kind of data-transfer.<br>\n"
 "Space characters are not allowed in an URI.\n"
 "Therefore a space character in a value of an URI component\n"
-"is encoded as '%20' (20 is the hexadecimal value of the space character).\n"
+"is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
 "The components of an URI are separated by special reserved characters like\n"
-"colon ':', slash '/', question mark '?', ampersand '&', or equals sign"
-" '='.<br>\n"
-"Finally there could be optional parameters (separated by a question mark"
-" '?')\n"
+"colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
+"Finally there could be optional parameters (separated by a question mark '?')\n"
 "of the form 'option1=value1&option2=value2&option3=value3' so that\n"
 "a full device URI could be for example:<br>\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false"
-"<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
 "Some examples:<br>\n"
 "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
 "with serial number 'A1B2C3' may have a device URI like:<br>\n"
@@ -2310,18 +2214,14 @@
 "制式之后有或多或少的附加组件指定了这种数据传输类型的细节。<br>\n"
 "URI 中不允许出现空格，因此URI 组件的值中的空格字符是编码为 '%20' 的 (20 是空格字符的十六进制值)。<br>\n"
 "URI 的组件之间由特殊的保留字符分隔，如冒号 ':'，斜线 '/'，问号 '?'，符号 '&'，或者等号 '='。<br>\n"
-"最后可以有可选参数 (由问号 '?' 分隔)，格式为 'option1=value1&option2=value2&option3=valu"
-"e3'，因此一个完整的设备 URI 的示例如下：<br>\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false"
-"<br>\n"
+"最后可以有可选参数 (由问号 '?' 分隔)，格式为 'option1=value1&option2=value2&option3=value3'，因此一个完整的设备 URI 的示例如下：<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
 "一些示例：<br>\n"
-"一个由 ‘ACME’ 制造的型号为 ‘Fun Printer 1000+’ 的串号为 'A1B2C3' 的 USB 打印机的设备 URI 可能是：\n"
+"一个由 ‘ACME’ 制造的型号为 ‘Fun Printer 1000+’ 的串号为 'A1B2C3' 的 USB 打印机的设备 URI 可能是：<br>\n"
 "usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
 "一个可通过 9100 端口访问的 IP 地址为 192.168.100.1 的网络打印机的设备 URI 可能是：<br>\n"
 "socket://192.168.100.1:9100<br>\n"
-"一个可通过 LPD 端口访问的 IP 地址为 192.168.100.2 的远程 LPD 队列名为 ‘LPT1’ 的网络打印机的设备 URI 可能是：<"
-"br>\n"
+"一个可通过 LPD 端口访问的 IP 地址为 192.168.100.2 的远程 LPD 队列名为 ‘LPT1’ 的网络打印机的设备 URI 可能是：<br>\n"
 "lpd://192.168.100.2/LPT1\n"
 "</p>"
 
@@ -2405,24 +2305,16 @@
 "<p>\n"
 "<b><big>百分号编码</big></b><br>\n"
 "该问题很复杂。\n"
-"建议您避免在 URI 中使用保留字符和空格作为组件值，如果您能控制的话 (例如当您必须在 URI"
-" 中指定这样的字符作为值以访问远程打印队列，但远程打印队列又不在您控制下时，您就无法避免使用它们)。\n"
+"建议您避免在 URI 中使用保留字符和空格作为组件值，如果您能控制的话 (例如当您必须在 URI 中指定这样的字符作为值以访问远程打印队列，但远程打印队列又不在您控制下时，您就无法避免使用它们)。\n"
 "可能的情况下请只使用 '非保留值'。\n"
 "非保留值包括大小写字母，十位数字，连字符，句号，下划线和波浪号。\n"
-"甚至在特殊情况下，连字符，句号，波浪号和大小写都会导致特殊问题 (例如，只有字符，数字和下划线已知可以用作 CUPS"
-" 打印队列名，它们一般没有什么显著问题)。\n"
+"甚至在特殊情况下，连字符，句号，波浪号和大小写都会导致特殊问题 (例如，只有字符，数字和下划线已知可以用作 CUPS 打印队列名，它们一般没有什么显著问题)。\n"
 "因此若可能最好只使用小写字母，数字，和下划线作为 URI 中的值。<br>\n"
 "组件中的保留字符和空格字符必须以百分比编码 (也叫做 URL 编码)。<br>\n"
-"当对话框中输入框是用来输入 URI 的一个组件的一个值时 (例如，用户名和密码的输入框是分开的)，您必须按字面输入空格和保留字符"
-" (非百分比编码)。这样的输入框会自动编码所有空格和保留字符。\n"
-"例如密码实际上是 'Foo%20Bar' (非百分比编码)，您必须在对话框中的密码输入框中按字面输入 'Foo%20Bar'。URI"
-" 中的密码组件值实际上储存的是自动百分比编码的结果 'Foo%2520Bar'。相反当对话框中输入框是用来输入 URI 的一个组件的多于一个值时"
-" (例如，一个给所有可选参数如 'option1=value1&option2=value2&option3=value3'"
-" 的输入框或者一个输入框里输入整个 URI)，您必须输入编码过的空格和保留字符，因为这时没有自动编码。\n"
-"假设一个可选参数 'option=value' 的输入，value 就应该是 'this&that' 因此整个可选参数应该是"
-" 'option=this&that' (字面上)。\n"
-"但是字面上的 '&' 字符意味着不同可选参数的分隔符，因此 URI 中的 'option=this&that' 意思是第一个可选参数是"
-" 'option=this'，第二个可选参数只是 'that'。\n"
+"当对话框中输入框是用来输入 URI 的一个组件的一个值时 (例如，用户名和密码的输入框是分开的)，您必须按字面输入空格和保留字符 (非百分比编码)。这样的输入框会自动编码所有空格和保留字符。\n"
+"例如密码实际上是 'Foo%20Bar' (非百分比编码)，您必须在对话框中的密码输入框中按字面输入 'Foo%20Bar'。URI 中的密码组件值实际上储存的是自动百分比编码的结果 'Foo%2520Bar'。相反当对话框中输入框是用来输入 URI 的一个组件的多于一个值时 (例如，一个给所有可选参数如 'option1=value1&option2=value2&option3=value3' 的输入框或者一个输入框里输入整个 URI)，您必须输入编码过的空格和保留字符，因为这时没有自动编码。\n"
+"假设一个可选参数 'option=value' 的输入，value 就应该是 'this&that' 因此整个可选参数应该是 'option=this&that' (字面上)。\n"
+"但是字面上的 '&' 字符意味着不同可选参数的分隔符，因此 URI 中的 'option=this&that' 意思是第一个可选参数是 'option=this'，第二个可选参数只是 'that'。\n"
 "因此一个单独的可选参数 'option=this&that' 必须以百分比编码格式输入为 'option=this%26%that'。<br>\n"
 "要求百分比编码输入的输入框由 '[percent-encoded]' 提示语表示。<br>\n"
 "下面是字符和它们的百分比编码的列表：<br>\n"
@@ -2468,8 +2360,7 @@
 #: src/include/printer/helps.rb:588
 msgid ""
 "<p>\n"
-"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big><br>\n"
+"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>\n"
 "A printserver box is a small device with a network connection\n"
 "and a USB or parallel port connection to connect the actual printer.\n"
 "A network printer has such a device built-in.\n"
@@ -2516,8 +2407,7 @@
 "匹配的设备 URI 是：<br>\n"
 "socket://ip地址:端口号<br>。\n"
 "<b>行式打印机守护精灵 (LPD) 协议</b><br>\n"
-"IPP 是运行在真实计算机上的 CUPS 的原生协议，但是如果 IPP 是实现在小型打印服务器盒中的，那它通常实现的不好。只有在生产厂商确实提供了官方支持时"
-"再使用 IPP。\n"
+"IPP 是运行在真实计算机上的 CUPS 的原生协议，但是如果 IPP 是实现在小型打印服务器盒中的，那它通常实现的不好。只有在生产厂商确实提供了官方支持时再使用 IPP。\n"
 "匹配的设备 URI 是：<br>\n"
 "ipp://ip地址:端口号/资源<br>。\n"
 "端口号和资源由网络打印机和打印服务器盒的型号而定。<br>\n"
@@ -2526,90 +2416,6 @@
 
 #. ConnectionWizardDialog help 6/7:
 #: src/include/printer/helps.rb:627
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
-#| "In contrast to a printserver box a print server machine\n"
-#| "means a real computer which offers a print service.<br>\n"
-#| "Access happens via various different network protocols.\n"
-#| "Ask your network administrator what which print server machine\n"
-#| "provides in your particular network:<br>\n"
-#| "<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
-#| "To access a SMB printer share, the RPM package samba-client must be installed.\n"
-#| "The package provides the CUPS backend 'smb' which is a link to\n"
-#| "the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
-#| "to a SMB printer share.<br>\n"
-#| "A server name and a printer share name and optionally a workgroup name\n"
-#| "is needed to access it.\n"
-#| "Furthermore a user name and a password may be required to get access.\n"
-#| "Have in mind that spaces and special characters in those values\n"
-#| "must be percent-encoded (see above).<br>\n"
-#| "By default CUPS runs backends (here smbspool) as user 'lp'.\n"
-#| "When printing in an Active Directory (R) environment (AD)\n"
-#| "the user 'lp' is not allowed to print in this environment\n"
-#| "so that the traditional way to print via smbspool as user 'lp'\n"
-#| "would not work.<br>\n"
-#| "For printing in an AD environment additionally\n"
-#| "the RPM package samba-krb-printing must be installed.\n"
-#| "In this case the CUPS backend 'smb' link\n"
-#| "is changed to <tt>/usr/bin/get_printing_ticket</tt>\n"
-#| "which is a wrapper to run smbspool as the original user\n"
-#| "who submitted a particular print job.\n"
-#| "When the Kerberos protocol is used for authentication\n"
-#| "in an AD environment, a user gets a ticket granting ticket (TGT)\n"
-#| "via the display manager during login at the Gnome or KDE desktop.\n"
-#| "When smbspool is run as the original user who submitted\n"
-#| "a particular print job, it can access the TGT of this user\n"
-#| "and use it to pass the printing data to the SMB printer share\n"
-#| "even in an AD environment with Kerberos authentication.\n"
-#| "In this case neither a fixed user name nor a fixed password\n"
-#| "has to be specified for authentication.\n"
-#| "A precondition is that get_printing_ticket runs on the same host\n"
-#| "where the user who submitted a particular print job is logged in.\n"
-#| "This means that it must be set up on the workstation\n"
-#| "for the particular user who will submit such print jobs\n"
-#| "and the user's workstation must send its printing data\n"
-#| "directly to the SMB printer share in the AD environment.\n"
-#| "In particular it does not work on a separated CUPS server machine\n"
-#| "where users who submit print jobs are not logged in.<br>\n"
-#| "For the traditional way a matching full device URI is:<br>\n"
-#| "smb://username:password@workgroup/server/printer<br>\n"
-#| "For example 'John Doe' with password '@home!' may use something like\n"
-#| "the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
-#| "smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
-#| "For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
-#| "http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
-#| "'Windows' and 'Active Directory' are registered trademarks\n"
-#| "of Microsoft Corporation in the United States and/or other countries.<br>\n"
-#| "<b>Traditional UNIX Server (LPR)</b><br>\n"
-#| "A Line Printer Daemon (LPD) runs on a traditional UNIX server\n"
-#| "and provides one or more LPD queues.\n"
-#| "The IP address and a LPD queue name is needed to access it.\n"
-#| "The matching device URI is:<br>\n"
-#| "lpd://ip-address/queue<br>\n"
-#| "<b>CUPS Server</b><br>\n"
-#| "Usually you should not set up a local print queue to access\n"
-#| "a remote queue on a CUPS server. Instead do the setup\n"
-#| "in the <b>Print Via Network</b> dialog.\n"
-#| "Only if you really know that you must set up a local print queue\n"
-#| "to access a remote queue on a CUPS server proceed here.<br>\n"
-#| "IPP is the native protocol for CUPS which runs on a server.\n"
-#| "The official IANA port for IPP is 631.\n"
-#| "The matching device URI is:<br>\n"
-#| "ipp://ip-address:631/printers/queue<br>\n"
-#| "<b>Novell Netware Print Server (IPX)</b><br>\n"
-#| "To access print queues on a Novell Netware print server,\n"
-#| "the RPM package ncpfs must be installed.\n"
-#| "The package provides the CUPS backend 'novell' which runs\n"
-#| "the <tt>nprint</tt> program which actually sends the data\n"
-#| "to a Novell Netware print queue.\n"
-#| "A server name and a printer queue name is needed to access it.\n"
-#| "Furthermore a user name and a password may be required to get access.\n"
-#| "The matching device URI is:<br>\n"
-#| "novell://username:password@server/queue<br>\n"
-#| "For <b>more information</b> have a look at <tt>man nprint</tt> and\n"
-#| "the other documentation in the RPM package ncpfs.\n"
-#| "</p>"
 msgid ""
 "<p>\n"
 "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
@@ -2619,8 +2425,7 @@
 "Ask your network administrator what which print server machine\n"
 "provides in your particular network:<br>\n"
 "<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
-"To access a SMB printer share, the RPM package samba-client must be"
-" installed.\n"
+"To access a SMB printer share, the RPM package samba-client must be installed.\n"
 "The package provides the CUPS backend 'smb' which is a link to\n"
 "the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
 "to a SMB printer share.<br>\n"
@@ -2663,8 +2468,7 @@
 "the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
 "smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
 "For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
-"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share\n"
+"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
 "'Windows' and 'Active Directory' are registered trademarks\n"
 "of Microsoft Corporation in the United States and/or other countries.<br>\n"
 "<b>Traditional UNIX Server (LPR)</b><br>\n"
@@ -2691,28 +2495,21 @@
 "询问您的网络管理员以获知您的网络中哪台计算机是打印服务器，是哪种打印服务器：<br>\n"
 "<b>Windows (R) 或 Samba (SMB/CIFS)</b><br>\n"
 "要访问 SMB 打印机共享，必须安装 RPM 软件包 samba-client。\n"
-"该软件包提供了 CUPS 后端 'smb'，它是对 <tt>/usr/bin/smbspool</tt> 程序的一个链接，由其实际发送数据到 SMB"
-" 打印机共享。<br>\n"
+"该软件包提供了 CUPS 后端 'smb'，它是对 <tt>/usr/bin/smbspool</tt> 程序的一个链接，由其实际发送数据到 SMB 打印机共享。<br>\n"
 "需要服务器名称和打印机共享名称以及可选的工作组名称来访问它。\n"
 "此外，还可能需要用户名和密码来获取访问权限。\n"
 "请记住这些值中的空格和特殊字符必须以百分比编码 (见上)。<br>\n"
-"默认 CUPS 以用户 'lp' 运行后端 (这里是 smbspool)。当在活动目录 (R) 环境 (AD) 中打印时，用户 'lp'"
-" 不允许在该环境打印，因此传统的以 'lp' 用户身份通过 smbspool 打印的方法行不通。<br>\n"
-"要在活动目录环境中打印，必须安装 RPM 软件包 samba-krb-printing。这时 CUPS 后端 'smb' 的链接变成了 /usr/bin/get_printing_ticket</tt>，它是一个以提交打印任务的原始用户身份执行 smbspool 的封装。\n"
+"默认 CUPS 以用户 'lp' 运行后端 (这里是 smbspool)。当在活动目录 (R) 环境 (AD) 中打印时，用户 'lp' 不允许在该环境打印，因此传统的以 'lp' 用户身份通过 smbspool 打印的方法行不通。<br>\n"
+"要在活动目录环境中打印，必须安装 RPM 软件包 samba-krb-printing。这时 CUPS 后端 'smb' 的链接变成了 <tt>/usr/bin/get_printing_ticket</tt>，它是一个以提交打印任务的原始用户身份执行 smbspool 的封装。\n"
 "当活动目录环境 (AD) 使用了 Kerberos 协议认证时，用户在登陆 GNOME 或 KDE 桌面时会通过显示管理器得到一个豁免券 (TGT)。\n"
-"当 smbspool 由提交打印任务的原始用户运行时，即使在使用 Kerberos 认证的活动目录 (AD)"
-" 环境下，它依然可以访问该用户的豁免券，使用它来向 SMB 打印机共享传输打印数据。这时不需要指定固定用户名或固定密码进行认证。\n"
-"这样做的前提是 get_printing_ticket 要运行在提交打印任务的用户登录的那台主机上。这意味着它必须在用户提交打印任务的工作站上设置，且用户的"
-"这台工作站必须直接发送打印数据给活动目录 (AD) 环境中的 SMB 打印机共享。尤其是它不能运行在提交打印任务的用户没有登录的独立 CUPS"
-" 服务器机上。<br>\n"
+"当 smbspool 由提交打印任务的原始用户运行时，即使在使用 Kerberos 认证的活动目录 (AD) 环境下，它依然可以访问该用户的豁免券，使用它来向 SMB 打印机共享传输打印数据。这时不需要指定固定用户名或固定密码进行认证。\n"
+"这样做的前提是 get_printing_ticket 要运行在提交打印任务的用户登录的那台主机上。这意味着它必须在用户提交打印任务的工作站上设置，且用户的这台工作站必须直接发送打印数据给活动目录 (AD) 环境中的 SMB 打印机共享。尤其是它不能运行在提交打印任务的用户没有登录的独立 CUPS 服务器机上。<br>\n"
 "传统方式下，一个匹配的完整设备 URI 是：<br>\n"
 "smb://用户名:密码@工作组/服务器/打印机<br>\n"
 "例如用户名 'John Doe'、密码 '@home!' 可能会使用像下面的设备 URI 来访问 'Fun Printer 1000+' 共享：<br>\n"
 "smb://Jhon%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
 "<b>更多信息</b>请参考 <tt>man smbspool</tt> 和 <br>\n"
-"http://zh.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share\n"
+"http://zh.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
 "'Windows' 和 '活动目录' 是微软公司在美国和/或其它国家的注册商标。<br>\n"
 "<b>传统 UNIX 服务器 (LPR)</b><br>\n"
 "运行在传统 UNIX 服务器上的行式打印机守护精灵 (LPD) 可以提供一个或多个 LDP 队列。\n"
@@ -2728,44 +2525,6 @@
 
 #. ConnectionWizardDialog help 7/7:
 #: src/include/printer/helps.rb:714
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>Special Device URIs</big></b><br>\n"
-#| "<b>Specify an Arbitrary Device URI</b>\n"
-#| "if you know the exact right device URI for your particular case\n"
-#| "or to modify an existing device URI in a special way.<br>\n"
-#| "<b>Send Print Data to Other Program (pipe)</b><br>\n"
-#| "To do this, the RPM package cups-backends must be installed.\n"
-#| "The package provides the CUPS backend 'pipe' which runs\n"
-#| "the program that you specified here.\n"
-#| "The matching device URI is:<br>\n"
-#| "pipe:/path/to/targetcommand<br>\n"
-#| "<b>Daisy-chain Backend Error Handler (beh)</b><br>\n"
-#| "To do this, the RPM package foomatic-filters must be installed.\n"
-#| "The package provides the CUPS backend 'beh'.<br>\n"
-#| "The backend 'beh' is a wrapper for the usual backend,\n"
-#| "which is then called by beh.\n"
-#| "This way beh can, depending on its configuration,\n"
-#| "repeat the call of the backend or simply hide the error status\n"
-#| "of the backend from being seen by the CUPS daemon.\n"
-#| "The matching device URI is:<br>\n"
-#| "beh:/nodisable/attempts/delay/originalDeviceURI<br>\n"
-#| "If nodisable is '1' beh always exits successfully\n"
-#| "so that the queue gets never disabled but on the other hand\n"
-#| "print jobs are lost if there is an error.<br>\n"
-#| "Attempts is the number of attempts to recall the backend\n"
-#| "in case of an error. '0' means infinite retries.<br>\n"
-#| "Delay is the number of seconds between two attempts\n"
-#| "to call the backend.<br>\n"
-#| "The last parameter is the original URI, which the queue had before.<br>\n"
-#| "Example:<br>\n"
-#| "beh:/1/3/5/socket://ip-address:port-number<br>\n"
-#| "The beh backend tries to access a network printer 3 times with 5 second delay\n"
-#| "between the attempts. If access still fails, the queue is not disabled\n"
-#| "and the print job is lost.<br>\n"
-#| "For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
-#| "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler\n"
-#| "</p>"
 msgid ""
 "<p>\n"
 "<b><big>Special Device URIs</big></b><br>\n"
@@ -2798,12 +2557,10 @@
 "The last parameter is the original URI, which the queue had before.<br>\n"
 "Example:<br>\n"
 "beh:/1/3/5/socket://ip-address:port-number<br>\n"
-"The beh backend tries to access a network printer 3 times with 5 second"
-" delay\n"
+"The beh backend tries to access a network printer 3 times with 5 second delay\n"
 "between the attempts. If access still fails, the queue is not disabled\n"
 "and the print job is lost.<br>\n"
-"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh<"
-"/tt> and<br>\n"
+"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
 "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler\n"
 "</p>"
 msgstr ""
@@ -2819,8 +2576,7 @@
 "<b>菊链后端错误处理器 (beh)</b><br>\n"
 "必须安装 RPM 软件包 foomatic-filters。\n"
 "该软件包提供了 CUPS 后端 'beh'。<br>\n"
-"后端 'beh' 是常用后端的一个封装，使用 beh 调用常用后端。通过这种方法，根据 beh 的配置，它可以重复调用后端，或对 CUPS"
-" 守护精灵简单隐藏后端的错误状态。\n"
+"后端 'beh' 是常用后端的一个封装，使用 beh 调用常用后端。通过这种方法，根据 beh 的配置，它可以重复调用后端，或对 CUPS 守护精灵简单隐藏后端的错误状态。\n"
 "匹配的设备 URI 为:<br>\n"
 "beh://nodisable/尝试次数/延迟/原始设备 URI<br>\n"
 "如果 nodisable 是 '1' 的话，beh 总能成功退出因此队列从不禁用，但另一方面说如果出错的话整个队列剩余的打印任务都会丢失。<br>\n"
@@ -2876,8 +2632,7 @@
 "<b><big>网络打印</big></b><br>\n"
 "通常使用 CUPS (通用 UNIX 打印系统) 来通过网络打印。<br>\n"
 "默认 CUPS 使用它的所谓 '浏览' 模式来向网络发布打印机。<br>\n"
-"在这种情况下远程 CUPS 服务器必须通过网路发布它的打印机，您的主机必须运行 CUPS 守护精灵进程 (cupsd) 以监听发布的打印机的进站信息。<"
-"br>\n"
+"在这种情况下远程 CUPS 服务器必须通过网路发布它的打印机，您的主机必须运行 CUPS 守护精灵进程 (cupsd) 以监听发布的打印机的进站信息。<br>\n"
 "CUPS 浏览信息是通过 UDP 端口 631 来接收的。<br>\n"
 "防火墙相关：<br>\n"
 "检查防火墙是否监控着打印机发布的网络区域。\n"
@@ -2919,8 +2674,7 @@
 msgid ""
 "<p>\n"
 "If you print only via network and if you use only one single CUPS server,\n"
-"there is no need to use CUPS Browsing and have a CUPS daemon running on your"
-" host.\n"
+"there is no need to use CUPS Browsing and have a CUPS daemon running on your host.\n"
 "Instead it is simpler to specify the CUPS server and access it directly.<br>\n"
 "A possible drawback is that application programs may be delayed\n"
 "for some time (until a timeout happens) when they try\n"
@@ -2933,9 +2687,7 @@
 "<p>\n"
 "如果您只通过网络打印且您只使用一个 CUPS 服务器，没有必须使用 CUPS 浏览模式和在您的主机上运行一个 CUPS 守护精灵。\n"
 "指定 CUPS 服务器并直接访问它会更简单。<br>\n"
-"一个或有缺陷就是应用程序在访问 CUPS 服务器但服务器不可用时 (比如笔记本带出了公司)，它可能会延迟直到超时"
-" (卡死的文雅说法啦)。通常延迟是由主机名称解析 (DNS) 超时造成的，因此在 /etc/hosts 文件中指定一个硬编码的 CUPS"
-" 服务器条目可能会有帮助。\n"
+"一个或有缺陷就是应用程序在访问 CUPS 服务器但服务器不可用时 (比如笔记本带出了公司)，它可能会延迟直到超时 (卡死的文雅说法啦)。通常延迟是由主机名称解析 (DNS) 超时造成的，因此在 /etc/hosts 文件中指定一个硬编码的 CUPS 服务器条目可能会有帮助。\n"
 "</p>"
 
 #. PrintingViaNetworkDialog help 4/4:
@@ -2953,8 +2705,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"如果您的网络中没有 CUPS 服务器，或者您可以直接访问网络打印机，或您使用另外种类的打印服务器，例如通过 Windows (R) 或 Samba"
-" 服务器或传统 UNIX 服务器打印，您需要在您的主机上设置一个合适的打印队列。<br>\n"
+"如果您的网络中没有 CUPS 服务器，或者您可以直接访问网络打印机，或您使用另外种类的打印服务器，例如通过 Windows (R) 或 Samba 服务器或传统 UNIX 服务器打印，您需要在您的主机上设置一个合适的打印队列。<br>\n"
 "'Windows' 是美国和/或其他国家的微软的注册商标 (屁咧)。\n"
 "</p>"
 
@@ -2966,8 +2717,7 @@
 "Usually CUPS (Common Unix Printing System) should be set up to use\n"
 "its so called 'Browsing' mode to make printers available via network.<br>\n"
 "In this case CUPS servers publish their local print queues via network\n"
-"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must"
-" run\n"
+"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must run\n"
 "which is listening for incoming information about published printers.<br>\n"
 "CUPS Browsing information is received via UDP port 631.\n"
 "</p>"
@@ -2975,8 +2725,7 @@
 "<p>\n"
 "<b><big>通过网络分享和发布打印队列</big></b><br>\n"
 "通常 CUPS (通用 UNIX 打印系统) 应该设置使用它所谓的 '浏览' 模式来向网络发布打印机。<br>\n"
-"在这种情况下 CUPS 服务器通过网络发布它的本地打印队列，CUPS 客户端系统必须运行 CUPS 守护精灵进程 (cupsd)"
-" 来监听发布的打印机的进站信息。<br>\n"
+"在这种情况下 CUPS 服务器通过网络发布它的本地打印队列，CUPS 客户端系统必须运行 CUPS 守护精灵进程 (cupsd) 来监听发布的打印机的进站信息。<br>\n"
 "CUPS 浏览信息是通过 UDP 端口 631 接收的。\n"
 "</p>"
 
@@ -2990,8 +2739,7 @@
 "to allow remote access for all hosts in the local network\n"
 "and to publish printers to all those hosts.<br>\n"
 "It is not required to publish printers in any case.<br>\n"
-"If you have only one single CUPS server, there is no need to use CUPS"
-" Browsing.\n"
+"If you have only one single CUPS server, there is no need to use CUPS Browsing.\n"
 "Instead it is simpler to specify the CUPS server on the client systems\n"
 "(via 'Printing Via Network') so that the clients access the server directly.\n"
 "</p>"
@@ -3027,8 +2775,7 @@
 "<p>\n"
 "如何指派哪些远程主机可以访问 CUPS 服务器有多种方法，这些方法可以共存。<br>\n"
 "允许本地网络内的计算机的远程访问将允许所有本地网络内的主机访问。\n"
-"当一个远程主机拥有属于 CUPS 服务器所在网络的 IP 地址时，或主机的网络连接接入了 CUPS 服务器上的非 PPP 接口 (没有设置"
-" IFF_POINTTOPOINT 标记的接口)，它就属于本地网络。<br>\n"
+"当一个远程主机拥有属于 CUPS 服务器所在网络的 IP 地址时，或主机的网络连接接入了 CUPS 服务器上的非 PPP 接口 (没有设置 IFF_POINTTOPOINT 标记的接口)，它就属于本地网络。<br>\n"
 "另外可以指定一个允许远程访问的网络接口白名单。<br>\n"
 "另外也可以指定一个 IP 地址或网络地址的白名单。\n"
 "</p>"
@@ -3099,28 +2846,6 @@
 
 #. Policies help 2/2:
 #: src/include/printer/helps.rb:924
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>CUPS Error Policy</big></b><br>\n"
-#| "The error policy defines the default policy that is used when\n"
-#| "CUPS fails to send a print job to the printer device.<br>\n"
-#| "Depending on the particular way how the printer is connected\n"
-#| "(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n"
-#| "and depending on the actual kind of failure,\n"
-#| "the CUPS backend which actually sends the data to the printer\n"
-#| "can overwrite the default error policy\n"
-#| "and enforce another error policy (see <tt>man backend</tt>).\n"
-#| "For example it can stop any further printing attempt\n"
-#| "even when the default error policy is to retry the job.\n"
-#| "This could happen when any attempt to establish\n"
-#| "the communication with the printer is useless\n"
-#| "so that it does no make sense to retry the job.\n"
-#| "<br>\n"
-#| "The following error policies exist:<br>\n"
-#| "Stop the printer and keep the job for future printing.<br>\n"
-#| "Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
-#| "Abort and delete the job and proceed with the next job.\n"
-#| "</p>"
 msgid ""
 "<p>\n"
 "<b><big>CUPS Error Policy</big></b><br>\n"
@@ -3140,16 +2865,14 @@
 "<br>\n"
 "The following error policies exist:<br>\n"
 "Stop the printer and keep the job for future printing.<br>\n"
-"Re-send the job from the beginning after waiting some time (30 seconds by"
-" default).<br>\n"
+"Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
 "Abort and delete the job and proceed with the next job.\n"
 "</p>"
 msgstr ""
 "<p>\n"
 "<b><big>CUPS 错误策略</big></b><br>\n"
 "错误策略定义了当 CUPS 未能发送打印任务给打印机设备时所用的默认策略。<br>\n"
-"根据打印机的连接方式 (例如 'usb', 'socket', 'lpd', 或 'ipp')，和错误类型，实际发送数据到打印机的 CUPS"
-" 后端可以覆写默认错误策略并强制执行另一个错误策略 (参考 <tt>man backend</tt>)。\n"
+"根据打印机的连接方式 (例如 'usb', 'socket', 'lpd', 或 'ipp')，和错误类型，实际发送数据到打印机的 CUPS 后端可以覆写默认错误策略并强制执行另一个错误策略 (参考 <tt>man backend</tt>)。\n"
 "例如它可以停止任何进一步打印尝试即使默认错误策略是重试任务。这可能发生在当任何与打印机建立通信的尝试都是无用的，因此没必要重试任务时。<br>\n"
 "存在以下错误策略：<br>\n"
 "停止打印机并保留任务以供未来打印。<br>\n"
@@ -3208,10 +2931,7 @@
 "RPM 软件包 'udev-configure-printer' 为插入的 USB 打印机提供自动配置。<br>\n"
 "当它的复选框初始未选中时，它没有安装。当您选中它时，它将被安装。<br>\n"
 "当它的复选框初始选中时，它已经安装。当您取消选中时，它将被卸载。<br>\n"
-"当已安装了 udev-configure-printer 时，自动 USB 打印机配置通过 udev 配置文件"
-" /lib/udev/rules.d/70-printers.rules 的条目执行，该条目在有 USB 打印机插入时会触发运行"
-" 'udev-configure-printer add'，有 USB 打印机拔出时会触发运行 'udev-configure-printer"
-" remove'。该文件没有可调整的设置，除非用户手动编辑 70-printers.rules 文件。\n"
+"当已安装了 udev-configure-printer 时，自动 USB 打印机配置通过 udev 配置文件 /lib/udev/rules.d/70-printers.rules 的条目执行，该条目在有 USB 打印机插入时会触发运行 'udev-configure-printer add'，有 USB 打印机拔出时会触发运行 'udev-configure-printer remove'。该文件没有可调整的设置，除非用户手动编辑 70-printers.rules 文件。\n"
 "</p>"
 
 #. encoding: utf-8
@@ -3239,56 +2959,56 @@
 #. Authors:     Johannes Meixner 
 #.
 #. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
 msgid "Show"
 msgstr "显示"
 
 #. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
 msgid "&Local"
 msgstr "本地(&L)"
 
 #. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
 msgid "&Remote"
 msgstr "远程(&R)"
 
 #. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
 msgid "Configuration"
 msgstr "配置"
 
 #. Header of a Table column with a list of print queues.
 #. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
 msgid "Name"
 msgstr "名称"
 
 #. Header of a Table column with a list of print queues.
 #. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
 msgid "Location"
 msgstr "位置"
 
 #. Header of a Table column with a list of print queues.
 #. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
 msgid "Default"
 msgstr "默认值"
 
 #. Header of a Table column with a list of print queues.
 #. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
 msgid "Status"
 msgstr "状态"
 
 #. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
 msgid "Re&fresh List"
 msgstr "刷新列表(&F)"
 
 #. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
 msgid "Print &Test Page"
 msgstr "打印测试页(&T)"
 
@@ -3298,10 +3018,9 @@
 #. to check whether or not a local cupsd is accessible.
 #. The command is shown here to the user (even if it is a bit technical)
 #. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
 msgid ""
-"A locally running CUPS daemon is required, but it seems to be not"
-" accessible.\n"
+"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
 "Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
 "A non-accessible cupsd leads to an endless sequence of further failures.\n"
 msgstr ""
@@ -3315,7 +3034,7 @@
 #. By default the cupsd uses the official IPP port (631).
 #. If not, the user must have intentionally and manually changed
 #. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
 msgid ""
 "The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
 "Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -3329,14 +3048,13 @@
 msgstr ""
 "CUPS 守护精灵似乎没有监听官方 IANA IPP 端口 (631)。\n"
 "使用 'netstat -nap | grep cupsd' 来检查 cupsd 是否在监听该端口。\n"
-"当 /etc/cups/cupsd.conf 中有 'Listen ....1234' 或者 'Port 1234' 设置 (1234 意味着除了官方端口"
-" 631 以外的任何端口号) 时 (也检查下有没有 'BrowsePort 1234') 才会发生。\n"
+"当 /etc/cups/cupsd.conf 中有 'Listen ....1234' 或者 'Port 1234' 设置 (1234 意味着除了官方端口 631 以外的任何端口号) 时 (也检查下有没有 'BrowsePort 1234') 才会发生。\n"
 "YaST 打印机模块不支持非官方端口，使用非官方端口会导致未来无尽的错误。\n"
 "如果你真的必须使用非官方端口的话，您就不能使用 YaST 打印机模块来配置您的打印机。\n"
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
 msgid ""
 "Running several tests regarding CUPS server accessibility...\n"
 "(this might take some time)"
@@ -3345,71 +3063,67 @@
 "(这可能花费一些时间)"
 
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
 msgid "Do no longer use the inaccessible CUPS server '%1'?"
 msgstr "不再使用无法访问的 CUPS 服务器 '%1'？"
 
 #. Popup::YesNoHeadline body recommendation how to answer the headline question
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
 msgid "To proceed, you should agree that '%1' will be no longer used."
 msgstr "您应该同意不再使用 '%1' 才能继续进行。"
 
 #. The 'ServerName' entry in /etc/cups/client.conf was removed
 #. so that it is now no longer a real client-only config and
 #. therefore the Printerlib::client_* values must be determined anew:
-#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
-msgid ""
-"A non-accessible server leads to an endless sequence of delays and failures."
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
+msgid "A non-accessible server leads to an endless sequence of delays and failures."
 msgstr "无法访问的服务器会导致将来无尽的错误。"
 
 #. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:253
+#: src/include/printer/overview.rb:256
 msgid "CUPS Server %1"
 msgstr "CUPS 服务器 %1"
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
 msgid "Testing if CUPS server is accessible..."
 msgstr "正在检测打印服务器是否可访问..."
 
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
-#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
 msgid "Select an entry."
 msgstr "请选择一项。"
 
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
 msgid "Cannot Delete"
 msgstr "无法删除"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
-msgid ""
-"This is a remote configuration. Only local configurations can be deleted."
+#: src/include/printer/overview.rb:610
+msgid "This is a remote configuration. Only local configurations can be deleted."
 msgstr "这是远程配置。仅本地配置可以被删除。"
 
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
 #. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
-msgid ""
-"The selected configuration would be deleted immediately and cannot be"
-" restored."
+#: src/include/printer/overview.rb:619
+msgid "The selected configuration would be deleted immediately and cannot be restored."
 msgstr "选定配置会被立即删除且无法恢复。"
 
 #. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:620
+#: src/include/printer/overview.rb:623
 msgid "Delete configuration %1"
 msgstr "删除配置 %1"
 
 #. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
 msgid "Do not delete it"
 msgstr "不删除"
 
@@ -3420,33 +3134,33 @@
 #. Nevertheless it is possible to delete a class with the YaST printer module
 #. so that the user can get rid of a class which may have been created by accident
 #. with whatever other setup tool:
-#: src/include/printer/overview.rb:637
+#: src/include/printer/overview.rb:640
 msgid "Confirm Deletion of a Class"
 msgstr "确认删除一个类"
 
 #. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
 msgid "A deleted class cannot be re-created with this tool."
 msgstr "此工具不能重新创建一个已被删除的类。"
 
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
 msgid "Rejecting Print Jobs"
 msgstr "拒绝打印任务"
 
 #. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
 msgid "The testpage cannot be printed because print jobs are rejected."
 msgstr "无法打印测试页，打印机任务被拒绝。"
 
 #. Do a refresh of the overview content to be on the safe side.
 #. Perhaps the actual current queue state is no longer "rejecting".
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:697
+#: src/include/printer/overview.rb:700
 msgid "Printout Disabled"
 msgstr "打印输出已禁用"
 
 #. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
 msgid "The testpage cannot be printed because printout is disabled."
 msgstr "无法打印测试页，因为打印输出被禁用。"
 
@@ -3455,27 +3169,25 @@
 #. the test above makes sure that the queue has printing enabled.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:728
-msgid ""
-"There are pending print jobs which might be deleted before the testpage is"
-" printed."
+#: src/include/printer/overview.rb:731
+msgid "There are pending print jobs which might be deleted before the testpage is printed."
 msgstr "有可能在打印测试页前被删除的等待中的任务。"
 
 #. where %1 will be replaced by the queue name.
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
 msgid "Delete Pending Print Jobs For %1"
 msgstr "为 %1 删除等待中的打印任务"
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
 msgid "Delete them before printing testpage"
 msgstr "在打印测试页前删除它们"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:759
+#: src/include/printer/overview.rb:762
 msgid "Print testpage after the other jobs"
 msgstr "在其它任务完成后打印测试页"
 
@@ -3483,7 +3195,7 @@
 #. Only a simple message because this error does not happen on a normal system.
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
 msgid "Failed to delete all pending jobs for %1."
 msgstr "删除 %1 所有等待中的任务失败。"
 
@@ -3502,28 +3214,28 @@
 #. +  (Printed with CUPS) show
 #. make it obvious that it is not a YaST testpage but a CUPS testpage
 #. and it is now independent of the CUPS version.
-#: src/include/printer/overview.rb:799
+#: src/include/printer/overview.rb:802
 msgid "Test printout"
 msgstr "测试打印"
 
 #. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
 msgid "Print one or two pages e.g. to test duplex printing"
 msgstr "打印一到两页来测试全双工打印"
 
 #. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:803
+#: src/include/printer/overview.rb:806
 msgid "Single test page"
 msgstr "单一测试页"
 
 #. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
 msgid "Two test pages"
 msgstr "两张测试页"
 
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:835
+#: src/include/printer/overview.rb:838
 msgid "Failed to print testpage for %1."
 msgstr "为 %1 打印测试页失败。"
 
@@ -3531,25 +3243,25 @@
 #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
 #. so that a refresh of the overview content is needed to be on the safe side.
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:852
+#: src/include/printer/overview.rb:855
 msgid "Wait Until Testpage Printing Finished"
 msgstr "等待打印测试页完成"
 
 #. Popup::AnyQuestion message regarding testpage printout result
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:856
+#: src/include/printer/overview.rb:859
 msgid "Sent testpage to %1. Printing should start soon."
 msgstr "发送测试页到 %1。应该很快开始打印。"
 
 #. Popup::AnyQuestion 'Yes' button label
 #. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
 msgid "Testpage printout was successful"
 msgstr "测试页打印成功"
 
 #. Popup::AnyQuestion 'No' button label
 #. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
 msgid "Testpage printing failed"
 msgstr "测试打印失败"
 
@@ -3569,58 +3281,54 @@
 #. spit out zillions of sheets with nonsense characters.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:897
+#: src/include/printer/overview.rb:900
 msgid "There are pending print jobs which might be deleted now."
 msgstr "有可能立即被删除的等待中的打印任务。"
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:925
+#: src/include/printer/overview.rb:928
 msgid "Delete all pending jobs"
 msgstr "删除所有等待中的任务"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:928
+#: src/include/printer/overview.rb:931
 msgid "Do not delete them"
 msgstr "不删除"
 
 #. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
 msgid "For the full log, see the /var/log/cups/error_log file."
 msgstr "完整日志请见 /var/log/cups/error_log 文件。"
 
-#: src/include/printer/overview.rb:1048
-msgid ""
-"CUPS log information while processing the testpage for %1 (English only)"
+#: src/include/printer/overview.rb:1051
+msgid "CUPS log information while processing the testpage for %1 (English only)"
 msgstr "处理 %1 的测试页的 CUPS 日志信息 (仅英文)"
 
 #. but the test_print_cups_error_log was effectively empty,
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1065
+#: src/include/printer/overview.rb:1068
 msgid "For CUPS log information, see the /var/log/cups/error_log file."
 msgstr "CUPS 日志信息见 /var/log/cups/error_log 文件。"
 
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
-msgid ""
-"When printing via a remote system fails, you may ask an admin of the remote"
-" system."
+#: src/include/printer/overview.rb:1078
+msgid "When printing via a remote system fails, you may ask an admin of the remote system."
 msgstr "当通过远程系统打印失败时，您或许可以询问远程系统管理员。"
 
 #. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1102
+#: src/include/printer/overview.rb:1105
 msgid "A remote CUPS server setting conflicts with adding a configuration."
 msgstr "添加一项配置与远程 CUPS 服务器设定相冲突。"
 
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
 msgid "Cannot Modify"
 msgstr "无法修改"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
-msgid ""
-"This is a remote configuration. Only local configurations can be modified."
+#: src/include/printer/overview.rb:1164
+msgid "This is a remote configuration. Only local configurations can be modified."
 msgstr "这是远程配置。仅可以修改本地配置。"
 
 #. An entry for a ComboBox from which the user can select that the CUPS error policy
@@ -3676,9 +3384,7 @@
 #. PopupYesNoHeadline headline
 #. PopupYesNoHeadline body:
 #: src/include/printer/policies.rb:139
-msgid ""
-"A remote CUPS server setting conflicts with setting policies for the local"
-" system."
+msgid "A remote CUPS server setting conflicts with setting policies for the local system."
 msgstr "一个远程 CUPS 服务器设定与本地系统的设定策略冲突。"
 
 #. where %1 will be replaced by the print queue name.
@@ -3916,8 +3622,7 @@
 #. they are at least informend why there may be still remote queues:
 #: src/include/printer/printingvianetwork.rb:727
 msgid ""
-"When switching from 'accept printer announcements' to 'not accept"
-" announcements'\n"
+"When switching from 'accept printer announcements' to 'not accept announcements'\n"
 "or after 'request printer information from CUPS servers' was disabled\n"
 "it takes usually 5 minutes until already received information faded away..."
 msgstr ""
@@ -3999,16 +3704,13 @@
 #. TextEntry to allow remote access to local print queues
 #. for hosts and/or networks:
 #: src/include/printer/sharing.rb:180
-msgid ""
-"Allow access from those IP addresses or &network/netmask (separated by space)"
+msgid "Allow access from those IP addresses or &network/netmask (separated by space)"
 msgstr "允许来自这些 IP 地址或网络/网络掩码的访问（用空格分开）(&N)"
 
 #. TextEntry to publish local print queues
 #. to IP addresses and/or network broadcast addresses:
 #: src/include/printer/sharing.rb:192
-msgid ""
-"Publish to these IP addresses or network &broadcast addresses (separated by"
-" space)"
+msgid "Publish to these IP addresses or network &broadcast addresses (separated by space)"
 msgstr "向这些 IP 地址或网络广播地址发布打印机（用空格分开）(&B)"
 
 #. A CheckBox label to publish local print queues by default
@@ -4064,9 +3766,7 @@
 #. PopupYesNoHeadline headline
 #. PopupYesNoHeadline body:
 #: src/include/printer/sharing.rb:643
-msgid ""
-"A remote CUPS server setting conflicts with sharing local printer"
-" configurations."
+msgid "A remote CUPS server setting conflicts with sharing local printer configurations."
 msgstr "一个远程 CUPS 服务器设定与本地打印机共享配置冲突。"
 
 #. Only "Printing via Network" configuration of printer.
@@ -4404,8 +4104,7 @@
 #: src/modules/Printer.rb:2389
 msgid ""
 "Launched hp-setup.\n"
-"You must finish hp-setup before you can proceed with the printer"
-" configuration.\n"
+"You must finish hp-setup before you can proceed with the printer configuration.\n"
 msgstr ""
 "hp-setup 已启动。\n"
 "在继续配置打印机前，您必须完成 hp-setup。\n"
@@ -4425,15 +4124,12 @@
 #. Is the package available to be installed?
 #. Package::Available returns nil if no package source is available.
 #: src/modules/Printerlib.rb:179
-msgid ""
-"Required package %1 is not installed and there is no package repository"
-" available."
+msgid "Required package %1 is not installed and there is no package repository available."
 msgstr "未安装必需的包 %1 且没有可用的软件源。"
 
 #. Message of a Popup::Error where %1 will be replaced by the package name:
 #: src/modules/Printerlib.rb:194
-msgid ""
-"Required package %1 is not installed and not available in the repository."
+msgid "Required package %1 is not installed and not available in the repository."
 msgstr "未安装必需的软件包 %1 且软件源中没有该软件包。"
 
 #. Only a simple message because:

Modified: trunk/yast/zh_CN/po/rdp.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/rdp.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/rdp.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2013-02-04 15:54+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -102,52 +102,52 @@
 msgstr "防火墙设置"
 
 #. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
 msgid "Write firewall settings"
 msgstr "写入防火墙设置"
 
 #. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
 msgid "Configure xrdp"
 msgstr "配置 xrdp"
 
 #. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
 msgid "Restart the services"
 msgstr "重启服务"
 
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
 msgid "Stop the services"
 msgstr "停止服务"
 
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
 msgid "Saving Remote Administration Configuration"
 msgstr "正在保存远程管理配置"
 
 #. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
 msgid "Writing firewall settings..."
 msgstr "正在写入防火墙设置..."
 
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
 msgid "Configuring xrdp..."
 msgstr "正在配置 xrdp..."
 
 #. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
 msgid "Restarting the service..."
 msgstr "正在重启服务..."
 
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
 msgid "Stopping the service..."
 msgstr "正在停止服务..."
 
 #. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
 msgid "Remote administration is enabled."
 msgstr "已启用远程管理。"
 
 #. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
 msgid "Remote administration is disabled."
 msgstr "已禁用远程管理。"

Modified: trunk/yast/zh_CN/po/rear.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/rear.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/rear.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2013-09-18 14:55+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -232,13 +232,13 @@
 msgstr "正在读取 Rear 配置"
 
 #: src/include/rear/ui.rb:698
+msgid "Reading rear settings"
+msgstr "正在读取 rear 设置"
+
+#: src/include/rear/ui.rb:698
 msgid "Analyzing system"
 msgstr "正在分析系统"
 
-#: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
-msgstr "正在读取 rear 设置"
-
 #: src/include/rear/ui.rb:699
 msgid "Analyzing system..."
 msgstr "正在分析系统..."

Modified: trunk/yast/zh_CN/po/registration.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/registration.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/registration.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
 "PO-Revision-Date: 2016-06-05 16:56+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -22,29 +22,6 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-msgid "Local Registration Servers"
-msgstr "本地注册服务器"
-
-#: src/clients/discover_registration_services.rb:44
-msgid ""
-"Select a detected registration server from the list\n"
-"or the default SUSE registration server."
-msgstr ""
-"请从列表中选择一个检测到的注册服务器\n"
-"或使用默认的 SUSE 注册服务器。"
-
-#. error popup
-#: src/clients/discover_registration_services.rb:68
-msgid "No registration server selected."
-msgstr "未选择注册服务器。"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-msgid "SUSE Customer Center (%s)"
-msgstr "SUSE 客服中心(&s)"
-
 #. popup message
 #. popup message
 #. popup message
@@ -63,7 +40,7 @@
 #. @return [Symbol] user input
 #: src/clients/inst_scc.rb:189
 #: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
 #: src/lib/registration/ui/migration_repos_workflow.rb:287
 #: src/lib/registration/ui/registered_system_dialog.rb:37
 #: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -99,8 +76,8 @@
 #. %s is name of given product
 #. then register the product(s)
 #. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283
-#: src/lib/registration/registration_ui.rb:316
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
 msgid "Registering %s ..."
 msgstr "正在注册 %s ..."
 
@@ -237,18 +214,25 @@
 msgid "SHA256 Fingerprint: "
 msgstr "SHA256 指纹: "
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
+#: src/lib/registration/connect_helpers.rb:80
 msgid "Connection time out."
 msgstr "连接超时。"
 
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
+msgstr ""
+
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:84
+#: src/lib/registration/connect_helpers.rb:91
 msgid "Check that this system is known to the registration server."
 msgstr "检查本系统是否已在注册服务器上注册。"
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:97
 msgid ""
 "If you are upgrading from SLE11 make sure the SCC server\n"
 "knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -259,8 +243,7 @@
 "Just wait several minutes after logging in and then retry \n"
 "the upgrade again."
 msgstr ""
-"若您正在从 SLE11 升级请确保 SCC 服务器了解您之前在旧的 NCC 服务器上的注册情"
-"况。\n"
+"若您正在从 SLE11 升级请确保 SCC 服务器了解您之前在旧的 NCC 服务器上的注册情况。\n"
 "从 NCC 同步到 SCC 可能需要花费很长时间。\n"
 "\n"
 "若该 SLE11 系统是最近才安装的，您可以登入到 %s 来加速同步过程。\n"
@@ -270,41 +253,47 @@
 #. update the message when an old SMT server is found
 #. Error popup
 #. update the message when an old SMT server is found
-#: src/lib/registration/connect_helpers.rb:104
-#: src/lib/registration/connect_helpers.rb:109
-#: src/lib/registration/connect_helpers.rb:112
+#: src/lib/registration/connect_helpers.rb:111
+#: src/lib/registration/connect_helpers.rb:116
 #: src/lib/registration/connect_helpers.rb:119
-#: src/lib/registration/connect_helpers.rb:170
-#: src/lib/registration/connect_helpers.rb:173
-msgid "Registration failed."
-msgstr "注册失败。"
+#: src/lib/registration/connect_helpers.rb:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
+#, fuzzy
+#| msgid "Contacting the Registration Server"
+msgid "Connection to registration server failed."
+msgstr "正在连接注册服务器"
 
-#: src/lib/registration/connect_helpers.rb:114
+#: src/lib/registration/connect_helpers.rb:121
 msgid "Registration client error."
 msgstr "注册客户端错误。"
 
-#: src/lib/registration/connect_helpers.rb:116
+#: src/lib/registration/connect_helpers.rb:123
+#, fuzzy
+#| msgid ""
+#| "Registration server error.\n"
+#| "Retry registration later."
 msgid ""
 "Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
 msgstr ""
 "注册服务器错误。\n"
 "请稍候重新注册。"
 
 #. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:165
 msgid "Received SSL Certificate does not match the expected certificate."
 msgstr "收到的 SSL 证书不匹配期望的证书。"
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:188
+#: src/lib/registration/connect_helpers.rb:198
 msgid "Details: %s"
 msgstr "细节：%s"
 
 #. TRANSLATORS: multiline error message - a SSL certificate has been
 #. imported but the registration server still cannot be accessed securely,
 #. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:217
+#: src/lib/registration/connect_helpers.rb:227
 msgid ""
 "A certificate has been already imported\n"
 "but the server connection still cannot be trusted.\n"
@@ -317,23 +306,23 @@
 "请手动修复该证书，确保可安全连接服务器并再次启动本 YaST 模块。"
 
 #. progress label
-#: src/lib/registration/connect_helpers.rb:229
+#: src/lib/registration/connect_helpers.rb:239
 msgid "Importing the SSL certificate"
 msgstr "导入 SSL 证书"
 
-#: src/lib/registration/connect_helpers.rb:230
+#: src/lib/registration/connect_helpers.rb:240
 msgid "Importing '%s' certificate..."
 msgstr "正在导入 '%s' 证书..."
 
 #. try to use a translatable message first, if not found then use
 #. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:251
+#: src/lib/registration/connect_helpers.rb:261
 msgid "Secure connection error: %s"
 msgstr "安全连接错误：%s"
 
 #. TRANSLATORS: error message, %s is a server URL,
 #. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:270
+#: src/lib/registration/connect_helpers.rb:280
 msgid ""
 "An old registration server was detected at\n"
 "%s.\n"
@@ -345,14 +334,14 @@
 "请确保服务器上安装了最新的支持新注册协议的产品。"
 
 #. FIXME: use a better message, this one has been reused after the text freeze
-#. error message, the entered URL is not valid
-#: src/lib/registration/connect_helpers.rb:282
-#: src/lib/registration/ui/local_server_dialog.rb:67
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
 msgid "Invalid URL."
 msgstr "无效 URL。"
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:286
+#: src/lib/registration/connect_helpers.rb:296
 msgid ""
 "Network is not configured, the registration server cannot be reached.\n"
 "Do you want to configure the network now?"
@@ -360,7 +349,7 @@
 "未配置网络，无法访问注册服务器。\n"
 "您想要现在配置网络吗？"
 
-#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/connect_helpers.rb:303
 msgid "Network error, check the network configuration."
 msgstr "网络错误，请检查网络配置。"
 
@@ -370,14 +359,14 @@
 msgstr "正在存储注册配置..."
 
 #. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
 msgid ""
 "The base product was not found,\n"
 "check your system."
 msgstr "未找到基础产品，请检查您的系统。"
 
 #. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
 msgid ""
 "The installation medium or the installer itself is seriously broken.\n"
 "Report a bug at %s."
@@ -385,18 +374,16 @@
 "安装介质或安装器自身严重损坏。\n"
 "请于 %s 汇报故障。"
 
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
 msgid ""
 "Make sure a product is installed and /etc/products.d/baseproduct\n"
 "is a symlink pointing to the base product .prod file."
-msgstr ""
-"请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文"
-"件的符号链接。"
+msgstr "请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文件的符号链接。"
 
 #. FIXME: reused an existing message due to text freeze
 #. (later use a better text, it's system update actually...)
 #: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:269
+#: src/lib/registration/registration_ui.rb:272
 msgid "Registering the System..."
 msgstr "正在注册系统..."
 
@@ -405,14 +392,14 @@
 #. updating registered addon/extension, %s is an extension name
 #. TRANSLATORS: Progress label
 #: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:148
-#: src/lib/registration/registration_ui.rb:353
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
 #: src/lib/registration/ui/migration_repos_workflow.rb:304
 msgid "Updating to %s ..."
 msgstr "正在更新到 %s ..."
 
 #. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:165
+#: src/lib/registration/registration_ui.rb:166
 msgid "Synchronizing Products..."
 msgstr "正在同步产品..."
 
@@ -422,27 +409,27 @@
 #. @return [ArrayRegistration::Addon] available addons
 #. download the addons from SCC, let the user select addons to install
 #. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:179
+#: src/lib/registration/registration_ui.rb:180
 #: src/lib/registration/ui/autoyast_config_workflow.rb:106
 msgid "Loading Available Extensions and Modules..."
 msgstr "正在加载可用扩展和模块..."
 
-#: src/lib/registration/registration_ui.rb:193
+#: src/lib/registration/registration_ui.rb:195
 msgid "Loading Migration Products..."
 msgstr "正在加载迁移产品..."
 
 #. dialog title
-#: src/lib/registration/registration_ui.rb:210
+#: src/lib/registration/registration_ui.rb:213
 msgid "Register Extensions and Modules"
 msgstr "注册扩展和模块"
 
 #. help text
-#: src/lib/registration/registration_ui.rb:214
+#: src/lib/registration/registration_ui.rb:217
 msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr "<p>正在注册扩展和模块。</p>"
 
 #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:239
+#: src/lib/registration/registration_ui.rb:242
 msgid ""
 "The registration server offers update repositories.\n"
 "\n"
@@ -451,7 +438,7 @@
 "\n"
 
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:243
+#: src/lib/registration/registration_ui.rb:246
 msgid ""
 "Would you like to enable these repositories during installation\n"
 "in order to receive the latest updates?"
@@ -459,7 +446,7 @@
 
 #. Yast::Mode.update
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:247
+#: src/lib/registration/registration_ui.rb:250
 msgid ""
 "Would you like to enable these repositories during upgrade\n"
 "in order to receive the latest updates?"
@@ -473,7 +460,7 @@
 #. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
 #. when a migration repository cannot be accessed, there are [Skip]
 #. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
 msgid ""
 "Repository '%s'\n"
 "cannot be loaded.\n"
@@ -487,39 +474,39 @@
 #. create UI label for a base product
 #. @param base_product [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
 msgid "Unknown product"
 msgstr "未知产品"
 
 #. error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
 msgid "Saving repository configuration failed."
 msgstr "保存软件源配置失败。"
 
 #. # error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
 msgid "Updating service '%s' failed."
 msgstr "更新服务 '%s' 失败。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
 msgid "Adding service '%s' failed."
 msgstr "添加服务 '%s' 失败。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
 msgid "Saving service '%s' failed."
 msgstr "保存服务 '%s' 失败。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:280
+#: src/lib/registration/sw_mgmt.rb:262
 msgid "Refreshing service '%s' failed."
 msgstr "刷新服务 '%s' 失败。"
 
 #. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:487
+#: src/lib/registration/sw_mgmt.rb:474
 msgid ""
 "Cannot find remote product %s.\n"
 "The product cannot be registered."
@@ -574,13 +561,10 @@
 #: src/lib/registration/ui/addon_reg_codes_dialog.rb:50
 msgid ""
 "<p>Enter registration codes for the requested extensions or modules.</p>\n"
-"<p>Registration codes are required for successfull registration.If you "
-"cannot provide a registration code then go back and deselect the respective "
-"extension or module.</p>"
+"<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>"
 msgstr ""
 "<p>请输入所请求扩展或模块的注册码。</p>\n"
-"<p>注册码为成功注册所必需。若您无法提供注册码则请返回并反选相应扩展或模块。"
+"<p>注册码为成功注册所必需。若您无法提供注册码则请返回并反选相应扩展或模块。</p>"
 
 #. part of the UI - labels in the dialog
 #. @return [ArrayYast::Term] UI definition
@@ -596,39 +580,39 @@
 
 #. create the main dialog definition
 #. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
 msgid "Details"
 msgstr "细节"
 
 #. addon description widget
 #. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
 msgid "Select an extension or a module to show details here"
 msgstr "选择一个扩展或模块并在此显示其细节"
 
 #. checkbox label for an unavailable extension
 #. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:164
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
 msgid "%s (not available)"
 msgstr "%s (不可用)"
 
 #. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
 msgid "YaST allows to select at most %s extensions or modules."
 msgstr "YaST 允许选择最多 %s 个扩展或模块。"
 
 #. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
-msgid ""
-"<p>Please note, that some extensions or modules might need specific "
-"registration code.</p>"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
+msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
 msgstr "<p>请注意，某些扩展或模块可能需要指定的注册码。</p>"
 
 #. help text (3/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:260
-msgid ""
-"<p>If you want to remove any extension or module you need to loginto the "
-"SUSE Customer Center and remove them manually there.</p>"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
+msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>"
 msgstr "<p>若您想要移除扩展或模块，您需要登入 SUSE 客服中心并在那里手动移除它们。</p>"
 
 #. dialog title
@@ -638,12 +622,11 @@
 
 #. help text (1/3)
 #: src/lib/registration/ui/addon_selection_registration_dialog.rb:34
-msgid ""
-"<p>Here you can select available extensions and modules for yoursystem.</p>"
+msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
 msgstr "<p>在此您可为您的系统选择可用扩展和模块。</p>"
 
 #. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
 msgid "Available Extensions and Modules"
 msgstr "可用扩展和模块"
 
@@ -654,9 +637,7 @@
 
 #. help text (1/3)
 #: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
-msgid ""
-"<p>Here you can select extensions and modules which will be registered again."
-"</p>"
+msgid "<p>Here you can select extensions and modules which will be registered again.</p>"
 msgstr "<p>在此您可选择要再次注册的扩展和模块。</p>"
 
 #. @return [String] the main dialog label
@@ -666,9 +647,7 @@
 
 #. help text
 #: src/lib/registration/ui/autoyast_addon_dialog.rb:38
-msgid ""
-"<p>Here you can select which extensions or moduleswill be registered "
-"together with the base product.</p>"
+msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
 msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>"
 
 #: src/lib/registration/ui/autoyast_addon_dialog.rb:41
@@ -703,42 +682,40 @@
 msgstr "下载可用扩展..."
 
 #. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
 msgid "Really delete '%s'?"
 msgstr "真的删除 '%s' 吗？"
 
 #. dialog definition for adding/editing an addon
 #. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
 msgid "Extension or Module &Identifier"
 msgstr "扩展或模块标识符(&I)"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
 msgid "&Version"
 msgstr "版本(&V)"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
 msgid "&Architecture"
 msgstr "架构(&A)"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
 msgid "&Release Type"
 msgstr "发行类型(&R)"
 
 #. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
 #: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:140
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
 msgid "Registration &Code"
 msgstr "注册码(&C)"
 
 #: src/lib/registration/ui/autoyast_config_dialog.rb:57
 msgid ""
-"<p>Product registration includes your product in SUSE Customer Center "
-"database,\n"
+"<p>Product registration includes your product in SUSE Customer Center database,\n"
 "enabling you to get online updates and technical support.\n"
-"To register while installing automatically, select <b>Run Product "
-"Registration</b>.</p>"
+"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
 msgstr ""
 "<p>产品注册会将您的产品收纳在 SUSE 客服中心数据库中，\n"
 "使您能够获得在线更新和技术支持。\n"
@@ -746,15 +723,12 @@
 
 #: src/lib/registration/ui/autoyast_config_dialog.rb:63
 msgid ""
-"<p>If your network deploys a custom registration server, set the correct URL "
-"of the server\n"
-"and the location of the SMT certificate in <b>SMT Server Settings</b>. "
-"Refer\n"
+"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
+"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
 "to your SMT manual for further assistance.</p>"
 msgstr ""
 "<p>若您的网络部署了一个自定义注册服务器，请设置正确的服务器 URL\n"
-"以及在<b>SMT 服务器设置</b>中设置 SMT 证书的位置。进一步协助请参考您的 SMT 手"
-"册。</p>"
+"以及在<b>SMT 服务器设置</b>中设置 SMT 证书的位置。进一步协助请参考您的 SMT 手册。</p>"
 
 #. the UI defition for the global registration status
 #. @return [Yast::Term] UI term
@@ -762,10 +736,8 @@
 msgid "Register the Product"
 msgstr "注册产品"
 
-#. part of the main dialog definition - the input fields
-#. @return [Yast::Term] UI term
 #: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:138
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
 msgid "&E-mail Address"
 msgstr "电子邮件地址(&E)"
 
@@ -774,56 +746,68 @@
 msgstr "安装来自更新软件源的可用更新"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
 msgid "Server Settings"
 msgstr "服务器设置"
 
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
 msgid "Find Registration Server Using SLP Discovery"
 msgstr "使用 SLP 探索查找注册服务器"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
 msgid "Use Specific Server URL Instead of the Default"
 msgstr "使用特定服务器 URL 而非默认"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
 msgid "Optional SSL Server Certificate URL"
 msgstr "可选 SSL 服务器证书 URL"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
 msgid "Optional SSL Server Certificate Fingerprint"
 msgstr "可选 SSL 服务器证书指纹"
 
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
 msgid "none"
 msgstr "无"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
 msgid "SSL Certificate Fingerprint"
 msgstr "SSL 证书指纹"
 
 #. the UI defition for the main dialog
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
 msgid "Register Extensions or Modules..."
 msgstr "注册扩展或模块..."
 
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
-msgid "&Local Registration Server..."
-msgstr "本地注册服务器(&L)..."
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+#, fuzzy
+#| msgid "Registering the System..."
+msgid "Register System via %s"
+msgstr "正在注册系统..."
 
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#, fuzzy
+#| msgid "Registration Server"
+msgid "Register System via local SMT Server"
+msgstr "注册服务器"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+msgid "&Local Registration Server URL"
+msgstr "本地注册服务器 URL(&L)"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
 msgid "&Skip Registration"
 msgstr "跳过注册(&S)"
 
 #. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
 msgid "&Register Extensions or Modules Again"
 msgstr "再次注册扩展或模块(&R)"
 
@@ -831,28 +815,37 @@
 #. @return [Yast::Term]  UI term
 #. the main dialog content
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:118
+#: src/lib/registration/ui/base_system_registration_dialog.rb:342
 #: src/lib/registration/ui/registered_system_dialog.rb:67
 msgid "The system is already registered."
 msgstr "系统已注册。"
 
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
 #. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:149
-msgid ""
-"Enter SUSE Customer Center credentials here to register the system to get "
-"updates and extensions."
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
+msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr "在此输入 SUSE 客服中心账户信息来注册系统以获得更新和扩展。"
 
 #. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:184
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#, fuzzy
+#| msgid ""
+#| "If you do not register your system we will not be able\n"
+#| "to grant you access to the update repositories.\n"
+#| "\n"
+#| "You can register after the installation or visit our\n"
+#| "Customer Center for online registration.\n"
+#| "\n"
+#| "Really skip the registration now?"
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
 "\n"
 "You can register after the installation or visit our\n"
-"Customer Center for online registration.\n"
-"\n"
-"Really skip the registration now?"
+"Customer Center for online registration."
 msgstr ""
 "若您未注册您的系统，我们将无法保证您能够访问更新软件源。\n"
 "\n"
@@ -860,31 +853,9 @@
 "\n"
 "现在真的要跳过注册吗？"
 
-#. label text describing the registration (1/2)
-#. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/lib/registration/ui/base_system_registration_dialog.rb:201
-msgid ""
-"Please enter a registration or evaluation code for this product and your\n"
-"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
-"Access to security and general software updates is only possible on\n"
-"a registered system."
-msgstr ""
-"请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件"
-"地址。\n"
-"只有注册了产品才能够获得安全和常规软件更新。"
-
-#. label text describing the registration (2/2),
-#. not displayed in installed system
-#. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/lib/registration/ui/base_system_registration_dialog.rb:213
-msgid ""
-"If you skip product registration now, remember to register after\n"
-"installation has completed."
-msgstr "若您现在跳过了注册，请记得在安装完成后注册呀。"
-
 #. UI term for the network configuration button (or empty if not needed)
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:225
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
 msgid "Net&work Configuration..."
 msgstr "网络配置(&w)..."
 
@@ -910,49 +881,37 @@
 
 #. help text (RichText) for importing a SSL certificate (1/5)
 #: src/lib/registration/ui/import_certificate_dialog.rb:122
-msgid ""
-"<p>Secure connection (HTTPS) uses SSL certificates for verifying the "
-"authenticity of the server and for encrypting the transferred data.</p>"
+#, fuzzy
+#| msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
 msgstr "<p>安全连接 (HTTPS) 使用 SSL 证书来校验服务器的权威性和加密所传输的数据。</p>"
 
 #. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:126
-msgid ""
-"<p>You can choose to import the certificate it into the list of known "
-"certificate autohorities (CA), meaning that you trust the subject and the "
-"issuer of the unknown certificate.</p>"
-msgstr ""
-"<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中，这意味着您信任该未知证"
-"书的主体和签发人。</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+#, fuzzy
+#| msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
+msgstr "<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中，这意味着您信任该未知证书的主体和签发人。</p>"
 
 #. help text (RichText) for importing a SSL certificate (3/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:131
-msgid ""
-"<p>Importing a certificate will allow to use for example a self-signed "
-"certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+#, fuzzy
+#| msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
 msgstr "<p>导入证书将允许使用例如自签名的证书。</p>"
 
 #. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:135
-msgid ""
-"<p><b>Important:</b> You should verify the fingerprint of the certificate to "
-"be sure you import the genuine certificate from the requested server.</p>"
-msgstr ""
-"<p><b>重要：</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证"
-"书。</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+#, fuzzy
+#| msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>"
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
+msgstr "<p><b>重要：</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证书。</p>"
 
 #. help text (RichText) for importing a SSL certificate (5/5)
 #: src/lib/registration/ui/import_certificate_dialog.rb:140
-msgid ""
-"<p><b>Importing an unknown certificate without verification is a big "
-"security risk.</b></p>"
+msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
 msgstr "<p><b>未校验即导入一个未知证书是一个巨大的安全风险。</b></p>"
 
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-msgid "&Local Registration Server URL"
-msgstr "本地注册服务器 URL(&L)"
-
 #. TRANSLATORS: error message, %s are details
 #. TRANSLATORS: error message, %s are details
 #: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -976,13 +935,8 @@
 
 #. TRANSLATORS: help text
 #: src/lib/registration/ui/migration_repos_selection_dialog.rb:50
-msgid ""
-"<p>In this dialog you can manually select which repositories willbe used for "
-"online migration. The packages will be upgraded to thehighest version found "
-"in the selected repositories.</p>"
-msgstr ""
-"<p>在此对话框中您可手动选择用于在线迁移的软件源。软件包将被升级到所选源中所能"
-"找到的最高版本。</p>"
+msgid "<p>In this dialog you can manually select which repositories willbe used for online migration. The packages will be upgraded to thehighest version found in the selected repositories.</p>"
+msgstr "<p>在此对话框中您可手动选择用于在线迁移的软件源。软件包将被升级到所选源中所能找到的最高版本。</p>"
 
 #. TRANSLATORS: Multiselection widget label
 #: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
@@ -990,17 +944,17 @@
 msgstr "选择用于迁移的软件源"
 
 #. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
 msgid "Manage Repositories..."
 msgstr "管理软件源..."
 
 #. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
 msgid "URL: %s"
 msgstr "URL：%s"
 
 #. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
@@ -1038,9 +992,7 @@
 
 #. TRANSLATORS: help text (1/3)
 #: src/lib/registration/ui/migration_selection_dialog.rb:65
-msgid ""
-"<p>Here you can select the migration target products. The registrationserver "
-"may offer several possible migration to new products.</p>"
+msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
 msgstr "<p>在此您可选择迁移对象产品。注册服务器或许会提供一些可供迁移的新产品。</p>"
 
 #. TRANSLATORS: help text (2/3)
@@ -1050,9 +1002,7 @@
 
 #. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
 #: src/lib/registration/ui/migration_selection_dialog.rb:70
-msgid ""
-"<p>Use the <b>%s</b> check box to manually select the migration repositories "
-"later.</p>"
+msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
 msgstr "<p>稍后使用 <b>%s</b> 复选框手动选择迁移软件源。</p>"
 
 #: src/lib/registration/ui/migration_selection_dialog.rb:71
@@ -1065,17 +1015,17 @@
 msgstr "选择迁移对象。"
 
 #. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
 msgid "Manually Adjust the Repositories for Migration"
 msgstr "手动调整迁移软件源"
 
 #. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
 msgid "Possible Migration Targets"
 msgstr "可行迁移对象"
 
 #. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
 msgid "Migration Summary"
 msgstr "迁移摘要"
 
@@ -1085,42 +1035,38 @@
 #. using the selected migration.
 #. %{url} is the URL of the registration server (SMT)
 #. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
-msgid ""
-"ERROR: Product <b>%{product}</b> is not available at the registration server "
-"(%{url}). Make the product available to allow using this migration."
-msgstr ""
-"错误：产品 <b>%{product}</b> 在注册服务器 (%{url}) 上不可用。请将缺失的产品添"
-"加到注册服务器上以允许使用此迁移助手。"
+#: src/lib/registration/ui/migration_selection_dialog.rb:212
+msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
+msgstr "错误：产品 <b>%{product}</b> 在注册服务器 (%{url}) 上不可用。请将缺失的产品添加到注册服务器上以允许使用此迁移助手。"
 
 #. this is rather a theoretical case, but anyway....
 #. TRANSLATORS: Summary message, rich text format
 #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
 msgid "%s <b>will be installed.</b>"
 msgstr "<b>将安装</b> %s。"
 
 #. TRANSLATORS: Summary message, rich text format
 #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
 msgid "%s <b>stays unchanged.</b>"
 msgstr "%s <b>无变化。</b>"
 
 #. TRANSLATORS: Summary message, rich text format
 #. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
 #. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
 msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
 msgstr "%{old_product} <b> 将被升级到</b> %{new_product}。"
 
 #. TRANSLATORS: Summary message, rich text format
 #. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
 msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
 msgstr "%{old_product} <b>将被降级到</b> %{new_product}。"
 
 #. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
 msgid ""
 "The selected migration contains a product\n"
 "which is not available at the registration server.\n"
@@ -1138,18 +1084,12 @@
 msgstr "<p>系统已注册。</p>"
 
 #: src/lib/registration/ui/registered_system_dialog.rb:41
-msgid ""
-"<p>You can re-register it again or you can register additional extension or "
-"modules to enhance the functionality of the system.</p>"
+msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
 msgstr "<p>您可以再次注册或注册额外扩展或模块以增强系统功能。</p>"
 
 #: src/lib/registration/ui/registered_system_dialog.rb:43
-msgid ""
-"<p>If you want to deregister your system you need to log into the SUSE "
-"Customer Center and remove the system manually there.</p>"
-msgstr ""
-"<p>若您想要反注册您的系统，您需要登入 SUSE 客服中心并在那里手动移除该系统。"
+msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
+msgstr "<p>若您想要反注册您的系统，您需要登入 SUSE 客服中心并在那里手动移除该系统。</p>"
 
 #. button label
 #: src/lib/registration/ui/registered_system_dialog.rb:70
@@ -1178,16 +1118,95 @@
 "自动注册升级失败。\n"
 "您可以从头开始手动注册该系统。"
 
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:211
+#. Constructor
+#.
+#. @param services    [ArrayYast::SlpServiceClass::Service]
+#: src/lib/registration/url_helpers.rb:220
 msgid "Searching..."
 msgstr "搜索中..."
 
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:220
 msgid "Looking up local registration servers..."
 msgstr "正在查找本地注册服务器..."
 
+#. Constructor
+#.
+#. @param services        [ArraySlpServiceClass::Service] list of services to show
+#. @param heading         [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description     [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial         [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
 #, fuzzy
+#| msgid "Server Settings"
+msgid "Service selection"
+msgstr "服务器设置"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+#| msgid "No registration server selected."
+msgid "No service was selected."
+msgstr "未选择注册服务器。"
+
+#~ msgid "Registration failed."
+#~ msgstr "注册失败。"
+
+#~ msgid "&Local Registration Server..."
+#~ msgstr "本地注册服务器(&L)..."
+
+#~ msgid ""
+#~ "Please enter a registration or evaluation code for this product and your\n"
+#~ "User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
+#~ "Access to security and general software updates is only possible on\n"
+#~ "a registered system."
+#~ msgstr ""
+#~ "请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件地址。\n"
+#~ "只有注册了产品才能够获得安全和常规软件更新。"
+
+#~ msgid ""
+#~ "If you skip product registration now, remember to register after\n"
+#~ "installation has completed."
+#~ msgstr "若您现在跳过了注册，请记得在安装完成后注册呀。"
+
+#, fuzzy
 #~| msgid "Additional Repositories"
 #~ msgid "Migration Repositories"
 #~ msgstr "附加源"
@@ -1294,11 +1313,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "To install an add-on product from separate media together with &product;, "
-#~ "select\n"
+#~ "To install an add-on product from separate media together with &product;, select\n"
 #~ "<b>Include Add-on Products from Separate Media</b>.</p>\n"
-#~ "<p>If you need specific hardware drivers for installation, see <i>%s</i> "
-#~ "site.</p>"
+#~ "<p>If you need specific hardware drivers for installation, see <i>%s</i> site.</p>"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "要与 &product; 一起安装某个来自独立介质的附加产品，请选择\n"
@@ -1457,8 +1474,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Configure your system to enable online updates by registering it with "
-#~ "Novell.\n"
+#~ "Configure your system to enable online updates by registering it with Novell.\n"
 #~ "To do this now, select <b>Configure Now</b>. Delay the registration with\n"
 #~ "<b>Configure Later</b>.\n"
 #~ "</p>"
@@ -1470,34 +1486,25 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "To simplify the registration process, include information from your "
-#~ "system\n"
+#~ "To simplify the registration process, include information from your system\n"
 #~ "with <b>Optional Information</b> and <b>Hardware Profile</b>. \n"
-#~ "<b>Details</b> shows the maximum amount of information that can be "
-#~ "involved\n"
-#~ " in your registration. To obtain this information, it contacts the "
-#~ "Novell\n"
-#~ "server to query what information is needed for your product. Only the "
-#~ "identity\n"
+#~ "<b>Details</b> shows the maximum amount of information that can be involved\n"
+#~ " in your registration. To obtain this information, it contacts the Novell\n"
+#~ "server to query what information is needed for your product. Only the identity\n"
 #~ "of the installed product is sent in this initial exchange.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "要简化注册流程，可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信"
-#~ "息。\n"
-#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息，注册程序会联"
-#~ "系\n"
-#~ "Novell 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身"
-#~ "份。\n"
+#~ "要简化注册流程，可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信息。\n"
+#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息，注册程序会联系\n"
+#~ "Novell 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身份。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "If you purchased your copy of this product, enable <b>Registration Code\n"
+#~ "If you purchased your copy of this product, enable <b>Registration Code</b>\n"
 #~ "so you are prompted for your product code. \n"
-#~ "This registers you for the installation support included with your "
-#~ "product.\n"
+#~ "This registers you for the installation support included with your product.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
@@ -1508,44 +1515,34 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "No information is passed to anyone outside Novell. The data is used for\n"
-#~ "statistical purposes and to enhance your convenience regarding driver "
-#~ "support\n"
-#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. "
-#~ "View\n"
-#~ "the transmitted information in the log file <tt>~/.suse_register.log.\n"
+#~ "statistical purposes and to enhance your convenience regarding driver support\n"
+#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. View\n"
+#~ "the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "没有信息会被转让给 Novell 以外的任何人。该数据用于统计目的，为了在驱动支持"
-#~ "和网络账户方面为您提供更多方便。\n"
-#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/."
-#~ "suse_register.log</tt> 中查看已传输的信息。\n"
+#~ "没有信息会被转让给 Novell 以外的任何人。该数据用于统计目的，为了在驱动支持和网络账户方面为您提供更多方便。\n"
+#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/.suse_register.log</tt> 中查看已传输的信息。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
 #~ "sources are still valid and adds any new ones that may be available.\n"
-#~ "It additionally sends any modifications to your included data to Novell, "
-#~ "such \n"
+#~ "It additionally sends any modifications to your included data to Novell, such \n"
 #~ "as hardware information if <b>Hardware Information</b> is activated.\n"
 #~ "This option does not remove any sources added manually.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新"
-#~ "来源。\n"
-#~ "它还会把对从您系统上采集的数据的任何修订发送到 Novell，比如激活了<b>硬件信"
-#~ "息</b>\n"
+#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新来源。\n"
+#~ "它还会把对从您系统上采集的数据的任何修订发送到 Novell，比如激活了<b>硬件信息</b>\n"
 #~ "时的硬件信息。该选项不会移除任何手动添加的来源。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The registration process will contact a Novell server (or a local "
-#~ "registration server if your company provides one).\n"
+#~ "The registration process will contact a Novell server (or a local registration server if your company provides one).\n"
 #~ "Make sure that the network and proxy settings are correct.\n"
 #~ "You can go back to the network setup to check or change the settings.\n"
 #~ "</p>\n"
@@ -1557,8 +1554,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Configure your system to enable online updates by registering it with "
-#~ "Open-SLX.\n"
+#~ "Configure your system to enable online updates by registering it with Open-SLX.\n"
 #~ "To do this now, select <b>Configure Now</b>. Delay the registration with\n"
 #~ "<b>Configure Later</b>.\n"
 #~ "</p>"
@@ -1570,69 +1566,51 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "To simplify the registration process, include information from your "
-#~ "system\n"
+#~ "To simplify the registration process, include information from your system\n"
 #~ "with <b>Optional Information</b> and <b>Hardware Profile</b>. \n"
-#~ "<b>Details</b> shows the maximum amount of information that can be "
-#~ "involved\n"
-#~ " in your registration. To obtain this information, it contacts the Open-"
-#~ "SLX\n"
-#~ "server to query what information is needed for your product. Only the "
-#~ "identity\n"
+#~ "<b>Details</b> shows the maximum amount of information that can be involved\n"
+#~ " in your registration. To obtain this information, it contacts the Open-SLX\n"
+#~ "server to query what information is needed for your product. Only the identity\n"
 #~ "of the installed product is sent in this initial exchange.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "要简化注册流程，可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信"
-#~ "息。\n"
-#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息，注册程序会联"
-#~ "系\n"
-#~ "Open-SLX 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身"
-#~ "份。\n"
+#~ "要简化注册流程，可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信息。\n"
+#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息，注册程序会联系\n"
+#~ "Open-SLX 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身份。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "No information is passed to anyone outside Open-SLX. The data is used "
-#~ "for\n"
-#~ "statistical purposes and to enhance your convenience regarding driver "
-#~ "support\n"
-#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. "
-#~ "View\n"
-#~ "the transmitted information in the log file <tt>~/.suse_register.log.\n"
+#~ "No information is passed to anyone outside Open-SLX. The data is used for\n"
+#~ "statistical purposes and to enhance your convenience regarding driver support\n"
+#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. View\n"
+#~ "the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "没有信息会被转让给 Open-SLX 以外的任何人。该数据用于统计目的，为了驱动器支"
-#~ "持和网络帐户方面为您提供更多方便。\n"
-#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/."
-#~ "suse_register.log</tt> 中查看已传输的信息。\n"
+#~ "没有信息会被转让给 Open-SLX 以外的任何人。该数据用于统计目的，为了驱动器支持和网络帐户方面为您提供更多方便。\n"
+#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/.suse_register.log</tt> 中查看已传输的信息。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
 #~ "sources are still valid and adds any new ones that may be available.\n"
-#~ "It additionally sends any modifications to your included data to Open-"
-#~ "SLX, such \n"
+#~ "It additionally sends any modifications to your included data to Open-SLX, such \n"
 #~ "as hardware information if <b>Hardware Information</b> is activated.\n"
 #~ "This option does not remove any sources added manually.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新"
-#~ "来源。\n"
-#~ "它还会把对从您系统上采集的数据的任何修订发送到 Open-SLX，比如激活了<b>硬件"
-#~ "信息</b>\n"
+#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新来源。\n"
+#~ "它还会把对从您系统上采集的数据的任何修订发送到 Open-SLX，比如激活了<b>硬件信息</b>\n"
 #~ "时的硬件信息。该选项不会移除任何手动添加的来源。\n"
 #~ "</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The registration process will contact an Open-SLX server (or a local "
-#~ "registration server if your company provides one).\n"
+#~ "The registration process will contact an Open-SLX server (or a local registration server if your company provides one).\n"
 #~ "Please make sure that the network and proxy settings are correct.\n"
 #~ "You can step back to the network setup to check or change the settings.\n"
 #~ "</p>"
@@ -1720,8 +1698,7 @@
 #~ msgid "The following package needs to be installed."
 #~ msgstr "需要安装以下软件包。"
 
-#~ msgid ""
-#~ "To count this installation correctly the package %1 needs to be installed."
+#~ msgid "To count this installation correctly the package %1 needs to be installed."
 #~ msgstr "<p>为了正确统计此计算机，需要安装软件包 %1。</p>"
 
 #~ msgid "Therefore the following package needs to be removed first."
@@ -1730,9 +1707,7 @@
 #~ msgid "The package %1 should have been installed and %2 removed."
 #~ msgstr "应该已经安装了软件包 %1 并移除了软件包 %2。"
 
-#~ msgid ""
-#~ "Registration will continue now although the registration server may "
-#~ "miscount this installation."
+#~ msgid "Registration will continue now although the registration server may miscount this installation."
 #~ msgstr "即使注册服务器或许漏计了此计算机，注册也将立即继续进行。"
 
 #~ msgid "Setting up online update source..."
@@ -1768,27 +1743,16 @@
 #~ msgid "Key is invalid."
 #~ msgstr "无效键。"
 
-#~ msgid ""
-#~ "<p>Get more information about the registration process with "
-#~ "<tt>suse_register -h</tt>.</p>"
-#~ msgstr ""
-#~ "<p>请使用 <tt>suse_register -h</tt> 获得有关注册过程的更多信息。</p>"
+#~ msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
+#~ msgstr "<p>请使用 <tt>suse_register -h</tt> 获得有关注册过程的更多信息。</p>"
 
 #~ msgid ""
 #~ "<p>Other information used for registration is shown in <b>Registration\n"
-#~ "Data</b>.<br>To add a new key and value pair, press <b>Add</b> then enter "
-#~ "the\n"
-#~ "appropriate values. These parameters are the ones that can be passed with "
-#~ "<tt>suse_register\n"
-#~ "-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove "
-#~ "a\n"
-#~ "key-value pair with <b>Delete</b> or modify an existing pair with "
-#~ "<b>Edit</b>.</p>"
-#~ msgstr ""
-#~ "<p>用于注册的其他信息显示在<b>注册数据</b>中。<br>要添加新键值对，请按<b>"
-#~ "添加</b>，然后输入适当的值。这些参数也可通过 <tt>suse_register -a</tt> 传"
-#~ "递。<br>可使用 <tt>suse_register -p</tt> 获得更多信息。可使用<b>删除</b>移"
-#~ "除键值对或使用<b>编辑</b>修改现有键值对。</p>"
+#~ "Data</b>.<br>To add a new key and value pair, press <b>Add</b> then enter the\n"
+#~ "appropriate values. These parameters are the ones that can be passed with <tt>suse_register\n"
+#~ "-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove a\n"
+#~ "key-value pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
+#~ msgstr "<p>用于注册的其他信息显示在<b>注册数据</b>中。<br>要添加新键值对，请按<b>添加</b>，然后输入适当的值。这些参数也可通过 <tt>suse_register -a</tt> 传递。<br>可使用 <tt>suse_register -p</tt> 获得更多信息。可使用<b>删除</b>移除键值对或使用<b>编辑</b>修改现有键值对。</p>"
 
 #~ msgid "SMT Server"
 #~ msgstr "SMT 服务器"
@@ -1900,27 +1864,11 @@
 #~ msgid "See the help text for details."
 #~ msgstr "详情请参阅帮助文本。"
 
-#~ msgid ""
-#~ "<p>To register this installation at a local registration server, "
-#~ "configure the URL and optionally the server's CA certificate via the "
-#~ "<b>Advanced</b> menu.</p>"
-#~ msgstr ""
-#~ "<p>要在本地注册服务器上注册此计算机，请配置 URL，可能还要通过<b>高级</b>菜"
-#~ "单配置服务器 CA 证书。</p>"
+#~ msgid "<p>To register this installation at a local registration server, configure the URL and optionally the server's CA certificate via the <b>Advanced</b> menu.</p>"
+#~ msgstr "<p>要在本地注册服务器上注册此计算机，请配置 URL，可能还要通过<b>高级</b>菜单配置服务器 CA 证书。</p>"
 
-#~ msgid ""
-#~ "<p>The registration server URL has to start with <i>https://</i> whereas "
-#~ "the location of its CA certificate may be a URL of the format <i>http://, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/"
-#~ "path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the "
-#~ "keyword <i>done</i>. The latter indicates that no CA certificate handling "
-#~ "needs to be done in order to trust the registration server.</p>"
-#~ msgstr ""
-#~ "<p>注册服务器 URL 必须以 <i>https://</i> 开头而其 CA 证书的位置可以是 "
-#~ "<i>http://</i>、<i>https://</i> 或 <i>ftp://</i> 格式的 URL。此外有效的位"
-#~ "置为 <i>/patch/on/local/disk</i>，<b>floppy</b><i>/path/on/floppy-disk 和关键词 <i>done</i>。后者表示不需要处理 CA 证书即可信任该注册服务器。"
-#~ "</p>"
+#~ msgid "<p>The registration server URL has to start with <i>https://</i> whereas the location of its CA certificate may be a URL of the format <i>http://</i>, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the keyword <i>done</i>. The latter indicates that no CA certificate handling needs to be done in order to trust the registration server.</p>"
+#~ msgstr "<p>注册服务器 URL 必须以 <i>https://</i> 开头而其 CA 证书的位置可以是 <i>http://</i>、<i>https://</i> 或 <i>ftp://</i> 格式的 URL。此外有效的位置为 <i>/patch/on/local/disk</i>，<b>floppy</b><i>/path/on/floppy-disk</i> 和关键词 <i>done</i>。后者表示不需要处理 CA 证书即可信任该注册服务器。</p>"
 
 #~ msgid "Do you want to skip registration?"
 #~ msgstr "您想要跳过注册吗？"
@@ -2090,8 +2038,7 @@
 
 #~ msgid ""
 #~ "The SMT server URL could not be validated as URL.\n"
-#~ "Registration can not be performed. Please modify /etc/suseRegister.conf "
-#~ "and run Registration manually.\n"
+#~ "Registration can not be performed. Please modify /etc/suseRegister.conf and run Registration manually.\n"
 #~ "The SMT server URL that was configured was\n"
 #~ "%1"
 #~ msgstr ""
@@ -2117,12 +2064,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
-#~ "repositories are still valid and adds any new ones that may be "
-#~ "available.\n"
-#~ "It additionally sends any modifications to your included data to Novell, "
-#~ "such \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
+#~ "repositories are still valid and adds any new ones that may be available.\n"
+#~ "It additionally sends any modifications to your included data to Novell, such \n"
 #~ "as hardware information if <b>Hardware Information</b> is activated.\n"
 #~ "This option does not remove any repositories added manually.\n"
 #~ "</p>"

Modified: trunk/yast/zh_CN/po/reipl.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/reipl.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/reipl.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2014-06-10 11:57+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -28,11 +28,16 @@
 #. TRANSLATORS: part of a shutdown message
 #. %1 is replaced with a device name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "After shutdown, reload the system\n"
+#| "with an IPL from DASD '%1'.\n"
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
 msgstr ""
 "\n"
 "关机后，从可直接访问存储设备 (DASD) '%1'\n"
@@ -43,7 +48,7 @@
 #. %2 is replaced with a WWPN name
 #. %3 is replaced with a LUN name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -56,7 +61,7 @@
 "逻辑单元编号为 '%3' 的光纤通道协议\n"
 "'%1' 进行初始程序装入 (IPL) 来重加系统。\n"
 
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
 msgid ""
 "\n"
 "After shutdown, reload the system \n"

Modified: trunk/yast/zh_CN/po/samba-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/samba-client.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/samba-client.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: Samba Client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2014-06-18 19:42+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -824,79 +824,79 @@
 msgstr "正在安装所需软件包..."
 
 #. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
 msgid "PAM Login"
 msgstr "PAM 登入"
 
 #. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
 msgid "Use Kerberos"
 msgstr "使用 Kerberos"
 
 #. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
 msgid "Do Not Use Kerberos"
 msgstr "不使用 Kerberos"
 
 #. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
 msgid "Default Realm"
 msgstr "默认领域"
 
 #. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
 msgid "Default Domain"
 msgstr "默认域"
 
 #. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
 msgid "KDC Server Address"
 msgstr "KDC 服务器地址"
 
 #. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
 msgid "Clock Skew"
 msgstr "时钟偏差"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
 msgid "<b>KDC Server</b>: %1<br>"
 msgstr "<b>KDC 服务器</b>：%1<br>"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
 msgid "<b>Default Domain</b>: %1<br>"
 msgstr "<b>默认域</b>：%1<br>"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
 msgid "<b>Default Realm</b>: %1<br>"
 msgstr "<b>默认领域</b>：%1<br>"
 
 #. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
 msgid "<b>Kerberos Authentication Enabled</b>: %1"
 msgstr "<b>启动 Kerberos 认证</b>：%1"
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
 msgid "Yes"
 msgstr "是"
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
 msgid "No"
 msgstr "否"
 
 #. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
 msgid "Configuration Acquired via DNS"
 msgstr "通过 DNS 取得的配置"
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
 msgid ""
 "Clock skew is invalid.\n"
 "Try again.\n"
@@ -905,7 +905,7 @@
 "请重试。\n"
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
 msgid ""
 "Lifetime is invalid.\n"
 "Try again."

Modified: trunk/yast/zh_CN/po/services-manager.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/services-manager.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/services-manager.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2015-10-18 11:26+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -274,11 +274,11 @@
 
 #. Do not start or stop services that are already in the desired state.
 #. They might be coming from AutoYast import and thus marked as :modified.
-#: src/modules/services_manager_service.rb:407
+#: src/modules/services_manager_service.rb:415
 msgid "Could not %{change} %{service} which is currently %{status}. "
 msgstr "无法 %{change} %{service}，其当前处于 %{status} 状态。"
 
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
 msgid "Could not %{change} %{service}. "
 msgstr "无法 %{change} %{service}。"
 

Modified: trunk/yast/zh_CN/po/snapper.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/snapper.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/snapper.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2016-06-05 23:33+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -20,134 +20,171 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#. The main ()
-#: src/clients/snapper.rb:53
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	clients/snapper.ycp
+#. Package:	Configuration of snapper
+#. Summary:	Main file
+#. Authors:	Jiri Suchomel 
+#.
+#. Main file for snapper configuration. Uses all other files.
+#: src/clients/snapper.rb:49
 msgid "Configuration of system snapshots"
 msgstr "系统快照配置"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
 msgid "Description"
 msgstr "描述"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
 msgid "User data"
 msgstr "用户数据"
 
 #. combo box label
 #. text entry label
-#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
 msgid "Cleanup algorithm"
 msgstr "清理算法"
 
-#. popup label, %1 is number
-#: src/include/snapper/dialogs.rb:158
-msgid "Modify Snapshot %1"
+#. popup label, %{num} is number
+#: src/include/snapper/dialogs.rb:161
+#, fuzzy
+#| msgid "Modify Snapshot %1"
+msgid "Modify Snapshot %{num}"
 msgstr "修订快照 %1"
 
-#. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:166
-msgid "Modify Snapshots %1 - %2"
-msgstr "修订快照 %1 - %2"
+#. popup label, %{pre} and %{post} are numbers
+#: src/include/snapper/dialogs.rb:167
+msgid "Modify Snapshot %{pre} and %{post}"
+msgstr "修订快照 %{pre} 和 %{post}"
 
 #. label
 #: src/include/snapper/dialogs.rb:169
-msgid "Pre (%1)"
+#, fuzzy
+#| msgid "Pre (%1)"
+msgid "Pre (%{pre})"
 msgstr "前期快照 (%1)"
 
 #. label
 #: src/include/snapper/dialogs.rb:173
-msgid "Post (%1)"
+#, fuzzy
+#| msgid "Post (%1)"
+msgid "Post (%{post})"
 msgstr "后期快照 (%2)"
 
 #. popup label
-#: src/include/snapper/dialogs.rb:249
+#: src/include/snapper/dialogs.rb:250
 msgid "Create New Snapshot"
 msgstr "创建新快照"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:262
+#: src/include/snapper/dialogs.rb:263
 msgid "Single snapshot"
 msgstr "单个快照"
 
 #. radio button label
 #. 0 means there's no post
-#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
 msgid "Pre"
 msgstr "前期快照"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:281
+#: src/include/snapper/dialogs.rb:282
 msgid "Post, paired with:"
 msgstr "后期快照，配对为："
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:352
-msgid "Really delete snapshot '%1'?"
+#: src/include/snapper/dialogs.rb:358
+#, fuzzy
+#| msgid "Really delete snapshot '%1'?"
+msgid "Really delete snapshot %{num}?"
 msgstr "真的删除快照 ‘%1’ 吗？"
 
+#. yes/no popup question
+#: src/include/snapper/dialogs.rb:365
+msgid "Really delete snapshots %{pre} and %{post}?"
+msgstr "真的删除快照 %{pre} 和 %{post} 吗？"
+
 #. summary dialog caption
-#: src/include/snapper/dialogs.rb:365
+#: src/include/snapper/dialogs.rb:380
 msgid "Snapshots"
 msgstr "快照"
 
 #. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:394
+#: src/include/snapper/dialogs.rb:409
 msgid "Single"
 msgstr "单个"
 
 #. pre canot be 0
-#: src/include/snapper/dialogs.rb:419
+#: src/include/snapper/dialogs.rb:434
 msgid "Pre & Post"
 msgstr "前后快照"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:454
+#: src/include/snapper/dialogs.rb:469
 msgid "Reading list of snapshots..."
 msgstr "正在读取快照列表..."
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:475
+#: src/include/snapper/dialogs.rb:485
 msgid "Current Configuration"
 msgstr "当前配置"
 
 #. table header
-#: src/include/snapper/dialogs.rb:486
+#: src/include/snapper/dialogs.rb:496
 msgid "ID"
 msgstr "ID"
 
-#: src/include/snapper/dialogs.rb:487
+#: src/include/snapper/dialogs.rb:497
 msgid "Type"
 msgstr "类型"
 
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:498
 msgid "Start Date"
 msgstr "开始日期"
 
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:499
 msgid "End Date"
 msgstr "结束日期"
 
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:501
 msgid "User Data"
 msgstr "用户数据"
 
 #. button label
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:507
 msgid "Show Changes"
 msgstr "显示变化"
 
 #. button label
-#: src/include/snapper/dialogs.rb:500
+#: src/include/snapper/dialogs.rb:510
 msgid "Modify"
 msgstr "修订"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:542
+#: src/include/snapper/dialogs.rb:553
 msgid ""
 "This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
 "Showing differences is not possible."
@@ -156,131 +193,131 @@
 "无法显示差异。"
 
 #. dialog caption
-#: src/include/snapper/dialogs.rb:588
+#: src/include/snapper/dialogs.rb:638
 msgid "Selected Snapshot Overview"
 msgstr "所选快照概览"
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:626
+#: src/include/snapper/dialogs.rb:670
 msgid "%1: %2"
 msgstr "%1：%2"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:645
+#: src/include/snapper/dialogs.rb:689
 msgid "Calculating changed files..."
 msgstr "正在计算有变化的文件..."
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:742
+#: src/include/snapper/dialogs.rb:699
 msgid "Calculating file modifications..."
 msgstr "正在计算文件修改..."
 
 #. label
-#: src/include/snapper/dialogs.rb:750
+#: src/include/snapper/dialogs.rb:707
 msgid "New file was created."
 msgstr "已创建新文件。"
 
 #. label
-#: src/include/snapper/dialogs.rb:754
+#: src/include/snapper/dialogs.rb:711
 msgid "File was removed."
 msgstr "已移除文件。"
 
 #. label
-#: src/include/snapper/dialogs.rb:759
+#: src/include/snapper/dialogs.rb:716
 msgid "File content was not changed."
 msgstr "文件内容无变化。"
 
 #. label
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:722
 msgid "File does not exist in either snapshot."
 msgstr "文件在任何快照中都不存在。"
 
 #. label
-#: src/include/snapper/dialogs.rb:771
+#: src/include/snapper/dialogs.rb:728
 msgid "File content was modified."
 msgstr "已修订文件内容。"
 
 #. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:738
 msgid "File mode was changed from '%1' to '%2'."
 msgstr "文件模式已从 '%1' 变为 '%2'。"
 
 #. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:796
+#: src/include/snapper/dialogs.rb:753
 msgid "File user ownership was changed from '%1' to '%2'."
 msgstr "文件用户所有权已从 '%1' 变为 '%2'。"
 
 #. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:812
+#: src/include/snapper/dialogs.rb:769
 msgid "File group ownership was changed from '%1' to '%2'."
 msgstr "文件组所有权已经从 '%1' 变为 '%2'。"
 
 #. button label
-#: src/include/snapper/dialogs.rb:847
+#: src/include/snapper/dialogs.rb:786
 msgid "R&estore from First"
 msgstr "从第一个快照恢复(&E)"
 
 #. button label
-#: src/include/snapper/dialogs.rb:849
+#: src/include/snapper/dialogs.rb:788
 msgid "Restore"
 msgstr "恢复"
 
-#: src/include/snapper/dialogs.rb:872
+#: src/include/snapper/dialogs.rb:811
 msgid "Res&tore from Second"
 msgstr "从第二个快照恢复(&T)"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:909
+#: src/include/snapper/dialogs.rb:848
 msgid "Show the difference between snapshot and current system"
 msgstr "显示快照和当前系统间的差异"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:921
+#: src/include/snapper/dialogs.rb:860
 msgid "Show the difference between current and selected snapshot:"
 msgstr "显示当前系统和所选快照间的差异："
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:968
+#: src/include/snapper/dialogs.rb:907
 msgid "Show the difference between first and second snapshot"
 msgstr "显示第一个和第二个快照间的差异"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:979
+#: src/include/snapper/dialogs.rb:918
 msgid "Show the difference between first snapshot and current system"
 msgstr "显示第一个快照和当前系统间的差异"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:929
 msgid "Show the difference between second snapshot and current system"
 msgstr "显示第二个快照和当前系统间的差异"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1031
+#: src/include/snapper/dialogs.rb:958
+msgid "Time of taking the snapshot:"
+msgstr "快照耗时："
+
+#. label, date string will follow at the end of line
+#: src/include/snapper/dialogs.rb:966
 msgid "Time of taking the first snapshot:"
 msgstr "第一个快照耗时："
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:971
 msgid "Time of taking the second snapshot:"
 msgstr "第二个快照耗时："
 
-#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1044
-msgid "Time of taking the snapshot:"
-msgstr "快照耗时："
-
 #. button label
-#: src/include/snapper/dialogs.rb:1066
+#: src/include/snapper/dialogs.rb:994
 msgid "&Open"
 msgstr "打开(&O)"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1112
+#: src/include/snapper/dialogs.rb:1040
 msgid "Restore Selected"
 msgstr "恢复所选内容"
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1186
+#: src/include/snapper/dialogs.rb:1125
 msgid ""
 "Do you want to delete the file\n"
 "\n"
@@ -296,7 +333,7 @@
 
 #. yes/no question, %1 is file name, %2 is number
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
 msgid ""
 "Do you want to copy the file\n"
 "\n"
@@ -311,24 +348,25 @@
 "到当前系统吗？"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:1259
-msgid "No file was selected for restoring"
+#: src/include/snapper/dialogs.rb:1191
+#, fuzzy
+#| msgid "No file was selected for restoring"
+msgid "No file was selected for restoring."
 msgstr "未选择要恢复的文件。"
 
 #. popup headline
-#: src/include/snapper/dialogs.rb:1264
+#: src/include/snapper/dialogs.rb:1201
 msgid "Restoring files"
 msgstr "正在恢复文件"
 
 #. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1267
+#: src/include/snapper/dialogs.rb:1204
 msgid ""
 "<p>These files will be restored from snapshot '%1':</p>\n"
 "<p>\n"
 "%2\n"
 "</p>\n"
-"<p>Files existing in original snapshot will be copied to current system.\n"
+"<p>Files existing in original snapshot will be copied to current system.</p>\n"
 "<p>Files that did not exist in the snapshot will be deleted.</p>Are you sure?"
 msgstr ""
 "<p>这些文件将从快照 '%1' 中恢复：</p>\n"
@@ -339,7 +377,7 @@
 "<p>快照中不存在的文件将被删除。</p>您确定吗？"
 
 #. Read dialog help
-#: src/include/snapper/helps.rb:36
+#: src/include/snapper/helps.rb:35
 msgid ""
 "<p><b><big>Reading the list of snapshots</big></b><br>\n"
 "</p>\n"
@@ -348,172 +386,153 @@
 "</p>\n"
 
 #. Summary dialog help:
-#: src/include/snapper/helps.rb:40
+#: src/include/snapper/helps.rb:39
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Snapshots Configuration</big></b><p>\n"
+#| "<p>The table shows a list of root filesystem snapshots. There are three types\n"
+#| "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n"
+#| "used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n"
+#| "<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n"
+#| "new file system changes in the specified snapshot.</p>\n"
 msgid ""
 "<p><b><big>Snapshots Configuration</big></b><p>\n"
-"<p>The table shows a list of root filesystem snapshots. There are three "
-"types\n"
-"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots "
-"are\n"
-"used for storing the file system state in a certain time, while Pre and Post "
-"are used to define the changes done by special operation performed between "
-"taking those two snapshots. Pre and Post snapshots are coupled together in "
-"the table.</p>\n"
-"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see "
-"the\n"
+"<p>The table shows a list of root filesystem snapshots. There are three types\n"
+"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n"
+"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>\n"
+"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n"
 "new file system changes in the specified snapshot.</p>\n"
 msgstr ""
 "<p><b><big>快照配置</big></b></p>\n"
 "<p>该表格显示了一份根文件系统快照列表。\n"
 "有三种类型的快照，<b>单个</b>，<b>前期</b>和<b>后期</b>。\n"
-"\"单个\" 快照用于存储某一特定时间点的文件系统状态，而 \"前期\" 和 \"后期\" 快"
-"照用于确定在两次快照期间执行的某特殊操作造成的修改。\n"
+"\"单个\" 快照用于存储某一特定时间点的文件系统状态，而 \"前期\" 和 \"后期\" 快照用于确定在两次快照期间执行的某特殊操作造成的修改。\n"
 "\"前期\" 和 \"后期\" 快照在表格中是成对显示的。</p>\n"
-"<p>选择一个快照或快照对，点击<b>显示变化</b>来查看指定快照中新的文件系统变"
-"化。</p>\n"
+"<p>选择一个快照或快照对，点击<b>显示变化</b>来查看指定快照中新的文件系统变化。</p>\n"
 
 #. Show snapshot dialog help
-#: src/include/snapper/helps.rb:49
+#: src/include/snapper/helps.rb:48
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Snapshot Overview</big></b><p>\n"
+#| "<p>\n"
+#| "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n"
+#| "</p>\n"
 msgid ""
 "<p><b><big>Snapshot Overview</big></b><p>\n"
 "<p>\n"
-"The tree shows all the files that were modified between creating the first "
-"('pre') and second ('post') snapshot. On the right side, you see the "
-"description generated when the first snapshot was created and the time of "
-"creation for both snapshots.\n"
+"The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n"
 "</p>\n"
 "<p>\n"
-"When a file is selected in the tree, you see the changes done to it. By "
-"default, changes between selected coupled snapshots are shown, but it is "
-"possible to compare the file with different versions.\n"
+"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n"
 "</p>\n"
 msgstr ""
 "<p><b><big>快照概览</big></b></p>\n"
-"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部"
-"文件。在右侧，您可以看到第一个快照创建时生成的描述和两个快照的创建时间。</p>\n"
-"<p>当选中该树形结构中的某个文件时，您可以看到其修订历史。默认显示了所选快照对"
-"之间的差异，但也可以比较该文件的不同版本。</p>\n"
+"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部文件。在右侧，您可以看到第一个快照创建时生成的描述和两个快照的创建时间。</p>\n"
+"<p>当选中该树形结构中的某个文件时，您可以看到其修订历史。默认显示了所选快照对之间的差异，但也可以比较该文件的不同版本。</p>\n"
 
 #. Show snapshot dialog help, alternative for single snapshots
-#: src/include/snapper/helps.rb:59
+#: src/include/snapper/helps.rb:58
 msgid ""
 "<p><b><big>Snapshot Overview</big></b><p>\n"
 "<p>\n"
-"The tree shows all the files that differ in a selected snapshot and the "
-"current system. On the right side, you see the snapshot description and time "
-"of its creation.\n"
+"The tree shows all the files that differ in a selected snapshot and the current system. On the right side, you see the snapshot description and time of its creation.\n"
 "</p>\n"
 "<p>\n"
-"When a file is selected in the tree, you can see the its difference between "
-"snapshot version and current system.\n"
+"When a file is selected in the tree, you can see the its difference between snapshot version and current system.\n"
 "</p>\n"
 msgstr ""
 "<p><b><big>快照概览</big></b></p>\n"
-"<p>该树形结构显示了所选快照中与当前系统有所不同的全部文件。在右侧，您可以看到"
-"快照描述和其创建时间。</p>\n"
-"<p>当选中该树形结构中的某个文件时，您可以看到快照版本和当前系统的不同之处。\n"
+"<p>该树形结构显示了所选快照中与当前系统有所不同的全部文件。在右侧，您可以看到快照描述和其创建时间。</p>\n"
+"<p>当选中该树形结构中的某个文件时，您可以看到快照版本和当前系统的不同之处。</p>\n"
 
-#. popup error
-#: src/modules/Snapper.rb:91
-msgid "Snapshot '%1' was not found."
-msgstr "未找到快照 '%1'。"
+#. Return Tree of files modified between given snapshots
+#. Map is recursively describing the filesystem structure; helps to build Tree widget contents
+#: src/modules/Snapper.rb:108
+msgid "Failed to get config:\n"
+msgstr "获取配置失败：\n"
 
-#. Initialize snapper agent
-#. Return true on success
-#. Delete existing snapshot
-#. Return true on success
-#. Modify existing snapshot
-#. Return true on success
+#. Return the path to given snapshot
+#: src/modules/Snapper.rb:129
+msgid "Failed to get snapshot mount point:\n"
+msgstr "获取快照挂载点失败：\n"
+
 #. Create new snapshot
 #. Return true on success
-#: src/modules/Snapper.rb:236 src/modules/Snapper.rb:264
-#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303
-msgid "Reason not known."
-msgstr "原因未知。"
-
-#: src/modules/Snapper.rb:238
-msgid "Configuration not found."
-msgstr "未找到配置。"
-
-#: src/modules/Snapper.rb:240
-msgid "Configuration is not valid."
-msgstr "配置无效。"
-
-#. error popup
-#: src/modules/Snapper.rb:247
-msgid ""
-"Failed to initialize snapper library:\n"
-"%1"
+#: src/modules/Snapper.rb:276
+#, fuzzy
+#| msgid ""
+#| "Failed to create new snapshot:\n"
+#| "%1"
+msgid "Failed to create new snapshot:\n"
 msgstr ""
-"初始化 Snapper 库失败：\n"
+"创建新快照失败：\n"
 "%1"
 
-#: src/modules/Snapper.rb:266
-msgid "Snapshot was not found."
-msgstr "未找到快照。"
-
-#. error popup
-#: src/modules/Snapper.rb:271
-msgid ""
-"Failed to delete snapshot:\n"
-"%1"
+#. Modify existing snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:291
+#, fuzzy
+#| msgid ""
+#| "Failed to modify snapshot:\n"
+#| "%1"
+msgid "Failed to modify snapshot:\n"
 msgstr ""
-"删除快照失败：\n"
-"%1"
-
-#. error popup
-#: src/modules/Snapper.rb:289
-msgid ""
-"Failed to modify snapshot:\n"
-"%1"
-msgstr ""
 "修订快照失败：\n"
 "%1"
 
+#. Delete existing snapshot
+#. Return true on success
 #: src/modules/Snapper.rb:306
-msgid "Wrong snapshot type given."
-msgstr "给定了错误的快照类型。"
-
-#: src/modules/Snapper.rb:308
-msgid "'Pre' snapshot was not given."
-msgstr "未给定前期快照。"
-
-#: src/modules/Snapper.rb:310
-msgid "Given 'Pre' snapshot was not found."
-msgstr "未找到给定的前期快照。"
-
-#. error popup
-#: src/modules/Snapper.rb:316
-msgid ""
-"Failed to create new snapshot:\n"
-"%1"
+#, fuzzy
+#| msgid ""
+#| "Failed to delete snapshot:\n"
+#| "%1"
+msgid "Failed to delete snapshot:\n"
 msgstr ""
-"创建新快照失败：\n"
+"删除快照失败：\n"
 "%1"
 
 #. Snapper read dialog caption
-#: src/modules/Snapper.rb:326
+#: src/modules/Snapper.rb:319
 msgid "Initializing Snapper"
 msgstr "正在初始化 Snapper"
 
-#. Progress stage 1/3
-#: src/modules/Snapper.rb:337
-msgid "Read the list of snapshots"
-msgstr "读取快照列表"
+#. Progress stage 1/2
+#: src/modules/Snapper.rb:324
+msgid "Read list of configurations"
+msgstr "读取配置列表"
 
-#. Progress step 1/3
-#: src/modules/Snapper.rb:341
-msgid "Reading the database..."
-msgstr "正在读取数据库..."
+#. Progress stage 2/2
+#: src/modules/Snapper.rb:326
+#, fuzzy
+#| msgid "Reading list of snapshots"
+msgid "Read list of snapshots"
+msgstr "正在读取快照列表"
 
+#. Progress step 1/2
+#: src/modules/Snapper.rb:330
+msgid "Reading list of configurations"
+msgstr "正在读取配置列表"
+
+#. Progress step 2/2
+#: src/modules/Snapper.rb:332
+msgid "Reading list of snapshots"
+msgstr "正在读取快照列表"
+
 #. Progress finished
-#: src/modules/Snapper.rb:343
+#: src/modules/Snapper.rb:334
 msgid "Finished"
 msgstr "已完成"
 
-#. error popup
-#: src/modules/Snapper.rb:352
+#: src/modules/Snapper.rb:344
+msgid "Querying snapper configurations failed:"
+msgstr "查询 snapper 配置失败："
+
+#: src/modules/Snapper.rb:349
 msgid ""
 "No snapper configurations exist. You have to create one or more\n"
 "configurations to use yast2-snapper. The snapper command line\n"
@@ -523,47 +542,64 @@
 "才能使用 yast2-snapper。可使用 snapper 命令\n"
 "行工具来创建配置。"
 
+#: src/modules/Snapper.rb:359
+msgid "Querying snapper snapshots failed:"
+msgstr "查询 snapper 快照失败："
+
 #. label for log window
-#: src/modules/Snapper.rb:395
+#: src/modules/Snapper.rb:399
 msgid "Restoring Files..."
 msgstr "正在恢复文件..."
 
 #. log entry (%1 is file name)
-#: src/modules/Snapper.rb:424
+#: src/modules/Snapper.rb:428
 msgid "Deleted %1\n"
 msgstr "已删除 %1\n"
 
 #. log entry (%1 is file name)
-#: src/modules/Snapper.rb:477
+#: src/modules/Snapper.rb:481
 msgid "%1 skipped\n"
 msgstr "已跳过 %1\n"
 
-#~ msgid "Modify Snapshot %{pre} and %{post}"
-#~ msgstr "修订快照 %{pre} 和 %{post}"
+#~ msgid "Modify Snapshots %1 - %2"
+#~ msgstr "修订快照 %1 - %2"
 
-#~ msgid "Really delete snapshots %{pre} and %{post}?"
-#~ msgstr "真的删除快照 %{pre} 和 %{post} 吗？"
+#~ msgid "Snapshot '%1' was not found."
+#~ msgstr "未找到快照 '%1'。"
 
-#~ msgid "Failed to get config:\n"
-#~ msgstr "获取配置失败：\n"
+#~ msgid "Reason not known."
+#~ msgstr "原因未知。"
 
-#~ msgid "Failed to get snapshot mount point:\n"
-#~ msgstr "获取快照挂载点失败：\n"
+#~ msgid "Configuration not found."
+#~ msgstr "未找到配置。"
 
-#~ msgid "Read list of configurations"
-#~ msgstr "读取配置列表"
+#~ msgid "Configuration is not valid."
+#~ msgstr "配置无效。"
 
-#~ msgid "Reading list of configurations"
-#~ msgstr "正在读取配置列表"
+#~ msgid ""
+#~ "Failed to initialize snapper library:\n"
+#~ "%1"
+#~ msgstr ""
+#~ "初始化 Snapper 库失败：\n"
+#~ "%1"
 
-#~ msgid "Reading list of snapshots"
-#~ msgstr "正在读取快照列表"
+#~ msgid "Snapshot was not found."
+#~ msgstr "未找到快照。"
 
-#~ msgid "Querying snapper configurations failed:"
-#~ msgstr "查询 snapper 配置失败："
+#~ msgid "Wrong snapshot type given."
+#~ msgstr "给定了错误的快照类型。"
 
-#~ msgid "Querying snapper snapshots failed:"
-#~ msgstr "查询 snapper 快照失败："
+#~ msgid "'Pre' snapshot was not given."
+#~ msgstr "未给定前期快照。"
 
+#~ msgid "Given 'Pre' snapshot was not found."
+#~ msgstr "未找到给定的前期快照。"
+
+#~ msgid "Read the list of snapshots"
+#~ msgstr "读取快照列表"
+
+#~ msgid "Reading the database..."
+#~ msgstr "正在读取数据库..."
+
 #~ msgid "File /etc/sysconfig/snapper is not available."
 #~ msgstr "文件 /etc/sysconfig/snapper 不可用。"

Modified: trunk/yast/zh_CN/po/storage.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/storage.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/storage.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2016-06-05 23:45+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -151,8 +151,7 @@
 "advanced configurations like RAID and encryption.</p>\n"
 msgstr ""
 "<p>\n"
-"若建议提案不契合您的需要，您可以基于当前显示在磁盘上的分区配置，创建您自己"
-"的\n"
+"若建议提案不契合您的需要，您可以基于当前显示在磁盘上的分区配置，创建您自己的\n"
 "要改变分区配置请选择\n"
 "<b>%1</b>。\n"
 "这也是 RAID 和加密之类高级配置要选择的选项。</p>\n"
@@ -447,8 +446,7 @@
 "\n"
 "欲安装 Linux，请先引导 Windows 并卸载一些应用程序或删除某些数据以腾出空间。\n"
 "\n"
-"Windows 设备上至少需要有 %1 MB 可用空间，包括 Windows 工作空间和 %2 的空"
-"间。\n"
+"Windows 设备上至少需要有 %1 MB 可用空间，包括 Windows 工作空间和 %2 的空间。\n"
 
 #. not yet checked
 #. Inform the user that his Windows partition is being checked.
@@ -581,8 +579,7 @@
 "由于须重组数据，强烈推荐备份好您的数据。\n"
 "在个别情景下，重组可能会失败。\n"
 "\n"
-"只有您已在 Windows 下成功运行过了 scandisk 和 defrag 系统应用程序后才可以继"
-"续。\n"
+"只有您已在 Windows 下成功运行过了 scandisk 和 defrag 系统应用程序后才可以继续。\n"
 "\n"
 "真的收缩您的 Windows 分区吗？\n"
 
@@ -646,8 +643,7 @@
 #. normally the target is located on hard disks. Here no hard disks
 #. can be found. YaST2 cannot install. Update CD might have newer drivers.
 #: src/clients/inst_target_selection.rb:172
-msgid ""
-"No disks found. Try using the update CD, if available, for installation."
+msgid "No disks found. Try using the update CD, if available, for installation."
 msgstr "未找到磁盘。如果有的话，请尝试使用更新 CD 来安装，它或许有新一些磁盘驱动。"
 
 #. There are several hard disks found. Linux is completely installed on
@@ -936,15 +932,14 @@
 msgstr ""
 "<p>\n"
 "您若删除 Windows，此分区上的全部数据都将在安装时<b>不复存在且无法恢复</b>。\n"
-"当收缩 Windows 时，我们<b>强烈推荐备份数据</b>，因为系统必须对数据进行重"
-"组，\n"
+"当收缩 Windows 时，我们<b>强烈推荐备份数据</b>，因为系统必须对数据进行重组，\n"
 "这在个别情况下可能失败。\n"
 "</p>\n"
 
 #. Label text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6250
+#: src/modules/StorageProposal.rb:6272
 msgid "Propose Separate &Home Partition"
 msgstr "创建使用独立主分区的提案(&H)"
 
@@ -1204,8 +1199,7 @@
 "You have not assigned a swap partition. In most cases, we highly recommend \n"
 "to create and assign a swap partition.\n"
 "Swap partitions on your system are listed in the main window with the\n"
-"type \"Linux Swap\". An assigned swap partition has the mount point \"swap"
-"\".\n"
+"type \"Linux Swap\". An assigned swap partition has the mount point \"swap\".\n"
 "You can assign more than one swap partition, if desired.\n"
 "\n"
 "Really use the setup without swap partition?\n"
@@ -1247,8 +1241,7 @@
 #: src/include/partitioning/custom_part_check_generated.rb:534
 msgid ""
 "If in doubt, better go back and mark this partition for\n"
-"formatting, especially if it is assigned to one of the standard mount "
-"points\n"
+"formatting, especially if it is assigned to one of the standard mount points\n"
 "like /, /boot, /opt or /var.\n"
 msgstr ""
 "若存疑，最好返回上一步并标记格式化此分区，尤其是当它指派为了\n"
@@ -1319,18 +1312,14 @@
 msgid ""
 "The device (%1) cannot be removed since it is a logical partition and \n"
 "another logical partition with a higher number is in use.\n"
-msgstr ""
-"无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使"
-"用中。\n"
+msgstr "无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使用中。\n"
 
 #. popup text
 #: src/include/partitioning/custom_part_check_generated.rb:790
 msgid ""
-"The selected extended partition contains partitions which are currently "
-"mounted:\n"
+"The selected extended partition contains partitions which are currently mounted:\n"
 "%1\n"
-"We *strongly* recommend to unmount these partitions before you delete the "
-"extended partition.\n"
+"We *strongly* recommend to unmount these partitions before you delete the extended partition.\n"
 "Choose Cancel unless you know exactly what you are doing.\n"
 msgstr ""
 "所选扩展分区包含了当前已挂载的分区：\n"
@@ -1384,7 +1373,7 @@
 #. label text
 #: src/include/partitioning/custom_part_dialogs.rb:74
 #: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6378
+#: src/modules/StorageProposal.rb:6400
 msgid "Do not forget what you enter here!"
 msgstr "求别忘您在这儿输入的东东！"
 
@@ -1493,8 +1482,7 @@
 "Normally, a file system to mount is identified in /etc/fstab\n"
 "by the device name. This identification can be changed so the file system \n"
 "to mount is found by searching for a UUID or a volume label. Not all file \n"
-"systems can be mounted by UUID or a volume label. If an option is "
-"disabled, \n"
+"systems can be mounted by UUID or a volume label. If an option is disabled, \n"
 "this is not possible.\n"
 msgstr ""
 "<p><b>挂载到 /etc/fstab 的方式：</b>\n"
@@ -1507,8 +1495,7 @@
 #: src/include/partitioning/custom_part_dialogs.rb:479
 msgid ""
 "<p><b>Volume Label:</b>\n"
-"The name entered in this field is used as the volume label. This usually "
-"makes sense only \n"
+"The name entered in this field is used as the volume label. This usually makes sense only \n"
 "when you activate the option for mounting by volume label.\n"
 "A volume label cannot contain the / character or spaces.\n"
 msgstr ""
@@ -1734,8 +1721,7 @@
 msgid ""
 "The selected device contains partitions that are currently mounted:\n"
 "%1\n"
-"We *strongly* recommended to unmount these partitions before deleting the "
-"partition table.\n"
+"We *strongly* recommended to unmount these partitions before deleting the partition table.\n"
 "Choose Cancel unless you know exactly what you are doing.\n"
 msgstr ""
 "所选设备包含了当前已挂载的分区：\n"
@@ -1815,7 +1801,7 @@
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6231
+#: src/modules/StorageProposal.rb:6253
 msgid "Enable Snapshots"
 msgstr "启用快照"
 
@@ -1887,8 +1873,7 @@
 #: src/include/partitioning/ep-dialogs.rb:746
 msgid ""
 "<p>\n"
-"This mount point corresponds to a temporary filesystem like /tmp or /var/"
-"tmp.\n"
+"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
 "If you leave the encryption password empty, the system will create\n"
 "a random password at system startup for you. This means, you will lose all\n"
 "data on these filesystems at system shutdown.\n"
@@ -1906,8 +1891,7 @@
 #: src/include/partitioning/ep-dialogs.rb:761
 msgid ""
 "<p>\n"
-"If you forget your password, you will lose access to the data on your file "
-"system.\n"
+"If you forget your password, you will lose access to the data on your file system.\n"
 "Choose your password carefully. A combination of letters and numbers\n"
 "is recommended. To ensure the password was entered correctly,\n"
 "enter it twice.\n"
@@ -1926,8 +1910,7 @@
 #: src/include/partitioning/ep-dialogs.rb:775
 msgid ""
 "<p>\n"
-"You must distinguish between uppercase and lowercase. A password should have "
-"at\n"
+"You must distinguish between uppercase and lowercase. A password should have at\n"
 "least %1 characters and, as a rule, not contain any special characters\n"
 "(e.g., letters with accents or umlauts).\n"
 "</p>\n"
@@ -1981,8 +1964,7 @@
 #: src/include/partitioning/custom_part_helptexts.rb:159
 msgid ""
 "<p>\n"
-"If the encrypted file system does not contain any system file and therefore "
-"is\n"
+"If the encrypted file system does not contain any system file and therefore is\n"
 "not needed for the update, you may select <b>Skip</b>. In this case, the\n"
 "file system is not accessed during update.\n"
 "</p>\n"
@@ -2022,8 +2004,7 @@
 "警告：您的系统声明它需要一个 EFI 引导设置。\n"
 "由于所选磁盘不包含 GPT 磁盘标签，YaST 将在此磁盘上创建一个 GPT 标签。\n"
 "\n"
-"您必须标记移除此磁盘上的全部分区即全盘格式化。因为 MBR 和 GPT 分区无法共"
-"存。\n"
+"您必须标记移除此磁盘上的全部分区即全盘格式化。因为 MBR 和 GPT 分区无法共存。\n"
 
 #. error popup text
 #: src/include/partitioning/custom_part_lib.rb:51
@@ -2115,8 +2096,7 @@
 
 #. error popup text
 #: src/include/partitioning/custom_part_lib.rb:248
-msgid ""
-"Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
+msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
 msgstr "挂载点中的字符无效。不要在挂载点中使用 \"`'!\"%#\"。"
 
 #. error popup text
@@ -2672,12 +2652,9 @@
 #: src/include/partitioning/ep-dialogs.rb:127
 msgid ""
 "<p>If you want to encrypt all data on the\n"
-"volume, select <b>Encrypt Device</b>. Changing the encryption on an "
-"existing\n"
+"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
 "volume will delete all data on it.</p>\n"
-msgstr ""
-"<p>如果您想要加密卷上的所有数据，选择 <b>加密设备</b>。修改一个已有卷的加密方"
-"式会删除其中所有数据。</p>\n"
+msgstr "<p>如果您想要加密卷上的所有数据，选择 <b>加密设备</b>。修改一个已有卷的加密方式会删除其中所有数据。</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-dialogs.rb:137
@@ -2774,8 +2751,7 @@
 "</p>\n"
 msgstr ""
 "<p>\n"
-"此卷使用的文件系统为 swap。您可以留空加密密码，但那样 swap 设备就不能用于休"
-"眠 (挂起到磁盘)。\n"
+"此卷使用的文件系统为 swap。您可以留空加密密码，但那样 swap 设备就不能用于休眠 (挂起到磁盘)。\n"
 "</p>\n"
 
 #: src/include/partitioning/ep-dialogs.rb:804
@@ -2938,9 +2914,7 @@
 "<p>This view shows all Device Mapper devices except for those already \n"
 "included in some other view. Therefore multipath disks,\n"
 "BIOS RAIDs and LVM logical volumes are not shown here.</p>\n"
-msgstr ""
-"<p>该视图显示了除已经包含在其他视图的所有设备映射器设备。因此多路径磁盘、"
-"BIOS RAID 和 LVM 逻辑卷不在这里显示。</p>\n"
+msgstr "<p>该视图显示了除已经包含在其他视图的所有设备映射器设备。因此多路径磁盘、BIOS RAID 和 LVM 逻辑卷不在这里显示。</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-dm.rb:161
@@ -3172,9 +3146,7 @@
 msgid ""
 "Really create new partition table on %1? This will delete all data\n"
 "on %1 and all RAIDs and Volume Groups using partitions on %1."
-msgstr ""
-"真的要在 %1 上创建新分区表吗？这会删除 %1 上的所有数据和使用 %1 上的分区的所"
-"有 RAID 和卷组。"
+msgstr "真的要在 %1 上创建新分区表吗？这会删除 %1 上的所有数据和使用 %1 上的分区的所有 RAID 和卷组。"
 
 #. error popup
 #: src/include/partitioning/ep-hd-lib.rb:137
@@ -3400,9 +3372,7 @@
 msgid ""
 "<p>This view shows all hard disks including\n"
 "iSCSI disks, BIOS RAIDs and multipath disks and their partitions.</p>\n"
-msgstr ""
-"<p>该视图显示包括 iSCCI 磁盘，BIOS RAID 和多路径磁盘在内的所有硬盘和它们的分"
-"区。</p>\n"
+msgstr "<p>该视图显示包括 iSCCI 磁盘，BIOS RAID 和多路径磁盘在内的所有硬盘和它们的分区。</p>\n"
 
 #. push button text (do not translate 'SMART', it is the name of the tool)
 #: src/include/partitioning/ep-hd.rb:320
@@ -3463,9 +3433,7 @@
 "<p>This view shows all partitions of the selected\n"
 "hard disk. If the hard disk is used by e.g. BIOS RAID or multipath, no\n"
 "partitions are shown here.</p>\n"
-msgstr ""
-"<p>该视图显示了所选硬盘的所有分区。如果硬盘被例如 BIOS RAID 或多路径使用，则"
-"显示不出分区。</p>\n"
+msgstr "<p>该视图显示了所选硬盘的所有分区。如果硬盘被例如 BIOS RAID 或多路径使用，则显示不出分区。</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-hd.rb:596
@@ -3473,9 +3441,7 @@
 "<p>This view shows all devices used by the\n"
 "selected hard disk. The view is only available for BIOS RAIDs, partitioned\n"
 "software RAIDs and multipath disks.</p>\n"
-msgstr ""
-"<p>该视图显示了所选硬盘使用的全部设备。此视图只适用于 BIOS RAID，已分区的软"
-"件 RAID 和多路径磁盘。</p>\n"
+msgstr "<p>该视图显示了所选硬盘使用的全部设备。此视图只适用于 BIOS RAID，已分区的软件 RAID 和多路径磁盘。</p>\n"
 
 #. tab heading
 #: src/include/partitioning/ep-hd.rb:646
@@ -3505,9 +3471,7 @@
 "<p>YaST has scanned your hard disks and found one or several existing \n"
 "Linux systems with mount points. The old mount points are shown in \n"
 "the table.</p>\n"
-msgstr ""
-"<p>YaST 已扫描了您的硬盘，发现了一个或多个带挂载点的已有 Linux 系统。旧挂载点"
-"显示在表格中。</p>\n"
+msgstr "<p>YaST 已扫描了您的硬盘，发现了一个或多个带挂载点的已有 Linux 系统。旧挂载点显示在表格中。</p>\n"
 
 #. help text, richtext format
 #: src/include/partitioning/ep-import.rb:305
@@ -3515,9 +3479,7 @@
 "<p>You can choose whether the existing system\n"
 "volumes, e.g. / and /usr, will be formatted during the\n"
 "installation. Non-system volumes, e.g. /home, will not be formatted.</p>"
-msgstr ""
-"<p>您可以选择安装时是否格式化已有系统卷，例如 / 和 /usr。非系统卷，如 /home，"
-"则不会被格式化。</p>"
+msgstr "<p>您可以选择安装时是否格式化已有系统卷，例如 / 和 /usr。非系统卷，如 /home，则不会被格式化。</p>"
 
 #. popup text
 #: src/include/partitioning/ep-import.rb:328
@@ -3677,8 +3639,7 @@
 #: src/include/partitioning/ep-loop-dialogs.rb:36
 msgid ""
 "\n"
-"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the "
-"file\n"
+"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the file\n"
 "containing the data for the encrypted loop device to set up.</p>\n"
 msgstr ""
 "\n"
@@ -3969,8 +3930,7 @@
 #: src/include/partitioning/ep-lvm-dialogs.rb:491
 msgid ""
 "<p>Enter the size as well as the number and size\n"
-"of stripes for the new logical volume. The number of stripes cannot be "
-"higher\n"
+"of stripes for the new logical volume. The number of stripes cannot be higher\n"
 "than the number of physical volumes of the volume group.</p>"
 msgstr "<p>为新逻辑卷输入尺寸、分带数和分带尺寸。分带数不能大于卷组的物理卷数。</p>"
 
@@ -3984,10 +3944,8 @@
 "Volume, the assigned Thin Pool must be able to meet this space requirement.\n"
 "Thin Volumes cannot have a Stripe Count."
 msgstr ""
-"<p>所谓的<b>瘦卷</b>可以创建为任意卷尺寸。所需的空间是按需从指定的<b>瘦池</b>"
-"中获取的。\n"
-"因此您可以创建比瘦池还大的瘦卷。当然啦，在有真实数据写入到瘦卷时，指定的瘦池"
-"还是必须能够\n"
+"<p>所谓的<b>瘦卷</b>可以创建为任意卷尺寸。所需的空间是按需从指定的<b>瘦池</b>中获取的。\n"
+"因此您可以创建比瘦池还大的瘦卷。当然啦，在有真实数据写入到瘦卷时，指定的瘦池还是必须能够\n"
 "满足空间需求。瘦卷无法有分带计数。"
 
 #. heading for frame
@@ -4021,20 +3979,17 @@
 #: src/include/partitioning/ep-lvm-dialogs.rb:778
 msgid ""
 "<p>You can declare the logical volume as a <b>Normal Volume</b>.\n"
-"This is the default and means plain LVM Volumes like all volumes were before "
-"the feature of <b>Thin Provisioning</b> existed.\n"
+"This is the default and means plain LVM Volumes like all volumes were before the feature of <b>Thin Provisioning</b> existed.\n"
 "If in doubt this is most probably the right choice</p>"
 msgstr ""
 "你可以将逻辑卷声明为 <b>正常卷</b>。\n"
-"这是默认选项，表示像 <b>瘦配置</b> 特性存在之前的所有卷一样的普通 LVM 卷。如"
-"果存疑，那这就是最可能对的选项</p>"
+"这是默认选项，表示像 <b>瘦配置</b> 特性存在之前的所有卷一样的普通 LVM 卷。如果存疑，那这就是最可能对的选项</p>"
 
 #. helptext
 #: src/include/partitioning/ep-lvm-dialogs.rb:787
 msgid ""
 "<p>You can declare the logical volume as a <b>Thin Pool</b>.\n"
-"This means <b>Thin Volumes</b> allocate their needed space on demand from "
-"such a pool.</p>"
+"This means <b>Thin Volumes</b> allocate their needed space on demand from such a pool.</p>"
 msgstr ""
 "您可以将逻辑卷声明为 <b>瘦池</b>。\n"
 "这意味着<b>瘦卷</b>将能按需从此池中分配它们所需的空间。</p>"
@@ -4043,8 +3998,7 @@
 #: src/include/partitioning/ep-lvm-dialogs.rb:794
 msgid ""
 "<p>You can declare the logical volume as a <b>Thin Volume</b>.\n"
-"This means the volume allocates needed space on demand from a <b>Thin Pool.</p>"
+"This means the volume allocates needed space on demand from a <b>Thin Pool</b>.</p>"
 msgstr ""
 "<p>您可以将逻辑卷声明为 <b>瘦卷</b>。\n"
 "这意味着该卷将按需从<b>瘦池</b>中分配所需空间。</p>"
@@ -4101,8 +4055,7 @@
 msgid ""
 "There are not enough suitable unused devices to create a volume group.\n"
 "\n"
-"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one "
-"unused\n"
+"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused\n"
 "RAID device is required. Change your partition table accordingly."
 msgstr ""
 "没有足够的合适的未使用设备来创建卷组。\n"
@@ -4327,9 +4280,7 @@
 
 #. fallback dialog content
 #: src/include/partitioning/ep-nfs.rb:55
-msgid ""
-"NFS configuration is not available. Check yast2-nfs-client package "
-"installation."
+msgid "NFS configuration is not available. Check yast2-nfs-client package installation."
 msgstr "网络文件系统配置不可用。请检查是否安装了 yast2-nfs-client 软件包。"
 
 #. heading
@@ -4361,8 +4312,7 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:87
 msgid ""
 "<p><b>RAID 0:</b> This level increases your disk performance.\n"
-"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, "
-"data recovery will not be possible.</p>\n"
+"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data recovery will not be possible.</p>\n"
 msgstr ""
 "<p><b>RAID 0</b>：此级别可提高磁盘性能。\n"
 "在此方式中<b>没有</b>冗余。如果其中一个驱动器崩溃，将无法恢复数据。</p>\n"
@@ -4371,10 +4321,8 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:95
 msgid ""
 "<p><b>RAID 1:</b> <br>This mode has the best redundancy. It can be\n"
-"used with two or more disks. This mode maintains an exact copy of all data "
-"on all\n"
-"disks. As long as at least one disk is still working, no data is lost. The "
-"partitions\n"
+"used with two or more disks. This mode maintains an exact copy of all data on all\n"
+"disks. As long as at least one disk is still working, no data is lost. The partitions\n"
 "used for this type of RAID should have approximately the same size.</p>\n"
 msgstr ""
 "<p><b>RAID 1：</b> <br>这种方式具有最佳冗余性能。用在\n"
@@ -4386,15 +4334,12 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:106
 msgid ""
 "<p><b>RAID 5:</b> <br>This mode combines management of a larger number\n"
-"of disks and still maintains some redundancy. This mode can be used on three "
-"disks or more.\n"
-"If one disk fails, all data is still intact. If two disks fail "
-"simultaneously, all data is lost</p>\n"
+"of disks and still maintains some redundancy. This mode can be used on three disks or more.\n"
+"If one disk fails, all data is still intact. If two disks fail simultaneously, all data is lost</p>\n"
 msgstr ""
 "<p><b>RAID 5：</b> <br>这种方式既能管理数量更多的磁盘，\n"
 "还能保持一定的冗余程度。这种方式适用于三个或更多磁盘的情况。\n"
-"如果一个磁盘出故障，所有数据仍能完好无损。如果两个磁盘同时出故障，则所有数据"
-"都会丢失。</p>\n"
+"如果一个磁盘出故障，所有数据仍能完好无损。如果两个磁盘同时出故障，则所有数据都会丢失。</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:116
@@ -4410,10 +4355,8 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:126
 msgid ""
 "<p>Add partitions to your RAID. According to\n"
-"the RAID type, the usable disk size is the sum of these partitions (RAID0), "
-"the size\n"
-"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).\n"
+"the RAID type, the usable disk size is the sum of these partitions (RAID0), the size\n"
+"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>\n"
 msgstr ""
 "<p>向 RAID 添加分区。根据\n"
 "RAID 的类型，可用磁盘尺寸是这些分区尺寸之和 (RAID0)、最小分区的\n"
@@ -4480,10 +4423,8 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:338
 msgid ""
 "<p><b>Chunk Size:</b><br>It is the smallest \"atomic\" mass\n"
-"of data that can be written to the devices. A reasonable chunk size for RAID "
-"5 is 128 kB. For RAID 0,\n"
-"32 kB is a good starting point. For RAID 1, the chunk size does not affect "
-"the array very much.</p>\n"
+"of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128 kB. For RAID 0,\n"
+"32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>\n"
 msgstr ""
 "<p><b>区块尺寸：</b><br>这是可以写入设备的\n"
 "最小\"单位\"数据块。RAID 5 的合理区块尺寸为 128KB。对于 RAID 0，\n"
@@ -4497,8 +4438,7 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:353
 msgid ""
 "The parity algorithm to use with RAID5/6.\n"
-"Left-symmetric is the one that offers maximum performance on typical disks "
-"with rotating platters.\n"
+"Left-symmetric is the one that offers maximum performance on typical disks with rotating platters.\n"
 msgstr ""
 "RAID5/6 所用的奇偶校验算法。\n"
 "对于典型的旋转盘片磁盘来说，左对称能够提供最佳性能。\n"
@@ -4766,11 +4706,9 @@
 msgid ""
 "<p><b>Default Mount by</b> gives the mount by\n"
 "method for newly created file systems. <i>Device Name</i> uses the kernel\n"
-"device name, which is not persistent. <i>Device ID</i> and <i>Device Path\n"
+"device name, which is not persistent. <i>Device ID</i> and <i>Device Path</i>\n"
 "use names generated by udev from hardware information. These should be\n"
-"persistent but unfortunately this is not always true. Finally <i>UUID</i> "
-"and\n"
+"persistent but unfortunately this is not always true. Finally <i>UUID</i> and\n"
 "<i>Volume Label</i> use the file systems UUID and label.</p>\n"
 msgstr ""
 "<p><b>默认挂载方式</b> 给出新创建文件系统的挂载方式。<i>设备名称</i>\n"
@@ -4789,9 +4727,7 @@
 #: src/include/partitioning/ep-settings.rb:217
 msgid ""
 "<p><b>Alignment of Newly Created Partitions</b>\n"
-"determines how created partitions are aligned. <b>cylinder</b> is the "
-"traditional alignment at cylinder boundaries of the disk. <b>optimal</b> "
-"aligns the \n"
+"determines how created partitions are aligned. <b>cylinder</b> is the traditional alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the \n"
 "partitions for best performance according to hints provided by the Linux \n"
 "kernel or tries to be compatible with Windows Vista and Win 7.</p>\n"
 msgstr ""
@@ -5057,24 +4993,19 @@
 #: src/modules/DualMultiSelectionBox.rb:316
 msgid ""
 "<p>This dialog is for defining classes for the raid devices\n"
-"contained in the raid. Available classes are A, B, C, D and E but for many "
-"cases\n"
+"contained in the raid. Available classes are A, B, C, D and E but for many cases\n"
 "fewer classes are needed (e.g. only A and B). </p>"
 msgstr ""
-"<p>该对话框用来为 RAID 中的 RAID 设备定义分类。可用的分类为 A、B、C、B 和 "
-"E，\n"
+"<p>该对话框用来为 RAID 中的 RAID 设备定义分类。可用的分类为 A、B、C、B 和 E，\n"
 "但是大多数情况下只需要很少的分类 (例如，只用 A 和 B)。</p>"
 
 #. dialog help text
 #: src/modules/DualMultiSelectionBox.rb:325
 msgid ""
 "<p>You can put a device into a class by right-clicking on the\n"
-"device and choosing the appropriate class from context menu. By pressing "
-"the \n"
-"Ctrl  or Shift key you can select multiple devices and put them into a class "
-"in\n"
-"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put "
-"currently \n"
+"device and choosing the appropriate class from context menu. By pressing the \n"
+"Ctrl  or Shift key you can select multiple devices and put them into a class in\n"
+"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put currently \n"
 "selected devices into this class.</p>"
 msgstr ""
 "<p>您可以通过右键点击该设备并从交互菜单中选择合适的分类来给设备归类。\n"
@@ -5100,11 +5031,9 @@
 msgid ""
 "<b>Interleaved</b> uses first device of class A, then first device of \n"
 "class B, then all the following classes with assigned devices. Then the \n"
-"second device of class A, the second device of class B, and so on will "
-"follow."
+"second device of class A, the second device of class B, and so on will follow."
 msgstr ""
-"<b>交错</b>使用分类 A 的第一个设备，然后是分类 B 的第一个设备，直到用光所有分"
-"类下的指派设备。\n"
+"<b>交错</b>使用分类 A 的第一个设备，然后是分类 B 的第一个设备，直到用光所有分类下的指派设备。\n"
 "然后接着是分类 A 的第二个设备，分类 B 的第二个设备。诸如此类。"
 
 #. dialog help text
@@ -5121,24 +5050,17 @@
 #: src/modules/DualMultiSelectionBox.rb:379
 msgid ""
 "By pressing button \"<b>%1</b>\" you can select a file that contains\n"
-"lines with a regular expression and a class name (e.g. \"sda.*  A\"). All "
-"devices that match \n"
-"the regular expression will be put into the class on this line. The regular "
-"expression is \n"
+"lines with a regular expression and a class name (e.g. \"sda.*  A\"). All devices that match \n"
+"the regular expression will be put into the class on this line. The regular expression is \n"
 "matched against the kernel name (e.g. /dev/sda1), \n"
-"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-"
-"part1) and the\n"
+"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-part1) and the\n"
 "the udev id (e.g. /dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1). \n"
-"The first match finally determines the class if a devices name matches more "
-"then one\n"
+"The first match finally determines the class if a devices name matches more then one\n"
 "regular expression.</p>"
 msgstr ""
-"通过按键 \"<b>%1</b>\" 您可以选择一个带有正则表达式和类名 (例如 \"sda* A\") "
-"的文件。\n"
-"所有匹配此正则表达式的设备都将被归类为此行中指定的分类名。正则表达式可以匹配"
-"内核名(例如 /dev/sda1)，\n"
-"udev 路径名 (例如 /dev/disk/by-path/pci-0000:00:1f:2-scsi-0:0:0:0-part1) 和 "
-"udev id (例如\n"
+"通过按键 \"<b>%1</b>\" 您可以选择一个带有正则表达式和类名 (例如 \"sda* A\") 的文件。\n"
+"所有匹配此正则表达式的设备都将被归类为此行中指定的分类名。正则表达式可以匹配内核名(例如 /dev/sda1)，\n"
+"udev 路径名 (例如 /dev/disk/by-path/pci-0000:00:1f:2-scsi-0:0:0:0-part1) 和 udev id (例如\n"
 "/dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1)。\n"
 "如果设备名匹配了多个正则表达式，第一个匹配将最终决定分类名。。</p>"
 
@@ -5175,8 +5097,7 @@
 #: src/modules/FileSystems.rb:297
 msgid ""
 "<p><b>Tmpfs Size:</b>\n"
-"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or "
-"Gigabyte or\n"
+"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
 "as a number followed by a percent sign meaning percentage of memory.</p>"
 msgstr ""
 "<p><b>缓存文件系统尺寸：</b>\n"
@@ -5211,8 +5132,7 @@
 #: src/modules/FileSystems.rb:485
 msgid ""
 "<p><b>Mount Read-Only:</b>\n"
-"Writing to the file system is not possible. Default is false. During "
-"installation\n"
+"Writing to the file system is not possible. Default is false. During installation\n"
 "the file system is always mounted read-write.</p>"
 msgstr ""
 "<p><b>只读挂载：</b>\n"
@@ -5258,10 +5178,8 @@
 "<p><b>Do Not Mount at System Start-up:</b>\n"
 "The file system is not automatically mounted when the system starts.\n"
 "An entry in /etc/fstab is created and the file system is mounted\n"
-"with the appropriate options when the command <tt>mount <mount point>\n"
-"is entered (<mount point> is the directory to which the file system is "
-"mounted). Default is false.</p>\n"
+"with the appropriate options when the command <tt>mount <mount point></tt>\n"
+"is entered (<mount point> is the directory to which the file system is mounted). Default is false.</p>\n"
 msgstr ""
 "<p><b>不在系统启动时挂载：</b>\n"
 "系统启动时文件系统不会自动挂载。\n"
@@ -5299,10 +5217,8 @@
 "<tt>journal</tt> -- All data is committed to the journal prior to being\n"
 "written into the main file system. Highest performance impact.<br>\n"
 "<tt>ordered</tt> -- All data is forced directly out to the main file system\n"
-"prior to its metadata being committed to the journal. Medium performance "
-"impact.<br>\n"
-"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact."
-"</p>\n"
+"prior to its metadata being committed to the journal. Medium performance impact.<br>\n"
+"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>\n"
 msgstr ""
 "<p><b>数据日志模式：</b>\n"
 "指定文件数据的日志模式。\n"
@@ -5346,17 +5262,14 @@
 msgstr "任意选项值(&V)"
 
 #: src/modules/FileSystems.rb:647
-msgid ""
-"Invalid characters in arbitrary option value. Do not use spaces or tabs. Try "
-"again."
+msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
 msgstr "自由选项值中有无效字符。不要使用空格或 Tab。请重试。"
 
 #. help text, richtext format
 #: src/modules/FileSystems.rb:651
 msgid ""
 "<p><b>Arbitrary Option Value:</b>\n"
-"In this field, type any legal mount option allowed in the fourth field of /"
-"etc/fstab.\n"
+"In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n"
 "Multiple options are separated by commas.</p>\n"
 msgstr ""
 "<p><b>任意选项值</b>：\n"
@@ -5386,8 +5299,7 @@
 #: src/modules/FileSystems.rb:706
 msgid ""
 "<p><b>Codepage for Short FAT Names:</b>\n"
-"This codepage is used for converting to shortname characters on FAT file "
-"systems.</p>\n"
+"This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
 msgstr ""
 "<p><b>文件配置表短名称的代码页：</b>\n"
 "此代码页用于 FAT 文件系统上的短名称字符转换。</p>\n"
@@ -5401,8 +5313,7 @@
 #: src/modules/FileSystems.rb:726
 msgid ""
 "<p><b>Number of FATs:</b>\n"
-"Specify the number of file allocation tables in the file system. The default "
-"is 2.</p>"
+"Specify the number of file allocation tables in the file system. The default is 2.</p>"
 msgstr ""
 "<p><b>文件配置表数量：</b>\n"
 "指定文件系统中的文件配置表的数量。默认值是 2。</p>"
@@ -5416,13 +5327,10 @@
 #: src/modules/FileSystems.rb:746
 msgid ""
 "<p><b>FAT Size:</b>\n"
-"Specifies the type of file allocation tables used (12, 16, or 32-bit). If "
-"auto is specified, YaST will automatically select the value most suitable "
-"for the file system size.</p>\n"
+"Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
 msgstr ""
 "<p><b>文件配置表尺寸：</b>\n"
-"指定所用文件配置表的类型(12 位、16 位或 32 位)。如果指定自动选项，YaST2 将为"
-"文件系统尺寸自动选择最适合的值。</p>\n"
+"指定所用文件配置表的类型(12 位、16 位或 32 位)。如果指定自动选项，YaST2 将为文件系统尺寸自动选择最适合的值。</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:755
@@ -5452,8 +5360,7 @@
 #: src/modules/FileSystems.rb:787
 msgid ""
 "<p><b>Hash Function:</b>\n"
-"This specifies the name of the hash function to use to sort the file names "
-"in directories.</p>\n"
+"This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
 msgstr ""
 "<p><b>哈希函数：</b>\n"
 "此选项指定对文件夹中的文件名进行排序所用的哈希函数的名称。</p>\n"
@@ -5467,14 +5374,10 @@
 #: src/modules/FileSystems.rb:803
 msgid ""
 "<p><b>FS Revision:</b>\n"
-"This option defines the reiserfs format revision to use. '3.5' is for "
-"backwards compatibility with kernels of the 2.2.x series. '3.6' is more "
-"recent, but can only be used with kernel versions greater than or equal to "
-"2.4.</p>\n"
+"This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
 msgstr ""
 "<p><b>文件系统修订版本：</b>\n"
-"此选项定义要使用的 reiserfs 修订版本。\"3.5\"用于向后兼容 2.2.x 系列的内"
-"核。\"3.6\"是最新的，但只能用于 2.4 或更高版本的内核。</p>\n"
+"此选项定义要使用的 reiserfs 修订版本。\"3.5\"用于向后兼容 2.2.x 系列的内核。\"3.6\"是最新的，但只能用于 2.4 或更高版本的内核。</p>\n"
 
 #. label text
 #. label text
@@ -5486,13 +5389,10 @@
 #: src/modules/FileSystems.rb:823
 msgid ""
 "<p><b>Block Size:</b>\n"
-"Specify the size of blocks in bytes. Valid block size values are 512, 1024, "
-"2048 and 4096 bytes per block. If auto is selected, the standard block size "
-"of 4096 is used.</p>\n"
+"Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
 msgstr ""
 "<p><b>块尺寸：</b>\n"
-"指定以字节计的块尺寸。有效的块尺寸值为每个块 512、1024、2048 和 4096 字节。如"
-"果选中自动选项，将使用 4096 这个标准块尺寸。</p>\n"
+"指定以字节计的块尺寸。有效的块尺寸值为每个块 512、1024、2048 和 4096 字节。如果选中自动选项，将使用 4096 这个标准块尺寸。</p>\n"
 
 #. label text
 #. label text
@@ -5519,12 +5419,10 @@
 #: src/modules/FileSystems.rb:875
 msgid ""
 "<p><b>Percentage of Inode Space:</b>\n"
-"The option \"Percentage of Inode Space\" specifies the maximum percentage of "
-"space in the file system that can be allocated to inodes.</p>\n"
+"The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
 msgstr ""
 "<p><b>索引节点空间百分比：</b>\n"
-"\"索引节点空间百分比\"选项指定文件系统中可分配给索引节点的最大空间百分比。\n"
+"\"索引节点空间百分比\"选项指定文件系统中可分配给索引节点的最大空间百分比。</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:884
@@ -5535,8 +5433,7 @@
 #: src/modules/FileSystems.rb:890
 msgid ""
 "<p><b>Inode Aligned:</b>\n"
-"The option \"Inode Aligned\" is used to specify whether inode allocation is "
-"or\n"
+"The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
 "is not aligned. By default inodes are aligned, which\n"
 "is usually more efficient than unaligned access.</p>\n"
 msgstr ""
@@ -5564,8 +5461,7 @@
 #: src/modules/FileSystems.rb:934
 msgid ""
 "<p><b>Log Size</b>\n"
-"Set the log size (in megabytes). If auto, the default is 40% of the "
-"aggregate size.</p>\n"
+"Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
 msgstr ""
 "<p><b>日志尺寸</b>\n"
 "设置日志尺寸(以 MB 计)。如果选择自动选项，默认值为总尺寸的 40%。</p>\n"
@@ -5606,13 +5502,10 @@
 #: src/modules/FileSystems.rb:987
 msgid ""
 "<p><b>Block Size:</b>\n"
-"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, "
-"and 4096 bytes per block. If auto is selected, the block size is determined "
-"by the file system size and the expected use of the file system.</p>\n"
+"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
 msgstr ""
 "<p><b>块尺寸：</b>\n"
-"指定以字节计的块尺寸。有效的块尺寸值为每个块 1024、2048 和 4096 字节。如果选"
-"中自动选项，块尺寸将由文件系统的尺寸和预期使用量来决定。</p>\n"
+"指定以字节计的块尺寸。有效的块尺寸值为每个块 1024、2048 和 4096 字节。如果选中自动选项，块尺寸将由文件系统的尺寸和预期使用量来决定。</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:996
@@ -5628,15 +5521,12 @@
 "bytes-per-inode ratio, the fewer inodes will be created.  Generally, this\n"
 "value should not be smaller than the block size of the file system, or else\n"
 "too many inodes will be created. It is not possible to expand the number of\n"
-"inodes on a file system after its creation. So be sure to enter a "
-"reasonable\n"
+"inodes on a file system after its creation. So be sure to enter a reasonable\n"
 "value for this parameter.</p>\n"
 msgstr ""
 "<p><b>每索引节点的字节数：</b>\n"
-"指定字节与索引节点的比率。YaST2 为磁盘上每 <bytes-per-inode> 个字节的空"
-"间创建一个索引节点。字节/索引节点 之比越大，创建的索引节点越少。\n"
-"通常这个值不应小于文件系统中的块尺寸，因为若比块小的话就会创建太多的索引节"
-"点。 创建文件系统后，将无法扩展其中的索引节点的个数，\n"
+"指定字节与索引节点的比率。YaST2 为磁盘上每 <bytes-per-inode> 个字节的空间创建一个索引节点。字节/索引节点 之比越大，创建的索引节点越少。\n"
+"通常这个值不应小于文件系统中的块尺寸，因为若比块小的话就会创建太多的索引节点。 创建文件系统后，将无法扩展其中的索引节点的个数，\n"
 "因此务必为此参数输入一个合理值。</p>\n"
 
 #. label text
@@ -5656,14 +5546,8 @@
 #. xgettext: no-c-format
 #. help text, richtext format
 #: src/modules/FileSystems.rb:1033
-msgid ""
-"<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of "
-"blocks reserved for the super user. The default is computed so that normally "
-"1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved "
-"default is 0.1.</p>"
-msgstr ""
-"<p><b>为 root 保留的块的百分比：</b>指定为超级用户保留的块的百分比。该值默认"
-"会自动计算，通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>"
+msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
+msgstr "<p><b>为 root 保留的块的百分比：</b>指定为超级用户保留的块的百分比。该值默认会自动计算，通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>"
 
 #. checkbox text
 #: src/modules/FileSystems.rb:1042
@@ -5702,21 +5586,19 @@
 #: src/modules/FileSystems.rb:1103
 msgid ""
 "<p><b>No Journal:</b>\n"
-"Suppressed use of journaling on filesystem. Only activate this when you "
-"really\n"
+"Suppressed use of journaling on filesystem. Only activate this when you really\n"
 "know what you are doing.</p>\n"
 msgstr ""
 "<p><b>禁用日志：</b>\n"
-"不在文件系统中使用日志功能。只有在您真正知道您在做什么的时候才可以激活。\n"
+"不在文件系统中使用日志功能。只有在您真正知道您在做什么的时候才可以激活。</p>\n"
 
 #. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:936
+#: src/modules/Partitions.rb:937
 msgid "Operation not permitted on disk %{device}.\n"
 msgstr "磁盘 %{device} 上不允许该操作。\n"
 
 #. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:941
+#: src/modules/Partitions.rb:942
 msgid ""
 "\n"
 "It's not supported by the partitioning tool parted to change\n"
@@ -5736,7 +5618,7 @@
 "添加、缩放，或移除分区操作。\n"
 
 #. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:953
+#: src/modules/Partitions.rb:954
 msgid ""
 "\n"
 "The partitioning on your disk %{device} is either not readable or not \n"
@@ -5756,7 +5638,7 @@
 "添加、缩放或移除分区操作。\n"
 
 #. popup text %{device} is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:965
+#: src/modules/Partitions.rb:966
 msgid ""
 "\n"
 "The disk %{device} does not contain a partition table but for\n"
@@ -5774,7 +5656,7 @@
 "但您无法在这里缩放或移除那个磁盘中的那个分区。\n"
 
 #. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:982
 msgid ""
 "\n"
 "\n"
@@ -5790,7 +5672,7 @@
 "所有数据。\n"
 
 #. popup text
-#: src/modules/Partitions.rb:991
+#: src/modules/Partitions.rb:992
 msgid ""
 "\n"
 "\n"
@@ -5959,8 +5841,7 @@
 
 #. TRANSLATORS: error popup
 #: src/modules/Storage.rb:5262
-msgid ""
-"Partitions cannot be created since other partitions on the disk are used."
+msgid "Partitions cannot be created since other partitions on the disk are used."
 msgstr "无法创建分区因为磁盘上的其它分区正在使用中。"
 
 #: src/modules/Storage.rb:5288
@@ -6007,8 +5888,7 @@
 "the installation.\n"
 msgstr ""
 "\n"
-"无法移除设备 %1 因为这将间接地修改设备 %2，后者含有激活的 swap，那是运行安装"
-"所需要的。\n"
+"无法移除设备 %1 因为这将间接地修改设备 %2，后者含有激活的 swap，那是运行安装所需要的。\n"
 
 #: src/modules/Storage.rb:5380
 msgid ""
@@ -6270,26 +6150,22 @@
 #: src/modules/StorageFields.rb:346
 msgid ""
 "<b>Mount by</b> indicates how the file system\n"
-"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) "
-"by\n"
+"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) by\n"
 "file system UUID, (ID) by device ID, and (Path) by device path.\n"
 msgstr ""
 "<b>挂载方式</b>表示文件系统的挂载方式：(Kernel) 通过内核名称、\n"
-" (Label) 通过文件系统标签、(UUID) 通过文件系统 UUID、(ID) 通过设备 ID 和 "
-"(Path) 通过设备路径。\n"
+" (Label) 通过文件系统标签、(UUID) 通过文件系统 UUID、(ID) 通过设备 ID 和 (Path) 通过设备路径。\n"
 
 #. helptext for table column and overview entry
 #: src/modules/StorageFields.rb:356
 msgid ""
 "A question mark (?) indicates that\n"
 "the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted\n"
-"manually or by some automount system. When changing settings for this "
-"volume\n"
+"manually or by some automount system. When changing settings for this volume\n"
 "YaST will not update <tt>/etc/fstab</tt>.\n"
 msgstr ""
 "问号 (?) 表示该文件系统未列于 <tt>/etc/fstab</tt> 中。\n"
-"它要么是手动挂载的要么是由某些自动挂载系统挂载的。当改变此卷的设置时，YaST 将"
-"不会更新 <tt>/etc/fstab</tt>。\n"
+"它要么是手动挂载的要么是由某些自动挂载系统挂载的。当改变此卷的设置时，YaST 将不会更新 <tt>/etc/fstab</tt>。\n"
 
 #. helptext for table column and overview entry
 #: src/modules/StorageFields.rb:368
@@ -6302,8 +6178,7 @@
 #: src/modules/StorageFields.rb:374
 msgid ""
 "An asterisk (*) after the mount point\n"
-"indicates a file system that is currently not mounted (for example, because "
-"it\n"
+"indicates a file system that is currently not mounted (for example, because it\n"
 "has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>)."
 msgstr ""
 "挂载点后面的星号 (*) 表示此文件系统目前未挂载\n"
@@ -6646,35 +6521,33 @@
 "存储子系统被应用程序 “%1” 锁定 (%2)。\n"
 "继续前您必须退出该应用程序。"
 
-#. enable snapshots for root volume if desired
+#. bsc#983003
 #. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702
-msgid ""
-"Resize impossible due to inconsistent file system. Try checking file system "
-"under Windows."
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
+msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr "由于文件系统不一致，无法调整尺寸。请试试在 Windows 下检查文件系统。"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6217
+#: src/modules/StorageProposal.rb:6239
 msgid "File System for Root Partition"
 msgstr "根分区文件系统"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6264
+#: src/modules/StorageProposal.rb:6286
 msgid "File System for Home Partition"
 msgstr "主分区文件系统"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6304
 msgid "Enlarge &Swap for Suspend"
 msgstr "增大 &Swap 用于挂起"
 
-#: src/modules/StorageProposal.rb:6292
+#: src/modules/StorageProposal.rb:6314
 msgid "Proposal Settings"
 msgstr "提案设置"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6307
+#: src/modules/StorageProposal.rb:6329
 msgid ""
 "<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
 "Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
@@ -6685,7 +6558,7 @@
 "选择 <b>加密的基于 LVM 的提案</b>。</p>"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6315
+#: src/modules/StorageProposal.rb:6337
 msgid ""
 "<p>The filesystem for the root partition can be selected with the\n"
 "corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -6697,47 +6570,45 @@
 "这也将增加根分区的大小。</p>"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6324
+#: src/modules/StorageProposal.rb:6346
 msgid ""
 "<p>The proposal can create a separate home partition. The filesystem for\n"
 "the home partition can be selected with the corresponding combo box.</p>"
-msgstr ""
-"<p>该提案可创建一个独立 home 分区。可使用相应复选框选择 home 分区的文件系统。"
-"</p>"
+msgstr "<p>该提案可创建一个独立 home 分区。可使用相应复选框选择 home 分区的文件系统。</p>"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6331
+#: src/modules/StorageProposal.rb:6353
 msgid ""
 "<p>The swap partition can be made large enough to be used to suspend\n"
 "the system to disk in most cases.</p>"
 msgstr "<p>多数时候 swap 分区可分大一些以用于将系统挂起到硬盘。</p>"
 
-#: src/modules/StorageProposal.rb:6356
+#: src/modules/StorageProposal.rb:6378
 msgid "Enter your password for the proposal encryption."
 msgstr "请输入您的密码以在提案中应用加密。"
 
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6363
+#: src/modules/StorageProposal.rb:6385
 msgid "Password:"
 msgstr "密码："
 
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6374
+#: src/modules/StorageProposal.rb:6396
 msgid "Reenter the password for verification:"
 msgstr "请再次确认密码："
 
 #. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6572
+#: src/modules/StorageProposal.rb:6594
 msgid "&Partition-based Proposal"
 msgstr "基于分区的提案(&P)"
 
-#: src/modules/StorageProposal.rb:6574
+#: src/modules/StorageProposal.rb:6596
 msgid "&LVM-based Proposal"
 msgstr "基于 &LVM 的提案"
 
-#: src/modules/StorageProposal.rb:6576
+#: src/modules/StorageProposal.rb:6598
 msgid "&Encrypted LVM-based Proposal"
 msgstr "加密的基于 LVM 的提案(&E)"
 
@@ -6850,16 +6721,13 @@
 
 #~ msgid ""
 #~ "You have mounted a partition with Btrfs to the\n"
-#~ "mount point /. This will very likely cause problems. Use a Linux file "
-#~ "system,\n"
-#~ "such as ext3 or ext4, for this mount point or an extra partition for /"
-#~ "boot.\n"
+#~ "mount point /. This will very likely cause problems. Use a Linux file system,\n"
+#~ "such as ext3 or ext4, for this mount point or an extra partition for /boot.\n"
 #~ "\n"
 #~ "Really use this setup?\n"
 #~ msgstr ""
 #~ "您试图在挂载点 / 挂载 Btrfs 分区。这很容易造成问题。\n"
-#~ "对于这个挂载点，请使用 Linux 文件系统，如 ext3 或 ext4,或为 /boot 使用额外"
-#~ "的分区。\n"
+#~ "对于这个挂载点，请使用 Linux 文件系统，如 ext3 或 ext4,或为 /boot 使用额外的分区。\n"
 #~ "\n"
 #~ "真的使用此设置吗？\n"
 
@@ -6917,12 +6785,9 @@
 #~ msgid ""
 #~ "<p><b>Mount in /etc/fstab By:</b>\n"
 #~ "Normally, a file system to mount is identified in /etc/fstab\n"
-#~ "by the device name. This identification can be changed so the file system "
-#~ "to mount\n"
-#~ "is found by searching for a UUID or a volume label. Not all file systems "
-#~ "can be\n"
-#~ "mounted by UUID or a volume label. If an option is disabled, it is not "
-#~ "possible.\n"
+#~ "by the device name. This identification can be changed so the file system to mount\n"
+#~ "is found by searching for a UUID or a volume label. Not all file systems can be\n"
+#~ "mounted by UUID or a volume label. If an option is disabled, it is not possible.\n"
 #~ msgstr ""
 #~ "<p><b>挂载 /etc/fstab 的方式：</b>\n"
 #~ "通常情况下，在 /etc/fstab\n"
@@ -6957,12 +6822,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "This mount point corresponds to a temporary filesystem like /tmp or /var/"
-#~ "tmp.\n"
-#~ "You may leave the crypt password empty. If you do this, the system will "
-#~ "create \n"
-#~ "a random password at system startup for you. This means, you will lose "
-#~ "all \n"
+#~ "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
+#~ "You may leave the crypt password empty. If you do this, the system will create \n"
+#~ "a random password at system startup for you. This means, you will lose all \n"
 #~ "data on these filesystems at system shutdown.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -7095,12 +6957,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Depending on the size of your hard disk and your processor speed, this "
-#~ "action\n"
-#~ "might take some time.  Several minutes are not unusual for really large "
-#~ "disks.\n"
-#~ "Often, the progress meter does not show a linear progress. Even if it "
-#~ "looks\n"
+#~ "Depending on the size of your hard disk and your processor speed, this action\n"
+#~ "might take some time.  Several minutes are not unusual for really large disks.\n"
+#~ "Often, the progress meter does not show a linear progress. Even if it looks\n"
 #~ "slow near the end (\"95 %\"), please be patient. The formatting tool \n"
 #~ "performs various checks. </p>"
 #~ msgstr ""
@@ -7550,9 +7409,7 @@
 #~ msgid "Create file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"
 #~ msgstr "使用 %4$s 将文件 %2$s 的基于文件的设备 %1$s(%3$s) 创建为 %5$s"
 
-#~ msgid ""
-#~ "Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with "
-#~ "%4$s"
+#~ msgid "Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"
 #~ msgstr "使用 %4$s 将文件 %2$s 的加密且基于文件的设备 %1$s(%3$s) 创建为 %5$s"
 
 #~ msgid "Create file-based device %1$s of file %2$s (%3$s)"
@@ -7564,8 +7421,7 @@
 #~ msgid "Format file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
 #~ msgstr "使用 %4$s 将 %2$s 的基于文件的设备 %1$s(%3$s) 格式化为 %5$s"
 
-#~ msgid ""
-#~ "Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
+#~ msgid "Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
 #~ msgstr "使用 %4$s 将 %2$s 加密且基于文件的设备 %1$s(%3$s) 格式化为 %5$s"
 
 #~ msgid "Format file-based device %1$s of %2$s (%3$s) with %4$s"
@@ -7661,8 +7517,7 @@
 
 #, fuzzy
 #~| msgid "Create encrypted software RAID %1$s (%2$s) for %4$s with %3$s"
-#~ msgid ""
-#~ "Create encrypted software RAID %1$s (%2$s) from %5$s for %4$s with %3$s"
+#~ msgid "Create encrypted software RAID %1$s (%2$s) from %5$s for %4$s with %3$s"
 #~ msgstr "使用 %3$s 创建加密软件 RAID %1$s(%2$s) 以作为 %4$s"
 
 #, fuzzy
@@ -7882,8 +7737,7 @@
 #~ msgstr "可用空间 (%1)"
 
 #~ msgid ""
-#~ "Your NTFS file system has %1 %3 free space available. Due to limitations "
-#~ "in\n"
+#~ "Your NTFS file system has %1 %3 free space available. Due to limitations in\n"
 #~ "the NTFS resizer, the file system can only be shrunk by up to %2 %3.\n"
 #~ "To be able to shrink the file system more, boot your Windows\n"
 #~ "system and run a disk defragmentation program under Windows to move\n"
@@ -8194,46 +8048,31 @@
 #~ "<p>对于现有分区，您可以更改除了分区起始位置和分区大小\n"
 #~ "之外的所有参数。</p>"
 
-#~ msgid ""
-#~ "<p>First, choose the type of the partition and whether this partition "
-#~ "should be formatted.</p>"
+#~ msgid "<p>First, choose the type of the partition and whether this partition should be formatted.</p>"
 #~ msgstr "<p>首先，选择分区的类型以及是否应对此分区进行格式化。</p>"
 
 #~ msgid "<p>Then, enter the mount point ( /, /boot, /usr, /var, etc.)</p>"
 #~ msgstr "<p>然后，输入挂载点(/、/boot、/usr、/var 等)。</p>"
 
-#~ msgid ""
-#~ "<p>To change the start or end cylinder, delete this partition then create "
-#~ "a new one with the new parameters. All data on this partition will be "
-#~ "lost.</p>"
-#~ msgstr ""
-#~ "<p>要更改起始或结束柱面，应删除此分区，然后用新参数创建新分区。该操作将导"
-#~ "致此分区上的所有数据全部丢失。</p>"
+#~ msgid "<p>To change the start or end cylinder, delete this partition then create a new one with the new parameters. All data on this partition will be lost.</p>"
+#~ msgstr "<p>要更改起始或结束柱面，应删除此分区，然后用新参数创建新分区。该操作将导致此分区上的所有数据全部丢失。</p>"
 
-#~ msgid ""
-#~ "<p>Now, enter the location of the new partition on your hard disk. </p>"
+#~ msgid "<p>Now, enter the location of the new partition on your hard disk. </p>"
 #~ msgstr "<p>现在，输入新分区在硬盘上所处的位置。</p>"
 
 #~ msgid "<p>Please enter the starting cylinder number of the partition. </p>"
 #~ msgstr "<p>请输入该分区的起始柱面值。</p>"
 
-#~ msgid ""
-#~ "<p>After that, either specify an ending cylinder number or an offset from "
-#~ "the first cylinder (e.g., +66).</p>"
-#~ msgstr ""
-#~ "<p>然后，可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。</p>"
+#~ msgid "<p>After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66).</p>"
+#~ msgstr "<p>然后，可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。</p>"
 
-#~ msgid ""
-#~ "<p>It is also possible to specify the size of the partition directly (e."
-#~ "g., +100M or +20000K).</p>"
+#~ msgid "<p>It is also possible to specify the size of the partition directly (e.g., +100M or +20000K).</p>"
 #~ msgstr "<p>也可以直接指定分区的大小(如 +100M 或 +20000K)。</p>"
 
 #~ msgid ""
 #~ "<p>Enter the starting cylinder number of the partition.\n"
-#~ "After that, either specify an ending cylinder number or an offset from "
-#~ "the first cylinder (e.g., +66).\n"
-#~ "It is also possible to specify the size of the partition directly (e.g., "
-#~ "+2G, +100M, or +20000K).</p>\n"
+#~ "After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66).\n"
+#~ "It is also possible to specify the size of the partition directly (e.g., +2G, +100M, or +20000K).</p>\n"
 #~ msgstr ""
 #~ "<p>输入分区的起始柱面值。\n"
 #~ "然后，可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。\n"
@@ -8246,8 +8085,7 @@
 #~ "<p>\n"
 #~ "This is intended for <b>experts</b>.\n"
 #~ "If you are not familiar with the concepts of hard disk <b>partitions</b>\n"
-#~ "and how to use them, you might want to go back and select <b>automatic\n"
+#~ "and how to use them, you might want to go back and select <b>automatic</b>\n"
 #~ "partitioning.\n"
 #~ "</p>"
 #~ msgstr ""
@@ -8261,8 +8099,7 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "Please note that <b>nothing will be written to your hard disk</b>\n"
-#~ "until you confirm the entire installation in the last installation "
-#~ "dialog.\n"
+#~ "until you confirm the entire installation in the last installation dialog.\n"
 #~ "Until that point, you can safely abort the installation.\n"
 #~ "</p>"
 #~ msgstr ""
@@ -8298,8 +8135,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The table to the right shows the current partitions on all your hard "
-#~ "disks.\n"
+#~ "The table to the right shows the current partitions on all your hard disks.\n"
 #~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8346,10 +8182,8 @@
 #~ msgstr "<p><tt>/dev/sda2 </tt>第 1 个磁盘上的第 2 个主分区。</p>"
 
 #~ msgid ""
-#~ "<p><tt>/dev/sda5 </tt>1st logical partition within the extended partition "
-#~ "on\n"
-#~ "the first disk. <b>Note:</b> this is always #5, even if there are less "
-#~ "than four\n"
+#~ "<p><tt>/dev/sda5 </tt>1st logical partition within the extended partition on\n"
+#~ "the first disk. <b>Note:</b> this is always #5, even if there are less than four\n"
 #~ "primary partitions.</p>"
 #~ msgstr ""
 #~ "<p><tt>/dev/sda5 </tt>第 1 个磁盘上的扩展分区中的第 1 个逻辑分区。\n"
@@ -8361,8 +8195,7 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "On the i386 platform (i.e., normal PCs), there cannot be more than four\n"
-#~ "<b>primary partitions</b> on any hard disk, because the respective table "
-#~ "in the\n"
+#~ "<b>primary partitions</b> on any hard disk, because the respective table in the\n"
 #~ "master boot record cannot contain more than four entries.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8385,11 +8218,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "If you have an older PC and want to boot from a partition, make sure it "
-#~ "ends below this\n"
+#~ "If you have an older PC and want to boot from a partition, make sure it ends below this\n"
 #~ "1024 cylinder boundary. Create a separate partition and mount it as\n"
-#~ "<b>/boot</b>, if necessary. A partition consisting of one single "
-#~ "cylinder\n"
+#~ "<b>/boot</b>, if necessary. A partition consisting of one single cylinder\n"
 #~ "(at least 64 MB) is usually sufficient for that.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8403,8 +8234,7 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "One of the four primary partitions may be an <b>extended partition</b>.\n"
-#~ "This extended partition can contain one or more <b>logical partitions.\n"
+#~ "This extended partition can contain one or more <b>logical partitions</b>.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8431,8 +8261,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "In connection with advanced boot managers such as <b>GRUB</b>, you can "
-#~ "even\n"
+#~ "In connection with advanced boot managers such as <b>GRUB</b>, you can even\n"
 #~ "boot your computer from a logical partition.\n"
 #~ "</p>"
 #~ msgstr ""
@@ -8445,8 +8274,7 @@
 #~ "<p>\n"
 #~ "The extended partition will <b>overlap</b> with the logical\n"
 #~ "partitions: for an extended partition from cylinder 200 to 500, logical\n"
-#~ "partitions could range from, for example, 200 to 250, 251 to 400, and 401 "
-#~ "to 500.\n"
+#~ "partitions could range from, for example, 200 to 250, 251 to 400, and 401 to 500.\n"
 #~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8458,20 +8286,17 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "An asterisk (*) after the mount point indicates a file system that is\n"
-#~ "currently not mounted (for example, because it has the <tt>noauto</tt> "
-#~ "option set in <tt>/etc/fstab</tt>).\n"
+#~ "currently not mounted (for example, because it has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>).\n"
 #~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "挂载点后面的星号 (*) 表示此文件系统\n"
-#~ "当前未挂载(例如由于在 <tt>/etc/fstab</tt> 中设置了它的 <tt>noauto</tt> 选"
-#~ "项)。\n"
+#~ "当前未挂载(例如由于在 <tt>/etc/fstab</tt> 中设置了它的 <tt>noauto</tt> 选项)。\n"
 #~ " </p>\n"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The column labeled <b>F</b> contains flags. <tt>C</tt> means the "
-#~ "partition is encrypted. \n"
+#~ "The column labeled <b>F</b> contains flags. <tt>C</tt> means the partition is encrypted. \n"
 #~ "<tt>F</tt> means the partition is selected to be formatted.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8483,8 +8308,7 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Used By</b> tells if a device is used by LVM or RAID. If you do not "
-#~ "use such\n"
+#~ "<b>Used By</b> tells if a device is used by LVM or RAID. If you do not use such\n"
 #~ "things, it is perfectly normal for this column to be empty.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8495,8 +8319,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Mount By</b> indicates how the file system is mounted: (K) by Kernel "
-#~ "Name,\n"
+#~ "<b>Mount By</b> indicates how the file system is mounted: (K) by Kernel Name,\n"
 #~ "(L) by Label, (U) by UUID, (I) by Device ID, and (P) by Device Path.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8516,11 +8339,9 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The table to the right shows the current partitions on all your hard "
-#~ "disks.\n"
+#~ "The table to the right shows the current partitions on all your hard disks.\n"
 #~ "<b>Nothing will be written to your hard disk</b>\n"
-#~ "until you confirm the entire installation in the last installation "
-#~ "dialog.\n"
+#~ "until you confirm the entire installation in the last installation dialog.\n"
 #~ "Until that point, you can safely abort the installation.</p>"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8785,8 +8606,7 @@
 #~ "<p>\n"
 #~ "Logical volumes are\n"
 #~ "usable almost everywhere normal <b>disk partitions</b> can be used.\n"
-#~ "You can create file systems on logical volumes and use them, for example, "
-#~ "as swap \n"
+#~ "You can create file systems on logical volumes and use them, for example, as swap \n"
 #~ "or as raw partitions for databases.</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8798,8 +8618,7 @@
 #~ msgid ""
 #~ "<p>\n"
 #~ "If there is still unallocated\n"
-#~ "physical storage in a volume group and you use <b>reiserfs</b> as your "
-#~ "file system,\n"
+#~ "physical storage in a volume group and you use <b>reiserfs</b> as your file system,\n"
 #~ "extend a logical volume and the underlying file system while it\n"
 #~ "is <b>mounted</b> and in <b>use</b>.</p>\n"
 #~ msgstr ""
@@ -8813,8 +8632,7 @@
 #~ "<p>\n"
 #~ "The logical volumes need to be large enough\n"
 #~ "to hold all the files to install now, but you do not necessarily need to\n"
-#~ "allocate all your physical storage now. The file systems can be "
-#~ "increased \n"
+#~ "allocate all your physical storage now. The file systems can be increased \n"
 #~ "later while your system is in use.\n"
 #~ "</p>\n"
 #~ msgstr ""
@@ -8825,15 +8643,12 @@
 #~ "可随时扩展文件系统。\n"
 #~ "</p>\n"
 
-#~ msgid ""
-#~ "<p><b>Add partitions</b> (called physical volumes) to your volume group."
+#~ msgid "<p><b>Add partitions</b> (called physical volumes) to your volume group.</p>"
 #~ msgstr "<p>向卷组<b>添加分区</b>(称为物理卷)</p>"
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "The volume group forms the <b>storage pool</b> from which your logical "
-#~ "volumes,\n"
+#~ "The volume group forms the <b>storage pool</b> from which your logical volumes,\n"
 #~ "like virtual partitions, are allocated.</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
@@ -8842,8 +8657,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Under normal circumstances, there is no need to have more than one "
-#~ "volume \n"
+#~ "Under normal circumstances, there is no need to have more than one volume \n"
 #~ "group. If you need more than one volume group for special reasons,\n"
 #~ "create them here. Each volume group must have at least one partition \n"
 #~ "that belongs to that volume group.</p>\n"
@@ -8856,8 +8670,7 @@
 
 #~ msgid ""
 #~ "<p>\n"
-#~ "Each physical volume belongs <b>to exactly one</b> volume group. Assign "
-#~ "all\n"
+#~ "Each physical volume belongs <b>to exactly one</b> volume group. Assign all\n"
 #~ "partitions to use with Linux LVM to volume groups.</p>\n"
 #~ msgstr ""
 #~ "<p>\n"

Modified: trunk/yast/zh_CN/po/update.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/update.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/update.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: update\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2015-10-18 12:10+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -427,7 +427,7 @@
 msgstr "这些文件均不存在：%1"
 
 #. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
 msgid ""
 "The installed product is not compatible with the product\n"
 "on the installation media. If you try to update using the\n"
@@ -868,13 +868,13 @@
 #. -----------------------------------------------------------------------
 #. GLOBAL FUNCTIONS
 #. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
 msgid "Unknown Product"
 msgstr "未知产品"
 
 #. If the current default desktop is not installed, it's a valid use case
 #. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
 msgid ""
 "Cannot select these patterns required for installation:\n"
 "%{patterns}"
@@ -882,7 +882,7 @@
 "无法选择这些安装所需的软件集：\n"
 "%{patterns}"
 
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
 msgid ""
 "Cannot select these packages required for installation:\n"
 "%{packages}"

Modified: trunk/yast/zh_CN/po/users.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/users.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/users.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: users\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2016-06-05 16:44+0800\n"
 "Last-Translator: marguerite \n"
 "Language-Team: Chinese \n"
@@ -102,9 +102,7 @@
 
 #. translators: command line help text for 'user' option
 #: src/clients/groups.rb:218
-msgid ""
-"List of group members, usually usernames, separated by commas. The list of "
-"LDAP user DNs must be separated by colons."
+msgid "List of group members, usually usernames, separated by commas. The list of LDAP user DNs must be separated by colons."
 msgstr "组成员(通常是用户名)列表，用逗号隔开。LDAP 用户判别名列表必须用冒号隔开。"
 
 #. translators: command line help text for new_groupname option
@@ -259,8 +257,7 @@
 #: src/clients/users_plugin_ldap_all.rb:105
 msgid ""
 "<p>\n"
-"Here, see the table of all allowed attributes for the current LDAP entry "
-"that were not set in previous dialogs.</p>"
+"Here, see the table of all allowed attributes for the current LDAP entry that were not set in previous dialogs.</p>"
 msgstr ""
 "<p>\n"
 "在此可以看到在上一个对话框中未设置的当前 LDAP 项的所有允许属性的表。</p>"
@@ -286,8 +283,7 @@
 msgid ""
 "<p>\n"
 "Edit each attribute using <b>Edit</b>. Some attributes \n"
-"could be required, as defined in the user template in the <b>LDAP Client "
-"Module</b>.</p>\n"
+"could be required, as defined in the user template in the <b>LDAP Client Module</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "使用<b>编辑</b>编辑每个属性。根据在 <b>LDAP 客户机模块</b>中\n"
@@ -310,13 +306,8 @@
 
 #. helptext
 #: src/clients/users_plugin_ldap_passwordpolicy.rb:91
-msgid ""
-"<p>Assign a password policy object to this user in <b>DN of Password Policy "
-"object</b>. Activate <b>Reset Password</b> to reset the password of modified "
-"user.</p>"
-msgstr ""
-"<p>在<b>密码策略对象的判别名</b> 中将一个密码策略对象指派给此用户。 激活<b>重"
-"置密码</b>重置已修改用户的密码。</p>"
+msgid "<p>Assign a password policy object to this user in <b>DN of Password Policy object</b>. Activate <b>Reset Password</b> to reset the password of modified user.</p>"
+msgstr "<p>在<b>密码策略对象的判别名</b> 中将一个密码策略对象指派给此用户。 激活<b>重置密码</b>重置已修改用户的密码。</p>"
 
 #. check box label
 #: src/clients/users_plugin_ldap_passwordpolicy.rb:107
@@ -418,34 +409,20 @@
 #: src/clients/users_plugin_quota.rb:101
 msgid ""
 "<p>Define a size limit by specifying the number of 1 KB blocks the\n"
-"user may have on this file system. Additionally, you can define an inode "
-"limit specifying the number of inodes the user may have on the file system.\n"
+"user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p>\n"
 msgstr ""
 "<p>设定大小限制，请指定用户在文件系统中可用的 1 kB 块的个数。\n"
 "或者，您也可以设置 inode 限制，指定用户在文件系统可用的 inode 个数。</p>\n"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:105
-msgid ""
-"<p>You can specify both soft and hard limits for size and number of inodes. "
-"The soft limits define a warning level at which users are informed they are "
-"nearing their limit, whereas the hard limits define the limit at which write "
-"requests are denied.</p>"
-msgstr ""
-"<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别，当快要到"
-"达限制的时候通知用户。而硬限制的限制是，一旦到达，就不能再写入。</p>"
+msgid "<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which users are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>"
+msgstr "<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别，当快要到达限制的时候通知用户。而硬限制的限制是，一旦到达，就不能再写入。</p>"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:109
-msgid ""
-"<p>As soon as the user has reached the soft limit, the input fields for the "
-"grace interval are activated. Specify the time period for which the user is "
-"allowed to exceed the soft limits set above. The countdown of the grace "
-"interval starts immediately.</p>"
-msgstr ""
-"<p>一旦用户到达了软限制，赦免间隔的输入区域就会被激活。指定允许用户超出软限制"
-"的时间。赦免间隔的倒计时会立刻开始。</p>"
+msgid "<p>As soon as the user has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the user is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"
+msgstr "<p>一旦用户到达了软限制，赦免间隔的输入区域就会被激活。指定允许用户超出软限制的时间。赦免间隔的倒计时会立刻开始。</p>"
 
 #. helptext for quota
 #: src/clients/users_plugin_quota.rb:115
@@ -456,34 +433,20 @@
 #: src/clients/users_plugin_quota.rb:119
 msgid ""
 "<p>Define a size limit by specifying the number of 1 kB blocks the\n"
-"group may use on this file system. Additionally, you can define an inode "
-"limit specifying the number of inodes the group may use on the file system.\n"
+"group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system.</p>\n"
 msgstr ""
 "<p>设定大小限制，请指定组在文件系统中可用的 1 kB 块的个数。\n"
 "另外，您也可以设置 inode 限制，指定组在文件系统可用的 inode 个数。</p>\n"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:123
-msgid ""
-"<p>You can specify both soft and hard limits for size and number of inodes. "
-"The soft limits define a warning level at which groups are informed they are "
-"nearing their limit, whereas the hard limits define the limit at which write "
-"requests are denied.</p>"
-msgstr ""
-"<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别，当快要到"
-"达限制的时候通知组。而硬限制的限制是，一旦到达，就不能再写入。</p>"
+msgid "<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which groups are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>"
+msgstr "<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别，当快要到达限制的时候通知组。而硬限制的限制是，一旦到达，就不能再写入。</p>"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:127
-msgid ""
-"<p>As soon as the group has reached the soft limit, the input fields for the "
-"grace interval are activated. Specify the time period for which the group is "
-"allowed to exceed the soft limits set above. The countdown of the grace "
-"interval starts immediately.</p>"
-msgstr ""
-"<p>一旦组到达了软限制，赦免间隔的输入区域就会被激活。指定允许组超出软限制的时"
-"间。赦免间隔的倒计时会立刻开始。</p>"
+msgid "<p>As soon as the group has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the group is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"
+msgstr "<p>一旦组到达了软限制，赦免间隔的输入区域就会被激活。指定允许组超出软限制的时间。赦免间隔的倒计时会立刻开始。</p>"
 
 #. combo box label
 #: src/clients/users_plugin_quota.rb:188
@@ -716,7 +679,7 @@
 #: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
 #: src/include/users/dialogs.rb:2364
 #: src/lib/users/dialogs/inst_root_first.rb:193
-#: src/lib/users/dialogs/inst_user_first.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:471
 msgid ""
 "The passwords do not match.\n"
 "Try again."
@@ -731,8 +694,7 @@
 "'%1' and '%2'\n"
 "were found. Use them for current user?\n"
 "\n"
-"This means that data from this image will be used instead of current home "
-"directory."
+"This means that data from this image will be used instead of current home directory."
 msgstr ""
 "找到加密目录映像 '%1' 和密钥文件 '%2'。以当前用户使用它们吗？\n"
 "\n"
@@ -755,7 +717,7 @@
 #. text entry
 #. text entry
 #: src/include/users/dialogs.rb:403
-#: src/lib/users/dialogs/inst_user_first.rb:582
+#: src/lib/users/dialogs/inst_user_first.rb:583
 msgid "User's &Full Name"
 msgstr "用户的完整名称(&F)"
 
@@ -777,7 +739,7 @@
 #. input field for login name
 #. input field for login name
 #: src/include/users/dialogs.rb:433
-#: src/lib/users/dialogs/inst_user_first.rb:589
+#: src/lib/users/dialogs/inst_user_first.rb:590
 msgid "&Username"
 msgstr "用户名(&U)"
 
@@ -794,7 +756,7 @@
 #. checkbox label
 #. checkbox label
 #: src/include/users/dialogs.rb:470
-#: src/lib/users/dialogs/inst_user_first.rb:613
+#: src/lib/users/dialogs/inst_user_first.rb:614
 msgid "U&se this password for system administrator"
 msgstr "系统管理员使用此密码(&S)"
 
@@ -990,7 +952,7 @@
 #. User can confirm using "invalid" password confirming all the errors
 #: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
 #: src/lib/users/dialogs/inst_root_first.rb:212
-#: src/lib/users/dialogs/inst_user_first.rb:482
+#: src/lib/users/dialogs/inst_user_first.rb:483
 msgid "Really use this password?"
 msgstr "确实要使用此密码吗？"
 
@@ -1106,8 +1068,7 @@
 msgid ""
 "<p>\n"
 "When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or "
-"umlauts. \n"
+"lowercase. Passwords should not contain any accented characters or umlauts. \n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1119,8 +1080,7 @@
 #: src/include/users/helps.rb:73
 msgid ""
 "<p>\n"
-"With the current password encryption (%1), the password length should be "
-"between\n"
+"With the current password encryption (%1), the password length should be between\n"
 " %2 and %3 characters.\n"
 "</p>"
 msgstr ""
@@ -1130,7 +1090,7 @@
 "</p>"
 
 #. help text 4/4
-#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:159
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
 msgid ""
 "<p>\n"
 "To ensure that the password was entered correctly,\n"
@@ -1183,8 +1143,7 @@
 #: src/include/users/helps.rb:123
 msgid ""
 "<p><b>Default Login Shell</b><br>\n"
-"The name of the new user's login shell. Select one from the list or enter "
-"your own path to the shell.</P>\n"
+"The name of the new user's login shell. Select one from the list or enter your own path to the shell.</P>\n"
 msgstr ""
 "<p><b>默认登录壳层</b><br>\n"
 "新用户的登录壳层的名称。请从列表中选择一个壳层，或输入自己的壳层路径。</P>\n"
@@ -1193,8 +1152,7 @@
 #: src/include/users/helps.rb:127
 msgid ""
 "<p><b>Default Home</b><br>\n"
-"The initial path prefix for a new user's home directory. The username is "
-"added\n"
+"The initial path prefix for a new user's home directory. The username is added\n"
 "to the end of this value to create the default name of the home directory.\n"
 "</P>\n"
 msgstr ""
@@ -1207,8 +1165,7 @@
 #: src/include/users/helps.rb:134
 msgid ""
 "<p><b>Skeleton Directory</b><br>\n"
-"The contents of this directory are copied to a user's home directory when a "
-"new user is added. </p>\n"
+"The contents of this directory are copied to a user's home directory when a new user is added. </p>\n"
 msgstr ""
 "<p><b>目录主干</b><br>\n"
 "此目录的内容将在添加新用户时被复制到用户的主目录。</p>\n"
@@ -1227,8 +1184,7 @@
 #: src/include/users/helps.rb:143
 msgid ""
 "<p><b>Expiration Date</b><br>\n"
-"The date on which the user account is disabled. The date must be in the "
-"format\n"
+"The date on which the user account is disabled. The date must be in the format\n"
 "YYYY-MM-DD. Leave it empty if this account never expires.</P>\n"
 msgstr ""
 "<p><b>默认失效日期</b><br>\n"
@@ -1311,7 +1267,7 @@
 "</p>\n"
 
 #. alternative help text 1/7
-#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:138
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
 msgid ""
 "<p>\n"
 "Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
@@ -1329,11 +1285,9 @@
 "Create the <b>Username</b> from components of the full name by\n"
 "clicking <b>Suggestion</b>. It may be modified, but use only\n"
 "letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
 "Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1351,11 +1305,9 @@
 "<p>\n"
 "For the <b>Username</b>, use only\n"
 "letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
 "Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file.  Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file.  Read its man page for information.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1368,32 +1320,26 @@
 
 #. these are used only during installation time
 #. help text 4/7 (only during installation)
-#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:175
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
 msgid ""
 "<p>\n"
-"The username and password created here are needed to log in and work with "
-"your Linux system. With <b>Automatic Login</b> enabled, the login procedure "
-"is skipped. This user is logged in automatically.</p>\n"
+"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
 msgstr ""
 "<p>\n"
-"需要使用在此处创建的用户名和密码来登录并使用 Linux 系统。如果启用<b>自动登录"
-"</b>，则会跳过登录过程。该用户会自动登录。</p>\n"
+"需要使用在此处创建的用户名和密码来登录并使用 Linux 系统。如果启用<b>自动登录</b>，则会跳过登录过程。该用户会自动登录。</p>\n"
 
 #. help text 5/7 (only during installation)
 #: src/include/users/helps.rb:264
 msgid ""
 "<p>\n"
-"Have mail for root forwarded to this user by checking <b>Receive System "
-"Mail</b>.</p>\n"
+"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "通过选中<b>接收系统邮件</b>将 root 用户的邮件转发给该用户。</p>\n"
 
 #. help text 6/7 (only during installation)
 #: src/include/users/helps.rb:269
-msgid ""
-"<p>Press <b>User Management</b> to add more users or groups to your system."
+msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
 msgstr "<p>按<b>用户管理</b>向系统添加更多用户或组。</p>"
 
 #. alternative help text 4/7
@@ -1413,8 +1359,7 @@
 #: src/include/users/helps.rb:286
 msgid ""
 "<p>\n"
-"To edit various password settings of this user, such as expiration date, "
-"click <b>Password Settings</b>.</p>\n"
+"To edit various password settings of this user, such as expiration date, click <b>Password Settings</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "要编辑此用户的多个密码设置(例如失效日期)，请单击<b>密码设置</b>。</p>\n"
@@ -1482,8 +1427,7 @@
 msgid ""
 "<p>\n"
 "<b>Password:</b>\n"
-"To require users who are not members of the group to identify themselves "
-"when\n"
+"To require users who are not members of the group to identify themselves when\n"
 "switching to this group (see the man page of <tt>newgrp</tt>), assign a\n"
 "password to this group. For security reasons, this password is not shown\n"
 "here. This entry is not required.\n"
@@ -1596,9 +1540,7 @@
 
 #. help text for user's home directory mode
 #: src/include/users/helps.rb:430
-msgid ""
-"<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's "
-"home directory different from the default.</p>"
+msgid "<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's home directory different from the default.</p>"
 msgstr "<p>或者，可以将该用户的主目录的<b>主目录权限模式</b>设置为与默认值不同。</p>"
 
 #. alternate helptext 4.5/8; %1 is directory (e.g. '/etc/skel')
@@ -1614,42 +1556,23 @@
 
 #. help text for Move to new location checkbox
 #: src/include/users/helps.rb:452
-msgid ""
-"<p>If changing the location of a user's home directory, move the contents of "
-"the current directory with <b>Move to New Location</b>, activated by "
-"default. Otherwise a new home directory is created without any of the "
-"existing data.</p>"
-msgstr ""
-"<p>如果更改用户主目录的位置，则将默认激活<b>移动到新位置</b>以移动当前目录的"
-"内容。否则，将创建不含任何现有数据的新用户主目录。</p>"
+msgid "<p>If changing the location of a user's home directory, move the contents of the current directory with <b>Move to New Location</b>, activated by default. Otherwise a new home directory is created without any of the existing data.</p>"
+msgstr "<p>如果更改用户主目录的位置，则将默认激活<b>移动到新位置</b>以移动当前目录的内容。否则，将创建不含任何现有数据的新用户主目录。</p>"
 
 #. help text for directory encryption
 #: src/include/users/helps.rb:464
 msgid ""
 "<p>To encrypt the user's home directory, enable <b>Use Encrypted Home\n"
-"Directory</b> and set the directory size. Encrypting a user's home "
-"directory\n"
-"does not provide strong security from other users. If this machine is "
-"shared\n"
+"Directory</b> and set the directory size. Encrypting a user's home directory\n"
+"does not provide strong security from other users. If this machine is shared\n"
 "among multiple users, it may be possible for a user to compromise system\n"
-"security by obtaining another user's key and gaining access to the encrypted "
-"data. If strong security is required, the system should not be physically "
-"shared.</p>"
-msgstr ""
-"<p>要对用户主目录进行加密，请启用<b>使用加密的用户主目录</b>并设置目录的大"
-"小。对某个用户主目录加密并不能保护它免遭其它用户的侵入。如果此计算机由多名用"
-"户共享，其中一名用户获取另一个用户的密钥并访问加密的数据，则可能危及系统安"
-"全。如果安全性要求很高，则系统不应物理共享。</p>"
+"security by obtaining another user's key and gaining access to the encrypted data. If strong security is required, the system should not be physically shared.</p>"
+msgstr "<p>要对用户主目录进行加密，请启用<b>使用加密的用户主目录</b>并设置目录的大小。对某个用户主目录加密并不能保护它免遭其它用户的侵入。如果此计算机由多名用户共享，其中一名用户获取另一个用户的密钥并访问加密的数据，则可能危及系统安全。如果安全性要求很高，则系统不应物理共享。</p>"
 
 #. help text for directory encryption
 #: src/include/users/helps.rb:476
-msgid ""
-"<p>Home directories cannot be encrypted if a fingerprint reader device is "
-"used. To encrypt the user's home directory, disable fingerprint "
-"configuration first.</p>"
-msgstr ""
-"<p>当使用指纹识别装置的时候，用户主目录不能加密。要加密用户的主目录，请先禁用"
-"指纹配置。</p>"
+msgid "<p>Home directories cannot be encrypted if a fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first.</p>"
+msgstr "<p>当使用指纹识别装置的时候，用户主目录不能加密。要加密用户的主目录，请先禁用指纹配置。</p>"
 
 #. alternate helptext 5/8
 #: src/include/users/helps.rb:487
@@ -1742,9 +1665,7 @@
 
 #. helptext for plugin dialog 3/3
 #: src/include/users/helps.rb:552
-msgid ""
-"<p>Start the detailed configuration of a particular plug-in by selecting "
-"<b>Launch</b>.</p>"
+msgid "<p>Start the detailed configuration of a particular plug-in by selecting <b>Launch</b>.</p>"
 msgstr "<p>通过选择<b>起动</b>启动特定插件的详细配置。</p>"
 
 #. help texts 1/1
@@ -1764,9 +1685,7 @@
 "<p>Activate <b>Force Password Change</b> to force the user to change the\n"
 "password at the next login. If <b>Last Password Change</b> is set to\n"
 "<i>Never</i>, the user will be forced to change the password.</p>"
-msgstr ""
-"<p>激活<b>强制更改密码</b>将让用户在下一次登录的时候修改密码。如果<b>上次密码"
-"更改</b>设为<i>永不</i>，用户将必须更改密码。</p>"
+msgstr "<p>激活<b>强制更改密码</b>将让用户在下一次登录的时候修改密码。如果<b>上次密码更改</b>设为<i>永不</i>，用户将必须更改密码。</p>"
 
 #. Help text 2/6
 #: src/include/users/helps.rb:579
@@ -1801,8 +1720,7 @@
 #. Help text 4/6
 #: src/include/users/helps.rb:595
 msgid ""
-"<P><B>Maximum Number of Days for the Same Password</B><BR>Set how many days "
-"a user \n"
+"<P><B>Maximum Number of Days for the Same Password</B><BR>Set how many days a user \n"
 "can use the same password before it expires.</P>\n"
 msgstr ""
 "<P><B>相同密码的最大使用天数</B><BR>设置用户\n"
@@ -1811,12 +1729,10 @@
 #. Help text 5/6
 #: src/include/users/helps.rb:599
 msgid ""
-"<P><B>Minimum Number of Days for the Same Password</B><BR>Set the minimum "
-"age of \n"
+"<P><B>Minimum Number of Days for the Same Password</B><BR>Set the minimum age of \n"
 "a password before a user is allowed to change it.</P>\n"
 msgstr ""
-"<P><B>相同密码的最小有效天数</B><BR>设置密码的最小有效期，只有在这段时间过"
-"后\n"
+"<P><B>相同密码的最小有效天数</B><BR>设置密码的最小有效期，只有在这段时间过后\n"
 "用户才能更改密码。</P>\n"
 
 #. Help text 6/6 : Don't reorder letters YYYY-MM-DD, date must be set in this format
@@ -1850,8 +1766,7 @@
 msgid ""
 "<p>\n"
 "<b>Changing the Values</b><br>\n"
-"You can configure these settings by running appropriate modules. Select the "
-"module with <b>Configure</b>.\n"
+"You can configure these settings by running appropriate modules. Select the module with <b>Configure</b>.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -1861,139 +1776,78 @@
 
 #. help text for Password Policy Dialog
 #: src/include/users/ldap_dialogs.rb:62
-msgid ""
-"<p>Select the <b>Password Change Policies</b>, <b>Password Aging Policies, and <b>Lockout Policies</b> tabs to choose LDAP password policy groups "
-"of attributes to configure.</p>"
-msgstr ""
-"<p>请选择<b>密码更改策略</b>、<b>密码过期策略</b>和<b>锁定策略</b>选项卡，以"
-"选择要配置属性的 LDAP 密码策略组。</p>"
+msgid "<p>Select the <b>Password Change Policies</b>, <b>Password Aging Policies</b>, and <b>Lockout Policies</b> tabs to choose LDAP password policy groups of attributes to configure.</p>"
+msgstr "<p>请选择<b>密码更改策略</b>、<b>密码过期策略</b>和<b>锁定策略</b>选项卡，以选择要配置属性的 LDAP 密码策略组。</p>"
 
 #. help text for pwdInHistory attribute
 #: src/include/users/ldap_dialogs.rb:70
-msgid ""
-"<p>Specify the <b>Maximum Number of Passwords Stored in History</b> to set "
-"how many previously used passwords should be saved. Saved passwords may not "
-"be used.</p>"
-msgstr ""
-"<p>请指定<b>历史中储存密码的最大数量</b>，以设置应保存的以前所用密码的数量。"
-"不能使用已保存的密码。</p>"
+msgid "<p>Specify the <b>Maximum Number of Passwords Stored in History</b> to set how many previously used passwords should be saved. Saved passwords may not be used.</p>"
+msgstr "<p>请指定<b>历史中储存密码的最大数量</b>，以设置应保存的以前所用密码的数量。不能使用已保存的密码。</p>"
 
 #. help text for pwdMustChange attribute
 #: src/include/users/ldap_dialogs.rb:74
-msgid ""
-"<p>Check <b>User Must Change Password after Reset</b> to force users to "
-"change their passwords after the the password is reset or changed by an "
-"administrator.</p>"
-msgstr ""
-"<p>请选中<b>用户必须在重置后更改密码</b>，以强制用户在管理员重置或更改密码后"
-"更改其密码。</p>"
+msgid "<p>Check <b>User Must Change Password after Reset</b> to force users to change their passwords after the the password is reset or changed by an administrator.</p>"
+msgstr "<p>请选中<b>用户必须在重置后更改密码</b>，以强制用户在管理员重置或更改密码后更改其密码。</p>"
 
 #. help text for pwdAllowUserChange attribute
 #: src/include/users/ldap_dialogs.rb:78
-msgid ""
-"<p>Check <b>User Can Change Password</b> to allow users to change their "
-"passwords.</p>"
+msgid "<p>Check <b>User Can Change Password</b> to allow users to change their passwords.</p>"
 msgstr "<p>请选中<b>用户可以更改密码</b>，以允许用户更改其密码。</p>"
 
 #. help text for pwdSafeModify attribute
 #: src/include/users/ldap_dialogs.rb:82
-msgid ""
-"<p>If the existing password must be provided along with the new password, "
-"check <b>Old Password Required for Password Change</b>.</p>"
-msgstr ""
-"<p>如果提供新密码的同时还必须提供现有密码，则选中<b>更改密码时要求提供旧密码"
-"</b>。</p>"
+msgid "<p>If the existing password must be provided along with the new password, check <b>Old Password Required for Password Change</b>.</p>"
+msgstr "<p>如果提供新密码的同时还必须提供现有密码，则选中<b>更改密码时要求提供旧密码</b>。</p>"
 
 #. help text for pwdCheckQuality attribute
 #: src/include/users/ldap_dialogs.rb:86
-msgid ""
-"<p>Select whether the password quality should be verified while passwords "
-"are modified or added. Select <b>No Checking</b> if passwords should not be "
-"checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are "
-"accepted even if the check cannot be performed, for example, if the user has "
-"provided an encrypted password. With <b>Only Accept Checked Passwords</b> "
-"passwords are refused if the quality test fails or the password cannot be "
-"checked.</p>"
-msgstr ""
-"<p>请选择修改或添加密码时是否应校验密码的强度。如果根本不用检查密码，请选择"
-"<b>不检查</b>。如果选择了<b>接受不可检查的密码</b>，则即使无法执行检查（例"
-"如，用户提供的密码是加密的），密码也将被接受。如果选择<b>只接受已检查的密码，则当密码强度测试失败或无法检查密码时，将拒绝该密码。<p>"
+msgid "<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>"
+msgstr "<p>请选择修改或添加密码时是否应校验密码的强度。如果根本不用检查密码，请选择<b>不检查</b>。如果选择了<b>接受不可检查的密码</b>，则即使无法执行检查（例如，用户提供的密码是加密的），密码也将被接受。如果选择<b>只接受已检查的密码</b>，则当密码强度测试失败或无法检查密码时，将拒绝该密码。<p>"
 
 #. help text for pwdMinLength attribute
 #: src/include/users/ldap_dialogs.rb:90
-msgid ""
-"Set the minimum number of characters that must be used in a password in "
-"<b>Minimum Password Length</b>.</p>"
+msgid "Set the minimum number of characters that must be used in a password in <b>Minimum Password Length</b>.</p>"
 msgstr "在<b>最小密码长度</b>中设置密码必须使用的字符的最小数量。</p>"
 
 #. help text for pwdMinAge attribute
 #: src/include/users/ldap_dialogs.rb:94
-msgid ""
-"<p><b>Minimum Password Age</b> sets how much time must pass between "
-"modifications to the password.</p>"
+msgid "<p><b>Minimum Password Age</b> sets how much time must pass between modifications to the password.</p>"
 msgstr "<p><b>最小密码有效期</b>设置修改密码的最小时间间隔。</p>"
 
 #. help text for pwdMaxAge attribute
 #: src/include/users/ldap_dialogs.rb:98
-msgid ""
-"<p><b>Maximum Password Age</b> sets how long after modification a password "
-"expires.</p>"
+msgid "<p><b>Maximum Password Age</b> sets how long after modification a password expires.</p>"
 msgstr "<p><b>最大密码有效期</b>用于设置密码在修改后多长时间过期。</p>"
 
 #. help text for pwdExpireWarning attribute
 #: src/include/users/ldap_dialogs.rb:102
-msgid ""
-"<p>In <b>Time before Password Expiration to Issue Warning</b> set how long "
-"before a password is due to expire that an expiration warning messages "
-"should be given to an authenticating user.</p>"
-msgstr ""
-"<p><b>提前多长时间发出密码失效警告</b>设置在密码失效前多长时间向认证中的用户"
-"发出失效警告消息。</p>"
+msgid "<p>In <b>Time before Password Expiration to Issue Warning</b> set how long before a password is due to expire that an expiration warning messages should be given to an authenticating user.</p>"
+msgstr "<p><b>提前多长时间发出密码失效警告</b>设置在密码失效前多长时间向认证中的用户发出失效警告消息。</p>"
 
 #. help text for pwdGraceAuthNLimit attribute
 #: src/include/users/ldap_dialogs.rb:106
-msgid ""
-"<p>Set the number of times an expired password can be used to authenticate "
-"in <b>Allowed Uses of an Expired Password</b>.</p>"
+msgid "<p>Set the number of times an expired password can be used to authenticate in <b>Allowed Uses of an Expired Password</b>.</p>"
 msgstr "<p>在<b>失效密码的允许使用次数</b>中设置允许使用失效密码进行认证的次数。</p>"
 
 #. help text for pwdLockout attribute
 #: src/include/users/ldap_dialogs.rb:110
-msgid ""
-"<p>Check <b>Enable Password Locking</b> to forbid use of a password after a "
-"specified number of consecutive failed bind attempts.</p>"
-msgstr ""
-"<p>选中<b>启用密码锁定</b>，以禁止在指定次数的连续联结尝试失败后使用密码。"
+msgid "<p>Check <b>Enable Password Locking</b> to forbid use of a password after a specified number of consecutive failed bind attempts.</p>"
+msgstr "<p>选中<b>启用密码锁定</b>，以禁止在指定次数的连续联结尝试失败后使用密码。</p>"
 
 #. help text for pwdMaxFailure attribute
 #: src/include/users/ldap_dialogs.rb:114
-msgid ""
-"<p>Set the number of consecutive failed bind  attempts after which the "
-"password may not be used to authenticate in <b>Bind Failures to Lock the "
-"Password</b>.</p>"
-msgstr ""
-"<p>在<b>锁定密码的联结失败次数</b>中设置在多少次连续联结尝试失败后禁止使用密"
-"码进行认证。</p>"
+msgid "<p>Set the number of consecutive failed bind  attempts after which the password may not be used to authenticate in <b>Bind Failures to Lock the Password</b>.</p>"
+msgstr "<p>在<b>锁定密码的联结失败次数</b>中设置在多少次连续联结尝试失败后禁止使用密码进行认证。</p>"
 
 #. help text for pwdLockoutDuration attribute
 #: src/include/users/ldap_dialogs.rb:118
-msgid ""
-"<p>Set how long the password cannot be used in <b>Password Lock Duration</b>."
-"</p>"
+msgid "<p>Set how long the password cannot be used in <b>Password Lock Duration</b>.</p>"
 msgstr "<p>在<b>密码锁定持续时间</b>中设置无法使用密码的持续时间。</p>"
 
 #. help text for pwdFailureCountInterval attribute
 #: src/include/users/ldap_dialogs.rb:122
-msgid ""
-"<p><b>Bind Failures Cache Duration</b> sets how long before password "
-"failures are purged from the failure counter even though no successful "
-"authentication has occurred.</p>"
-msgstr ""
-"<p><b>联结失败缓存持续时间</b>设置从失败计数器清除密码失败次数的时间间隔（即"
-"使未成功认证）。</p>"
+msgid "<p><b>Bind Failures Cache Duration</b> sets how long before password failures are purged from the failure counter even though no successful authentication has occurred.</p>"
+msgstr "<p><b>联结失败缓存持续时间</b>设置从失败计数器清除密码失败次数的时间间隔（即使未成功认证）。</p>"
 
 #. tab label
 #: src/include/users/ldap_dialogs.rb:171
@@ -2129,8 +1983,7 @@
 #: src/include/users/ldap_dialogs.rb:675
 msgid ""
 "<p>Press <b>Configure</b> to configure settings stored on the\n"
-"LDAP server. You will be asked for the password if you are not connected yet "
-"or\n"
+"LDAP server. You will be asked for the password if you are not connected yet or\n"
 "have changed your configuration.</p>\n"
 msgstr ""
 "<p>按<b>配置</b>，可以配置存储在\n"
@@ -2145,12 +1998,9 @@
 #. password policy help
 #: src/include/users/ldap_dialogs.rb:683
 msgid ""
-"<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> "
-"to add a new password policy. The configuration is only possible,\n"
+"<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> to add a new password policy. The configuration is only possible,\n"
 "  if the password policies are already enabled on the LDAP server.</p>"
-msgstr ""
-"<p>使用<b>编辑</b>配置选中的密码策略。使用<b>添加</b>可添加新的密码策略。仅仅"
-"在 LDAP 服务器上启用密码策略的情况下，配置才会生效。</p>"
+msgstr "<p>使用<b>编辑</b>配置选中的密码策略。使用<b>添加</b>可添加新的密码策略。仅仅在 LDAP 服务器上启用密码策略的情况下，配置才会生效。</p>"
 
 #. checkbox label
 #: src/include/users/ldap_dialogs.rb:693
@@ -2235,7 +2085,7 @@
 
 #. the type of user set
 #. New user is the default option
-#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:274
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
 msgid "Local Users"
 msgstr "本地用户"
 
@@ -2444,8 +2294,7 @@
 msgid ""
 "<p>\n"
 "Choose a password encryption method for local and system users.\n"
-"<b>DES</b>, the Linux default method, works in all network environments, but "
-"it\n"
+"<b>DES</b>, the Linux default method, works in all network environments, but it\n"
 "restricts passwords to eight characters or less.\n"
 "</p>\n"
 msgstr ""
@@ -2470,12 +2319,8 @@
 
 #. Help text for password expert dialog 4/5
 #: src/include/users/widgets.rb:491
-msgid ""
-"<p><b>SHA-512</b> is the current standard hash method. Using other "
-"algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgstr ""
-"<p><b>SHA-512</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其他算"
-"法。</p>"
+msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其他算法。</p>"
 
 #. Label
 #: src/include/users/widgets.rb:499
@@ -2519,8 +2364,7 @@
 #. help text 2/3
 #: src/include/users/widgets.rb:586
 msgid ""
-"<p>It seems that you are running a NIS server. In some network "
-"environments,\n"
+"<p>It seems that you are running a NIS server. In some network environments,\n"
 "you might be unable to log in to a NIS client when a user password is\n"
 "encrypted with a method other than DES.\n"
 "</p>\n"
@@ -2552,17 +2396,14 @@
 
 #. helptext 2/4
 #: src/include/users/widgets.rb:730
-msgid ""
-"<p>Here, extend the search filters for users and groups beyond the default "
-"search filters.</p>"
+msgid "<p>Here, extend the search filters for users and groups beyond the default search filters.</p>"
 msgstr "<p>在此将用户和组的搜索过滤器扩展到默认搜索过滤器之外。</p>"
 
 #. helptext 3/4
 #: src/include/users/widgets.rb:734
 msgid ""
 "<p>With <b>Default</b>, load the default filter from the user and group\n"
-"configuration modules saved on the LDAP server (values of 'suseSearchFilter' "
-"attributes).\n"
+"configuration modules saved on the LDAP server (values of 'suseSearchFilter' attributes).\n"
 "If you are not connected yet, you are prompted for the password.</p>\n"
 msgstr ""
 "<p>如果选择<b>默认</b>，将从用户和组配置模块装载默认过滤器，\n"
@@ -2664,8 +2505,7 @@
 #: src/include/users/widgets.rb:969
 msgid ""
 "<p>\n"
-"The features described below are only available if you are using KDM or GDM "
-"as the login manager.\n"
+"The features described below are only available if you are using KDM or GDM as the login manager.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -2676,8 +2516,7 @@
 #: src/include/users/widgets.rb:975
 msgid ""
 "<p><b>Auto Login</b><br>\n"
-"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from "
-"the list is logged in automatically.</p>\n"
+"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from the list is logged in automatically.</p>\n"
 msgstr ""
 "<p><b>自动登录</b><br>\n"
 "通过设置<b>自动登录</b>可跳过登录过程。从列表中选择的用户将自动登录。</p>\n"
@@ -2687,13 +2526,11 @@
 msgid ""
 "<p><b>Passwordless Logins</b><br>\n"
 "If this option is checked, all users are allowed to log in without entering\n"
-"passwords. Otherwise, you are asked for the password even if you set a user "
-"to log in automatically.</p>\n"
+"passwords. Otherwise, you are asked for the password even if you set a user to log in automatically.</p>\n"
 msgstr ""
 "<p><b>无密码登录</b><br>\n"
 "如果选中了此选项，则允许所有用户\n"
-"无须输入密码即可登录。否则，即使设置某个用户自动登录，系统也会要求您提供密"
-"码。</p>\n"
+"无须输入密码即可登录。否则，即使设置某个用户自动登录，系统也会要求您提供密码。</p>\n"
 
 #. dialog label
 #: src/include/users/widgets.rb:1004
@@ -2865,8 +2702,7 @@
 #: src/include/users/widgets.rb:1518
 msgid ""
 "<p>\n"
-"Linux is a multiuser system. Several different users can be logged in to "
-"the\n"
+"Linux is a multiuser system. Several different users can be logged in to the\n"
 "system at the same time.  To avoid confusion, each user must have\n"
 "a unique identity. Additionally, every user belongs to at least one group.\n"
 "</p>\n"
@@ -2882,13 +2718,11 @@
 #: src/include/users/widgets.rb:1535
 msgid ""
 "<p>\n"
-"Users and groups are arranged in various sets. Change the set currently "
-"shown in the table with <b>Set Filter</b>.\n"
+"Users and groups are arranged in various sets. Change the set currently shown in the table with <b>Set Filter</b>.\n"
 "Customize your view with <b>Customize Filter</b>.</p>\n"
 msgstr ""
 "<p>\n"
-"通过不同的集合对用户和组进行组织。使用<b>集合过滤器</b>更改表中当前显示的集"
-"合。\n"
+"通过不同的集合对用户和组进行组织。使用<b>集合过滤器</b>更改表中当前显示的集合。\n"
 "使用<b>自定义过滤器</b>自定义视图。</p>\n"
 
 #. help text 2/3
@@ -2896,8 +2730,7 @@
 msgid ""
 "<p>\n"
 "Click <b>Expert Options</b> to edit various expert settings, such as\n"
-"password encryption type, user authentication method, default values for "
-"new\n"
+"password encryption type, user authentication method, default values for new\n"
 "users, or login settings. With <b>Write Changes Now</b>, save\n"
 "all changes made so far without exiting the configuration module.</p>\n"
 msgstr ""
@@ -2976,8 +2809,7 @@
 msgid ""
 "\n"
 "<p>\n"
-"Use this dialog to get information about existing groups and add or modify "
-"groups.\n"
+"Use this dialog to get information about existing groups and add or modify groups.\n"
 "</p>\n"
 msgstr ""
 "\n"
@@ -3229,12 +3061,8 @@
 
 #. TRANSLATORS: %s is the name of the recommended encryption method
 #: src/lib/users/dialogs/encryption_method.rb:41
-msgid ""
-"<p><b>%s</b> is the current standard hash method. Using other algorithms is "
-"not recommended unless needed for compatibility purposes.</p>"
-msgstr ""
-"<p><b>%s</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其它算"
-"法。</p>"
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>%s</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其它算法。</p>"
 
 #. Let's add some vertical space after each widget
 #. TRANSLATORS: rich text label
@@ -3287,8 +3115,7 @@
 msgid ""
 "<p>\n"
 "Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and "
-"numbers\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
 "is recommended. To ensure that the password was entered correctly,\n"
 "reenter it in a second field.\n"
 "</p>\n"
@@ -3306,8 +3133,7 @@
 "<p>\n"
 "All the rules for user passwords apply to the \"root\" password:\n"
 "Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or "
-"umlauts.\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -3343,7 +3169,7 @@
 "请重试。"
 
 #. reenable suggestion
-#: src/lib/users/dialogs/inst_user_first.rb:133
+#: src/lib/users/dialogs/inst_user_first.rb:134
 msgid ""
 "<p>\n"
 "Use one of the available options to add local users to the system.\n"
@@ -3355,11 +3181,11 @@
 "本地用户存储在 <i>/etc/passwd</i> 和 </i>/etc/shadow</i>。\n"
 "</p>\n"
 
-#: src/lib/users/dialogs/inst_user_first.rb:137
+#: src/lib/users/dialogs/inst_user_first.rb:138
 msgid "Create new user"
 msgstr "创建新用户"
 
-#: src/lib/users/dialogs/inst_user_first.rb:141
+#: src/lib/users/dialogs/inst_user_first.rb:142
 msgid ""
 "<p>\n"
 "When entering a password, distinguish between uppercase and\n"
@@ -3372,7 +3198,7 @@
 "</p>\n"
 
 #. TRANSLATORS: %{min} and %{max} will be replaced by numbers
-#: src/lib/users/dialogs/inst_user_first.rb:148
+#: src/lib/users/dialogs/inst_user_first.rb:149
 msgid ""
 "<p>\n"
 "The password length should be between %{min}\n"
@@ -3383,16 +3209,13 @@
 "密码长度应介于 %{min} 和 %{max} 个字符之间。\n"
 "</p>\n"
 
-#: src/lib/users/dialogs/inst_user_first.rb:164
+#: src/lib/users/dialogs/inst_user_first.rb:165
 msgid ""
 "<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, "
-"and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
 "Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
@@ -3402,46 +3225,38 @@
 "重新定义这些限制。请参阅其手册页了解相关信息。\n"
 "</p>\n"
 
-#: src/lib/users/dialogs/inst_user_first.rb:171
-msgid ""
-"<p>Check <b>Use this password for system administrator</b> if the same "
-"password as entered for the first user should be used for root.</p>"
-msgstr ""
-"<p>如果要让 root 使用第一个用户的密码，请勾选 <b>系统管理员使用此密码</b>。"
+#: src/lib/users/dialogs/inst_user_first.rb:172
+msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
+msgstr "<p>如果要让 root 使用第一个用户的密码，请勾选 <b>系统管理员使用此密码</b>。</p>"
 
-#: src/lib/users/dialogs/inst_user_first.rb:182
+#: src/lib/users/dialogs/inst_user_first.rb:183
 msgid "Import User Data from a Previous Installation"
 msgstr "从以前安装的系统导入用户数据"
 
-#: src/lib/users/dialogs/inst_user_first.rb:183
+#: src/lib/users/dialogs/inst_user_first.rb:184
 msgid ""
 "<p>\n"
 "A previous Linux installation with local users has been detected.\n"
-"The information there can be used to create users in the system being "
-"installed.\n"
-"Use the <b>Choose Users</b> button to select some users. Their basic "
-"information will\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
 "be imported.\n"
 "</p>\n"
 msgstr ""
 "<p>\n"
 "检测到了以前安装的 Linux。\n"
 "其本地用户信息可用于为正在安装的系统创建用户。\n"
-"使用 <b>选择用户</b> 按钮来选择这些用户。"
-"它们的基本信息将被导入。\n"
+"使用 <b>选择用户</b> 按钮来选择这些用户。它们的基本信息将被导入。\n"
 "</p>\n"
 
-#: src/lib/users/dialogs/inst_user_first.rb:191
+#: src/lib/users/dialogs/inst_user_first.rb:192
 msgid "Skip User Creation"
 msgstr "跳过创建用户"
 
-#: src/lib/users/dialogs/inst_user_first.rb:192
+#: src/lib/users/dialogs/inst_user_first.rb:193
 msgid ""
 "<p>\n"
 "Sometimes root is the only needed local user, like in network environments\n"
-"with an authentication server. Select this option to proceed without "
-"creating\n"
+"with an authentication server. Select this option to proceed without creating\n"
 "a local user.\n"
 "</p>\n"
 msgstr ""
@@ -3450,12 +3265,12 @@
 "选择此选项来继续而不创建本地用户。\n"
 "</p>\n"
 
-#: src/lib/users/dialogs/inst_user_first.rb:274
+#: src/lib/users/dialogs/inst_user_first.rb:275
 msgid "Local User"
 msgstr "本地用户"
 
 #. TRANSLATORS: Error popup
-#: src/lib/users/dialogs/inst_user_first.rb:329
+#: src/lib/users/dialogs/inst_user_first.rb:330
 msgid ""
 "The new username cannot be blank.\n"
 "If you don't want to create a user now, select\n"
@@ -3465,7 +3280,7 @@
 "若您不想要立即创建用户，请选择'跳过创建用户'。"
 
 #. TRANSLATORS: error popup
-#: src/lib/users/dialogs/inst_user_first.rb:386
+#: src/lib/users/dialogs/inst_user_first.rb:387
 msgid ""
 "No users from the previous installation were choosen.\n"
 "If you don't want to create a user now, select\n"
@@ -3475,34 +3290,34 @@
 "若您不想要立即创建用户，请选择'跳过创建用户'。"
 
 #. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:513
+#: src/lib/users/dialogs/inst_user_first.rb:514
 msgid "&Create New User"
 msgstr "创建本地用户(&C)"
 
 #. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:536
+#: src/lib/users/dialogs/inst_user_first.rb:537
 msgid "&Import User Data from a Previous Installation"
 msgstr "从以前安装的系统导入用户数据(&I)"
 
-#: src/lib/users/dialogs/inst_user_first.rb:546
+#: src/lib/users/dialogs/inst_user_first.rb:547
 msgid "Choose Users"
 msgstr "选择用户"
 
 #. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:562
+#: src/lib/users/dialogs/inst_user_first.rb:563
 msgid "&Skip User Creation"
 msgstr "跳过创建用户(&S)"
 
 #. checkbox label
-#: src/lib/users/dialogs/inst_user_first.rb:618
+#: src/lib/users/dialogs/inst_user_first.rb:619
 msgid "&Automatic Login"
 msgstr "自动登录(&A)"
 
-#: src/lib/users/dialogs/inst_user_first.rb:625
+#: src/lib/users/dialogs/inst_user_first.rb:626
 msgid "No users selected"
 msgstr "未选择用户"
 
-#: src/lib/users/dialogs/inst_user_first.rb:627
+#: src/lib/users/dialogs/inst_user_first.rb:628
 msgid "%d user will be imported"
 msgid_plural "%d users will be imported"
 msgstr[0] "将导入 %d 个用户"
@@ -4050,7 +3865,7 @@
 
 #. Popup text: %1 is the file name (e.g. /etc/fstab),
 #. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:716
+#: src/modules/Users.pm:722
 msgid ""
 "In %1, there is a mount point for the directory\n"
 "%2, which is used as a default home directory for new\n"
@@ -4069,185 +3884,185 @@
 "这些目录不可访问。是否继续用户配置？"
 
 #. error message
-#: src/modules/Users.pm:964
+#: src/modules/Users.pm:970
 msgid "Multiple users satisfy the input conditions."
 msgstr "有多个用户满足输入条件。"
 
 #. progress caption
-#: src/modules/Users.pm:1542
+#: src/modules/Users.pm:1548
 msgid "Initializing User and Group Configuration"
 msgstr "初始化用户和组配置"
 
 #. progress stage label
-#: src/modules/Users.pm:1549
+#: src/modules/Users.pm:1555
 msgid "Read the default login settings"
 msgstr "读取默认登录设置"
 
 #. progress stage label
-#: src/modules/Users.pm:1551
+#: src/modules/Users.pm:1557
 msgid "Read the default system settings"
 msgstr "读取默认系统设置"
 
 #. progress stage label
-#: src/modules/Users.pm:1553
+#: src/modules/Users.pm:1559
 msgid "Read the configuration type"
 msgstr "读取配置类型"
 
 #. progress stage label
-#: src/modules/Users.pm:1555
+#: src/modules/Users.pm:1561
 msgid "Read the user custom settings"
 msgstr "读取用户自定义设置"
 
 #. progress stage label
-#: src/modules/Users.pm:1557
+#: src/modules/Users.pm:1563
 msgid "Read users and groups"
 msgstr "读取用户和组"
 
 #. progress stage label
-#: src/modules/Users.pm:1559
+#: src/modules/Users.pm:1565
 msgid "Build the cache structures"
 msgstr "构建缓存结构"
 
 #. progress step label
-#: src/modules/Users.pm:1563
+#: src/modules/Users.pm:1569
 msgid "Reading the default login settings..."
 msgstr "正在读取默认登录设置..."
 
 #. progress step label
-#: src/modules/Users.pm:1565
+#: src/modules/Users.pm:1571
 msgid "Reading the default system settings..."
 msgstr "正在读取默认系统设置..."
 
 #. progress step label
-#: src/modules/Users.pm:1567
+#: src/modules/Users.pm:1573
 msgid "Reading the configuration type..."
 msgstr "正在读取配置类型..."
 
 #. progress step label
-#: src/modules/Users.pm:1569
+#: src/modules/Users.pm:1575
 msgid "Reading custom settings..."
 msgstr "正在读取自定义设置..."
 
 #. progress step label
-#: src/modules/Users.pm:1571
+#: src/modules/Users.pm:1577
 msgid "Reading users and groups..."
 msgstr "正在读取用户和组..."
 
 #. progress step label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1579
 msgid "Building the cache structures..."
 msgstr "正在构建缓存结构..."
 
 #. final progress step label
-#: src/modules/Users.pm:1575 src/modules/Users.pm:4290
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
 msgid "Finished"
 msgstr "已完成"
 
 #. error message
-#: src/modules/Users.pm:2131
+#: src/modules/Users.pm:2137
 msgid "User does not exist."
 msgstr "用户不存在。"
 
 #. error message
-#: src/modules/Users.pm:2383
+#: src/modules/Users.pm:2389
 msgid "Group does not exist."
 msgstr "组不存在。"
 
 #. progress caption
-#: src/modules/Users.pm:4252
+#: src/modules/Users.pm:4258
 msgid "Writing User and Group Configuration"
 msgstr "写入用户和组配置"
 
 #. progress stage label
-#: src/modules/Users.pm:4261
+#: src/modules/Users.pm:4267
 msgid "Write LDAP users and groups"
 msgstr "写入 LDAP 用户和组"
 
 #. progress stage label
-#: src/modules/Users.pm:4263
+#: src/modules/Users.pm:4269
 msgid "Write groups"
 msgstr "写入组"
 
 #. progress stage label
-#: src/modules/Users.pm:4265
+#: src/modules/Users.pm:4271
 msgid "Check for deleted users"
 msgstr "检查删除的用户"
 
 #. progress stage label
-#: src/modules/Users.pm:4267
+#: src/modules/Users.pm:4273
 msgid "Write users"
 msgstr "写入用户"
 
 #. progress stage label
-#: src/modules/Users.pm:4269
+#: src/modules/Users.pm:4275
 msgid "Write passwords"
 msgstr "写入密码"
 
 #. progress stage label
-#: src/modules/Users.pm:4271
+#: src/modules/Users.pm:4277
 msgid "Write the custom settings"
 msgstr "写入自定义设置"
 
 #. progress stage label
-#: src/modules/Users.pm:4273
+#: src/modules/Users.pm:4279
 msgid "Write the default login settings"
 msgstr "写入默认登录设置"
 
 #. progress step label
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4282
 msgid "Writing LDAP users and groups..."
 msgstr "正在写入 LDAP 用户和组..."
 
 #. progress step label
-#: src/modules/Users.pm:4278
+#: src/modules/Users.pm:4284
 msgid "Writing groups..."
 msgstr "正在写入组..."
 
 #. progress step label
-#: src/modules/Users.pm:4280
+#: src/modules/Users.pm:4286
 msgid "Checking deleted users..."
 msgstr "正在检查删除的用户..."
 
 #. progress step label
-#: src/modules/Users.pm:4282
+#: src/modules/Users.pm:4288
 msgid "Writing users..."
 msgstr "正在写入用户..."
 
 #. progress step label
-#: src/modules/Users.pm:4284
+#: src/modules/Users.pm:4290
 msgid "Writing passwords..."
 msgstr "正在写入密码..."
 
 #. progress step label
-#: src/modules/Users.pm:4286
+#: src/modules/Users.pm:4292
 msgid "Writing the custom settings..."
 msgstr "正在写入自定义设置..."
 
 #. progress step label
-#: src/modules/Users.pm:4288
+#: src/modules/Users.pm:4294
 msgid "Writing the default login settings..."
 msgstr "正在写入默认登录设置..."
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4373
+#: src/modules/Users.pm:4379
 #, perl-format
 msgid "File %s was not read correctly, so it will not be written."
 msgstr "未正确读取文件 %s，因此无法写入此文件。"
 
 #. error popup
-#: src/modules/Users.pm:4409 src/modules/Users.pm:4444
-#: src/modules/Users.pm:4720
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
 msgid "An error occurred while removing users."
 msgstr "在删除用户时出错。"
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4422 src/modules/Users.pm:4570
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
 #, perl-format
 msgid "File %s was not correctly read, so it will not be written."
 msgstr "未正确读取文件 %s，因此无法写入此文件。"
 
 #. error message
-#: src/modules/Users.pm:4559
+#: src/modules/Users.pm:4565
 msgid ""
 "\n"
 "Encryption support is not installed, home directories will NOT be encrypted."
@@ -4256,17 +4071,17 @@
 "未安装加密支持，无法加密 home 文件夹。"
 
 #. error popup
-#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
 msgid "An error occurred while setting forwarding for root's mail."
 msgstr "设置 root 用户邮件转发时出错。"
 
 #. error popup
-#: src/modules/Users.pm:4837
+#: src/modules/Users.pm:4843
 msgid "No UID is available for this type of user."
 msgstr "此类型的用户没有可用的 UID。"
 
 #. error popup
-#: src/modules/Users.pm:4868
+#: src/modules/Users.pm:4874
 #, perl-format
 msgid ""
 "The selected user ID is not allowed.\n"
@@ -4276,7 +4091,7 @@
 "请选择 %i 到 %i 之间的有效整数。"
 
 #. popup question
-#: src/modules/Users.pm:4899
+#: src/modules/Users.pm:4905
 msgid ""
 "The user ID entered is already in use.\n"
 "Really use it?"
@@ -4285,7 +4100,7 @@
 "是否确实要使用它？"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:4912
+#: src/modules/Users.pm:4918
 #, perl-format
 msgid ""
 "The selected user ID is not from a range\n"
@@ -4297,7 +4112,7 @@
 "是否确实要使用它？"
 
 #. popup question
-#: src/modules/Users.pm:4927
+#: src/modules/Users.pm:4933
 #, perl-format
 msgid ""
 "The selected user ID is a local ID,\n"
@@ -4309,7 +4124,7 @@
 "是否确实要将用户类型更改为\"本地\"？"
 
 #. popup question
-#: src/modules/Users.pm:4941
+#: src/modules/Users.pm:4947
 #, perl-format
 msgid ""
 "The selected user ID is a system ID,\n"
@@ -4320,7 +4135,7 @@
 "这是因为该 ID 小于 %i。\n"
 "是否确实要将用户类型更改为\"系统\"？"
 
-#: src/modules/Users.pm:4975
+#: src/modules/Users.pm:4981
 msgid ""
 "\n"
 "The existing username might belong to a NIS or LDAP user.\n"
@@ -4329,7 +4144,7 @@
 "已有用户名可能属于 NIS 或 LDAP 用户。\n"
 
 #. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:4979
+#: src/modules/Users.pm:4985
 msgid ""
 "There is a conflict between the entered\n"
 "username and an existing username. %1\n"
@@ -4340,7 +4155,7 @@
 "请尝试使用其它名称。"
 
 #. error popup
-#: src/modules/Users.pm:5009
+#: src/modules/Users.pm:5015
 msgid ""
 "The \"Additional User Information\" entry cannot\n"
 "contain a colon (:).  Try again."
@@ -4349,7 +4164,7 @@
 "不能包含冒号 (:)。请重试。"
 
 #. error popup
-#: src/modules/Users.pm:5016
+#: src/modules/Users.pm:5022
 msgid ""
 "The \"Additional User Information\" entry can consist\n"
 "of up to three sections separated by commas.\n"
@@ -4360,7 +4175,7 @@
 "请删除多余部分。"
 
 #. error popup
-#: src/modules/Users.pm:5079
+#: src/modules/Users.pm:5085
 msgid ""
 "The home directory may only contain the following characters:\n"
 "a-z, A-Z, 0-9, and _-/\n"
@@ -4371,7 +4186,7 @@
 "请重试。"
 
 #. error popup
-#: src/modules/Users.pm:5102
+#: src/modules/Users.pm:5108
 #, perl-format
 msgid ""
 "The directory %s is not writable.\n"
@@ -4381,7 +4196,7 @@
 "请为主目录选择另一个路径。"
 
 #. error message
-#: src/modules/Users.pm:5113
+#: src/modules/Users.pm:5119
 msgid ""
 "The home directory is used by another user.\n"
 "Try again."
@@ -4390,7 +4205,7 @@
 "请重试。"
 
 #. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5155
+#: src/modules/Users.pm:5161
 msgid ""
 "The path for the selected home directory already exists,\n"
 "but it is not a directory.\n"
@@ -4401,7 +4216,7 @@
 "确实要使用该路径吗？"
 
 #. yes/no popup
-#: src/modules/Users.pm:5166
+#: src/modules/Users.pm:5172
 msgid ""
 "The home directory selected already exists.\n"
 "Use it and change its owner?"
@@ -4411,7 +4226,7 @@
 
 #. chown is not needed (#25200)
 #. yes/no popup
-#: src/modules/Users.pm:5173
+#: src/modules/Users.pm:5179
 #, perl-format
 msgid ""
 "The selected home directory (%s)\n"
@@ -4423,7 +4238,7 @@
 "是否使用此目录？\n"
 
 #. yes/no popup
-#: src/modules/Users.pm:5182
+#: src/modules/Users.pm:5188
 #, perl-format
 msgid ""
 "The home directory selected (%s)\n"
@@ -4437,7 +4252,7 @@
 "是否使用此目录？"
 
 #. popup question
-#: src/modules/Users.pm:5210
+#: src/modules/Users.pm:5216
 msgid ""
 "If you select a nonexistent shell, the user may be unable to log in.\n"
 "Use this shell?"
@@ -4446,12 +4261,12 @@
 "是否使用该壳层？"
 
 #. error popup
-#: src/modules/Users.pm:5230
+#: src/modules/Users.pm:5236
 msgid "No GID is available for this type of group."
 msgstr "此类型的组没有可用的 GID。"
 
 #. error popup
-#: src/modules/Users.pm:5263
+#: src/modules/Users.pm:5269
 #, perl-format
 msgid ""
 "The selected group ID is not allowed.\n"
@@ -4461,7 +4276,7 @@
 "请选择 %i 到 %i 之间的有效整数。"
 
 #. popup question
-#: src/modules/Users.pm:5293
+#: src/modules/Users.pm:5299
 msgid ""
 "The group ID entered is already in use.\n"
 "Really use it?"
@@ -4470,7 +4285,7 @@
 "是否确实要使用它？"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:5305
+#: src/modules/Users.pm:5311
 #, perl-format
 msgid ""
 "The selected group ID is not from a range\n"
@@ -4482,7 +4297,7 @@
 "是否确实要使用它？"
 
 #. popup question
-#: src/modules/Users.pm:5320
+#: src/modules/Users.pm:5326
 #, perl-format
 msgid ""
 "The selected group ID is a local ID,\n"
@@ -4494,7 +4309,7 @@
 "是否确实要将组类型更改为\"本地\"？"
 
 #. popup question
-#: src/modules/Users.pm:5334
+#: src/modules/Users.pm:5340
 #, perl-format
 msgid ""
 "The selected group ID is a system ID,\n"
@@ -4506,7 +4321,7 @@
 "是否确实要将组类型更改为\"系统\"？"
 
 #. error popup
-#: src/modules/Users.pm:5353
+#: src/modules/Users.pm:5359
 msgid ""
 "No group name entered.\n"
 "Try again."
@@ -4515,7 +4330,7 @@
 "请重试。"
 
 #. error popup
-#: src/modules/Users.pm:5370
+#: src/modules/Users.pm:5376
 #, perl-format
 msgid ""
 "The group name must be between %i and %i characters in length.\n"
@@ -4525,7 +4340,7 @@
 "请重试。"
 
 #. error popup
-#: src/modules/Users.pm:5383
+#: src/modules/Users.pm:5389
 msgid ""
 "The group name may contain only\n"
 "letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4538,7 +4353,7 @@
 "请重试。"
 
 #. error popup
-#: src/modules/Users.pm:5391
+#: src/modules/Users.pm:5397
 msgid ""
 "There is a conflict between the entered\n"
 "group name and an existing group name.\n"
@@ -4548,13 +4363,13 @@
 "组名之间存在冲突。\n"
 "请尝试使用其它名称。"
 
-#: src/modules/Users.pm:5507
+#: src/modules/Users.pm:5513
 #, perl-format
 msgid "User %s does not exist."
 msgstr "用户 %s 不存在。"
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5561
+#: src/modules/Users.pm:5567
 msgid ""
 "You cannot delete this group because\n"
 "there are users that use this group\n"
@@ -4565,7 +4380,7 @@
 "其默认组。"
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5568
+#: src/modules/Users.pm:5574
 msgid ""
 "You cannot delete this group because\n"
 "there are users in the group.\n"
@@ -4576,22 +4391,22 @@
 "请先删除组中的这些用户。"
 
 #. summary label
-#: src/modules/Users.pm:6581
+#: src/modules/Users.pm:6587
 msgid "<h3>Users</h3>"
 msgstr "<h3>用户</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6591
+#: src/modules/Users.pm:6597
 msgid "<h3>Groups</h3>"
 msgstr "<h3>组</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6602
+#: src/modules/Users.pm:6608
 msgid "<h3>Login Settings</h3>"
 msgstr "<h3>登录设置</h3>"
 
 #. summary item, %1 is user name
-#: src/modules/Users.pm:6604
+#: src/modules/Users.pm:6610
 msgid "User %1 configured for automatic login"
 msgstr "用户 %1 已设为自动登录"
 
@@ -4755,7 +4570,7 @@
 "%2"
 
 #. the ']' is or-ed...
-#. error popup
+#. error popup	
 #: src/modules/UsersSimple.pm:379
 msgid ""
 "The password may only contain the following characters:\n"
@@ -4770,8 +4585,7 @@
 #: src/modules/UsersSimple.pm:414
 msgid ""
 "<p>\n"
-"For the password, use only characters that can be found on an English "
-"keyboard\n"
+"For the password, use only characters that can be found on an English keyboard\n"
 "layout.  In cases of system error, it may be necessary to log in without a\n"
 "localized keyboard layout.\n"
 "</p>"
@@ -4979,16 +4793,8 @@
 #~ "选择对系统中用户使用的身份验证方法。\n"
 #~ "</p>"
 
-#~ msgid ""
-#~ "If you have a previous installation or alternative system, it is possible "
-#~ "to create users based on this source. To do so, select <b>Read User Data "
-#~ "from a Previous Installation</b>. This option uses an existing or creates "
-#~ "a new home directory for each user in the location specified for this "
-#~ "installation."
-#~ msgstr ""
-#~ "如果先前安装了一个系统或有备用系统，则可以基于此源创建用户。要这样做，请选"
-#~ "择<b>请从先前安装读取用户数据</b>。此选项使用现有主目录，或在对此安装指定"
-#~ "的位置为每个用户创建一个新的主目录。"
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "如果先前安装了一个系统或有备用系统，则可以基于此源创建用户。要这样做，请选择<b>请从先前安装读取用户数据</b>。此选项使用现有主目录，或在对此安装指定的位置为每个用户创建一个新的主目录。"
 
 #~ msgid "&LDAP"
 #~ msgstr "LDAP(&L)"
@@ -5006,10 +4812,8 @@
 #~ msgstr "eDirectory LDAP"
 
 #~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data or if you "
-#~ "want\n"
-#~ "to authenticate users against an NT server, choose the appropriate value. "
-#~ "Then\n"
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
 #~ "press <b>Next</b> to continue with configuration of your client.</p>"
 #~ msgstr ""
 #~ "<p>如果使用 NIS 服务器或 LDAP 服务器来存储用户数据，或者\n"
@@ -5018,16 +4822,14 @@
 
 #~ msgid ""
 #~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration "
-#~ "of your client.</p>"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
 #~ msgstr ""
 #~ "<p>如果使用 NIS 或 LDAP 服务器来存储用户数据，请选择相应的值。\n"
 #~ "然后按<b>下一步</b>继续配置客户机。</p>"
 
 #~ msgid ""
 #~ "<p>If you are using an LDAP server to store user data or if you want to\n"
-#~ "authenticate users against an NT server, choose the appropriate value. "
-#~ "Then\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
 #~ "press <b>Next</b> to continue with configuration of your client.</p>"
 #~ msgstr ""
 #~ "<p>如果使用 LDAP 服务器来存储用户数据，或者希望\n"
@@ -5036,18 +4838,13 @@
 
 #~ msgid ""
 #~ "<p>If you are using an LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration "
-#~ "of your client.</p>"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
 #~ msgstr ""
 #~ "<p>如果使用 LDAP 服务器来存储用户数据，请选择相应的值。\n"
 #~ " 然后按<b>下一步</b>继续配置客户机。</p>"
 
-#~ msgid ""
-#~ "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos "
-#~ "after configuring the user data source.</p>"
-#~ msgstr ""
-#~ "<p>请选中<b>设置 Kerberos 认证</b>以在配置用户数据源之后配置 Kerberos。"
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>请选中<b>设置 Kerberos 认证</b>以在配置用户数据源之后配置 Kerberos。</p>"
 
 #~ msgid "&Choose"
 #~ msgstr "选择(&C)"
@@ -5068,12 +4865,8 @@
 #~ "<p>如果要使用此密码来创建证书，\n"
 #~ "则此密码的长度必须至少为 %1 个字符。</p>"
 
-#~ msgid ""
-#~ "<p>To check whether your current keyboard layout is correct, try entering "
-#~ "text into the <b>Test Keyboard Layout</b> field.</p>"
-#~ msgstr ""
-#~ "<p>要检查您现在的键盘布局是否正确，请在<b>测试键盘布局</b>区域输入文字。"
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>要检查您现在的键盘布局是否正确，请在<b>测试键盘布局</b>区域输入文字。</p>"
 
 #~ msgid ""
 #~ "If you intend to create certificates,\n"
@@ -5150,10 +4943,8 @@
 #~ msgstr "eDirectory LDAP(&E)"
 
 #~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data or if you "
-#~ "want\n"
-#~ "to authenticate users against an NT server, choose the appropriate value."
-#~ "</p>"
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value.</p>"
 #~ msgstr ""
 #~ "<p>如果使用 NIS 服务器或 LDAP 服务器来存储用户数据，\n"
 #~ "或者希望根据 NT 服务器来验证用户，请选择合适的值。</p>"

Modified: trunk/yast/zh_CN/po/vm.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/vm.zh_CN.po	2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/vm.zh_CN.po	2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2014-06-10 12:17+0800\n"
 "Last-Translator: 玛格丽特 · 苏 \n"
 "Language-Team: Chinese Simplified \n"
@@ -32,12 +32,12 @@
 msgstr "正在配置虚拟机..."
 
 #. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr "x86_64 是唯一支持搭建虚拟机的架构。您的架构是 "
 
 #. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -47,151 +47,151 @@
 
 #. progress stage 1/2
 #. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
 msgid "Verify Installed Packages"
 msgstr "校验已安装的软件包"
 
 #. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
 msgid "Network Bridge Configuration"
 msgstr "网桥配置"
 
 #. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
 msgid "Configuring the VM Server (domain 0)"
 msgstr "正在配置虚拟机服务器 (域 0)"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 msgstr "<p><big><b>虚拟机服务器配置</b></big></p><p>虚拟机服务器 (域 0) 的配置有两部分。</p>"
 
 #. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>首先将安装必需的软件包，然后将把引导加载器切换为 GRUB (若尚未使用) 并把 Xen 启动项添加到引导菜单(若菜单中尚无)。</p>"
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<p>需要 GRUB 是因为它支持引导 Xen 和 Linux 内核所需的多重引导标准。</p>"
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>配置成功后，您就可以从引导加载器菜单来启动虚拟机服务器了。</p>"
 
 #. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
 msgid "The installation will be aborted."
 msgstr "安装将中止。"
 
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
 msgid "Choose Hypervisor(s) to install"
 msgstr "选择要安装的虚拟机管理程序"
 
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
 msgid "Server: Minimal system to get a running Hypervisor"
 msgstr "服务器：运行虚拟机管理程序的最小化系统"
 
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
 msgid "Tools: Configure, manage and monitor virtual machines"
 msgstr "工具：配置、管理和监视虚拟机"
 
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
 msgid "KVM Hypervisor"
 msgstr "KVM 管理程序"
 
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
 msgid "KVM server"
 msgstr "KVM 服务器"
 
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
 msgid "KVM tools"
 msgstr "KVM 工具"
 
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
 msgid "libvirt LXC containers"
 msgstr "libvirt LXC 容器"
 
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
 msgid "libvirt LXC daemon"
 msgstr "libvirt LXC 守护进程"
 
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
 msgid "Software to connect to Virtualization server"
 msgstr "连接虚拟化服务器的软件"
 
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
 msgid "Virtualization client tools"
 msgstr "虚拟化客户端工具"
 
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
 msgid "Xen Hypervisor"
 msgstr "Xen 管理程序"
 
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
 msgid "Xen server"
 msgstr "Xen 服务器"
 
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
 msgid "Xen tools"
 msgstr "Xen 工具"
 
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
 msgid "Package installation failed\n"
 msgstr "软件包安装失败\n"
 
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
 msgid "Package installation failed for lxc\n"
 msgstr "lxc 的软件包安装失败\n"
 
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
 msgid "Package installation failed for sled client pattern\n"
 msgstr "SLED 客户端软件集的软件包安装失败\n"
 
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
 msgid "Package installation failed for sles patterns\n"
 msgstr "SLES 软件集的软件包安装失败\n"
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "正以文本模式运行。强行安装图形部件吗？"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
 msgid "Checking packages..."
 msgstr "正在检查软件包..."
 
 #. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
 msgid "Installing packages..."
 msgstr "正在安装软件包..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
 msgid "Cannot install required packages."
 msgstr "无法安装必需的软件包。"
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
 msgid "Updating grub2 configuration files..."
 msgstr "正在更新 grub2 配置文件..."
 
 #. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
 msgid "Configuring Default Network Bridge..."
 msgstr "正在配置默认网桥..."
 
 #. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
 msgid "Network Bridge."
 msgstr "网桥。"
 
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr "<p>要搭建正常的虚拟机网络配置，推荐使用网桥。</p><p>配置一个默认网桥吗？</p>"
 
@@ -204,27 +204,27 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr "KVM 部件已安装。您的宿主机已准备好安装 KVM 访客机了。"
 
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
 msgstr "KVM 部件已安装。请重新引导计算机并在引导加载器菜单中选择原生内核来安装 KVM 访客机。"
 
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
 msgstr "要安装 Xen 客户机，需重启计算机并在引导加载器菜单中选择 Xen 启动项。"
 
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Xen 管理程序和工具已安装。"
 
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
 msgid "Virtualization client tools are installed."
 msgstr "已安装虚拟化客户端工具。"
 
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
 msgid "Libvirt LXC components are installed."
 msgstr "已安装 Libvirt LXC 部件。"

    

[opensuse-translation-commit] r96727 - trunk/yast/zh_CN/po

minton＠svn2.opensuse.org