Mailinglist Archive: opensuse-translation-commit (60 mails)

< Previous Next >
[opensuse-translation-commit] r95900 - trunk/yast/zh_CN/po
Author: marguerite
Date: 2016-06-05 18:43:05 +0200 (Sun, 05 Jun 2016)
New Revision: 95900

Added:
trunk/yast/zh_CN/po/journalctl.zh_CN.po
Modified:
trunk/yast/zh_CN/po/auth-client.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/control.zh_CN.po
trunk/yast/zh_CN/po/crowbar.zh_CN.po
trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
trunk/yast/zh_CN/po/drbd.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/live-installer.zh_CN.po
trunk/yast/zh_CN/po/network.zh_CN.po
trunk/yast/zh_CN/po/nfs_server.zh_CN.po
trunk/yast/zh_CN/po/packager.zh_CN.po
trunk/yast/zh_CN/po/registration.zh_CN.po
trunk/yast/zh_CN/po/samba-server.zh_CN.po
trunk/yast/zh_CN/po/security.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/users.zh_CN.po
trunk/yast/zh_CN/po/vpn.zh_CN.po
Log:
[cn]merge&update

Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -3,10 +3,10 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
-"PO-Revision-Date: 2016-03-03 23:17+0800\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-06 00:36+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -14,343 +14,944 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 2.0\n"

-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
-msgstr "认证客户端配置模块"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
+msgstr "领域名"

-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
-msgstr "认证客户端配置摘要"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
+msgstr "映射域名到领域 (example.com -> EXAMPLE.COM)"

-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
-msgstr "从 @parameters 创建 autoyast rnc"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
+msgstr "映射通配符域名到领域 (*.example.com -> EXAMPLE.COM)"

+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr "管理服务器主机名 (可选)"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr "主力密钥分发服务器主机名 (可选)"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid ""
+"Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr "密钥分发中心 (若启用通过 DNS 自动发现则为可选)"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr "自定义主体名到用户名映射"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr "主体名"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "User Name"
+msgstr "用户名"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr "主体名到用户名映射的自定义规则"
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr "请输入密钥分发中心的主机名:"
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr "请输入 auth_to_local 规则:"
+
+#. 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\":"
+msgstr "请以 \"主体名 = 用户名\" 格式输入主体名和用户名:"
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+msgid "Please enter realm name."
+msgstr "请输入领域名称。"
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr "Keytab 文件默认位置"
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr "票据授权服务器加密类型 (空格分隔)"
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr "票据加密类型 (空格分隔)"
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr "会话加密类型 (空格分隔)"
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+msgid "Authentication via Kerberos"
+msgstr "通过 Kerberos 认证"
+
+#. LDAP tab events
+#: 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\"."
+msgstr ""
+
+#: 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\"."
+msgstr ""
+
+#: 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\"."
+msgstr ""
+
+#: 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\"."
+msgstr ""
+
+#: 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\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: 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"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: 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\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+msgid "Are you sure to delete realm %s?"
+msgstr "您确定删除领域 %s 吗?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+msgid "Automatically Create Home Directory"
+msgstr "自动创建主文件夹"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+msgid "All Authentication Realms"
+msgstr "全部认证领域"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Delete Realm"
+msgstr "删除领域"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+msgid "Change Settings"
+msgstr "修改设置"
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+msgid "User Logon Configuration"
+msgstr "用户登入配置"
+
+#: src/lib/authui/main_dialog.rb:68
+msgid "LDAP/Kerberos Configuration"
+msgstr "LDAP/Kerberos 配置"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "名称"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "值"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+msgid "Network Domain"
+msgstr "网络域"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr "身份域"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "描述"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+msgid "Name filter:"
+msgstr "名称过滤器:"
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
msgid "None."
msgstr "无。"

#. Render controls for editing parameter values, according to parameter data
type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
msgid "Mandatory Parameters"
msgstr "必需参数"

-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
msgid "Optional Parameters"
msgstr "可选参数"

#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr "请完成以下全部必需参数:\n"

+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
+msgid "Global Options"
+msgstr "全局选项"
+
+#: src/lib/authui/sssd/main_dialog.rb:40
+msgid "Name switch"
+msgstr "名称开关"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Authentication"
+msgstr "认证"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
-msgid "Authentication Client Configuration"
-msgstr "认证客户端配置"
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""

-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
-msgstr "全局配置"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
-msgstr "在登录时创建主目录"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:68
-msgid "Enable SSSD daemon"
-msgstr "启用 SSSD 守护进程"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:73
-msgid "Sections"
-msgstr "部分"
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:76
-msgid "New Service/Domain"
-msgstr "新服务/域"
+#: src/lib/authui/sssd/main_dialog.rb:77
+msgid "Create Home Directory"
+msgstr "创建主文件夹"

-#: src/lib/yauthclient/main_dialog.rb:77
-msgid "Delete Service/Domain"
-msgstr "删除服务/域"
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""

+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
+msgid "Join Domain"
+msgstr "加入域"
+
+#: src/lib/authui/sssd/main_dialog.rb:92
+msgid "Leave Domain"
+msgstr "离开域"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters
and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+msgid "Service Options"
+msgstr "服务选项"
+
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
+msgid "Domain Options"
+msgstr "域选项"
+
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
-msgid "Customisation - %s"
-msgstr "自定义 - %s"
+#: src/lib/authui/sssd/main_dialog.rb:172
+msgid "Options - %s"
+msgstr "选项 - %s"

-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "名称"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "值"
+#: src/lib/authui/sssd/main_dialog.rb:220
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "您真的希望清除域 %s 的配置吗?"

-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "描述"
+#. 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\"."
+msgstr ""

-#. For the currently selected config section, render list of additional
parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-msgid "More Parameters"
-msgstr "更多参数"
+#. 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\"."
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:140
-msgid "Name filter:"
-msgstr "名称过滤器:"
+#. 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\"."
+msgstr ""

-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
msgid ""
-"Your system is configured for using nss_ldap.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your nss_ldap configuration will be removed.\n"
-"Do you want to continue?"
+"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 ""
-"您的系统已配置为使用 nss_ldap。\n"
-"此模块设计用于通过 sssd 配置您的系统。\n"
-"若您继续,您的 nss_ldap 配置将会被移除。\n"
-"您想要继续吗?"

-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"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."
msgstr ""
-"您的系统已配置为 OES 客户端。\n"
-"此模块设计用于通过 sssd 配置您的系统。\n"
-"若您继续,您的 OES 客户端配置将被取消激活。\n"
-"您想要继续吗?"

-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-msgid "You may not delete section SSSD."
-msgstr "您不能删除 SSSD 部分。"
+#. 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\"."
+msgstr ""

-#: src/lib/yauthclient/main_dialog.rb:225
-msgid "Do you really wish to delete section %s?"
-msgstr "您真的希望删除 %s 部分吗?"
+#: 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."
+msgstr ""

+#. Enable/disable PAC responder
+#: 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."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr "这是一个必需的参数,不可以删除它。"

#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
msgid "Confirm parameter removal: "
msgstr "确认移除参数:"

-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup "
+"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 continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
-"该参数十分重要。移除该参数可能造成 SSSD 启动失败。\n"
-"继续前请参照 SSSD 手册页。\n"
-"您仍希望继续吗?"
+"该参数十分重要。移除该参数可能造成配置失败。\n"
+"继续前请查阅 SSSD 手册页。\n"
+"您仍希望移除该参数吗?"

#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
-msgid "No domain enabled"
-msgstr "无启用的域"
+#: src/lib/authui/sssd/main_dialog.rb:434
+msgid "No domain"
+msgstr "没有域"

-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\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 ""
-"[sssd] \"域\" 参数中没有启用的域。\n"
-"将不会启动 SSSD,届时只有本地认证可用。\n"
-"您仍希望继续吗?"
+"您尚未配置任何认证域,但您选择启用域认证。\n"
+"SSSD 将启动失败,并且只有本地认证可用。\n"
+"您仍想要继续吗?"

-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
-msgstr "发现了非活动域"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
+msgstr ""

-#. Render input box and dropdowns for service/domain creation
-#: src/lib/yauthclient/new_section_dialog.rb:49
-msgid "Would you like to enable another service or join a domain?"
-msgstr "您想要启用另一个服务还是加入一个域?"
+#. 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:"
+msgstr ""

-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "服务"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""

-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "域"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""

-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com):"
-msgstr "域名 (example.com):"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
+msgstr ""

-#: src/lib/yauthclient/new_section_dialog.rb:64
-msgid "Identification provider:"
-msgstr "鉴定提供方:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""

-#: src/lib/yauthclient/new_section_dialog.rb:69
-msgid "Authentication provider:"
-msgstr "认证提供方:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""

-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
-msgstr "激活域"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
+msgstr ""

-#. Create new service
-#: src/lib/yauthclient/new_section_dialog.rb:105
-msgid "There are no more services to be enabled."
-msgstr "没有更多服务可启用。"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""

-#. Create new domain
-#: src/lib/yauthclient/new_section_dialog.rb:123
-msgid "Please enter a name for the new domain."
-msgstr "请为新域输入一个名称。"
+#: 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."
+msgstr ""

-#: src/lib/yauthclient/new_section_dialog.rb:126
-msgid "The domain name is already in-use."
-msgstr "域名已使用。"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""

-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
-msgstr "揭示了配置文件的语法。"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
+msgstr ""

-#: src/lib/yauthclient/params.rb:114
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
msgid ""
-"Comma separated list of services that are started when sssd itself starts."
-msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。"
+"AD enrollment details have been saved for AutoYast. Please keep in mind that "
+"AD user password is saved in plain text."
+msgstr ""

-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
msgid ""
+"Enrollment has completed successfully!\n"
"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
msgstr ""
-"\n"
-"支持的服务:nss, pam, sudo, autofs, ssh"

-#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
msgid ""
-"Number of times services should attempt to reconnect in the event of a Data "
-"Provider crash or restart before they give up"
-msgstr "当数据提供者崩溃或重启时在放弃前服务应尝试重连的次数"
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
+msgstr ""

-#: src/lib/yauthclient/params.rb:125
-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 不会启动。"
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
+msgstr ""

-#: src/lib/yauthclient/params.rb:126
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
+msgstr ""
+
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com):"
+msgstr "域名 (诸如 example.com):"
+
+#: src/lib/authui/sssd/new_section_dialog.rb:78
msgid ""
-"This parameter contains the list of domains in the order these will be "
-"queried."
-msgstr "此参数包含了以查询顺序排列的域列表。"
+"Which service provides identity data, such as user names and group "
+"memberships?"
+msgstr ""

-#: src/lib/yauthclient/params.rb:130
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+msgid "Enable the domain"
+msgstr "启用该域"
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+msgid "Please enter the domain name."
+msgstr "请输入域名。"
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
msgid ""
-"Default regular expression that describes how to parse the string containing "
-"user name and domain into these components"
-msgstr "默认正则表达式描述了如何解析包含用户名和域的字符串到这些组件中"
+"The domain name collides with a reserved keyword. Please choose a different "
+"name."
+msgstr ""

-#: src/lib/yauthclient/params.rb:134
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+msgid "The domain name is already in-use."
+msgstr "域名已使用。"
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never
customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
msgid ""
-"The default printf(3)-compatible format that describes how to translate a "
-"(name, domain) tuple into a fully qualified name."
-msgstr "默认的 printf(3) 兼容格式,描述了如何转义 (name, domain) 元组为完全限定名称。"
+"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/yauthclient/params.rb:138
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr "正则表达式会将用户名和域名解析到部件中"
+
+#: src/lib/authui/sssd/params.rb:123
msgid ""
-"SSSD monitors the state of resolv.conf to identify when it needs to update "
-"its internal DNS resolver."
-msgstr "SSSD 监控着 resolv.conf 的状态来识别它是否需要更新其内部 DNS 解析器。"
+"The default printf(3)-compatible format that describes translation of a name/"
+"domain tuple into FQDN"
+msgstr "默认的 printf(3)-compatible 格式描述了如何转义名称/域数组为完全限定名称。"

-#: src/lib/yauthclient/params.rb:139
+#: src/lib/authui/sssd/params.rb:127
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 "
-"一次。"
+"Whether or not to use inotify mechanism to monitor resolv.conf to update "
+"internal DNS resolver"
+msgstr "是否使用 inotify 机制监视 resolv.conf 来更新内部 DNS 解析器"

-#: src/lib/yauthclient/params.rb:143
+#: src/lib/authui/sssd/params.rb:131
msgid ""
"Directory on the filesystem where SSSD should store Kerberos replay cache "
-"files."
-msgstr "SSSD 应在文件系统上存放 Kerberos 回放缓存文件的文件夹。"
+"files"
+msgstr "文件系统上 SSSD 应存储 Kerberos 回放缓存文件的文件夹"

-#: src/lib/yauthclient/params.rb:147
-msgid ""
-"This string will be used as a default domain name for all names without a "
-"domain name component."
-msgstr "此字符串将用作全部没有域名组件的名称的默认域名。"
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr "用于全部没有域名部件的名称的默认域名"

#. Define Global Services Parameters
-#: src/lib/yauthclient/params.rb:154
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration
section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: 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 ""
-"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."
+"Level of details for logging. Can be numeric (0-9) or a big mask such as "
+"0x0010 (lowest level) or 0xFFF (highest level)"
msgstr ""
-"表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值,0xFFF0是最详尽模"
-"式。"

-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr "为调试信息添加时间戳"

-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr "为调试信息中的时间戳添加毫秒"

-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
-msgstr "此服务心跳间超时秒数。"
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
+msgstr "此服务心跳间超时秒数"

-#: src/lib/yauthclient/params.rb:179
+#: src/lib/authui/sssd/params.rb:171
msgid ""
-"This option specifies the maximum number of file descriptors that may be "
-"opened at one time by this SSSD process."
-msgstr "此选项指定了此 SSSD 进程同一时间可打开的最大文件描述符数目。"
+"Maximum number of file descriptors that may be opened at a time by SSSD "
+"service process"
+msgstr "SSSD 服务进程同一时间可打开的最大文件描述符数目"

-#: src/lib/yauthclient/params.rb:184
+#: src/lib/authui/sssd/params.rb:176
msgid ""
-"This option specifies the number of seconds that a client of an SSSD process "
-"can hold onto a file descriptor without communicating on it."
-msgstr "此选项指定了 SSSD 进程客户端可持有文件描述符而不与之通信的秒数。"
+"Number of seconds a client of SSSD process can hold onto a file descriptor "
+"without any communication"
+msgstr "SSSD 进程客户端可持有文件描述符而不与之通信的秒数"

-#: src/lib/yauthclient/params.rb:189
+#: src/lib/authui/sssd/params.rb:181
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."
+"The service will receive SIGTERM after this number of seconds of consecutive "
+"ping check failure"
msgstr ""
-"若服务不响应 ping 检查 (参考「超时」选项) ,它将会先发送 SIGTERM 信号引导服务"
-"优雅地退出。"

-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid ""
"How many seconds should cache nss_sss enumerations (requests for info about "
"all users)?"
msgstr "缓存 nss_css 枚举 (对全部用户信息的请求) 的秒数"

-#: src/lib/yauthclient/params.rb:202
+#: 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 "
@@ -359,7 +960,7 @@
"若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比,则可将条目缓存设"
"为在后台自动更新条目。"

-#: src/lib/yauthclient/params.rb:207
+#: 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) "
@@ -368,73 +969,72 @@
"指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即,针对无效数据库条目如不存"
"在条目的查询) 的秒数。"

-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
msgstr "排除特定用户不被 SSS 后端获取"

-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr "排除特定组不被 SSS 后端获取"

-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid ""
"If you want filtered user to still be group members set this option to false."
msgstr "若您想使被过滤的用户仍留作组成员则请设置此选项为假。"

-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224
msgid ""
"Override the user's home directory. You can either provide an absolute value "
"or a template."
msgstr "覆盖用户主文件夹。您可以提供一个绝对值或一个模板。"

-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: 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."
msgstr "设置当某域的数据提供者未显式指定用户主文件夹时所用的默认模板。"

-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr "覆盖全部用户的登录壳层。"

-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr "限制用户使用的壳层为列出值其一。"

-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr "使用 shell_fallback 替换这些壳层中的任何一种"

-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid ""
"The default shell to use if an allowed shell is not installed on the machine."
msgstr "机器上未安装获准使用的壳层时所使用的默认壳层。"

-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: 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."
msgstr "查询时提供者未返回值时所使用的默认壳层。"

-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: 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."
msgstr "指定了子域列表被认定有效的秒数 。"

-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid ""
"Specifies time in seconds for which records in the in-memory cache will be "
"valid."
msgstr "指定了内存缓存中记录的有效秒数。"

-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: 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)."
msgstr "认证提供者离线时应允许缓存登入的天数 (自上次成功在线登入起的天数)"

-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: 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."
@@ -442,12 +1042,12 @@
"触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时"
"间。"

-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid ""
"Controls what kind of messages are shown to the user during authentication."
msgstr "控制在认证期间展示给用户的消息类型。"

-#: src/lib/yauthclient/params.rb:291
+#: 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 "
@@ -457,51 +1057,46 @@
"认证使用了最新信息。"

#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811
+#: src/lib/authui/sssd/params.rb:1096
msgid "Display a warning N days before the password expires."
msgstr "在密码过期前 N 天展示一条警告。"

-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid ""
"Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes "
"that implement time-dependent sudoers entries."
msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。"

-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: 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."
msgstr "指定了再次询问后端前 autofs 回应者应缓存否定次数的秒数。"

-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid ""
"Whether or not to hash host names and addresses in the managed known_hosts "
"file."
msgstr "是否在受管 known_hosts 文件中哈希化主机名和地址。"

-#: src/lib/yauthclient/params.rb:330
+#: 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."
msgstr "已请求主机密钥后在受管 known_hosts 文件中保存主机的秒数。"

-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration
section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: 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."
msgstr "该域的 UID 和 GID 限制。若某域含有一个超出这些限制的项,则忽略该项。"

-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr "从后端数据库读取全部项 (会增加服务器负载)"

-#: src/lib/yauthclient/params.rb:355
+#: 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."
@@ -509,63 +1104,63 @@
"若服务在 \"force_timeout\" 秒后未终止,监控器将发送一个 SIGKILL 信号强制关闭"
"它。"

-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid ""
"How many seconds nss_sss should consider entries valid before asking the "
"backend again."
msgstr "再次询问后端前 nss_sss 应认定条目有效的秒数。"

-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid ""
"How many seconds nss_sss should consider user entries valid before asking "
"the backend again."
msgstr "再次询问后端前 nss_sss 应认定用户项有效的秒数。"

-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid ""
"How many seconds nss_sss should consider group entries valid before asking "
"the backend again."
msgstr "再次询问后端前 nss_sss 应认定组项有效的秒数。"

-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid ""
"How many seconds nss_sss should consider netgroup entries valid before "
"asking the backend again."
msgstr "再次询问后端前 nss_sss 应认定网络组项有效的秒数。"

-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid ""
"How many seconds nss_sss should consider service entries valid before asking "
"the backend again."
msgstr "再次询问后端前 nss_sss 应认定服务项有效的秒数。"

-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid ""
"How many seconds sudo should consider rules valid before asking the backend "
"again."
msgstr "再次询问后端前 sudo 应认定规则有效的秒数。"

-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid ""
"How many seconds the autofs service should consider automounter maps valid "
"before asking the backend again."
msgstr "再次询问后端前 autofs 服务应认定自动挂载器映射有效的秒数。"

-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr "缓存机要信息以供离线使用"

-#: src/lib/yauthclient/params.rb:401
+#: 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."
msgstr "在自缓存清理期间移除前应在缓存中保留条目的从最后成功登入日起计的天数。"

-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr "该域所用的标识提供者。"

-#: src/lib/yauthclient/params.rb:413
+#: 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."
@@ -573,46 +1168,46 @@
"使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录"
"名。"

-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr "该域所用的认证提供者"

-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr "该域所用的访问控制提供者。"

-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid ""
"The provider which should handle change password operations for the domain."
msgstr "应受理该域的密码变更操作的提供者。"

-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr "该域所用的 SUDO 提供者。"

-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr "应受理 selinux 设置加载的提供者。"

-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr "应受理子域撷取的提供者。"

-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr "该域所用的 autofs 提供者。"

-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr "用于撷取主机身份信息的提供者。"

-#: src/lib/yauthclient/params.rb:466
+#: 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."
msgstr "用于此域的正则表达式,描述了如何解析包含用户名和域的字符串到这些组件中。"

-#: src/lib/yauthclient/params.rb:471
+#: 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."
@@ -620,33 +1215,33 @@
"一种 printf(3) 兼容格式,描述了如何转义此域的 (name, domain) 元组为完全限定名"
"称。"

-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid ""
"Provides the ability to select preferred address family to use when "
"performing DNS lookups."
msgstr "提供了执行 DNS 查询时选择偏好的地址族的能力。"

-#: src/lib/yauthclient/params.rb:482
+#: 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."
msgstr "定义了假设其不可达前等待 DNS 解析者回复的以秒计的时间。"

-#: src/lib/yauthclient/params.rb:486
+#: 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."
msgstr "若后端使用了服务发现,则指定了服务发现 DNS 查询的域部分。"

-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr "使用指定组 ID 值覆盖主要组 ID 值。"

-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:512
msgid "Treat user and group names as case sensitive."
msgstr "视用户和组名称为大小写敏感的。"

-#: src/lib/yauthclient/params.rb:500
+#: 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 "
@@ -655,23 +1250,23 @@
"当在代理提供者上按名称查询某个用户或组时,也执行按 ID 的二次查询以 '规范化' "
"该名称以防止所请求的名称是一个别名。"

-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:522
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/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:528
msgid "Comma separated list of users who are allowed to log in."
msgstr "逗号分隔的允许登入用户列表。"

-#: src/lib/yauthclient/params.rb:516
+#: 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."
msgstr "逗号分隔的允许登入组列表。这仅应用于此 SSSD 域中的组。"

-#: src/lib/yauthclient/params.rb:521
+#: 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."
@@ -679,29 +1274,29 @@

#. 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/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:547
msgid ""
"The tools append the login name to base_directory and use that as the home "
"directory."
msgstr "此工具会追加登入名到 base_directory 并用其作为主文件夹。"

-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:552
msgid ""
"Indicate if a home directory should be created by default for new users."
msgstr "指出是否应为新用户默认创建主文件夹。"

-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:557
msgid ""
"Indicate if a home directory should be removed by default for deleted users."
msgstr "指出是否应默认移除已删除用户的主文件夹。"

-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:562
msgid ""
"Used by sss_useradd(8) to specify the default permissions on a newly created "
"home directory."
msgstr "被 sss_useradd(8) 用来指定新创建的主文件夹的默认权限。"

-#: src/lib/yauthclient/params.rb:550
+#: 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 "
@@ -710,30 +1305,34 @@
"骨架文件夹,其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件"
"和文件夹。"

-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:572
msgid "The mail spool directory."
msgstr "邮件卷文件夹。"

-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:576
msgid "The command that is run after a user is removed."
msgstr "移除用户后运行的命令。"

#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:585
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:591
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr "LDAP 服务器 URI (ldap://) (逗号分隔)"

-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:597
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr "用于执行 LDAP sudo 规则的默认基本判别名。"

-#: src/lib/yauthclient/params.rb:579
+#: 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."
msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 LDAP 服务器 URI 列表。"

-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: 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."
@@ -741,70 +1340,70 @@
"指定了逗号分隔的 LDAP 服务器 URI 列表,SSSD 应以优先级顺序连接以修改用户密"
"码。"

-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:620
msgid "Base DN for LDAP search"
msgstr "LDAP 搜索的基础判别名"

-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:627
msgid "LDAP schema type"
msgstr "LDAP 方案类型"

-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:631
msgid "The default bind DN to use for performing LDAP operations."
msgstr "指定 LDAP 操作所用的默认绑定判别名。"

-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:637
msgid "The type of the authentication token of the default bind DN."
msgstr "默认绑定判别名的认证 token 的类型。"

-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:641
msgid "The authentication token of the default bind DN."
msgstr "默认绑定判别名的认证 token。"

-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:646
msgid "The object class of a user entry in LDAP."
msgstr "LDAP 中用户项的对象类。"

-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:651
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr "对应着用户登录名的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:656
msgid "The LDAP attribute that corresponds to the user's id."
msgstr "对应着用户 ID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:661
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr "对应着用户的首要组 ID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:666
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr "对应着用户 gecos 字段的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:671
msgid ""
" The LDAP attribute that contains the name of the user's home directory."
msgstr "存放用户主文件夹名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:676
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr "存放用户默认壳层路径的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:681
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr "存放 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:686
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr "存放 LDAP 用户对象的 objectSID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: 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."
msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:673
+#: 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 "
@@ -813,7 +1412,7 @@
"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(上次"
"密码变更日期) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:678
+#: 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 "
@@ -822,7 +1421,7 @@
"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最小"
"密码有效期) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:683
+#: 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 "
@@ -831,7 +1430,7 @@
"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最大"
"密码有效期) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:688
+#: 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 "
@@ -840,7 +1439,7 @@
"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码"
"告警时间) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:693
+#: 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 "
@@ -849,7 +1448,7 @@
"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码"
"无活动时间) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:698
+#: 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 "
@@ -858,7 +1457,7 @@
"当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时,此参数"
"存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。"

-#: src/lib/yauthclient/params.rb:703
+#: 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 "
@@ -867,7 +1466,7 @@
"当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储 kerberos 中上次密码"
"变更日期和时间的 LDAP 属性的名称。"

-#: src/lib/yauthclient/params.rb:708
+#: 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."
@@ -875,7 +1474,7 @@
"当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储当前密码过期日期和时"
"间的 LDAP 属性的名称。"

-#: src/lib/yauthclient/params.rb:713
+#: 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."
@@ -883,7 +1482,7 @@
"当使用 ldap_account_expire_policy=ad 时,此参数存放了存储账户过期时间的 LDAP "
"属性的名称。"

-#: src/lib/yauthclient/params.rb:718
+#: 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."
@@ -891,25 +1490,25 @@
"当使用 ldap_account_expire_policy=ad 时,此参数存放了存储用户账户控制字节段"
"的 LDAP 属性的名称。"

-#: src/lib/yauthclient/params.rb:723
+#: 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."
msgstr "当使用 ldap_account_expire_policy=rhds 或等价物时,此参数确定了是否允许访问。"

-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:751
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/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:756
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/yauthclient/params.rb:738
+#: 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."
@@ -917,17 +1516,17 @@
"当使用 ldap_account_expire_policy=nds 时,此属性确定了一周中每天准予访问的小"
"时数。"

-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:766
msgid ""
"The LDAP attribute that contains the user's Kerberos User Principal Name "
"(UPN)."
msgstr "存放用户的 Kerberos 用户实体名称 (UPN) 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr "存放用户 SSH 公钥的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:752
+#: 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 "
@@ -936,17 +1535,17 @@
"某些目录服务器,例如活动目录服务器,可能会以小写传递 UPN 的领域部分,这可能造"
"成认证失败。"

-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:776
msgid "Set this option to true if you want to use an upper-case realm."
msgstr "若您想要使用大写领域则请将此选项设为真。"

-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:781
msgid ""
"Specifies how many seconds SSSD has to wait before refreshing its cache of "
"enumerated records."
msgstr "指定了刷新其枚举记录缓存前 SSSD 必须等待的秒数。"

-#: src/lib/yauthclient/params.rb:763
+#: 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 "
@@ -955,15 +1554,15 @@
"确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省"
"空间的频率。"

-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:791
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr "对应着用户完整名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:796
msgid "The LDAP attribute that lists the user's group memberships."
msgstr "列出了用户的组成员资格的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:778
+#: 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 "
@@ -972,7 +1571,7 @@
"若 access_provider=ldap 且 ldap_access_order=authorized_service,SSSD 将依据 "
"authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。"

-#: src/lib/yauthclient/params.rb:783
+#: 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 "
@@ -981,37 +1580,37 @@
"若 access_provider=ldap 且 ldap_access_order=host,SSSD 将依据主机属性是否在"
"该用户 LDAP 项中出现来确定访问权限。"

-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:816
msgid "The object class of a group entry in LDAP."
msgstr "LDAP 中组项的对象类。"

-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:821
msgid "The LDAP attribute that corresponds to the group name."
msgstr "对应着组名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:826
msgid "The LDAP attribute that corresponds to the group's id."
msgstr "对应着组 ID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:831
msgid "The LDAP attribute that contains the names of the group's members."
msgstr "存放组成员名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:836
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr "存放某 LDAP 组对象的 UUID/GUID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:841
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr "存放某 LDAP 组对象的 objectSID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:846
msgid ""
" The LDAP attribute that contains timestamp of the last modification of the "
"parent object."
msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:829
+#: 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 "
@@ -1020,7 +1619,7 @@
"若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis),则此选项控制了 "
"SSSD 将跟随的嵌套级数。"

-#: src/lib/yauthclient/params.rb:835
+#: 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 "
@@ -1029,7 +1628,7 @@
"此选项告知 SSSD 利用一项活动目录独有特性,其可能加速在具有复杂或深度嵌套的组"
"的部署上的组查询操作。"

-#: src/lib/yauthclient/params.rb:841
+#: 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 "
@@ -1038,61 +1637,61 @@
"此选项告知 SSSD 利用一项活动目录独有特性,其可能加速 initgroups 操作 (当处理"
"复杂或深度嵌套的组时最为显著)。"

-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:870
msgid " The object class of a netgroup entry in LDAP."
msgstr " LDAP 中网络组项的对象类。"

-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:876
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr "对应着网络组名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:881
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr "存放网络组成员名称的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:886
msgid ""
"The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr "存放 (主机,用户,域) 网络组铁三角的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:891
msgid ""
"The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr "存放某个 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:901
msgid "The object class of a service entry in LDAP."
msgstr "LDAP 中服务项的对象类。"

-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:906
msgid ""
"The LDAP attribute that contains the name of service attributes and their "
"aliases."
msgstr "存放服务属性名称和其别名的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:911
msgid "The LDAP attribute that contains the port managed by this service."
msgstr "存放此服务管理的端口的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:916
msgid ""
"The LDAP attribute that contains the protocols understood by this service."
msgstr "存放此服务可解析协议的 LDAP 属性。"

-#: src/lib/yauthclient/params.rb:899
+#: 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."
msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器,可限制 LDAP 搜索只搜索此属性类型。"

-#: src/lib/yauthclient/params.rb:904
+#: 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)."
msgstr "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 搜索允许运行的以秒计超时。"

-#: src/lib/yauthclient/params.rb:909
+#: 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 "
@@ -1101,81 +1700,81 @@
"指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的"
"以秒计超时。"

-#: src/lib/yauthclient/params.rb:914
+#: 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."
msgstr "指定了无活动时 poll(2)/select(2) 跟随 connect(2) 返回的以秒计超时。"

-#: src/lib/yauthclient/params.rb:919
+#: 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."
msgstr "指定了无回应时同步 LDAP API 调用中止的以秒计超时。"

-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:947
msgid ""
"Specifies a timeout (in seconds) that a connection to an LDAP server will be "
"maintained."
msgstr "指定了维持到 LDAP 服务器连接的以秒计超时。"

-#: src/lib/yauthclient/params.rb:929
+#: 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."
msgstr "指定了单一请求从 LDAP 撷取的记录数。某些 LDAP 服务器强制单一请求最大限制。"

-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:957
msgid "Disable the LDAP paging control."
msgstr "禁用 LDAP 分页控制。"

-#: src/lib/yauthclient/params.rb:938
+#: 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."
msgstr "当使用 SASL 与 LDAP 服务器通信时,请指定建立连接必需的最小安全级别。"

-#: src/lib/yauthclient/params.rb:943
+#: 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."
msgstr "指定了为触发解引用查询内部缓存必须缺失的组成员数。"

-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:973
msgid "Validate server certification in LDAP TLS session"
msgstr "在 LDAP TLS 会话中验证服务器证书"

-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:977
msgid ""
"Specifies the file that contains certificates for all of the Certificate "
"Authorities that sssd will recognize."
msgstr "指定了包含全部 sssd 应认得的证书授权机构证书的文件。"

-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:981
msgid ""
"Specifies the path of a directory that contains Certificate Authority "
"certificates in separate individual files."
msgstr "指定了包含以几个单独文件形式存在的证书授权机构证书的文件夹路径。"

-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the file that contains the certificate for the client's key."
msgstr "指定了包含客户端密钥证书的文件。"

-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the client's key."
msgstr "指定了包含客户端密钥的文件。"

-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:994
msgid "Specifies acceptable cipher suites."
msgstr "指定了可接受的密码套件。"

-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:999
msgid ""
"Specifies that the id_provider connection must also use tls to protect the "
"channel."
msgstr "指定了 id_provider 连接必须也使用 TLS 来保护通道。"

-#: src/lib/yauthclient/params.rb:981
+#: 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 "
@@ -1184,56 +1783,56 @@
"指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户"
"和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。"

-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1008
msgid "Specify the SASL mechanism to use."
msgstr "指定了要使用的 SASL 机制。"

-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1013
msgid "Specify the SASL authorization id to use."
msgstr "指定了要使用的 SASL 认证 ID。"

-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1018
msgid "Specify the SASL realm to use."
msgstr "指定了要使用的 SASL 领域。"

-#: src/lib/yauthclient/params.rb:1000
+#: 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."
msgstr "若设为真,LDAP 函数库在 SASL 绑定时应执行一次反向查询以规范化主机名。"

-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1028
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr "指定了使用 SASL/GSSAPI 时使用的密钥表。"

-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1033
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr "指定了 id_provider 应初始化 Kerberos 机要资料 (票据授权票据)。"

-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1038
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr "指定了使用 GSSAPI 时票据授权票据以秒计的生命周期。"

-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1043
msgid ""
"Select the policy to evaluate the password expiration on the client side."
msgstr "选择客户端方面用于评估密码有效期的策略。"

-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1048
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr "指定了是否应启用自动引用跟踪。"

-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1053
msgid "Specifies the service name to use when service discovery is enabled."
msgstr "制定了当启用了服务发现时使用的服务名称。"

-#: src/lib/yauthclient/params.rb:1034
+#: 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."
msgstr "指定了当启用了服务发现时用于查找允许密码变更的 LDAP 服务器的服务名称。"

-#: src/lib/yauthclient/params.rb:1039
+#: 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."
@@ -1241,7 +1840,7 @@
"指定了在密码变更操作过后是否使用上次操作天数更新 "
"ldap_user_shadow_last_change 属性。"

-#: src/lib/yauthclient/params.rb:1044
+#: 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 "
@@ -1251,31 +1850,31 @@
"项是必需的。它指定了一个 LDAP 搜索过滤器标准,用户想要获得此主机的访问权就必"
"须满足此标准。"

-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1072
msgid ""
" With this option a client side evaluation of access control attributes can "
"be enabled."
msgstr "使用此选项可启用客户端访问控制属性评估。"

-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1078
msgid "Comma separated list of access control options."
msgstr "逗号分隔的访问控制选项列表。"

-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1083
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr "指定了执行搜索时如何解引用别名。"

-#: src/lib/yauthclient/params.rb:1065
+#: 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."
msgstr "针对使用 RFC2307 方案的服务器允许保留本地用户作为某个 LDAP 组的成员。"

-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1101
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr "Kerberos 服务器 IP 地址或主机名 (逗号分隔)"

-#: src/lib/yauthclient/params.rb:1082
+#: 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."
@@ -1283,88 +1882,88 @@
"指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列"
"表。"

-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1110
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr "Kerberos 领域 (例如 EXAMPLE.COM)"

-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: 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."
msgstr "若 KDC 上未运行密码变更服务,则可在此定义替代服务器。"

-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1124
msgid "Directory to store credential caches."
msgstr "存储机要缓存的文件夹。"

-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1129
msgid "Location of the user's credential cache."
msgstr "用户机要缓存的位置。"

-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1134
msgid ""
" Timeout in seconds after an online authentication request or change "
"password request is aborted."
msgstr "在线认证请求或密码变更请求以秒计的超时。"

-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1139
msgid ""
"Verify with the help of krb5_keytab that the TGT obtained has not been "
"spoofed."
msgstr "在 krb5_keytab 的帮助下校验获取的票据授权票据未被冒名顶替。"

-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1144
msgid ""
"The location of the keytab to use when validating credentials obtained from "
"KDCs."
msgstr "当认证从 KDC 获取的机要资料时所用的密钥表的位置。"

-#: src/lib/yauthclient/params.rb:1126
+#: 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."
msgstr "若提供者离线则存储用户密码并在提供者再次上线时用其请求票据授权票据。"

-#: src/lib/yauthclient/params.rb:1130
+#: 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."
msgstr "请求可续期票据和其完整生命期,以整数后接时间单位的形式给出。"

-#: src/lib/yauthclient/params.rb:1134
+#: 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."
msgstr "请求票据和其生命期,以整数后接时间单位的形式给出。"

-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1161
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr "当票据授权票据应续期时两次检查间的秒数。"

-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1166
msgid ""
"Enables flexible authentication secure tunneling (FAST) for Kerberos pre-"
"authentication."
msgstr "为 Kerberos 预认证启用灵活认证安全隧道 (FAST)。"

-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1170
msgid "Specifies the server principal to use for FAST."
msgstr "指定了用于灵活认证安全隧道的服务器实体。"

-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1175
msgid "Specifies if the host and user principal should be canonicalized."
msgstr "指定了是否应规范化主机和用户实体。"

#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1187
msgid "Specifies the name of the Active Directory domain."
msgstr "指定了活动目录域的名称。"

-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1192
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr "AD 服务器 IP 地址或主机名 (逗号分隔)"

-#: src/lib/yauthclient/params.rb:1173
+#: 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."
@@ -1372,69 +1971,66 @@
"以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名"
"列表。"

-#: src/lib/yauthclient/params.rb:1177
+#: src/lib/authui/sssd/params.rb:1201
msgid ""
-"Optional. May be set on machines where the hostname(5) does not reflect the "
-"fully qualified name used in the Active Directory domain to identify this "
-"host."
-msgstr ""
-"可选。可以在 hostname(5) 未反映在活动目录域中用于识别此主机的完全限定名称的机"
-"器上设置。"
+"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/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1205
msgid "Override the user's home directory."
msgstr "覆盖用户主文件夹。"

-#: src/lib/yauthclient/params.rb:1194
+#: 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."
msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的下界。"

-#: src/lib/yauthclient/params.rb:1199
+#: 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."
msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的上界。"

-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1228
msgid "Specifies the number of IDs available for each slice."
msgstr "指定了每一切片可用的 ID 数。"

-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specify the domain SID of the default domain."
msgstr "指定默认域的域 SID。"

-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the name of the default domain."
msgstr "指定默认域的名称。"

-#: src/lib/yauthclient/params.rb:1217
+#: 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."
msgstr "修改 ID 映射算法的行为以与 winbind 的 \"idmap_autorid\" 算法更加相似。"

#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1253
msgid "Specifies the name of the IPA domain."
msgstr "指定 IPA 域的名称。"

-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1258
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr "IPA 服务器 IP 地址或主机名 (逗号分隔)"

-#: src/lib/yauthclient/params.rb:1238
+#: src/lib/authui/sssd/params.rb:1263
msgid ""
-"May be set on machines where the hostname(5) does not reflect the fully "
-"qualified name."
-msgstr "可以在 hostname(5) 未反映完全限定名称的机器上设置。"
+"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/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1268
msgid "The automounter location this IPA client will be using."
msgstr "将使用此 IPA 客户端的自动挂载器位置。"

-#: src/lib/yauthclient/params.rb:1248
+#: 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."
@@ -1442,48 +2038,147 @@
"此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务"
"器。"

-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1278
msgid "The TTL to apply to the client DNS record when updating it."
msgstr "更新客户端 DNS 记录时应用的 TTL。"

-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1282
msgid ""
"Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr "选择其 IP 地址应用于动态 DNS 更新的接口。"

-#. autofs may only start after sssd is started
-#: src/modules/AuthClient.rb:230
-msgid "Failed to enable %s service. Please use system journal to diagnose."
-msgstr "启用 %s 服务失败。请使用系统日志进行诊断。"
+#~ msgid "Authentication client configuration module"
+#~ msgstr "认证客户端配置模块"

-#: src/modules/AuthClient.rb:232
-msgid ""
-"Failed to start %s service. Please use system journal (journalctl -n -u %s) "
-"to diagnose."
-msgstr "启动 %s 服务失败。请使用系统日志 (journalctl -n -u %s) 进行诊断。"
+#~ msgid "Configuration summary of the authentication client"
+#~ msgstr "认证客户端配置摘要"

-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr "系统配置为使用 nss_ldap。\n"
+#~ msgid "Create autoyast rnc from @parameters"
+#~ msgstr "从 @parameters 创建 autoyast rnc"

-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr "系统配置为使用 sssd。\n"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "认证客户端配置"

-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr "系统配置为使用 OES。\n"
+#~ msgid "New Service/Domain"
+#~ msgstr "新服务/域"

-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr "系统配置为仅使用 /etc/passwd。\n"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "删除服务/域"

+#~ msgid "More Parameters"
+#~ msgstr "更多参数"
+
+#~ msgid ""
+#~ "Your system is configured for using nss_ldap.\n"
+#~ "This module is designed to configure your system via sssd.\n"
+#~ "If you continue, your nss_ldap configuration will be removed.\n"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "您的系统已配置为使用 nss_ldap。\n"
+#~ "此模块设计用于通过 sssd 配置您的系统。\n"
+#~ "若您继续,您的 nss_ldap 配置将会被移除。\n"
+#~ "您想要继续吗?"
+
+#~ msgid ""
+#~ "Your system is configured as OES client.\n"
+#~ "This module is designed to configure your system via sssd.\n"
+#~ "If you continue, your OES client configuration will be deactivated.\n"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "您的系统已配置为 OES 客户端。\n"
+#~ "此模块设计用于通过 sssd 配置您的系统。\n"
+#~ "若您继续,您的 OES 客户端配置将被取消激活。\n"
+#~ "您想要继续吗?"
+
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "您不能删除 SSSD 部分。"
+
+#~ msgid "Inactive domain(s) found"
+#~ msgstr "发现了非活动域"
+
+#~ msgid "Would you like to enable another service or join a domain?"
+#~ msgstr "您想要启用另一个服务还是加入一个域?"
+
+#~ msgid "Service"
+#~ msgstr "服务"
+
+#~ msgid "Identification provider:"
+#~ msgstr "鉴定提供方:"
+
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "没有更多服务可启用。"
+
+#~ msgid "Indicates what is the syntax of the config file."
+#~ msgstr "揭示了配置文件的语法。"
+
+#~ msgid ""
+#~ "Comma separated list of services that are started when sssd itself starts."
+#~ msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。"
+
+#~ msgid ""
+#~ "\n"
+#~ "Supported services: nss, pam, sudo, autofs, ssh"
+#~ msgstr ""
+#~ "\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."
+#~ msgstr "SSSD 可同时使用更多域,但必须配置至少一个否则 SSSD 不会启动。"
+
+#~ 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 ""
+#~ "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 ""
+#~ "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."
+#~ msgstr "启动 %s 服务失败。请使用系统日志 (journalctl -n -u %s) 进行诊断。"
+
+#~ msgid "System is configured for using nss_ldap.\n"
+#~ msgstr "系统配置为使用 nss_ldap。\n"
+
+#~ msgid "System is configured for using sssd.\n"
+#~ msgstr "系统配置为使用 sssd。\n"
+
+#~ msgid "System is configured for using OES.\n"
+#~ msgstr "系统配置为使用 OES。\n"
+
+#~ msgid "System is configured for using /etc/passwd only.\n"
+#~ msgstr "系统配置为仅使用 /etc/passwd。\n"
+
#~ msgid "Authentication Client Config"
#~ msgstr "认证客户端配置"

@@ -1529,9 +2224,6 @@
#~ msgid "New"
#~ msgstr "新建"

-#~ msgid "Add New Domain"
-#~ msgstr "添加新域"
-
#~ msgid "Name:"
#~ msgstr "名称:"

@@ -1544,9 +2236,6 @@
#~ msgid "You have to provide a domain name!"
#~ msgstr "您必须提供一个域名!"

-#~ msgid "Basic Settings:"
-#~ msgstr "基本设置:"
-
#~ msgid "Services:"
#~ msgstr "服务:"

@@ -1568,9 +2257,6 @@
#~ msgid "Edit"
#~ msgstr "编辑"

-#~ msgid "Delete"
-#~ 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 "

Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/autoinst.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/autoinst.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
"PO-Revision-Date: 2015-10-18 12:20+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\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:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358
msgid "This may take a while"
msgstr "这可能要花费一点时间"

@@ -57,12 +57,12 @@

#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. We will have to set default entries which are defined
+#. in the import call of ServicesManager
#. 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:410
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -127,7 +127,8 @@

#. 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
@@ -156,15 +157,20 @@
#: 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"
@@ -240,8 +246,10 @@
#: 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"
@@ -300,7 +308,8 @@
"\n"
"%s\n"
"\n"
-"Maybe they were misspelled or your profile does not contain all the needed
YaST packages in <software/> section."
+"Maybe they were misspelled or your profile does not contain all the needed "
+"YaST packages in <software/> section."
msgstr ""
"AutoYaST 方案的这些部分无法在此系统上进行:\n"
"\n"
@@ -325,23 +334,21 @@
msgid "Executing Post-Scripts"
msgstr "正在执行安装后脚本"

-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
-#: src/clients/inst_autoconfigure.rb:304
+#: src/clients/inst_autoconfigure.rb:303
msgid "Restarting all running services"
msgstr "正在重启全部运行中的服务"

-#: src/clients/inst_autoconfigure.rb:327
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr "正在激活 systemd 默认对象"

#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "正在完成配置"

#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:444
msgid "Processing resource %1"
msgstr "正在处理资源 %1"

@@ -514,104 +521,92 @@
#. Uwe Gansert <ug@xxxxxxx>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>系统正在准备自动安装,请稍候。</P>"

-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr "执行安装前用户脚本"

-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure General Settings "
msgstr "配置常规设置"

-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
msgid "Set up language"
msgstr "设置语言"

-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:57
msgid "Create partition plans"
msgstr "创建分区计划"

-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configure Bootloader"
msgstr "配置引导加载器"

-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
msgid "Registration"
msgstr "注册"

-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
msgid "Configure Software selections"
msgstr "配置软件选集"

-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:61
msgid "Configure Systemd Default Target"
msgstr "配置 Systemd 默认对象"

-#: src/clients/inst_autosetup.rb:65
-msgid "Configure users and groups"
-msgstr "配置用户和组"
-
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr "正在执行安装前用户脚本..."

-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr "正在配置常规设置..."

-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
msgid "Setting up language..."
msgstr "正在设置语言..."

-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:68
msgid "Creating partition plans..."
msgstr "正在创建分区计划..."

-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr "正在配置引导加载器..."

-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
msgid "Registering the system..."
msgstr "正在注册系统..."

-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
msgid "Configuring Software selections..."
msgstr "正在配置软件选集..."

-#: src/clients/inst_autosetup.rb:76
+#: src/clients/inst_autosetup.rb:72
msgid "Configuring Systemd Default Target..."
msgstr "正在配置 Systemd 默认对象..."

-#: src/clients/inst_autosetup.rb:77
-msgid "Importing users and groups configuration..."
-msgstr "正在导入用户和组配置..."
-
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
msgid "Preparing System for Automated Installation"
msgstr "准备系统以进行自动安装"

-#. 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:183
+#. configure general settings
+#: src/clients/inst_autosetup.rb:164
msgid "Handling Add-On Products..."
msgstr "正在处理附加产品..."

#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
msgid "Configuring language..."
msgstr "正在配置语言..."

#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:273
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -620,7 +615,7 @@
"请重试。\n"

#. Software
-#: src/clients/inst_autosetup.rb:344
+#: src/clients/inst_autosetup.rb:331
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -680,7 +675,8 @@

#: 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"

@@ -688,7 +684,9 @@
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"
@@ -703,12 +701,14 @@
#: src/clients/software_auto.rb:88
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();
@@ -719,7 +719,8 @@
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)"
+msgid ""
+"The inst-source of this system (you can't create images if you choose this)"
msgstr "此系统的安装来源 (若您选了则不能创建映像,因为映像不是动态的)"

#: src/clients/software_auto.rb:164
@@ -735,9 +736,12 @@
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"
@@ -751,7 +755,8 @@
#: 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 "
@@ -857,7 +862,9 @@
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
@@ -925,7 +932,8 @@

#. 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
@@ -1029,7 +1037,8 @@
"</p>"
msgstr ""
"<p>\n"
-"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 &product;。\n"
+"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 "
+"&product;。\n"
"</p>"

#. force help text width
@@ -1108,7 +1117,8 @@
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 ""
@@ -1180,7 +1190,8 @@
"creating the classes.</P>\n"
msgstr ""
"<p>若您已定义并创建了<b>类</b>,您将能够使用此界面合并这些类来创建一个\n"
-"新<i>方案</i>,该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。</P>\n"
+"新<i>方案</i>,该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。</"
+"P>\n"

#: src/include/autoinstall/classes.rb:497
msgid ""
@@ -1378,7 +1389,9 @@
#. 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
@@ -1393,7 +1406,9 @@

#. 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
@@ -1445,8 +1460,7 @@
msgid "Settings"
msgstr "设置"

-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr "选择文件夹"

@@ -1531,7 +1545,8 @@
#: 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"
@@ -1569,7 +1584,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
msgid "Checking XML with RNG validation..."
msgstr "正在进行 RNG 校验以检查 XML..."

@@ -1579,7 +1594,7 @@
msgstr "部分 %1:"

#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
msgid "Checking XML with RNC validation..."
msgstr "正在进行 RNC 校验以检查 XML..."

@@ -1618,7 +1633,7 @@
msgstr "第二阶段后重启计算机"

#: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:121
msgid "Signature Handling"
msgstr "签名处理"

@@ -1663,7 +1678,8 @@
"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"
@@ -1675,12 +1691,14 @@
#: 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
@@ -1824,12 +1842,14 @@

#: 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 ""
@@ -1848,13 +1868,15 @@
"to add more configuration options available with SUSE.</p>\n"
msgstr ""
"<p>要导入 Kickstart 文件,请输入配置文件的路径。\n"
-"导入的数据将被加载到配置管理系统中以添加更多可通过 SUSE 使用的配置选项。</p>\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"
@@ -1865,7 +1887,8 @@

#: 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"
@@ -1906,9 +1929,12 @@
#: 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 ""
@@ -1923,20 +1949,30 @@
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 ""
@@ -2040,7 +2076,8 @@
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 ""
@@ -2058,13 +2095,15 @@
"<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"
@@ -2074,12 +2113,14 @@
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"

@@ -2107,13 +2148,15 @@
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
@@ -2122,15 +2165,19 @@
"<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"

@@ -2138,14 +2185,17 @@
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"
@@ -2230,11 +2280,13 @@
#: 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"
@@ -2260,8 +2312,10 @@
#. @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:738
-msgid "The XML parser reported an error while parsing the autoyast profile.
The error message is:\n"
+#: 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"
msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为:\n"

#. backdoor for merging problems.
@@ -2274,50 +2328,51 @@
"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:278
+#: src/modules/AutoinstConfig.rb:273
msgid "Choose Profile"
msgstr "选择方案"

#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:329
msgid "Retrieving control file from floppy."
msgstr "正在软盘中撷取控制文件。"

-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:332
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "正在从 TFTP 服务器中撷取控制文件(%1):%2。"

-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "正在从 NFS 服务器中撷取控制文件(%1):%2。"

-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "正在从 HTTP 服务器中撷取控制文件(%1):%2。"

-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "正在从 FTP 服务器中撷取控制文件(%1):%2。"

-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:356
msgid "Copying control file from file: %1."
msgstr "正在从文件中复制控制文件:%1。"

-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:361
msgid "Copying control file from device: /dev/%1."
msgstr "正在从设备中复制控制文件:/dev/%1。"

-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:365
msgid "Copying control file from default location."
msgstr "正在从默认位置复制控制文件。"

-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:367
msgid "Source unknown."
msgstr "未知来源。"

@@ -2327,7 +2382,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:447
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2336,10 +2391,12 @@
"<h3>AutoYaST 配置管理系统</h3>\n"
"<p>使用配置管理系统几乎可以配置控制文件的全部资源。</p>\n"

-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:452
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"
@@ -2349,12 +2406,15 @@
"而该文件可通过 AutoYaST 用于安装另一个系统。\n"
"</p>\n"

-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:459
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.
#.
@@ -2380,97 +2440,79 @@

#. string language_name = "";
#. string keyboard_name = "";
-#: src/modules/AutoinstGeneral.rb:90
+#: src/modules/AutoinstGeneral.rb:85
msgid "Confirm installation?"
msgstr "确认安装吗?"

-#: 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
+#: 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
msgid "Yes"
msgstr "是"

-#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103
msgid "No"
msgstr "否"

-#: src/modules/AutoinstGeneral.rb:96
+#: src/modules/AutoinstGeneral.rb:91
msgid "Second Stage of AutoYaST"
msgstr "AutoYaST 第二阶段"

-#: src/modules/AutoinstGeneral.rb:104
+#: src/modules/AutoinstGeneral.rb:99
msgid "Halting the machine after stage one"
msgstr "第一阶段后挂起计算机"

-#: src/modules/AutoinstGeneral.rb:113
+#: src/modules/AutoinstGeneral.rb:108
msgid "Halting the machine after stage two"
msgstr "第二阶段后挂起计算机"

-#: src/modules/AutoinstGeneral.rb:120
+#: src/modules/AutoinstGeneral.rb:115
msgid "Reboot the machine after stage two"
msgstr "第二阶段后重启计算机"

-#: src/modules/AutoinstGeneral.rb:130
+#: src/modules/AutoinstGeneral.rb:125
msgid "Accepting unsigned files"
msgstr "接受未签名文件"

-#: src/modules/AutoinstGeneral.rb:131
+#: src/modules/AutoinstGeneral.rb:126
msgid "Not accepting unsigned files"
msgstr "不接受未签名文件"

-#: src/modules/AutoinstGeneral.rb:140
+#: src/modules/AutoinstGeneral.rb:135
msgid "Accepting files without a checksum"
msgstr "接受没有校验和的文件"

-#: src/modules/AutoinstGeneral.rb:141
+#: src/modules/AutoinstGeneral.rb:136
msgid "Not accepting files without a checksum"
msgstr "不接受没有校验和的文件"

-#: src/modules/AutoinstGeneral.rb:150
+#: src/modules/AutoinstGeneral.rb:145
msgid "Accepting failed verifications"
msgstr "接受失败的验证"

-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:146
msgid "Not accepting failed verifications"
msgstr "不接受失败的验证"

-#: src/modules/AutoinstGeneral.rb:156
+#: src/modules/AutoinstGeneral.rb:151
msgid "Accepting unknown GPG keys"
msgstr "接受未知 GPG 密钥"

-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:152
msgid "Not accepting unknown GPG Keys"
msgstr "不接受未知 GPG 密钥"

-#: src/modules/AutoinstGeneral.rb:162
+#: src/modules/AutoinstGeneral.rb:157
msgid "Importing new GPG keys"
msgstr "导入新 GPG 密钥"

-#: src/modules/AutoinstGeneral.rb:163
+#: src/modules/AutoinstGeneral.rb:158
msgid "Not importing new GPG Keys"
msgstr "不导入新 GPG 密钥"

-#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
-msgid "Syncing time..."
-msgstr "正在同步时间..."
-
-#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
-msgid "Syncing time with %s."
-msgstr "正与 %s 同步时间。"
-
-#: src/modules/AutoinstGeneral.rb:420
-msgid "Time syncing failed."
-msgstr "时间同步失败。"
-
-#: src/modules/AutoinstGeneral.rb:424
-msgid "Cannot update system time."
-msgstr "无法更新系统时间。"
-
#. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:113
+#: src/modules/AutoinstLVM.rb:111
msgid "Cannot reuse volume group %1. The volume group does not exist."
msgstr "无法复用卷组 %1。该卷组不存在。"

@@ -2550,7 +2592,7 @@
msgstr "未知"

#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:171
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2560,48 +2602,53 @@

#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
msgid "Adding repo %1 failed"
msgstr "添加软件源 %1 失败"

#. Install
-#: src/modules/AutoinstSoftware.rb:375
-msgid "Image creation failed while pattern installation. Please check
/tmp/ay_image.log"
+#: src/modules/AutoinstSoftware.rb:373
+msgid ""
+"Image creation failed while pattern installation. Please check /tmp/ay_image."
+"log"
msgstr "映像创建失败于软件集安装环节。请检查 /tmp/ay_image.log"

-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:381
msgid "Creating Image - installing packages"
msgstr "正在创建映像 - 安装软件包"

-#: src/modules/AutoinstSoftware.rb:393
-msgid "Image creation failed while package installation. Please check
/tmp/ay_image.log"
+#: src/modules/AutoinstSoftware.rb:391
+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:404
+#: src/modules/AutoinstSoftware.rb:402
msgid "Store image to ..."
msgstr "存储映像到..."

#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:431
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:447
+#: src/modules/AutoinstSoftware.rb:445
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr "映像压缩失败于 '%1'。请检查 /tmp/ay_image.log"

-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:452
msgid "Image created successfully"
msgstr "已成功创建映像"

#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:488
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."
@@ -2610,32 +2657,33 @@
"若缺失了它,您可以通过 'ls -F > directory.yast' 命令创建该文件。"

#. don't copy subdirs. They have to be mentioned explicit. Copy only files
from that dir.
-#: src/modules/AutoinstSoftware.rb:524
+#: src/modules/AutoinstSoftware.rb:522
msgid "can not read '%1'. Try again?"
msgstr "无法读取 '%1'。重试吗?"

#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:540
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:572
+#: src/modules/AutoinstSoftware.rb:570
msgid "Preparing ISO Filestructure ..."
msgstr "正在准备 ISO 文件结构..."

#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:619
msgid "boot config for the DVD"
msgstr "DVD 引导配置"

-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:623
msgid "Ok"
msgstr "好呢"

-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:626
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"
@@ -2643,49 +2691,53 @@

#. 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:647
+#: src/modules/AutoinstSoftware.rb:645
msgid "Store ISO image to ..."
msgstr "存储 ISO 映像到..."

-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:646
msgid "Creating ISO File ..."
msgstr "正在创建 ISO 文件..."

-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:667
msgid "ISO successfully created at %1"
msgstr "ISO 成功创建于 %1"

#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:743
msgid "Selected Patterns"
msgstr "所选软件集"

-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:753
msgid "Individually Selected Packages"
msgstr "单选的软件包"

-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:759
msgid "Packages to Remove"
msgstr "待移除软件包"

-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:766
msgid "Force Kernel Package"
msgstr "强制内核软件包"

#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:856
msgid "Could not set patterns: %1."
msgstr "无法设置软件集:%1。"

#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
-msgid "The package resolver run failed. Please check your software section in
the autoyast profile."
+#: src/modules/AutoinstSoftware.rb:917
+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
@@ -2722,14 +2774,14 @@

#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:357
msgid "Collecting configuration data..."
msgstr "正在嵬集配置数据..."

#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:460
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr "加密的 AutoYaST 方案。请输入两次密码。"

@@ -2737,14 +2789,14 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:534
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:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr "加密的 AutoYaST 方案。请输入正确的密码。"

@@ -2762,6 +2814,24 @@
msgid "&OK"
msgstr "好呢(&O)"

+#~ msgid "Configure users and groups"
+#~ msgstr "配置用户和组"
+
+#~ msgid "Importing users and groups configuration..."
+#~ msgstr "正在导入用户和组配置..."
+
+#~ msgid "Syncing time..."
+#~ msgstr "正在同步时间..."
+
+#~ msgid "Syncing time with %s."
+#~ msgstr "正与 %s 同步时间。"
+
+#~ msgid "Time syncing failed."
+#~ msgstr "时间同步失败。"
+
+#~ msgid "Cannot update system time."
+#~ msgstr "无法更新系统时间。"
+
#~ msgid "Configure runlevel"
#~ msgstr "配置运行级别"

@@ -2783,18 +2853,25 @@
#~ 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"
@@ -2853,12 +2930,15 @@
#~ 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"

Modified: trunk/yast/zh_CN/po/base.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/base.zh_CN.po 2016-06-03 15:03:18 UTC (rev 95899)
+++ trunk/yast/zh_CN/po/base.zh_CN.po 2016-06-05 16:43:05 UTC (rev 95900)
@@ -8,15 +8,15 @@
# Novell Language <language@xxxxxxxxxx>, 2004, 2005.
# Thruth Wang <lihaow@xxxxxxxxx>, 2007.
# Eric Shan <ericalways@xxxxxxxxx>, 2008, 2012, 2013.
-# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014, 2015.
+# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: Base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
-"PO-Revision-Date: 2015-10-26 21:29+0800\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"PO-Revision-Date: 2016-06-05 16:52+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -240,12 +240,16 @@

#. 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=<target_XML_file> command line option."
+msgid ""
+"Target file name ('xmlfile' option) is missing. Use "
+"xmlfile=<target_XML_file> 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=<target_XML_file> command line option."
+msgid ""
+"Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> "
+"command line option."
msgstr "目标文件名 ('xmlfile' 选项) 为空。请使用 xmlfile=<目标_XML_文件> 命令行选项。"

#. translators: fallback name for a module at command line
@@ -396,7 +400,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:1444
+#: library/control/src/modules/ProductControl.rb:1450
msgid "http://en.opensuse.org/Bugs/YaST";
msgstr "http://en.opensuse.org/Bugs/YaST";

@@ -432,7 +436,7 @@
msgstr "正在从内存中移除软件包 '%s'"

#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1259
msgid "No workflow defined for this installation mode."
msgstr "没有为此安装方式定义工作流程。"

@@ -444,14 +448,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "继续安装(&C)"

#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "中止安装(&A)"

@@ -496,7 +500,7 @@
msgstr "整合附加工作流程时发生内部错误。"

#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "%1 的值无效。"

@@ -794,7 +798,8 @@
"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
@@ -806,7 +811,8 @@
"<b>Generate</b>.</p>\n"
msgstr ""
"<p><big><b>创建新的事务数字签名 (TSIG) 密钥</b></big><br>\n"
-"要创建一个新的事务数字签名密钥,请设定将在其中创建密钥的文件的<b>文件名</b>,\n"
+"要创建一个新的事务数字签名密钥,请设定将在其中创建密钥的文件的<b>文件名</"
+"b>,\n"
"以及用以识别密钥的<b>密钥 ID</b>,然后点击<b>生成</b>。</p>\n"

#. tsig keys management dialog help 4/4
@@ -915,7 +921,9 @@
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>删除</b>。</p>"
+msgstr ""
+"<p>要添加新选项,请点击<b>添加</b>。要移除某选项,请选择该选项并点击<b>删除</"
+"b>。</p>"

#. help 3/4, optional
#: library/cwm/src/modules/TablePopup.rb:918
@@ -930,7 +938,9 @@
"<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
@@ -994,8 +1004,15 @@

#. 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
@@ -1011,7 +1028,9 @@
msgid ""
"<p>Press [ESC] to close selection pop-ups (e.g., from\n"
"menu buttons) without choosing anything.</p>\n"
-msgstr "<p>按 [ESC] 键可关闭选区弹窗 (例如,菜单按钮的弹窗) 而无需选择任何东西。</p>\n"
+msgstr ""
+"<p>按 [ESC] 键可关闭选区弹窗 (例如,菜单按钮的弹窗) 而无需选择任何东西。</"
+"p>\n"

#. NCurses Control Center help 5/10
#: library/desktop/src/clients/menu.rb:346
@@ -1024,7 +1043,8 @@
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
@@ -1041,7 +1061,8 @@
#: 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"
@@ -1084,6 +1105,86 @@
"F keys are not available.</p>"
msgstr "<p>在某些环境中,全部或部分功能键是不能用的。</p>"

+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+msgid "Restart After Saving Settings"
+msgstr "保存设置后重启"
+
+#: library/general/src/lib/ui/service_status.rb:61
+msgid "Reload After Saving Settings"
+msgstr "保存设置后重新加载"
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+msgid "Service Status"
+msgstr "服务状态"
+
+#. rubocop:enable Style/TrivialAccessors
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:133
+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"
+"<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"
+"<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"
+msgstr ""
+"<p><b><big>当前状态</big></b><br>\n"
+"显示服务当前状态。保存设置后状态仍不变,独立于 '引导期间启动服务' 的值。</p>\n"
+"<p><b><big>%{reload_label}</big></b><br>\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
+msgid "Current status:"
+msgstr "当前状态:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:172
+msgid "Start During System Boot"
+msgstr "系统引导期间启动"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:196
+msgid "running"
+msgstr "正在运行"
+
+#: library/general/src/lib/ui/service_status.rb:198
+msgid "Stop now"
+msgstr "立即停止"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:203
+msgid "stopped"
+msgstr "已停止"
+
+#: library/general/src/lib/ui/service_status.rb:205
+msgid "Start now"
+msgstr "立即启动"
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
#: library/general/src/modules/FileUtils.rb:292
@@ -1284,7 +1385,7 @@
#. this media (CD) so no packages from this media will be installed
#. PushButton label
#: library/general/src/modules/Label.rb:250
-#: library/packages/src/modules/PackageCallbacks.rb:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "跳过(&S)"
@@ -1307,7 +1408,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2231
msgid "&Password"
msgstr "密码(&P)"

@@ -1524,27 +1625,27 @@
msgstr "未找到版本资讯文件 %{file}"

#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "真的中止安装吗?"

#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "真的中止 YaST 系统修复吗?"

#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "中止系统修复"

#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "继续系统修复(&C)"

#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1556,7 +1657,7 @@
#. Warning text for aborting an installation during the install process
#. - After some installation steps have been performed - e.g.
#. disks formatted / some packages already installed
-#: library/general/src/modules/Popup.rb:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1569,7 +1670,7 @@

#. Warning text for aborting an installation during the install process
#. right in the middle of some critical process (e.g. formatting)
-#: library/general/src/modules/Popup.rb:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1579,18 +1680,18 @@
"您将需要重装。"

#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "真的中止吗?"

#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "将丢失全部修改!"

#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr "细节(&D)..."

@@ -1824,7 +1925,8 @@
#: 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 ""
@@ -2622,47 +2724,47 @@
"不允许使用空格。\n"

#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
+#: 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:119
+#: 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:123
+#: library/network/src/modules/SuSEFirewall.rb:124
msgid "Demilitarized Zone"
msgstr "隔离区域"

#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
+#: library/network/src/modules/SuSEFirewall.rb:247
msgid "TCP"
msgstr "TCP"

#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
+#: library/network/src/modules/SuSEFirewall.rb:249
msgid "UDP"
msgstr "UDP"

#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
+#: library/network/src/modules/SuSEFirewall.rb:251
msgid "RPC"
msgstr "RPC"

#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
+#: 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:1158
+#: 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:1506
+#: library/network/src/modules/SuSEFirewall.rb:1508
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
"Continuing with configuration can produce errors.\n"
@@ -2678,8 +2780,8 @@

#. TRANSLATORS: Error message, %1 = interface name (like eth0)
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1971
-#: library/network/src/modules/SuSEFirewall.rb:2047
+#: 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"
@@ -2688,72 +2790,72 @@
"请运行 YaST2 防火墙并指派它。\n"

#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
+#: library/network/src/modules/SuSEFirewall.rb:2480
msgid "Initializing Firewall Configuration"
msgstr "初始化防火墙配置"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
+#: library/network/src/modules/SuSEFirewall.rb:2488
msgid "Check for network devices"
msgstr "检查网络设备"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
+#: library/network/src/modules/SuSEFirewall.rb:2490
msgid "Read current configuration"
msgstr "读取当前配置"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
+#: library/network/src/modules/SuSEFirewall.rb:2492
msgid "Check possibly conflicting services"
msgstr "检查可能冲突的服务"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
+#: library/network/src/modules/SuSEFirewall.rb:2496
msgid "Checking for network devices..."
msgstr "正在检查网络设备..."

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2498
msgid "Reading current configuration..."
msgstr "正在读取当前配置..."

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2500
msgid "Checking possibly conflicting services..."
msgstr "正在检查可能冲突的服务..."

#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
+#: library/network/src/modules/SuSEFirewall.rb:2643
msgid "Writing Firewall Configuration"
msgstr "写入防火墙配置"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
+#: library/network/src/modules/SuSEFirewall.rb:2651
msgid "Write firewall settings"
msgstr "写入防火墙设置"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
+#: library/network/src/modules/SuSEFirewall.rb:2653
msgid "Adjust firewall service"
msgstr "调整防火墙服务"

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
+#: library/network/src/modules/SuSEFirewall.rb:2657
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."

#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
+#: library/network/src/modules/SuSEFirewall.rb:2659
msgid "Adjusting firewall service..."
msgstr "正在调整防火墙服务..."

#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
+#: 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:3476
+#: library/network/src/modules/SuSEFirewall.rb:3471
msgid "Unknown protocol (%1)"
msgstr "未知协议 (%1)"

@@ -2775,32 +2877,39 @@
#. 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 (<a
href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
+msgid ""
+"Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal"
+"\">disable</a>)"
msgstr "防火墙已启用 (<a href=\"firewall--disable_firewall_in_proposal\">禁用</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 (<a
href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
+msgid ""
+"Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal"
+"\">enable</a>)"
msgstr "防火墙已禁用 (<a href=\"firewall--enable_firewall_in_proposal\">启用</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 (<a
href=\"firewall--disable_ssh_in_proposal\">close</a>)"
+msgid ""
+"SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)"
msgstr "SSH 端口已打开(<a href=\"firewall--disable_ssh_in_proposal\">关闭</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 (<a
href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid ""
+"SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
msgstr "SSH 端口已屏蔽 (<a href=\"firewall--enable_ssh_in_proposal\">打开</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 (<a href=\"firewall--disable_ssh_in_proposal\">close</a>),
but\n"
+"SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), "
+"but\n"
"there are no network interfaces configured"
msgstr ""
"SSH 端口已打开 (<a href=\"firewall--disable_ssh_in_proposal\">关闭</a>), \n"
@@ -2808,24 +2917,36 @@

#. 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 (<a
href=\"firewall--disable_vnc_in_proposal\">close</a>)"
-msgstr "远程管理 (VNC) 端口已打开 (<a
href=\"firewall--disable_vnc_in_proposal\">关闭</a>)"
+msgid ""
+"Remote Administration (VNC) ports are open (<a href=\"firewall--"
+"disable_vnc_in_proposal\">close</a>)"
+msgstr ""
+"远程管理 (VNC) 端口已打开 (<a href=\"firewall--disable_vnc_in_proposal\">关闭"
+"</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 (<a
href=\"firewall--enable_vnc_in_proposal\">open</a>)"
-msgstr "远程管理 (VNC) 端口已屏蔽 (<a href=\"firewall--enable_vnc_in_proposal\">打开</a>)"
+msgid ""
+"Remote Administration (VNC) ports are blocked (<a href=\"firewall--"
+"enable_vnc_in_proposal\">open</a>)"
+msgstr ""
+"远程管理 (VNC) 端口已屏蔽 (<a href=\"firewall--enable_vnc_in_proposal\">打开"
+"</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
@@ -2840,54 +2961,57 @@

#. 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 not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
#.
-#. @param [String] service name
+#. @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 SuSEFirewalServiceNotFound
+#. 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 map <string, list <string> > of full service definition
+#. @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()
+#. @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:354
-#: library/network/src/modules/SuSEFirewallServices.rb:637
+#. {
+#. "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:430
+#: 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:503
+#: library/network/src/modules/SuSEFirewallServices.rb:505
msgid "Unknown service '%1'"
msgstr "未知服务 '%1'"

@@ -2911,35 +3035,79 @@
msgid "&Uninstall"
msgstr "卸载(&U)"

+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
+msgid "Checking file conflicts..."
+msgstr "正在检查文件冲突..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:87
+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
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+"检测到了文件冲突,这些冲突的文件将被覆盖:\n"
+"\n"
+"%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
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+"文件冲突发生于两个软件包试图安装同名不同内容的文件时。\n"
+"若您选择继续将覆盖冲突的文件,以前的内容将会丢失。"
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:173
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] "检测到文件冲突"
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr "此消息可于 %s 获取"
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr "正在下载软件包 %1 (%2)..."

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr "正在下载软件包"

#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
msgid "Package %1 is broken, integrity check has failed."
msgstr "软件包 %1 已损坏,完整性检查失败。"

#. command line mode - ask user whether installation of the failed package
should be retried
#. command line mode - ask user whether installation of the failed package
should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr "重试安装该软件包吗?"

#. command line mode - ask user whether the installation should be aborted
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
msgid "Abort the installation?"
msgstr "中止安装吗?"

@@ -2948,15 +3116,15 @@
#. detail string is appended to the end
#. error message, %1 is code of the error,
#. detail string is appended to the end
-#: library/packages/src/modules/PackageCallbacks.rb:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2144
msgid "Error: %1:"
msgstr "错误:%1:"

#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
msgid ""
"Ignoring a download failure may result in a broken system.\n"
"Verify the system later by running the Software Management module.\n"
@@ -2965,48 +3133,51 @@
"请稍后运行软件管理模块校验系统。\n"

#. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr "正在卸载软件包 %1 (%2)..."

-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
msgid "Installing package %1 (%2)..."
msgstr "正在安装软件包 %1 (%2)..."

-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr "正在卸载软件包"

-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Installing Package"
msgstr "正在安装软件包"

#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr "软件包 %1 移除失败。"

#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
msgid "Installation of package %1 failed."
msgstr "软件包 %1 安装失败。"

#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a package
installation error
-#: library/packages/src/modules/PackageCallbacks.rb:506
+#: 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"
"稍后应运行软件管理模块校验系统。"

#. error report
-#: library/packages/src/modules/PackageCallbacks.rb:575
+#: 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"
@@ -3017,27 +3188,27 @@
#. media is double sided, we want the user to insert the 'Side A' of the media
#. the complete string will be "<product> <media> <number>, <side>"
#. e.g. "'SuSE Linux 9.0' DVD 1, Side A"
-#: library/packages/src/modules/PackageCallbacks.rb:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr "A 面"

#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr "B 面"

#. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium
number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
msgid "%1 (Disc %2)"
msgstr "%1 (光盘 %2)"

#. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium
number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
msgid "%1 (Medium %2)"
msgstr "%1 (介质 %2)"

#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
@@ -3046,7 +3217,7 @@
"'%1'"

#. report error while accessing local directory with product (%1 = URL, %2 =
"SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
msgid ""
"Cannot access installation media\n"
"%1\n"
@@ -3059,7 +3230,7 @@
"请检查能否访问文件夹。"

#. report error while accessing network media of product (%1 = URL, %2 = "SuSE
Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
msgid ""
"Cannot access installation media \n"
"%1\n"
@@ -3073,83 +3244,83 @@

#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1839
msgid "Skip Autorefresh"
msgstr "跳过自动刷新"

#. menu button label - used for more then one device
#. push button label - in the media change popup, user can eject the CD/DVD
-#: library/packages/src/modules/PackageCallbacks.rb:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr "弹出(&E)"

-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "自动弹出 CD 或 DVD 介质(&U)"

#. command line mode - ask user whether installation of the failed package
should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
msgid "Retry the installation?"
msgstr "重试安装吗?"

#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr "跳过介质吗?"

#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr "正在忽略损坏的介质..."

#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr "&URL"

#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
msgid "Creating Repository %1"
msgstr "正在创建软件源 %1"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
msgid "An error occurred while creating the repository."
msgstr "创建软件源时出错。"

#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
msgid "Unable to retrieve the remote repository description."
msgstr "不能撷取远程软件源描述。"

#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
msgid "An error occurred while retrieving the new metadata."
msgstr "撷取新的元数据时出错。"

#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
msgid "The repository is not valid."
msgstr "该软件源无效。"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
msgid "The repository metadata is invalid."
msgstr "软件源元数据无效。"

@@ -3157,92 +3328,92 @@
#. command line mode - ask user whether the repository refreshment should be
retried
#. command line mode - ask user whether the repository refreshment should be
retried
#. command line mode - ask user whether target initializatin can be restarted
-#: library/packages/src/modules/PackageCallbacks.rb:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: 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
msgid "Retry?"
msgstr "重试吗?"

#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
msgid "Probing Repository %1"
msgstr "正在检测软件源 %1"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
msgid "Error occurred while probing the repository."
msgstr "检测软件源时出错。"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
msgid "Repository probing details."
msgstr "检测到的软件源细节。"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
msgid "Repository metadata is invalid."
msgstr "软件源元数据无效。"

#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
msgid "Repository %1"
msgstr "软件源 %1"

#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "正在下载增量 RPM 包 %1 (%2)..."

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr "正在下载增量 RPM 包"

#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr "正在应用增量 RPM 包 %1..."

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr "正在应用增量 RPM 包"

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3082
msgid "Package: "
msgstr "软件包:"

#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr "正在启动脚本 %1 (补丁 %2)..."

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr "正在运行脚本"

#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr "补丁:"

#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr "脚本:"

#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr "脚本输出"

#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
@@ -3251,7 +3422,7 @@
"\n"

#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3265,36 +3436,36 @@
"注意:若跳过刷新,某些软件包可能会缺失或者过时。"

#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
msgid "&Skip Refresh"
msgstr "跳过刷新(&S)"

#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
msgid "Downloading"
msgstr "正在下载"

#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1772
msgid "Downloading: %1"
msgstr "正在下载:%1"

#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1876
+#: library/packages/src/modules/PackageCallbacks.rb:1942
msgid "Checking Package Database"
msgstr "正在检查软件包数据库"

#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1879
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:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1912
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3303,16 +3474,16 @@
"%1"

#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1945
msgid "Converting package database. This process can take some time."
msgstr "正在转换软件包数据库。此过程要花费一点时间。"

-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1958
msgid "Status"
msgstr "状态"

#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1982
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3321,12 +3492,12 @@
"%1"

#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2018
msgid "Reading RPM database..."
msgstr "正在读取 RPM 数据库..."

#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2028
msgid "Reading Installed Packages"
msgstr "正在读取已安装的软件包"

@@ -3337,27 +3508,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2034
+#: library/packages/src/modules/PackageCallbacks.rb:2050
msgid "Scanning RPM database..."
msgstr "正在扫描 RPM 数据库..."

#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2087
msgid "Initialization of the target failed."
msgstr "目标初始化失败。"

#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2179
msgid "RPM database read"
msgstr "已读取 RPM 数据库"

#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2213
msgid "User Authentication"
msgstr "用户认证"

-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2219
msgid ""
"URL: %1\n"
"\n"
@@ -3368,20 +3539,20 @@
"%2"

#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2228
msgid "&User Name"
msgstr "用户名(&U)"

#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3017
msgid "Show &details"
msgstr "显示细节(&D)"

-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3083
msgid "Size: "
msgstr "大小:"

-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3106
msgid "Remaining time to automatic retry: %1"
msgstr "自动重试前剩余时间:%1"

@@ -3429,7 +3600,9 @@
"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
@@ -3451,12 +3624,12 @@
msgstr "有未解决的依赖关系,需要在软件管理器中手动解决。"

#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:417
msgid "Installing required packages failed."
msgstr "安装必需的软件包失败。"

#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:421
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3464,39 +3637,40 @@
msgstr "安装必需的软件包失败。若未安装必需的软件包就继续,YaST 可能无法正常工作。\n"

#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
msgid "Cannot continue without installing required packages."
msgstr "未安装必需的软件包,无法继续。"

#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
msgstr "若未安装必需的软件包就继续,YaST 可能无法正常工作。\n"

#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr "确认软件包许可:%1"

#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr "我同意(&A)"

#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr "我不同意(&D)"

#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
msgid ""
"<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>."
@@ -3509,11 +3683,13 @@
"要拒绝软件包许可,请点击<b>我不同意</b>。"

#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: 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 ""
@@ -3523,7 +3699,7 @@
"\t\t 要查看某个项的描述,请在列表中选择它。\n"
"\t\t </p>"

-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3537,7 +3713,7 @@
"\t\t 右键菜单也可以更改全部条目的状态。\n"
"\t\t </p>"

-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3549,10 +3725,11 @@
"\t\t 您可在其中查看和选择单个软件包。\n"
"\t\t </p>"

-#: library/packages/src/modules/PackagesUI.rb:346
+#: 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"
@@ -3569,124 +3746,126 @@

#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr "软件选择和系统任务"

#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
msgid "(more)"
msgstr "(更多)"

-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
msgid "Installation Successfully Finished"
msgstr "安装已成功完成"

-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
msgid "Package Installation Failed"
msgstr "软件包安装失败"

-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
msgid "Error Message: %1"
msgstr "错误消息:%1"

-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
msgid "Failed Packages: %1"
msgstr "失败的软件包:%1"

-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
msgid "Installed Packages: %1"
msgstr "已安装的软件包:%1"

-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
msgid "Updated Packages: %1"
msgstr "已更新的软件包:%1"

-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
msgid "Removed Packages: %1"
msgstr "已移除的软件包:%1"

-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
msgid "Not Installed Packages: %1"
msgstr "未安装的软件包:%1"

#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr "软件包"

#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
msgid "Elapsed Time: %1"
msgstr "耗时:%1"

-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
msgid "Total Installed Size: %1"
msgstr "总安装大小:%1"

-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
msgid "Total Downloaded Size: %1"
msgstr "总下载大小:%1"

-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
msgid "Statistics"
msgstr "统计"

#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:712
msgid "Installation log"
msgstr "安装日志"

-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
msgid "Details"
msgstr "细节"

#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
msgid "After Installing Packages"
msgstr "在安装软件包后"

-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:680
msgid "Show This Report"
msgstr "显示此报告"

-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Finish"
msgstr "已完成"

-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:682
msgid "Continue in the Software Manager"
msgstr "在软件管理器中继续"

-#: library/packages/src/modules/PackagesUI.rb:666
-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:687
+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:674
+#: library/packages/src/modules/PackagesUI.rb:695
msgid "Installation Report"
msgstr "安装报告"

-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:717
msgid "Installed Packages"
msgstr "已安装的软件包"

-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:722
msgid "Updated Packages"
msgstr "已更新的软件包"

-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:727
msgid "Removed Packages"
msgstr "已移除的软件包"

-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:732
msgid "Remaining Packages"
msgstr "其余软件包"

#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:753
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3774,14 +3953,16 @@
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"
"无论如何都使用该文件吗?"

@@ -3858,7 +4039,8 @@
"由以下 GnuPG 密钥签名,但完整性检查失败:%4\n"
"\n"
"这意味着在该软件源创建者签名该软件包之后,\n"
-"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性是一个巨大的风险。\n"
+"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性"
+"是一个巨大的风险。\n"
"\n"
"无论如何都安装该软件包吗?\n"

@@ -4005,7 +4187,8 @@
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>"
@@ -4084,7 +4267,8 @@
"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 ""
@@ -4107,83 +4291,89 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. translators: default global progress bar label
-#: library/packages/src/modules/SlideShow.rb:151
#: library/packages/src/modules/SlideShow.rb:152
-#: library/packages/src/modules/SlideShow.rb:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
msgid "Installing..."
msgstr "正在安装..."

#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr "介质"

#. Table headings for CD statistics during installation - keep as short as
possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
msgid "Remaining"
msgstr "剩余"

#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr "时间"

#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
msgid "Actions performed:"
msgstr "执行的操作:"

#. Help text while software packages are being installed (displayed only in
rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
msgid "<p>Packages are being installed.</p>"
msgstr "<p>正在安装软件包。</p>"

-#: library/packages/src/modules/SlideShow.rb:634
-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>"
+#: 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>"

#. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
msgid "%s Release Notes"
msgstr "%s 版本资讯"

#. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
msgid "Slide Sho&w"
msgstr "幻灯片演示(&W)"

#. tab
-#: library/packages/src/modules/SlideShow.rb:666
+#: library/packages/src/modules/SlideShow.rb:667
msgid "&Details"
msgstr "细节(&D)"

#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:706
msgid "Performing Upgrade"
msgstr "正在执行升级"

#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:709
msgid "Performing Installation"
msgstr "正在执行安装"

#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:744
msgid "Package Installation"
msgstr "软件包安装"

#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:816
msgid ""
"Do you really want\n"
"to quit the installation?"
msgstr "您真的想要退出安装吗?"

#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:828
msgid "Aborted"
msgstr "已中止"

@@ -4778,6 +4968,19 @@
msgid "Bluetooth device"
msgstr "蓝牙设备"

+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter
docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
+msgid ""
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
+msgstr ""
+"执行命令 \"%{command}\" 失败。\n"
+"退出代码:%{exitcode}\n"
+"错误输出:%{stderr}"
+
#. Continue/Cancel question, %1 is a file name
#: library/system/src/modules/FileChanges.rb:175
msgid ""
@@ -4855,7 +5058,7 @@
msgstr "有效 MAC 地址由 6 对十六进制数字组成,由英文冒号分隔。"

#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -4867,7 +5070,7 @@
"并且最后一部分不能以数字开头。"

#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5677,11 +5880,13 @@
"\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
@@ -5806,60 +6011,6 @@
"DNS 服务器管理的 %1 没有反向区域。\n"
"无法添加主机名 %2。"

-#: src/lib/ui/srv_status_component.rb:60
-msgid "Service Status"
-msgstr "服务状态"
-
-#. Content for the help
-#: src/lib/ui/srv_status_component.rb:114
-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"
-"<p><b><big>Reload After Saving Settings</big></b><br>\n"
-"Only applicable if the service is currently running. Ensures the running
service reloads the new configuration after saving it (via 'ok' or 'save'
buttons).</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"
-msgstr ""
-"<p><b><big>当前状态</big></b><br>\n"
-"显示服务当前状态。保存设置后状态仍不变,独立于 '引导期间启动服务' 的值。</p>\n"
-"<p><b><big>保存设置后重新加载</big></b><br>\n"
-"仅在服务当前正在运行时应用。会确保运行中的服务在保存设置后重新加载新的配置 (通过 '好' 或 '保存' 按钮)。</p>\n"
-"<p><b><big>系统引导期间启动</big></b><br>\n"
-"勾选此框在系统引导时启用服务。反选禁用服务。这不会影响已在运行中的系统上的服务的当前状态。</p>\n"
-
-#. Widget displaying the status and associated buttons
-#: src/lib/ui/srv_status_component.rb:181
-msgid "Current status:"
-msgstr "当前状态:"
-
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-msgid "Start During System Boot"
-msgstr "系统引导期间启动"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-msgid "Reload After Saving Settings"
-msgstr "保存设置后重新加载"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-msgid "running"
-msgstr "正在运行"
-
-#: src/lib/ui/srv_status_component.rb:220
-msgid "Stop now"
-msgstr "立即停止"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-msgid "stopped"
-msgstr "已停止"
-
-#: src/lib/ui/srv_status_component.rb:227
-msgid "Start now"
-msgstr "立即启动"
-
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "无法挂载正确的软件源介质。"

@@ -5893,7 +6044,9 @@
#~ "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-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/bootloader.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -7,15 +7,15 @@
# Novell Language <language@xxxxxxxxxx>, 2004, 2005.
# Thruth Wang <lihaow@xxxxxxxxx>, 2007.
# Eric Shan <ericalways@xxxxxxxxx>, 2008, 2012.
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014, 2015.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
-"PO-Revision-Date: 2015-10-27 21:30+0800\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"PO-Revision-Date: 2016-06-05 17:01+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,49 +35,153 @@

#. command line help text for delete action
#: src/clients/bootloader.rb:58
-msgid "Delete a global option"
-msgstr "删除一个全局选项"
+msgid "Delete a global option or option of a section"
+msgstr "删除全局选项或某引导项的选项"

#. command line help text for set action
#: src/clients/bootloader.rb:65
-msgid "Set a global option"
-msgstr "设置全局选项"
+msgid "Set a global option or option of a section"
+msgstr "设置全局选项或某引导项的选项"

+#. command line help text for add action
+#: src/clients/bootloader.rb:72
+msgid "Add a new section - please use interactive mode"
+msgstr "添加新引导项 - 请使用交互模式"
+
#. command line help text for print action
-#: src/clients/bootloader.rb:75
+#: src/clients/bootloader.rb:82
msgid "Print value of specified option"
msgstr "打印指定选项的值"

#. command line help text for an option
-#: src/clients/bootloader.rb:83
+#: src/clients/bootloader.rb:90
+msgid "The name of the section"
+msgstr "引导项名称"
+
+#. command line help text for an option
+#: src/clients/bootloader.rb:97
msgid "The key of the option"
msgstr "选项的键"

#. command line help text for an option
-#: src/clients/bootloader.rb:90
+#: 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:152
+#: 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:174
+#: 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, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
-msgid "Value: %s"
-msgstr "值:%s"
-
#. command line error report
-#: src/clients/bootloader.rb:183
+#: 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
+msgid "Saving bootloader configuration..."
+msgstr "正在保存引导加载器配置..."
+
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/clients/bootloader_finish.rb:133
+msgid ""
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
+msgstr ""
+"\n"
+"您的系统即将关闭。%1\n"
+"细节请阅读文档中的相关章节。\n"
+
+#. Final message after all packages from CD1 are installed
+#. 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
+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 "未选择安装任何引导加载器。您的系统可能无法引导。"
+
+#. error in the proposal
+#: src/clients/bootloader_proposal.rb:126
+msgid ""
+"Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "出于分区原因,无法正确安装引导加载器"
+
+#. proposal part - bootloader label
+#: src/clients/bootloader_proposal.rb:225
+msgid "Booting"
+msgstr "引导"
+
+#. menubutton entry
+#: src/clients/bootloader_proposal.rb:227
+msgid "&Booting"
+msgstr "引导(&B)"
+
+#. 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/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
@@ -99,8 +203,10 @@
#: src/include/bootloader/grub/helps.rb:24
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"
+"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"
@@ -127,7 +233,8 @@
#: src/include/bootloader/routines/common_helps.rb:23
msgid ""
"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is
loaded.</p>\n"
+"Specifies the time the bootloader will wait until the default kernel is "
+"loaded.</p>\n"
msgstr ""
"<p><b>超时(以秒计)</b><br>\n"
"指定在默认内核加载前引导加载器将等待的时间。</p>\n"
@@ -142,98 +249,145 @@
"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
msgstr ""
"<p>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
+"统。\n"
"若超时前没有按下任何键,将引导默认内核或操作系统。\n"
"引导加载器菜单中的引导项顺序可使用<b>向上</b>和<b>向下</b>按钮调整。</p>\n"

#: 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"
+"<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>"
+msgstr ""
+"<p><b>将通用引导代码写入主引导记录</b>将使用通用代码 (用于引导活动分区的独立"
+"于操作系统的代码) 替换您磁盘的主引导记录。</p>"

#: 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"
+"<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/grub/helps.rb:47
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>"
+"<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/grub/helps.rb:50
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"
+"<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/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>"
+"若需要更新主引导记录,可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区"
+"设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的"
+"引导管理器去启动此引导项。</p>"

-#: src/include/bootloader/grub/helps.rb:56
+#: 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"
+"<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>"
+msgstr ""
+"若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</"
+"b></p>"

-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot
from.</p>"
+#: 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>"

-#: src/include/bootloader/grub/helps.rb:62
+#: 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>"
+msgstr ""
+"<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 "
+"GRUB 写入两个磁盘的主引导记录。</p>"

-#: src/include/bootloader/grub/helps.rb:65
+#: 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
grub2</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub</"
+"code>) for details.</p>"
msgstr ""
"<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n"
-"细节请参考 grub 文档 (<code>info grub2</code>)。</p>"
+"细节请参考 grub 文档 (<code>info grub</code>)。</p>"

-#: src/include/bootloader/grub/helps.rb:68
+#: 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 (e.g. 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"
+"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"
+"<p><b>定义终端</b></p><br>\n"
"定义您想要使用的终端类型。 \n"
"对于串行终端 (如串行控制台),您必须指定 <code>serial</code>。\n"
"您也可以向命令传递 <code>console</code> 参数,如 <code>serial console</code>。\n"
"在这种情况下,将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>"

-#: src/include/bootloader/grub/helps.rb:75
+#: src/include/bootloader/grub/helps.rb:78
msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section
numbers\n"
+"<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/include/bootloader/grub/helps.rb:78
+#: 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/include/bootloader/grub/helps.rb:81
+#: 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/include/bootloader/grub/helps.rb:87
+msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
+
+#: src/include/bootloader/grub/helps.rb:90
+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>.</p>"
+"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"
-"在引导时,修改甚至引导任何项都将需要密码。若勾选了<b>仅保护引导项不受修改</b>那么引导任何项都不受限制但修改引导项将需要密码 (这是 GRUB
Legacy 的行为)。<br>YaST 仅在您于<b>再输入一次密码</b>中再输入一次密码后才会接受该密码。</p>"
+"定义用于访问引导菜单的密码。\n"
+"若您在 <b>重输密码</b> 中重复了它,YaST 将只接受该密码。</p>"

#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
+#: src/include/bootloader/grub/helps.rb:97
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"
@@ -247,160 +401,227 @@
"要添加磁盘,请按<b>添加</b>。\n"
"要移除磁盘,请按<b>移除</b>。</p>"

-#: src/include/bootloader/grub/helps.rb:101
+#: src/include/bootloader/grub/helps.rb:108
msgid "Boot Loader Locations"
msgstr "引导加载器位置"

-#: src/include/bootloader/grub/helps.rb:102
+#: src/include/bootloader/grub/helps.rb:109
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr "在分区表中为引导分区设置活动旗标(&A)"

-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
+#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/routines/common_helps.rb:29
msgid "&Timeout in Seconds"
msgstr "超时 (以秒计)(&T)"

-#: src/include/bootloader/grub/helps.rb:106
+#: src/include/bootloader/grub/helps.rb:113
msgid "&Default Boot Section"
msgstr "默认引导项(&D)"

-#: src/include/bootloader/grub/helps.rb:107
+#: src/include/bootloader/grub/helps.rb:114
msgid "Write &generic Boot Code to MBR"
msgstr "将通用引导代码写入主引导记录(&G)"

-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:115
+msgid "Use &Trusted Grub"
+msgstr "使用信任的 Grub(&T)"
+
+#: src/include/bootloader/grub/helps.rb:116
msgid "Custom Boot Partition"
msgstr "自定义引导分区"

-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:117
msgid "Boot from Master Boot Record"
msgstr "从主引导记录引导"

-#: src/include/bootloader/grub/helps.rb:110
+#: src/include/bootloader/grub/helps.rb:118
msgid "Boot from Root Partition"
msgstr "从根分区引导"

-#: src/include/bootloader/grub/helps.rb:111
+#: src/include/bootloader/grub/helps.rb:119
msgid "Boot from Boot Partition"
msgstr "从引导分区引导"

-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:120
msgid "Boot from Extended Partition"
msgstr "从扩展分区引导"

-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:121
msgid "Serial Connection &Parameters"
msgstr "串行连接参数(&P)"

-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:122
msgid "Fallback Sections if Default fails"
msgstr "默认引导项失败时的备用引导项"

-#: src/include/bootloader/grub/helps.rb:115
+#: src/include/bootloader/grub/helps.rb:123
msgid "&Hide Menu on Boot"
msgstr "引导时隐藏菜单(&H)"

-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:124
+msgid "Graphical &Menu File"
+msgstr "图形菜单文件(&M)"
+
+#: src/include/bootloader/grub/helps.rb:125
msgid "Pa&ssword for the Menu Interface"
msgstr "菜单界面密码(&S)"

-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:126
msgid "Debugg&ing Flag"
msgstr "调试旗标(&I)"

+#. 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 <jsrain@xxxxxxx>
+#. Joachim Plack <jplack@xxxxxxx>
+#. Olaf Dabrunz <od@xxxxxxx>
+#. Philipp Thomas <pth@xxxxxxx>
+#.
+#. $Id$
+#: src/include/bootloader/grub/options.rb:68
+msgid "Choose new graphical menu file"
+msgstr "选择新图形菜单文件"
+
+#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic
&Signals"))),
+#: src/include/bootloader/grub/options.rb:129
+msgid "Enable Acoustic &Signals"
+msgstr "启用声音信号(&S)"
+
#. 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:73
+#: src/include/bootloader/grub/options.rb:254
msgid "Prot&ect Boot Loader with Password"
msgstr "使用密码保护引导加载器(&E)"

-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
-msgstr "仅保护启动项不受修改(&r)"
-
#. text entry
-#: src/include/bootloader/grub/options.rb:85
+#: src/include/bootloader/grub/options.rb:259
msgid "&Password"
msgstr "密码(&P)"

#. text entry
-#: src/include/bootloader/grub/options.rb:88
+#: src/include/bootloader/grub/options.rb:262
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
+msgid "Use &serial console"
+msgstr "使用串行控制台(&S)"
+
+#: src/include/bootloader/grub/options.rb:366
+#: src/include/bootloader/grub2/options.rb:302
+msgid "&Console arguments"
+msgstr "控制台参数(&C)"
+
+#. textentry header
+#: src/include/bootloader/grub/options.rb:455
+msgid "&Device"
+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/include/bootloader/grub/options.rb:543
+msgid "D&isks"
+msgstr "磁盘(&I)"
+
+#: src/include/bootloader/grub/options.rb:555
+msgid "&Up"
+msgstr "向上(&U)"
+
+#: 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:222
+#: src/include/bootloader/grub/options.rb:730
msgid "Boot from &Root Partition"
msgstr "从根分区引导(&R)"

-#: src/include/bootloader/grub/options.rb:224
+#: src/include/bootloader/grub/options.rb:731
msgid "Boo&t from Boot Partition"
msgstr "从引导分区引导(&T)"

-#: src/include/bootloader/grub/options.rb:235
-msgid "C&ustom Boot Partition"
-msgstr "自定义引导分区(&U)"
-
-#: src/include/bootloader/grub/options.rb:250
-#: src/include/bootloader/grub/options.rb:280
-#: src/include/bootloader/grub/options.rb:301
+#: 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/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
+#: src/include/bootloader/grub/options.rb:745
+#: src/include/bootloader/grub/options.rb:772
+#: src/include/bootloader/grub/options.rb:807
msgid "Boot from &Master Boot Record"
msgstr "从主引导记录引导(&M)"

-#: src/include/bootloader/grub/options.rb:263
+#: src/include/bootloader/grub/options.rb:752
msgid "Boot from &Extended Partition"
msgstr "从扩展分区引导(&E)"

-#: src/include/bootloader/grub/options.rb:312
+#: src/include/bootloader/grub/options.rb:778
+#: src/include/bootloader/grub/options.rb:819
+msgid "C&ustom Boot Partition"
+msgstr "自定义引导分区(&U)"
+
+#: src/include/bootloader/grub/options.rb:812
msgid "Enable Red&undancy for MD Array"
msgstr "启用多设备 (MD) 阵列冗余(&U)"

+#. 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)"
+
#. Title in tab
#: src/include/bootloader/grub2/dialogs.rb:57
msgid "Boot Code Options"
msgstr "引导代码选项"

#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
+#: src/include/bootloader/grub2/dialogs.rb:82
msgid "Kernel Parameters"
msgstr "内核参数"

#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
+#: src/include/bootloader/grub2/dialogs.rb:102
msgid "Bootloader Options"
msgstr "引导加载器选项"

-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "引导加载器选项"
-
-#: src/include/bootloader/grub2/dialogs.rb:190
+#: src/include/bootloader/grub2/dialogs.rb:183
msgid "Secure Boot"
msgstr "安全引导 (Secure Boot)"

-#: src/include/bootloader/grub2/dialogs.rb:196
+#: src/include/bootloader/grub2/dialogs.rb:189
msgid "Enable &Secure Boot Support"
msgstr "启用安全引导支持 (Secure Boot)"

#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
+#: src/include/bootloader/grub2/dialogs.rb:262
msgid "Boot &Loader Location"
msgstr "引导加载器位置(&L)"

#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
+#: src/include/bootloader/grub2/dialogs.rb:281
msgid "Choose partition where is boot sequence installed."
msgstr "请选择将安装引导程序的分区。"

@@ -419,34 +640,69 @@
#.
#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define
additional parameters to pass to the kernel.</p>"
+#: 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>"

#: src/include/bootloader/grub2/helps.rb:26
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the
<i>console</i> to when booting.</p>"
+#: 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>"

#: src/include/bootloader/grub2/helps.rb:29
-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>"
+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/include/bootloader/grub2/helps.rb:32
-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>"
+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/grub2/helps.rb:35
+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/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>"
+
+#: src/include/bootloader/grub2/helps.rb:44
+#: src/include/bootloader/routines/section_helps.rb:99
msgid "O&ptional Kernel Command Line Parameter"
msgstr "可选内核命令行参数(&P)"

-#: src/include/bootloader/grub2/helps.rb:39
+#: src/include/bootloader/grub2/helps.rb:45
+msgid "D&istributor"
+msgstr "发行方(&I)"
+
+#: src/include/bootloader/grub2/helps.rb:46
+#: src/include/bootloader/routines/section_helps.rb:98
msgid "&Vga Mode"
msgstr "&VGA 模式"

-#: src/include/bootloader/grub2/helps.rb:40
+#: src/include/bootloader/grub2/helps.rb:47
+msgid "&Failsafe Kernel Command Line Parameter"
+msgstr "安全模式内核命令行参数(&F)"
+
+#: src/include/bootloader/grub2/helps.rb:48
msgid "Probe Foreign OS"
msgstr "探测外来操作系统"

-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:49
msgid "Protective MBR flag"
msgstr "保护性 MBR 旗标"

@@ -455,20 +711,30 @@
#. %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)"

#: src/include/bootloader/grub2/options.rb:68
+#: src/include/bootloader/routines/section_widgets.rb:537
msgid "Standard 8-pixel font mode."
msgstr "标准 8 像素字体模式。"

#. 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 "文本模式"

#: src/include/bootloader/grub2/options.rb:72
+#: src/include/bootloader/routines/section_widgets.rb:541
msgid "Unspecified"
msgstr "未指定"

@@ -489,70 +755,223 @@

#. Init function for console
#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
+#: src/include/bootloader/grub2/options.rb:174
msgid "Autodetect by grub2"
msgstr "由 grub2 自动检测"

#. FATE: #110038: Serial console
#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
+#: src/include/bootloader/grub2/options.rb:249
msgid "Choose new graphical theme file"
msgstr "选择新图形主题文件"

-#: src/include/bootloader/grub2/options.rb:258
+#: src/include/bootloader/grub2/options.rb:261
msgid "Use &graphical console"
msgstr "使用图形控制台(&G)"

-#: src/include/bootloader/grub2/options.rb:265
+#: src/include/bootloader/grub2/options.rb:268
msgid "&Console resolution"
msgstr "控制台分辨率(&C)"

-#: src/include/bootloader/grub2/options.rb:273
+#: src/include/bootloader/grub2/options.rb:276
msgid "&Console theme"
msgstr "控制台主题(&C)"

-#: src/include/bootloader/grub2/options.rb:292
-msgid "Use &serial console"
-msgstr "使用串行控制台(&S)"
-
-#: src/include/bootloader/grub2/options.rb:299
-msgid "&Console arguments"
-msgstr "控制台参数(&C)"
-
-#. 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:131
+#. 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 方案。"

#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
+#. 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 "选择文件"

#. 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:86 src/modules/Bootloader.rb:239
+#: 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。无法安装引导加载器。"

#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
+#: src/include/bootloader/routines/dialogs.rb:131
msgid "Boot Loader Settings"
msgstr "引导加载器设置"

#. message
-#: src/include/bootloader/routines/dialogs.rb:142
+#: src/include/bootloader/routines/dialogs.rb:159
msgid "There are no options to set for the current boot loader."
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 "内核项"
+
+#. 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 "引导项设置"
+
+#. 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 "引导加载器设置:引导项管理"
+
+#. 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 项"
+
+#. 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 "菜单项"
+
+#. heading
+#. radio button
+#: src/include/bootloader/routines/dialogs.rb:516
+#: src/include/bootloader/routines/section_widgets.rb:593
+msgid "Dump Section"
+msgstr "转储项"
+
+#. label
+#. label
+#: src/include/bootloader/routines/dialogs.rb:573
+#: src/include/bootloader/routines/dialogs.rb:628
+msgid "Other System Section"
+msgstr "其它系统项"
+
+#. combobox label
+#: src/include/bootloader/routines/dialogs.rb:803
+msgid "&Filename"
+msgstr "文件名(&F)"
+
+#. label. %1 is name of file (eg. /etc/lilo.conf
+#: src/include/bootloader/routines/dialogs.rb:811
+msgid "Filename: %1"
+msgstr "文件名:%1"
+
+#. multiline edit header
+#: src/include/bootloader/routines/dialogs.rb:828
+msgid "Fi&le Contents"
+msgstr "文件内容(&L)"
+
+#. dialog caption
+#: src/include/bootloader/routines/dialogs.rb:836
+msgid "Expert Manual Configuration"
+msgstr "专家手动配置"
+
+#. sections list widget
+#. Refresh and redraw widget wits sections
+#. @param [Array<Hash{String => 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 "其它"
+
+#: src/include/bootloader/routines/global_widgets.rb:116
+msgid "Image"
+msgstr "映像"
+
+#: src/include/bootloader/routines/global_widgets.rb:134
+msgid "Xen"
+msgstr "Xen"
+
+#: src/include/bootloader/routines/global_widgets.rb:152
+msgid "Floppy"
+msgstr "软盘"
+
+#: src/include/bootloader/routines/global_widgets.rb:154
+msgid "Menu"
+msgstr "菜单"
+
+#: src/include/bootloader/routines/global_widgets.rb:161
+msgid "Dump"
+msgstr "转储"
+
+#. table header, Def stands for default
+#: src/include/bootloader/routines/global_widgets.rb:255
+msgid "Def."
+msgstr "默认"
+
+#. table header
+#: src/include/bootloader/routines/global_widgets.rb:257
+msgid "Label"
+msgstr "标签"
+
+#. table header
+#: src/include/bootloader/routines/global_widgets.rb:259
+#: src/include/bootloader/routines/global_widgets.rb:746
+msgid "Type"
+msgstr "类型"
+
+#. 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 "映像 / 设备"
+
+#: src/include/bootloader/routines/global_widgets.rb:271
+msgid "Set as De&fault"
+msgstr "设置为默认(&F)"
+
#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
+#: src/include/bootloader/routines/global_widgets.rb:312
msgid "&Boot Loader"
msgstr "引导加载器(&B)"

#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
+#: src/include/bootloader/routines/global_widgets.rb:343
msgid ""
"\n"
"If you do not install any boot loader, the system\n"
@@ -565,66 +984,115 @@
"\n"
"继续咩?后果很严重哦\n"

-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "编辑配置文件(&D)"
+#. 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"

+#. radiobutton
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
+#: src/include/bootloader/routines/global_widgets.rb:399
+#: src/include/bootloader/routines/global_widgets.rb:593
msgid "&Propose New Configuration"
msgstr "建议新配置(&P)"

+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:406
+msgid "Co&nvert Current Configuration"
+msgstr "转换当前配置(&N)"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:415
+msgid "&Start New Configuration from Scratch"
+msgstr "从零开始新配置(&S)"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:423
+msgid "&Read Configuration Saved on Disk"
+msgstr "读取保存在磁盘上的配置(&R)"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:433
+msgid "Res&tore Configuration Saved before Conversion"
+msgstr "恢复转换前保存的配置(&T)"
+
+#. popup message
+#: src/include/bootloader/routines/global_widgets.rb:514
+msgid "Select the boot loader before editing sections."
+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)"
+
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
+#: src/include/bootloader/routines/global_widgets.rb:600
msgid "&Start from Scratch"
msgstr "从零开始(&S)"

#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
+#: src/include/bootloader/routines/global_widgets.rb:608
msgid "&Reread Configuration from Disk"
msgstr "从磁盘重新读取配置(&R)"

#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
+#: src/include/bootloader/routines/global_widgets.rb:625
msgid "Restore MBR of Hard Disk"
msgstr "恢复硬盘的主引导记录"

#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
+#: src/include/bootloader/routines/global_widgets.rb:633
msgid "Write bootloader boot code to disk"
msgstr "将引导加载器引导代码写入磁盘"

-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "其它"
-
#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
+#: src/include/bootloader/routines/global_widgets.rb:665
msgid "MBR restored successfully."
msgstr "已成功恢复主引导记录。"

#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
+#: src/include/bootloader/routines/global_widgets.rb:668
msgid "Failed to restore MBR."
msgstr "恢复主引导记录失败。"

#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
+#: src/include/bootloader/routines/global_widgets.rb:691
msgid "Writing bootloader settings failed."
msgstr "写入引导加载器设置失败。"

+#. tab header
+#: src/include/bootloader/routines/global_widgets.rb:730
+msgid "&Section Management"
+msgstr "引导项管理(&S)"
+
+#. tab header
+#: src/include/bootloader/routines/global_widgets.rb:740
+msgid "Boot Loader &Installation"
+msgstr "引导加载器安装(&I)"
+
#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
+#: src/include/bootloader/routines/global_widgets.rb:818
msgid "Boot &Loader Options"
msgstr "引导加载器选项(&L)"

-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "引导加载器安装细节(&D)"
-
#. help text 1/1 (shown during settings reading progress)
#: src/include/bootloader/routines/helps.rb:32
msgid ""
@@ -643,38 +1111,49 @@
"<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n"
"请稍候...<br></p>"

-#. help text 1/2 (%1 may be following sentence, optionally empty)
+#. 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 可以尝试查找它们并合并它们的菜单。"
+
+#. 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"
+"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>"
+msgstr ""
+"<P>从<B>其它</B>中,您可以手动编辑引导加载器配置文件,清除当前配置并提出一个"
+"新方案,从零开始新配置,或重新读取保存在您磁盘上的配置。%1</P>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
+#: 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>"

#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
+#: 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>"

#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
+#: 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>"

#. help 3/4
-#: src/include/bootloader/routines/helps.rb:84
+#: 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"
@@ -684,12 +1163,13 @@
"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
msgstr ""
"<P>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
+"统。\n"
"若超时前没有按下任何键,将引导默认内核或操作系统。\n"
"引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>"

#. help 4/4
-#: src/include/bootloader/routines/helps.rb:93
+#: 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>"
@@ -700,7 +1180,7 @@
#. 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:107
+#: 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>"
@@ -709,7 +1189,7 @@
"引导管理器 (%1) 可以以下方式安装:</p>"

#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:116
+#: 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"
@@ -719,13 +1199,14 @@
"若计算机上安装了其它操作系统则不推荐此方法。</p>"

#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:126
+#: 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</b>\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>"
@@ -733,12 +1214,28 @@
"<p>\n"
"- 在 <tt>/boot</tt> 或 <tt>/</tt>(根) 分区的<b>引导扇区</b>中。\n"
"这是当有合适的分区存在时的推荐选项。\n"
-"若需要更新主引导记录,可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器分区</b>\n"
+"若需要更新主引导记录,可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器"
+"分区</b>\n"
"和<b>使用通用代码替换主引导记录</b>。\n"
"或者也可以配置您其它的引导管理器去启动 &product;。</p>"

+#. 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>"
+
#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
+#: src/include/bootloader/routines/helps.rb:164
msgid ""
"<p>\n"
"- In some <b>Other</b> partition. Consider your system's restrictions\n"
@@ -749,7 +1246,7 @@
"当选择此选项时请考虑到您系统的限制。</p>"

#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
+#: src/include/bootloader/routines/helps.rb:174
msgid ""
"<p>For example, most PCs have a BIOS\n"
"limit that restricts booting to\n"
@@ -760,17 +1257,18 @@
"取决于所用的引导管理器,您可能能够也可能不能从一个逻辑分区引导。</p>"

#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:163
+#: 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</tt>)。</p>"
+"请在输入字段中输入分区的设备名 (例如,<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</"
+"tt>)。</p>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
+#: 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"
@@ -781,7 +1279,7 @@
"请点击<b>引导加载器安装细节</b>。</p>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
+#: 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"
@@ -791,7 +1289,7 @@
"要选择是否安装引导加载器以及安装哪个引导加载器,请使用<b>引导加载器</b>。</p>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
+#: 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"
@@ -801,7 +1299,7 @@
"要调整引导加载器的选项,诸如超时,请点击<b>引导加载器选项</b>。</p>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:209
+#: 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"
@@ -812,10 +1310,11 @@
"<P>注意:最终配置文件中的缩进可能有所不同。</P>"

#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
+#: 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"
+"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"
@@ -823,7 +1322,7 @@
"引导项必须是唯一。</p>"

#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:231
+#: 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>"
@@ -832,7 +1331,7 @@
"选择要创建的新引导项类型。</p>"

#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:235
+#: 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"
@@ -842,73 +1341,87 @@
"然后再修改应与所选引导项不同的选项。</p>"

#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
+#: 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>"

#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
+#: 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>"
+msgstr ""
+"<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像,但需要在 XEN 环境中启"
+"动它。</p>"

#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:249
+#: 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>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区"
+"的项。\n"
"这用于引导其它操作系统。</p>"

-#: src/include/bootloader/routines/helps.rb:254
+#: 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"
+"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>"

#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
+#: src/include/bootloader/routines/lilolike.rb:697
msgid "Order of Hard Disks: %1"
msgstr "硬盘顺序:%1"

#. summary string
-#: src/include/bootloader/routines/misc.rb:51
+#: src/include/bootloader/routines/misc.rb:48
msgid "Do not install any boot loader"
msgstr "不安装任何引导加载器"

#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
+#: src/include/bootloader/routines/misc.rb:50
msgid "Do Not Install Any Boot Loader"
msgstr "不安装任何引导加载器"

#. summary string
-#: src/include/bootloader/routines/misc.rb:60
+#: src/include/bootloader/routines/misc.rb:55
msgid "Install the default boot loader"
msgstr "安装默认引导加载器"

#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:57
msgid "Install Default Boot Loader"
msgstr "安装默认引导加载器"

#. summary string
-#: src/include/bootloader/routines/misc.rb:68
+#: src/include/bootloader/routines/misc.rb:61
msgid "Boot loader"
msgstr "引导加载器"

#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
+#: src/include/bootloader/routines/misc.rb:63
msgid "Boot Loader"
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 引导扇区写入软盘。"
+
+#. popup - continuing
+#: src/include/bootloader/routines/misc.rb:113
+msgid "Leave the floppy disk in the drive."
+msgstr "请将软盘留在驱动器中。"
+
#. popup message
#: src/include/bootloader/routines/popups.rb:35
msgid ""
@@ -925,27 +1438,97 @@
"真的不保存就离开引导加载器配置界面吗?\n"
"全部修改均将不复存在。\n"

+#. yes-no popup question
+#: src/include/bootloader/routines/popups.rb:59
+msgid "Really delete section %1?"
+msgstr "真的删除引导项 %1 吗?"
+
#. error popup
-#: src/include/bootloader/routines/popups.rb:57
+#: src/include/bootloader/routines/popups.rb:65
msgid "The password must not be empty."
msgstr "密码不能为空。"

#. error popup
-#: src/include/bootloader/routines/popups.rb:66
+#: src/include/bootloader/routines/popups.rb:74
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。"

+#. 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"
+
+#. 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"
+
#. 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:82
+#: src/include/bootloader/routines/popups.rb:116
msgid "%1Set default boot loader location?\n"
msgstr "%1 设置默认引导装载器位置吗?\n"

+#. combobox item
+#: src/include/bootloader/routines/popups.rb:128
+msgid "Do Not Create a File System"
+msgstr "不创建文件系统"
+
+#. combobox item
+#: src/include/bootloader/routines/popups.rb:130
+msgid "Create an ext2 File System"
+msgstr "创建 ext2 文件系统"
+
+#. combobox item
+#: src/include/bootloader/routines/popups.rb:136
+msgid "Create a FAT File System"
+msgstr "创建 FAT 文件系统"
+
+#. 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"
+
+#. checkbox
+#: src/include/bootloader/routines/popups.rb:150
+msgid "&Low Level Format"
+msgstr "低级格式化(&L)"
+
+#. combobox
+#: src/include/bootloader/routines/popups.rb:153
+msgid "&Create File System"
+msgstr "创建文件系统(&C)"
+
+#. yes-no popup
+#: src/include/bootloader/routines/popups.rb:182
+msgid "Low level format failed. Try again?"
+msgstr "低级格式化失败。重试吗?"
+
+#. error report
+#. error report
+#: src/include/bootloader/routines/popups.rb:195
+#: src/include/bootloader/routines/popups.rb:207
+msgid "Creating file system failed."
+msgstr "创建文件系统失败。"
+
#. error popup
-#: src/include/bootloader/routines/popups.rb:90
+#: src/include/bootloader/routines/popups.rb:218
msgid ""
"The name selected is already used.\n"
"Use a different one.\n"
@@ -954,7 +1537,7 @@
"请使用其它名称。\n"

#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
+#: src/include/bootloader/routines/popups.rb:229
msgid ""
"An error occurred during boot loader\n"
"installation. Retry boot loader configuration?\n"
@@ -962,9 +1545,14 @@
"引导加载器安装期间出错。\n"
"重试引导加载器配置吗?\n"

+#. FIXME too generic, but was already translated
+#: src/include/bootloader/routines/popups.rb:241
+msgid "Unable to install the boot loader."
+msgstr "无法安装引导加载器。"
+
#. warning popup. %1 is device name, %2 is date/time in form of
#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
+#: src/include/bootloader/routines/popups.rb:283
msgid ""
"Warning!\n"
"\n"
@@ -986,761 +1574,637 @@
"继续吗?\n"

#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
+#: src/include/bootloader/routines/popups.rb:305
msgid "&Yes, Rewrite"
msgstr "是,覆盖(&Y)"

-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed
properly."
-msgstr "出于分区原因,无法正确安装引导加载器。"
+#. 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 <jreidinger@xxxxxxx>
+#.
+#. $Id$
+#: src/include/bootloader/routines/section_helps.rb:23
+msgid "<p><b>Image Section</b></p>"
+msgstr "<p><b>映像项</b></p>"

-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
-msgid "Device map must contain at least one device"
-msgstr "设备映射必须包含至少一个设备"
+#: 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>"

-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
-msgid "Disk order settings"
-msgstr "磁盘顺序设置"
+#: 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.</"
+"p>"
+msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"

-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "磁盘(&I)"
+#: 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"

-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "设备(&D)"
+#: 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>"

-#. TRANSLATORS: %s stands for partition
-#: src/lib/bootloader/disk_change_detector.rb:47
-msgid "Selected custom bootloader partition %s is not available any more."
-msgstr "所选自定义引导分区 %s 不再可用。"
+#: 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>"

-#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to
install and
-#. the %{device} is device where it should be, but isn't
-#: src/lib/bootloader/disk_change_detector.rb:61
-msgid "Selected bootloader location %{path} is not on %{device} any more."
-msgstr "所选引导加载器位置 %{path} 不再在 %{device} 上。"
+#: 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>"

-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "正在保存引导加载器配置..."
+#: 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>当选为引导分区时激活此分区</"
+"b></p>"

-#. TRANSLATORS: reboot message
-#. %1 is replaced with additional message from reIPL
-#: src/lib/bootloader/finish_client.rb:145
+#: src/include/bootloader/routines/section_helps.rb:51
msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
+"<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 ""
-"\n"
-"您的系统即将关闭。%1\n"
-"细节请阅读文档中的相关章节。\n"
+"<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n"
+"在多数情况下您需要在此指定 <code>+1</code>。 \n"
+"有关块列表的规范请参考 grub 文档。</p>\n"

-#. Final message after all packages from CD1 are installed
-#. 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/lib/bootloader/finish_client.rb:158
-msgid "The system will reboot now..."
-msgstr "系统将立即重引导..."
+#: 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"

-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "引导"
+#: src/include/bootloader/routines/section_helps.rb:57
+msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"

-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "引导(&B)"
+#: 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>"

-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be
bootable."
-msgstr "未选择安装任何引导加载器。您的系统可能无法引导。"
+#: src/include/bootloader/routines/section_helps.rb:63
+msgid "<p><b>Menu Section</b></p>"
+msgstr "<p><b>菜单项</b></p>"

-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed
properly"
-msgstr "出于分区原因,无法正确安装引导加载器"
+#: src/include/bootloader/routines/section_helps.rb:64
+msgid "<p><b>Partition of Menu File</b></p>"
+msgstr "<p><b>菜单文件的分区</b></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>"
+
+#: 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"
+
+#: 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>"
+
+#: 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>"
+
+#: 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>"
+
+#: 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>"
+
+#: 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"
+
+#: 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>"
+
+#. radio button
+#: src/include/bootloader/routines/section_helps.rb:95
+#: src/include/bootloader/routines/section_widgets.rb:583
+msgid "Image Section"
+msgstr "映像项"
+
+#: src/include/bootloader/routines/section_helps.rb:96
+msgid "&Kernel Image"
+msgstr "内核映像(&K)"
+
+#: src/include/bootloader/routines/section_helps.rb:97
+msgid "&Root Device"
+msgstr "根设备(&R)"
+
+#: src/include/bootloader/routines/section_helps.rb:100
+msgid "&Initial RAM Disk"
+msgstr "初始内存磁盘(&I)"
+
+#: src/include/bootloader/routines/section_helps.rb:101
+msgid "Chainloader Section"
+msgstr "链式加载器项"
+
+#: src/include/bootloader/routines/section_helps.rb:102
+msgid "Use Password Protection"
+msgstr "使用密码保护"
+
+#: src/include/bootloader/routines/section_helps.rb:103
+msgid "&Other System"
+msgstr "其它系统(&O)"
+
+#: src/include/bootloader/routines/section_helps.rb:104
+msgid "Do not &verify Filesystem before Booting"
+msgstr "引导前不校验文件系统(&V)"
+
+#: src/include/bootloader/routines/section_helps.rb:105
+msgid "&Activate this Partition when selected for Boot"
+msgstr "当选为引导分区时激活此分区(&A)"
+
+#: src/include/bootloader/routines/section_helps.rb:106
+msgid "B&lock Offset for Chainloading"
+msgstr "阻止链式加载的偏移(&L)"
+
+#: src/include/bootloader/routines/section_helps.rb:107
+msgid "&Map Section to the First Disk in Device Map"
+msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
+
+#: src/include/bootloader/routines/section_helps.rb:109
+msgid "&Hypervisor"
+msgstr "管理程序(&H)"
+
+#: src/include/bootloader/routines/section_helps.rb:110
+msgid "&Additional Xen Hypervisor Parameters"
+msgstr "Xen 管理程序额外参数(&A)"
+
+#: src/include/bootloader/routines/section_helps.rb:112
+msgid "&Partition of Menu File"
+msgstr "菜单文件的分区(&P)"
+
+#: src/include/bootloader/routines/section_helps.rb:113
+msgid "&Menu Description File"
+msgstr "菜单描述文件(&M)"
+
+#: src/include/bootloader/routines/section_helps.rb:114
+msgid "&Force root filesystem to be mounted read-only"
+msgstr "强制只读挂载根文件系统(&F)"
+
+#: src/include/bootloader/routines/section_helps.rb:115
+msgid "Allow attempt to &relocate"
+msgstr "允许尝试重新定位(&R)"
+
+#: src/include/bootloader/routines/section_helps.rb:116
+msgid "Tar&get Directory for Section"
+msgstr "引导项目标文件夹(&G)"
+
+#: src/include/bootloader/routines/section_helps.rb:117
+msgid "Op&tional Parameter File"
+msgstr "可选参数文件(&T)"
+
+#: src/include/bootloader/routines/section_helps.rb:118
+msgid "Dump Section (obsolete)"
+msgstr "转储项目(淘汰)"
+
+#: src/include/bootloader/routines/section_helps.rb:119
+msgid "&Dump Device"
+msgstr "转储设备(&D)"
+
+#: src/include/bootloader/routines/section_helps.rb:120
+msgid "&SCSI Dump Device"
+msgstr "&SCSI 转储设备"
+
+#: src/include/bootloader/routines/section_helps.rb:122
+msgid "&List of Menu Entries"
+msgstr "菜单项列表(&L)"
+
+#: src/include/bootloader/routines/section_helps.rb:123
+msgid "&Number of Default Entry"
+msgstr "默认项数量(&N)"
+
+#: src/include/bootloader/routines/section_helps.rb:124
+msgid "&Timeout in seconds"
+msgstr "超时(以秒计)(&S)"
+
+#: src/include/bootloader/routines/section_helps.rb:125
+msgid "&Show boot menu"
+msgstr "显示引导菜单(&S)"
+
+#: src/include/bootloader/routines/section_helps.rb:126
+msgid "C&opy Image to Boot Partition"
+msgstr "复制映像到引导分区(&C)"
+
+#: src/include/bootloader/routines/section_helps.rb:127
+msgid "&Skip Section gracefully on Errors"
+msgstr "出错时优雅地跳过该项(&S)"
+
+#: src/include/bootloader/routines/section_helps.rb:128
+msgid "Boot &Partition of Other System"
+msgstr "其它系统的引导分区(&P)"
+
+#. Cache for CommonSectionWidgets
+#: src/include/bootloader/routines/section_widgets.rb:58
+msgid "Image section must have specified kernel image"
+msgstr "映像项必须指定内核映像"
+
+#: src/include/bootloader/routines/section_widgets.rb:65
+msgid "Image file doesn't exist now. Do you really want use it?"
+msgstr "映像文件目前不存在。您真的想要使用它吗?"
+
+#: src/include/bootloader/routines/section_widgets.rb:82
+msgid "Initrd file doesn't exist now. Do you really want use it?"
+msgstr "Initrd 文件目前不存在。您真的想要使用它吗?"
+
+#. string append = BootCommon::current_section["append"]:"";
+#: src/include/bootloader/routines/section_widgets.rb:227
+msgid "Enable &SELinux"
+msgstr "启用 &SELinux"
+
+#. 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 "名称包含了不允许的字符"
+
+#: src/include/bootloader/routines/section_widgets.rb:533
+msgid "Ask for resolution during boot."
+msgstr "引导期间询问分辨率。"
+
+#. radio button
+#: src/include/bootloader/routines/section_widgets.rb:573
+msgid "Clone Selected Section"
+msgstr "克隆所选引导项"
+
+#. radio button (don't translate 'chainloader')
+#: src/include/bootloader/routines/section_widgets.rb:587
+msgid "Other System (Chainloader)"
+msgstr "其它系统 (链式加载器)"
+
+#. frame
+#: src/include/bootloader/routines/section_widgets.rb:609
+msgid "Section Type"
+msgstr "引导项类型"
+
+#. text entry
+#: src/include/bootloader/routines/section_widgets.rb:668
+msgid "Section &Name"
+msgstr "引导项名称(&N)"
+
+#. error report
+#: src/include/bootloader/routines/wizards.rb:36
+msgid ""
+"Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "出于分区原因,无法正确安装引导加载器。"
+
#. FATE#303643 Enable one-click changes in bootloader proposal
#.
-#: src/modules/BootGRUB2.rb:168
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not
install</a>)"
+#.
+#. FIXME identical code in BootGRUB module
+#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
+msgid ""
+"Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
msgstr "安装引导代码至 MBR(<a href=\"disable_boot_mbr\">不安装</a>)"

-#: src/modules/BootGRUB2.rb:172
-msgid "Do not install bootcode into MBR (<a
href=\"enable_boot_mbr\">install</a>)"
+#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
+msgid ""
+"Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
msgstr "不安装引导代码至 MBR(<a href=\"enable_boot_mbr\">安装</a>)"

#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do
not install</a>)"
+#. check for separated boot partition, use root otherwise
+#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
+msgid ""
+"Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not "
+"install</a>)"
msgstr "安装引导代码至 /boot 分区(<a href=\"disable_boot_boot\">不安装</a>)"

-#: src/modules/BootGRUB2.rb:189
-msgid "Do not install bootcode into /boot partition (<a
href=\"enable_boot_boot\">install</a>)"
+#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
+msgid ""
+"Do not install bootcode into /boot partition (<a href=\"enable_boot_boot"
+"\">install</a>)"
msgstr "不安装引导代码至 /boot 分区(<a href=\"enable_boot_boot\">安装</a>)"

-#: src/modules/BootGRUB2.rb:195
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do
not install</a>)"
+#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
+msgid ""
+"Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not "
+"install</a>)"
msgstr "安装引导代码至 \"/\" 分区(<a href=\"disable_boot_root\">不安装</a>)"

-#: src/modules/BootGRUB2.rb:199
-msgid "Do not install bootcode into \"/\" partition (<a
href=\"enable_boot_root\">install</a>)"
+#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
+msgid ""
+"Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root"
+"\">install</a>)"
msgstr "不安装引导代码至 \"/\" 分区(<a href=\"enable_boot_root\">安装</a>)"

-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know
what you are doing please select above location."
-msgstr "警告:没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。"
-
#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
+#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
msgid "Change Location: %s"
msgstr "变动位置:%s"

+#. 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/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
+#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
+#: src/modules/BootGRUB2EFI.rb:96
msgid "Boot Loader Type: %1"
msgstr "引导加载器类型:%1"

+#. summary text, location is location description (eg. /dev/hda)
+#: src/modules/BootGRUB.rb:718
+msgid " (\"/boot\")"
+msgstr " (\"/boot\")"
+
#. TRANSLATORS: extended is here for extended partition. Keep translation
short.
-#: src/modules/BootGRUB2.rb:237
+#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
msgid " (extended)"
msgstr " (扩展分区)"

+#: src/modules/BootGRUB.rb:730
+msgid " (\"/\")"
+msgstr " (根分区)"
+
#. 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/BootGRUB2.rb:245
+#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
msgid " (MBR)"
msgstr " (主引导记录)"

-#: src/modules/BootGRUB2.rb:252
+#. 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"

-#: src/modules/BootGRUB2EFI.rb:108
+#. section name "suffix" for default section
+#: src/modules/BootGRUB.rb:768
+msgid " (default)"
+msgstr " (默认)"
+
+#: src/modules/BootGRUB.rb:779
+msgid "Sections:<br>%1"
+msgstr "项:<br>%1"
+
+#. summary text
+#: src/modules/BootGRUB.rb:788
+msgid "Do not install boot loader; just create configuration files"
+msgstr "不安装引导加载器;仅创建配置文件"
+
+#. menubutton item, keep as short as possible
+#: src/modules/BootGRUB.rb:919
+msgid "Propose and &Merge with Existing GRUB Menus"
+msgstr "建议并与已有 GRUB 菜单合并(&M)"
+
+#. 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 选择位置。除非您知道您正在做什么否则请选择上面"
+"的位置。"
+
+#: src/modules/BootGRUB2EFI.rb:104
msgid "Enable Secure Boot: %1"
msgstr "启用安全引导:%1"

#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
+#: src/modules/BootSupportCheck.rb:70
msgid "Unknown bootloader: %1"
msgstr "未知引导加载器:%1"

#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
+#: src/modules/BootSupportCheck.rb:101
msgid "Unsupported combination of hardware platform %1 and bootloader %2"
msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合"

#. TRANSLATORS: description of technical problem. Do not translate technical
terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:139
-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/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。"

#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
+#: src/modules/BootSupportCheck.rb:168
msgid "The boot device is on raid type: %1. System will not boot."
msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。"

#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:187
-msgid "The boot device is on software RAID1. Select other bootloader location,
e.g. Master Boot Record"
+#: src/modules/BootSupportCheck.rb:188
+msgid ""
+"The boot device is on software RAID1. Select other bootloader location, e.g. "
+"Master Boot Record"
msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置,例如,主引导记录"

+#. 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 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复"
+"核并调整磁盘的引导顺序"
+
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
+#: src/modules/BootSupportCheck.rb:263
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr "缺失用于引导的 ext 分区。无法安装引导代码。"

-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some
BIOSes could refuse to boot."
-msgstr "安装器未设置激活旗标。若根本未设置该旗标,某些 BIOS 可能会拒绝引导。"
-
-#: src/modules/BootSupportCheck.rb:255
-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 将无法引导磁盘。"
-
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#: src/modules/Bootloader.rb:170
msgid "Check boot loader"
msgstr "检查引导加载器"

#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/modules/Bootloader.rb:172
msgid "Read partitioning"
msgstr "读取分区"

#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
+#: src/modules/Bootloader.rb:174
msgid "Load boot loader settings"
msgstr "加载引导加载器设置"

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/modules/Bootloader.rb:178
msgid "Checking boot loader..."
msgstr "正在检查引导加载器..."

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/modules/Bootloader.rb:180
msgid "Reading partitioning..."
msgstr "正在读取分区..."

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
+#: src/modules/Bootloader.rb:182
msgid "Loading boot loader settings..."
msgstr "正在加载引导加载器设置..."

#. dialog header
-#: src/modules/Bootloader.rb:162
+#: src/modules/Bootloader.rb:186
msgid "Initializing Boot Loader Configuration"
msgstr "正在初始化引导加载器配置"

+#. part of summary, %1 is a part of kernel command line
+#: src/modules/Bootloader.rb:307
+msgid "Added Kernel Parameters: %1"
+msgstr "添加的内核参数:%1"
+
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/modules/Bootloader.rb:367
msgid "Create initrd"
msgstr "创建 initrd"

#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/modules/Bootloader.rb:369
msgid "Save boot loader configuration files"
msgstr "保存引导加载器配置文件"

#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
+#: src/modules/Bootloader.rb:371
msgid "Install boot loader"
msgstr "安装引导加载器"

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/modules/Bootloader.rb:375
msgid "Creating initrd..."
msgstr "正在创建 initrd..."

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
+#: src/modules/Bootloader.rb:377
msgid "Saving boot loader configuration files..."
msgstr "正在保存引导加载器配置文件..."

#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
+#: src/modules/Bootloader.rb:379
msgid "Installing boot loader..."
msgstr "正在安装引导加载器..."

#. progress line
-#: src/modules/Bootloader.rb:299
+#: src/modules/Bootloader.rb:385
msgid "Saving Boot Loader Configuration"
msgstr "正在保存引导加载器配置"

-#~ msgid "<p><b>Distributor</b> specifies name of distributor of kernel used
to create boot entry name. </p>"
-#~ msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>"
+#~ msgid "Delete a global option"
+#~ msgstr "删除一个全局选项"

-#~ msgid "D&istributor"
-#~ msgstr "发行方(&I)"
+#~ msgid "Set a global option"
+#~ msgstr "设置全局选项"

-#~ 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>"
+#~ msgid "P&rotect Entry Modification Only"
+#~ msgstr "仅保护启动项不受修改(&r)"

-#~ msgid "&Failsafe Kernel Command Line Parameter"
-#~ msgstr "安全模式内核命令行参数(&F)"
+#~ msgid "Selected custom bootloader partition %s is not available any more."
+#~ msgstr "所选自定义引导分区 %s 不再可用。"

-#~ msgid "Delete a global option or option of a section"
-#~ msgstr "删除全局选项或某引导项的选项"
+#~ msgid "Selected bootloader location %{path} is not on %{device} any more."
+#~ msgstr "所选引导加载器位置 %{path} 不再在 %{device} 上。"

-#~ msgid "Set a global option or option of a section"
-#~ msgstr "设置全局选项或某引导项的选项"
-
-#~ msgid "Add a new section - please use interactive mode"
-#~ msgstr "添加新引导项 - 请使用交互模式"
-
-#~ msgid "The name of the section"
-#~ msgstr "引导项名称"
-
-#~ msgid "Section %1 not found."
-#~ msgstr "未找到引导项 %1。"
-
-#~ msgid "Add option is available only in commandline interactive mode"
-#~ msgstr "添加选项只在命令行交互模式中可用"
-
-#~ msgid "Section name must be specified."
-#~ msgstr "必须指定引导项名称。"
-
-#~ msgid "Disk Order"
-#~ msgstr "磁盘顺序"
-
-#~ msgid "Boot Menu"
-#~ 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>"
+#~ "Activate flag is not set by installer. If it is not set at all, some "
+#~ "BIOSes could refuse to boot."
#~ msgstr ""
-#~ "<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将被忽略。\n"
-#~ "推荐将 grub 安装到主引导记录。</p>"
+#~ "安装器未设置激活旗标。若根本未设置该旗标,某些 BIOS 可能会拒绝引导。"

-#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the
graphical boot menu.</p>"
-#~ msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>"
-
-#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-#~ msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
-
-#~ msgid "Use &Trusted Grub"
-#~ msgstr "使用信任的 Grub(&T)"
-
-#~ msgid "Graphical &Menu File"
-#~ msgstr "图形菜单文件(&M)"
-
-#~ msgid "Choose new graphical menu file"
-#~ msgstr "选择新图形菜单文件"
-
-#~ msgid "Enable Acoustic &Signals"
-#~ msgstr "启用声音信号(&S)"
-
-#~ msgid "&Up"
-#~ msgstr "向上(&U)"
-
-#~ msgid "&Down"
-#~ msgstr "向下(&D)"
-
-#~ msgid "Kernel Section"
-#~ msgstr "内核项"
-
-#~ msgid "Section Settings"
-#~ msgstr "引导项设置"
-
-#~ msgid "Boot Loader Settings: Section Management"
-#~ msgstr "引导加载器设置:引导项管理"
-
-#~ msgid "Xen Section"
-#~ msgstr "Xen 项"
-
-#~ msgid "Menu Section"
-#~ msgstr "菜单项"
-
-#~ msgid "Dump Section"
-#~ msgstr "转储项"
-
-#~ msgid "Other System Section"
-#~ msgstr "其它系统项"
-
-#~ msgid "&Filename"
-#~ msgstr "文件名(&F)"
-
-#~ msgid "Filename: %1"
-#~ msgstr "文件名:%1"
-
-#~ msgid "Fi&le Contents"
-#~ msgstr "文件内容(&L)"
-
-#~ msgid "Expert Manual Configuration"
-#~ msgstr "专家手动配置"
-
-#~ msgid "Image"
-#~ msgstr "映像"
-
-#~ msgid "Xen"
-#~ msgstr "Xen"
-
-#~ msgid "Floppy"
-#~ msgstr "软盘"
-
-#~ msgid "Menu"
-#~ msgstr "菜单"
-
-#~ msgid "Dump"
-#~ msgstr "转储"
-
-#~ msgid "Def."
-#~ msgstr "默认"
-
-#~ msgid "Label"
-#~ msgstr "标签"
-
-#~ msgid "Type"
-#~ msgstr "类型"
-
-#~ msgid "Image / Device"
-#~ msgstr "映像 / 设备"
-
-#~ msgid "Set as De&fault"
-#~ msgstr "设置为默认(&F)"
-
#~ 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"
+#~ "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 ""
-#~ "\n"
-#~ "您选择了修改您的引导加载器。\n"
-#~ "当转换配置时,可能丢失一些设置。\n"
-#~ "\n"
-#~ "当前配置将被保存,若您后面再使用现在这个引导加载器时可以恢复当前配置。\n"
-#~ "\n"
-#~ "请选择一个动作:\n"
+#~ "安装器将不会修改磁盘 MBR。除非它已包含了引导代码,否则 BIOS 将无法引导磁"
+#~ "盘。"

-#~ msgid "Co&nvert Current Configuration"
-#~ msgstr "转换当前配置(&N)"
-
-#~ msgid "&Start New Configuration from Scratch"
-#~ msgstr "从零开始新配置(&S)"
-
-#~ msgid "&Read Configuration Saved on Disk"
-#~ msgstr "读取保存在磁盘上的配置(&R)"
-
-#~ msgid "Res&tore Configuration Saved before Conversion"
-#~ msgstr "恢复转换前保存的配置(&T)"
-
-#~ msgid "Select the boot loader before editing sections."
-#~ msgstr "在编辑各项前请选择引导加载器。"
-
-#~ msgid "&Section Management"
-#~ msgstr "引导项管理(&S)"
-
-#~ msgid "Boot Loader &Installation"
-#~ msgstr "引导加载器安装(&I)"
-
#~ msgid ""
-#~ "If you have multiple Linux systems installed,\n"
-#~ "YaST can try to find them and merge their menus."
-#~ msgstr "若您安装了多个 Linux 系统,YaST 可以尝试查找它们并合并它们的菜单。"
+#~ "Partition number > 3 is being used for booting with GPT partition table"
+#~ msgstr ">3 的分区号正用于引导 GPT 分区表"

#~ 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>"
+#~ "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 ""
-#~ "<p>\n"
-#~ "- 在<b>软盘</b>上。\n"
-#~ "可使用此选项规避干扰已存在的引导机制的风险。\n"
-#~ "请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>"
+#~ "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 "
+#~ "grub 主引导记录时出现 error 18 即为表象),则系统可能无法引导。"

-#~ msgid "The %1 boot sector has been written to the floppy disk."
-#~ msgstr "已将 %1 引导扇区写入软盘。"
-
-#~ msgid "Leave the floppy disk in the drive."
-#~ msgstr "请将软盘留在驱动器中。"
-
-#~ msgid "Really delete section %1?"
-#~ msgstr "真的删除引导项 %1 吗?"
-
#~ msgid ""
-#~ "The disk settings have changed.\n"
-#~ "Check section %1 settings.\n"
-#~ msgstr ""
-#~ "磁盘设置已修改。\n"
-#~ "请检查引导项 %1 的设置。\n"
-
-#~ 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 "Do Not Create a File System"
-#~ msgstr "不创建文件系统"
-
-#~ msgid "Create an ext2 File System"
-#~ msgstr "创建 ext2 文件系统"
-
-#~ msgid "Create a FAT File System"
-#~ msgstr "创建 FAT 文件系统"
-
-#~ 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 "&Low Level Format"
-#~ msgstr "低级格式化(&L)"
-
-#~ msgid "&Create File System"
-#~ msgstr "创建文件系统(&C)"
-
-#~ msgid "Low level format failed. Try again?"
-#~ msgstr "低级格式化失败。重试吗?"
-
-#~ msgid "Creating file system failed."
-#~ msgstr "创建文件系统失败。"
-
-#~ msgid "Unable to install the boot loader."
-#~ msgstr "无法安装引导加载器。"
-
-#~ msgid "<p><b>Image Section</b></p>"
-#~ msgstr "<p><b>映像项</b></p>"
-
-#~ 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 "<p><b>Root Device</b> sets the device to pass to the kernel as root
device.</p>"
-#~ msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"
-
-#~ 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>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>Setting <b>Use Password Protection</p> will require a password to
select this section.</p>"
-#~ msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>"
-
-#~ 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>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>"
-
-#~ 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>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><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-#~ msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"
-
-#~ 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><b>Menu Section</b></p>"
-#~ msgstr "<p><b>菜单项</b></p>"
-
-#~ msgid "<p><b>Partition of Menu File</b></p>"
-#~ msgstr "<p><b>菜单文件的分区</b></p>"
-
-#~ 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><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><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>Allow attempt to relocate</b>\n"
-#~ "Usually specified in global section</p>"
-#~ msgstr ""
-#~ "<p><b>允许尝试重新定位</b>\n"
-#~ "通常在全局项中指定</p>"
-
-#~ 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>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>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>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 "Image Section"
-#~ msgstr "映像项"
-
-#~ msgid "&Kernel Image"
-#~ msgstr "内核映像(&K)"
-
-#~ msgid "&Root Device"
-#~ msgstr "根设备(&R)"
-
-#~ msgid "&Initial RAM Disk"
-#~ msgstr "初始内存磁盘(&I)"
-
-#~ msgid "Chainloader Section"
-#~ msgstr "链式加载器项"
-
-#~ msgid "Use Password Protection"
-#~ msgstr "使用密码保护"
-
-#~ msgid "&Other System"
-#~ msgstr "其它系统(&O)"
-
-#~ msgid "Do not &verify Filesystem before Booting"
-#~ msgstr "引导前不校验文件系统(&V)"
-
-#~ msgid "&Activate this Partition when selected for Boot"
-#~ msgstr "当选为引导分区时激活此分区(&A)"
-
-#~ msgid "B&lock Offset for Chainloading"
-#~ msgstr "阻止链式加载的偏移(&L)"
-
-#~ msgid "&Map Section to the First Disk in Device Map"
-#~ msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
-
-#~ msgid "&Hypervisor"
-#~ msgstr "管理程序(&H)"
-
-#~ msgid "&Additional Xen Hypervisor Parameters"
-#~ msgstr "Xen 管理程序额外参数(&A)"
-
-#~ msgid "&Partition of Menu File"
-#~ msgstr "菜单文件的分区(&P)"
-
-#~ msgid "&Menu Description File"
-#~ msgstr "菜单描述文件(&M)"
-
-#~ msgid "&Force root filesystem to be mounted read-only"
-#~ msgstr "强制只读挂载根文件系统(&F)"
-
-#~ msgid "Allow attempt to &relocate"
-#~ msgstr "允许尝试重新定位(&R)"
-
-#~ msgid "Tar&get Directory for Section"
-#~ msgstr "引导项目标文件夹(&G)"
-
-#~ msgid "Op&tional Parameter File"
-#~ msgstr "可选参数文件(&T)"
-
-#~ msgid "Dump Section (obsolete)"
-#~ msgstr "转储项目(淘汰)"
-
-#~ msgid "&Dump Device"
-#~ msgstr "转储设备(&D)"
-
-#~ msgid "&SCSI Dump Device"
-#~ msgstr "&SCSI 转储设备"
-
-#~ msgid "&List of Menu Entries"
-#~ msgstr "菜单项列表(&L)"
-
-#~ msgid "&Number of Default Entry"
-#~ msgstr "默认项数量(&N)"
-
-#~ msgid "&Timeout in seconds"
-#~ msgstr "超时(以秒计)(&S)"
-
-#~ msgid "&Show boot menu"
-#~ msgstr "显示引导菜单(&S)"
-
-#~ msgid "C&opy Image to Boot Partition"
-#~ msgstr "复制映像到引导分区(&C)"
-
-#~ msgid "&Skip Section gracefully on Errors"
-#~ msgstr "出错时优雅地跳过该项(&S)"
-
-#~ 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 " (default)"
-#~ 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 "Partition number > 3 is being used for booting with GPT partition
table"
-#~ msgstr ">3 的分区号正用于引导 GPT 分区表"
-
-#~ 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 "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"
@@ -1750,19 +2214,23 @@
#~ 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 引导分区。"
@@ -1773,7 +2241,9 @@
#~ 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"
@@ -1806,11 +2276,15 @@
#~ 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 的调试级别。</p>"
+#~ msgstr ""
+#~ "<p><b>设置调试级别 [0-5]</b><br>若遇到引导问题可增加 ELILO 的调试级别。</"
+#~ "p>"

#~ msgid ""
-#~ "<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"
+#~ "<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"
@@ -1818,8 +2292,10 @@
#~ "要是给定项中未出现 '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"
@@ -1827,7 +2303,8 @@

#~ 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"
@@ -1842,7 +2319,8 @@

#~ 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"
@@ -1860,7 +2338,8 @@
#~ "</p>"
#~ msgstr ""
#~ "<p><b>允许尝试重新定位</b><br>\n"
-#~ "若在内核的初始加载点遇到了内存分配错误,则允许尝试重新定位 (假设此内核可重新定位)。\n"
+#~ "若在内核的初始加载点遇到了内存分配错误,则允许尝试重新定位 (假设此内核可重"
+#~ "新定位)。\n"
#~ "</p>"

#~ msgid ""
@@ -1892,7 +2371,8 @@
#~ "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"
@@ -1922,7 +2402,9 @@
#~ 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"
@@ -1988,7 +2470,9 @@
#~ 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"
@@ -2030,8 +2514,10 @@
#~ 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"
@@ -2039,11 +2525,14 @@
#~ "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</b><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"
@@ -2051,8 +2540,10 @@
#~ "要是给定项里未出现 '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"
@@ -2060,9 +2551,12 @@

#~ 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"
@@ -2075,7 +2569,8 @@
#~ "<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"
@@ -2085,49 +2580,62 @@
#~ 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.</p>"
+#~ "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"
@@ -2313,7 +2821,8 @@
#~ 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 引导加载器。"
@@ -2427,7 +2936,8 @@

#~ 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"
@@ -2496,7 +3006,9 @@
#~ "但需要在 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 ""
@@ -2596,15 +3108,19 @@
#~ 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"
@@ -2687,16 +3203,19 @@

#~ 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"
@@ -2705,7 +3224,8 @@

#~ 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"
@@ -2723,7 +3243,8 @@

#~ 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 ""
@@ -2735,10 +3256,12 @@
#, 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"
@@ -2753,7 +3276,8 @@
#~ "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"
@@ -2765,7 +3289,8 @@
#~ "<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/control.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/control.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/control.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -8,315 +8,307 @@
# Novell Language <language@xxxxxxxxxx>, 2004, 2005.
# Eric Shan <ericalways@xxxxxxxxx>, 2008.
# margurite <i@xxxxxxxxxxxxx>, 2012, 2013.
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014, 2016.
msgid ""
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
-"PO-Revision-Date: 2014-10-30 17:30+0800\n"
-"Last-Translator: 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese Simplified <kde-i18n-doc@xxxxxxx>\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"PO-Revision-Date: 2016-06-05 16:45+0800\n"
+"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"

-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.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"
-" "
+"<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"
+" "
msgstr ""
"\n"
-"<p><b>恭喜!</b></p>\n"
-"<p>openSUSE 已在您的计算机上安装完毕。\n"
-"点击<b>完成</b>后,您就可以登入系统了。</p>\n"
-"<p>欢迎访问我们的站点:%1。</p>\n"
-"<p>祝您使用愉快!<br>您的 openSUSE 开发团队</p>\n"
-" "
+"<p>\n"
+"安装已成功完成。\n"
+"您的系统已经可以使用了。\n"
+"请点击<b>完成</b>来登入系统。\n"
+"</p>\n"
+"<p>\n"
+"欢迎访问我们的站点 http://www.suse.com/。\n";
+"</p>\n"
+" "

-#: control/control.openSUSE.glade.translations.glade:10
-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"
-"桌面最适合您。"
+#: control/control.SLED.glade.translations.glade:15
+msgid "CIM Server"
+msgstr "通用信息模型 (CIM) 服务器"

-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr "GNOME 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr "KDE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr "XFCE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr "LXDE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr "极简 X 窗口系统"
-
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Enlightenment Desktop"
-msgstr "Enlightenment 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "极简服务器选集 (文本模式)"
-
-#: control/control.openSUSE.glade.translations.glade:28
-#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: 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
msgid "Installation Settings"
msgstr "安装设置"

-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+msgid "Overview"
+msgstr "概览"
+
+#: control/control.SLED.glade.translations.glade:19
+msgid "Expert"
+msgstr "专家"
+
+#: control/control.SLED.glade.translations.glade:20
msgid "Live Installation Settings"
msgstr "Live 安装设置"

-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
msgid "Update Settings"
msgstr "更新设置"

-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
msgid "Network Configuration"
msgstr "网络配置"

-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
msgid "Hardware Configuration"
msgstr "硬件配置"

-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:90
msgid "Preparation"
msgstr "准备"

-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:64
msgid "Load linuxrc Network Configuration"
msgstr "加载 Linuxrc 网络配置"

-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:65
msgid "Network Autosetup"
msgstr "自动网络设置"

-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
msgid "Welcome"
msgstr "欢迎"

-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
msgid "Network Activation"
msgstr "网络激活"

-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:68
msgid "Disk Activation"
msgstr "磁盘激活"

-#: control/control.openSUSE.glade.translations.glade:41
-#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: 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
msgid "System Analysis"
msgstr "系统分析"

-#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+msgid "Add-On Products"
+msgstr "附加产品"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:54
msgid "Disk"
msgstr "磁盘"

-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:55
msgid "Time Zone"
msgstr "时区"

-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
-msgid "Online Repositories"
-msgstr "在线软件源"
-
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
-msgid "Add-On Products"
-msgstr "附加产品"
-
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "桌面选择"
-
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:37
msgid "User Settings"
msgstr "用户设置"

-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "安装"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:38
msgid "Installation Overview"
msgstr "安装概览"

-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
-#: 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:57
-#: 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:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
-#: control/control.openSUSE.glade.translations.glade:75
-#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
-#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: 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: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: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
msgid "Perform Installation"
msgstr "执行安装"

-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:49
+msgid "Installation"
+msgstr "安装"
+
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLED.glade.translations.glade:92
msgid "System for Update"
msgstr "待更新系统"

-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:95
msgid "Update"
msgstr "更新"

-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
-#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
-#: control/control.openSUSE.glade.translations.glade:122
-#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.SLED.glade.translations.glade:73
+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:109
+#: control/control.SLED.glade.translations.glade:110
msgid "Perform Update"
msgstr "执行更新"

-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "配置"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:79
msgid "Base Installation"
msgstr "基本安装"

-#: 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:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: 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
msgid "AutoYaST Settings"
msgstr "AutoYaST 设置"

-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLED.glade.translations.glade:111
+msgid "Configuration"
+msgstr "配置"
+
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:112
msgid "System Configuration"
msgstr "系统配置"

#~ 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"
-#~ " "
+#~ "<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>\n"
-#~ "已成功完成安装。\n"
-#~ "您的系统已经可以使用了。\n"
-#~ "请点击完成来登入系统。\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "欢迎访问我们的站点 http://www.suse.com/。\n";
-#~ "</p>\n"
-#~ " "
+#~ "<p><b>恭喜!</b></p>\n"
+#~ "<p>openSUSE 已在您的计算机上安装完毕。\n"
+#~ "点击<b>完成</b>后,您就可以登入系统了。</p>\n"
+#~ "<p>欢迎访问我们的站点:%1。</p>\n"
+#~ "<p>祝您使用愉快!<br>您的 openSUSE 开发团队</p>\n"
+#~ " "

-#~ msgid "CIM Server"
-#~ msgstr "通用信息模型 (CIM) 服务器"
+#~ 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"
+#~ "桌面最适合您。"

-#~ msgid "Overview"
-#~ msgstr "概览"
+#~ msgid "GNOME Desktop"
+#~ msgstr "GNOME 桌面"

-#~ msgid "Expert"
-#~ msgstr "专家"
+#~ msgid "KDE Desktop"
+#~ msgstr "KDE 桌面"

+#~ msgid "XFCE Desktop"
+#~ msgstr "XFCE 桌面"
+
+#~ msgid "LXDE Desktop"
+#~ msgstr "LXDE 桌面"
+
+#~ msgid "Minimal X Window"
+#~ msgstr "极简 X 窗口系统"
+
+#~ msgid "Enlightenment Desktop"
+#~ msgstr "Enlightenment 桌面"
+
+#~ msgid "Minimal Server Selection (Text Mode)"
+#~ msgstr "极简服务器选集 (文本模式)"
+
+#~ msgid "Online Repositories"
+#~ msgstr "在线软件源"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "桌面选择"
+
#~ msgid "Network Services Configuration"
#~ msgstr "网络服务配置"

#~ msgid "Installation Summary"
#~ msgstr "安装摘要"

-#~ msgid "Update Summary"
-#~ msgstr "更新摘要"
-
#~ msgid "Add-On Product Installation"
#~ msgstr "附加产品安装"

@@ -450,10 +442,13 @@

#~ 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"

Modified: trunk/yast/zh_CN/po/crowbar.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/crowbar.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/crowbar.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -9,10 +9,10 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
-"PO-Revision-Date: 2016-03-02 22:26+0800\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-05 23:29+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,66 +25,44 @@
msgid "Configuration of crowbar"
msgstr "Crowbar 配置"

-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr "全部通用"
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr "SLES 11 SP3"
-
-#. target platform name
#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
-msgstr "SLES 12"
+msgid "SLES 12 SP1"
+msgstr "SLES 12 SP1"

#. combobox label
#: src/include/crowbar/complex.rb:106
-#| msgid "&List of Repositories"
msgid "&Location of Repositories"
msgstr "软件源位置(&L)"

#: src/include/crowbar/complex.rb:109
-#| msgid ""
-#| "<p>Here you can edit the location of your <b>Update
Repositories</b>.</p>\n"
-#| "<p>\n"
-#| "Some examples of how the URL could look like:\n"
-#| "</p><p>\n"
-#| "<ul>\n"
-#| "<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i>
for SMT server\n"
-#|
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i>
for SUSE Manager Server.\n"
-#| "</p><p>\n"
-#| "For detailed description, check the Deployment Guide.\n"
-#| "</p>"
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought
"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough "
"to enter server's URL and the paths\n"
" to repositories will be filled automatically.</p>It is also "
"possible to use custom paths. Some examples of how the URL could look like:\n"
"</p><p>\n"
"<ul>\n"
-"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> "
-"for SMT server\n"
-"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sle";
-"s11-sp3-x86_64/</i> for SUSE Manager Server.\n"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/";
+"product</i> for SMT server\n"
+"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/";
+"sles11-sp3-x86_64/</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
"</p>"
msgstr ""
"<p>在这里您可以编辑您<b>更新软件源</b>的位置。</p>\n"
"<p>\n"
-"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上,输入服务器 URL 就够了,软件源路径将自动填充。</p>也可以使用自定义路径。"
-"一些 URL 示例:\n"
+"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上,输入服务器 URL 就够了,软"
+"件源路径将自动填充。</p>也可以使用自定义路径。一些 URL 示例:\n"
"</p><p>\n"
"<ul>\n"
-"<li>SMT
服务器:<i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/";
-"</i>\n"
-"<li>SUSE Manager
服务器:<i>http://manager.example.com/ks/dist/child/suse-cloud-3.";
-"0-pool-x86_64/sles11-sp3-x86_64/</i>\n"
+"<li>SMT
服务器:<i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/";
+"product</i>\n"
+"<li>SUSE Manager 服务器:<i>http://manager.example.com/ks/dist/child/suse-";
+"cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i>\n"
"</p><p>\n"
"详细描述请查阅部署指南。\n"
"</p>"
@@ -107,8 +85,8 @@
#. help text for the Network mode tab (do not translate bastion)
#: src/include/crowbar/complex.rb:196
msgid ""
-"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding
Policy</b>.</p>"
-"\n"
+"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</"
+"p>\n"
"<p>You can also specify interface names for the bastion network conduits as "
"space-separated list.</p>"
msgstr ""
@@ -208,32 +186,31 @@
msgstr "IP 地址(&I)"

#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr "名称"

#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr "URL"

#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
msgid "Ask On Error"
msgstr "出错时询问"

-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
-#| msgid "Target Name"
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
msgid "Target Platform"
msgstr "目标平台"

+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr "架构"
+
#. error popup
-#: src/include/crowbar/complex.rb:580
-#| msgid ""
-#| "User '%1' already exists.\n"
-#| "Choose a different name."
+#: src/include/crowbar/complex.rb:583
msgid ""
"Repository '%1' already exists.\n"
"Choose a different name."
@@ -242,77 +219,77 @@
"请选择一个不同的名称。"

#. text entry label
-#: src/include/crowbar/complex.rb:676
-#| msgid "LDAP Server &URL"
+#: src/include/crowbar/complex.rb:685
msgid "Server &URL"
msgstr "服务器 &URL"

#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
msgid "Repository Name"
msgstr "软件源名称"

#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
msgid "&Ask On Error"
msgstr "出错时询问(&A)"

#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
msgid "Repository &URL"
msgstr "软件源 &URL"

#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr "空白 URL 意味着将使用默认值。"

#. push button label
-#: src/include/crowbar/complex.rb:726
-#| msgid "Repository"
+#: src/include/crowbar/complex.rb:722
msgid "A&dd Repository"
msgstr "添加软件源(&d)"

#. combobox item
-#: src/include/crowbar/complex.rb:793
-#| msgid "Remote WINS Server"
+#: src/include/crowbar/complex.rb:792
+msgid "Local SMT Server"
+msgstr "本地 SMT 服务器"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
msgid "Remote SMT Server"
msgstr "远程 SMT 服务器"

#. combobox item
-#: src/include/crowbar/complex.rb:795
-#| msgid "Finger Server"
+#: src/include/crowbar/complex.rb:796
msgid "SUSE Manager Server"
msgstr "SUSE Manager 服务器"

#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr "自定义"

#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
msgid "User Name"
msgstr "用户名"

#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr "密码"

#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
msgid "Repeat the Password"
msgstr "重复密码"

#. error popup
-#: src/include/crowbar/complex.rb:900
-#| msgid "Server name cannot be empty."
+#: src/include/crowbar/complex.rb:888
msgid "User name cannot be empty."
msgstr "用户名不能为空。"

#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -321,7 +298,7 @@
"请重试。"

#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
msgid ""
"User '%1' already exists.\n"
"Choose a different name."
@@ -330,17 +307,17 @@
"请选择一个不同的名称。"

#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
msgid "The interface format '%1' is not valid"
msgstr "接口格式 '%1' 无效。"

#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr "已禁用"

#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
msgid ""
"The netmask '%1' is invalid.\n"
"%2"
@@ -350,7 +327,7 @@

#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
msgid ""
"The IP address '%1' is invalid.\n"
"%2"
@@ -359,7 +336,7 @@
"%2"

#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
msgid ""
"The router address '%1' is invalid.\n"
"%2"
@@ -368,17 +345,17 @@
"%2"

#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
msgid "The router address '%1' is not part of network '%2'."
msgstr "路由器地址 '%1' 不是网络 '%2' 的一部分。"

#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
msgid "The IP address '%1' is not part of network '%2'."
msgstr "IP 地址 '%1' 不是网络 '%2' 的一部分。"

#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
msgid ""
"Some address ranges are not part of network '%1'.\n"
"Adapt them using 'Edit ranges' button."
@@ -387,66 +364,61 @@
"请使用 '编辑地址段' 按钮来调整它们。"

#. inputfield label
-#: src/include/crowbar/complex.rb:1335
+#: src/include/crowbar/complex.rb:1326
msgid "Min IP Address"
msgstr "最小 IP 地址"

#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
msgid "Max IP Address"
msgstr "最大 IP 地址"

-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
msgid "The address '%1' is not part of network '%2'."
msgstr "地址 '%1' 不是网络 '%2' 的一部分。"

#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
msgid "The lowest address must be lower than the highest one."
msgstr "最低地址必须低于最高地址。"

#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr "地址段 '%1' 和 '%2' 有重叠。"

#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
msgid "&User Settings"
msgstr "用户设置(&U)"

#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid ""
"If no user is present, user 'crowbar' with default password will be used."
msgstr "若没有用户则将使用 'crowbar' 用户和默认密码。"

#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
msgid "N&etwork Mode"
msgstr "网络模式(&e)"

-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
msgid "Bastion Network"
msgstr "堡垒网络"

#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
msgid "Net&works"
msgstr "网络(&w)"

#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
msgid "Re&positories"
msgstr "软件源(&p)"

#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
-#| msgid ""
-#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
-#| "currently not supported.\n"
-#| "\n"
-#| "You can visit the Crowbar web UI on http://%1:3000/";
+#: src/include/crowbar/complex.rb:1722
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -458,7 +430,7 @@
"您可通过 http://%1:3000/ 访问 Crowbar 网页界面"

#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
msgid "Crowbar Configuration Overview"
msgstr "Crowbar 配置概览"

@@ -491,11 +463,6 @@

#. Ovreview dialog help
#: src/include/crowbar/helps.rb:49
-#| msgid ""
-#| "<p>\n"
-#| "See the SUSE Cloud deployment guide for details on the network\n"
-#| "configuration and on using this YaST module.\n"
-#| "</p>"
msgid ""
"<p>\n"
"See the product deployment guide for details on the network\n"
@@ -517,41 +484,47 @@
msgstr "正在初始化..."

#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
msgid "Initializing crowbar Configuration"
msgstr "正在初始化 Crowbar 配置"

#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
msgid "Read the configuraton"
msgstr "读取配置"

#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr "正在读取配置..."

#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr "已完成"

#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
msgid "Saving crowbar Configuration"
msgstr "正在保存 Crowbar 配置"

#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr "写入设置"

#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr "正在写入设置..."

+#~ msgid "Common for All"
+#~ msgstr "全部通用"
+
+#~ msgid "SLES 12"
+#~ msgstr "SLES 12"
+
#~ msgid "Password for Crowbar Administrator"
#~ msgstr "Crowbar 系统管理员密码"


Modified: trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -6,21 +6,21 @@
# Xinwei Hu <xwhu@xxxxxxxxxx>, 2004.
# James Su <suzhe@xxxxxxxxxxxxxxx>, 2004.
# Novell Language <language@xxxxxxxxxx>, 2004, 2005, 2012.
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014, 2016.
msgid ""
msgstr ""
"Project-Id-Version: dhcp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
-"PO-Revision-Date: 2014-08-23 02:05+0800\n"
-"Last-Translator: 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese Simplified <kde-i18n-doc@xxxxxxx>\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-05 16:30+0800\n"
+"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"

#. command line help text for DHCP server module
#: src/include/dhcp-server/commandline.rb:25
@@ -63,9 +63,7 @@
msgstr "管理 DHCP 子网选项"

#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr "列出所有具有固定地址的已定义的主机"

@@ -105,242 +103,247 @@
msgstr "具有固定地址的主机的 IP 地址(或主机名)"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
msgid "Select the network interface to use"
msgstr "选择要使用的网络接口"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr "输出当前使用的接口并列出其它可用的接口"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
msgid "Print current options"
msgstr "输出当前选项"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
msgid "Set a global option"
msgstr "设置全局选项"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr "选项键(例如,ntp-servers)"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
msgid "Option value (for example, IP address)"
msgstr "选项键(例如,IP 地址)"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr "动态地址指派范围中最低的 IP 地址"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr "动态地址指派范围中最高的 IP 地址"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
msgid "Default lease time in seconds"
msgstr "默认租用时间(以秒为单位)"

#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
msgid "Maximum lease time in seconds"
msgstr "最长租用时间(以秒为单位)"

#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
msgid "DHCP server is enabled"
msgstr "DHCP 服务器已启用"

#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
msgid "DHCP server is disabled"
msgstr "DHCP 服务器已禁用"

#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
msgid "Host: %1"
msgstr "主机:%1"

#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
msgid "Hardware: %1"
msgstr "硬件:%1"

#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
msgid "IP Address: %1"
msgstr "IP 地址:%1"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
msgid "Hostname not specified."
msgstr "未指定主机名。"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
msgid "Specified host does not exist."
msgstr "指定的主机不存在。"

#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "无"

#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
msgid "Selected Interfaces: %1"
msgstr "所选的接口:%1"

#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
msgid "Other Interfaces: %1"
msgstr "其它接口:%1"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
msgid "Specified interface does not exist."
msgstr "指定的接口不存在。"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
msgid "Operation with the interface not specified."
msgstr "未指定对接口的操作。"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
msgid "Option key must be set."
msgstr "必须设置选项键。"

#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
msgid "Value must be set."
msgstr "必须设置值。"

#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
msgid "Address Range: %1-%2"
msgstr "地址范围:%1-%2"

#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
msgid "Default Lease Time: %1"
msgstr "默认租用时间:%1"

#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
msgid "Maximum Lease Time: %1"
msgstr "最长租用时间:%1"

#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr "保存配置失败。是否更改设置?"

+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+msgid "Saving the configuration failed"
+msgstr "保存配置失败"
+
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
msgid "DHCP Server Configuration"
msgstr "DHCP 服务器配置"

#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
msgid "Global Options"
msgstr "全局选项"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
msgid "Subnet Configuration"
msgstr "子网配置"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
msgid "Host with Fixed Address"
msgstr "具有固定地址的主机"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Shared Network"
msgstr "共享网络"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
msgid "Pool of Addresses"
msgstr "地址池"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
msgid "Group-Specific Options"
msgstr "特定于组的选项"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "类"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr "子网(&S)"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
msgid "&Host"
msgstr "主机(&H)"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr "共享网络(&N)"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "组(&G)"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
msgid "&Pool of Addresses"
msgstr "地址池(&P)"

#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "类(&C)"

#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr "声明类型"

#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
msgid "Declaration Type"
msgstr "声明类型"

#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
msgid "Interface Configuration"
msgstr "接口配置"

#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr "合约签名(TSIG) 密钥管理"

@@ -365,251 +368,212 @@
msgstr "秒"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
msgid "DHCP Server: Start-Up"
msgstr "DHCP 服务器:启动"

#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
msgid "Start-Up"
msgstr "启动"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
msgid "DHCP Server: Card Selection"
msgstr "DHCP 服务器:卡选择"

#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
msgid "Card Selection"
msgstr "卡选择"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
msgid "DHCP Server: Global Settings"
msgstr "DHCP 服务器:全局设置"

#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
msgid "Global Settings"
msgstr "全局设置"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
msgid "DHCP Server: Dynamic DHCP"
msgstr "DHCP 服务器:动态 DHCP"

#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
msgid "Dynamic DHCP"
msgstr "动态 DHCP"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
msgid "DHCP Server: Host Management"
msgstr "DHCP 服务器:主机管理"

#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
msgid "Host Management"
msgstr "主机管理"

#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
msgid "DHCP Server: Expert Settings"
msgstr "DHCP 服务器:专家设置"

#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
msgid "Expert Settings"
msgstr "专家设置"

#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
msgid "When &Booting"
msgstr "引导时(&B)"

#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
msgid "&Manually"
msgstr "手动(&M)"

#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
msgid "When Booting"
msgstr "引导时"

#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "手动"

-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
-msgid "DHCP server is running"
-msgstr "DHCP 服务器正在运行"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-msgid "DHCP server is not running"
-msgstr "DHCP 服务器未运行"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-msgid "&Start DHCP Server Now"
-msgstr "立即启动 DHCP 服务器(&S)"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-msgid "S&top DHCP Server Now"
-msgstr "立即停止 DHCP 服务器(&T)"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "立即保存设置并重启 DHCP 服务器(&N)"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-msgid "Start DHCP Server Now"
-msgstr "立即启动 DHCP 服务器"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-msgid "Stop DHCP Server Now"
-msgstr "立即停止 DHCP 服务器"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "立即保存设置并重启 DHCP 服务器"
-
-#: src/include/dhcp-server/dialogs2.rb:371
+#: src/include/dhcp-server/dialogs2.rb:334
msgid "DHCP Server Start-up Arguments"
msgstr "DHCP 服务器启动参数"

#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
msgid "Network Cards for DHCP Server"
msgstr "DHCP 服务器的网卡"

#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
msgid "Selected"
msgstr "已选择"

#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
msgid "Interface Name"
msgstr "接口名"

#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
msgid "Device Name"
msgstr "设备名"

#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
msgid "IP"
msgstr "IP"

#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
msgid "&Select"
msgstr "选择(&S)"

#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
msgid "&Deselect"
msgstr "取消选择(&D)"

#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
msgid "DHCP address"
msgstr "DHCP 地址"

#. TRANSLATORS: popup error, DHCP Server needs to run on one or more
interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
msgid "At least one network interface must be selected."
msgstr "至少必须选择一个网络接口。"

#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: 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 地址和网关)。"

#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
msgid "&LDAP Support"
msgstr "&LDAP 支持"

#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
msgid "DHCP Server &Name (optional)"
msgstr "DHCP 服务器名称(可选)(&N)"

#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
msgid "&Domain Name"
msgstr "域名(&D)"

#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
msgid "&Primary Name Server IP"
msgstr "主名称服务器 IP(&P)"

#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
msgid "&Secondary Name Server IP"
msgstr "次名称服务器 IP(&S)"

#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
msgid "Default &Gateway (Router) "
msgstr "默认网关(路由)(&G) "

#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
msgid "NTP &Time Server"
msgstr "NTP 时间服务器(&T)"

#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
msgid "&Print Server"
msgstr "打印服务器(&P)"

#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
msgid "&WINS Server"
msgstr "WINS 服务器(&W)"

#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
msgid "Default &Lease Time"
msgstr "默认租用时间(&L)"

#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr "单位(&U)"

@@ -617,48 +581,48 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
msgid "The specified value is not a valid hostname or IP address."
msgstr "指定的值不是有效的主机名或 IP 地址。"

#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
msgid "Subnet Information"
msgstr "子网信息"

#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
msgid "Current &Network"
msgstr "当前网络(&N)"

#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
msgid "Current Net&mask"
msgstr "当前网络掩码(&M)"

#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
msgid "Netmask Bi&ts"
msgstr "掩码位(&T)"

#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
msgid "Min&imum IP Address"
msgstr "最小 IP 地址(&I)"

#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
msgid "Ma&ximum IP Address"
msgstr "最大 IP 地址(&X)"

-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
msgid "IP Address Range"
msgstr "IP 地址范围"

@@ -666,10 +630,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
msgid "&First IP Address"
msgstr "第一个 IP 地址(&F)"

@@ -677,61 +641,61 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
msgid "&Last IP Address"
msgstr "最后一个 IP 地址(&L)"

#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr "允许动态 BOOTP(&B)"

#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
msgid "Lease Time"
msgstr "租用时间"

#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
msgid "&Default"
msgstr "默认值(&D)"

#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
msgid "&Maximum"
msgstr "最大值(&M)"

#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr "单位(&T)"

#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
msgid "Create New DNS Zone from Scratch"
msgstr "从头创建新的 DNS 区域"

-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
msgid "Edit Current DNS Zone"
msgstr "编辑当前 DNS 区域"

#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
msgid "Get Current Zone Information"
msgstr "获取当前区域信息"

-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
msgid "&Synchronize DNS Server..."
msgstr "同步 DNS 服务器(&S)..."

#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -741,8 +705,8 @@

#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr "请输入 IP 地址范围两端的值。"

@@ -750,137 +714,138 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: 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"
"IP %1 与网络 %2/%3 不匹配。"

#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
msgid "Registered Host"
msgstr "已注册的主机"

#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "名称"

#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
msgid "Hardware Address"
msgstr "硬件地址"

#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "类型"

#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
msgid "List Setup"
msgstr "列表设置"

#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "名称(&N)"

#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
msgid "&IP Address"
msgstr "IP 地址(&I)"

#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
msgid "&Hardware Address"
msgstr "硬件地址(&H)"

#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
msgid "&Ethernet"
msgstr "以太网(&E)"

-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
msgid "&Token Ring"
msgstr "令环牌(&T)"

#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
msgid "C&hange in List"
msgstr "在列表中更改(&H)"

#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "Dele&te from List"
msgstr "从列表中删除(&T)"

#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "以太网"

#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "令环牌"

#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
msgid "The hardware address is invalid.\n"
msgstr "硬件地址无效。\n"

#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
msgid "The hardware address must be unique."
msgstr "硬件地址必须是唯一的。"

#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
msgid "The hostname cannot be empty."
msgstr "主机名不能为空。"

#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
msgid "A host named %1 already exists."
msgstr "名为 %1 的主机已存在。"

#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
msgid "Enter a host IP."
msgstr "请输入主机 IP 地址。"

#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
msgid "The hardware address must be defined."
msgstr "必须定义硬件地址。"

#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
msgid "Select a host first."
msgstr "先选择一台主机。"

#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
msgid "The input value must be defined."
msgstr "必须定义输入值。"

#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -900,19 +865,20 @@
"是否继续?"

#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr "“-%1”不是有效的 DHCP 服务器命令行选项"

-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr "DHCP 服务器命令行选项“-%1”需要参数"

-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
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"
@@ -927,7 +893,7 @@
"确实要继续?\n"

#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
msgid "DHCP Server Wizard (%1 of 4)"
msgstr "DHCP 服务器向导 (第 %1 步/共 4 步)"

@@ -940,7 +906,8 @@
"<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"
@@ -980,7 +947,8 @@
#: 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"
@@ -1018,7 +986,8 @@
"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"
@@ -1029,7 +998,8 @@
#: 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 ""
@@ -1055,7 +1025,8 @@
"<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"
@@ -1151,10 +1122,13 @@
"<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"
@@ -1163,7 +1137,8 @@
"要将 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: $[
@@ -1216,7 +1191,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
msgid "The last IP address must be higher than the first one."
msgstr "最后一个 IP 地址必须高于第一个。"

@@ -1243,7 +1218,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname
description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname
description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
msgid "Invalid hostname."
msgstr "主机名无效。"

@@ -1254,9 +1229,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
msgid "Invalid IP address."
msgstr "无效的 IP 地址。"

@@ -1274,44 +1249,44 @@
"允许的 IP 地址范围 (%2-%3) 之内。\n"

#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
msgid "Regenerating DNS zone entries..."
msgstr "正在重新生成 DNS 区域条目..."

#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
msgid "Adding a New DNS Record"
msgstr "添加新 DNS 记录"

#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "主机名(&H)"

#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr "正在向 DNS 服务器添加 DHCP 范围 %1 - %2..."

#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Removing DNS Records Matching Range"
msgstr "正在去除 DNS 记录匹配范围"

#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr "正在从 DNS 服务器去除范围 %1 - %2 中的记录..."

#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
@@ -1320,7 +1295,7 @@
"DNS 服务器无法向其写入任何记录。\n"

#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1330,18 +1305,18 @@

#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
msgid "Cannot create zone %1."
msgstr "无法创建区域 %1。"

#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr "正在同步 DNS 反向记录..."

#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
@@ -1350,62 +1325,62 @@
"确实取消此操作?\n"

#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "域(&D)"

#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Network"
msgstr "网络(&N)"

#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "网络掩码(&M)"

#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
msgid "DNS Zone Records"
msgstr "DNS 区域记录"

#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
msgid "Hostname"
msgstr "主机名"

#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr "分配的 IP"

#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
msgid "&Add..."
msgstr "添加(&A)..."

#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
msgid "&Special Tasks"
msgstr "特殊任务(&S)"

#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr "添加新的 DNS 记录范围"

#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr "运行向导,从头重写 DNS 区域"

#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr "与反向区域 %1 同步"

#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
msgid "DHCP Server: DNS Server Synchronization"
msgstr "DHCP 服务器:DNS 服务器同步"

@@ -1442,7 +1417,8 @@
#: 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"
@@ -1701,8 +1677,7 @@
"请稍候...</p>"

#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1729,20 +1704,9 @@
"此选项仅当启用了防火墙\n"
"时才可用。</p>"

-#. help text 1/5
+#. help text 2/5
#: src/include/dhcp-server/helps.rb:39
msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>DHCP 服务器</big></b></p>\n"
-"<p>要在每次启动计算机时运行 DHCP 服务器,请设置\n"
-"<b>启动 DHCP 服务器</b>。</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1754,7 +1718,7 @@
"会更安全,强烈建议采用此方法。</p>"

#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1765,7 +1729,7 @@
"请启用 <b>LDAP 支持</b>。</p>"

#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1780,7 +1744,7 @@
"要删除声明,请选择该声明,然后单击<b>删除</b>。</p>"

#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1794,7 +1758,7 @@
"或者管理用于认证动态 DNS 更新的 TSIG 密钥。</p>"

#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
@@ -1803,7 +1767,7 @@
"设置子网的<b>网络地址</b>和<b>网络掩码</b>。</p>"

#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1814,7 +1778,7 @@
"其它特殊选项。</p>"

#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1827,7 +1791,7 @@
"不影响 DHCP 服务器的行为。</p>"

#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1840,7 +1804,7 @@
"不影响 DHCP 服务器的行为。</p>"

#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1853,7 +1817,7 @@
"不影响 DHCP 服务器的行为。</p>"

#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
@@ -1862,7 +1826,7 @@
"在<b>类名称</b>中设置主机类的名称。</p>"

#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
msgid ""
"<p>\n"
"To edit DHCP options, choose the appropriate\n"
@@ -1877,7 +1841,7 @@
"请先选择该选项,然后单击<b>删除</b>。</p>"

#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
@@ -1886,7 +1850,7 @@
"要调整此子网中主机的动态 DNS,请使用<b>动态 DNS</b>。</p>"

#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1897,7 +1861,7 @@
"<b>对此子网启用动态 DNS</b>。</p>"

#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1912,7 +1876,7 @@
"的密钥。</p>"

#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1925,11 +1889,12 @@
"<b>更新全局动态 DNS 设置</b>。</p>"

#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
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"
@@ -1938,11 +1903,13 @@
"则可以不填写这些字段。</p>"

#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: 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"
@@ -1951,16 +1918,17 @@
"请参考 dhcpd 手册页。如果保留为空,将使用默认值。</p>"

#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: 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.</p>\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"

#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -1969,7 +1937,7 @@
"(dhcpServer LDAP 对象的名称),如果它和主机名不一样。\n"

#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1979,7 +1947,7 @@

#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
@@ -1988,7 +1956,7 @@
"向客户机租用的 IP 所对应的域。</p>"

#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -1999,7 +1967,7 @@
"这些值必须是 IP 地址。</p>"

#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
@@ -2008,7 +1976,7 @@
"插入客户机的路由表。</p>"

#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
@@ -2017,12 +1985,13 @@
"进行时间同步。</p>"

#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
-msgid "<p><b>Print Server</b> offers this server as the default print
server.</p>"
+#: src/include/dhcp-server/helps.rb:183
+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
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
@@ -2031,16 +2000,17 @@
"(Windows 因特网命名服务)提供。</p>"

#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: 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"
"在此之后客户机必须再申请一个 IP。</p>"

#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -2053,11 +2023,12 @@
"</p>\n"

#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
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"
@@ -2070,7 +2041,7 @@
"适用于 BOOTP 客户机,请勾选<b>允许动态 BOOTP</b>项</p>。\n"

#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2081,7 +2052,7 @@
"它用来设置刷新客户机 IP 地址的最佳时间。<br></p>"

#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
@@ -2090,7 +2061,7 @@
"的最长时间。</p>"

#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -2101,7 +2072,7 @@
"<b>输入 DHCP 服务器专家配置</b>。</p>"

#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
"Use this dialog to edit hosts with static address binding.</p>"
@@ -2110,7 +2081,7 @@
"使用此对话框可编辑有静态地址联结的主机。</p>"

#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2125,17 +2096,17 @@
"更改所有值,然后单击<b>在列表中更改</b>。</p>"

#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr "<p>要删除某主机,请先选择该主机,然后单击<b>从列表中删除</b>。</p>"

#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>Select the type of declaration to add.</p>"
msgstr "<p>选择要添加的声明的类型。</p>"

#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
@@ -2144,7 +2115,7 @@
"请选择<b>子网</b>。</p>"

#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
@@ -2153,7 +2124,7 @@
"(通常为固定地址),请选择<b>主机</b>。</p>"

#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2162,7 +2133,7 @@
",请选择<b>共享网络</b>。</p>"

#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
@@ -2171,7 +2142,7 @@
"请选择<b>组</b>。</p>"

#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2182,7 +2153,7 @@
"请选择<b>地址池</b>。</p>"

#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2195,23 +2166,23 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
msgid "A&ddresses"
msgstr "地址(&D)"

#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
msgid "The entered address is not valid."
msgstr "输入的地址无效。"

#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
msgid "At least one address must be specified."
msgstr "必须至少指定一个地址。"

@@ -2221,94 +2192,94 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
msgid "&Values"
msgstr "值(&V)"

#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
msgid "The entered addresses are not valid."
msgstr "输入的地址无效。"

#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
msgid "At least one address pair must be specified."
msgstr "必须至少指定一个地址对。"

#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "开"

#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "关"

#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
msgid "A value must be specified."
msgstr "必须指定一个值。"

#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
msgid "&New Address"
msgstr "新建地址(&N)"

#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
msgid "&New Value"
msgstr "新建值(&N)"

#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
msgid "Separate multiple addresses with spaces."
msgstr "使用空格分隔多个地址。"

#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr "添加地址对(&A)"

#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr "最低地址必须低于最高地址。"

#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr "如果对此进行更改,还应更新系统日志配置。"

#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr "硬件类型(&H)"

#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
msgid "&MAC Address"
msgstr "MAC 地址(&M)"

#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
msgid "&Lowest IP Address"
msgstr "最低 IP 地址(&L)"

#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
msgid "&Highest IP Address"
msgstr "最高 IP 地址(&H)"

#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
@@ -2317,7 +2288,7 @@
"所有更改都将丢失。确实要退出吗?"

#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2328,7 +2299,7 @@
"是否继续?"

#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2339,7 +2310,7 @@
"请运行 YaST 防火墙配置,将它们指定给某个区域。"

#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2349,8 +2320,8 @@

#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2358,199 +2329,188 @@
"此功能在准备自动\n"
"安装期间不可用。"

-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-msgid "Restart DHCP Server"
-msgstr "重启 DHCP 服务器"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-msgid "Save Settings and Restart DHCP Server"
-msgstr "保存设置并重启 DHCP 服务器"
-
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
msgid "&Configured Declarations"
msgstr "已配置的声明(&C)"

#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr "动态 DNS(&D)"

#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
msgid "Forward Zone TSIG &Key"
msgstr "正向区域 TSIG 密钥(&K)"

#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
msgid "Reverse Zone TSIG &Key"
msgstr "反向区域 TSIG 密钥(&K)"

#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
msgid "Select File with Authentication Key"
msgstr "选择含有验证密钥的文件"

-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-msgid "&Start DHCP Server"
-msgstr "启动 DHCP 服务器(&S)"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr "应用修改"

#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr "在 Chroot 囚牢中运行 DHCP 服务器(&R)"

-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "高级(&V)"

#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
msgid "Display &Log"
msgstr "显示日志(&L)"

#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
msgid "&Interface Configuration"
msgstr "接口配置(&I)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
msgid "&Network Address"
msgstr "网络地址(&N)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
msgid "Network &Mask"
msgstr "网路掩码(&M)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "组名(&N)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr "池名称(&N)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr "共享网络名称(&N)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr "类名称(&N)"

#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
msgid "Available Interfaces"
msgstr "可用接口"

#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
msgid "Open &Firewall for Selected Interfaces"
msgstr "针对所选接口打开防火墙(&F)"

#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr "对此子网启用动态 DNS(&E)"

#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
msgid "&Update Global Dynamic DNS Settings"
msgstr "更新全局动态 DNS 设置(&U)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr "区域(&Z)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
msgid "&Primary DNS Server"
msgstr "主 DNS 服务器(&P)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr "反向区域(&V)"

#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
msgid "Pr&imary DNS Server"
msgstr "主 DNS 服务器(&I)"

#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
msgid "DHCP Server &Expert Configuration..."
msgstr "DHCP 服务器专家配置(&E)..."

#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
msgid "Initializing DHCP Server Configuration"
msgstr "初始化 DHCP 服务器配置"

#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "检查环境"

#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
msgid "Read firewall settings"
msgstr "读取防火墙设置"

#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
msgid "Read DHCP server settings"
msgstr "读取 DHCP 服务器设置"

#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
msgid "Read DNS server settings"
msgstr "读取 DNS 服务器设置"

#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
msgid "Checking the environment..."
msgstr "正在检查环境..."

#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
msgid "Reading firewall settings..."
msgstr "正在读取防火墙设置..."

#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
msgid "Reading DHCP server settings..."
msgstr "正在读取 DHCP 服务器设置..."

#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
msgid "Reading DNS server settings..."
msgstr "正在读取 DNS 服务器设置..."

#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "已完成"

#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2566,102 +2526,102 @@
" \n"
"现在正在中止。"

-#. error report
-#: src/modules/DhcpServer.pm:1475
+#. error report
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
msgstr "不能确定主机名。基于 LDAP 的DHCP 服务器配置将不可用。"

#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
msgstr "DHCP 服务器似乎尚未配置。是否创建新配置?"

#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
msgid "Saving DHCP Server Configuration"
msgstr "正在保存 DHCP 服务器配置"

#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
msgid "Write DHCP server settings"
msgstr "写入 DHCP 服务器设置"

#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "写入防火墙设置"

#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
msgid "Restart DHCP server"
msgstr "重启 DHCP 服务器"

#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
msgid "Write DNS server settings"
msgstr "写入 DNS 服务器设置"

#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
msgid "Writing DHCP server settings..."
msgstr "正在写入 DHCP 服务器设置..."

#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."

#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
msgid "Restarting DHCP server..."
msgstr "正在重启 DHCP 服务器..."

#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
msgid "Writing DNS server settings..."
msgstr "正在写入 DNS 服务器设置..."

#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
msgid "Error occurred while restarting the DHCP daemon."
msgstr "重新启动 DHCP 守护精灵时出错。"

#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr "在引导时启动 DHCP 服务器"

#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr "在引导时不启动 DHCP 服务器"

#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
msgid "Listen On: %1"
msgstr "监听:%1"

#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
msgid "Dynamic Address Range: %1"
msgstr "动态地址范围:%1"

#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "LDAP 配置无效。无法使用 LDAP。"

#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr "没有实施对多 dhcpServiceDN 的支持。"

#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
msgid "DHCP service DN is not defined."
msgstr "未定义 DHCP 服务 DN。"

@@ -2669,27 +2629,69 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
msgid "Error occurred while creating %1."
msgstr "创建 %1 时出错。"

-#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#. error report, %1 is LDAP record key
+#: src/modules/DhcpServer.pm:2754
msgid "Error occurred while updating %1."
msgstr "更新 %1 时出错。"

#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "创建 cn=%2、ou=DHCP 的 %1 时出错。"

#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "写入 /etc/dhcpd.conf 时出错。"

+#~ msgid "DHCP server is running"
+#~ msgstr "DHCP 服务器正在运行"
+
+#~ msgid "DHCP server is not running"
+#~ msgstr "DHCP 服务器未运行"
+
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "立即启动 DHCP 服务器(&S)"
+
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "立即停止 DHCP 服务器(&T)"
+
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "立即保存设置并重启 DHCP 服务器(&N)"
+
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "立即启动 DHCP 服务器"
+
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "立即停止 DHCP 服务器"
+
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "立即保存设置并重启 DHCP 服务器"
+
#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>DHCP 服务器</big></b></p>\n"
+#~ "<p>要在每次启动计算机时运行 DHCP 服务器,请设置\n"
+#~ "<b>启动 DHCP 服务器</b>。</p>"
+
+#~ msgid "Restart DHCP Server"
+#~ msgstr "重启 DHCP 服务器"
+
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "保存设置并重启 DHCP 服务器"
+
+#~ msgid "&Start DHCP Server"
+#~ msgstr "启动 DHCP 服务器(&S)"
+
+#~ msgid ""
#~ "IP address %1 does not match\n"
#~ "the current network %2/%3\n"
#~ msgstr ""

Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-06-03 15:03:18 UTC (rev 95899)
+++ trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-06-05 16:43:05 UTC (rev 95900)
@@ -9,10 +9,10 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
-"PO-Revision-Date: 2016-03-03 22:37+0800\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-06 00:02+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -229,229 +229,240 @@
"\t\t"

#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>分布式复制块设备 (DRBD) 资源配置</big></b></p>"

#: 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
-#| 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. Or either omit the name or minor and the
minor number. If you omit the name a default of /dev/drbdminor 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"
+#, 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>\"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"
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 编号'。<"
-"/p>\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>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。"
+"主机名中不应包含 \".\"。</p>\n"
+"\t\t<p>\"地址:端口\":一个资源针对每个设备都需要一个 IP 地址,用于等待来自父"
+"设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口,用于连"
+"接到节点的父设备。</p>\n"
+"\t\t<p>\"设备\":所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中"
+"您必须使用此设备,而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要"
+"么省略名称,要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/"
+"drbd'minor 编号'。</p>\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"

-#: src/include/drbd/helps.rb:88
+#: 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:112
-#| msgid "<p><b><big>Connection Configuration</big></b></p>"
+#: src/include/drbd/helps.rb:113
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>LVM 配置</big></b></p>"

-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
+#, fuzzy
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.</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"
+"\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."
-" Disable cache when for network storage, like nfs. </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"
+"\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 缓存是默认的。当使用网络存储如 NFS 时请禁用缓存。</p>\n"
+"\t\t<p><b>LVM 缓存</b>:启用/开启写入 LVM 缓存是默认的。当使用网络存储如 NFS "
+"时请禁用缓存。</p>\n"
"\n"
"\t\t"

-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>分布式复制块设备 (DRBD) 全局配置</big></b></p>"

-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid ""
-"<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's"
-" sanity check</p>"
+"<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:136
+#: 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:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -460,11 +471,12 @@
" as configured mentioned in this file. </p>"
msgstr ""
"<p><b>最少次数:</b>\n"
-" 若您想要稍后不用重新加载模块 就定义更多资源,请使用此选项。\n"
+" 若您想要稍后不用重新加载模块 就定义更多资源,请使用此"
+"选项。\n"
" 默认在加载模块时会加载此文件 中配置的全部设备。</p>"

#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
"Configure drbd here.<br></p>\n"
@@ -473,7 +485,7 @@
"在此配置分布式复制块设备 (DRBD)。<br></p>\n"

#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Choose an drbd from the list of detected drbds.\n"
@@ -486,7 +498,7 @@
"然后按<b>配置</b>。</p>\n"

#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -496,7 +508,7 @@
"您若按<b>编辑</b>,将打开另一个对话框,在其中您可修改相应配置。</p>\n"

#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
"Obtain an overview of installed drbds. Additionally\n"
@@ -507,7 +519,7 @@
"此外,还可编辑它们的配置。<br></p>\n"

#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Press <b>Add</b> to configure a drbd.</p>"
@@ -516,7 +528,7 @@
"请按<b>添加</b>来配置一个分布式复制块设备。</p>"

#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"Choose a drbd to change or remove.\n"
@@ -527,7 +539,7 @@
"然后按需按<b>编辑</b>或<b>删除</b>。</p>\n"

#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -539,7 +551,7 @@

#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -550,7 +562,7 @@
" </p>"

#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -561,54 +573,107 @@
" <br></p>\n"

#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
-#| msgid "Configuration of DRBD"
+#: src/include/drbd/lvm_conf.rb:44
msgid "LVM Filter Configuration of DRBD"
msgstr "DRBD 的 LVM 过滤器配置"

-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr "自动修改 LVM 设备过滤器"

-#: src/include/drbd/lvm_conf.rb:54
-#| msgid "Device type"
+#: src/include/drbd/lvm_conf.rb:62
msgid "Device Filter"
msgstr "设备过滤器"

-#: src/include/drbd/lvm_conf.rb:64
-#| msgid "Writing the SCPM database..."
+#: src/include/drbd/lvm_conf.rb:72
msgid "Writing the LVM cache"
msgstr "正在写入 LVM 缓存..."

-#: src/include/drbd/lvm_conf.rb:73
-#| msgid "Enable Microphone."
+#: src/include/drbd/lvm_conf.rb:81
msgid "Enable LVM Cache"
msgstr "启用 LVM 缓存"

+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr "警告!使用分布式复制块设备应禁用 LVM 缓存。"
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr "为 LVM 使用 lvmetad"
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr "使用 LVM metad"
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr "警告!集群不应使用 lvmetad。"
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:143
msgid "Resource Name"
msgstr "资源名称"

-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:150
+msgid "Nodes"
+msgstr "节点"
+
+#: src/include/drbd/resource_conf.rb:153
+msgid "Add"
+msgstr "添加"
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Edit"
+msgstr "编辑"
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Delete"
+msgstr "删除"
+
+#: src/include/drbd/resource_conf.rb:187
+msgid "Save"
+msgstr "保存"
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:329
msgid "Protocol"
msgstr "协议"

+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:569
+msgid "OK"
+msgstr "好的"
+
+#: src/include/drbd/resource_conf.rb:570
+msgid "Cancel"
+msgstr "取消"
+
+#: src/include/drbd/resource_conf.rb:584
+msgid "Node name can not be empty."
+msgstr "节点名称不能为空。"
+
#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
-msgid "Node names must be different."
-msgstr "节点名称不能相同。"
-
-#: src/include/drbd/resource_conf.rb:578
+#: src/include/drbd/resource_conf.rb:687
msgid "Node names must not include \".\" , using the local hostname."
msgstr "节点名称必须不包含 \".\",使用本机主机名。"

-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:707
msgid "Please fill out all fields."
msgstr "请填写全部字段。"

+#: src/include/drbd/resource_conf.rb:716
+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
+msgid "Enter the node name:"
+msgstr "输入节点名称:"
+
+#: src/include/drbd/resource_conf.rb:757
+msgid "Node name must be different."
+msgstr "节点名称必须不同。"
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar@xxxxxxx>
@@ -619,7 +684,6 @@
msgstr "引导时"

#: src/include/drbd/startup_conf.rb:37
-#| msgid "On -- Start DRBD Server Now and when Booting"
msgid "On -- Start DRBD Server when Booting"
msgstr "开 -- 引导时启动 DRBD"

@@ -711,73 +775,70 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:115
msgid "Failed to merge separated DRBD conf files\n"
msgstr "合并独立的 DRBD 配置文件失败\n"

-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:137
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr "写入 drbd.conf.YaST2prepare 失败"

#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:192
msgid "Initializing DRBD Configuration"
msgstr "正在初始化分布式复制块设备 (DRBD) 配置"

#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:200
msgid "Read global settings"
msgstr "读取全局设置"

-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:201
msgid "Read resources"
msgstr "读取资源"

-#: src/modules/Drbd.rb:195
-#| msgid "LVM configuration"
+#: src/modules/Drbd.rb:202
msgid "Read LVM configurations"
msgstr "读取 LVM 配置"

-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:203
msgid "Read daemon status"
msgstr "读取守护程序状态"

-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
-#| msgid "Read Firewall Settings."
+#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
msgid "Read SuSEFirewall Settings"
msgstr "读取 SuSEFirewall 设置。"

-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:207
msgid "Reading global settings..."
msgstr "正在读取全局设置..."

-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:208
msgid "Reading resources..."
msgstr "正在读取资源..."

-#: src/modules/Drbd.rb:202
-#| msgid "Reading the configuration..."
+#: src/modules/Drbd.rb:209
msgid "Reading LVM configurations..."
msgstr "正在读取 LVM 配置..."

-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:210
msgid "Reading daemon status..."
msgstr "正在读取守护程序状态..."

-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
msgid "Finished"
msgstr "已完成"

#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:515
msgid "Failed to backup drbd.conf"
msgstr "备份 drbd.conf 失败"

-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:524
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr "清理 drbd.conf 以进行 drbdadm 测试失败"

-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:548
msgid ""
"Invalid configuration of resource %1\n"
"%2"
@@ -785,12 +846,12 @@
"无效的资源配置 %1\n"
"%2"

-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:567
msgid "Failed to bring drbd.conf back"
msgstr "恢复 drbd.conf 失败"

#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:638
msgid "Writing DRBD Configuration"
msgstr "正在写入分布式复制块设备 (DRBD) 配置"

@@ -798,51 +859,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:617
+#: src/modules/Drbd.rb:650
msgid "Write global settings"
msgstr "写入全局设置"

-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:651
msgid "Write resources"
msgstr "写入资源"

-#: src/modules/Drbd.rb:619
-#| msgid "Write configuration"
+#: src/modules/Drbd.rb:652
msgid "Write LVM configurations"
msgstr "写入 LVM 配置"

-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:653
msgid "Set daemon status"
msgstr "设置守护程序状态"

-#: src/modules/Drbd.rb:621
-#| msgid "Write the firewall settings"
+#: src/modules/Drbd.rb:654
msgid "Write the SuSEfirewall settings"
msgstr "写入 SuSEfirewall 设置"

-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:657
msgid "Writing global settings..."
msgstr "正在写入全局设置..."

-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:658
msgid "Writing resources..."
msgstr "正在写入资源..."

-#: src/modules/Drbd.rb:626
-#| msgid "Writing configuration..."
+#: src/modules/Drbd.rb:659
msgid "Writing LVM configurations..."
msgstr "正在写入 LVM 配置..."

-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:660
msgid "Setting daemon status..."
msgstr "正在设置守护程序状态..."

-#: src/modules/Drbd.rb:628
-#| msgid "Writing the firewall settings..."
+#: src/modules/Drbd.rb:661
msgid "Writing the SuSEFirewall settings"
msgstr "正在写入 SuSEFirewall 设置..."

-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:672
msgid "Failed to make directory /etc/drbd.d"
msgstr "创建文件夹 /etc/drbd.d 失败"


Modified: trunk/yast/zh_CN/po/geo-cluster.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -1,15 +1,15 @@
# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
# This file is distributed under the same license as the PACKAGE package.
#
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014, 2015.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
-"PO-Revision-Date: 2015-10-21 15:05+0800\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-05 23:46+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -60,10 +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:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: 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/wizards.rb:141
msgid "Geo Cluster Configuration"
msgstr "地理集群配置"
@@ -115,17 +113,17 @@
msgstr "仲裁主机"

#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:809
msgid "Add"
msgstr "添加"

#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:810
msgid "Edit"
msgstr "编辑"

#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:811
msgid "Delete"
msgstr "删除"

@@ -133,25 +131,24 @@
msgid "site"
msgstr "站点"

-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr "票据"

#: src/include/geo-cluster/dialogs.rb:106
-msgid "Authentification"
+msgid "Authentication"
msgstr "认证"

#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
msgid "Ca&ncel"
msgstr "取消(&n)"

#. return `cancel or a string
#: src/include/geo-cluster/dialogs.rb:109
-#: src/include/geo-cluster/dialogs.rb:157
-#: src/include/geo-cluster/dialogs.rb:177
-#: src/include/geo-cluster/dialogs.rb:254
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr "好"

@@ -160,177 +157,188 @@
msgstr "启用安全认证"

#: src/include/geo-cluster/dialogs.rb:128
-msgid "Authentification file"
+msgid "Authentication file"
msgstr "认证文件"

#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path
directly."
-msgstr "相对路径将被保存在 /etc/booth 中,或直接使用绝对路径。"
+msgid "The file will be written to /etc/booth."
+msgstr "文件将被写入到 /etc/booth。"

#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate
/etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
+msgstr "要写入到不同的文件夹,请输入一个绝对路径。"
+
+#: src/include/geo-cluster/dialogs.rb:142
+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:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other
node manually."
+#: src/include/geo-cluster/dialogs.rb:147
+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:146
-msgid "Generate Authentification Key File"
+#: src/include/geo-cluster/dialogs.rb:151
+msgid "Generate Authentication Key File"
msgstr "生成认证密钥文件"

-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
msgid "Basic"
msgstr "基础"

-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr "取消"

-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
msgid "Please enter a valid ip address"
msgstr "请输入一个有效的 IP 地址"

-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr "请输入票据和超时"

-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr "超时"

-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
msgid "retries"
msgstr "重试次数"

-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
msgid "weights"
msgstr "权重"

-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
msgid "expire"
msgstr "过期时间"

-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
msgid "acquire-after"
msgstr "acquire-after"

-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr "before-acquire-handler"

-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
msgid "timeout is invalid"
msgstr "超时无效"

-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
msgid "expire is invalid"
msgstr "过期时间无效"

-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
msgid "acquireafter is invalid"
msgstr "acquireafter 无效"

-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
msgid "retries is invalid"
msgstr "重试次数无效"

-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr "小于 3 的重试次数值是非法的"

-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
msgid "weights is invalid"
msgstr "权重无效"

-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
msgid "ticket can not be empty"
msgstr "票据不能为空"

#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:412 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:554
+#: src/include/geo-cluster/dialogs.rb:559
msgid "Enter an IP address of your arbitrator"
msgstr "请输入一个您的仲裁主机的 IP 地址"

-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:570
msgid "Edit IP address of your arbitrator"
msgstr "编辑您仲裁主机的 IP 地址"

-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:586
msgid "Enter an IP address of your site"
msgstr "请输入您站点的 IP 地址"

-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:597
msgid "Edit IP address of your site"
msgstr "编辑您站点的 IP 地址"

-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:619
msgid "Ticket name already exist!"
msgstr "票据名称已存在!"

-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:651
msgid "Configuration name can not be empty."
msgstr "配置名称不能为空。"

-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:654
msgid "Configuration name can not be duplicated."
msgstr "无法复制配置名称。"

#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:662
msgid "port is invalid!"
msgstr "端口无效!"

-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:668
msgid "transport have to be filled!"
msgstr "必须填写「传输」!"

#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:674
msgid "arbitrator have to be filled!"
msgstr "必须填写仲裁主机!"

-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:679
msgid "site have to be filled!"
msgstr "必须填写「站点」!"

-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:684
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:733
-msgid "Failed to create authentification file "
+#: src/include/geo-cluster/dialogs.rb:738
+msgid "Failed to create authentication file "
msgstr "创建认证文件失败"

-#: src/include/geo-cluster/dialogs.rb:736
-msgid "Succeed to created authentification file "
-msgstr "成功创建了认证文件 "
+#: src/include/geo-cluster/dialogs.rb:741
+msgid "Authentication file "
+msgstr "认证文件"

+#: src/include/geo-cluster/dialogs.rb:741
+msgid " created successfully."
+msgstr "创建成功。"
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:800
msgid "GeoCluster Configuration Select"
msgstr "地理集群配置选择"

#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:806
msgid "Choose configuration file:"
msgstr "请选择配置文件:"

#: src/include/geo-cluster/wizards.rb:47
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr "认证配置"

#. Initialization dialog contents
@@ -478,6 +486,14 @@
msgid "Configuration summary ..."
msgstr "配置摘要 ..."

+#~ msgid ""
+#~ "A relative path will be saved in /etc/booth, or using absolute path "
+#~ "directly."
+#~ msgstr "相对路径将被保存在 /etc/booth 中,或直接使用绝对路径。"
+
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "成功创建了认证文件 "
+
#~ msgid "site have to be filled"
#~ msgstr "必须填写「站点」"


Modified: trunk/yast/zh_CN/po/installation.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/installation.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/installation.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -7,15 +7,15 @@
# Novell Language <language@xxxxxxxxxx>, 2004, 2005.
# Thruth Wang <lihaow@xxxxxxxxx>, 2007.
# Eric Shan <ericalways@xxxxxxxxx>, 2008, 2012, 2013.
-# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014, 2015.
+# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
-"PO-Revision-Date: 2015-10-21 15:18+0800\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"PO-Revision-Date: 2016-06-06 00:08+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr "正在初始化..."

@@ -202,28 +202,28 @@
#. Text for confirmation popup before the update really starts 3/3
#. Text for confirmation popup before the update really starts 3/3
#: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222
-#: src/lib/installation/proposal_runner.rb:136
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>若您不确定请返回并检查设置。</p>"

#. Heading for confirmation popup before the update really starts
#. Heading for confirmation popup before the update really starts
#: src/include/installation/misc.rb:210
-#: src/lib/installation/proposal_runner.rb:124
+#: src/lib/installation/proposal_runner.rb:121
msgid "Confirm Update"
msgstr "确认更新"

#. Text for confirmation popup before the update really starts 1/3
#. Text for confirmation popup before the update really starts 1/3
#: src/include/installation/misc.rb:214
-#: src/lib/installation/proposal_runner.rb:128
+#: src/lib/installation/proposal_runner.rb:125
msgid "<p>Information required to perform an update is now complete.</p>"
msgstr "<p>现在已完成了执行更新所需的信息。</p>"

#. Text for confirmation popup before the update really starts 2/3
#. Text for confirmation popup before the update really starts 2/3
#: src/include/installation/misc.rb:216
-#: src/lib/installation/proposal_runner.rb:130
+#: src/lib/installation/proposal_runner.rb:127
msgid ""
"\n"
"<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -235,7 +235,7 @@
#. Label for the button that confirms startint the installation
#. Label for the button that confirms startint the installation
#: src/include/installation/misc.rb:225
-#: src/lib/installation/proposal_runner.rb:139
+#: src/lib/installation/proposal_runner.rb:136
msgid "Start &Update"
msgstr "开始更新(&U)"

@@ -263,8 +263,12 @@

#. 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>屏蔽设备</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
@@ -272,51 +276,7 @@
msgstr "正在屏蔽设备..."

#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr "若需要则生成 AutoYaST 方案..."
-
-#. TRANSLATORS: help text
-#: src/lib/installation/clients/clone_proposal.rb:39
-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>"
-msgstr ""
-"<p>若您想要创建一个 AutoYaST 方案请使用<b>复制系统设置</b>。\n"
-"AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
-"AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n"
-"若选择了此选项,将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</p>"
-
-#: src/lib/installation/clients/clone_proposal.rb:60
-msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
-msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗?"
-
-#. this is a heading
-#: src/lib/installation/clients/clone_proposal.rb:71
-msgid "Clone System Configuration"
-msgstr "复制系统配置"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-msgid "&Clone System Configuration"
-msgstr "复制系统配置(&C)"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only
visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a
href=\"%1\">do not write it</a>)."
-msgstr "AutoYaST 方案将被写入在 /root/autoinst.xml 下(<a href=\"%1\">不写入</a>)。"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only
visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr "将不会保存 AutoYaST 方案(<a href=\"%1\">写入</a>)。"
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:82
msgid "Copying files to installed system..."
msgstr "正在将文件复制到安装好的系统..."

@@ -344,7 +304,9 @@
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
@@ -356,7 +318,9 @@
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
@@ -365,11 +329,15 @@
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
@@ -395,7 +363,8 @@
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"
@@ -405,9 +374,12 @@
#: 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"
@@ -421,9 +393,13 @@
#. 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.</p>"
-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
@@ -506,7 +482,7 @@
msgstr "%1 的更新 %2"

#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:306
msgid "Unknown Product"
msgstr "未知产品"

@@ -535,52 +511,26 @@
"选择是否立即运行在线更新。\n"
"您可以跳过该步骤,稍后再运行在线更新。\n"

-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr "语言、键盘和许可协议"

-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: src/lib/installation/clients/inst_complex_welcome.rb:71
-#: src/lib/installation/clients/inst_release_notes.rb:217
-#: src/lib/installation/clients/inst_release_notes.rb:431
-msgid "&Language"
-msgstr "语言(&L)"
+#. In case of going back, Release Notes button may be shown, retranslate it
(bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 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_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:304
+msgid "Re&lease Notes..."
+msgstr "版本资讯(&L)..."

-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "键盘布局(&K)"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr "我同意许可条款。(&A)"
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-msgid "K&eyboard Test"
-msgstr "键盘测试(&e)"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "许可协议"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr "许可译文(&T)..."
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:169
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -593,11 +543,12 @@

#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:177
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"
@@ -606,7 +557,7 @@
"</p>\n"

#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -617,7 +568,7 @@
"</p>\n"

#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:190
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -629,7 +580,7 @@
"</p>\n"

#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:197
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -640,22 +591,48 @@
"您可以随时选择<b>中止</b>来中止安装进程。\n"
"</p>\n"

-#. In case of going back, Release Notes button may be shown, retranslate it
(bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: src/lib/installation/clients/inst_complex_welcome.rb:211
-#: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:302
-msgid "Re&lease Notes..."
-msgstr "版本资讯(&L)..."
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
+#: src/lib/installation/clients/inst_complex_welcome.rb:415
+msgid "License Agreement"
+msgstr "许可协议"

-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:237
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:431
+msgid "&Language"
+msgstr "语言(&L)"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:247
+msgid "&Keyboard Layout"
+msgstr "键盘布局(&K)"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:261
+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
msgid "You must accept the license to install this product"
msgstr "您必须接受许可才能安装本产品"

+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:406
+msgid "K&eyboard Test"
+msgstr "键盘测试(&e)"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:436
+msgid "License &Translations..."
+msgstr "许可译文(&T)..."
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
msgid "&Disable ZMD Service"
@@ -729,19 +706,24 @@
#: 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
@@ -753,7 +735,7 @@
msgstr "未安装 autoyast2 软件包。克隆已禁用。"

#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr "系统将立即重新引导..."

@@ -762,8 +744,8 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:109
+#: src/lib/installation/clients/inst_deploy_image.rb:354
#: src/lib/installation/clients/inst_prepareprogress.rb:110
#: src/lib/installation/clients/inst_prepareprogress.rb:152
msgid "Deploying Images..."
@@ -771,7 +753,7 @@

#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:170
msgid ""
"Deploying images has failed.\n"
"Aborting the installation...\n"
@@ -780,29 +762,30 @@
"正在中止安装...\n"

#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:202
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:375
+#: src/lib/installation/clients/inst_deploy_image.rb:378
msgid "Downloading image at speed %1/s"
msgstr "正在下载映像,速度:%1/秒"

-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:383
msgid "Downloading image %1 at speed %2/s"
msgstr "正在下载映像 %1,速度:%2/秒"

#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:445
msgid "Deploying image..."
msgstr "正在部署映像..."

-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:448
msgid "Deploying image %1..."
msgstr "正在部署映像 %1..."

@@ -820,42 +803,47 @@
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 "请选择将部署映像的磁盘。该磁盘上的全部数据均将被摧毁,磁盘将以映像中定义的方式被重新分区。"
+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
msgid "Hard Disk for Image Deployment"
msgstr "用于部署映像的硬盘"

#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
msgid "Detecting Available Controllers"
msgstr "正在检测可用控制器"

#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
msgid "Disk Activation"
msgstr "磁盘激活"

-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
msgid "Configure &DASD Disks"
msgstr "配置 &DASD 磁盘"

-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
msgid "Configure &ZFCP Disks"
msgstr "配置 &ZFCP 磁盘"

-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
msgid "Configure &FCoE Interfaces"
msgstr "配置以太网络光纤通道接口(&F)"

-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
msgid "Configure &iSCSI Disks"
msgstr "配置 &iSCSI 磁盘"

-#: src/lib/installation/clients/inst_disks_activate.rb:111
-msgid "Change Net&work Configuration"
-msgstr "修改网络配置(&W)"
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
+msgid "Net&work Configuration..."
+msgstr "网络配置(&w)..."

#. TRANSLATORS: dialog caption
#: src/lib/installation/clients/inst_doit.rb:56
@@ -873,7 +861,7 @@
#. bug #302384
#: src/lib/installation/clients/inst_download_release_notes.rb:134
#: src/lib/installation/clients/inst_initialization.rb:56
-#: src/lib/installation/clients/inst_installation_options.rb:152
+#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "正在初始化"

@@ -913,53 +901,53 @@
msgstr "正在创建要调用的收尾脚本列表..."

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:203
msgid "Copy files to installed system"
msgstr "复制文件到安装好的系统"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:210
msgid "Save configuration"
msgstr "保存配置"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:217
msgid "Save installation settings"
msgstr "保存安装设置"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:226
msgid "Install boot manager"
msgstr "安装引导管理器"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:233
msgid "Prepare system for initial boot"
msgstr "为首次引导准备系统"

#. merge steps from add-on products
#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#: src/lib/installation/clients/inst_finish.rb:337
msgid "Checking stage: %1..."
msgstr "正在检查阶段:%1..."

#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
+#: 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:445
+#: src/lib/installation/clients/inst_finish.rb:444
msgid " * %1"
msgstr " * %1"

#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
+#: src/lib/installation/clients/inst_finish.rb:481
msgid "Finished"
msgstr "已完成"

#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
+#: src/lib/installation/clients/inst_finish.rb:613
msgid "Installation Error"
msgstr "安装出错"

@@ -984,48 +972,53 @@
msgstr "正在准备初始系统配置..."

#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
msgid "Installation Options"
msgstr "安装选项"

#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr "在安装前添加在线软件源(&A)"

#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
msgid "In&clude Add-on Products from Separate Media"
msgstr "包括独立介质中的附加产品(&C)"

#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
msgid "<p><big><b>Installation Options</b></big></p>"
msgstr "<p><big><b>安装选项</b></big></p>"

#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
"<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:213
+#: 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:216
-msgid "<p>If you need specific hardware drivers for installation, see
<i>http://drivers.suse.com</i> site.</p>"
+#: 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>"
msgstr "<p>若您需要安装特种硬件驱动,请参考 <i>http://drivers.suse.com</i> 站点。</p>"

#. Error message
@@ -1080,7 +1073,8 @@
#: 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"
@@ -1097,23 +1091,31 @@
#. 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
@@ -1284,16 +1286,17 @@
msgstr "YaST 现在正在检测计算机硬件和已安装的系统。"

#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:242
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:254
+#: src/lib/installation/clients/inst_system_analysis.rb:256
msgid ""
"No hard disks were found for the installation.\n"
"Please check your hardware!\n"
@@ -1303,7 +1306,7 @@
"请检查您的硬件!\n"
"%1\n"

-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:266
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1314,7 +1317,7 @@
"(尤其是在 S/390 或 iSCSI 系统上)\n"

#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:277
msgid ""
"No hard disks and no hard disk controllers were\n"
"found for the installation.\n"
@@ -1326,7 +1329,7 @@
"%1\n"

#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:322
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1334,6 +1337,42 @@
"初始化软件源失败。\n"
"即将中止安装。"

+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:184
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+"无法找到有效更新自\n"
+"%s。\n"
+"\n"
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:190
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+"无法获取更新自 \n"
+"%s。\n"
+"\n"
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:215
+msgid ""
+"Downloading installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"Would you like to check your network configuration?"
+msgstr ""
+"从 %s\n"
+"下载安装器更新失败。\n"
+"\n"
+"您想要检查您的网络配置吗?"
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
msgid "Removed"
@@ -1385,8 +1424,8 @@
#. menu button
#. menu button
#: src/lib/installation/clients/inst_upgrade_urls.rb:247
-#: src/lib/installation/proposal_runner.rb:659
-#: src/lib/installation/proposal_runner.rb:783
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "修改(&C)..."

@@ -1399,7 +1438,8 @@
#: 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>"
@@ -1617,7 +1657,7 @@
msgstr "正在设置链接器超速缓存..."

#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
msgid "Saving network configuration..."
msgstr "正在保存网络配置..."

@@ -1744,58 +1784,47 @@
msgstr "正在收缩 PREP (PowerPC 参考平台) 分区..."

#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "真的全部重置为默认值吗?"

#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "您将丢失全部修改。"

-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-msgid "Location of Stored Configuration"
-msgstr "已存储配置位置"
-
-#. force write, so it always write profile even if user do not want
-#. to store profile after installation
-#: src/lib/installation/proposal_runner.rb:257
-msgid "Failed to store configuration. Details can be found in log."
-msgstr "存储配置失败。可在日志中找到细节。"
-
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "根据用户请求跳过配置"

#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
msgstr "提案存在一处错误,继续前必须解决掉它。\n"

#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
msgid "Adapting the proposal to the current settings..."
msgstr "正在调整提案到当前设置..."

#. busy message;
#. Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/proposal_runner.rb:398
-#: src/lib/installation/proposal_runner.rb:687
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "正在分析您的系统..."

#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr "错误:无提案"

#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1808,42 +1837,36 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "跳过配置(&S)"

#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "使用以下配置(&U)"

-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-msgid "&Export Configuration"
-msgstr "导出配置(&E)"
-
#. Help message between headline and installation proposal / settings summary.
#. May contain newlines, but don't make it very much longer than the original.
-#: src/lib/installation/proposal_runner.rb:713
+#: src/lib/installation/proposal_runner.rb:693
msgid "Click a headline to make changes or use the \"Change...\" menu below."
msgstr "点击任一标题或使用下面的 \"修改...\" 菜单进行修改。"

-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
msgid "Click a headline to make changes."
msgstr "点击标题作出修改。"

#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "重置为默认值(&R)"

#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Update"
msgstr "更新(&U)"

-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "安装(&I)"

@@ -1877,10 +1900,11 @@

#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: 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"
@@ -1890,7 +1914,7 @@
#. so update
#. Help text for update proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:425
+#: src/lib/installation/proposal_store.rb:434
msgid ""
"<p>\n"
"Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1902,7 +1926,7 @@

#. Help text for network configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:434
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1914,7 +1938,7 @@

#. Help text for service configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:442
+#: src/lib/installation/proposal_store.rb:451
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1926,7 +1950,7 @@

#. Help text for hardware configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:450
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1937,12 +1961,12 @@
"</p>\n"

#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>UML 安装提案</B></P>"

#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -1951,7 +1975,7 @@
#. Generic help text for other proposals (not basic installation or
#. hardhware configuration.
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:473
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -1968,6 +1992,16 @@
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
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr "修改系统角色可能冲销您已做的调整。"
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -1975,10 +2009,71 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
msgid "Creating root filesystem snapshot..."
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."
+msgstr "无法通过协议 HTTP(S) 找到 URL '%1'。服务器返回代码 %2。"
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+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/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr "读取 %1/%2 上的文件失败。\n"
+
+#: src/lib/transfer/file_from_url.rb:208
+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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr "挂载 %1 失败。"
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+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/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr "%1 未挂载并挂载失败"
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr "无法找到文件 %1"
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+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/lib/transfer/file_from_url.rb:568
+msgid "Unknown protocol %1."
+msgstr "未知协议 %1。"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
@@ -2015,6 +2110,54 @@
"安装未能自动解决软件包依赖关系。\n"
"将打开软件包管理器来让您手动解决那些依赖关系。"

+#~ 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>"
+#~ msgstr ""
+#~ "<p>若您想要创建一个 AutoYaST 方案请使用<b>复制系统设置</b>。\n"
+#~ "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
+#~ "AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n"
+#~ "若选择了此选项,将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</"
+#~ "p>"
+
+#~ msgid ""
+#~ "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+#~ msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗?"
+
+#~ msgid "Clone System Configuration"
+#~ msgstr "复制系统配置"
+
+#~ msgid "&Clone System Configuration"
+#~ msgstr "复制系统配置(&C)"
+
+#~ msgid ""
+#~ "The AutoYaST profile will be written under /root/autoinst.xml (<a href="
+#~ "\"%1\">do not write it</a>)."
+#~ msgstr ""
+#~ "AutoYaST 方案将被写入在 /root/autoinst.xml 下(<a href=\"%1\">不写入</a>)。"
+
+#~ msgid ""
+#~ "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
+#~ msgstr "将不会保存 AutoYaST 方案(<a href=\"%1\">写入</a>)。"
+
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "已存储配置位置"
+
+#~ msgid "Failed to store configuration. Details can be found in log."
+#~ msgstr "存储配置失败。可在日志中找到细节。"
+
+#~ msgid "&Export Configuration"
+#~ msgstr "导出配置(&E)"
+
#~ msgid "ERROR: Missing Title"
#~ msgstr "错误:缺少标题"

@@ -2137,7 +2280,8 @@
#~ 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 ""
@@ -2258,7 +2402,9 @@
#~ 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"
@@ -2337,7 +2483,9 @@
#~ 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 ""
@@ -2421,7 +2569,8 @@

#~ 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"
@@ -2446,7 +2595,8 @@

#~ 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"
@@ -2584,7 +2734,8 @@
#~ 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>"
@@ -2636,21 +2787,27 @@
#~ 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>"
@@ -2663,7 +2820,8 @@

#~ 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"
@@ -2675,7 +2833,8 @@

#~ 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"
@@ -2704,7 +2863,8 @@
#~ 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 ""
@@ -2730,7 +2890,8 @@
#~ 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"
@@ -2773,10 +2934,14 @@
#~ 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"
@@ -2784,7 +2949,8 @@
#~ "带有很多桌面软件,比如 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>"

@@ -2807,9 +2973,6 @@
#~ msgid "Description"
#~ msgstr "描述"

-#~ msgid "System Type"
-#~ msgstr "系统类型"
-
#~ msgid "Image deployed"
#~ msgstr "映像已部署"

@@ -2824,9 +2987,11 @@

#, 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"
@@ -2834,16 +2999,21 @@

#~ 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"
@@ -2852,10 +3022,13 @@

#~ 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-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -9,10 +9,10 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
-"PO-Revision-Date: 2016-03-03 22:40+0800\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"PO-Revision-Date: 2016-06-05 17:03+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -116,9 +116,8 @@
msgstr "编辑"

#: src/include/iscsi-client/dialogs.rb:161
-#| msgid "Disconnected"
-msgid "Disconnect"
-msgstr "断开"
+msgid "Log Out"
+msgstr "注销"

#: src/include/iscsi-client/dialogs.rb:186
msgid "Connected"
@@ -129,6 +128,9 @@
msgstr "发现"

#: src/include/iscsi-client/dialogs.rb:193
+msgid "Log In"
+msgstr "登入"
+
#: src/include/iscsi-client/dialogs.rb:223
msgid "Connect"
msgstr "连接"
@@ -210,8 +212,8 @@
#. 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:110 src/include/iscsi-client/helps.rb:122
-#: src/include/iscsi-client/helps.rb:129
+#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119
+#: src/include/iscsi-client/helps.rb:126
msgid "<h1>iSCSI Initiator</h1>"
msgstr "<h1>iSCSI 发起端</h1>"

@@ -330,71 +332,75 @@
#. table of connected targets
#: src/include/iscsi-client/helps.rb:90
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>"
+"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>当前会话列表。</p><p>使用<b>添加</b>按钮来获取额外目标。将启动探索来检测新目标和已连接目标的启动模式是否保持未变。<br>使用<b"
-">断开连接</b>来取消连接并从列表中移除该目标。<br>要修改启动状态,请按<b>编辑</b>。</p>"
+"当前会话列表。要添加新目标,请选择它并按<b>添加</b>。\n"
+"要移除某个目标,请按<b>注销</b>。\n"
+"要修改启动状态,请按<b>切换</b>。\n"

#. Warning
#. Warning
-#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117
+#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114
msgid "<h1>Warning</h1>"
msgstr "<h1>警告</h1>"

-#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118
+#: 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"
+"<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:103
-#| 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>"
+#: src/include/iscsi-client/helps.rb:100
msgid ""
-"<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>"
+"<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>"
msgstr ""
"<p><b>发起端名称</b> 是 <tt>/etc/iscsi/initiatorname.iscsi</tt> 中的一个值。\n"
"若您有 iBFT,此值将从那里添加,并且您只能在 BIOS 设置中修改它。</p>"

-#: src/include/iscsi-client/helps.rb:106
+#: src/include/iscsi-client/helps.rb:103
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:111
-#| 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"
+#: src/include/iscsi-client/helps.rb:108
msgid ""
-"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"
+"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"
msgstr ""
-"请输入 iSCSI 目标服务器的 <b>IP 地址</b>。\n"
-"若有需要请只修改<b>端口</b>。认证请使用<b>用户名</b>和<b>密码</b>。若您不需要认证,请选择<b>无认证</b>。\n"
+"请输入所发现服务器的 <b>IP 地址</b>。\n"
+"若有需要请只修改<b>端口</b>。\n"
+"认证请使用<b>用户名</b>和<b>密码</b>。\n"
+"若您不需要认证,请选择<b>无认证</b>。\n"

-#: src/include/iscsi-client/helps.rb:125
+#: src/include/iscsi-client/helps.rb:122
msgid ""
-"List of nodes offered by the iSCSI target. Select one item and click <b"
-">Connect</b>. "
+"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>"
@@ -403,57 +409,26 @@
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"

-#: src/include/iscsi-client/helps.rb:141
-#| msgid "Authentication"
-msgid "<h1>Authentication</h1>"
-msgstr "<h1>认证</h1>"
-
+#. list of discovered targets
#: src/include/iscsi-client/helps.rb:142
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>"
+"List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> "
+"to any target."
+msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"

-#. 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
+#: src/include/iscsi-client/helps.rb:145
msgid "<h1>iBTF</h1>"
msgstr "<h1>iBTF</h1>"

@@ -504,48 +479,31 @@
msgstr "端口号不能为空"

#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
-#| msgid "Initiator Name"
-msgid "Incorrect Initiator Name"
-msgstr "不正确的发起端名称"
-
-#: src/include/iscsi-client/widgets.rb:429
-#| 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"
+#: src/include/iscsi-client/widgets.rb:423
msgid ""
-"\n"
+"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"
-"\n"
-"Do you want to use the name?\n"
msgstr ""
-"\n"
+"错误的发起端名称。\n"
"正确的语法为\n"
"iqn.yyyy-mm.reversed.domain.name[:identifier]\n"
"或 eui:yyyy-mm.reversed.domain.name[:identifier]\n"
"\n"
"例如:\n"
"iqn.2007-04.cz.server:storage.disk.sdb\n"
-"\n"
-"您想要使用该名称吗?\n"

#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#: src/include/iscsi-client/widgets.rb:625
msgid "Insert the IP address."
msgstr "请输入 IP 地址。"

#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:631
msgid "Insert the port."
msgstr "请输入端口。"

@@ -553,38 +511,38 @@
#. ******************* 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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:866
msgid "True"
msgstr "真"

-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
msgid "False"
msgstr "假"

#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: 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."
+"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:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:774
+#: src/include/iscsi-client/widgets.rb:894
msgid "Continue"
msgstr "继续"

-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:775
+#: src/include/iscsi-client/widgets.rb:895
msgid "Cancel"
msgstr "取消"

#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:885
msgid "The target is already connected."
msgstr "目标已连接。"

@@ -602,8 +560,8 @@
#. 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>"
+"<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
@@ -675,7 +633,7 @@
msgstr "全部"

#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:694
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"
@@ -686,38 +644,75 @@
"旧的发起端名称将替换为 iBFT 中的值并创建备份。\n"
"您若想要使用不同的发起端名称,请到 BIOS 中修改之。\n"

-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
-#| msgid "Image creation failed."
-msgid "Target connection failed.\n"
-msgstr "目标连接失败。\n"
-
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1147
msgid "Configuration summary..."
msgstr "配置摘要..."

-#~ msgid "Log Out"
-#~ msgstr "注销"
+#~| msgid "Disconnected"
+#~ msgid "Disconnect"
+#~ msgstr "断开"

-#~ msgid "Log In"
-#~ 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 "Authentication"
+#~ msgid "<h1>Authentication</h1>"
+#~ msgstr "<h1>认证</h1>"
+
#~ msgid ""
-#~ "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"
+#~ "<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 ""
-#~ "当前会话列表。要添加新目标,请选择它并按<b>添加</b>。\n"
-#~ "要移除某个目标,请按<b>注销</b>。\n"
-#~ "要修改启动状态,请按<b>切换</b>。\n"
+#~ "<p>这里的默认设置是<i>无认证</i>。若出于安全原因需要认证请反选复选框。"
+#~ "在'进站认证','出站认证',或两者中输入<b>用户名</b>和<b>密码</b>。</"
+#~ "p><p><b>请注意:</b><br>这里的'进站认证'与 iSCSI 目标服务器端的'出站认"
+#~ "证'相关联,反之亦然。</p>"

-#~ msgid "Select the type of authentication and enter the <b>Username</b> and
<b>Password</b>."
-#~ msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。"
+#~ 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>"

-#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or
<b>Connect</b> to any target."
-#~ msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"
+#~| msgid "Initiator Name"
+#~ msgid "Incorrect Initiator Name"
+#~ msgstr "不正确的发起端名称"

+#~| 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-06-03 15:03:18 UTC
(rev 95899)
+++ trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2016-06-05 16:43:05 UTC
(rev 95900)
@@ -3,15 +3,15 @@
# Copyright (C) 2002 SuSE Linux AG.
# Copyright (C) 2001 SuSE GmbH.
#
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014, 2015.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
-"PO-Revision-Date: 2015-10-18 11:30+0800\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"PO-Revision-Date: 2016-06-05 23:57+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -40,15 +40,14 @@
msgstr "服务"

#. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
msgid "Global"
msgstr "全局"

#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
msgid "Targets"
msgstr "目标"
@@ -65,7 +64,7 @@

#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
msgid "Portal group"
msgstr "门户组"

@@ -99,153 +98,159 @@
msgstr "路径"

#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: 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
msgid "Add"
msgstr "添加"

#: src/include/iscsi-lio-server/dialogs.rb:155
-#: 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/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr "编辑"

#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: 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
msgid "Delete"
msgstr "删除"

-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Client"
-msgstr "客户端"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit
client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr "发起端"

-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
msgstr "逻辑单元编号映射"

-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
msgid "Auth"
msgstr "认证"

-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
msgid "Edit LUN"
msgstr "编辑逻辑单元编号"

-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
msgid "Edit Auth"
msgstr "编辑认证"

-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr "复制"

#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
+#: src/include/iscsi-lio-server/dialogs.rb:217
#: src/include/iscsi-lio-server/widgets.rb:207
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "无认证"

-#: src/include/iscsi-lio-server/dialogs.rb:225
+#: src/include/iscsi-lio-server/dialogs.rb:226
#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "进站认证"

#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:253
+#: 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
msgid "Username"
msgstr "用户名"

-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:254
+#: 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
msgid "Password"
msgstr "密码"

-#: src/include/iscsi-lio-server/dialogs.rb:248
+#: src/include/iscsi-lio-server/dialogs.rb:249
#: src/include/iscsi-lio-server/widgets.rb:231
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "出站认证"

#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr "引导时(&B)"

#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr "手动(&M)"

#. part of help text, used to describe radiobuttons (matching starting LIO
target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "引导时"

#. part of help text, used to describe radiobuttons (matching starting LIO
target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "手动"

+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr "目标门户组状态"
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr "键"

-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr "值"

#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
msgid "iSCSI LIO Target Overview"
msgstr "iSCSI LIO 目标概览"

#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>iSCSI 目标</h1>"

#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
msgid "Add iSCSI Target"
msgstr "添加 iSCSI 目标"

-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
-msgstr "修改 iSCSI 目标客户端设置"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+msgid "Modify iSCSI Target Initiator Setup"
+msgstr "修改 iSCSI 目标发起端设置"

#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
msgid "Modify iSCSI Target Lun Setup"
msgstr "修改 iSCSI 目标逻辑单元编号设置"

#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
msgid "iSCSI Target Expert Settings"
msgstr "iSCSI 目标专家设置"

@@ -395,43 +400,76 @@

#. 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 a client access for a LUN imported from
target portal group. Specify which client is allowed to access it (client name
is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi
initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
-msgstr "<p>使用<b>添加</b>来给予一个客户端从目标门户组导入的逻辑单元编号的访问权限。请指定允许访问逻辑单元编号的客户端 (客户端名称为
iscsi 发起端上的 '/etc/iscsi/initatorname.iscsi'
中的<i>发起端名称</i>)。<b>删除</b>将移除该客户端对逻辑单元编号的访问权限。</p>"
+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>"

#: src/include/iscsi-lio-server/helps.rb:130
-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>. 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>。若在之前对话框禁用了<b>使用认证</b>,那这里的<b>编辑认证</b>也是禁用的。</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</"
+"b> is disabled here.</p>"
+msgstr ""
+"<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:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client
access to the LUN.</p>"
-msgstr "<p><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>"
+msgstr "<p><b>复制</b>提供了给予另一个发起端逻辑单元编号访问权限的可能。</p>"

#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: 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</b>."
+"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>。"

#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr "<h1>iSCSI 目标 IP/端口和逻辑单元编号设置</h1>"

-#: src/include/iscsi-lio-server/helps.rb:146
+#: 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</b>.
\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 ""
@@ -441,25 +479,29 @@
"该名称需要在目标门户组中唯一。若用户没有为逻辑单元编号提供一个名称,\n"
"它将自动生成。"

-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: 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:162
+#: src/include/iscsi-lio-server/helps.rb:163
msgid "Create a new target. Replace template values with the correct values."
msgstr "创建一个新目标。请使用正确的值替换模板值。"

-#: src/include/iscsi-lio-server/helps.rb:165
+#: 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</b>.
\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 ""
@@ -469,17 +511,22 @@
"该名称需要在目标门户组中唯一。若用户没有提供为逻辑单元编号提供一个名称,\n"
"它将自动生成。"

-#: src/include/iscsi-lio-server/helps.rb:179
-msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all
additional configuration options."
+#: 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."
msgstr "可以<b>添加</b>、<b>编辑</b>或<b>删除</b>全部额外配置选项。"

-#: src/include/iscsi-lio-server/helps.rb:184
+#: 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
@@ -498,8 +545,8 @@
msgstr "无效的密码。"

#: src/include/iscsi-lio-server/widgets.rb:251
-msgid "Selected Lun is already in use!"
-msgstr "所选逻辑单元编号已被使用!"
+msgid "Selected LUN is already in use!"
+msgstr "所选逻辑单元编号已在使用!"

#: src/include/iscsi-lio-server/widgets.rb:260
msgid "Selected Name is already in use!"
@@ -526,8 +573,8 @@
msgstr "选择文件或设备"

#: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Client Lun"
-msgstr "客户端逻辑单元编号"
+msgid "Initiator LUN"
+msgstr "发起端逻辑单元编号"

#: src/include/iscsi-lio-server/widgets.rb:436
msgid "Target LUN"
@@ -546,8 +593,8 @@
msgstr "需要至少启用一个认证!"

#: src/include/iscsi-lio-server/widgets.rb:619
-msgid "Client name:"
-msgstr "客户端名称:"
+msgid "Initiator name:"
+msgstr "发起端名称:"

#: src/include/iscsi-lio-server/widgets.rb:622
msgid "Import LUNs from TPG"
@@ -555,22 +602,22 @@

#: src/include/iscsi-lio-server/widgets.rb:638
#: src/include/iscsi-lio-server/widgets.rb:695
-msgid "Client name must not be empty!"
-msgstr "客户端名称不能为空!"
+msgid "Initiator name must not be empty!"
+msgstr "发起端名称不能为空!"

#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. 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
-msgid "Client name already exists!"
-msgstr "客户端名称已存在!"
+msgid "Initiator name already exists!"
+msgstr "发起端名称已存在!"

-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. 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
-msgid "New client name:"
-msgstr "新客户端名称:"
+msgid "New initiator name:"
+msgstr "新发起端名称:"

#: src/include/iscsi-lio-server/widgets.rb:724
msgid "OK"
@@ -580,98 +627,104 @@
msgid "Cancel"
msgstr "取消"

+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:785
+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
+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:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:822
+#: src/include/iscsi-lio-server/widgets.rb:936
+#: src/include/iscsi-lio-server/widgets.rb:1290
msgid "Really delete the selected item?"
msgstr "真的删除所选项吗?"

-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1004
msgid "Problem creating target %1 with tpg %2"
msgstr "使用目标门户组 %2 创建目标 %1 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1026
msgid "Problem setting network portal to %1"
msgstr "设置网络门户为 %1 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1047
msgid "Problem removing lun %1"
msgstr "移除逻辑单元编号 %1 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1072
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr "设置逻辑单元编号 %1 (名称:%2) 到路径 %3 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1086
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:1198
+#: src/include/iscsi-lio-server/widgets.rb:1200
msgid "The target cannot be empty."
msgstr "目标不能为空。"

-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1204
msgid "The target portal group cannot be empty."
msgstr "目标门户组不能为空。"

-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1215
msgid "The target already exists."
msgstr "目标已存在。"

-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1235
msgid "Incoming"
msgstr "进站"

-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1238
msgid "Outgoing"
msgstr "出站"

-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1240
msgid "None"
msgstr "无"

-#: src/include/iscsi-lio-server/widgets.rb:1261
-#: src/include/iscsi-lio-server/widgets.rb:1364
-#: src/include/iscsi-lio-server/widgets.rb:1401
-msgid "Disabled"
-msgstr "已禁用"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1452
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator login to the target, please\n"
"use the 'Add' button and enter the name\n"
"(see /etc/iscsi/initiatorname.iscsi on initiator).\n"
-"Really want to continue without client access?"
+"Really want to continue without initiator access?"
msgstr ""
-"未指定任何客户端。\n"
-"要允许客户端登入到目标,请使用 ’添加‘ 按钮并输入名称\n"
+"未指定任何发起端。\n"
+"要允许发起端登入到目标,请使用 ’添加‘ 按钮并输入名称\n"
"(可参考发起端上的 /etc/iscsi/initiatorname.iscsi)。\n"
-"真的想要继续而不指定可访问客户端吗?"
+"真的想要继续而不指定可访问发起端吗?"

-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
-msgstr "在 %1:%2 中为客户端 %3 移除逻辑单元编号 %4 时出现问题"
+#: src/include/iscsi-lio-server/widgets.rb:1466
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
+msgstr "在 %1:%2 中为发起端 %3 移除逻辑单元编号 %4 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
-msgstr "在 %1:%2 中为客户端 %3 添加逻辑单元编号 %4:%5 时出现问题"
+#: src/include/iscsi-lio-server/widgets.rb:1481
+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:1500
-msgid "Problem removing client %3 from %1:%2"
-msgstr "从 %1:%2 中移除客户端 %3 时出现问题"
+#: src/include/iscsi-lio-server/widgets.rb:1502
+msgid "Problem removing initiator %3 from %1:%2"
+msgstr "从 %1:%2 中移除发起端 %3 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1524
-msgid "Problem creating client %3 for %1:%2"
-msgstr "为 %1:%2 创建客户端 %3 时出现问题"
+#: src/include/iscsi-lio-server/widgets.rb:1526
+msgid "Problem creating initiator %3 for %1:%2"
+msgstr "为 %1:%2 创建发起端 %3 时出现问题"

-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
-msgstr "在 %1:%2 中为客户端 %3 修改认证时出现问题"
+#: src/include/iscsi-lio-server/widgets.rb:1561
+msgid "Problem changing auth for initiator %3 in %1:%2"
+msgstr "在 %1:%2 中为发起端 %3 修改认证时出现问题"

#. Initialization dialog caption
#: src/include/iscsi-lio-server/wizards.rb:110
@@ -684,11 +737,11 @@
msgstr "正在初始化..."

#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr "无法保存 LIO 设置"

-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr "无法保存 tcm 设置"

@@ -788,6 +841,18 @@
msgid "Configuration summary..."
msgstr "配置摘要..."

+#~ msgid "Client"
+#~ msgstr "客户端"
+
+#~ msgid "Modify iSCSI Target Client Setup"
+#~ msgstr "修改 iSCSI 目标客户端设置"
+
+#~ msgid "Client Lun"
+#~ msgstr "客户端逻辑单元编号"
+
+#~ msgid "Client name:"
+#~ msgstr "客户端名称:"
+
#~ msgid "Run SuSEconfig"
#~ msgstr "运行 SuSEconfig"


Added: trunk/yast/zh_CN/po/journalctl.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/journalctl.zh_CN.po (rev 0)
+++ trunk/yast/zh_CN/po/journalctl.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -0,0 +1,127 @@
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# marguerite <marguerite@xxxxxxxxxxxx>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"PO-Revision-Date: 2016-06-06 00:41+0800\n"
+"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr "日志项"
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr "显示带有以下文本的项"
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr "修改过滤器..."
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr "刷新"
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr "要显示的项"
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr "日志项针对"
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr "过滤器"
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr "自上次引导"
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr "自系统引导"
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr "单元 (%s)"
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr "文件 (%s)"
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr "优先级 (%s)"
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr "无额外条件"
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr "按 %s 过滤"
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr "自系统引导"
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr "自上次引导"
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr "针对此 systemd 单元"
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr "针对此文件 (可执行文件或设备)"
+
+#: src/lib/journalctl/query_presenter.rb:116
+msgid "With at least this priority"
+msgstr "至少有此优先级"
+
+#. Fields to display for listing the entries
+#.
+#. @return [Array<Hash>] for each column a :label and a :method is provided
+#: src/lib/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr "时间"
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr "来源"
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr "消息"
+

Modified: trunk/yast/zh_CN/po/kdump.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/kdump.zh_CN.po 2016-06-03 15:03:18 UTC (rev 95899)
+++ trunk/yast/zh_CN/po/kdump.zh_CN.po 2016-06-05 16:43:05 UTC (rev 95900)
@@ -4,15 +4,15 @@
# Copyright (C) 2001 SuSE GmbH.
#
# Marguerite Su, 2012.
-# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014, 2015.
+# 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
-"PO-Revision-Date: 2015-10-21 14:10+0800\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"PO-Revision-Date: 2016-06-05 16:54+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,17 +52,25 @@

#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:117
-msgid "The naming scheme is:/boot/vmlinu[zx]-<kernel_string>[.gz] Please enter
only \"kernel_string\"."
-msgstr "命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 请只输入 \"kernel_string\"。"
+msgid ""
+"The naming scheme is:/boot/vmlinu[zx]-<kernel_string>[.gz] Please enter only "
+"\"kernel_string\"."
+msgstr ""
+"命名方式是:/boot/vmlinu[zx]-<kernel_string>[.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
@@ -92,7 +100,9 @@

#. 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
@@ -137,7 +147,9 @@

#. 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
@@ -177,8 +189,12 @@

#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:303
-msgid "The naming scheme is: /boot/vmlinu[zx]-<kernel_string>[.gz] kernel
means only \"kernel_string\"."
-msgstr "命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 内核只意味着 \"kernel_string\"。"
+msgid ""
+"The naming scheme is: /boot/vmlinu[zx]-<kernel_string>[.gz] kernel means "
+"only \"kernel_string\"."
+msgstr ""
+"命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 内核只意味着 "
+"\"kernel_string\"。"

#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:310
@@ -187,7 +203,9 @@

#. 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
@@ -367,10 +385,8 @@

#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:496
msgid "To apply changes a reboot is necessary."
msgstr "需要重启来应用变更。"

@@ -417,7 +433,8 @@

#. 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
@@ -740,7 +757,8 @@
#: 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"
@@ -761,10 +779,17 @@
#: 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
@@ -785,8 +810,10 @@
"<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"
@@ -800,7 +827,8 @@
#: 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>"
@@ -810,11 +838,13 @@
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
@@ -825,7 +855,8 @@
" <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"
@@ -949,10 +980,12 @@
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
@@ -964,45 +997,63 @@
" 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.</p>\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
@@ -1191,19 +1242,37 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr "内核选项包括一些范围或冗余值。重写它吗?"

#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr "使用固件辅助转储(&F)"

+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+"此系统不支持 Kdump。\n"
+"若您现在继续,该模块可能工作不正常。\n"
+"例如,无法正确读取某些设置,产生的配置很可能无用。\n"
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr "不支持 Kdump"
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
@@ -1212,129 +1281,131 @@
"细节请参考 %{log}。"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:506
msgid "Initializing kdump Configuration"
msgstr "初始化 kdump 配置"

#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
msgid "Reading the config file..."
msgstr "正在读取配置文件..."

#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:517
msgid "Reading kernel boot options..."
msgstr "正在读取内核引导选项..."

#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:519
msgid "Calculating memory limits..."
msgstr "正在计算内存限制..."

#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:525
msgid "Reading partitions of disks..."
msgstr "正在读取磁盘分区..."

#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:527
msgid "Reading available memory and calibrating usage..."
msgstr "正在读取可用内存并校准用量..."

#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:539
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "无法读取配置文件 /etc/sysconfig/kdump"

#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:547
msgid "Cannot read kernel boot options."
msgstr "无法读取内核引导选项。"

#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:555
msgid "Cannot read available memory."
msgstr "无法读取可用内存。"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:581
msgid "Saving kdump Configuration"
msgstr "保存 kdump 配置"

#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:610
msgid "Write the settings"
msgstr "写入设置"

#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:612
msgid "Update boot options"
msgstr "更新引导选项"

#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:616
msgid "Writing the settings..."
msgstr "正在写入设置..."

#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:618
msgid "Updating boot options..."
msgstr "正在更新引导选项..."

#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:620
msgid "Finished"
msgstr "已完成"

#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:630
msgid "Cannot write settings."
msgstr "无法写入设置。"

#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:639
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "添加 crashkernel 参数到引导加载器失败。"

#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:750
msgid "Kdump status: %1"
msgstr "Kdump 状态:%1"

-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:751
msgid "enabled"
msgstr "已启用"

-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:751
msgid "disabled"
msgstr "已禁用"

-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:758
msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernel 选项的值:%1"

-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:765
msgid "Dump format: %1"
msgstr "转储格式:%1"

-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:772
msgid "Target of dumps: %1"
msgstr "转储标的:%1"

-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:779
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:879
-msgid "Warning! There might not be enough free space. %{required} required,
but only %{available} are available."
+#: src/modules/Kdump.rb:871
+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:974
+#: src/modules/Kdump.rb:958
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."

Modified: trunk/yast/zh_CN/po/live-installer.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/live-installer.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/live-installer.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -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-05-06 16:58+0200\n"
"PO-Revision-Date: 2013-02-03 19:36+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>\n"
"Language-Team: Chinese Simplified <opensuse-zh@xxxxxxxxxxxx>\n"
@@ -41,27 +41,27 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
msgid "Evaluating filesystems to copy..."
msgstr "正在评估待复制的文件系统..."

-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
msgid "Copying root filesystem..."
msgstr "正在复制根文件系统..."

-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
msgid "Copying live image..."
msgstr "正在复制 Live 映像..."

#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
msgid "Copying %1..."
msgstr "正在复制 %1..."

#. need to set some lower limit - roughly estimated maximum size of the last
file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -74,80 +74,63 @@
"您的磁盘空间不足。选择一块大点的磁盘分区来安装 Live 系统。"

#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr "未能将 Live 映像复制到硬盘。"

#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr "安装设置"

#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
msgid "Analyzing the system..."
msgstr "正在分析系统..."

#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr "将磁盘 %2 的 %1%% 用于 Linux"

-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
msgid "Do not use disk %1"
msgstr "不使用磁盘 %1"

-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr "分区"

#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr "系统启动"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr "询问引导 Linux 还是已有系统"
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr "仅引导 Linux"
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr "系统启动倒计时:%1 秒"
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr "键盘"

#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr "时区"

#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
msgid "Change Installation Settings"
msgstr "修改安装设置"

#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
msgid ""
"<p>\n"
-"Use <b>Accept</b> to perform a new installation with the values
displayed.</p>"
+"Use <b>Accept</b> to perform a new installation with the values displayed.</"
+"p>"
msgstr ""
"<p>\n"
"用<b>接受</b>来用显示的值执行全新安装。</p>"

#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
msgid ""
"<p>\n"
"To change the values, click the respective headline\n"
@@ -158,7 +141,7 @@
"或选择<b>修改安装设置</b>。</p>\n"

#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
msgid ""
"<p>\n"
"Your hard disk has not been modified, you can still safely abort.\n"
@@ -269,7 +252,7 @@
"请手动重启。您可能需要按下复位键来重启。"

#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr "正在复制文件到安装好的系统..."

@@ -293,6 +276,18 @@
msgid "Saving time zone..."
msgstr "正在保存时区..."

+#~ msgid "System start-up"
+#~ msgstr "系统启动"
+
+#~ msgid "Ask whether to boot Linux or existing system"
+#~ msgstr "询问引导 Linux 还是已有系统"
+
+#~ msgid "Boot only Linux"
+#~ msgstr "仅引导 Linux"
+
+#~ msgid "System start time-out: %1 seconds"
+#~ msgstr "系统启动倒计时:%1 秒"
+
#~ msgid "Installation settings"
#~ msgstr "初始设置"


Modified: trunk/yast/zh_CN/po/network.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/network.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/network.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
"PO-Revision-Date: 2016-03-02 22:27+0800\n"
"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
"Language-Team: Chinese <kde-i18n-doc@xxxxxxx>\n"
@@ -128,10 +128,10 @@
#: 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,20 +140,21 @@

#: 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
@@ -223,7 +224,7 @@

#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
msgid "Host Configuration Summary:"
msgstr "主机配置摘要:"

@@ -365,9 +366,10 @@
"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"
@@ -491,7 +493,7 @@
#. in case keep_install_network is set to true (in AY)
#. we'll keep values from installation
#. and merge with XML data (bnc#712864)
-#: src/clients/lan_auto.rb:136
+#: src/clients/lan_auto.rb:108
msgid "Configuration Error: uninitialized interface."
msgstr "配置错误:未初始化的接口。"

@@ -576,7 +578,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
msgid "Routing Configuration"
msgstr "路由配置"

@@ -731,8 +733,8 @@

#: src/clients/routing.rb:348
msgid ""
-"At least one of the following parameters (gateway, netmask, device, options)"
-" must be specified"
+"At least one of the following parameters (gateway, netmask, device, options) "
+"must be specified"
msgstr "必须指定至少一个以下参数 (网关、网络掩码、设备、选项)"

#: src/clients/routing.rb:370
@@ -745,13 +747,13 @@

#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
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:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
msgid "Change."
msgstr "修改。"

@@ -1054,7 +1056,7 @@
#. Table header label
#. Table header label
#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "IP 地址"

@@ -1062,7 +1064,7 @@
#. PushButton label
#. PushButton label
#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "添加(&D)"
@@ -1072,7 +1074,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1083,7 +1085,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
@@ -1130,7 +1132,7 @@
msgstr "隧道组"

#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:1315
msgid "Bridged Devices"
msgstr "桥接设备"

@@ -1170,7 +1172,7 @@
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:816
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr "无链接和 IP 设置 (绑定从属)"

@@ -1203,7 +1205,7 @@
#. TextEntry label
#: src/include/network/lan/address.rb:325
#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/services/host.rb:334
msgid "&IP Address"
msgstr "&IP 地址"

@@ -1231,7 +1233,7 @@
msgstr "&S/390"

#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1036
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1241,13 +1243,13 @@
"这只有在您知道检测有误时才有意义。"

#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1056
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:1062
+#: src/include/network/lan/address.rb:1080
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1261,20 +1263,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1100
msgid "No valid IP address."
msgstr "无效的 IP 地址。"

-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1107
msgid "No valid netmask or prefix length."
msgstr "无效的网络掩码或前缀长度。"

-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1115
msgid "Invalid hostname."
msgstr "无效的主机名。"

#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1123
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1288,7 +1290,7 @@
"真的要把主机名留空吗?\n"

#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1142
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1298,82 +1300,84 @@

#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1195
msgid "&General"
msgstr "常规(&G)"

#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1206
msgid "Device Activation"
msgstr "设备激活"

-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1210
msgid "Firewall Zone"
msgstr "防火墙区域"

-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1215
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:1207
+#: src/include/network/lan/address.rb:1225
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:1274
+#: src/include/network/lan/address.rb:1292
msgid "&Address"
msgstr "地址(&A)"

#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1295
msgid "<p>Configure your IP address.</p>"
msgstr "<p>配置您的 IP 地址。</p>"

-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1301
msgid "&Hardware"
msgstr "硬件(&H)"

-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1308
msgid "&Bond Slaves"
msgstr "绑定从属(&B)"

-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1322
msgid "&Wireless"
msgstr "无线(&W)"

#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1406
msgid "Ifplugd Priority"
msgstr "Ifplugd 优先级"

#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1412
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:1476
+#: src/include/network/lan/address.rb:1494
msgid "Network Card Setup"
msgstr "网卡设置"

#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
msgid ""
"At least one selected device is already configured.\n"
"Adapt the configuration for bridge?\n"
@@ -1563,8 +1567,8 @@

#: src/include/network/lan/cmdline.rb:98
msgid ""
-"Value of \"id\" is out of range. Use \"list\" option to check max. value of"
-" \"id\"."
+"Value of \"id\" is out of range. Use \"list\" option to check max. value of "
+"\"id\"."
msgstr "\"id\" 的值超出范围。请使用 \"list\" 选项检查 \"id\" 的最大值。"

#. Handler for action "add"
@@ -1680,9 +1684,10 @@

#: 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' 脚本。现在执行它吗?"
+"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
msgid "An error occurred during firmware installation."
@@ -1703,12 +1708,12 @@
"该接口将不再由 NetworkManager 管理。\n"

#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:454
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr "您选择的设备有 STARTMODE=nfsroot。真的删除吗?"

#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
msgid "Network Setup Method"
msgstr "网络设置方法"

@@ -1717,7 +1722,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:519
+#: src/include/network/lan/complex.rb:517
msgid "Network Settings"
msgstr "网络设置"

@@ -1761,8 +1766,8 @@
#: 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"
@@ -1771,24 +1776,25 @@

#: 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"
@@ -1798,20 +1804,23 @@
#: 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"
+"<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
@@ -1829,15 +1838,16 @@
"<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"
+"<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
@@ -1986,26 +1996,26 @@
#. 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>"
+"<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>"
+"<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>"
+"<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>"
+"<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
@@ -2190,8 +2200,8 @@
"<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"
@@ -2222,8 +2232,8 @@
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"
@@ -2235,7 +2245,9 @@
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 ""
@@ -2244,13 +2256,14 @@
"<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 ""
@@ -2261,15 +2274,16 @@
#: 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"
@@ -2278,16 +2292,18 @@
#: 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
@@ -2314,7 +2330,8 @@
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"
@@ -2323,30 +2340,34 @@

#: 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
@@ -2360,18 +2381,22 @@
"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</i>。\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"
@@ -2380,8 +2405,8 @@

#: 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"
+"<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
@@ -2389,7 +2414,9 @@
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
@@ -2406,10 +2433,10 @@
#: 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>.</p"
-">\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"
@@ -2418,8 +2445,8 @@
#. 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 ""
@@ -2429,15 +2456,17 @@
#. 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
@@ -2475,9 +2504,10 @@

#: 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>"
+"<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 ""
@@ -2485,19 +2515,21 @@
"<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>"
@@ -2511,7 +2543,8 @@
#: 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>"
@@ -2525,21 +2558,25 @@
#: 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</b"
-">\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
@@ -2556,31 +2593,32 @@
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>。</p>"
+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"
-#| " length of interface name (inclusive of the colon and label)
is\n"
-#| " limited to 15 characters and the obsolete ifconfig utility
truncates it after 9 characters.</p>"
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 alias name. For example,
enter <b>foo</b> instead of <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>"
+"<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
@@ -2636,8 +2674,8 @@
"<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"
@@ -2661,8 +2699,8 @@
"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"
@@ -2672,7 +2710,8 @@
"认证模式取决于所用的保护技术是 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"
@@ -2690,7 +2729,8 @@
"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
@@ -2721,8 +2761,8 @@
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"
@@ -2747,7 +2787,7 @@
#. Popup::Error text
#. Popup::Error text
#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/services/host.rb:379
msgid "The IP address is invalid."
msgstr "IP 地址无效。"

@@ -2818,8 +2858,8 @@
"<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.<"
-"/p>\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"
@@ -2844,8 +2884,8 @@
#: 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"
@@ -2890,7 +2930,8 @@
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
@@ -3009,47 +3050,47 @@
msgstr "&WEP 密钥"

#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:561
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:571
+#: src/include/network/lan/wireless.rb:572
msgid "Specify the network name for this mode."
msgstr "请指定此模式的网络名称。"

#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:579
msgid "The network name must be shorter than 32 characters."
msgstr "网络名称必须短于 32 个字符。"

#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:599
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "密码短语的长度必须在 8 到 63 (包括两者) 个字符之间。"

#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:610
msgid "The key must have %1 hexadecimal digits."
msgstr "密钥必须有 %1 个十六进制数字。"

#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:622
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "加密密钥无效。"

#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:630
msgid "The encryption key must be specified for this authentication mode."
msgstr "必须为此认证模式指定加密密钥。"

#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:637
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3059,32 +3100,33 @@

#. Wireless expert dialog caption
#. Frame label
-#: src/include/network/lan/wireless.rb:694
-#: src/include/network/lan/wireless.rb:775
+#: src/include/network/lan/wireless.rb:695
+#: src/include/network/lan/wireless.rb:776
msgid "Wireless Expert Settings"
msgstr "无线专家设置"

#. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:697
+#: src/include/network/lan/wireless.rb:698
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:701
+#: src/include/network/lan/wireless.rb:702
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>通道</b>。\n"
+"<p>要以主控或点对点模式使用您的无线局域网卡,请在此设置该卡应使用的<b>通道</"
+"b>。\n"
"受管模式下无需这样做 -- 该模式下该卡将在各通道间跳跃以搜索访问点。</p>\n"

#. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:708
+#: src/include/network/lan/wireless.rb:709
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>"
@@ -3093,78 +3135,82 @@
"默认值为传输得越快越好。</p>"

#. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:712
+#: src/include/network/lan/wireless.rb:713
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:716
+#: src/include/network/lan/wireless.rb:717
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:744
-#: src/include/network/lan/wireless.rb:766
+#: src/include/network/lan/wireless.rb:745
+#: src/include/network/lan/wireless.rb:767
msgid "Automatic"
msgstr "自动"

#. Combobox label
-#: src/include/network/lan/wireless.rb:781
+#: src/include/network/lan/wireless.rb:782
msgid "&Channel"
msgstr "通道(&C)"

#. Combobox label
-#: src/include/network/lan/wireless.rb:784
+#: src/include/network/lan/wireless.rb:785
msgid "B&it Rate"
msgstr "比特率(&I)"

#. Text entry label
-#: src/include/network/lan/wireless.rb:790
+#: src/include/network/lan/wireless.rb:791
msgid "&Access Point"
msgstr "访问点(&A)"

#. CheckBox label
-#: src/include/network/lan/wireless.rb:798
+#: src/include/network/lan/wireless.rb:799
msgid "Use &Power Management"
msgstr "使用电源管理(&P)"

-#: src/include/network/lan/wireless.rb:807
+#: src/include/network/lan/wireless.rb:808
msgid "AP ScanMode"
msgstr "访问点扫描模式"

#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
msgid "Enter Encryption Key"
msgstr "输入加密密钥"

#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
msgid "&Key"
msgstr "密钥(&K)"

#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "帮助"

#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
msgid "Wireless Keys"
msgstr "无线密钥"

#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: 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>"
@@ -3174,7 +3220,7 @@
"其它密钥可用于解密数据。通常,您只需要一个密钥。</p>"

#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
msgid ""
"<p><b>Key Length</b> defines the bit length of your WEP keys.\n"
"Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n"
@@ -3188,97 +3234,100 @@
"无法建立无线局域网连接,您或许需要将此值设为 64。</p>"

#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
msgid "WEP Keys"
msgstr "WEP 密钥"

#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr "密钥长度(&K)"

#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
msgid "No."
msgstr "编号"

#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "密钥"

#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "默认"

#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
msgid "&Set as Default"
msgstr "设为默认(&S)"

#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1213
msgid "Choose a Certificate"
msgstr "选择证书"

#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1258
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:1283
+#: src/include/network/lan/wireless.rb:1286
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
msgstr "请输入身份和密码或客户证书。"

#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1332
msgid "WPA-EAP"
msgstr "WPA-EAP"

#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1354
msgid "Any"
msgstr "任意"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1358
msgid "MD5"
msgstr "MD5"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1360
msgid "GTC"
msgstr "GTC"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1362
msgid "CHAP"
msgstr "CHAP"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1364
msgid "PAP"
msgstr "PAP"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1366
msgid "MSCHAPv1"
msgstr "MSCHAPv1"

#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1370
msgid "MSCHAPv2"
msgstr "MSCHAPv2"

#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1393
msgid "WPA-EAP Details"
msgstr "WPA-EAP 细节"

@@ -3309,14 +3358,15 @@
"<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>&lt;hostname&gt;:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://&lt;hostname&gt;:%2/</tt"
-">).\n"
+"a Java-capable Web browser (connect to <tt>http://&lt;hostname&gt;:%2/</"
+"tt>).\n"
"This form of remote administration is less secure than using SSH.</p>\n"
msgstr ""
"<p><b><big>远程管理设置</big></b></p>\n"
"<p>若启用了此功能,您将可以从另一台计算机远程管理这台计算机。\n"
"可以使用 VNC 客户端管理,例如 krdc (连接到 <i>&lt;hostname&gt;:%1</i>),\n"
-"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://&lt;hostname&gt;:%2/</i>)。\n"
+"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://&lt;hostname&gt;:%2/</"
+"i>)。\n"
"与使用 SSH 相比,使用这种形式的远程管理安全性较差。</p>\n"

#. Dialog frame title
@@ -3325,12 +3375,12 @@
msgstr "远程管理设置"

#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "需要安装这些软件包:"

#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3342,78 +3392,28 @@
"\n"
"重试吗?\n"

-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "未知"

-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "已成功保存配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "已成功保存 DNS 配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "已成功保存 DSL 配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "已成功保存主机配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "已成功保存 ISDN 配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "已成功保存网卡配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "已成功保存调制解调器配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "已成功保存代理配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "已成功保存服务提供商配置"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "已成功保存路由配置"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "现在配置邮件吗?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "运行 %1 的配置吗?"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:807
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
@@ -3422,33 +3422,33 @@
"YaST 无法配置某些选项。"

#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1064
+#: src/include/network/routines.rb:867
msgid "Network Cards"
msgstr "网卡"

#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:871
msgid "Modems"
msgstr "调制解调器"

#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:875
msgid "ISDN Cards"
msgstr "ISDN 卡"

#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:879
msgid "DSL Devices"
msgstr "DSL 设备"

-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:884
msgid "All Network Devices"
msgstr "全部网络设备"

#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:391
msgid "The hostname is invalid."
msgstr "主机名无效。"

@@ -3520,8 +3520,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
msgid "Hostname and Domain Name"
msgstr "主机名和域名"

@@ -3547,30 +3547,30 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: 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?"
+"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
-#: src/include/network/services/dns.rb:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr "搜索列表最多可有 %1 个域。"

#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr "搜索列表最多可有 %1 个字符。"

#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
msgid "The search domain '%1' is invalid."
msgstr "搜索域 '%1' 无效。"

#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
msgid "Hostname and Name Server Configuration"
msgstr "主机名和名称服务器配置"

@@ -3599,30 +3599,32 @@
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:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "当前主机"

#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
msgid "Hostnames"
msgstr "主机名"

#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "主机别名"

#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:344
msgid "Hos&t Aliases"
msgstr "主机别名(&T)"

#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:407
msgid "Alias name \"%1\" is invalid."
msgstr "别名 \"%1\" 无效。"

@@ -3658,40 +3660,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "目的地(&D)"

-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:172
msgid "Ge&nmask"
msgstr "网络掩码(&N)"

-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:182
msgid "&Gateway"
msgstr "网关(&G)"

-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:191
msgid "De&vice"
msgstr "设备(&V)"

#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:252
msgid "Destination is invalid."
msgstr "目的地无效。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:260
msgid "Gateway IP address is invalid."
msgstr "网关 IP 地址无效。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:268
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:414
+#: src/include/network/services/routing.rb:426
msgid "The default gateway is invalid."
msgstr "默认网关无效。"

@@ -3724,7 +3726,8 @@
#: 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"
@@ -3775,7 +3778,8 @@
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
@@ -3832,10 +3836,10 @@
#. 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"
@@ -3853,8 +3857,8 @@
#: 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 ""
@@ -3944,7 +3948,7 @@
msgstr "IPn6 协议设置"

#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
msgid "Enable IPv6"
msgstr "启用 IPv6"

@@ -3999,8 +4003,8 @@

#: src/lib/network/confirm_virt_proposal.rb:24
msgid ""
-"Because of the bridged network, YaST2 needs to restart the network to apply"
-" the settings."
+"Because of the bridged network, YaST2 needs to restart the network to apply "
+"the settings."
msgstr "由于是桥接网络,YaST2 需要重启网络以应用设置。"

#. Opens dialog for editing NIC name
@@ -4037,7 +4041,7 @@

#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
msgid "Update configuration"
msgstr "更新配置"

@@ -4060,7 +4064,7 @@

#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
msgid "Updating configuration..."
msgstr "正在更新配置..."

@@ -4072,100 +4076,100 @@
msgstr "正在更新 /etc/resolv.conf ..."

#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
msgid "Hostname: Set by DHCP"
msgstr "主机名:由 DHCP 设置"

#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
msgid "Hostname: %1"
msgstr "主机名:%1"

-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr "主机名将不会写入 /etc/hosts"

#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "名称服务器:%1"

#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "搜索列表:%1"

#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
msgid "Update /etc/hosts"
msgstr "更新 /etc/hosts"

-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
msgid "Saving Hostname Configuration"
msgstr "正在保存主机名配置"

#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
msgid "Updating /etc/hosts ..."
msgstr "正在更新 /etc/hosts ..."

#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:271
msgid "Initializing Network Configuration"
msgstr "正在初始化网络配置"

#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:284
msgid "Detect network devices"
msgstr "检测网络设备"

#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:286
msgid "Read driver information"
msgstr "读取驱动信息"

#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:288
msgid "Read device configuration"
msgstr "读取设备配置"

#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:290
msgid "Read network configuration"
msgstr "读取网络配置"

#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:292
msgid "Read firewall settings"
msgstr "读取防火墙设置"

#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:294
msgid "Read hostname and DNS configuration"
msgstr "读取主机名和 DNS 配置"

#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:296
msgid "Read installation information"
msgstr "读取安装信息"

#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:298
msgid "Read routing configuration"
msgstr "读取路由配置"

#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:300
msgid "Detect current status"
msgstr "检测当前状态"

#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:314
msgid "Detecting ndiswrapper..."
msgstr "正在检测 ndiswrapper..."

#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:333
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
@@ -4175,7 +4179,7 @@
"但内核模块尚未加载。\n"
"您想要加载 ndiswrapper 模块吗?\n"

-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:341
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4184,304 +4188,296 @@
"请手动检查配置。\n"

#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:355
msgid "Detecting network devices..."
msgstr "正在检测网络设备..."

#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:363
msgid "Reading device configuration..."
msgstr "正在读取设备配置..."

#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:369
msgid "Reading network configuration..."
msgstr "正在读取网络配置..."

#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:378
msgid "Reading firewall settings..."
msgstr "正在读取防火墙设置..."

#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:386
msgid "Reading hostname and DNS configuration..."
msgstr "正在读取主机名和 DNS 配置..."

#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:393
msgid "Reading installation information..."
msgstr "正在读取安装信息..."

#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:399
msgid "Reading routing configuration..."
msgstr "正在读取路由配置..."

#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:405
msgid "Detecting current status..."
msgstr "正在检测当前状态..."

#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
msgid "Finished"
msgstr "已完成"

#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:437
msgid "To apply this change, a reboot is needed."
msgstr "要应用此改动,需要重启。"

#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:505
msgid "Saving Network Configuration"
msgstr "正在保存网络配置"

#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:512
msgid "Write drivers information"
msgstr "写入驱动信息"

#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:514
msgid "Write device configuration"
msgstr "写入设备配置"

#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:516
msgid "Write network configuration"
msgstr "写入网络配置"

#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:518
msgid "Write routing configuration"
msgstr "写入路由配置"

#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:520
msgid "Write hostname and DNS configuration"
msgstr "写入主机名和 DNS 配置"

#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:522
msgid "Set up network services"
msgstr "设置网络服务"

#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
msgid "Write firewall settings"
msgstr "写入防火墙设置"

#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:530
msgid "Activate network services"
msgstr "激活网络服务"

#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:546
msgid "Writing /etc/modprobe.conf..."
msgstr "正在写入 /etc/modprobe.conf..."

#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:551
msgid "Writing device configuration..."
msgstr "正在写入设备配置..."

#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:557
msgid "Writing network configuration..."
msgstr "正在写入网络配置..."

#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:563
msgid "Writing routing configuration..."
msgstr "正在写入路由配置..."

#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:571
msgid "Writing hostname and DNS configuration..."
msgstr "正在写入主机名和 DNS 配置..."

#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:584
msgid "Setting up network services..."
msgstr "正在设置网络服务..."

#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."

#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:602
msgid "Activating network services..."
msgstr "正在激活网络服务..."

-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:638
msgid "No network running"
msgstr "无网络运行"

-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: src/modules/Lan.rb:698
-msgid ""
-"AutoYaST setting networking/managed: NetworkManager is not available, Wicked"
-" will be used."
-msgstr "AutoYaST 设置网络/受管:NetworkManager 不可用,将使用 Wicked。"
-
#. Create a textual summary for the general network settings
#. proposal (NetworkManager + ipv6)
#. @return [rich text, links]
-#: src/modules/Lan.rb:782
+#: src/modules/Lan.rb:755
msgid "Network Mode"
msgstr "网络模式"

#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:760
msgid "Interfaces controlled by NetworkManager"
msgstr "由 NetworkManager 控制的接口"

#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:762
msgid "Disable NetworkManager"
msgstr "禁用 NetworkManager"

#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:766
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:796
+#: src/modules/Lan.rb:769
msgid "Enable NetworkManager"
msgstr "启用 NetworkManager"

#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:775
msgid "Support for IPv6 protocol is enabled"
msgstr "已启用 IPv6 协议支持"

#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:777
msgid "Disable IPv6"
msgstr "禁用 IPv6"

#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:781
msgid "Support for IPv6 protocol is disabled"
msgstr "禁用了对 IPv6 协议的支持"

#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:199
msgid "connected"
msgstr "已连接"

-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:200
msgid "datagram"
msgstr "数据报"

#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1272
msgid "Started automatically at boot"
msgstr "引导时自动启动"

#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically on cable connection"
msgstr "连接网线时自动启动"

#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1280
msgid "Managed by NetworkManager"
msgstr "由 NetworkManager 管理"

#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1284
msgid "Will not be started at all"
msgstr "根本不会启动"

-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1290
msgid "Started manually"
msgstr "手动启动"

#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1302
msgid "IP address assigned using"
msgstr "IP 地址指派自"

-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1306
msgid "IP address: %s/%s"
msgstr "IP 地址:%s/%s"

-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1309
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:1329
+#: src/modules/LanItems.rb:1333
msgid "Not configured"
msgstr "未配置"

#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
msgid "Device Name: %s"
msgstr "设备名称:%s"

-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1376
msgid "Bonding slaves"
msgstr "绑定从属"

-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1390
msgid "enslaved in %s"
msgstr "从属于 %s"

-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1391
msgid "Bonding master"
msgstr "绑定主体"

-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1405
msgid "Not connected"
msgstr "未连接"

-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1406
msgid "No hwinfo"
msgstr "无硬件信息"

-#: src/modules/LanItems.rb:1417
+#: 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."
+"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 输出。"
+"由于没有内核设备 (eth0, wlan0),无法配置网卡。这大多是缺少固件 (对于 wlan 设"
+"备) 造成的。细节请参考 dmesg 输出。"

-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1427
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr "设备尚未配置。请按<b>编辑</b>配置。\n"

-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1434
msgid "Needed firmware"
msgstr "所需固件"

-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1434
msgid "unknown"
msgstr "未知"

#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:159
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -4490,35 +4486,35 @@
"将禁用防火墙设置。"

#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:199
msgid "Configure display manager"
msgstr "配置显示管理器"

#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:204
msgid "Restart the services"
msgstr "重启服务"

-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:207
msgid "Saving Remote Administration Configuration"
msgstr "正在保存远程管理配置"

-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:216
msgid "Configuring display manager..."
msgstr "正在配置显示管理器..."

-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:220
msgid "Restarting the service..."
msgstr "正在重启服务..."

#. Enable xinetd
#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
msgid "Enabling service %{service} has failed"
msgstr "启动服务 %{service} 失败"

#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:281
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4529,30 +4525,30 @@
"请手动重启显示管理器或重新登录。"

#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:312
msgid "Remote administration is enabled."
msgstr "已启用远程管理。"

-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:312
msgid "Remote administration is disabled."
msgstr "已禁用远程管理。"

#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
msgid "Write IP forwarding settings"
msgstr "写入 IP 转发设置"

#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
msgid "Write routing settings"
msgstr "写入路由设置"

-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
msgid "Saving Routing Configuration"
msgstr "正在保存路由配置"

#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
msgid "Writing IP forwarding settings..."
msgstr "正在写入 IP 转发设置..."

@@ -4561,22 +4557,22 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:281
+#: src/modules/Routing.rb:284
msgid "Writing routing settings..."
msgstr "正在写入路由设置..."

#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
msgid "Gateway: %s"
msgstr "网关:%s"

#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
msgid "IP Forwarding for IPv4: %s"
msgstr "IPv4 转发:%s"

#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
msgid "IP Forwarding for IPv6: %s"
msgstr "IPv6 转发:%s"

@@ -4595,6 +4591,47 @@
msgid "(Unprotected)"
msgstr "(无保护的)"

+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "已成功保存配置"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "已成功保存 DNS 配置"
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "已成功保存 DSL 配置"
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "已成功保存主机配置"
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "已成功保存 ISDN 配置"
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "已成功保存网卡配置"
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "已成功保存调制解调器配置"
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "已成功保存代理配置"
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "已成功保存服务提供商配置"
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "已成功保存路由配置"
+
+#~ msgid "Configure mail now?"
+#~ msgstr "现在配置邮件吗?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "运行 %1 的配置吗?"
+
+#~ msgid ""
+#~ "AutoYaST setting networking/managed: NetworkManager is not available, "
+#~ "Wicked will be used."
+#~ msgstr "AutoYaST 设置网络/受管:NetworkManager 不可用,将使用 Wicked。"
+
#~ msgid "Device boot protocol"
#~ msgstr "设备引导协议"

@@ -4619,7 +4656,8 @@
#~ 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 ""
@@ -4637,15 +4675,20 @@
#~ 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 (<a
href=\"%1\">disable and close</a>)"
+#~ msgid ""
+#~ "SSH service will be enabled, SSH port will be open (<a href="
+#~ "\"%1\">disable and close</a>)"
#~ msgstr "将启用 SSH 服务并打开 SSH 端口 (<a href=\"%1\">禁用并关闭</a>)"

-#~ msgid "SSH service will be disabled, SSH port will be blocked (<a
href=\"%1\">enable and open</a>)"
+#~ msgid ""
+#~ "SSH service will be disabled, SSH port will be blocked (<a href="
+#~ "\"%1\">enable and open</a>)"
#~ msgstr "将禁用 SSH 服务并屏蔽 SSH 端口 (<a href=\"%1\">启用并打开</a>)"

#~ msgid "General &Network Settings"
@@ -4741,7 +4784,8 @@
#~ 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 ""
@@ -4830,14 +4874,18 @@
#~ "<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</i>。\n"
+#~ "若您的 DSL 调制解调器通过以太网与计算机连接,请用 <i>PPP over Ethernet</"
+#~ "i>。\n"
#~ "若您想要连接到一个 VPN 服务器,请用<i>点对点隧道协议</i>。\n"
#~ "若您不确定使用哪种模式,请垂询您的服务提供商。</p>"

@@ -4847,8 +4895,10 @@
#~ 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</i>\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 ""
@@ -4995,7 +5045,8 @@

#~ 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.</P>\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"
@@ -5022,9 +5073,11 @@
#~ 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"
@@ -5032,26 +5085,36 @@
#~ 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>,则将以正常方式处理呼叫,而不进行特殊处理。</p>\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 ""
@@ -5089,11 +5152,13 @@
#~ 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 接口</b>配置您的 DSL 连接。\n"
+#~ "<p>若您有一个组合式 ISDN 和 DSL CAPI 控制器,请通过<b>添加 DSL CAPI 接口</"
+#~ "b>配置您的 DSL 连接。\n"
#~ "您也可以稍后在 DSL 配置对话框中这么做。</p>\n"

#~ msgid ""
@@ -5102,14 +5167,17 @@
#~ "the default for all common Internet providers.</p>\n"
#~ msgstr ""
#~ "<p>通过 ISDN 上网有两种类型的接口:<b>RawIP</b> 和 <b>SyncPPP</b>。\n"
-#~ "大多数情况下使用 SyncPPP。全部常见互联网服务提供商默认均使用 SyncPPP。</p>\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 ""
@@ -5151,14 +5219,19 @@

#~ 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>"
@@ -5173,7 +5246,8 @@
#~ "</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"
@@ -5183,15 +5257,18 @@

#~ 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 ""
@@ -5211,7 +5288,8 @@
#~ "<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"
@@ -5248,7 +5326,9 @@
#~ 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"
@@ -5257,7 +5337,8 @@
#~ "This is the default with most providers.\n"
#~ "</p>\n"
#~ msgstr ""
-#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址</b>。\n"
+#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址</"
+#~ "b>。\n"
#~ "在这种情况下,外发地址直到链接建立前的那个时刻前都是未知的。\n"
#~ "这时多数服务提供商的默认设置。\n"
#~ "</p>\n"
@@ -5329,9 +5410,11 @@
#~ 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 ""
@@ -5352,22 +5435,28 @@
#~ "<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"
@@ -5563,8 +5652,10 @@
#~ 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"
@@ -5574,13 +5665,18 @@
#~ 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>).</p>\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"
@@ -5632,7 +5728,8 @@
#~ 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)"
@@ -5675,9 +5772,12 @@

#~ 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"
@@ -5688,7 +5788,9 @@
#~ 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>名称服务器</i>。</p>"
+#~ msgstr ""
+#~ "<p>若启用了<b>修改 DNS</b>,则会在连接到互联网时自动修改<i>名称服务器</"
+#~ "i>。</p>"

#~ msgid ""
#~ "<p>If the provider does not transmit its domain name server (DNS)\n"
@@ -5700,7 +5802,8 @@

#~ 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 ""
@@ -5710,8 +5813,10 @@
#~ "则只需指定名称服务器。</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"
@@ -5728,8 +5833,11 @@

#~ 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).</p>\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 "分钟"
@@ -5792,18 +5900,23 @@

#~ 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"
@@ -5811,23 +5924,28 @@
#~ "现在几乎全部服务提供商都支持<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"
@@ -5958,7 +6076,8 @@
#~ 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 "服务提供商参数"
@@ -5974,13 +6093,17 @@
#~ msgstr "<p>请为服务提供商输入一个<b>服务提供商名称</b>。</p>"

#~ msgid ""
-#~ "<p>Enter a <b>Provider Name</b> for the provider and a <b>Phone
Number</b>\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"
@@ -6000,18 +6123,22 @@
#~ 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</i>\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"
@@ -6094,7 +6221,8 @@
#~ "请使用 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 ""
@@ -6108,38 +6236,47 @@
#~ 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.</p>\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>。若遇到困难请垂询您的服务提供商。</p>\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>。若遇到困难请垂询您的服务提供商。</p>\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</"
+#~ "p>\n"

#~ msgid "<p>Access to Kamp Eggenet DSL.</p>"
#~ msgstr "<p>Kamp Eggenet DSL 连接</p>"
@@ -6156,11 +6293,14 @@

#~ 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>/</b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
+#~ "<p>在<b>用户名</b>字段中,用您的 T-Online Business 登录名替换空格 (<b>/</"
+#~ "b> 后面)。\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</"
+#~ "p>\n"

#~ msgid "Provider Configuration"
#~ msgstr "服务提供商配置"
@@ -6171,14 +6311,17 @@
#~ 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>。</p>\n"
+#~ "任何用户都可以通过 QInternet 控制接口。这需要安装和运行 <b>smpppd</b>。</"
+#~ "p>\n"

#~ msgid "Initializing DSL Configuration"
#~ msgstr "正在初始化 DSL 配置"
@@ -6521,7 +6664,8 @@
#~ "万维网 (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"
@@ -6539,7 +6683,8 @@

#, 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 ""
@@ -6564,11 +6709,13 @@
#~| 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"
@@ -6653,7 +6800,8 @@
#, 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"
@@ -6665,11 +6813,16 @@

#, 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</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"
+#~ "<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"

@@ -6690,13 +6843,16 @@
#~ 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"
@@ -6734,7 +6890,8 @@

#~ 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>"
@@ -6755,8 +6912,11 @@
#~ 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>"
@@ -6766,8 +6926,10 @@
#~ "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"
@@ -6789,7 +6951,8 @@

#~ 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"
@@ -6815,7 +6978,8 @@

#~ 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"
@@ -6828,10 +6992,14 @@
#~ 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.</p>"
+#~ 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_server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2016-06-03 15:03:18 UTC (rev
95899)
+++ trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2016-06-05 16:43:05 UTC (rev
95900)
@@ -6,21 +6,21 @@
# James Su <suzhe@xxxxxxxxxxxxxxx>, 2004.
# Novell Language <language@xxxxxxxxxx>, 2004, 2005.
# Thruth Wang <lihaow@xxxxxxxxx>, 2007, 2012.
-# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014.
+# 玛格丽特 · 苏 <i@xxxxxxxxxxxxx>, 2013, 2014, 2016.
msgid ""
msgstr ""
"Project-Id-Version: nfs server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
-"PO-Revision-Date: 2014-06-10 10:38+0800\n"
-"Last-Translator: 玛格丽特 · 苏 <marguerite@xxxxxxxxxxxx>\n"
-"Language-Team: Chinese Simplified <opensuse-zh@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"PO-Revision-Date: 2016-06-05 16:56+0800\n"
+"Last-Translator: marguerite <marguerite@xxxxxxxxxxxx>\n"
+"Language-Team: Chinese <opensuse-zh@xxxxxxxxxxxx>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"

#. Command line help text for the nfs-server module
#: src/clients/nfs_server.rb:46
@@ -66,7 +66,9 @@
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
@@ -78,27 +80,27 @@
msgstr "启用/禁用安全网络文件系统的是/否选项。"

#. summary text
-#: src/clients/nfs_server.rb:196
+#: src/clients/nfs_server.rb:202
msgid "NFS server is enabled"
msgstr "已启用网络文件系统服务器"

#. summary text
-#: src/clients/nfs_server.rb:199
+#: src/clients/nfs_server.rb:205
msgid "NFS server is disabled"
msgstr "已禁用网络文件系统服务器"

#. error message
-#: src/clients/nfs_server.rb:215
+#: src/clients/nfs_server.rb:221
msgid "Required packages (%1) are not installed."
msgstr "未安装必需的软件包 (%1)。"

#. error
#. error
-#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
+#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
msgid "No mount point specified."
msgstr "未指定挂载点。"

-#: src/clients/nfs_server.rb:260
+#: src/clients/nfs_server.rb:266
msgid ""
"The exports table already\n"
"contains this directory."
@@ -107,13 +109,18 @@
#. CLI action handler.
#. @param [Hash] options command options
#. @return whether successful
-#: src/clients/nfs_server.rb:319
-msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4'
command."
+#: src/clients/nfs_server.rb:325
+msgid ""
+"Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
msgstr "未启用第四版网络文件系统不能设置域。请使用 'set enablev4' 命令。"

-#: 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' 获知可用选项信息。"
+#: 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' 获知可用选项信"
+"息。"

#. Then no need to check for conflict.
#: src/include/nfs_server/routines.rb:205
@@ -121,7 +128,9 @@
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
@@ -168,55 +177,65 @@
"配置文件中也可能有伪空格。\n"

#. text entry label
-#: src/include/nfs_server/ui.rb:58
+#: src/include/nfs_server/ui.rb:68
msgid "&Directory to Export"
msgstr "要导出的目录(&D)"

#. button label
-#: src/include/nfs_server/ui.rb:64
+#: src/include/nfs_server/ui.rb:74
msgid "&Browse..."
msgstr "浏览(&B)..."

-#: src/include/nfs_server/ui.rb:87
+#: src/include/nfs_server/ui.rb:97
msgid "Enter a non-empty export path. For example, /exports."
msgstr "请输入非空导出路径。 如: /exports。"

#. error popup message
-#: src/include/nfs_server/ui.rb:95
+#: src/include/nfs_server/ui.rb:105
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:101
+#: src/include/nfs_server/ui.rb:126
msgid "The directory does not exist. Create it?"
msgstr "该目录不存在。创建它吗?"

#. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:111
+#: src/include/nfs_server/ui.rb:136
msgid "Select the Directory to Export"
msgstr "选择要导出的目录"

#. text entry label
-#: src/include/nfs_server/ui.rb:168
+#: src/include/nfs_server/ui.rb:193
msgid "&Host Wild Card"
msgstr "主机通配符(&H)"

#. text entry label
-#: src/include/nfs_server/ui.rb:170
+#: src/include/nfs_server/ui.rb:195
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:222
+#: src/include/nfs_server/ui.rb:250
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:240
+#: src/include/nfs_server/ui.rb:268
msgid ""
"Options for this wild card\n"
"are already set."
@@ -224,12 +243,14 @@

#. Opening NFS server dialog
#. @return `back, `abort, `next `or finish
-#: 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'."
+#: 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'."
msgstr "无法读取 /etc/idmapd.conf 文件。正在将域默认设置设为 'localdomain'。"

#. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:295
+#: src/include/nfs_server/ui.rb:323
msgid ""
"<P>Here, choose whether to start an NFS server on your computer\n"
"and export some of your directories to others.</P>"
@@ -238,7 +259,7 @@
"并且将某些目录导出到其它目录中。</P>"

#. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:302
+#: src/include/nfs_server/ui.rb:330
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>"
@@ -246,64 +267,70 @@
"<P>若您选择了<B>启动网络文件系统服务器</B>,点击<B>下一步</B>将打开一个\n"
"配置对话框,在其中可指定要导出的目录。</P>"

-#: src/include/nfs_server/ui.rb:311
+#: src/include/nfs_server/ui.rb:339
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:321
+#: src/include/nfs_server/ui.rb:349
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:331
+#: src/include/nfs_server/ui.rb:359
msgid "NFS Server"
msgstr "网络文件系统服务器"

#. radio button label
-#: src/include/nfs_server/ui.rb:342
+#: src/include/nfs_server/ui.rb:370
msgid "&Start"
msgstr "启动(&S)"

#. radio button label
-#: src/include/nfs_server/ui.rb:351
+#: src/include/nfs_server/ui.rb:379
msgid "Do &Not Start"
msgstr "不启动(&N)"

#. frame label
-#: src/include/nfs_server/ui.rb:369
+#: src/include/nfs_server/ui.rb:397
msgid "Enable NFSv4"
msgstr "启用第四版网络文件系统"

-#: src/include/nfs_server/ui.rb:376
+#: src/include/nfs_server/ui.rb:404
msgid "Enable NFS&v4"
msgstr "启用第四版网络文件系统(&V)"

-#: src/include/nfs_server/ui.rb:381
+#: src/include/nfs_server/ui.rb:409
msgid "Enter NFSv4 do&main name:"
msgstr "输入第四版网络文件系统域名(&M):"

-#: src/include/nfs_server/ui.rb:391
+#: src/include/nfs_server/ui.rb:419
msgid "Enable &GSS Security"
msgstr "启用 &GSS 安全"

#. dialog title
-#: src/include/nfs_server/ui.rb:411
+#: src/include/nfs_server/ui.rb:439
msgid "NFS Server Configuration"
msgstr "网络文件系统服务器配置"

#. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:487
+#: src/include/nfs_server/ui.rb:515
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"
@@ -314,72 +341,79 @@
"允许挂载该目录的主机。</P>\n"

#. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:495
+#: src/include/nfs_server/ui.rb:524
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
-#: src/include/nfs_server/ui.rb:503
-msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all
hosts.</p>"
+#. 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>"
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:509
+#: src/include/nfs_server/ui.rb:551
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:524
+#: src/include/nfs_server/ui.rb:567
msgid "Add &Directory"
msgstr "添加目录(&D)"

#. push button label
-#: src/include/nfs_server/ui.rb:526
+#: src/include/nfs_server/ui.rb:569
msgid "&Edit"
msgstr "编辑(&E)"

#. push button label
-#: src/include/nfs_server/ui.rb:528
+#: src/include/nfs_server/ui.rb:571
msgid "De&lete"
msgstr "删除(&L)"

#. table header
-#: src/include/nfs_server/ui.rb:541
+#: src/include/nfs_server/ui.rb:584
msgid "Host Wild Card"
msgstr "主机通配符"

#. table header
-#: src/include/nfs_server/ui.rb:543
+#: src/include/nfs_server/ui.rb:586
msgid "Options"
msgstr "选项"

#. push button label
-#: src/include/nfs_server/ui.rb:554
+#: src/include/nfs_server/ui.rb:597
msgid "Add &Host"
msgstr "添加主机(&H)"

#. push button label
-#: src/include/nfs_server/ui.rb:556
+#: src/include/nfs_server/ui.rb:599
msgid "Ed&it"
msgstr "编辑(&I)"

#. push button label
-#: src/include/nfs_server/ui.rb:558
+#: src/include/nfs_server/ui.rb:601
msgid "Dele&te"
msgstr "删除(&T)"

#. dialog title
-#: src/include/nfs_server/ui.rb:565
+#: src/include/nfs_server/ui.rb:608
msgid "Directories to Export"
msgstr "要导出的目录"

#. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:158
+#: src/modules/NfsServer.rb:181
msgid ""
"Unable to create a missing directory:\n"
"%1"
@@ -388,7 +422,7 @@
"%1"

#. error popup message
-#: src/modules/NfsServer.rb:170
+#: src/modules/NfsServer.rb:193
msgid ""
"Unable to write to /etc/exports.\n"
"No changes will be made to the\n"
@@ -398,60 +432,74 @@
"将不会修改导出目录。\n"

#. dialog label
-#: src/modules/NfsServer.rb:192
+#: src/modules/NfsServer.rb:228
msgid "Writing NFS Server Configuration"
msgstr "正在写入网络文件系统服务器配置"

#. progress stage label
-#: src/modules/NfsServer.rb:197
+#: src/modules/NfsServer.rb:233
msgid "Save /etc/exports"
msgstr "保存 /etc/exports"

#. progress stage label
-#: src/modules/NfsServer.rb:199
+#: src/modules/NfsServer.rb:235
msgid "Restart services"
msgstr "重启服务"

#. progress step label
-#: src/modules/NfsServer.rb:203
+#: src/modules/NfsServer.rb:239
msgid "Saving /etc/exports..."
msgstr "正在保存 /etc/exports..."

#. progress step label
-#: src/modules/NfsServer.rb:205
+#: src/modules/NfsServer.rb:241
msgid "Restarting services..."
msgstr "正在重启服务..."

#. final progress step label
-#: src/modules/NfsServer.rb:207
+#: src/modules/NfsServer.rb:243
msgid "Finished"
msgstr "已完成"

#. help text
-#: src/modules/NfsServer.rb:215
+#: src/modules/NfsServer.rb:251
msgid "Writing NFS server settings. Please wait..."
msgstr "正在写入网络文件系统服务器设置。请稍候..."

#. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:229
+#: src/modules/NfsServer.rb:265
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:266
-msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils)
setup is correct."
+#: src/modules/NfsServer.rb:339
+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:275
-msgid "Unable to restart 'svcgssd' service."
-msgstr "无法重启 'svcgssd' 服务。"
+#: src/modules/NfsServer.rb:349
+msgid "'svcgssd' is already running. Unable to restart it."
+msgstr "'svcgssd' 已在运行。无法重启它。"

-#: src/modules/NfsServer.rb:283
+#: src/modules/NfsServer.rb:357
msgid "'svcgssd' is running. Unable to stop it."
msgstr "'svcgssd' 正在运行。无法停止它。"

#. error popup message
-#: src/modules/NfsServer.rb:299
+#: src/modules/NfsServer.rb:376
msgid ""
"Unable to restart the NFS server.\n"
"Your changes will be active after reboot.\n"
@@ -460,35 +508,18 @@
"您的修改将在重引导后生效。\n"

#. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:322
+#: src/modules/NfsServer.rb:399
msgid "NFS Exports"
msgstr "网络文件系统导出表"

#. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:340
+#: src/modules/NfsServer.rb:417
msgid "The NFSv4 domain for idmapping is %1."
msgstr "用于 ID 映射的第四版网络文件系统域是 %1 。"

-#~ 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 "Unable to restart 'svcgssd' service."
+#~ msgstr "无法重启 'svcgssd' 服务。"

-#~ 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 stop idmapd."
-#~ msgstr "无法停止 idmapd。"
-
-#~ msgid "'svcgssd' is already running. Unable to restart it."
-#~ msgstr "'svcgssd' 已在运行。无法重启它。"
-
#~ msgid "Directories"
#~ msgstr "目录"

@@ -498,20 +529,27 @@
#~ 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>已启用第四版网络