Author: keichwa Date: 2016-09-13 15:06:04 +0200 (Tue, 13 Sep 2016) New Revision: 96907 Added: branches/plus-SLE12-SP2/yast/zh_CN/po/alternatives.zh_CN.po Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/add-on-creator.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/add-on.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/audit-laf.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/auth-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/autoinst.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/base.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/bootloader.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/ca-management.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/cio.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/cluster.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/control-center.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/control.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/country.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/dhcp-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/dns-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/docker.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/drbd.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/fcoe-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/firewall-services.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/firewall.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/firstboot.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/ftp-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/geo-cluster.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/http-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/inetd.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/installation.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/instserver.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/iplb.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-lio-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/isns.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/journal.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/kdump.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/languages_db.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/ldap-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/ldap.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/mail.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/migration.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/multipath.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/network.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/nfs.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/nfs_server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/nis.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/nis_server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/ntp-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/online-update-configuration.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/online-update.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/packager.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/pam.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/pkg-bindings.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/printer.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/product-creator.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/proxy.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/rear.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/registration.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/relocation-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/s390.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/samba-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/samba-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/samba-users.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/scanner.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/security.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/services-manager.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/slp-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/snapper.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/sound.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/squid.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/storage.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/sudo.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/support.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/sysconfig.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/tftp-server.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/timezone_db.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/tune.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/update.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/users.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/vm.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/wol.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/xpram.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/yast2-apparmor.zh_CN.po Log: merged Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/add-on-creator.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/add-on-creator.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/add-on-creator.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: add-on-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/add-on.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/add-on.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/add-on.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Added: branches/plus-SLE12-SP2/yast/zh_CN/po/alternatives.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/alternatives.zh_CN.po (rev 0) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/alternatives.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -0,0 +1,116 @@ +# Chinese message file for YaST2 (@memory@) +# Copyright (C) 2005 SUSE Linux Products GmbH. +# Copyright (C) 2002 SuSE Linux AG. +# Copyright (C) 2001 SuSE GmbH. +# +msgid "" +msgstr "" +"Project-Id-Version: YaST (@memory@)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-12 09:12+0200\n" +"PO-Revision-Date: 2004-04-02 10:52+0200\n" +"Last-Translator: 裴寒牧 <phm@a2e.de>\n" +"Language-Team: 中华 <nls-zh@suse.de>\n" +"Language: \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" + +#. Dialog for displaying possible Choices for one particular Alternative. +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:86 +msgid "Choice" +msgstr "" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:86 +msgid "Priority" +msgstr "优先级" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:99 +#, fuzzy +#| msgid "Set option" +msgid "Set choice" +msgstr "设置选项" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:100 +#, fuzzy +#| msgid "Set up automatic online update" +msgid "Set automatic mode" +msgstr "设置自动在线更新" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:109 +#, fuzzy +#| msgid "&Name:" +msgid "Name:" +msgstr "名称(&N)：" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:110 +#, fuzzy +#| msgid "Status" +msgid "Status:" +msgstr "状态" + +#: src/lib/y2_alternatives/dialog/edit_alternative.rb:111 +#, fuzzy +#| msgid "Current Time" +msgid "Current choice:" +msgstr "当前时间" + +#. Dialog where all alternatives groups in the system are listed. +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:53 +msgid "Help" +msgstr "帮助" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:61 +msgid "" +"<p>The alternatives system is used when some equivalent applications are installed in the system. For example if several implementations and versions of Java are installed, the alternatives system will be used to decide which one to use when the command \"java\" is called.</p><p>Every alternative have an status, it can be automatic or manual. In <b>automatic mode</b> the system uses the choice with higher priority. Note that <b>priority</b> is set by the packages creators trying to provide reasonable defaults. The <b>manual mode</b> is set when the user selects a choice manually.</p><p>To change the current choice of an alternative, select the alternative, click the <b>edit</b> button then select the desired choice in the table and click on the <b>set choice</b> button. If you want to have the alternative in automatic mode just click the <b>set automatic mode</b> button in the edit dialog.</p><p>Furthermore every choice has its own set of <b>slaves</b>, these will be applied in the system when the choice is selected.</p><p>For example, given an alternative \"editor\" that has two choices.The first choice \"/bin/ed\" with the slave:</p><pre> editor.1.gz /usr/share/man/man1/ed.1.gz</pre><p>Another choice \"/usr/bin/vim\" with the following slaves:</p><pre> editor.1.gz /usr/share/man/man1/vim.1.gz\n" +" editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n" +" editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n" +" editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n" +" editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n" +"</pre><p>In this case if the second choice is selected all its slaves will be modified, or created if they do not exist already. If the \"/bin/ed\" choice is set afterward, the slave \"editor.1.gz\" will be modified and the others will be removed.</p>" +msgstr "" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:115 +#, fuzzy +#| msgid "<p>All your choices will be lost when exiting with Cancel.<br>Really exit?</p>" +msgid "" +"All the changes will be lost if you leave with Cancel.\n" +"Do you really want to quit?" +msgstr "<p>在使用\"取消\"退出时，所有选择都将丢失。<br>是否确实要退出？</p>" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:143 +#, fuzzy +#| msgid "Current Time" +msgid "Current choice" +msgstr "当前时间" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:143 +msgid "Name" +msgstr "名称" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:143 +msgid "Status" +msgstr "状态" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:150 +#, fuzzy +#| msgid "autoyast" +msgid "auto" +msgstr "autoyast" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:151 +#, fuzzy +#| msgid "[manually set]" +msgid "manual" +msgstr "[手工设置]" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:172 +#, fuzzy +#| msgid "Search in" +msgid "Search by name" +msgstr "搜索范围" + +#: src/lib/y2_alternatives/dialog/list_alternatives.rb:176 +msgid "Show only alternatives with more than one choice" +msgstr "" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/audit-laf.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/audit-laf.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/audit-laf.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: audit-laf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: auth-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -963,7 +963,7 @@ msgid "Override the user's home directory. You can either provide an absolute value or a template." msgstr "覆盖用户的主目录。您可以提供绝对值或模板。" -#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213 +#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1251 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." msgstr "如果域的数据提供程序未显式指定用户主目录的默认模板，则设置一个默认模板。" @@ -983,7 +983,7 @@ msgid "The default shell to use if an allowed shell is not installed on the machine." msgstr "计算机上未安装允许的外壳时要使用的默认外壳。" -#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217 +#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1255 msgid "The default shell to use if the provider does not return one during lookup." msgstr "提供程序在查找期间未返回外壳时要使用的默认外壳。" @@ -1012,8 +1012,8 @@ msgstr "对于 SSSD 联机时的任何 PAM 请求，SSSD 将尝试立即更新用户的超速缓存身份信息，以确保使用最新的信息进行身份验证。" #. The kerberos domain section -#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815 -#: src/lib/authui/sssd/params.rb:1100 +#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:809 +#: src/lib/authui/sssd/params.rb:1138 msgid "Display a warning N days before the password expires." msgstr "在口令失效之前显示警告 N 天。" @@ -1205,528 +1205,573 @@ msgid "(Active Directory specific) Use token-groups attribute if available" msgstr "（特定于 Active Directory）使用 token-groups 属性（如可用）" -#: src/lib/authui/sssd/params.rb:595 +#: src/lib/authui/sssd/params.rb:594 msgid "URIs (ldap://) of LDAP servers (comma separated)" msgstr "LDAP 服务器的 URI (ldap://)（以逗号分隔）" -#: src/lib/authui/sssd/params.rb:601 -msgid "The default base DN to use for performing LDAP sudo rules." -msgstr "用于执行 LDAP sudo 规则的默认基本 DN。" +#: src/lib/authui/sssd/params.rb:599 +msgid "An optional base DN to restrict LDAP sudo-rule searches. The default value is ldap_search_base." +msgstr "" -#: src/lib/authui/sssd/params.rb:606 +#: src/lib/authui/sssd/params.rb:603 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference." msgstr "指定 SSSD 应按优先顺序连接到的 LDAP 服务器 URI 的逗号分隔列表。" -#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618 +#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:613 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." msgstr "指定 SSSD 为更改用户口令而应按优先顺序连接到的 LDAP 服务器 URI 的逗号分隔列表。" -#: src/lib/authui/sssd/params.rb:624 +#: src/lib/authui/sssd/params.rb:618 msgid "Base DN for LDAP search" msgstr "LDAP 搜索的基本 DN" -#: src/lib/authui/sssd/params.rb:631 +#: src/lib/authui/sssd/params.rb:625 msgid "LDAP schema type" msgstr "LDAP 纲要类型" -#: src/lib/authui/sssd/params.rb:635 +#: src/lib/authui/sssd/params.rb:629 msgid "The default bind DN to use for performing LDAP operations." msgstr "用于执行 LDAP 操作的默认绑定 DN。" -#: src/lib/authui/sssd/params.rb:641 +#: src/lib/authui/sssd/params.rb:635 msgid "The type of the authentication token of the default bind DN." msgstr "默认绑定 DN 的身份验证令牌类型。" -#: src/lib/authui/sssd/params.rb:645 +#: src/lib/authui/sssd/params.rb:639 msgid "The authentication token of the default bind DN." msgstr "默认绑定 DN 的身份验证令牌。" -#: src/lib/authui/sssd/params.rb:650 +#: src/lib/authui/sssd/params.rb:644 msgid "The object class of a user entry in LDAP." msgstr "LDAP 中用户项的对象类。" -#: src/lib/authui/sssd/params.rb:655 +#: src/lib/authui/sssd/params.rb:649 msgid "The LDAP attribute that corresponds to the user's login name." msgstr "对应于用户登录名的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:660 +#: src/lib/authui/sssd/params.rb:654 msgid "The LDAP attribute that corresponds to the user's id." msgstr "对应于用户 ID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:665 +#: src/lib/authui/sssd/params.rb:659 msgid "The LDAP attribute that corresponds to the user's primary group id." msgstr "对应于用户主组 ID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:670 +#: src/lib/authui/sssd/params.rb:664 msgid "The LDAP attribute that corresponds to the user's gecos field." msgstr "对应于用户 gecos 字段的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:675 +#: src/lib/authui/sssd/params.rb:669 msgid " The LDAP attribute that contains the name of the user's home directory." msgstr " 包含用户主目录名称的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:680 +#: src/lib/authui/sssd/params.rb:674 msgid "The LDAP attribute that contains the path to the user's default shell." msgstr "包含用户默认外壳路径的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:685 +#: src/lib/authui/sssd/params.rb:679 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object." msgstr "包含 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:690 +#: src/lib/authui/sssd/params.rb:684 msgid "The LDAP attribute that contains the objectSID of an LDAP user object." msgstr "包含 LDAP 用户对象的 objectSID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900 +#: src/lib/authui/sssd/params.rb:689 src/lib/authui/sssd/params.rb:894 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "包含父对象上次修改时间戳的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:700 +#: src/lib/authui/sssd/params.rb:694 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)." msgstr "如果使用 ldap_pwd_policy=shadow，此参数将包含与其 shadow(5) 对等项（上次更改口令的日期）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:705 +#: src/lib/authui/sssd/params.rb:699 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)." msgstr "如果使用 ldap_pwd_policy=shadow，此参数将包含与其 shadow(5) 对等项（最短口令有效期）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:710 +#: src/lib/authui/sssd/params.rb:704 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)." msgstr "如果使用 ldap_pwd_policy=shadow，此参数将包含与其 shadow(5) 对等项（最长口令有效期）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:715 +#: src/lib/authui/sssd/params.rb:709 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)." msgstr "如果使用 ldap_pwd_policy=shadow，此参数将包含与其 shadow(5) 对等项（口令警告期限）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:720 +#: src/lib/authui/sssd/params.rb:714 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)." msgstr "如果使用 ldap_pwd_policy=shadow，此参数将包含与其 shadow(5) 对等项（口令非活动期限）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:725 +#: src/lib/authui/sssd/params.rb:719 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)." msgstr "如果使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow，此参数将包含与其 shadow(5) 对等项（帐户失效日期）对应的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:730 +#: src/lib/authui/sssd/params.rb:724 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos." msgstr "如果使用 ldap_pwd_policy=mit_kerberos，此参数将包含在 kerberos 中储存口令上次更改日期和时间的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:735 +#: src/lib/authui/sssd/params.rb:729 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires." msgstr "如果使用 ldap_pwd_policy=mit_kerberos，此参数将包含储存当前口令失效日期和时间的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:740 +#: src/lib/authui/sssd/params.rb:734 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account." msgstr "如果使用 ldap_account_expire_policy=ad，此参数将包含储存帐户失效时间的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:745 +#: src/lib/authui/sssd/params.rb:739 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field." msgstr "如果使用 ldap_account_expire_policy=ad，此参数将包含储存用户帐户控制位字段的 LDAP 属性的名称。" -#: src/lib/authui/sssd/params.rb:750 +#: src/lib/authui/sssd/params.rb:744 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not." msgstr "如果使用 ldap_account_expire_policy=rhds 或对等项，此参数将规定是否允许访问。" -#: src/lib/authui/sssd/params.rb:755 +#: src/lib/authui/sssd/params.rb:749 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." msgstr "如果使用 ldap_account_expire_policy=nds，此属性将规定是否允许访问。" -#: src/lib/authui/sssd/params.rb:760 +#: src/lib/authui/sssd/params.rb:754 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." msgstr "如果使用 ldap_account_expire_policy=nds，此属性将规定授予的访问权限的截止日期。" -#: src/lib/authui/sssd/params.rb:765 +#: src/lib/authui/sssd/params.rb:759 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted." msgstr "如果使用 ldap_account_expire_policy=nds，此属性将规定在某个星期日期的哪几个小时授予访问权限。" -#: src/lib/authui/sssd/params.rb:770 +#: src/lib/authui/sssd/params.rb:764 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." msgstr "包含用户的 Kerberos 用户主体名称 (UPN) 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:774 +#: src/lib/authui/sssd/params.rb:768 msgid "The LDAP attribute that contains the user's SSH public keys." msgstr "包含用户 SSH 公共密钥的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:779 +#: src/lib/authui/sssd/params.rb:773 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." msgstr "某些目录服务器（例如 Active Directory）可能以小写提供 UPN 的领域部分，这可能会导致身份验证失败。" -#: src/lib/authui/sssd/params.rb:780 +#: src/lib/authui/sssd/params.rb:774 msgid "Set this option to true if you want to use an upper-case realm." msgstr "如果您要使用大写领域，请将此选项设置为 true。" -#: src/lib/authui/sssd/params.rb:785 +#: src/lib/authui/sssd/params.rb:779 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." msgstr "指定刷新 SSSD 的枚举记录超速缓存之前，SSSD 必须等待的秒数。" -#: src/lib/authui/sssd/params.rb:790 +#: src/lib/authui/sssd/params.rb:784 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space." msgstr "规定在超速缓存中检查非活动项（例如，没有成员的组以及从未登录过的用户）并去除这些项以节省空间的频率。" -#: src/lib/authui/sssd/params.rb:795 +#: src/lib/authui/sssd/params.rb:789 msgid "The LDAP attribute that corresponds to the user's full name." msgstr "对应于用户全名的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:800 +#: src/lib/authui/sssd/params.rb:794 msgid "The LDAP attribute that lists the user's group memberships." msgstr "列出用户组成员资格的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:805 +#: src/lib/authui/sssd/params.rb:799 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." msgstr "如果 access_provider=ldap 并且 ldap_access_order=authorized_service，SSSD 将使用用户 LDAP 项中 authorizedService 属性包含的值来确定访问特权。" -#: src/lib/authui/sssd/params.rb:810 +#: src/lib/authui/sssd/params.rb:804 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." msgstr "如果 access_provider=ldap 并且 ldap_access_order=host，SSSD 将使用用户 LDAP 项中 host 属性包含的值来确定访问特权。" -#: src/lib/authui/sssd/params.rb:820 +#: src/lib/authui/sssd/params.rb:814 msgid "The object class of a group entry in LDAP." msgstr "LDAP 中组项的对象类。" -#: src/lib/authui/sssd/params.rb:825 +#: src/lib/authui/sssd/params.rb:819 msgid "The LDAP attribute that corresponds to the group name." msgstr "对应于组名的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:830 +#: src/lib/authui/sssd/params.rb:824 msgid "The LDAP attribute that corresponds to the group's id." msgstr "对应于组 ID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:835 +#: src/lib/authui/sssd/params.rb:829 msgid "The LDAP attribute that contains the names of the group's members." msgstr "包含组成员名称的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:840 +#: src/lib/authui/sssd/params.rb:834 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object." msgstr "包含 LDAP 组对象的 UUID/GUID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:845 +#: src/lib/authui/sssd/params.rb:839 msgid "The LDAP attribute that contains the objectSID of an LDAP group object." msgstr "包含 LDAP 组对象的 objectSID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:850 +#: src/lib/authui/sssd/params.rb:844 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr " 包含父对象上次修改时间戳的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:856 +#: src/lib/authui/sssd/params.rb:850 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow." msgstr "如果 ldap_schema 设置为支持嵌套组（例如 RFC2307bis）的纲要格式，则此选项将控制后接多少个嵌套 SSSD 级别。" -#: src/lib/authui/sssd/params.rb:862 +#: src/lib/authui/sssd/params.rb:856 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." msgstr "此选项指示 SSSD 利用特定于 Active Directory 的功能，以在包含复杂组或深度嵌套组的部署中加速组查找操作。" -#: src/lib/authui/sssd/params.rb:868 +#: src/lib/authui/sssd/params.rb:862 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." msgstr "此选项指示 SSSD 利用特定于 Active Directory 的功能，以加速 initgroups 操作（在处理复杂组或深度嵌套组时，效果最明显）。" -#: src/lib/authui/sssd/params.rb:874 +#: src/lib/authui/sssd/params.rb:868 msgid " The object class of a netgroup entry in LDAP." msgstr " LDAP 中网络组项的对象类。" -#: src/lib/authui/sssd/params.rb:880 +#: src/lib/authui/sssd/params.rb:874 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "对应于网络组名的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:885 +#: src/lib/authui/sssd/params.rb:879 msgid "The LDAP attribute that contains the names of the netgroup's members." msgstr "包含网络组成员名称的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:890 +#: src/lib/authui/sssd/params.rb:884 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples." msgstr "包含 (host, user, domain) 网络组三位元组的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:895 +#: src/lib/authui/sssd/params.rb:889 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." msgstr "包含 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:905 +#: src/lib/authui/sssd/params.rb:899 msgid "The object class of a service entry in LDAP." msgstr "LDAP 中服务项的对象类。" -#: src/lib/authui/sssd/params.rb:910 +#: src/lib/authui/sssd/params.rb:904 msgid "The LDAP attribute that contains the name of service attributes and their aliases." msgstr "包含服务属性的名称及其别名的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:915 +#: src/lib/authui/sssd/params.rb:909 msgid "The LDAP attribute that contains the port managed by this service." msgstr "包含此服务管理的端口的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:920 +#: src/lib/authui/sssd/params.rb:914 msgid "The LDAP attribute that contains the protocols understood by this service." msgstr "包含此服务识别的协议的 LDAP 属性。" -#: src/lib/authui/sssd/params.rb:926 -msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +#: src/lib/authui/sssd/params.rb:919 +#, fuzzy +#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP service searches for this attribute type. The default value is ldap_search_base." msgstr "可选的基本 DN、搜索范围和 LDAP 过滤器，用于限制对此属性类型执行的 LDAP 搜索。" -#: src/lib/authui/sssd/params.rb:931 +#: src/lib/authui/sssd/params.rb:924 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr " 指定在取消 LDAP 搜索并返回超速缓存的结果（并进入脱机模式）之前，允许这些搜索运行的时间，即超时（以秒为单位）。" -#: src/lib/authui/sssd/params.rb:936 +#: src/lib/authui/sssd/params.rb:929 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)." msgstr "指定在取消针对用户和组枚举执行的 LDAP 搜索并返回超速缓存的结果（并进入脱机模式）之前，允许这些搜索运行的时间，即超时（以秒为单位）。" -#: src/lib/authui/sssd/params.rb:941 +#: src/lib/authui/sssd/params.rb:934 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." msgstr "指定超时（以秒为单位），经过此超时时间后，如果没有活动，在 connect(2) 后执行的 poll(2)/select(2) 会返回。" -#: src/lib/authui/sssd/params.rb:946 +#: src/lib/authui/sssd/params.rb:939 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." msgstr "指定超时（以秒为单位），经过此超时时间后，如果未收到响应，对同步 LDAP API 的调用将会中止。" -#: src/lib/authui/sssd/params.rb:951 +#: src/lib/authui/sssd/params.rb:944 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." msgstr "指定与 LDAP 服务器保持连接的超时（以秒为单位）。" -#: src/lib/authui/sssd/params.rb:956 +#: src/lib/authui/sssd/params.rb:949 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request." msgstr "指定在单个请求中要从 LDAP 检索的记录数。某些 LDAP 服务器会对每个请求强制实施最大限制。" -#: src/lib/authui/sssd/params.rb:961 +#: src/lib/authui/sssd/params.rb:954 msgid "Disable the LDAP paging control." msgstr "禁用 LDAP 分页控制。" -#: src/lib/authui/sssd/params.rb:965 +#: src/lib/authui/sssd/params.rb:958 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." msgstr "如果是使用 SASL 与 LDAP 服务器通讯，指定建立连接需要达到的最低安全级别。" -#: src/lib/authui/sssd/params.rb:970 +#: src/lib/authui/sssd/params.rb:963 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." msgstr "指定内部超速缓存中必须缺少多少个组成员才能触发取消参照查找。" -#: src/lib/authui/sssd/params.rb:977 +#: src/lib/authui/sssd/params.rb:970 msgid "Validate server certification in LDAP TLS session" msgstr "在 LDAP TLS 会话中验证服务器认证" -#: src/lib/authui/sssd/params.rb:981 +#: src/lib/authui/sssd/params.rb:974 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." msgstr "指定包含 sssd 将要识别的所有证书颁发机构所颁发证书的文件。" -#: src/lib/authui/sssd/params.rb:985 +#: src/lib/authui/sssd/params.rb:978 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." msgstr "指定在单独的每个文件中包含证书颁发机构证书的目录的路径。" -#: src/lib/authui/sssd/params.rb:989 +#: src/lib/authui/sssd/params.rb:982 msgid "Specifies the file that contains the certificate for the client's key." msgstr "指定包含客户端密钥的证书的文件。" -#: src/lib/authui/sssd/params.rb:993 +#: src/lib/authui/sssd/params.rb:986 msgid "Specifies the file that contains the client's key." msgstr "指定包含客户端密钥的文件。" -#: src/lib/authui/sssd/params.rb:998 +#: src/lib/authui/sssd/params.rb:991 msgid "Specifies acceptable cipher suites." msgstr "指定可接受的加密套件。" -#: src/lib/authui/sssd/params.rb:1003 +#: src/lib/authui/sssd/params.rb:996 msgid "Specifies that the id_provider connection must also use tls to protect the channel." msgstr "指定 id_provider 连接还必须使用 tls 来保护通道。" -#: src/lib/authui/sssd/params.rb:1008 +#: src/lib/authui/sssd/params.rb:1001 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number." msgstr "指定 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户和组 ID，而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。" -#: src/lib/authui/sssd/params.rb:1012 +#: src/lib/authui/sssd/params.rb:1005 msgid "Specify the SASL mechanism to use." msgstr "指定要使用的 SASL 机制。" -#: src/lib/authui/sssd/params.rb:1017 +#: src/lib/authui/sssd/params.rb:1010 msgid "Specify the SASL authorization id to use." msgstr "指定要使用的 SASL 授权 ID。" -#: src/lib/authui/sssd/params.rb:1022 +#: src/lib/authui/sssd/params.rb:1015 msgid "Specify the SASL realm to use." msgstr "指定要使用的 SASL 领域。" -#: src/lib/authui/sssd/params.rb:1027 +#: src/lib/authui/sssd/params.rb:1020 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." msgstr "如果设置为 true，在 SASL 绑定期间，LDAP 库将执行反向查找以规范化主机名。" -#: src/lib/authui/sssd/params.rb:1032 +#: src/lib/authui/sssd/params.rb:1025 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "指定使用 SASL/GSSAPI 时要使用的 keytab。" -#: src/lib/authui/sssd/params.rb:1037 +#: src/lib/authui/sssd/params.rb:1030 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "指定 id_provider 应初始化 Kerberos 身份凭证 (TGT)。" -#: src/lib/authui/sssd/params.rb:1042 +#: src/lib/authui/sssd/params.rb:1035 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used." msgstr "指定使用 GSSAPI 时 TGT 的有效期，以秒为单位。" -#: src/lib/authui/sssd/params.rb:1047 +#: src/lib/authui/sssd/params.rb:1040 msgid "Select the policy to evaluate the password expiration on the client side." msgstr "选择用于在客户端上评估口令是否失效的策略。" -#: src/lib/authui/sssd/params.rb:1052 +#: src/lib/authui/sssd/params.rb:1045 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "指定是否应启用自动循环参照。" -#: src/lib/authui/sssd/params.rb:1057 +#: src/lib/authui/sssd/params.rb:1050 msgid "Specifies the service name to use when service discovery is enabled." msgstr "指定启用服务发现时要使用的服务名称。" -#: src/lib/authui/sssd/params.rb:1061 +#: src/lib/authui/sssd/params.rb:1054 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." msgstr "指定启用服务发现时，用于查找允许口令更改的 LDAP 服务器的服务名称。" -#: src/lib/authui/sssd/params.rb:1066 +#: src/lib/authui/sssd/params.rb:1059 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation." msgstr "指定在执行口令更改操作后，是否使用自纪元以来的天数更新 ldap_user_shadow_last_change 属性。" -#: src/lib/authui/sssd/params.rb:1071 +#: src/lib/authui/sssd/params.rb:1064 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host." msgstr "如果使用 access_provider = ldap 和 ldap_access_order = filter（默认值），则必须指定此选项。它指定要向用户授予此主机的访问权限所必须满足的 LDAP 搜索过滤准则。" -#: src/lib/authui/sssd/params.rb:1076 +#: src/lib/authui/sssd/params.rb:1069 msgid " With this option a client side evaluation of access control attributes can be enabled." msgstr " 使用此选项可以支持在客户端评估访问控制属性。" -#: src/lib/authui/sssd/params.rb:1082 +#: src/lib/authui/sssd/params.rb:1075 msgid "Comma separated list of access control options." msgstr "访问控制选项的列表（以逗号分隔）。" -#: src/lib/authui/sssd/params.rb:1087 +#: src/lib/authui/sssd/params.rb:1080 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "指定执行搜索时如何执行别名取消参照。" -#: src/lib/authui/sssd/params.rb:1092 +#: src/lib/authui/sssd/params.rb:1085 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." msgstr "允许将本地用户保留为使用 RFC2307 纲要的服务器的 LDAP 组成员。" +#: src/lib/authui/sssd/params.rb:1090 +#, fuzzy +#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP autofs searches for this attribute type. The default value is ldap_search_base." +msgstr "可选的基本 DN、搜索范围和 LDAP 过滤器，用于限制对此属性类型执行的 LDAP 搜索。" + +#: src/lib/authui/sssd/params.rb:1095 +#, fuzzy +#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP group searches for this attribute type. The default value is ldap_search_base." +msgstr "可选的基本 DN、搜索范围和 LDAP 过滤器，用于限制对此属性类型执行的 LDAP 搜索。" + +#: src/lib/authui/sssd/params.rb:1100 +#, fuzzy +#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP netgroup searches for this attribute type. The default value is ldap_search_base." +msgstr "可选的基本 DN、搜索范围和 LDAP 过滤器，用于限制对此属性类型执行的 LDAP 搜索。" + #: src/lib/authui/sssd/params.rb:1105 +#, fuzzy +#| msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." +msgid "An optional base DN, search scope and LDAP filter to restrict LDAP user searches for this attribute type. The default value is ldap_search_base." +msgstr "可选的基本 DN、搜索范围和 LDAP 过滤器，用于限制对此属性类型执行的 LDAP 搜索。" + +#: src/lib/authui/sssd/params.rb:1110 src/lib/authui/sssd/params.rb:1120 +#, fuzzy +#| msgid "The object class of a group entry in LDAP." +msgid "The object class of an automount map entry in LDAP." +msgstr "LDAP 中组项的对象类。" + +#: src/lib/authui/sssd/params.rb:1115 +#, fuzzy +#| msgid "The object class of a group entry in LDAP." +msgid "The name of an automount map entry in LDAP." +msgstr "LDAP 中组项的对象类。" + +#: src/lib/authui/sssd/params.rb:1125 src/lib/authui/sssd/params.rb:1130 +msgid "The key of an automount entry in LDAP. The entry usually corresponds to a mount point." +msgstr "" + +#: src/lib/authui/sssd/params.rb:1143 msgid "IP address or host names of Kerberos servers (comma separated)" msgstr "Kerberos 服务器的 IP 地址或主机名（以逗号分隔）" -#: src/lib/authui/sssd/params.rb:1109 +#: src/lib/authui/sssd/params.rb:1147 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference." msgstr "指定 SSSD 应按优先顺序连接到的 Kerberos 服务器的 IP 地址或主机名的逗号分隔列表。" -#: src/lib/authui/sssd/params.rb:1114 +#: src/lib/authui/sssd/params.rb:1152 msgid "Kerberos realm (e.g. EXAMPLE.COM)" msgstr "Kerberos 领域（例如 EXAMPLE.COM）" -#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123 +#: src/lib/authui/sssd/params.rb:1156 src/lib/authui/sssd/params.rb:1161 msgid "If the change password service is not running on the KDC, alternative servers can be defined here." msgstr "如果更改口令服务未在 KDC 上运行，则可以在此处定义备用服务器。" -#: src/lib/authui/sssd/params.rb:1128 +#: src/lib/authui/sssd/params.rb:1166 msgid "Directory to store credential caches." msgstr "用于储存身份凭证超速缓存的目录。" -#: src/lib/authui/sssd/params.rb:1133 +#: src/lib/authui/sssd/params.rb:1171 msgid "Location of the user's credential cache." msgstr "用户身份凭证超速缓存的位置。" -#: src/lib/authui/sssd/params.rb:1138 +#: src/lib/authui/sssd/params.rb:1176 msgid " Timeout in seconds after an online authentication request or change password request is aborted." msgstr " 中止联机身份验证请求或更改口令请求后的超时，以秒为单位。" -#: src/lib/authui/sssd/params.rb:1143 +#: src/lib/authui/sssd/params.rb:1181 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." msgstr "借助 krb5_keytab 校验获取的 TGT 是否未受欺骗。" -#: src/lib/authui/sssd/params.rb:1148 +#: src/lib/authui/sssd/params.rb:1186 msgid "The location of the keytab to use when validating credentials obtained from KDCs." msgstr "验证从 KDC 获取的身份凭证时要使用的 keytab 的位置。" -#: src/lib/authui/sssd/params.rb:1153 +#: src/lib/authui/sssd/params.rb:1191 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 "在提供程序脱机时储存用户的口令，当提供程序再次联机时，使用该口令请求 TGT。" -#: src/lib/authui/sssd/params.rb:1157 +#: src/lib/authui/sssd/params.rb:1195 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." msgstr "请求具有完整有效期的可续订票据，该有效期以一个整数加一个时间单位来指定。" -#: src/lib/authui/sssd/params.rb:1161 +#: src/lib/authui/sssd/params.rb:1199 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." msgstr "请求具有有效期的票据，该有效期以一个整数加一个时间单位来指定。" -#: src/lib/authui/sssd/params.rb:1165 +#: src/lib/authui/sssd/params.rb:1203 msgid "The time in seconds between two checks if the TGT should be renewed." msgstr "应续订 TGT 时两次检查相隔的时间，以秒为单位。" -#: src/lib/authui/sssd/params.rb:1170 +#: src/lib/authui/sssd/params.rb:1208 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "启用灵活身份验证安全隧道 (FAST) 进行 Kerberos 预身份验证。" -#: src/lib/authui/sssd/params.rb:1174 +#: src/lib/authui/sssd/params.rb:1212 msgid "Specifies the server principal to use for FAST." msgstr "指定用于 FAST 的服务器主体。" -#: src/lib/authui/sssd/params.rb:1179 +#: src/lib/authui/sssd/params.rb:1217 msgid "Specifies if the host and user principal should be canonicalized." msgstr "指定是否应规范化主机和用户主体。" #. The Active Directory domain section -#: src/lib/authui/sssd/params.rb:1191 +#: src/lib/authui/sssd/params.rb:1229 msgid "Specifies the name of the Active Directory domain." msgstr "指定 Active Directory 域的名称。" -#: src/lib/authui/sssd/params.rb:1196 +#: src/lib/authui/sssd/params.rb:1234 msgid "IP addresses or host names of AD servers (comma separated)" msgstr "AD 服务器的 IP 地址或主机名（以逗号分隔）" -#: src/lib/authui/sssd/params.rb:1200 +#: src/lib/authui/sssd/params.rb:1238 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." msgstr "SSSD 应按优先顺序连接到的 AD 服务器的 IP 地址或主机名的逗号分隔列表。" -#: src/lib/authui/sssd/params.rb:1205 +#: src/lib/authui/sssd/params.rb:1243 msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host." msgstr "AD 主机名（可选）- 如果 hostname(5) 未反映 AD 用于识别此主机的 FQDN，则可以设置该项。" -#: src/lib/authui/sssd/params.rb:1209 +#: src/lib/authui/sssd/params.rb:1247 msgid "Override the user's home directory." msgstr "覆盖用户的主目录。" -#: src/lib/authui/sssd/params.rb:1222 +#: src/lib/authui/sssd/params.rb:1260 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr " 指定用于映射 Active Directory 用户和组 SID 的 POSIX ID 范围的下限。" -#: src/lib/authui/sssd/params.rb:1227 +#: src/lib/authui/sssd/params.rb:1265 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "指定用于映射 Active Directory 用户和组 SID 的 POSIX ID 范围的上限。" -#: src/lib/authui/sssd/params.rb:1232 +#: src/lib/authui/sssd/params.rb:1270 msgid "Specifies the number of IDs available for each slice." msgstr "指定每个切片可用的 ID 数。" -#: src/lib/authui/sssd/params.rb:1236 +#: src/lib/authui/sssd/params.rb:1274 msgid "Specify the domain SID of the default domain." msgstr "指定默认域的域 SID。" -#: src/lib/authui/sssd/params.rb:1240 +#: src/lib/authui/sssd/params.rb:1278 msgid "Specify the name of the default domain." msgstr "指定默认域的名称。" -#: src/lib/authui/sssd/params.rb:1245 +#: src/lib/authui/sssd/params.rb:1283 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm." msgstr "更改 ID 映射算法的行为，使其更类似于 winbind 的“idmap_autorid”算法。" #. The Active Directory domain section -#: src/lib/authui/sssd/params.rb:1257 +#: src/lib/authui/sssd/params.rb:1295 msgid "Specifies the name of the IPA domain." msgstr "指定 IPA 域的名称。" -#: src/lib/authui/sssd/params.rb:1262 +#: src/lib/authui/sssd/params.rb:1300 msgid "IP addresses or host names of IPA servers (comma separated)" msgstr "IPA 服务器的 IP 地址或主机名（以逗号分隔）" -#: src/lib/authui/sssd/params.rb:1267 +#: src/lib/authui/sssd/params.rb:1305 msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host." msgstr "IPA 主机名（可选）- 如果 hostname(5) 未反映 IPA 用于识别此主机的 FQDN，则可以设置该项。" -#: src/lib/authui/sssd/params.rb:1272 +#: src/lib/authui/sssd/params.rb:1310 msgid "The automounter location this IPA client will be using." msgstr "此 IPA 客户端将要使用的自动装载器位置。" -#: src/lib/authui/sssd/params.rb:1277 +#: src/lib/authui/sssd/params.rb:1315 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." msgstr "此选项指示 SSSD 使用此客户端 IP 地址自动更新 FreeIPA v2 中内置的 DNS 服务器。" -#: src/lib/authui/sssd/params.rb:1282 +#: src/lib/authui/sssd/params.rb:1320 msgid "The TTL to apply to the client DNS record when updating it." msgstr "更新客户端 DNS 记录时要应用的 TTL。" -#: src/lib/authui/sssd/params.rb:1286 +#: src/lib/authui/sssd/params.rb:1324 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." msgstr "选择应该用于动态 DNS 更新的 IP 地址对应的接口。" + +#~ msgid "The default base DN to use for performing LDAP sudo rules." +#~ msgstr "用于执行 LDAP sudo 规则的默认基本 DN。" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/auth-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/auth-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/auth-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: auth-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -493,6 +493,11 @@ msgid "Provider Hostname" msgstr "提供程序主机名" +#: src/include/auth-server/dialogs.rb:1150 src/modules/LdapDatabase.rb:1613 +#: src/modules/LdapDatabase.rb:1710 +msgid "Port" +msgstr "端口" + #: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618 msgid "Use StartTLS" msgstr "使用 StartTLS" @@ -2781,10 +2786,6 @@ msgid "Provider Name" msgstr "提供程序名称" -#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710 -msgid "Port" -msgstr "端口" - #: src/modules/LdapDatabase.rb:1631 msgid "Replication Type" msgstr "复制类型" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/autoinst.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/autoinst.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/autoinst.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -611,67 +611,67 @@ #. ReportingDialog() #. @return sumbol -#: src/clients/report_auto.rb:103 +#: src/clients/report_auto.rb:99 msgid "Messages" msgstr "消息" -#: src/clients/report_auto.rb:109 +#: src/clients/report_auto.rb:105 msgid "Sho&w messages" msgstr "显示消息(&W)" -#: src/clients/report_auto.rb:117 +#: src/clients/report_auto.rb:113 msgid "Lo&g messages" msgstr "记录消息(&G)" -#: src/clients/report_auto.rb:128 +#: src/clients/report_auto.rb:124 msgid "&Time-out (in sec.)" msgstr "超时(以秒为单位)(&T)" -#: src/clients/report_auto.rb:140 +#: src/clients/report_auto.rb:136 msgid "Warnings" msgstr "警告" -#: src/clients/report_auto.rb:146 +#: src/clients/report_auto.rb:142 msgid "Sh&ow warnings" msgstr "显示警告(&O)" -#: src/clients/report_auto.rb:154 +#: src/clients/report_auto.rb:150 msgid "Log wa&rnings" msgstr "记录警告(&R)" -#: src/clients/report_auto.rb:165 +#: src/clients/report_auto.rb:161 msgid "Time-out (in s&ec.)" msgstr "超时(以秒为单位)(&E)" -#: src/clients/report_auto.rb:177 +#: src/clients/report_auto.rb:173 msgid "Errors" msgstr "错误" -#: src/clients/report_auto.rb:183 +#: src/clients/report_auto.rb:179 msgid "Show error&s" msgstr "显示错误(&S)" -#: src/clients/report_auto.rb:191 +#: src/clients/report_auto.rb:187 msgid "&Log errors" msgstr "记录错误(&L)" -#: src/clients/report_auto.rb:202 +#: src/clients/report_auto.rb:198 msgid "Time-o&ut (in sec.)" msgstr "超时(以秒为单位)(&U)" -#: src/clients/report_auto.rb:217 +#: src/clients/report_auto.rb:213 msgid "" "<p>Depending on your experience, you can skip, log, and show (with time-out)\n" "installation messages.</p> \n" msgstr "<p>根据您的经验，可以跳过、记录和显示(设置了超时)安装消息。</p> \n" -#: src/clients/report_auto.rb:223 +#: src/clients/report_auto.rb:219 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" -#: src/clients/report_auto.rb:230 +#: src/clients/report_auto.rb:226 msgid "Messages and Logging" msgstr "消息和日志记录" @@ -968,7 +968,7 @@ #. Shows a dialog when 'control file' can't be found #. @param [String] original Original value #. @return [String] new value -#: src/include/autoinstall/autoinst_dialogs.rb:21 +#: src/include/autoinstall/autoinst_dialogs.rb:22 msgid "" "<p>\n" "A profile for this machine could not be found or retrieved.\n" @@ -986,11 +986,11 @@ "基于规则或基于主机名的控制文件，\n" "则重启动安装过程并确保控制文件是可访问的。</p>\n" -#: src/include/autoinstall/autoinst_dialogs.rb:30 +#: src/include/autoinstall/autoinst_dialogs.rb:31 msgid "System Profile Location" msgstr "系统配置文件位置" -#: src/include/autoinstall/autoinst_dialogs.rb:45 +#: src/include/autoinstall/autoinst_dialogs.rb:46 msgid "&Profile Location:" msgstr "配置文件位置(&P)：" @@ -998,11 +998,11 @@ #. Below this label, all targets are listed that can be used as #. installation target #. heading text -#: src/include/autoinstall/autoinst_dialogs.rb:117 +#: src/include/autoinstall/autoinst_dialogs.rb:118 msgid "Choose a hard disk" msgstr "选择硬盘" -#: src/include/autoinstall/autoinst_dialogs.rb:124 +#: src/include/autoinstall/autoinst_dialogs.rb:125 msgid "No disks found." msgstr "未找到任何磁盘。" @@ -1011,7 +1011,7 @@ #. "Preparing Hard Disk - Step 1" is the description of the dialog what to #. do while the following locale is the help description #. help part 1 of 1 -#: src/include/autoinstall/autoinst_dialogs.rb:132 +#: src/include/autoinstall/autoinst_dialogs.rb:133 msgid "" "<p>\n" "All hard disks automatically detected on your system\n" @@ -1023,13 +1023,13 @@ "</p>" #. force help text width -#: src/include/autoinstall/autoinst_dialogs.rb:154 +#: src/include/autoinstall/autoinst_dialogs.rb:155 msgid "Hard Disk Selection" msgstr "硬盘选择" #. there is a selection from that one option has to be #. chosen - at the moment no option is chosen -#: src/include/autoinstall/autoinst_dialogs.rb:177 +#: src/include/autoinstall/autoinst_dialogs.rb:178 msgid "Select one of the options to continue." msgstr "请选择其中一个选项，然后继续。" @@ -2246,45 +2246,61 @@ #. The line above needs to be fixed when we have more attributes #. comment will look like this: "(description=BLA BLA)" -#: src/modules/AutoinstConfig.rb:279 +#: src/modules/AutoinstConfig.rb:289 msgid "Choose Profile" msgstr "选择配置文件" +#. Nothing returned by SLP query +#: src/modules/AutoinstConfig.rb:312 +#, fuzzy +#| msgid "The resulting autoyast profile can be found in %s." +msgid "No 'autoyast' provider has been found via SLP." +msgstr "生成的 autoyast 配置文件位于 %s 中。" + +#. There is no profile defined/found anywhere +#: src/modules/AutoinstConfig.rb:357 +#, fuzzy +#| msgid "Using AutoYaST profile %1" +msgid "" +"Invalid AutoYaST profile URL\n" +"%{url}" +msgstr "使用 AutoYaST 配置文件：%1" + #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:335 +#: src/modules/AutoinstConfig.rb:384 msgid "Retrieving control file from floppy." msgstr "正在软盘中获取控制文件。" -#: src/modules/AutoinstConfig.rb:338 +#: src/modules/AutoinstConfig.rb:387 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "正在从 TFTP 服务器中获取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:344 +#: src/modules/AutoinstConfig.rb:393 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "正在从 NFS 服务器中获取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:350 +#: src/modules/AutoinstConfig.rb:399 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "正在从 HTTP 服务器中获取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:356 +#: src/modules/AutoinstConfig.rb:405 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "正在从 FTP 服务器中获取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:362 +#: src/modules/AutoinstConfig.rb:411 msgid "Copying control file from file: %1." msgstr "正在从文件中复制控制文件：%1。" -#: src/modules/AutoinstConfig.rb:367 +#: src/modules/AutoinstConfig.rb:416 msgid "Copying control file from device: /dev/%1." msgstr "正在从设备中复制控制文件：/dev/%1。" -#: src/modules/AutoinstConfig.rb:371 +#: src/modules/AutoinstConfig.rb:420 msgid "Copying control file from default location." msgstr "正在从默认位置复制控制文件。" -#: src/modules/AutoinstConfig.rb:373 +#: src/modules/AutoinstConfig.rb:422 msgid "Source unknown." msgstr "源未知。" @@ -2294,7 +2310,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:453 +#: src/modules/AutoinstConfig.rb:502 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2303,7 +2319,7 @@ "<h3>AutoYaST 配置管理系统</h3>\n" "<p>使用配置管理系统几乎可以配置控制文件的所有资源。</p>\n" -#: src/modules/AutoinstConfig.rb:458 +#: src/modules/AutoinstConfig.rb:507 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" @@ -2316,7 +2332,7 @@ "而该文件可用于通过 AutoYaST 安装另一个系统。\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:465 +#: src/modules/AutoinstConfig.rb:514 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2443,7 +2459,7 @@ #. if no feeder (PV) was found for current volume group #. the next instructions taints result -#: src/modules/AutoinstPartPlan.rb:282 +#: src/modules/AutoinstPartPlan.rb:289 msgid "Volume group '%1' must have at least one physical volume. Provide one." msgstr "卷组“%1”必须有至少一个物理卷。请提供一个。" @@ -2453,66 +2469,66 @@ #. @return [String] configuration summary dialog #. return Summary of configuration #. @return [String] configuration summary dialog -#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913 +#: src/modules/AutoinstPartPlan.rb:703 src/modules/AutoinstStorage.rb:913 msgid "Drives" msgstr "驱动器" #. We are counting harddisks only (type CT_DISK) -#: src/modules/AutoinstPartPlan.rb:697 +#: src/modules/AutoinstPartPlan.rb:709 msgid "%s drive in total" msgid_plural "%s drives in total" msgstr[0] "%s 驱动器总计" -#: src/modules/AutoinstPartPlan.rb:716 +#: src/modules/AutoinstPartPlan.rb:728 msgid "Not yet cloned." msgstr "尚未克隆。" #. Return Summary #. @return [String] summary -#: src/modules/AutoinstScripts.rb:329 +#: src/modules/AutoinstScripts.rb:343 msgid "Preinstallation Scripts" msgstr "安装前脚本" -#: src/modules/AutoinstScripts.rb:342 +#: src/modules/AutoinstScripts.rb:356 msgid "Postinstallation Scripts" msgstr "安装后脚本" -#: src/modules/AutoinstScripts.rb:355 +#: src/modules/AutoinstScripts.rb:369 msgid "Chroot Scripts" msgstr "Chroot 脚本" -#: src/modules/AutoinstScripts.rb:368 +#: src/modules/AutoinstScripts.rb:382 msgid "Init Scripts" msgstr "Init 脚本" -#: src/modules/AutoinstScripts.rb:381 +#: src/modules/AutoinstScripts.rb:395 msgid "Postpartitioning Scripts" msgstr "分区后脚本" #. return type of script as formatted string #. @param script type #. @return [String] type as translated string -#: src/modules/AutoinstScripts.rb:476 +#: src/modules/AutoinstScripts.rb:490 msgid "Pre" msgstr "安装前" -#: src/modules/AutoinstScripts.rb:478 +#: src/modules/AutoinstScripts.rb:492 msgid "Post" msgstr "安装后" -#: src/modules/AutoinstScripts.rb:480 +#: src/modules/AutoinstScripts.rb:494 msgid "Init" msgstr "Init" -#: src/modules/AutoinstScripts.rb:482 +#: src/modules/AutoinstScripts.rb:496 msgid "Chroot" msgstr "Chroot" -#: src/modules/AutoinstScripts.rb:484 +#: src/modules/AutoinstScripts.rb:498 msgid "Postpartitioning" msgstr "分区后" -#: src/modules/AutoinstScripts.rb:486 +#: src/modules/AutoinstScripts.rb:500 msgid "Unknown" msgstr "未知" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/base.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/base.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/base.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -1684,13 +1684,13 @@ msgstr "细节(&D)..." #. translators: summary header for messages generated through autoinstallation -#: library/general/src/modules/Report.rb:101 +#: library/general/src/modules/Report.rb:103 msgid "Messages" msgstr "讯息" #. Report configuration - will be normal messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:109 +#: library/general/src/modules/Report.rb:111 msgid "Display Messages: %1" msgstr "显示讯息：%1" @@ -1701,23 +1701,23 @@ #. translators: summary if the errors should be displayed #. translators: summary if the errors should be written to log file #. TRANSLATORS: human text for Boolean value -#: library/general/src/modules/Report.rb:111 -#: library/general/src/modules/Report.rb:127 -#: library/general/src/modules/Report.rb:141 -#: library/general/src/modules/Report.rb:157 -#: library/general/src/modules/Report.rb:171 -#: library/general/src/modules/Report.rb:187 +#: library/general/src/modules/Report.rb:113 +#: library/general/src/modules/Report.rb:129 +#: library/general/src/modules/Report.rb:143 +#: library/general/src/modules/Report.rb:159 +#: library/general/src/modules/Report.rb:173 +#: library/general/src/modules/Report.rb:189 #: library/network/src/modules/NetworkPopup.rb:90 #: library/types/src/modules/String.rb:101 msgid "Yes" msgstr "是" -#: library/general/src/modules/Report.rb:111 -#: library/general/src/modules/Report.rb:127 -#: library/general/src/modules/Report.rb:141 -#: library/general/src/modules/Report.rb:157 -#: library/general/src/modules/Report.rb:171 -#: library/general/src/modules/Report.rb:187 +#: library/general/src/modules/Report.rb:113 +#: library/general/src/modules/Report.rb:129 +#: library/general/src/modules/Report.rb:143 +#: library/general/src/modules/Report.rb:159 +#: library/general/src/modules/Report.rb:173 +#: library/general/src/modules/Report.rb:189 #: library/network/src/modules/NetworkPopup.rb:89 #: library/types/src/modules/String.rb:101 msgid "No" @@ -1725,76 +1725,76 @@ #. Report configuration - will have normal messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:118 +#: library/general/src/modules/Report.rb:120 msgid "Time-out Messages: %1" msgstr "超时讯息：%1" #. Report configuration - will be normal messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:125 +#: library/general/src/modules/Report.rb:127 msgid "Log Messages: %1" msgstr "记录讯息：%1" #. translators: summary header for warnings generated through autoinstallation -#: library/general/src/modules/Report.rb:132 +#: library/general/src/modules/Report.rb:134 msgid "Warnings" msgstr "警告" #. Report configuration - will be warning messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:139 +#: library/general/src/modules/Report.rb:141 msgid "Display Warnings: %1" msgstr "显示警告：%1" #. Report configuration - will have warning messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:148 +#: library/general/src/modules/Report.rb:150 msgid "Time-out Warnings: %1" msgstr "超时警告：%1" #. Report configuration - will be warning messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:155 +#: library/general/src/modules/Report.rb:157 msgid "Log Warnings: %1" msgstr "记录警告：%1" #. translators: summary header for errors generated through autoinstallation -#: library/general/src/modules/Report.rb:162 +#: library/general/src/modules/Report.rb:164 msgid "Errors" msgstr "错误" #. Report configuration - will be error messages displayed? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:169 +#: library/general/src/modules/Report.rb:171 msgid "Display Errors: %1" msgstr "显示错误：%1" #. Report configuration - will have error messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:178 +#: library/general/src/modules/Report.rb:180 msgid "Time-out Errors: %1" msgstr "超时错误：%1" #. Report configuration - will be error messages logged to file? #. '%1' will be replaced by translated string "Yes" or "No" -#: library/general/src/modules/Report.rb:185 +#: library/general/src/modules/Report.rb:187 msgid "Log Errors: %1" msgstr "记录错误：%1" #. translators: warnings summary header -#: library/general/src/modules/Report.rb:664 +#: library/general/src/modules/Report.rb:668 msgid "Warning:" msgstr "警告：" #. translators: errors summary header -#: library/general/src/modules/Report.rb:681 +#: library/general/src/modules/Report.rb:685 msgid "Error:" msgstr "错误：" #. translators: message summary header #. translators: message summary header -#: library/general/src/modules/Report.rb:698 -#: library/general/src/modules/Report.rb:715 +#: library/general/src/modules/Report.rb:702 +#: library/general/src/modules/Report.rb:719 msgid "Message:" msgstr "消息：" @@ -3399,7 +3399,7 @@ #. popup heading #: library/packages/src/modules/PackageCallbacks.rb:1428 -#: library/packages/src/modules/PackageCallbacks.rb:3070 +#: library/packages/src/modules/PackageCallbacks.rb:3065 msgid "Package: " msgstr "包：" @@ -3561,15 +3561,15 @@ msgstr "用户名(&U)" #. check box -#: library/packages/src/modules/PackageCallbacks.rb:3005 +#: library/packages/src/modules/PackageCallbacks.rb:3000 msgid "Show &details" msgstr "显示细节(&D)" -#: library/packages/src/modules/PackageCallbacks.rb:3071 +#: library/packages/src/modules/PackageCallbacks.rb:3066 msgid "Size: " msgstr "大小：" -#: library/packages/src/modules/PackageCallbacks.rb:3094 +#: library/packages/src/modules/PackageCallbacks.rb:3089 msgid "Remaining time to automatic retry: %1" msgstr "自动重试前剩余时间：%1" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/bootloader.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/bootloader.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/bootloader.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -205,11 +205,11 @@ msgstr "更改位置：%s" #. Represents bootloader timeout value -#: src/lib/bootloader/grub2_widgets.rb:53 +#: src/lib/bootloader/grub2_widgets.rb:54 msgid "&Timeout in Seconds" msgstr "超时(&T)（以秒计）" -#: src/lib/bootloader/grub2_widgets.rb:57 +#: src/lib/bootloader/grub2_widgets.rb:58 msgid "" "<p><b>Timeout in Seconds</b><br>\n" "Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n" @@ -218,11 +218,11 @@ "指定引导加载程序等待直到装载默认内核的时间。</p>\n" #. Represents decision if bootloader need activated partition -#: src/lib/bootloader/grub2_widgets.rb:89 +#: src/lib/bootloader/grub2_widgets.rb:90 msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "在分区表中设置活动标志以引导分区(&A)" -#: src/lib/bootloader/grub2_widgets.rb:93 +#: src/lib/bootloader/grub2_widgets.rb:94 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" @@ -236,59 +236,59 @@ "即使引导加载程序安装在 MBR 中也是如此。</p>" #. Represents decision if generic MBR have to be installed on disk -#: src/lib/bootloader/grub2_widgets.rb:120 +#: src/lib/bootloader/grub2_widgets.rb:121 msgid "Write &generic Boot Code to MBR" msgstr "将通用引导代码写入 MBR(&G)" -#: src/lib/bootloader/grub2_widgets.rb:124 +#: src/lib/bootloader/grub2_widgets.rb:125 msgid "" "<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n" "boots the active partition).</p>" msgstr "<p><b>将通用引导代码写入 MBR</b> 将使用通用代码（用于引导活动分区的独立于操作系统的代码）替换您磁盘的主引导记录。</p>" #. Represents decision if menu should be hidden or visible -#: src/lib/bootloader/grub2_widgets.rb:149 +#: src/lib/bootloader/grub2_widgets.rb:150 msgid "&Hide Menu on Boot" msgstr "引导时隐藏菜单(&H)" -#: src/lib/bootloader/grub2_widgets.rb:153 +#: src/lib/bootloader/grub2_widgets.rb:154 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>" msgstr "<p>选择<b>引导时隐藏菜单</b>将隐藏引导菜单。</p>" #. Represents if os prober should be run -#: src/lib/bootloader/grub2_widgets.rb:172 +#: src/lib/bootloader/grub2_widgets.rb:173 msgid "Pro&be Foreign OS" msgstr "探测外来操作系统(&B)" -#: src/lib/bootloader/grub2_widgets.rb:176 +#: src/lib/bootloader/grub2_widgets.rb:177 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>" #. represents kernel command line -#: src/lib/bootloader/grub2_widgets.rb:200 +#: src/lib/bootloader/grub2_widgets.rb:201 msgid "O&ptional Kernel Command Line Parameter" msgstr "可选内核命令行参数(&P)" -#: src/lib/bootloader/grub2_widgets.rb:204 +#: src/lib/bootloader/grub2_widgets.rb:205 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>" #. Represents Protective MBR action -#: src/lib/bootloader/grub2_widgets.rb:228 +#: src/lib/bootloader/grub2_widgets.rb:229 msgid "&Protective MBR flag" msgstr "保护性 MBR 标志(&P)" -#: src/lib/bootloader/grub2_widgets.rb:232 +#: src/lib/bootloader/grub2_widgets.rb:233 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>" #. TRANSLATORS: set flag on disk -#: src/lib/bootloader/grub2_widgets.rb:246 +#: src/lib/bootloader/grub2_widgets.rb:247 msgid "set" msgstr "设置" #. TRANSLATORS: remove flag from disk -#: src/lib/bootloader/grub2_widgets.rb:248 +#: src/lib/bootloader/grub2_widgets.rb:249 msgid "remove" msgstr "删除" @@ -296,55 +296,72 @@ #. force re-calculation of bootloader proposal #. this deletes any internally cached values, a new proposal will #. not be partially based on old data now any more -#: src/lib/bootloader/grub2_widgets.rb:250 +#: src/lib/bootloader/grub2_widgets.rb:251 #: src/lib/bootloader/proposal_client.rb:49 msgid "do not change" msgstr "不更改" #. Represents switcher for secure boot on EFI -#: src/lib/bootloader/grub2_widgets.rb:268 +#: src/lib/bootloader/grub2_widgets.rb:269 msgid "Enable &Secure Boot Support" msgstr "启用安全引导支持(&S)" -#: src/lib/bootloader/grub2_widgets.rb:272 +#: src/lib/bootloader/grub2_widgets.rb:273 msgid "Tick to enable UEFI Secure Boot\n" msgstr "选中会启用 UEFI 安全引导\n" #. Represents switcher for Trusted Boot -#: src/lib/bootloader/grub2_widgets.rb:293 +#: src/lib/bootloader/grub2_widgets.rb:294 msgid "Enable &Trusted Boot Support" msgstr "启用可信引导支持(&T)" #. TRANSLATORS: TrustedGRUB2 is a name, don't translate it -#: src/lib/bootloader/grub2_widgets.rb:298 -msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n" -msgstr "<b>可信引导</b>将安装 TrustedGRUB2 而非普通的 GRUB2。\n" +#: src/lib/bootloader/grub2_widgets.rb:299 +msgid "" +"<p><b>Trusted Boot</b> will install TrustedGRUB2\n" +"instead of regular GRUB2.</p>\n" +"<p>It means measuring the integrity of the boot process,\n" +"with the help from the hardware (a TPM, Trusted Platform Module,\n" +"chip).</p>\n" +"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n" +"setup (the setting may be named Security Chip, for example).</p>\n" +msgstr "" +#. check for file size does not work, since FS reports it 4096 +#. even if the file is in fact empty and a single byte cannot +#. be read, therefore testing real reading (details: bsc#994556) +#: src/lib/bootloader/grub2_widgets.rb:325 +msgid "" +"Trusted Platform Module not found.\n" +"Make sure it is enabled in BIOS.\n" +"The system will not boot otherwise." +msgstr "" + #. Represents grub password protection widget -#: src/lib/bootloader/grub2_widgets.rb:324 +#: src/lib/bootloader/grub2_widgets.rb:345 msgid "Prot&ect Boot Loader with Password" msgstr "使用口令保护引导加载程序(&E)" #. TRANSLATORS: checkbox entry -#: src/lib/bootloader/grub2_widgets.rb:330 +#: src/lib/bootloader/grub2_widgets.rb:351 msgid "P&rotect Entry Modification Only" msgstr "仅实施项修改防护(&R)" #. TRANSLATORS: text entry, please keep it short -#: src/lib/bootloader/grub2_widgets.rb:336 +#: src/lib/bootloader/grub2_widgets.rb:357 msgid "&Password for GRUB2 User 'root'" msgstr "GRUB2 用户 root 的口令(&P)" #. text entry -#: src/lib/bootloader/grub2_widgets.rb:339 +#: src/lib/bootloader/grub2_widgets.rb:360 msgid "Re&type Password" msgstr "再次键入口令(&T)" -#: src/lib/bootloader/grub2_widgets.rb:350 +#: src/lib/bootloader/grub2_widgets.rb:371 msgid "The password must not be empty." msgstr "口令不能为空。" -#: src/lib/bootloader/grub2_widgets.rb:357 +#: src/lib/bootloader/grub2_widgets.rb:378 msgid "" "'Password' and 'Retype password'\n" "do not match. Retype the password." @@ -353,7 +370,7 @@ "不匹配。请重键入口令。" #. special value as we do not know password, so it mean user do not change it -#: src/lib/bootloader/grub2_widgets.rb:407 +#: src/lib/bootloader/grub2_widgets.rb:428 msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" "At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>" @@ -362,40 +379,40 @@ "在引导时，修改甚至引导任何项都需要提供口令。如果选中<b>仅实施项修改防护</b>，引导任何项都将不受限制，但修改项需要提供口令（这是 GRUB 1 的行为方式）。<br>仅当您在<b>重键入口令</b>中重复键入了口令时，YaST 才接受该口令。该口令适用于 GRUB2 用户“root”（与 Linux 用户“root”不同）。YaST 目前不支持其他 GRUB2 用户。如果您需要用到它们，请使用单独的 GRUB2 脚本。</p>" #. there's mode specified, use it -#: src/lib/bootloader/grub2_widgets.rb:485 +#: src/lib/bootloader/grub2_widgets.rb:506 msgid "Choose new graphical theme file" msgstr "选择新图形主题文件" -#: src/lib/bootloader/grub2_widgets.rb:498 +#: src/lib/bootloader/grub2_widgets.rb:519 msgid "Use &graphical console" msgstr "使用图形控制台(&G)" -#: src/lib/bootloader/grub2_widgets.rb:503 +#: src/lib/bootloader/grub2_widgets.rb:524 msgid "&Console resolution" msgstr "控制台分辨率(&C)" -#: src/lib/bootloader/grub2_widgets.rb:508 +#: src/lib/bootloader/grub2_widgets.rb:529 msgid "&Console theme" msgstr "控制台主题(&C)" -#: src/lib/bootloader/grub2_widgets.rb:539 +#: src/lib/bootloader/grub2_widgets.rb:560 msgid "Autodetect by grub2" msgstr "由 grub2 自动检测" -#: src/lib/bootloader/grub2_widgets.rb:547 +#: src/lib/bootloader/grub2_widgets.rb:568 msgid "Use &serial console" msgstr "使用串行控制台(&S)" -#: src/lib/bootloader/grub2_widgets.rb:554 +#: src/lib/bootloader/grub2_widgets.rb:575 msgid "&Console arguments" msgstr "控制台参数(&C)" #. represent choosing default section to boot -#: src/lib/bootloader/grub2_widgets.rb:571 +#: src/lib/bootloader/grub2_widgets.rb:592 msgid "&Default Boot Section" msgstr "默认引导部分(&D)" -#: src/lib/bootloader/grub2_widgets.rb:575 +#: src/lib/bootloader/grub2_widgets.rb:596 msgid "" "<p> By pressing <b>Set as Default</b> you mark the selected section as\n" "the default. When booting, the boot loader will provide a boot menu and\n" @@ -412,40 +429,40 @@ "菜单中各部分的顺序。</p>\n" #. Represents stage1 location for bootloader -#: src/lib/bootloader/grub2_widgets.rb:610 +#: src/lib/bootloader/grub2_widgets.rb:631 msgid "Boot Loader Location" msgstr "引导加载程序位置" -#: src/lib/bootloader/grub2_widgets.rb:664 +#: src/lib/bootloader/grub2_widgets.rb:685 msgid "Custom boot device have to be specied if checked" msgstr "如果选中，则必须指定自定义引导设备" -#: src/lib/bootloader/grub2_widgets.rb:692 +#: src/lib/bootloader/grub2_widgets.rb:713 msgid "Boo&t from Boot Partition" msgstr "从引导分区引导(&T)" -#: src/lib/bootloader/grub2_widgets.rb:693 +#: src/lib/bootloader/grub2_widgets.rb:714 msgid "Boo&t from Root Partition" msgstr "从根分区引导(&T)" -#: src/lib/bootloader/grub2_widgets.rb:694 +#: src/lib/bootloader/grub2_widgets.rb:715 msgid "Boot from &Master Boot Record" msgstr "从主引导记录引导(&M)" -#: src/lib/bootloader/grub2_widgets.rb:695 +#: src/lib/bootloader/grub2_widgets.rb:716 msgid "Boot from &Extended Partition" msgstr "从扩展分区引导(&E)" -#: src/lib/bootloader/grub2_widgets.rb:706 +#: src/lib/bootloader/grub2_widgets.rb:727 msgid "C&ustom Boot Partition" msgstr "自定义引导分区(&U)" #. Represents button that open Device Map edit dialog -#: src/lib/bootloader/grub2_widgets.rb:719 +#: src/lib/bootloader/grub2_widgets.rb:740 msgid "&Edit Disk Boot Order" msgstr "编辑磁盘引导顺序(&E)" -#: src/lib/bootloader/grub2_widgets.rb:725 +#: src/lib/bootloader/grub2_widgets.rb:746 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" @@ -460,17 +477,17 @@ "要去除磁盘，请按<b>去除</b>。</p>" #. represents Tab with kernel related configuration -#: src/lib/bootloader/grub2_widgets.rb:746 +#: src/lib/bootloader/grub2_widgets.rb:767 msgid "&Kernel Parameters" msgstr "内核参数(&K)" #. Represent tab with options related to stage1 location and bootloader type -#: src/lib/bootloader/grub2_widgets.rb:771 +#: src/lib/bootloader/grub2_widgets.rb:792 msgid "Boot Co&de Options" msgstr "引导代码选项(&D)" #. Represents bootloader specific options like its timeout, default section or password protection -#: src/lib/bootloader/grub2_widgets.rb:837 +#: src/lib/bootloader/grub2_widgets.rb:858 msgid "Boot&loader Options" msgstr "引导加载程序选项(&L)" @@ -621,3 +638,6 @@ #: src/modules/Bootloader.rb:233 msgid "Saving Boot Loader Configuration" msgstr "保存引导加载程序配置" + +#~ msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n" +#~ msgstr "<b>可信引导</b>将安装 TrustedGRUB2 而非普通的 GRUB2。\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/ca-management.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/ca-management.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/ca-management.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ca-management\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/cio.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/cio.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/cio.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: cio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/cluster.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/cluster.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/cluster.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: cluster\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/control-center.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/control-center.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/control-center.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/control.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/control.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/control.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -55,11 +55,11 @@ #: control/control.SLES.glade.translations.glade:45 #: control/control.SLES.glade.translations.glade:82 #: control/control.SLES.glade.translations.glade:83 +#: control/control.openSUSE.glade.translations.glade:28 #: control/control.openSUSE.glade.translations.glade:29 -#: control/control.openSUSE.glade.translations.glade:30 -#: control/control.openSUSE.glade.translations.glade:33 +#: control/control.openSUSE.glade.translations.glade:32 +#: control/control.openSUSE.glade.translations.glade:72 #: control/control.openSUSE.glade.translations.glade:73 -#: control/control.openSUSE.glade.translations.glade:74 msgid "Installation Settings" msgstr "安装设置" @@ -75,21 +75,21 @@ #: control/control.SLED.glade.translations.glade:20 #: control/control.SLES.glade.translations.glade:42 -#: control/control.openSUSE.glade.translations.glade:31 +#: control/control.openSUSE.glade.translations.glade:30 msgid "Live Installation Settings" msgstr "在线安装设置" #: control/control.SLED.glade.translations.glade:21 #: control/control.SLES.glade.translations.glade:43 -#: control/control.openSUSE.glade.translations.glade:32 -#: control/control.openSUSE.glade.translations.glade:89 +#: control/control.openSUSE.glade.translations.glade:31 +#: control/control.openSUSE.glade.translations.glade:90 msgid "Update Settings" msgstr "更新设置" #: control/control.SLED.glade.translations.glade:23 #: control/control.SLES.glade.translations.glade:46 #: control/control.SLES.glade.translations.glade:47 -#: control/control.openSUSE.glade.translations.glade:34 +#: control/control.openSUSE.glade.translations.glade:33 msgid "Network Configuration" msgstr "网络配置" @@ -97,7 +97,7 @@ #: control/control.SLES.glade.translations.glade:49 #: control/control.SLES.glade.translations.glade:50 #: control/control.SLES.glade.translations.glade:51 -#: control/control.openSUSE.glade.translations.glade:35 +#: control/control.openSUSE.glade.translations.glade:34 msgid "Hardware Configuration" msgstr "硬件配置" @@ -107,17 +107,18 @@ #: control/control.SLES.glade.translations.glade:52 #: control/control.SLES.glade.translations.glade:89 #: control/control.SLES.glade.translations.glade:119 -#: control/control.openSUSE.glade.translations.glade:36 -#: control/control.openSUSE.glade.translations.glade:80 -#: control/control.openSUSE.glade.translations.glade:110 +#: control/control.openSUSE.glade.translations.glade:35 +#: control/control.openSUSE.glade.translations.glade:79 +#: control/control.openSUSE.glade.translations.glade:111 msgid "Preparation" msgstr "准备" #: control/control.SLED.glade.translations.glade:26 #: control/control.SLED.glade.translations.glade:52 #: control/control.SLED.glade.translations.glade:66 -#: control/control.openSUSE.glade.translations.glade:37 -#: control/control.openSUSE.glade.translations.glade:66 +#: control/control.openSUSE.glade.translations.glade:36 +#: control/control.openSUSE.glade.translations.glade:65 +#: control/control.openSUSE.glade.translations.glade:80 msgid "Load linuxrc Network Configuration" msgstr "装载 linuxrc 网络配置" @@ -127,78 +128,79 @@ #: control/control.SLES.glade.translations.glade:54 #: control/control.SLES.glade.translations.glade:77 #: control/control.SLES.glade.translations.glade:91 -#: control/control.openSUSE.glade.translations.glade:38 -#: control/control.openSUSE.glade.translations.glade:67 +#: control/control.openSUSE.glade.translations.glade:37 +#: control/control.openSUSE.glade.translations.glade:66 +#: control/control.openSUSE.glade.translations.glade:81 msgid "Network Autosetup" msgstr "网络自动设置" #: control/control.SLED.glade.translations.glade:28 -#: control/control.SLED.glade.translations.glade:54 #: control/control.SLED.glade.translations.glade:68 +#: control/control.SLED.glade.translations.glade:84 +#: control/control.SLED.glade.translations.glade:97 #: control/control.SLES.glade.translations.glade:55 -#: control/control.SLES.glade.translations.glade:78 #: control/control.SLES.glade.translations.glade:92 -#: control/control.openSUSE.glade.translations.glade:39 -#: control/control.openSUSE.glade.translations.glade:68 -#: control/control.openSUSE.glade.translations.glade:81 -msgid "Welcome" -msgstr "欢迎" +#: control/control.SLES.glade.translations.glade:108 +#: control/control.SLES.glade.translations.glade:120 +#: control/control.openSUSE.glade.translations.glade:38 +#: control/control.openSUSE.glade.translations.glade:82 +#: control/control.openSUSE.glade.translations.glade:99 +#: control/control.openSUSE.glade.translations.glade:112 +msgid "Installer Update" +msgstr "安装程序更新" #: control/control.SLED.glade.translations.glade:29 -#: control/control.SLED.glade.translations.glade:55 +#: control/control.SLED.glade.translations.glade:54 #: control/control.SLED.glade.translations.glade:69 #: control/control.SLES.glade.translations.glade:56 -#: control/control.SLES.glade.translations.glade:79 +#: control/control.SLES.glade.translations.glade:78 #: control/control.SLES.glade.translations.glade:93 -#: control/control.openSUSE.glade.translations.glade:40 -msgid "Network Activation" -msgstr "网络激活" +#: control/control.openSUSE.glade.translations.glade:39 +#: control/control.openSUSE.glade.translations.glade:67 +#: control/control.openSUSE.glade.translations.glade:83 +msgid "Welcome" +msgstr "欢迎" #: control/control.SLED.glade.translations.glade:30 +#: control/control.SLED.glade.translations.glade:55 #: control/control.SLED.glade.translations.glade:70 #: control/control.SLES.glade.translations.glade:57 +#: control/control.SLES.glade.translations.glade:79 #: control/control.SLES.glade.translations.glade:94 -#: control/control.openSUSE.glade.translations.glade:41 -#: control/control.openSUSE.glade.translations.glade:82 -msgid "Disk Activation" -msgstr "磁盘激活" +#: control/control.openSUSE.glade.translations.glade:40 +msgid "Network Activation" +msgstr "网络激活" #: control/control.SLED.glade.translations.glade:31 -#: control/control.SLED.glade.translations.glade:33 #: control/control.SLED.glade.translations.glade:71 -#: control/control.SLED.glade.translations.glade:97 #: control/control.SLES.glade.translations.glade:58 -#: control/control.SLES.glade.translations.glade:60 #: control/control.SLES.glade.translations.glade:95 -#: control/control.SLES.glade.translations.glade:120 -#: control/control.openSUSE.glade.translations.glade:42 -#: control/control.openSUSE.glade.translations.glade:44 -#: control/control.openSUSE.glade.translations.glade:83 -#: control/control.openSUSE.glade.translations.glade:111 -msgid "System Analysis" -msgstr "系统分析" +#: control/control.openSUSE.glade.translations.glade:41 +#: control/control.openSUSE.glade.translations.glade:84 +msgid "Disk Activation" +msgstr "磁盘激活" #: control/control.SLED.glade.translations.glade:32 +#: control/control.SLED.glade.translations.glade:33 #: control/control.SLED.glade.translations.glade:72 -#: control/control.SLED.glade.translations.glade:85 -#: control/control.SLED.glade.translations.glade:100 +#: control/control.SLED.glade.translations.glade:98 #: control/control.SLES.glade.translations.glade:59 +#: control/control.SLES.glade.translations.glade:60 #: control/control.SLES.glade.translations.glade:96 -#: control/control.SLES.glade.translations.glade:109 -#: control/control.SLES.glade.translations.glade:123 +#: control/control.SLES.glade.translations.glade:121 +#: control/control.openSUSE.glade.translations.glade:42 #: control/control.openSUSE.glade.translations.glade:43 -#: control/control.openSUSE.glade.translations.glade:84 -#: control/control.openSUSE.glade.translations.glade:99 -#: control/control.openSUSE.glade.translations.glade:114 -msgid "Installer Update" -msgstr "安装程序更新" +#: control/control.openSUSE.glade.translations.glade:85 +#: control/control.openSUSE.glade.translations.glade:113 +msgid "System Analysis" +msgstr "系统分析" #: control/control.SLED.glade.translations.glade:34 #: control/control.SLED.glade.translations.glade:74 #: control/control.SLES.glade.translations.glade:61 #: control/control.SLES.glade.translations.glade:98 -#: control/control.openSUSE.glade.translations.glade:48 -#: control/control.openSUSE.glade.translations.glade:87 +#: control/control.openSUSE.glade.translations.glade:47 +#: control/control.openSUSE.glade.translations.glade:88 msgid "Add-On Products" msgstr "外接式附件" @@ -206,8 +208,8 @@ #: control/control.SLED.glade.translations.glade:56 #: control/control.SLES.glade.translations.glade:62 #: control/control.SLES.glade.translations.glade:80 -#: control/control.openSUSE.glade.translations.glade:45 -#: control/control.openSUSE.glade.translations.glade:70 +#: control/control.openSUSE.glade.translations.glade:44 +#: control/control.openSUSE.glade.translations.glade:69 msgid "Disk" msgstr "磁盘" @@ -215,22 +217,22 @@ #: control/control.SLED.glade.translations.glade:57 #: control/control.SLES.glade.translations.glade:63 #: control/control.SLES.glade.translations.glade:81 -#: control/control.openSUSE.glade.translations.glade:46 -#: control/control.openSUSE.glade.translations.glade:69 +#: control/control.openSUSE.glade.translations.glade:45 +#: control/control.openSUSE.glade.translations.glade:68 msgid "Time Zone" msgstr "时区" #: control/control.SLED.glade.translations.glade:37 #: control/control.SLED.glade.translations.glade:38 +#: control/control.openSUSE.glade.translations.glade:49 #: control/control.openSUSE.glade.translations.glade:50 -#: control/control.openSUSE.glade.translations.glade:51 +#: control/control.openSUSE.glade.translations.glade:70 #: control/control.openSUSE.glade.translations.glade:71 -#: control/control.openSUSE.glade.translations.glade:72 msgid "User Settings" msgstr "用户设置" #: control/control.SLED.glade.translations.glade:39 -#: control/control.openSUSE.glade.translations.glade:53 +#: control/control.openSUSE.glade.translations.glade:52 msgid "Installation Overview" msgstr "安装概述" @@ -281,31 +283,31 @@ #: control/control.SLES.glade.translations.glade:135 #: control/control.SLES.glade.translations.glade:136 #: control/control.SLES.glade.translations.glade:137 +#: control/control.openSUSE.glade.translations.glade: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:62 #: control/control.openSUSE.glade.translations.glade:63 -#: control/control.openSUSE.glade.translations.glade:64 +#: 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:77 #: control/control.openSUSE.glade.translations.glade:78 -#: control/control.openSUSE.glade.translations.glade:79 -#: control/control.openSUSE.glade.translations.glade:102 #: control/control.openSUSE.glade.translations.glade:103 -#: control/control.openSUSE.glade.translations.glade:105 +#: control/control.openSUSE.glade.translations.glade:104 #: control/control.openSUSE.glade.translations.glade:106 #: control/control.openSUSE.glade.translations.glade:107 #: control/control.openSUSE.glade.translations.glade:108 #: control/control.openSUSE.glade.translations.glade:109 -#: control/control.openSUSE.glade.translations.glade:126 +#: control/control.openSUSE.glade.translations.glade:110 #: control/control.openSUSE.glade.translations.glade:127 #: control/control.openSUSE.glade.translations.glade:128 +#: control/control.openSUSE.glade.translations.glade:129 msgid "Perform Installation" msgstr "执行安装" @@ -317,27 +319,27 @@ #: control/control.SLES.glade.translations.glade:103 #: control/control.SLES.glade.translations.glade:114 #: control/control.SLES.glade.translations.glade:130 -#: control/control.openSUSE.glade.translations.glade:57 -#: control/control.openSUSE.glade.translations.glade:92 -#: control/control.openSUSE.glade.translations.glade:104 -#: control/control.openSUSE.glade.translations.glade:121 +#: control/control.openSUSE.glade.translations.glade:56 +#: control/control.openSUSE.glade.translations.glade:93 +#: control/control.openSUSE.glade.translations.glade:105 +#: control/control.openSUSE.glade.translations.glade:122 msgid "Installer Cleanup" msgstr "安装程序清理" #: control/control.SLED.glade.translations.glade:51 #: control/control.SLES.glade.translations.glade:64 #: control/control.SLES.glade.translations.glade:75 -#: control/control.openSUSE.glade.translations.glade:52 -#: control/control.openSUSE.glade.translations.glade:65 +#: control/control.openSUSE.glade.translations.glade:51 +#: control/control.openSUSE.glade.translations.glade:64 msgid "Installation" msgstr "安装" #: control/control.SLED.glade.translations.glade:73 -#: control/control.SLED.glade.translations.glade:98 +#: control/control.SLED.glade.translations.glade:99 #: control/control.SLES.glade.translations.glade:97 -#: control/control.SLES.glade.translations.glade:121 -#: control/control.openSUSE.glade.translations.glade:85 -#: control/control.openSUSE.glade.translations.glade:112 +#: control/control.SLES.glade.translations.glade:122 +#: control/control.openSUSE.glade.translations.glade:86 +#: control/control.openSUSE.glade.translations.glade:114 msgid "System for Update" msgstr "更新系统" @@ -345,8 +347,8 @@ #: control/control.SLED.glade.translations.glade:102 #: control/control.SLES.glade.translations.glade:99 #: control/control.SLES.glade.translations.glade:125 -#: control/control.openSUSE.glade.translations.glade:88 -#: control/control.openSUSE.glade.translations.glade:116 +#: control/control.openSUSE.glade.translations.glade:89 +#: control/control.openSUSE.glade.translations.glade:117 msgid "Update" msgstr "更新" @@ -383,47 +385,47 @@ #: control/control.SLES.glade.translations.glade:134 #: control/control.SLES.glade.translations.glade:140 #: control/control.SLES.glade.translations.glade:141 -#: control/control.openSUSE.glade.translations.glade:90 #: control/control.openSUSE.glade.translations.glade:91 -#: control/control.openSUSE.glade.translations.glade:93 +#: control/control.openSUSE.glade.translations.glade:92 #: control/control.openSUSE.glade.translations.glade:94 #: control/control.openSUSE.glade.translations.glade:95 -#: control/control.openSUSE.glade.translations.glade:118 +#: control/control.openSUSE.glade.translations.glade:96 #: control/control.openSUSE.glade.translations.glade:119 #: control/control.openSUSE.glade.translations.glade:120 -#: control/control.openSUSE.glade.translations.glade:122 +#: control/control.openSUSE.glade.translations.glade:121 #: control/control.openSUSE.glade.translations.glade:123 #: control/control.openSUSE.glade.translations.glade:124 #: control/control.openSUSE.glade.translations.glade:125 -#: control/control.openSUSE.glade.translations.glade:131 +#: control/control.openSUSE.glade.translations.glade:126 #: control/control.openSUSE.glade.translations.glade:132 +#: control/control.openSUSE.glade.translations.glade:133 msgid "Perform Update" msgstr "执行更新" #: control/control.SLED.glade.translations.glade:83 #: control/control.SLES.glade.translations.glade:107 -#: control/control.openSUSE.glade.translations.glade:97 +#: control/control.openSUSE.glade.translations.glade:98 msgid "Base Installation" msgstr "基本安装" -#: 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:99 +#: control/control.SLED.glade.translations.glade:100 #: control/control.SLED.glade.translations.glade:101 #: control/control.SLED.glade.translations.glade:103 -#: control/control.SLES.glade.translations.glade:108 +#: control/control.SLES.glade.translations.glade:109 #: control/control.SLES.glade.translations.glade:110 #: control/control.SLES.glade.translations.glade:111 -#: control/control.SLES.glade.translations.glade:122 +#: control/control.SLES.glade.translations.glade:123 #: control/control.SLES.glade.translations.glade:124 #: control/control.SLES.glade.translations.glade:126 -#: control/control.openSUSE.glade.translations.glade:98 #: control/control.openSUSE.glade.translations.glade:100 #: control/control.openSUSE.glade.translations.glade:101 -#: control/control.openSUSE.glade.translations.glade:113 +#: control/control.openSUSE.glade.translations.glade:102 #: control/control.openSUSE.glade.translations.glade:115 -#: control/control.openSUSE.glade.translations.glade:117 +#: control/control.openSUSE.glade.translations.glade:116 +#: control/control.openSUSE.glade.translations.glade:118 msgid "AutoYaST Settings" msgstr "AutoYaST 设置" @@ -431,9 +433,9 @@ #: control/control.SLED.glade.translations.glade:119 #: control/control.SLES.glade.translations.glade:138 #: control/control.SLES.glade.translations.glade:142 -#: control/control.openSUSE.glade.translations.glade:96 -#: control/control.openSUSE.glade.translations.glade:129 -#: control/control.openSUSE.glade.translations.glade:133 +#: control/control.openSUSE.glade.translations.glade:97 +#: control/control.openSUSE.glade.translations.glade:130 +#: control/control.openSUSE.glade.translations.glade:134 msgid "Configuration" msgstr "配置" @@ -441,8 +443,8 @@ #: control/control.SLED.glade.translations.glade:120 #: control/control.SLES.glade.translations.glade:139 #: control/control.SLES.glade.translations.glade:143 -#: control/control.openSUSE.glade.translations.glade:130 -#: control/control.openSUSE.glade.translations.glade:134 +#: control/control.openSUSE.glade.translations.glade:131 +#: control/control.openSUSE.glade.translations.glade:135 msgid "System Configuration" msgstr "系统配置" @@ -622,15 +624,14 @@ msgid "Enlightenment Desktop" msgstr "Enlightenment 桌面" -#: control/control.openSUSE.glade.translations.glade:28 -msgid "Minimal Server Selection (Text Mode)" -msgstr "最小化的服务器选择（文本模式）" - -#: control/control.openSUSE.glade.translations.glade:47 -#: control/control.openSUSE.glade.translations.glade:86 +#: control/control.openSUSE.glade.translations.glade:46 +#: control/control.openSUSE.glade.translations.glade:87 msgid "Online Repositories" msgstr "联机储存库" -#: control/control.openSUSE.glade.translations.glade:49 +#: control/control.openSUSE.glade.translations.glade:48 msgid "Desktop Selection" msgstr "桌面选择" + +#~ msgid "Minimal Server Selection (Text Mode)" +#~ msgstr "最小化的服务器选择（文本模式）" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/country.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/country.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/country.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -327,8 +327,8 @@ #. summary label #. summary label -#: language/src/clients/language.rb:266 language/src/modules/Language.rb:793 -#: language/src/modules/Language.rb:827 +#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850 +#: language/src/modules/Language.rb:884 msgid "Additional Languages: %1" msgstr "其它语言：%1" @@ -582,25 +582,35 @@ msgstr "将时区更改为 %1(&T)" #. busy message -#: language/src/modules/Language.rb:382 +#: language/src/modules/Language.rb:375 msgid "Downloading installation system language extension..." msgstr "正在下载安装系统语言扩展..." +#. TRANSLATORS: Error message. Strings marked %{...} will be replaced +#. with variable content - do not translate them, please. +#: language/src/modules/Language.rb:406 +msgid "" +"Language '%{language}' was not found within the list of supported languages\n" +"available at %{directory}.\n" +"\n" +"Fallback language %{fallback} will be used." +msgstr "" + #. summary label #. summary label -#: language/src/modules/Language.rb:737 language/src/modules/Language.rb:809 +#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866 msgid "Primary Language: %1" msgstr "主要语言：%1" #. work-around for following in order not to depend on yast2-packager #. PackageSlideShow::InitPkgData (false); #. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes -#: language/src/modules/Language.rb:982 +#: language/src/modules/Language.rb:1039 msgid "Installing Packages..." msgstr "正在安装包..." #. continue/cancel message -#: language/src/modules/Language.rb:1073 +#: language/src/modules/Language.rb:1130 msgid "" "Translation of the primary language is not complete.\n" "Some texts may be displayed in English.\n" @@ -609,7 +619,7 @@ "某些文本可能显示为英文。\n" #. popup message -#: language/src/modules/Language.rb:1287 +#: language/src/modules/Language.rb:1344 msgid "" "Only minimal support for the selected language is included on this media.\n" "Add the Language add-on CD as an additional repository in order to get the appropriate support\n" @@ -620,7 +630,7 @@ "以获得对此语言的相应支持。\n" #. popup message (user selected CJK language in text mode) -#: language/src/modules/Language.rb:1316 +#: language/src/modules/Language.rb:1373 msgid "" "The selected language cannot be used in text mode. English is used for\n" "installation, but the selected language will be used for the new system." Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-06 16:57+0200\n" +"POT-Creation-Date: 2016-09-12 09:12+0200\n" "PO-Revision-Date: 2016-06-05 23:29+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <opensuse-zh@opensuse.org>\n" @@ -39,30 +39,23 @@ 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 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" +"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/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" +"<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/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" +"<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>" @@ -85,10 +78,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>You can also specify interface names for the bastion network conduits as " -"space-separated list.</p>" +"<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 "" "<p>在这里定义一个<b>网络模式</>及相关的<b>绑定策略</b>。</p>\n" "<p>您也可以空格分隔列表指定堡垒网络管道的接口名称。</p>" @@ -394,8 +385,7 @@ #. label (hint for user) #: src/include/crowbar/complex.rb:1502 -msgid "" -"If no user is present, user 'crowbar' with default password will be used." +msgid "If no user is present, user 'crowbar' with default password will be used." msgstr "若没有用户则将使用 'crowbar' 用户和默认密码。" #. tab header Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/dhcp-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: dhcp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/dns-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/dns-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/dns-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: dns-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/docker.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/docker.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/docker.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: docker\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/drbd.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/drbd.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/drbd.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: drbd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -310,12 +310,26 @@ msgstr "<p><b><big>LVM 配置</big></b></p>" #: 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\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" +#| "\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" 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\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><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>LVM Filter</b>: A filter that tells LVM2 to only use a restricted set of devices.</p>\n" "\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n" "\n" "\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n" @@ -473,40 +487,36 @@ "按<b>下一步</b>继续。\n" "<br></p>\n" -#. Default is always true (auto) -#: src/include/drbd/lvm_conf.rb:44 +#. encoding: utf-8 +#: src/include/drbd/lvm_conf.rb:42 msgid "LVM Filter Configuration of DRBD" msgstr "DRBD 的 LVM 过滤器配置" -#: src/include/drbd/lvm_conf.rb:52 -msgid "Modify LVM Device filter Automatically" -msgstr "自动修改 LVM 设备过滤器" - -#: src/include/drbd/lvm_conf.rb:62 +#: src/include/drbd/lvm_conf.rb:50 msgid "Device Filter" msgstr "设备过滤器" -#: src/include/drbd/lvm_conf.rb:72 +#: src/include/drbd/lvm_conf.rb:60 msgid "Writing the LVM cache" msgstr "写入 LVM 超速缓存" -#: src/include/drbd/lvm_conf.rb:81 +#: src/include/drbd/lvm_conf.rb:69 msgid "Enable LVM Cache" msgstr "启用 LVM 超速缓存" -#: src/include/drbd/lvm_conf.rb:86 +#: src/include/drbd/lvm_conf.rb:74 msgid "Warning! Should disable LVM cache for using drbd." msgstr "警告！应禁用 LVM 超速缓存以使用 drbd。" -#: src/include/drbd/lvm_conf.rb:97 +#: src/include/drbd/lvm_conf.rb:85 msgid "Use lvmetad for LVM" msgstr "对 LVM 使用 lvmetad" -#: src/include/drbd/lvm_conf.rb:106 +#: src/include/drbd/lvm_conf.rb:94 msgid "Use LVM metad" msgstr "使用 LVM metad" -#: src/include/drbd/lvm_conf.rb:111 +#: src/include/drbd/lvm_conf.rb:99 msgid "Warning! Should not use lvmetad for cluster." msgstr "警告！不应对群集使用 lvmetad。" @@ -536,61 +546,61 @@ msgstr "保存" #. Since n_name can't be edit, so set direct is OK -#: src/include/drbd/resource_conf.rb:336 +#: src/include/drbd/resource_conf.rb:331 msgid "Protocol" msgstr "协议" #. return `cancel or a string -#: src/include/drbd/resource_conf.rb:560 +#: src/include/drbd/resource_conf.rb:555 msgid "OK" msgstr "确定" -#: src/include/drbd/resource_conf.rb:561 +#: src/include/drbd/resource_conf.rb:556 msgid "Cancel" msgstr "取消" -#: src/include/drbd/resource_conf.rb:575 +#: src/include/drbd/resource_conf.rb:570 msgid "Node name can not be empty." msgstr "节点名称不能为空。" #. eg. ipv6 [fd01:2345:6789:abcd::1]:7800 -#: src/include/drbd/resource_conf.rb:623 +#: src/include/drbd/resource_conf.rb:618 msgid "IPv6 address must be placed inside brackets." msgstr "IPv6 地址必须用括号括住。" #. IPv6 should including port -#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636 +#: src/include/drbd/resource_conf.rb:626 src/include/drbd/resource_conf.rb:631 msgid "IP/port should use 'addr:port' combination." msgstr "IP/端口应采用“地址:端口”组合。" -#: src/include/drbd/resource_conf.rb:644 +#: src/include/drbd/resource_conf.rb:639 msgid "Please enter a valid IP address." msgstr "请输入有效的 IP 地址。" #. Checking the port is number -#: src/include/drbd/resource_conf.rb:651 +#: src/include/drbd/resource_conf.rb:646 msgid "Please enter a valid port number." msgstr "请输入有效的端口号。" #. myHelp("basic_conf"); -#: src/include/drbd/resource_conf.rb:719 +#: src/include/drbd/resource_conf.rb:714 msgid "Node names must not include \".\" , using the local hostname." msgstr "节点名称不能包含“.”，请使用本地主机名。" -#: src/include/drbd/resource_conf.rb:739 +#: src/include/drbd/resource_conf.rb:734 msgid "Please fill out all fields." msgstr "请填写所有字段。" -#: src/include/drbd/resource_conf.rb:754 +#: src/include/drbd/resource_conf.rb:749 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:789 +#: src/include/drbd/resource_conf.rb:784 msgid "Enter the node name:" msgstr "输入节点名称：" -#: src/include/drbd/resource_conf.rb:795 +#: src/include/drbd/resource_conf.rb:790 msgid "Node name must be different." msgstr "节点名称必须不同。" @@ -697,70 +707,70 @@ #. #. Representation of the configuration of drbd. #. Input and output routines. -#: src/modules/Drbd.rb:114 +#: src/modules/Drbd.rb:112 msgid "Failed to merge separated DRBD conf files\n" msgstr "无法合并分隔的 DRBD conf 文件\n" -#: src/modules/Drbd.rb:136 +#: src/modules/Drbd.rb:134 msgid "Failed to write drbd.conf.YaST2prepare" msgstr "无法写入 drbd.conf.YaST2prepare" #. DRBD read dialog caption -#: src/modules/Drbd.rb:191 +#: src/modules/Drbd.rb:189 msgid "Initializing DRBD Configuration" msgstr "正在初始化 DRBD 配置" #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:199 +#: src/modules/Drbd.rb:197 msgid "Read global settings" msgstr "读取全局设置" -#: src/modules/Drbd.rb:200 +#: src/modules/Drbd.rb:198 msgid "Read resources" msgstr "读取资源" -#: src/modules/Drbd.rb:201 +#: src/modules/Drbd.rb:199 msgid "Read LVM configurations" msgstr "读取 LVM 配置" -#: src/modules/Drbd.rb:202 +#: src/modules/Drbd.rb:200 msgid "Read daemon status" msgstr "读取守护程序状态" -#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210 +#: src/modules/Drbd.rb:201 src/modules/Drbd.rb:208 msgid "Read SuSEFirewall Settings" msgstr "读取 SuSEFirewall 设置" -#: src/modules/Drbd.rb:206 +#: src/modules/Drbd.rb:204 msgid "Reading global settings..." msgstr "正在读取全局设置..." -#: src/modules/Drbd.rb:207 +#: src/modules/Drbd.rb:205 msgid "Reading resources..." msgstr "正在读取资源..." -#: src/modules/Drbd.rb:208 +#: src/modules/Drbd.rb:206 msgid "Reading LVM configurations..." msgstr "正在读取 LVM 配置..." -#: src/modules/Drbd.rb:209 +#: src/modules/Drbd.rb:207 msgid "Reading daemon status..." msgstr "正在读取守护程序状态..." -#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661 +#: src/modules/Drbd.rb:209 src/modules/Drbd.rb:664 msgid "Finished" msgstr "已完成" #. new_map = remove(new_map, key); -#: src/modules/Drbd.rb:514 +#: src/modules/Drbd.rb:512 msgid "Failed to backup drbd.conf" msgstr "无法备份 drbd.conf" -#: src/modules/Drbd.rb:523 +#: src/modules/Drbd.rb:521 msgid "Failed to clean drbd.conf for drbdadm test" msgstr "无法清理 drbdadm 测试的 drbd.conf" -#: src/modules/Drbd.rb:547 +#: src/modules/Drbd.rb:545 msgid "" "Invalid configuration of resource %1\n" "%2" @@ -768,12 +778,12 @@ "资源 %1 的配置无效\n" "%2" -#: src/modules/Drbd.rb:566 +#: src/modules/Drbd.rb:564 msgid "Failed to bring drbd.conf back" msgstr "无法恢复 drbd.conf" #. DRBD write dialog caption -#: src/modules/Drbd.rb:637 +#: src/modules/Drbd.rb:640 msgid "Writing DRBD Configuration" msgstr "正在写入 DRBD 配置" @@ -781,46 +791,49 @@ #. 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:649 +#: src/modules/Drbd.rb:652 msgid "Write global settings" msgstr "写入全局设置" -#: src/modules/Drbd.rb:650 +#: src/modules/Drbd.rb:653 msgid "Write resources" msgstr "写入资源" -#: src/modules/Drbd.rb:651 +#: src/modules/Drbd.rb:654 msgid "Write LVM configurations" msgstr "写入 LVM 配置" -#: src/modules/Drbd.rb:652 +#: src/modules/Drbd.rb:655 msgid "Set daemon status" msgstr "设置守护程序状态" -#: src/modules/Drbd.rb:653 +#: src/modules/Drbd.rb:656 msgid "Write the SuSEfirewall settings" msgstr "写入 SuSEfirewall 设置" -#: src/modules/Drbd.rb:656 +#: src/modules/Drbd.rb:659 msgid "Writing global settings..." msgstr "正在写入全局设置..." -#: src/modules/Drbd.rb:657 +#: src/modules/Drbd.rb:660 msgid "Writing resources..." msgstr "正在写入资源..." -#: src/modules/Drbd.rb:658 +#: src/modules/Drbd.rb:661 msgid "Writing LVM configurations..." msgstr "正在写入 LVM 配置..." -#: src/modules/Drbd.rb:659 +#: src/modules/Drbd.rb:662 msgid "Setting daemon status..." msgstr "正在设置守护程序状态..." -#: src/modules/Drbd.rb:660 +#: src/modules/Drbd.rb:663 msgid "Writing the SuSEFirewall settings" msgstr "正在写入 SuSEFirewall 设置" -#: src/modules/Drbd.rb:671 +#: src/modules/Drbd.rb:674 msgid "Failed to make directory /etc/drbd.d" msgstr "无法创建目录 /etc/drbd.d" + +#~ msgid "Modify LVM Device filter Automatically" +#~ msgstr "自动修改 LVM 设备过滤器" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/fcoe-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/fcoe-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/fcoe-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: fcoe-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/firewall-services.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/firewall-services.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/firewall-services.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: firewall-services\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:57+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/firewall.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/firewall.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/firewall.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/firstboot.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/firstboot.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/firstboot.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/fonts.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-12 09:12+0200\n" "PO-Revision-Date: 2016-01-17 14:12+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <kde-i18n-doc@kde.org>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/ftp-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/ftp-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/ftp-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ftp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/geo-cluster.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: geo-cluster\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/http-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/http-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/http-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: http-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/inetd.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/inetd.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/inetd.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: inetd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/installation.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/installation.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/installation.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -463,7 +463,7 @@ msgstr "%1 %2 更新" #: src/lib/installation/clients/inst_addon_update_sources.rb:172 -#: src/lib/installation/clients/inst_system_analysis.rb:321 +#: src/lib/installation/clients/inst_system_analysis.rb:306 msgid "Unknown Product" msgstr "未知产品" @@ -504,14 +504,14 @@ #. 7 = Failed to connect to host. #. 28 = Operation timeout. #. push button -#: src/lib/installation/clients/inst_complex_welcome.rb:184 +#: src/lib/installation/clients/inst_complex_welcome.rb:178 #: src/lib/installation/clients/inst_download_release_notes.rb:126 -#: src/lib/installation/clients/inst_system_analysis.rb:319 +#: src/lib/installation/clients/inst_system_analysis.rb:304 msgid "Re&lease Notes..." msgstr "发行说明(&L)..." #. help text for initial (first time) language screen -#: src/lib/installation/clients/inst_complex_welcome.rb:198 +#: src/lib/installation/clients/inst_complex_welcome.rb:192 msgid "" "<p>\n" "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n" @@ -525,7 +525,7 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/lib/installation/clients/inst_complex_welcome.rb:206 +#: src/lib/installation/clients/inst_complex_welcome.rb:200 msgid "" "<p>\n" "The license must be accepted before the installation continues.\n" @@ -538,7 +538,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:213 +#: src/lib/installation/clients/inst_complex_welcome.rb:207 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -549,7 +549,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:219 +#: src/lib/installation/clients/inst_complex_welcome.rb:213 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -562,7 +562,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:226 +#: src/lib/installation/clients/inst_complex_welcome.rb:220 msgid "" "<p>\n" "Select <b>Abort</b> to abort the\n" @@ -575,49 +575,49 @@ "</p>\n" #. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_complex_welcome.rb:242 -#: src/lib/installation/clients/inst_complex_welcome.rb:469 +#: src/lib/installation/clients/inst_complex_welcome.rb:236 +#: src/lib/installation/clients/inst_complex_welcome.rb:434 msgid "License Agreement" msgstr "许可协议" #. combo box label #. combobox #. TRANSLATORS: Combo box -#: src/lib/installation/clients/inst_complex_welcome.rb:266 +#: src/lib/installation/clients/inst_complex_welcome.rb:260 #: src/lib/installation/clients/inst_release_notes.rb:217 #: src/lib/installation/clients/inst_release_notes.rb:429 msgid "&Language" msgstr "语言(&L)" #. combo box label -#: src/lib/installation/clients/inst_complex_welcome.rb:276 +#: src/lib/installation/clients/inst_complex_welcome.rb:270 msgid "&Keyboard Layout" msgstr "键盘布局(&K)" #. TRANSLATORS: check-box -#: src/lib/installation/clients/inst_complex_welcome.rb:290 +#: src/lib/installation/clients/inst_complex_welcome.rb:284 msgid "I &Agree to the License Terms." msgstr "我接受许可证条款(&A)。" #. Report error about missing license acceptance -#: src/lib/installation/clients/inst_complex_welcome.rb:317 +#: src/lib/installation/clients/inst_complex_welcome.rb:311 msgid "You must accept the license to install this product" msgstr "您必须接受许可证后才能安装此产品" #. TRANSLATORS: addition license information #. %1 is replaced with the filename. Please keep #. the translation VERY short. -#: src/lib/installation/clients/inst_complex_welcome.rb:437 +#: src/lib/installation/clients/inst_complex_welcome.rb:402 msgid "EULA location in the installed system: %s" msgstr "EULA 在安装的系统中的位置：%s" #. this type of contents will be shown only for initial installation dialog -#: src/lib/installation/clients/inst_complex_welcome.rb:460 +#: src/lib/installation/clients/inst_complex_welcome.rb:425 msgid "K&eyboard Test" msgstr "键盘测试(&E)" #. TRANSLATORS: button label -#: src/lib/installation/clients/inst_complex_welcome.rb:494 +#: src/lib/installation/clients/inst_complex_welcome.rb:459 msgid "License &Translations..." msgstr "许可证转换(&T)..." @@ -798,33 +798,33 @@ msgstr "用于部署映像的硬盘" #. popup label -#: src/lib/installation/clients/inst_disks_activate.rb:65 +#: src/lib/installation/clients/inst_disks_activate.rb:63 msgid "Detecting Available Controllers" msgstr "正在检测可用的控制器" #. dialog caption -#: src/lib/installation/clients/inst_disks_activate.rb:81 +#: src/lib/installation/clients/inst_disks_activate.rb:79 msgid "Disk Activation" msgstr "磁盘激活" -#: src/lib/installation/clients/inst_disks_activate.rb:91 +#: src/lib/installation/clients/inst_disks_activate.rb:89 msgid "Configure &DASD Disks" msgstr "配置 DASD 磁盘(&D)" -#: src/lib/installation/clients/inst_disks_activate.rb:97 +#: src/lib/installation/clients/inst_disks_activate.rb:95 msgid "Configure &ZFCP Disks" msgstr "配置 ZFCP 磁盘(&Z)" -#: src/lib/installation/clients/inst_disks_activate.rb:103 +#: src/lib/installation/clients/inst_disks_activate.rb:101 msgid "Configure &FCoE Interfaces" msgstr "配置 FCoE 接口(&F)" -#: src/lib/installation/clients/inst_disks_activate.rb:117 +#: src/lib/installation/clients/inst_disks_activate.rb:115 msgid "Configure &iSCSI Disks" msgstr "配置iSCSI 磁盘(&I)" #. Finish -#: src/lib/installation/clients/inst_disks_activate.rb:178 +#: src/lib/installation/clients/inst_disks_activate.rb:176 msgid "Net&work Configuration..." msgstr "网络配置(&W)..." @@ -855,17 +855,17 @@ msgstr "正在初始化安装程序..." #. popup message, list of repositores is appended to the text -#: src/lib/installation/clients/inst_extrasources.rb:142 +#: src/lib/installation/clients/inst_extrasources.rb:141 msgid "Package updates have been found in these additional repositories:" msgstr "在这些额外的储存库中找到了包更新：" #. yes/no popup question -#: src/lib/installation/clients/inst_extrasources.rb:160 +#: src/lib/installation/clients/inst_extrasources.rb:159 msgid "Start the software manager to check and install the updates?" msgstr "是否启动软件管理器以检查和安装这些更新？" #. check box -#: src/lib/installation/clients/inst_extrasources.rb:501 +#: src/lib/installation/clients/inst_extrasources.rb:494 msgid "Show &package updates" msgstr "显示包更新(&P)" @@ -1184,88 +1184,88 @@ #. This dialog in not interactive #. always return `back when came from the previous dialog -#: src/lib/installation/clients/inst_system_analysis.rb:86 +#: src/lib/installation/clients/inst_system_analysis.rb:80 msgid "Analyzing the Computer" msgstr "正在分析计算机" #. TRANSLATORS: progress steps in system probing -#: src/lib/installation/clients/inst_system_analysis.rb:105 +#: src/lib/installation/clients/inst_system_analysis.rb:99 msgid "Probe USB devices" msgstr "侦测 USB 设备" -#: src/lib/installation/clients/inst_system_analysis.rb:106 +#: src/lib/installation/clients/inst_system_analysis.rb:100 msgid "Probing USB devices..." msgstr "正在侦测 USB 设备..." -#: src/lib/installation/clients/inst_system_analysis.rb:109 +#: src/lib/installation/clients/inst_system_analysis.rb:103 msgid "Probe FireWire devices" msgstr "侦测 FireWire 设备..." -#: src/lib/installation/clients/inst_system_analysis.rb:110 +#: src/lib/installation/clients/inst_system_analysis.rb:104 msgid "Probing FireWire devices..." msgstr "正在检测 FireWire 设备..." -#: src/lib/installation/clients/inst_system_analysis.rb:113 +#: src/lib/installation/clients/inst_system_analysis.rb:107 msgid "Probe floppy disk devices" msgstr "检测软盘设备" -#: src/lib/installation/clients/inst_system_analysis.rb:114 +#: src/lib/installation/clients/inst_system_analysis.rb:108 msgid "Probing floppy disk devices..." msgstr "正在检测软盘设备..." -#: src/lib/installation/clients/inst_system_analysis.rb:118 +#: src/lib/installation/clients/inst_system_analysis.rb:112 msgid "Probe hard disk controllers" msgstr "侦测硬盘控制器" -#: src/lib/installation/clients/inst_system_analysis.rb:119 +#: src/lib/installation/clients/inst_system_analysis.rb:113 msgid "Probing hard disk controllers..." msgstr "正在侦测硬盘控制器..." -#: src/lib/installation/clients/inst_system_analysis.rb:122 +#: src/lib/installation/clients/inst_system_analysis.rb:116 msgid "Load kernel modules for hard disk controllers" msgstr "为硬盘控制器装载内核模块" -#: src/lib/installation/clients/inst_system_analysis.rb:123 +#: src/lib/installation/clients/inst_system_analysis.rb:117 msgid "Loading kernel modules for hard disk controllers..." msgstr "正在为硬盘控制器装载内核模块..." -#: src/lib/installation/clients/inst_system_analysis.rb:126 +#: src/lib/installation/clients/inst_system_analysis.rb:120 msgid "Probe hard disks" msgstr "侦测硬盘" -#: src/lib/installation/clients/inst_system_analysis.rb:127 +#: src/lib/installation/clients/inst_system_analysis.rb:121 msgid "Probing hard disks..." msgstr "正在侦测硬盘..." #. FATE #302980: Simplified user config during installation -#: src/lib/installation/clients/inst_system_analysis.rb:134 +#: src/lib/installation/clients/inst_system_analysis.rb:128 msgid "Search for system files" msgstr "搜索系统文件" -#: src/lib/installation/clients/inst_system_analysis.rb:135 +#: src/lib/installation/clients/inst_system_analysis.rb:129 msgid "Searching for system files..." msgstr "正在搜索系统文件..." -#: src/lib/installation/clients/inst_system_analysis.rb:138 +#: src/lib/installation/clients/inst_system_analysis.rb:132 msgid "Initialize software manager" msgstr "初始化软件管理器" -#: src/lib/installation/clients/inst_system_analysis.rb:139 +#: src/lib/installation/clients/inst_system_analysis.rb:133 msgid "Initializing software manager..." msgstr "正在初始化软件管理器..." #. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_system_analysis.rb:144 +#: src/lib/installation/clients/inst_system_analysis.rb:138 msgid "System Probing" msgstr "系统侦测" #. TRANSLATORS: dialog help -#: src/lib/installation/clients/inst_system_analysis.rb:150 +#: src/lib/installation/clients/inst_system_analysis.rb:144 msgid "YaST is probing computer hardware and installed systems now." msgstr "YaST 现在正在探测计算机硬件和已安装的系统。" #. additonal error when HW was not found -#: src/lib/installation/clients/inst_system_analysis.rb:257 +#: src/lib/installation/clients/inst_system_analysis.rb:242 msgid "" "\n" "Check 'drivers.suse.com' if you need specific hardware drivers for installation." @@ -1274,7 +1274,7 @@ "如果您需要安装特数硬件驱动程序，请查看“drivers.suse.com”。" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:271 +#: src/lib/installation/clients/inst_system_analysis.rb:256 msgid "" "No hard disks were found for the installation.\n" "Please check your hardware!\n" @@ -1284,7 +1284,7 @@ "请检查您的硬件！\n" "%1\n" -#: src/lib/installation/clients/inst_system_analysis.rb:281 +#: 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" @@ -1295,7 +1295,7 @@ "(尤其是在 S/390 或 iSCSI 系统上）\n" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:292 +#: 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" @@ -1308,7 +1308,7 @@ "%1\n" #. popup message -#: src/lib/installation/clients/inst_system_analysis.rb:337 +#: src/lib/installation/clients/inst_system_analysis.rb:322 msgid "" "Failed to initialize the software repositories.\n" "Aborting the installation." @@ -1316,8 +1316,34 @@ "未能初始化软件储存库。\n" "正在中止安装。" +#. TRANSLATORS: error message +#: src/lib/installation/clients/inst_update_installer.rb:225 +msgid "" +"<p>Cannot obtain the installer update repository URL\n" +"from the registration server.</p>" +msgstr "" + +#. TRANSLATORS: part of an error message, %s is the default repository +#. URL from control.xml +#: src/lib/installation/clients/inst_update_installer.rb:231 +#, fuzzy +#| msgid "<p>The automounter package will be installed.</p>" +msgid "<p>The default URL %s will be used.<p>" +msgstr "<p>自动加载软件包将被安装.</p>" + +#. Ask the user to chose a registration server +#. +#. @param services [Array<SlpServiceClass::Service>] Array of registration servers +#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected; +#. :cancel if the dialog was dismissed. +#: src/lib/installation/clients/inst_update_installer.rb:308 +msgid "" +"Select a detected registration server from the list\n" +"to search for installer updates." +msgstr "" + #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:187 +#: src/lib/installation/clients/inst_update_installer.rb:389 msgid "" "A valid update could not be found at\n" "%s.\n" @@ -1328,7 +1354,7 @@ "\n" #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:193 +#: src/lib/installation/clients/inst_update_installer.rb:395 msgid "" "Could not fetch update from\n" "%s.\n" @@ -1343,9 +1369,10 @@ #. Ask the user about checking network configuration. If she/he accepts, #. the `inst_lan` client will be launched. #. +#. @param url [URI] URL to show in the message #. @return [Boolean] true if the network configuration client was launched; #. false if the network is not configured. -#: src/lib/installation/clients/inst_update_installer.rb:221 +#: src/lib/installation/clients/inst_update_installer.rb:425 msgid "" "\n" "Would you like to check your network configuration\n" @@ -1358,7 +1385,7 @@ #. Note: the proxy cannot be configured in the YaST installer yet, #. it needs to be set via the "proxy" boot option. #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:265 +#: src/lib/installation/clients/inst_update_installer.rb:470 msgid "" "Downloading the optional installer updates from \n" "%s\n" @@ -1380,6 +1407,57 @@ "如果您需要代理服务器以访问更新储存库，\n" "请使用“proxy”引导参数。\n" +#. TRANSLATORS: progress label +#: src/lib/installation/clients/inst_update_installer.rb:579 +#, fuzzy +#| msgid "Adding the Repository..." +msgid "Add Update Repository" +msgstr "正在添加安装源..." + +#: src/lib/installation/clients/inst_update_installer.rb:580 +#, fuzzy +#| msgid "Downloading Package" +msgid "Download the Packages" +msgstr "正在下载包" + +#: src/lib/installation/clients/inst_update_installer.rb:581 +#, fuzzy +#| msgid "Copy the packages" +msgid "Apply the Packages" +msgstr "复制软件包" + +#: src/lib/installation/clients/inst_update_installer.rb:582 +msgid "Restart" +msgstr "重启动" + +#: src/lib/installation/clients/inst_update_installer.rb:585 +#, fuzzy +#| msgid "Select an AutoYast Profile" +msgid "Fetching AutoYast Profile" +msgstr "选择 AutoYast 配置文件" + +#. TRANSLATORS: dialog title +#. TRANSLATORS: progress title +#: src/lib/installation/clients/inst_update_installer.rb:595 +#: src/lib/installation/clients/inst_update_installer.rb:597 +#, fuzzy +#| msgid "Updating the sound volume..." +msgid "Updating the Installer..." +msgstr "正在更新音量..." + +#. Fetch the profile from the given URI +#. +#. @return [Hash, nil] current profile if fetched or exists; nil otherwise +#. +#. @see Yast::Profile.current +#: src/lib/installation/clients/inst_update_installer.rb:668 +#, fuzzy +#| msgid "Error reading control file." +msgid "" +"Error while parsing the control file.\n" +"\n" +msgstr "读取控制文件时出错。" + #. TRANSLATORS: Table item status (repository) #: src/lib/installation/clients/inst_upgrade_urls.rb:109 msgid "Removed" @@ -1433,8 +1511,8 @@ #. menu button #. menu button #: src/lib/installation/clients/inst_upgrade_urls.rb:247 -#: src/lib/installation/proposal_runner.rb:647 -#: src/lib/installation/proposal_runner.rb:762 +#: src/lib/installation/proposal_runner.rb:651 +#: src/lib/installation/proposal_runner.rb:766 msgid "&Change..." msgstr "更改(&C)..." @@ -1727,8 +1805,11 @@ msgstr "将这些设置写入系统是无意义的。" #. proposal part - bootloader label +#. For some reason the CheckBoxFrame Label is cut if the label size +#. exceeds the CheckBoxFrame content's width. MinWidth with label length +#. is used to avoid this issue. #: src/lib/installation/clients/ssh_import_proposal.rb:21 -#: src/lib/installation/dialogs/ssh_import.rb:91 +#: src/lib/installation/dialogs/ssh_import.rb:98 msgid "Import SSH Host Keys and Configuration" msgstr "导入 SSH 主机密钥和配置" @@ -1805,26 +1886,26 @@ msgstr "正在将日志文件复制到已安装的系统..." #. Event callback for the 'ok' button -#: src/lib/installation/dialogs/ssh_import.rb:69 +#: src/lib/installation/dialogs/ssh_import.rb:65 msgid "I would like to import SSH keys from a previous installation" msgstr "我要从先前的安装导入 SSH 密钥" -#: src/lib/installation/dialogs/ssh_import.rb:95 +#: src/lib/installation/dialogs/ssh_import.rb:102 msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>" msgstr "<p>每一个 SSH 服务器都通过一个或多个公共主机密钥来识别。选择现有的 Linux 安装会重用其 SSH 服务器的主机密钥并因而重用其身份。/etc/ssh 中的密钥文件（每个主机密钥对应一对文件）将会复制到正在安装的新系统中。</p><p>如果选中<b>导入 SSH 配置</b>，则除了密钥以外还会复制 /etc/ssh 中的其他文件。</p>" #. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0 -#: src/lib/installation/dialogs/ssh_import.rb:108 +#: src/lib/installation/dialogs/ssh_import.rb:115 msgid "&Device" msgstr "设备(&D)" #. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device} #. is a string like /dev/sda1 -#: src/lib/installation/dialogs/ssh_import.rb:129 +#: src/lib/installation/dialogs/ssh_import.rb:136 msgid "%{system_name} at %{device}" msgstr "%{device} 上的 %{system_name}" -#: src/lib/installation/dialogs/ssh_import.rb:134 +#: src/lib/installation/dialogs/ssh_import.rb:141 msgid "Import SSH Configuration" msgstr "导入 SSH 配置" @@ -1849,7 +1930,7 @@ msgstr "根据用户请求跳过配置" #. error message is a popup -#: src/lib/installation/proposal_runner.rb:272 +#: src/lib/installation/proposal_runner.rb:274 msgid "" "The proposal contains an error that must be\n" "resolved before continuing.\n" @@ -1858,25 +1939,25 @@ "才能继续。\n" #. busy message -#: src/lib/installation/proposal_runner.rb:381 +#: src/lib/installation/proposal_runner.rb:383 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:385 -#: src/lib/installation/proposal_runner.rb:667 +#: src/lib/installation/proposal_runner.rb:387 +#: src/lib/installation/proposal_runner.rb:671 msgid "Analyzing your system..." msgstr "正在分析您的系统..." #. fallback proposal, means usually an internal error -#: src/lib/installation/proposal_runner.rb:487 +#: src/lib/installation/proposal_runner.rb:489 msgid "ERROR: No proposal" msgstr "错误：无建议" #. Submodules handle their own error reporting #. text for a message box -#: src/lib/installation/proposal_runner.rb:526 +#: src/lib/installation/proposal_runner.rb:530 msgid "" "Configuration saved.\n" "There were errors." @@ -1889,36 +1970,36 @@ #. Translators: About 40 characters max, #. use newlines for longer translations. #. radio button -#: src/lib/installation/proposal_runner.rb:621 +#: src/lib/installation/proposal_runner.rb:625 msgid "&Skip Configuration" msgstr "跳过配置(&S)" #. radio button -#: src/lib/installation/proposal_runner.rb:630 +#: src/lib/installation/proposal_runner.rb:634 msgid "&Use Following Configuration" msgstr "使用以下配置(&U)" #. 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:693 +#: src/lib/installation/proposal_runner.rb:697 msgid "Click a headline to make changes or use the \"Change...\" menu below." msgstr "单击任一标题或使用下面的“更改...”菜单进行更改。" -#: src/lib/installation/proposal_runner.rb:697 +#: src/lib/installation/proposal_runner.rb:701 msgid "Click a headline to make changes." msgstr "单击标题可进行更改。" #. menu button item -#: src/lib/installation/proposal_runner.rb:757 +#: src/lib/installation/proposal_runner.rb:761 msgid "&Reset to defaults" msgstr "重设置为默认值(&R)" #. FATE #120373 -#: src/lib/installation/proposal_runner.rb:779 +#: src/lib/installation/proposal_runner.rb:783 msgid "&Update" msgstr "更新(&U)" -#: src/lib/installation/proposal_runner.rb:779 +#: src/lib/installation/proposal_runner.rb:783 msgid "&Install" msgstr "安装(&I)" @@ -1953,7 +2034,7 @@ #. Help text for installation proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:426 +#: src/lib/installation/proposal_store.rb:435 msgid "" "<p>\n" "Select <b>Install</b> to perform a new installation with the values displayed.\n" @@ -1966,7 +2047,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:434 +#: src/lib/installation/proposal_store.rb:443 msgid "" "<p>\n" "Select <b>Update</b> to perform an update with the values displayed.\n" @@ -1978,7 +2059,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:443 +#: src/lib/installation/proposal_store.rb:452 msgid "" "<p>\n" "Put the network settings into effect by pressing <b>Next</b>.\n" @@ -1990,7 +2071,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:451 +#: src/lib/installation/proposal_store.rb:460 msgid "" "<p>\n" "Put the service settings into effect by pressing <b>Next</b>.\n" @@ -2002,7 +2083,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:459 +#: src/lib/installation/proposal_store.rb:468 msgid "" "<p>\n" "Put the hardware settings into effect by pressing <b>Next</b>.\n" @@ -2013,12 +2094,12 @@ "</p>\n" #. Proposal in uml module -#: src/lib/installation/proposal_store.rb:466 +#: src/lib/installation/proposal_store.rb:475 msgid "<P><B>UML Installation Proposal</B></P>" msgstr "<P><B>UML 安装建议</B></P>" #. help text -#: src/lib/installation/proposal_store.rb:468 +#: src/lib/installation/proposal_store.rb:477 msgid "" "<P>UML (User Mode Linux) installation allows you to start independent\n" "Linux virtual machines in the host system.</P>" @@ -2029,7 +2110,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:482 +#: src/lib/installation/proposal_store.rb:491 msgid "" "<p>\n" "To use the settings as displayed, press <b>Next</b>.\n" @@ -2047,7 +2128,7 @@ msgstr "正在启用远程管理..." #. A Continue-Cancel popup -#: src/lib/installation/select_system_role.rb:79 +#: src/lib/installation/select_system_role.rb:80 msgid "Changing the system role may undo adjustments you may have done." msgstr "更改系统角色可能会撤消您所做的调整。" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/instserver.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/instserver.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/instserver.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: instserver\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/iplb.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/iplb.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/iplb.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iplb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscsi-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-lio-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscsi-lio-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/isns.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/isns.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/isns.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: isns\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/journal.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/journal.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/journal.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: journal\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-06 16:58+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2016-06-06 00:41+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" "Language-Team: Chinese <opensuse-zh@opensuse.org>\n" @@ -124,4 +124,3 @@ #: src/lib/journalctl/query_presenter.rb:130 msgid "Message" msgstr "消息" - Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/kdump.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/kdump.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/kdump.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdump\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -362,7 +362,7 @@ #. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text #. delete crashkernel parameter from bootloader -#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501 +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:502 msgid "To apply changes a reboot is necessary." msgstr "要应用更改，需要重引导。" @@ -1228,7 +1228,7 @@ #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:398 +#: src/modules/Kdump.rb:399 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." @@ -1237,129 +1237,129 @@ "有关细节，请参见 %{log}。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:511 +#: src/modules/Kdump.rb:512 msgid "Initializing kdump Configuration" msgstr "正在初始化 Kdump 配置" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528 +#: src/modules/Kdump.rb:521 src/modules/Kdump.rb:529 msgid "Reading the config file..." msgstr "正在读取配置文件..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:522 +#: src/modules/Kdump.rb:523 msgid "Reading kernel boot options..." msgstr "正在读取内核引导选项..." #. Progress stage 4/4 -#: src/modules/Kdump.rb:524 +#: src/modules/Kdump.rb:525 msgid "Calculating memory limits..." msgstr "正在计算内存限制..." #. Progress step 2/4 -#: src/modules/Kdump.rb:530 +#: src/modules/Kdump.rb:531 msgid "Reading partitions of disks..." msgstr "正在读取磁盘分区..." #. Progress finished 3/4 -#: src/modules/Kdump.rb:532 +#: src/modules/Kdump.rb:533 msgid "Reading available memory and calibrating usage..." msgstr "正在读取可用内存以及校准用量..." #. Error message -#: src/modules/Kdump.rb:544 +#: src/modules/Kdump.rb:545 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "无法读取配置文件 /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:552 +#: src/modules/Kdump.rb:553 msgid "Cannot read kernel boot options." msgstr "无法读取内核引导选项。" #. Error message -#: src/modules/Kdump.rb:560 +#: src/modules/Kdump.rb:561 msgid "Cannot read available memory." msgstr "无法读取可用内存。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:586 +#: src/modules/Kdump.rb:587 msgid "Saving kdump Configuration" msgstr "正在保存 Kdump 配置" #. Progress stage 1/2 -#: src/modules/Kdump.rb:615 +#: src/modules/Kdump.rb:616 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Kdump.rb:617 +#: src/modules/Kdump.rb:618 msgid "Update boot options" msgstr "更新引导选项" #. Progress step 1/2 -#: src/modules/Kdump.rb:621 +#: src/modules/Kdump.rb:622 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Kdump.rb:623 +#: src/modules/Kdump.rb:624 msgid "Updating boot options..." msgstr "正在更新引导选项..." #. Progress finished -#: src/modules/Kdump.rb:625 +#: src/modules/Kdump.rb:626 msgid "Finished" msgstr "已完成" #. Error message -#: src/modules/Kdump.rb:635 +#: src/modules/Kdump.rb:636 msgid "Cannot write settings." msgstr "无法写入设置。" #. Error message -#: src/modules/Kdump.rb:644 +#: src/modules/Kdump.rb:645 msgid "Adding crashkernel parameter to bootloader fault." msgstr "正在将 crashkernel 参数添加到引导加载程序默认值中。" #. Create a textual summary #. @return summary of the current configuration -#: src/modules/Kdump.rb:764 +#: src/modules/Kdump.rb:763 msgid "Kdump status: %1" msgstr "Kdump 状态：%1" -#: src/modules/Kdump.rb:765 +#: src/modules/Kdump.rb:764 msgid "enabled" msgstr "已启用" -#: src/modules/Kdump.rb:765 +#: src/modules/Kdump.rb:764 msgid "disabled" msgstr "已禁用" -#: src/modules/Kdump.rb:772 +#: src/modules/Kdump.rb:771 msgid "Value(s) of crashkernel option: %1" msgstr "crashkernel 选项的值：%1" -#: src/modules/Kdump.rb:779 +#: src/modules/Kdump.rb:778 msgid "Dump format: %1" msgstr "转储格式：%1" -#: src/modules/Kdump.rb:786 +#: src/modules/Kdump.rb:785 msgid "Target of dumps: %1" msgstr "转储的目标：%1" -#: src/modules/Kdump.rb:793 +#: src/modules/Kdump.rb:792 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:885 +#: src/modules/Kdump.rb:884 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:972 +#: src/modules/Kdump.rb:971 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/languages_db.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/languages_db.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/languages_db.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: languages_db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/ldap-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/ldap-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/ldap-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ldap-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/ldap.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/ldap.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/ldap.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ldap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-06 16:58+0200\n" +"POT-Creation-Date: 2016-08-04 14:55+0200\n" "PO-Revision-Date: 2013-02-03 19:36+0800\n" "Last-Translator: 玛格丽特 · 苏 <i@marguerite.su>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -123,8 +123,7 @@ #: 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>" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/mail.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/mail.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/mail.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: mail\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/migration.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/migration.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/migration.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: migration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/multipath.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/multipath.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/multipath.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: multipath\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/network.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/network.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/network.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -670,7 +670,7 @@ msgid "Device" msgstr "设备" -#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:399 +#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:408 msgid "Options" msgstr "选项" @@ -739,13 +739,13 @@ #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1340 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:1373 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1342 msgid "Change." msgstr "更改。" @@ -1116,14 +1116,14 @@ #. ComboBox label #. ComboBox label #: src/include/network/lan/address.rb:156 -#: src/include/network/lan/hardware.rb:351 +#: src/include/network/lan/hardware.rb:360 msgid "&Device Type" msgstr "设备类型(&D)" #. ComboBox label #. TextEntry label #: src/include/network/lan/address.rb:174 -#: src/include/network/lan/hardware.rb:337 +#: src/include/network/lan/hardware.rb:346 msgid "&Configuration Name" msgstr "配置名称(&C)" @@ -1136,7 +1136,7 @@ msgstr "隧道组" #: src/include/network/lan/address.rb:193 -#: src/include/network/lan/address.rb:1307 +#: src/include/network/lan/address.rb:1313 msgid "Bridged Devices" msgstr "桥接的设备" @@ -1208,7 +1208,7 @@ #. TextEntry label #. TextEntry label #: src/include/network/lan/address.rb:332 -#: src/include/network/lan/virtual.rb:210 +#: src/include/network/lan/virtual.rb:207 #: src/include/network/services/host.rb:330 msgid "&IP Address" msgstr "IP 地址(&I)" @@ -1304,62 +1304,61 @@ "检测到重复的 IP 地址。\n" "是否确实要继续？\n" -#. @param [Array<String>] types network card types -#. @return their descriptions for CWM -#: src/include/network/lan/address.rb:1187 +#. Stores content of IFPLUGD_PRIORITY widget into internal variables +#: src/include/network/lan/address.rb:1193 msgid "&General" msgstr "常规(&G)" #. TODO: "MANDATORY", -#: src/include/network/lan/address.rb:1198 +#: src/include/network/lan/address.rb:1204 msgid "Device Activation" msgstr "设备激活" -#: src/include/network/lan/address.rb:1202 +#: src/include/network/lan/address.rb:1208 msgid "Firewall Zone" msgstr "防火墙区域" -#: src/include/network/lan/address.rb:1207 +#: src/include/network/lan/address.rb:1213 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:1217 +#: src/include/network/lan/address.rb:1223 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:1284 +#: src/include/network/lan/address.rb:1290 msgid "&Address" msgstr "地址(&A)" #. Address tab help -#: src/include/network/lan/address.rb:1287 +#: src/include/network/lan/address.rb:1293 msgid "<p>Configure your IP address.</p>" msgstr "<p>配置您的 IP 地址。</p>" -#: src/include/network/lan/address.rb:1293 +#: src/include/network/lan/address.rb:1299 msgid "&Hardware" msgstr "硬件(&H)" -#: src/include/network/lan/address.rb:1300 +#: src/include/network/lan/address.rb:1306 msgid "&Bond Slaves" msgstr "绑定从属(&B)" -#: src/include/network/lan/address.rb:1314 +#: src/include/network/lan/address.rb:1320 msgid "&Wireless" msgstr "无线(&W)" #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/lan/address.rb:1398 +#: src/include/network/lan/address.rb:1404 msgid "Ifplugd Priority" msgstr "Ifplugd 优先级" #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/lan/address.rb:1404 +#: src/include/network/lan/address.rb:1410 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" @@ -1374,12 +1373,12 @@ "因此需要设置每个接口的优先级。</p>\n" #. Address dialog caption -#: src/include/network/lan/address.rb:1486 +#: src/include/network/lan/address.rb:1493 msgid "Network Card Setup" msgstr "网卡设置" #. Translators: Warn the user about not desired effect -#: src/include/network/lan/address.rb:1617 +#: src/include/network/lan/address.rb:1618 msgid "" "The interfaces selected share the same physical port and bonding them \n" "may not have the desired effect of redundancy.\n" @@ -1768,7 +1767,7 @@ msgstr "通过 DHCP 更改默认路由" #. Manual network card setup help 1/4 -#: src/include/network/lan/hardware.rb:82 +#: src/include/network/lan/hardware.rb:91 msgid "" "<p>Set up hardware-specific options for \n" "your network device here.</p>\n" @@ -1778,13 +1777,13 @@ #. Manual network card setup help 2/4 #. translators: do not translated udev, MAC, BusID -#: src/include/network/lan/hardware.rb:91 +#: src/include/network/lan/hardware.rb:100 msgid "" "<p><b>Device Type</b>. Various device types are available, select \n" "one according your needs.</p>" msgstr "<p><b>设备类型</b>。根据您的需要从多种可用设备类型中选择一个。</p>" -#: src/include/network/lan/hardware.rb:99 +#: src/include/network/lan/hardware.rb:108 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" @@ -1794,7 +1793,7 @@ "它允许把网络设备的 MAC 地址或 BusID 与其名称（例如，eth1、wlan0）相关联，\n" "并可保证重引导后设备名称的一致。\n" -#: src/include/network/lan/hardware.rb:105 +#: src/include/network/lan/hardware.rb:114 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" @@ -1805,7 +1804,7 @@ "</p>" #. Manual network card setup help 2/4 -#: src/include/network/lan/hardware.rb:118 +#: src/include/network/lan/hardware.rb:127 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" @@ -1816,7 +1815,7 @@ "您的设备的驱动程序。如有需要，请从该列表中选择一个驱动程序，但通常默认值即可。</p>\n" #. Manual networ card setup help 3/4 -#: src/include/network/lan/hardware.rb:125 +#: src/include/network/lan/hardware.rb:134 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" @@ -1826,12 +1825,12 @@ "<i>选项</i>=<i>值</i>。每项之间以空格分隔，例如 <i>io=0x300 irq=5</i>。\n" "<b>注意：</b>如果用同一个模块名称配置了两块网卡，保存时将合并这些选项。</p>\n" -#: src/include/network/lan/hardware.rb:131 +#: src/include/network/lan/hardware.rb:140 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n" msgstr "<p>如果您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。</p>\n" #. Manual dialog help 4/4 -#: src/include/network/lan/hardware.rb:140 +#: src/include/network/lan/hardware.rb:149 msgid "" "<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n" "If you have a <b>USB</b> network card, select USB.</p>\n" @@ -1841,7 +1840,7 @@ #. overwrite help #. Manual dialog help 5/4 -#: src/include/network/lan/hardware.rb:149 +#: src/include/network/lan/hardware.rb:158 msgid "" "<p>Here, set up your networking device. The values will be\n" "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" @@ -1850,7 +1849,7 @@ "写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/chandev.conf</i>。</p>\n" #. Manual dialog help 6/4 -#: src/include/network/lan/hardware.rb:153 +#: src/include/network/lan/hardware.rb:162 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>" @@ -1859,62 +1858,62 @@ "所指定的格式进行编写。</p>" #. CheckBox label -#: src/include/network/lan/hardware.rb:281 +#: src/include/network/lan/hardware.rb:290 msgid "&PCMCIA" msgstr "PCMCIA(&P)" #. CheckBox label -#: src/include/network/lan/hardware.rb:290 +#: src/include/network/lan/hardware.rb:299 msgid "&USB" msgstr "USB(&U)" #. #116211 - allow user to change modules from list #. Frame label -#: src/include/network/lan/hardware.rb:302 +#: src/include/network/lan/hardware.rb:311 msgid "&Kernel Module" msgstr "内核模块(&K)" #. Text entry label -#: src/include/network/lan/hardware.rb:312 +#: src/include/network/lan/hardware.rb:321 msgid "&Module Name" msgstr "模块名(&M)" -#: src/include/network/lan/hardware.rb:365 +#: src/include/network/lan/hardware.rb:374 msgid "Udev Rules" msgstr "Udev 规则" -#: src/include/network/lan/hardware.rb:367 +#: src/include/network/lan/hardware.rb:376 msgid "Device Name" msgstr "设备名称" -#: src/include/network/lan/hardware.rb:368 +#: src/include/network/lan/hardware.rb:377 msgid "Change" msgstr "更改" -#: src/include/network/lan/hardware.rb:379 +#: src/include/network/lan/hardware.rb:388 msgid "Show Visible Port Identification" msgstr "显示可见端口标识" #. translators: how many seconds will card be blinking -#: src/include/network/lan/hardware.rb:384 +#: src/include/network/lan/hardware.rb:393 msgid "Seconds" msgstr "秒" -#: src/include/network/lan/hardware.rb:389 +#: src/include/network/lan/hardware.rb:398 msgid "Blink" msgstr "闪烁" -#: src/include/network/lan/hardware.rb:394 +#: src/include/network/lan/hardware.rb:403 msgid "Ethtool Options" msgstr "Ethtool 选项" #. Manual selection caption -#: src/include/network/lan/hardware.rb:472 +#: src/include/network/lan/hardware.rb:481 msgid "Manual Network Card Selection" msgstr "手动网卡选择" #. Manual selection help -#: src/include/network/lan/hardware.rb:475 +#: src/include/network/lan/hardware.rb:484 msgid "" "<p>Select the network card to configure. Search\n" "for a particular network card by entering the name in the search entry.</p>" @@ -1924,27 +1923,43 @@ #. Selection box label #. Selection box title -#: src/include/network/lan/hardware.rb:485 -#: src/include/network/lan/hardware.rb:537 +#: src/include/network/lan/hardware.rb:494 +#: src/include/network/lan/hardware.rb:546 msgid "&Network Card" msgstr "网卡(&N)" #. Text entry field -#: src/include/network/lan/hardware.rb:489 +#: src/include/network/lan/hardware.rb:498 msgid "&Search" msgstr "搜索(&S)" #. bnc#767946 -#: src/include/network/lan/hardware.rb:796 +#: src/include/network/lan/hardware.rb:804 +#, fuzzy +#| msgid "" +#| "Configuration name %1 already exists.\n" +#| "Choose a different one." msgid "" -"Configuration name %1 already exists.\n" +"Configuration name %s already exists.\n" "Choose a different one." msgstr "" "配置名称 %1 已存在。\n" "请选择其他名称。" +#: src/include/network/lan/hardware.rb:810 +#, fuzzy +#| msgid "" +#| "Configuration name %1 already exists.\n" +#| "Choose a different one." +msgid "" +"Configuration name %s is invalid.\n" +"Choose a different one." +msgstr "" +"配置名称 %1 已存在。\n" +"请选择其他名称。" + #. S/390 dialog caption -#: src/include/network/lan/hardware.rb:853 +#: src/include/network/lan/hardware.rb:866 msgid "S/390 Network Card Configuration" msgstr "S/390 网卡配置" @@ -1952,131 +1967,131 @@ #. Frame label #. Frame label #. Frame label -#: src/include/network/lan/hardware.rb:872 -#: src/include/network/lan/hardware.rb:974 -#: src/include/network/lan/hardware.rb:1041 -#: src/include/network/lan/hardware.rb:1078 +#: src/include/network/lan/hardware.rb:885 +#: src/include/network/lan/hardware.rb:987 +#: src/include/network/lan/hardware.rb:1054 +#: src/include/network/lan/hardware.rb:1091 msgid "S/390 Device Settings" msgstr "S/390 设备设置" #. TextEntry label -#: src/include/network/lan/hardware.rb:882 +#: src/include/network/lan/hardware.rb:895 msgid "&Port Name" msgstr "端口名(&P)" -#: src/include/network/lan/hardware.rb:887 +#: src/include/network/lan/hardware.rb:900 msgid "Port Number" msgstr "端口号" #. CheckBox label -#: src/include/network/lan/hardware.rb:901 +#: src/include/network/lan/hardware.rb:914 msgid "&Enable IPA Takeover" msgstr "启用 IPA 接管(&E)" #. CheckBox label -#: src/include/network/lan/hardware.rb:908 +#: src/include/network/lan/hardware.rb:921 msgid "Enable &Layer 2 Support" msgstr "启用第 2 层支持(&L)" #. TextEntry label -#: src/include/network/lan/hardware.rb:915 +#: src/include/network/lan/hardware.rb:928 msgid "Layer2 &MAC Address" msgstr "第 2 层 MAC 地址(&M)" -#: src/include/network/lan/hardware.rb:923 -#: src/include/network/lan/hardware.rb:999 -#: src/include/network/lan/hardware.rb:1053 +#: src/include/network/lan/hardware.rb:936 +#: src/include/network/lan/hardware.rb:1012 +#: src/include/network/lan/hardware.rb:1066 msgid "Read Channel" msgstr "读通道" -#: src/include/network/lan/hardware.rb:929 -#: src/include/network/lan/hardware.rb:1005 -#: src/include/network/lan/hardware.rb:1059 +#: src/include/network/lan/hardware.rb:942 +#: src/include/network/lan/hardware.rb:1018 +#: src/include/network/lan/hardware.rb:1072 msgid "Write Channel" msgstr "写通道" -#: src/include/network/lan/hardware.rb:935 +#: src/include/network/lan/hardware.rb:948 msgid "Control Channel" msgstr "控制通道" #. S/390 dialog help: QETH Port name -#: src/include/network/lan/hardware.rb:946 +#: src/include/network/lan/hardware.rb:959 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>" msgstr "<p>输入此接口的<b>端口名</b>(区分大小写)。</p>" #. S/390 dialog help: QETH Options -#: src/include/network/lan/hardware.rb:950 +#: src/include/network/lan/hardware.rb:963 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" msgstr "<p>输入此接口的任何附加<b>选项</b>(它们之间用空格分隔)。</p>" -#: src/include/network/lan/hardware.rb:953 +#: src/include/network/lan/hardware.rb:966 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" msgstr "<p>如果应为此接口启用 IP 地址接管，请选择<b>启用 IPA 接管</b>。</p>" -#: src/include/network/lan/hardware.rb:956 +#: src/include/network/lan/hardware.rb:969 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>如果此卡已配置了第 2 层支持，请选择<b>启用第 2 层支持</b>。</p>" -#: src/include/network/lan/hardware.rb:959 +#: src/include/network/lan/hardware.rb:972 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>如果此卡已配置了第 2 层支持，请输入<b>第 2 层 MAC 地址</b>。</p>" #. TextEntry label -#: src/include/network/lan/hardware.rb:983 +#: src/include/network/lan/hardware.rb:996 msgid "&Port Number" msgstr "端口号(&P)" #. TextEntry label -#: src/include/network/lan/hardware.rb:991 +#: src/include/network/lan/hardware.rb:1004 msgid "&LANCMD Time-Out" msgstr "LANCMD 超时(&L)" #. S/390 dialog help: LCS -#: src/include/network/lan/hardware.rb:1016 +#: src/include/network/lan/hardware.rb:1029 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>" msgstr "<p>选择此接口的<b>端口号</b>。</p>" -#: src/include/network/lan/hardware.rb:1017 +#: src/include/network/lan/hardware.rb:1030 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>" msgstr "<p>为此接口指定 <b>LANCMD 超时</b>。</p>" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1022 +#: src/include/network/lan/hardware.rb:1035 msgid "Compatibility Mode" msgstr "兼容性模式" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1024 +#: src/include/network/lan/hardware.rb:1037 msgid "Extended Mode" msgstr "扩展模式" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1026 +#: src/include/network/lan/hardware.rb:1039 msgid "CTC-Based tty (Linux to Linux Connections)" msgstr "基于 CTC 的 tty(Linux 到 Linux 的连接)" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1028 +#: src/include/network/lan/hardware.rb:1041 msgid "Compatibility Mode with OS/390 and z/OS" msgstr "与 OS/390 和 z/OS 的兼容性模式" #. TextEntry label -#: src/include/network/lan/hardware.rb:1047 +#: src/include/network/lan/hardware.rb:1060 msgid "&Protocol" msgstr "协议(&P)" #. S/390 dialog help: CTC -#: src/include/network/lan/hardware.rb:1070 +#: src/include/network/lan/hardware.rb:1083 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>" msgstr "<p>选择此接口的<b>协议</b>。</p>" #. TextEntry label, #42789 -#: src/include/network/lan/hardware.rb:1087 +#: src/include/network/lan/hardware.rb:1100 msgid "&Peer Name" msgstr "同级名(&P)" #. S/390 dialog help: IUCV, #42789 -#: src/include/network/lan/hardware.rb:1098 +#: src/include/network/lan/hardware.rb:1111 msgid "" "<p>Enter the name of the IUCV peer,\n" "for example, the z/VM user name with which to connect (case-sensitive).</p>\n" @@ -2084,7 +2099,7 @@ "<p>输入 IUCV 同级的名称，\n" "例如要连接的 z/VM 用户名(区分大小写)。</p>\n" -#: src/include/network/lan/hardware.rb:1211 +#: src/include/network/lan/hardware.rb:1224 msgid "" "An error occurred while creating device.\n" "See YaST log for details." @@ -2094,7 +2109,7 @@ #. Manual network card configuration dialog #. @return dialog result -#: src/include/network/lan/hardware.rb:1233 +#: src/include/network/lan/hardware.rb:1246 msgid "Hardware Dialog" msgstr "硬件对话框" @@ -2743,29 +2758,29 @@ "的文件\"wireless\"。</p>" #. TextEntry label -#: src/include/network/lan/virtual.rb:206 +#: src/include/network/lan/virtual.rb:203 msgid "IPv4 &Address Label" msgstr "IPv4 地址标签(&A)" #. TextEntry label -#: src/include/network/lan/virtual.rb:214 +#: src/include/network/lan/virtual.rb:211 msgid "Net&mask" msgstr "网络掩码(&M)" #. Popup::Error text -#: src/include/network/lan/virtual.rb:244 +#: src/include/network/lan/virtual.rb:241 msgid "Label is too long." msgstr "标签太长。" #. Popup::Error text #. Popup::Error text -#: src/include/network/lan/virtual.rb:254 +#: src/include/network/lan/virtual.rb:251 #: src/include/network/services/host.rb:375 msgid "The IP address is invalid." msgstr "IP 地址无效。" #. Popup::Error text -#: src/include/network/lan/virtual.rb:263 +#: src/include/network/lan/virtual.rb:260 msgid "The subnet mask is invalid." msgstr "子网掩码无效。" @@ -3402,7 +3417,7 @@ #. if listed any items, disable them, if show_popup, show warning popup #. #. returns true if items were disabled -#: src/include/network/routines.rb:829 +#: src/include/network/routines.rb:833 msgid "" "Network is currently handled by NetworkManager\n" "or completely disabled. YaST is unable to configure some options." @@ -3411,26 +3426,26 @@ "或者已完全禁用。YaST 无法配置部分选项。" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:889 +#: src/include/network/routines.rb:893 msgid "Network Cards" msgstr "网卡" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:893 +#: src/include/network/routines.rb:897 msgid "Modems" msgstr "调制解调器" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:897 +#: src/include/network/routines.rb:901 msgid "ISDN Cards" msgstr "ISDN 卡" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:901 +#: src/include/network/routines.rb:905 msgid "DSL Devices" msgstr "DSL 设备" -#: src/include/network/routines.rb:906 +#: src/include/network/routines.rb:910 msgid "All Network Devices" msgstr "所有网络设备" @@ -4370,79 +4385,79 @@ #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272 -#: src/modules/LanItems.rb:1276 +#: src/modules/LanItems.rb:1237 src/modules/LanItems.rb:1241 +#: src/modules/LanItems.rb:1245 msgid "Started automatically at boot" msgstr "引导时自动启动" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1280 +#: src/modules/LanItems.rb:1249 msgid "Started automatically on cable connection" msgstr "连接电缆时自动启动" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1284 +#: src/modules/LanItems.rb:1253 msgid "Managed by NetworkManager" msgstr "由 NetworkManager 管理" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1288 +#: src/modules/LanItems.rb:1257 msgid "Will not be started at all" msgstr "不会启动" -#: src/modules/LanItems.rb:1294 +#: src/modules/LanItems.rb:1263 msgid "Started manually" msgstr "手动启动" #. do nothing -#: src/modules/LanItems.rb:1306 +#: src/modules/LanItems.rb:1275 msgid "IP address assigned using" msgstr "使用以下方式指派 IP 地址" -#: src/modules/LanItems.rb:1310 +#: src/modules/LanItems.rb:1279 msgid "IP address: %s/%s" msgstr "IP 地址：%s/%s" -#: src/modules/LanItems.rb:1313 +#: src/modules/LanItems.rb:1282 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:1337 +#: src/modules/LanItems.rb:1306 msgid "Not configured" msgstr "未配置" #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421 +#: src/modules/LanItems.rb:1328 src/modules/LanItems.rb:1390 msgid "Device Name: %s" msgstr "设备名：%s" -#: src/modules/LanItems.rb:1380 +#: src/modules/LanItems.rb:1349 msgid "Bonding slaves" msgstr "绑定从属" -#: src/modules/LanItems.rb:1394 +#: src/modules/LanItems.rb:1363 msgid "enslaved in %s" msgstr "从属于 %s" -#: src/modules/LanItems.rb:1395 +#: src/modules/LanItems.rb:1364 msgid "Bonding master" msgstr "绑定主体" -#: src/modules/LanItems.rb:1409 +#: src/modules/LanItems.rb:1378 msgid "Not connected" msgstr "未连接" -#: src/modules/LanItems.rb:1410 +#: src/modules/LanItems.rb:1379 msgid "No hwinfo" msgstr "无 hwinfo" -#: src/modules/LanItems.rb:1427 +#: src/modules/LanItems.rb:1396 msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details." msgstr "由于内核设备（eth0、wlan0）不存在，无法配置网卡。这主要是因为缺少固件（对于 WLAN 设备）而导致的。有关细节，请参见 dmesg 输出。" -#: src/modules/LanItems.rb:1433 +#: src/modules/LanItems.rb:1402 msgid "" "The device is not configured. Press <b>Edit</b>\n" "to configure.\n" @@ -4450,11 +4465,11 @@ "未配置该设备。请按<b>编辑</b>\n" "进行配置。\n" -#: src/modules/LanItems.rb:1440 +#: src/modules/LanItems.rb:1409 msgid "Needed firmware" msgstr "需要的固件" -#: src/modules/LanItems.rb:1440 +#: src/modules/LanItems.rb:1409 msgid "unknown" msgstr "未知" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/nfs.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/nfs.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/nfs.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: nfs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/nfs_server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/nfs_server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/nfs_server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: nfs_server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/nis.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/nis.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/nis.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: nis\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/nis_server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/nis_server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/nis_server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: nis_server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/ntp-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/ntp-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/ntp-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ntp-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/oneclickinstall.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -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-09-12 09:13+0200\n" "PO-Revision-Date: 2014-06-10 10:37+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Traditional <opensuse-zh@opensuse.org>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/online-update-configuration.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/online-update-configuration.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/online-update-configuration.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: online-update-configuration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/online-update.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/online-update.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/online-update.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: online-update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-09-12 09:13+0200\n" "PO-Revision-Date: 2014-06-08 11:02+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite@opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/packager.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/packager.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/packager.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: packager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -841,7 +841,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1328 +#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1307 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "细节：" @@ -849,7 +849,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1336 +#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1315 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "重试吗？" @@ -1452,7 +1452,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:323 -#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1302 src/modules/SourceManager.rb:306 msgid "" "Unable to create repository\n" "from URL '%1'." @@ -1496,7 +1496,7 @@ #. popup error #. popup error #: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624 -#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726 +#: src/modules/ProductLicense.rb:574 src/modules/ProductLicense.rb:767 msgid "An error occurred while preparing the installation system." msgstr "准备安装系统时出错。" @@ -1518,8 +1518,8 @@ #. FATE #302398: PATTERNS keyword in content file #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781 -#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471 +#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1733 +#: src/modules/AddOnProduct.rb:1739 src/modules/Packages.rb:450 msgid "Unknown Product" msgstr "未知产品" @@ -1530,7 +1530,7 @@ #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442 +#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1439 msgid "Unable to use additional products." msgstr "无法使用附加产品。" @@ -1544,12 +1544,12 @@ msgstr "URL：%1，路径：%2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1376 +#: src/modules/AddOnProduct.rb:1374 msgid "Additional Products" msgstr "附加产品" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1382 +#: src/modules/AddOnProduct.rb:1379 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" @@ -1557,28 +1557,30 @@ "安装储存库还包含了下面列出的额外储存库。\n" "请选择您想要使用的储存库。\n" -#: src/modules/AddOnProduct.rb:1393 +#: src/modules/AddOnProduct.rb:1390 msgid "Additional Products to Select" msgstr "要选择的附加产品" #. push button label -#: src/modules/AddOnProduct.rb:1400 +#: src/modules/AddOnProduct.rb:1397 msgid "Add Selected &Products" msgstr "添加所选产品(&P)" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1532 +#: src/modules/AddOnProduct.rb:1529 msgid "Insert the addon %1 medium" msgstr "插入附加的 %1 媒体" #. %1 is the product name, %2 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1537 +#: src/modules/AddOnProduct.rb:1534 msgid "Insert the %1 %2 medium" msgstr "插入 %1 %2 媒体" #. TRANSLATORS: error message, %1 is replaced with product URL -#: src/modules/AddOnProduct.rb:1589 -msgid "Unable to add product %1." +#: src/modules/AddOnProduct.rb:1581 +#, fuzzy +#| msgid "Unable to add product %1." +msgid "Unable to add product %s." msgstr "无法添加产品 %1。" #. update the trusted flag @@ -1711,23 +1713,23 @@ msgstr "正在应用增量 RPM：%1" #. warning text -#: src/modules/Packages.rb:311 +#: src/modules/Packages.rb:290 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution." msgstr "您的计算机是 64 位 x86-64 系统，但是您正试图安装 32 位发行套件。" #. help text for software proposal -#: src/modules/Packages.rb:327 +#: src/modules/Packages.rb:306 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>" msgstr "<P>模式列表指出了系统安装后将可用的功能。</P>" #. (see bnc#178357 why these numbers) #. translators: help text for software proposal -#: src/modules/Packages.rb:339 +#: src/modules/Packages.rb:318 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>" msgstr "<P>该建议报告了将安装到系统的文件总大小。不过，系统将包含一些其他文件（临时文件和工作文件），所以所用空间将会比建议的值稍微大一些。因此在启动安装前最好至少有 25%（或大约 300 MB）的可用空间。<P>" #. help text for software proposal -#: src/modules/Packages.rb:344 +#: src/modules/Packages.rb:323 msgid "" "<P>The total 'size to download' is the size of the packages which will be\n" "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n" @@ -1736,107 +1738,107 @@ "如果网速慢或有数据流量限制，该数值非常重要。</P>\n" #. help text for software proposal - header -#: src/modules/Packages.rb:353 +#: src/modules/Packages.rb:332 msgid "<P><B>Software Proposal</B></P>" msgstr "<P><B>软件建议</B></P>" #. installation proposal - SW summary, %1 is name of the installed product #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...) -#: src/modules/Packages.rb:370 +#: src/modules/Packages.rb:349 msgid "Product: %1" msgstr "产品：%1" #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE) -#: src/modules/Packages.rb:384 +#: src/modules/Packages.rb:363 msgid "System Type: %1" msgstr "系统类型：%1" -#: src/modules/Packages.rb:395 +#: src/modules/Packages.rb:374 msgid "Patterns:<br>" msgstr "模式：<br>" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:405 +#: src/modules/Packages.rb:384 msgid "Size of Packages to Install: %1" msgstr "要安装的包大小：%1" #. installation proposal - SW summary, %1 is download size of the selected packages #. which will be installed from an ftp or http repository (in MB or GB) -#: src/modules/Packages.rb:418 +#: src/modules/Packages.rb:397 msgid "Downloading from Remote Repositories: %1" msgstr "正从远程储存库中下载：%1" -#: src/modules/Packages.rb:480 +#: src/modules/Packages.rb:459 msgid "These add-on products have been marked for auto-removal: %1" msgstr "这些外接式附件已被标记为待自动去除：%1" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:504 +#: src/modules/Packages.rb:483 msgid "Contact the vendors of these add-ons to provide you with new installation media." msgstr "请联系这些外接式附件的供应商，要求其为您提供新的安装媒体。" #. Warning message when some add-ons are marked to be removed automatically -#: src/modules/Packages.rb:508 +#: src/modules/Packages.rb:487 msgid "Contact the vendor of the add-on to provide you with a new installation media." msgstr "请联系该外接式附件的供应商，要求其为您提供新的安装媒体。" #. error message: %1: e.g. "/usr", %2: "/dev/sda2" -#: src/modules/Packages.rb:549 +#: src/modules/Packages.rb:528 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation." msgstr "错误：无法检查基本目录 %1（设备 %2）中的可用空间，无法启动安装。" #. error message: %1: e.g. "/local", %2: "/dev/sda2" -#: src/modules/Packages.rb:569 +#: src/modules/Packages.rb:548 msgid "Warning: Cannot check free space in directory %1 (device %2)." msgstr "警告：无法检查目录 %1（设备 %2）中的可用空间。" #. summary warning -#: src/modules/Packages.rb:612 +#: src/modules/Packages.rb:591 msgid "Not enough disk space." msgstr "磁盘空间不够。" #. summary warning -#: src/modules/Packages.rb:614 +#: src/modules/Packages.rb:593 msgid "Not enough disk space. Remove some packages in the single selection." msgstr "磁盘空间不足。请去除单一选择内容中的某些包。" #. add a backslash if it's missing -#: src/modules/Packages.rb:635 +#: src/modules/Packages.rb:614 msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "分区 %3 上只有 %1 (%2%%) 的可用空间。<BR>" #. newly installed products -#: src/modules/Packages.rb:704 +#: src/modules/Packages.rb:683 msgid "New product <b>%s</b> will be installed" msgstr "将安装新产品 <b>%s</b>" #. product update: %s is a product name -#: src/modules/Packages.rb:714 +#: src/modules/Packages.rb:693 msgid "Product <b>%s</b> will be updated" msgstr "将更新产品 <b>%s</b>" #. product update: %{old_product} is an old product, %{new_product} is the new one -#: src/modules/Packages.rb:716 +#: src/modules/Packages.rb:695 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>" msgstr "产品 <b>%{old_product}</b> 将更新为 <b>%{new_product}</b>" -#: src/modules/Packages.rb:723 +#: src/modules/Packages.rb:702 msgid "Product <b>%s</b> will stay installed" msgstr "仍将安装产品 <b>%s</b>" #. Removing another product might be an issue #. (just warn if removed by user or by YaST) -#: src/modules/Packages.rb:733 +#: src/modules/Packages.rb:712 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "<b>警告：</b>将去除产品 <b>%s</b>。" -#: src/modules/Packages.rb:734 +#: src/modules/Packages.rb:713 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed." msgstr "<b>错误：</b>将自动去除产品 <b>%s</b>。" #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:760 +#: src/modules/Packages.rb:739 msgid "" "<ul><li><b>Some products are marked for automatic removal.</b></li>\n" "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n" @@ -1853,12 +1855,12 @@ "</li></ul></li></ul>" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1344 +#: src/modules/Packages.rb:1323 msgid "No repository found at '%1'." msgstr "在“%1”找不到储存库。" #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1617 +#: src/modules/Packages.rb:1596 msgid "" "<p><b>The release notes for the initial release are part of the installation\n" "media. If an Internet connection is available during configuration, you can\n" @@ -1869,31 +1871,31 @@ "下载更新的发行说明。</b></p>\n" #. popup - information label -#: src/modules/Packages.rb:1644 +#: src/modules/Packages.rb:1623 msgid "Integrating booted media..." msgstr "正在集成引导的媒体..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1666 +#: src/modules/Packages.rb:1645 msgid "Failed to integrate the service pack repository." msgstr "未能集成服务包储存库。" #. popup - information label -#: src/modules/Packages.rb:1699 +#: src/modules/Packages.rb:1678 msgid "Initializing repositories..." msgstr "正在初始化储存库..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1931 +#: src/modules/Packages.rb:1910 msgid "Insert %1 CD 1" msgstr "插入 %1 CD 1" -#: src/modules/Packages.rb:1933 +#: src/modules/Packages.rb:1912 msgid "%1 CD 1 not found" msgstr "%1 CD 1 没找到" #. an error message -#: src/modules/Packages.rb:2043 +#: src/modules/Packages.rb:2022 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -1902,7 +1904,7 @@ "有关细节，请查看日志文件 %1。" #. bnc #436925 -#: src/modules/Packages.rb:2304 +#: src/modules/Packages.rb:2283 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." @@ -1911,12 +1913,12 @@ "将会再次调用软件建议。" #. popup label -#: src/modules/Packages.rb:2322 +#: src/modules/Packages.rb:2301 msgid "Evaluating package selection..." msgstr "正在评估包选择..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2627 +#: src/modules/Packages.rb:2633 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -1927,27 +1929,27 @@ #. Sets that the license (file) has been already accepted #. #. @param [String] license_ident file name -#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159 +#: src/modules/ProductLicense.rb:157 src/modules/ProductLicense.rb:164 msgid "Cannot read license file %1" msgstr "无法读取协议许可文件 %1" -#: src/modules/ProductLicense.rb:153 +#: src/modules/ProductLicense.rb:158 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image." msgstr "为了正确显示产品许可证，请在生成映像时将 license.tar.gz 文件放入当前媒体的 root。" #. combo box -#: src/modules/ProductLicense.rb:297 +#: src/modules/ProductLicense.rb:302 msgid "&Language" msgstr "语言(&L)" #. check box label -#: src/modules/ProductLicense.rb:347 +#: src/modules/ProductLicense.rb:391 msgid "I &Agree to the License Terms." msgstr "我接受许可证条款(&A)。" #. TRANSLATORS: addition license information #. %s is replaced with the directory name -#: src/modules/ProductLicense.rb:372 +#: src/modules/ProductLicense.rb:416 msgid "" "This EULA can be found in the directory\n" "%s" @@ -1957,7 +1959,7 @@ #. TRANSLATORS: addition license information #. %s is replaced with the filename -#: src/modules/ProductLicense.rb:376 +#: src/modules/ProductLicense.rb:420 msgid "" "If you want to print this EULA, you can find it\n" "on the first media in the file %s" @@ -1966,7 +1968,7 @@ "第一个媒体的文件 %s 中找到" #. help text -#: src/modules/ProductLicense.rb:394 +#: src/modules/ProductLicense.rb:438 msgid "" "<p>Read the license agreement carefully and select\n" "one of the available options. If you do not agree to the license agreement,\n" @@ -1980,28 +1982,20 @@ #. #459391 #. If a progress is running open another dialog #. dialog caption -#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144 -#: src/modules/ProductLicense.rb:1217 +#: src/modules/ProductLicense.rb:448 src/modules/ProductLicense.rb:1197 +#: src/modules/ProductLicense.rb:1270 msgid "License Agreement" msgstr "许可协议" #. popup question -#: src/modules/ProductLicense.rb:1017 +#: src/modules/ProductLicense.rb:1061 msgid "Really abort the add-on product installation?" msgstr "确实要中止外接式附件的安装吗？" -#. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1041 +#. text changed due to bug #162499 +#. TRANSLATORS: text asking whether to refuse a license (Yes-No popup) +#: src/modules/ProductLicense.rb:1095 msgid "" -"Refusing the license agreement cancels the installation.\n" -"Really refuse the agreement?" -msgstr "" -"拒绝许可协议会取消安装。\n" -"确实拒绝该协议吗？" - -#. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1044 -msgid "" "Refusing the license agreement cancels the add-on\n" "product installation. Really refuse the agreement?" msgstr "" @@ -2009,18 +2003,18 @@ "确实要拒绝该协议吗？" #. timed ok/cancel popup -#: src/modules/ProductLicense.rb:1054 +#: src/modules/ProductLicense.rb:1107 msgid "The system is shutting down..." msgstr "系统正在关闭..." #. TRANSLATORS: %s is an extension name #. e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/modules/ProductLicense.rb:1153 +#: src/modules/ProductLicense.rb:1206 msgid "%s License Agreement" msgstr "%s 许可协议" #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found -#: src/modules/ProductLicense.rb:1573 +#: src/modules/ProductLicense.rb:1622 msgid "" "If you want to print this EULA, you can download it from\n" "%{license_url}" @@ -2944,3 +2938,10 @@ #: src/modules/SpaceCalculation.rb:899 msgid "Deselect some packages." msgstr "请取消选择一些包。" + +#~ msgid "" +#~ "Refusing the license agreement cancels the installation.\n" +#~ "Really refuse the agreement?" +#~ msgstr "" +#~ "拒绝许可协议会取消安装。\n" +#~ "确实拒绝该协议吗？" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/pam.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/pam.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/pam.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: pam\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/pkg-bindings.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/pkg-bindings.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/pkg-bindings.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: pkg-bindings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:55+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/printer.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/printer.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/printer.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: printer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/product-creator.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/product-creator.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/product-creator.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: product-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/proxy.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/proxy.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/proxy.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: proxy\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/rear.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/rear.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/rear.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: rear\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/registration.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/registration.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/registration.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-15 17:44+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-18 09:14\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -308,15 +308,14 @@ msgid "Importing '%s' certificate..." msgstr "正在导入“%s”证书..." -#. try to use a translatable message first, if not found then use -#. the original error message from openSSL -#: src/lib/registration/connect_helpers.rb:261 +#. workaround after string freeze +#: src/lib/registration/connect_helpers.rb:264 msgid "Secure connection error: %s" msgstr "来源连接错误：%s" #. TRANSLATORS: error message, %s is a server URL, #. e.g. https://smt.example.com -#: src/lib/registration/connect_helpers.rb:280 +#: src/lib/registration/connect_helpers.rb:283 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -330,13 +329,13 @@ #. FIXME: use a better message, this one has been reused after the text freeze #. error message, the entered URL is not valid. -#: src/lib/registration/connect_helpers.rb:292 +#: src/lib/registration/connect_helpers.rb:295 #: src/lib/registration/ui/base_system_registration_dialog.rb:544 msgid "Invalid URL." msgstr "URL 无效。" #. Error popup -#: src/lib/registration/connect_helpers.rb:296 +#: src/lib/registration/connect_helpers.rb:299 msgid "" "Network is not configured, the registration server cannot be reached.\n" "Do you want to configure the network now?" @@ -344,7 +343,7 @@ "未配置网络，无法连接注册服务器。\n" "是否要立即配置网络？" -#: src/lib/registration/connect_helpers.rb:303 +#: src/lib/registration/connect_helpers.rb:306 msgid "Network error, check the network configuration." msgstr "网络错误，请检查网络配置。" @@ -583,23 +582,23 @@ #. create the main dialog definition #. @return [Yast::Term] the main UI dialog term -#: src/lib/registration/ui/addon_selection_base_dialog.rb:91 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:90 msgid "&Filter Out Beta Versions" msgstr "滤除 Beta 版本(&F)" -#: src/lib/registration/ui/addon_selection_base_dialog.rb:93 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:92 msgid "Details" msgstr "细节" #. addon description widget #. @return [Yast::Term] the addon details widget -#: src/lib/registration/ui/addon_selection_base_dialog.rb:103 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:102 msgid "Select an extension or a module to show details here" msgstr "在此处选择扩展或模块以显示细节" #. checkbox label for an unavailable extension #. (%s is an extension name) -#: src/lib/registration/ui/addon_selection_base_dialog.rb:116 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:115 msgid "%s (not available)" msgstr "%s（不可用）" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/relocation-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/relocation-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/relocation-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: relocation-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/s390.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/s390.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/s390.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: s390\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/samba-client.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/samba-client.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/samba-client.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/samba-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/samba-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/samba-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: samba-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/samba-users.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/samba-users.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/samba-users.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: samba-users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/scanner.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/scanner.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/scanner.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/security.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/security.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/security.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -1221,6 +1221,10 @@ msgid "Predefined Security Configurations" msgstr "预定义安全性配置" +#: src/include/security/wizards.rb:62 +msgid "Security" +msgstr "安全" + #. Dialog caption #: src/include/security/wizards.rb:159 msgid "Security Configuration" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/services-manager.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/services-manager.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/services-manager.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: services-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/slp-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/slp-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/slp-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: slp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/snapper.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/snapper.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/snapper.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: snapper\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:05+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/sound.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/sound.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/sound.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/squid.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/squid.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/squid.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: squid\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/storage.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/storage.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -1036,9 +1036,17 @@ #. A PReP/CHRP partition is not supposed to be mounted. So if we find any #. other /boot partition, we should warn the user. #: src/include/partitioning/custom_part_check_generated.rb:298 +#, fuzzy +#| msgid "" +#| "Warning:\n" +#| "Your system needs a boot partition with type 0x41 PReP/CHRP.\n" +#| "Please, consider creating one.\n" +#| "\n" +#| "Really use this setup?\n" msgid "" "Warning:\n" -"Your system needs a boot partition with type 0x41 PReP/CHRP.\n" +"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n" +"on MS-DOS or type 0x00 GPT PReP Boot on GPT.\n" "Please, consider creating one.\n" "\n" "Really use this setup?\n" @@ -1050,7 +1058,7 @@ "确定要使用此设置吗？\n" #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:313 +#: src/include/partitioning/custom_part_check_generated.rb:314 msgid "" "Warning:\n" "Your boot partition ends above cylinder %1.\n" @@ -1071,7 +1079,7 @@ "确定要使用此设置？\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:333 +#: src/include/partitioning/custom_part_check_generated.rb:334 msgid "" "Warning:\n" "Your boot partition is smaller than %1.\n" @@ -1086,7 +1094,7 @@ "确定将引导分区的大小保留不变？\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:350 +#: src/include/partitioning/custom_part_check_generated.rb:351 msgid "" "Warning: There is no partition of type bios_grub present.\n" "Such a partition is recommended (required with Btrfs) when Grub2 is\n" @@ -1103,12 +1111,21 @@ #. popup text #. If the user chooses 'no' here, the system will not be able to #. boot from the hard drive! -#: src/include/partitioning/custom_part_check_generated.rb:370 +#: src/include/partitioning/custom_part_check_generated.rb:371 +#, fuzzy +#| msgid "" +#| "Warning: There is no partition mounted as /boot.\n" +#| "To boot from your hard disk, a small /boot partition\n" +#| "(approx. %1) is required. Consider creating one\n" +#| "with type 0x41 PReP/CHRP.\n" +#| "\n" +#| "Really use the setup without /boot partition?\n" msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" "(approx. %1) is required. Consider creating one\n" -"with type 0x41 PReP/CHRP.\n" +"with type 0x41 PReP/CHRP on MS-DOS or type 0x00 GPT\n" +"PReP Boot on GPT.\n" "\n" "Really use the setup without /boot partition?\n" msgstr "" @@ -1120,7 +1137,7 @@ "确定要使用没有 /boot 分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:389 +#: src/include/partitioning/custom_part_check_generated.rb:391 msgid "" "Warning: According to your setup, you intend to\n" "boot your machine from the root partition (/), which, unfortunately,\n" @@ -1140,7 +1157,7 @@ "\n" "确定要使用此设置？\n" -#: src/include/partitioning/custom_part_check_generated.rb:415 +#: src/include/partitioning/custom_part_check_generated.rb:417 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1153,7 +1170,7 @@ "确实要使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:433 +#: src/include/partitioning/custom_part_check_generated.rb:435 msgid "" "Warning: With your current setup, your %1\n" "installation might not be directly bootable, because\n" @@ -1170,7 +1187,7 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:451 +#: src/include/partitioning/custom_part_check_generated.rb:453 msgid "" "Warning: With your current setup, your %2 installation\n" "will encounter problems when booting, because you have no\n" @@ -1195,7 +1212,7 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:473 +#: src/include/partitioning/custom_part_check_generated.rb:475 msgid "" "Warning: With your current setup, your %2 installation will\n" "encounter problems when booting, because you have no \n" @@ -1220,12 +1237,12 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:496 +#: src/include/partitioning/custom_part_check_generated.rb:498 msgid "Really use this setup?" msgstr "确定要使用此设置？" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:504 +#: src/include/partitioning/custom_part_check_generated.rb:506 msgid "" "\n" "You have not assigned a swap partition. In most cases, we highly recommend \n" @@ -1246,7 +1263,7 @@ "确定要使用没有交换分区的设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:520 +#: src/include/partitioning/custom_part_check_generated.rb:522 msgid "" "\n" "You chose to install onto an existing partition that will not be\n" @@ -1259,7 +1276,7 @@ "特别是在以下情况下：\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:527 +#: src/include/partitioning/custom_part_check_generated.rb:529 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1272,7 +1289,7 @@ "- 如果这个分区尚不包含文件系统\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:534 +#: src/include/partitioning/custom_part_check_generated.rb:536 msgid "" "If in doubt, better go back and mark this partition for\n" "formatting, especially if it is assigned to one of the standard mount points\n" @@ -1282,7 +1299,7 @@ "一个像 /、/boot、/opt 或 /var 这样的标准安装点时。\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:540 +#: src/include/partitioning/custom_part_check_generated.rb:542 msgid "" "If you decide to format the partition, all data on it will be lost.\n" "\n" @@ -1293,7 +1310,7 @@ "确定要将分区保持未格式化？\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:601 +#: src/include/partitioning/custom_part_check_generated.rb:603 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1302,7 +1319,7 @@ "编辑该设备之前，请将其从该 RAID 中去除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:612 +#: src/include/partitioning/custom_part_check_generated.rb:614 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1311,7 +1328,7 @@ "编辑该设备之前，请将其从该卷组中去除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:622 +#: src/include/partitioning/custom_part_check_generated.rb:624 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1320,7 +1337,7 @@ "编辑之前请去除该卷。\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:655 +#: src/include/partitioning/custom_part_check_generated.rb:657 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1329,7 +1346,7 @@ "删除该设备之前，请将其从 RAID 中去除。\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:666 +#: src/include/partitioning/custom_part_check_generated.rb:668 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1337,12 +1354,12 @@ "设备 (%2) 已被 %1 使用。\n" "编辑之前请去除 %1。\n" -#: src/include/partitioning/custom_part_check_generated.rb:678 +#: src/include/partitioning/custom_part_check_generated.rb:680 msgid "It cannot be deleted while mounted." msgstr "无法在装入时删除它。" #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:714 +#: src/include/partitioning/custom_part_check_generated.rb:716 msgid "" "The device (%1) cannot be removed since it is a logical partition and \n" "another logical partition with a higher number is in use.\n" @@ -1351,7 +1368,7 @@ "并且另一个编号更高的逻辑分区正在使用它。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:790 +#: src/include/partitioning/custom_part_check_generated.rb:792 msgid "" "The selected extended partition contains partitions which are currently mounted:\n" "%1\n" @@ -1364,7 +1381,7 @@ "除非您完全了解正在执行的操作，否则请选择“取消”。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:808 +#: src/include/partitioning/custom_part_check_generated.rb:810 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1379,7 +1396,7 @@ "再删除该扩展分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:819 +#: src/include/partitioning/custom_part_check_generated.rb:821 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1394,7 +1411,7 @@ "再删除该扩展分区。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:830 +#: src/include/partitioning/custom_part_check_generated.rb:832 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -3225,7 +3242,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250 +#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5251 msgid "The disk is in use and cannot be modified." msgstr "该磁盘正在使用中，无法进行修改。" @@ -6051,11 +6068,11 @@ msgstr "尽管出错还是继续？" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5262 +#: src/modules/Storage.rb:5263 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区，因为磁盘上有其他分区处于使用状态。" -#: src/modules/Storage.rb:5288 +#: src/modules/Storage.rb:5289 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6065,7 +6082,7 @@ "设备 %1 无法修改，因为它包含\n" "运行安装所需的激活的交换分区。\n" -#: src/modules/Storage.rb:5302 +#: src/modules/Storage.rb:5303 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6075,7 +6092,7 @@ "设备 %1 无法修改，因为它包含执行安装所需的\n" "安装数据。\n" -#: src/modules/Storage.rb:5331 +#: src/modules/Storage.rb:5332 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6085,7 +6102,7 @@ "设备 %1 无法去除，因为它包含\n" "运行安装所需的激活的交换分区。\n" -#: src/modules/Storage.rb:5340 +#: src/modules/Storage.rb:5341 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6095,7 +6112,7 @@ "设备 %1 无法去除，因为它包含执行安装所需的\n" "安装数据。\n" -#: src/modules/Storage.rb:5369 +#: src/modules/Storage.rb:5370 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6107,7 +6124,7 @@ "改变设备 %2，而该设备包含用于\n" "运行安装的已激活 swap。\n" -#: src/modules/Storage.rb:5380 +#: src/modules/Storage.rb:5381 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6118,7 +6135,7 @@ "包含执行安装所需数据的设备 %2 。\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5402 +#: src/modules/Storage.rb:5403 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -6129,18 +6146,18 @@ "其他分区正在使用它。\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5491 +#: src/modules/Storage.rb:5492 msgid "Nothing assigned as root filesystem!" msgstr "未指派根文件系统！" -#: src/modules/Storage.rb:5492 +#: src/modules/Storage.rb:5493 msgid "Installation will most certainly fail fatally!" msgstr "安装一定会致命失败！" #. Set rather than Add, there might be some packs left over #. from previous 'MakeProposal' we don't need now #. This also covers the case when AddPackagesList returns [] or nil -#: src/modules/Storage.rb:6042 +#: src/modules/Storage.rb:6043 msgid "Adding the following resolvables failed: %1" msgstr "添加下列可解析项时失败：%1" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/sudo.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/sudo.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/sudo.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sudo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/support.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/support.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/support.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: support\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/sysconfig.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/sysconfig.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/sysconfig.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: sysconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/tftp-server.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/tftp-server.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/tftp-server.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: tftp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/timezone_db.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/timezone_db.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/timezone_db.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: timezone_db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/tune.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/tune.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/tune.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: tune\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/update.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/update.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/update.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -166,9 +166,9 @@ #. TRANSLATORS: label for an unknown installed system #: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74 #: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106 -#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:156 -#: src/modules/RootPart.rb:1441 src/modules/RootPart.rb:1447 -#: src/modules/RootPart.rb:1994 +#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:157 +#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448 +#: src/modules/RootPart.rb:2005 msgid "Unknown" msgstr "未知" @@ -271,19 +271,6 @@ "是否确实要\n" "重设置细节选择？" -#. error report -#. inform user in the proposal about the failed mount -#. error report -#: src/clients/inst_update_partition_auto.rb:79 -#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385 -msgid "Failed to mount target system" -msgstr "未能装入目标系统" - -#. Correctly mounted but incomplete installation found -#: src/clients/inst_update_partition_auto.rb:84 -msgid "A possibly incomplete installation has been detected." -msgstr "检测到可能不完整的安装。" - #. proposal for packages during update, %1 is count of packages #: src/clients/packages_proposal.rb:119 msgid "Packages to Update: %1" @@ -329,6 +316,14 @@ msgid "%1 on root partition %2" msgstr "根分区 %2 上的 %1" +#. inform user in the proposal about the failed mount +#. error report +#. error report +#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385 +#: src/lib/update/clients/inst_update_partition_auto.rb:64 +msgid "Failed to mount target system" +msgstr "未能装入目标系统" + #. this is a heading #: src/clients/rootpart_proposal.rb:149 msgid "Selected for Update" @@ -582,8 +577,13 @@ msgid "&Yes, Continue" msgstr "是，继续(&Y)" +#. Correctly mounted but incomplete installation found +#: src/lib/update/clients/inst_update_partition_auto.rb:69 +msgid "A possibly incomplete installation has been detected." +msgstr "检测到可能不完整的安装。" + #. Link to SDB article concerning renaming of devices. -#: src/modules/RootPart.rb:109 +#: src/modules/RootPart.rb:110 msgid "" "See the SDB article at %1 for details\n" "about how to solve this problem." @@ -592,17 +592,17 @@ "位于 %1 的 SBD 条目。" #. label - name of sustem to update -#: src/modules/RootPart.rb:147 +#: src/modules/RootPart.rb:148 msgid "Unknown Linux System" msgstr "未知的 Linux 系统" #. label - name of sustem to update -#: src/modules/RootPart.rb:152 +#: src/modules/RootPart.rb:153 msgid "Non-Linux System" msgstr "非 Linux 系统" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.rb:308 +#: src/modules/RootPart.rb:309 msgid "" "Cannot unmount partition %1.\n" "\n" @@ -617,7 +617,7 @@ "或重启动计算机。\n" #. label, %1 is partition -#: src/modules/RootPart.rb:379 +#: src/modules/RootPart.rb:380 msgid "Checking partition %1" msgstr "检查分区 %1" @@ -626,23 +626,23 @@ #. @param string button (true) #. @param string button (false) #. @param [String] details (hidden under [Details] button; optional; to disable, use "") -#: src/modules/RootPart.rb:416 +#: src/modules/RootPart.rb:417 msgid "Show &Details" msgstr "显示细节(&D)" #. #176292, run fsck before jfs is mounted -#: src/modules/RootPart.rb:498 +#: src/modules/RootPart.rb:499 msgid "Checking file system on %1..." msgstr "正在检查 %1 上的文件系统..." #. popup headline -#: src/modules/RootPart.rb:530 +#: src/modules/RootPart.rb:531 msgid "File System Check Failed" msgstr "文件系统检查失败" #. popup question (continue/cancel dialog) #. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.rb:534 +#: src/modules/RootPart.rb:535 msgid "" "The file system check of device %1 has failed.\n" "\n" @@ -653,24 +653,24 @@ "是否要继续装入该设备？\n" #. button -#: src/modules/RootPart.rb:543 +#: src/modules/RootPart.rb:544 msgid "&Skip Mounting" msgstr "跳过装载(&S)" #. yes-no popup -#: src/modules/RootPart.rb:1065 +#: src/modules/RootPart.rb:1066 msgid "Incorrect password. Try again?" msgstr "口令不正确。重试吗？" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.rb:1168 +#: src/modules/RootPart.rb:1169 msgid "Warning" msgstr "警告" #. TRANSLATORS: error message, #. %1 is replaced with the current /boot partition size #. %2 with the recommended size -#: src/modules/RootPart.rb:1173 +#: src/modules/RootPart.rb:1174 msgid "" "Your /boot partition is too small (%1 MB).\n" "We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n" @@ -687,7 +687,7 @@ "您要继续更新当前系统吗？\n" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.rb:1265 +#: src/modules/RootPart.rb:1266 msgid "" "The partition %1 could not be mounted.\n" "\n" @@ -708,27 +708,27 @@ "要中止更新，请单击“取消”。\n" #. push button -#: src/modules/RootPart.rb:1283 +#: src/modules/RootPart.rb:1284 msgid "&Specify Mount Options" msgstr "指定装入选项(&S)" #. popup heading -#: src/modules/RootPart.rb:1299 +#: src/modules/RootPart.rb:1300 msgid "Mount Options" msgstr "装入选项" #. text entry label -#: src/modules/RootPart.rb:1302 +#: src/modules/RootPart.rb:1303 msgid "&Mount Point" msgstr "加载点(&M)" #. tex entry label -#: src/modules/RootPart.rb:1305 +#: src/modules/RootPart.rb:1306 msgid "&Device" msgstr "设备(&D)" #. text entry label -#: src/modules/RootPart.rb:1310 +#: src/modules/RootPart.rb:1311 msgid "" "&File System\n" "(empty for autodetection)" @@ -737,12 +737,12 @@ "(对于自动检测为空)" #. error message -#: src/modules/RootPart.rb:1387 +#: src/modules/RootPart.rb:1388 msgid "The /var partition %1 could not be mounted.\n" msgstr "无法装入 /var 分区 %1。\n" #. Informational text about selected partition, %x are replaced with values later -#: src/modules/RootPart.rb:1428 +#: src/modules/RootPart.rb:1429 msgid "" "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" @@ -754,17 +754,17 @@ "<b>udev ID：</b>%5，<br>\n" "<b>udev 路径：</b>%6" -#: src/modules/RootPart.rb:1442 +#: src/modules/RootPart.rb:1443 msgid "None" msgstr "无" #. a popup caption -#: src/modules/RootPart.rb:1465 +#: src/modules/RootPart.rb:1466 msgid "Unable to find the /var partition automatically" msgstr "无法自动查找 /var 分区" #. a popup message -#: src/modules/RootPart.rb:1470 +#: src/modules/RootPart.rb:1471 msgid "" "Your system uses a separate /var partition which is required for the upgrade\n" "process to detect the disk-naming changes. Select the /var partition manually\n" @@ -775,22 +775,22 @@ "来继续升级过程。" #. a combo-box label -#: src/modules/RootPart.rb:1483 +#: src/modules/RootPart.rb:1484 msgid "&Select /var Partition Device" msgstr "选择 /var 分区设备(&S)" #. an informational rich-text widget label -#: src/modules/RootPart.rb:1489 +#: src/modules/RootPart.rb:1490 msgid "Device Info" msgstr "设备信息" #. error message -#: src/modules/RootPart.rb:1630 +#: src/modules/RootPart.rb:1631 msgid "Unable to mount /var partition with this disk configuration.\n" msgstr "无法装入具有此磁盘配置的 /var 分区。\n" #. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.rb:1661 +#: src/modules/RootPart.rb:1662 msgid "" "Partitions could not be mounted.\n" "\n" @@ -803,7 +803,7 @@ #. read the keyboard settings now, so that it used when #. typing passwords for encrypted partitions #. Calling a script because otherwise this module would depend on yast2-country -#: src/modules/RootPart.rb:1705 +#: src/modules/RootPart.rb:1706 msgid "" "Some partitions in the system on %1 are mounted by kernel-device name. This is\n" "not reliable for the update since kernel-device names are unfortunately not\n" @@ -816,32 +816,32 @@ "其他方法并应用于所有分区。" #. error message -#: src/modules/RootPart.rb:1723 +#: src/modules/RootPart.rb:1724 msgid "No fstab found." msgstr "未找到 fstab。" #. message part 1 -#: src/modules/RootPart.rb:1748 +#: src/modules/RootPart.rb:1749 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "/etc/fstab 中的根分区包含无效的根设备。\n" #. message part 2 -#: src/modules/RootPart.rb:1753 +#: src/modules/RootPart.rb:1754 msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "它当前被作为 %1 装入，但作为 %2 列出。\n" #. prepare progress-bar -#: src/modules/RootPart.rb:2115 +#: src/modules/RootPart.rb:2130 msgid "Evaluating root partition. One moment please..." msgstr "正在评估根分区。请稍候..." #. intermediate popup while mounting partitions -#: src/modules/RootPart.rb:2197 +#: src/modules/RootPart.rb:2213 msgid "Mounting partitions. One moment please..." msgstr "正在装入分区。请稍候..." #. TRANSLATORS: dialog caption -#: src/modules/RootPart.rb:2212 +#: src/modules/RootPart.rb:2228 msgid "Searching for Available Systems" msgstr "正在搜索可用的系统" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/users.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/users.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/users.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" @@ -245,6 +245,18 @@ msgid "New UID of the user" msgstr "用户的新 UID" +#. Checking double user entries +#. (double username or UID) +#. @param [Array] users to check +#: src/clients/users_auto.rb:172 +msgid "Found users in profile with equal <username>." +msgstr "" + +#. Do not check users without defined UID. (bnc#996823) +#: src/clients/users_auto.rb:178 +msgid "Found users in profile with equal <uid>." +msgstr "" + #. helptext 1/3 #: src/clients/users_plugin_ldap_all.rb:105 msgid "" @@ -671,7 +683,7 @@ #: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247 #: src/include/users/dialogs.rb:2364 #: src/lib/users/dialogs/inst_root_first.rb:193 -#: src/lib/users/dialogs/inst_user_first.rb:471 +#: src/lib/users/dialogs/inst_user_first.rb:473 msgid "" "The passwords do not match.\n" "Try again." @@ -709,7 +721,7 @@ #. text entry #. text entry #: src/include/users/dialogs.rb:403 -#: src/lib/users/dialogs/inst_user_first.rb:583 +#: src/lib/users/dialogs/inst_user_first.rb:585 msgid "User's &Full Name" msgstr "用户的完整名称(&F)" @@ -731,7 +743,7 @@ #. input field for login name #. input field for login name #: src/include/users/dialogs.rb:433 -#: src/lib/users/dialogs/inst_user_first.rb:590 +#: src/lib/users/dialogs/inst_user_first.rb:592 msgid "&Username" msgstr "用户名(&U)" @@ -748,7 +760,7 @@ #. checkbox label #. checkbox label #: src/include/users/dialogs.rb:470 -#: src/lib/users/dialogs/inst_user_first.rb:614 +#: src/lib/users/dialogs/inst_user_first.rb:616 msgid "U&se this password for system administrator" msgstr "对系统管理员使用此口令(&S)" @@ -944,7 +956,7 @@ #. User can confirm using "invalid" password confirming all the errors #: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391 #: src/lib/users/dialogs/inst_root_first.rb:212 -#: src/lib/users/dialogs/inst_user_first.rb:483 +#: src/lib/users/dialogs/inst_user_first.rb:485 msgid "Really use this password?" msgstr "确实要使用这个口令吗？" @@ -1082,7 +1094,7 @@ "</p>" #. help text 4/4 -#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160 +#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:164 msgid "" "<p>\n" "To ensure that the password was entered correctly,\n" @@ -1260,7 +1272,7 @@ "</p>\n" #. alternative help text 1/7 -#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139 +#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:143 msgid "" "<p>\n" "Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" @@ -1313,7 +1325,7 @@ #. these are used only during installation time #. help text 4/7 (only during installation) -#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176 +#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:180 msgid "" "<p>\n" "The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n" @@ -2081,7 +2093,7 @@ #. the type of user set #. New user is the default option #: src/include/users/widgets.rb:79 -#: src/lib/users/dialogs/inst_user_first.rb:275 +#: src/lib/users/dialogs/inst_user_first.rb:279 msgid "Local Users" msgstr "本地用户" @@ -3170,7 +3182,7 @@ "请重试。" #. reenable suggestion -#: src/lib/users/dialogs/inst_user_first.rb:134 +#: src/lib/users/dialogs/inst_user_first.rb:138 msgid "" "<p>\n" "Use one of the available options to add local users to the system.\n" @@ -3182,11 +3194,11 @@ "本地用户储存在 <i>/etc/passwd</i> 和 <i>/etc/shadow</i> 中。\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:138 +#: src/lib/users/dialogs/inst_user_first.rb:142 msgid "Create new user" msgstr "创建新用户" -#: src/lib/users/dialogs/inst_user_first.rb:142 +#: src/lib/users/dialogs/inst_user_first.rb:146 msgid "" "<p>\n" "When entering a password, distinguish between uppercase and\n" @@ -3199,7 +3211,7 @@ "</p>\n" #. TRANSLATORS: %{min} and %{max} will be replaced by numbers -#: src/lib/users/dialogs/inst_user_first.rb:149 +#: src/lib/users/dialogs/inst_user_first.rb:153 msgid "" "<p>\n" "The password length should be between %{min}\n" @@ -3211,7 +3223,7 @@ "到 %{max} 个字符。\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:165 +#: src/lib/users/dialogs/inst_user_first.rb:169 msgid "" "<p>\n" "For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" @@ -3227,15 +3239,15 @@ "重新定义这些限制。请参阅其手册页了解相关信息。\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:172 +#: src/lib/users/dialogs/inst_user_first.rb:176 msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>" msgstr "<p>如果要让 root 用户使用第一位用户输入的相同口令，请选中<b>对系统管理员使用此口令</b>。</p>" -#: src/lib/users/dialogs/inst_user_first.rb:183 +#: src/lib/users/dialogs/inst_user_first.rb:187 msgid "Import User Data from a Previous Installation" msgstr "从先前的安装导入用户数据" -#: src/lib/users/dialogs/inst_user_first.rb:184 +#: src/lib/users/dialogs/inst_user_first.rb:188 msgid "" "<p>\n" "A previous Linux installation with local users has been detected.\n" @@ -3251,11 +3263,11 @@ "他们的基本信息将会导入系统。\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:192 +#: src/lib/users/dialogs/inst_user_first.rb:196 msgid "Skip User Creation" msgstr "跳过用户创建" -#: src/lib/users/dialogs/inst_user_first.rb:193 +#: src/lib/users/dialogs/inst_user_first.rb:197 msgid "" "<p>\n" "Sometimes root is the only needed local user, like in network environments\n" @@ -3269,12 +3281,12 @@ "选择此选项会继续后面的步骤而不创建本地用户。\n" "</p>\n" -#: src/lib/users/dialogs/inst_user_first.rb:275 +#: src/lib/users/dialogs/inst_user_first.rb:279 msgid "Local User" msgstr "本地用户" #. TRANSLATORS: Error popup -#: src/lib/users/dialogs/inst_user_first.rb:330 +#: src/lib/users/dialogs/inst_user_first.rb:332 msgid "" "The new username cannot be blank.\n" "If you don't want to create a user now, select\n" @@ -3285,7 +3297,7 @@ "请选择“跳过用户创建”。" #. TRANSLATORS: error popup -#: src/lib/users/dialogs/inst_user_first.rb:387 +#: src/lib/users/dialogs/inst_user_first.rb:389 msgid "" "No users from the previous installation were choosen.\n" "If you don't want to create a user now, select\n" @@ -3296,34 +3308,34 @@ "请选择“跳过用户创建”。" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:514 +#: src/lib/users/dialogs/inst_user_first.rb:516 msgid "&Create New User" msgstr "创建新用户(&C)" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:537 +#: src/lib/users/dialogs/inst_user_first.rb:539 msgid "&Import User Data from a Previous Installation" msgstr "从先前的安装导入用户数据(&I)" -#: src/lib/users/dialogs/inst_user_first.rb:547 +#: src/lib/users/dialogs/inst_user_first.rb:549 msgid "Choose Users" msgstr "选择用户" #. TRANSLATORS: radio button -#: src/lib/users/dialogs/inst_user_first.rb:563 +#: src/lib/users/dialogs/inst_user_first.rb:565 msgid "&Skip User Creation" msgstr "跳过用户创建(&S)" #. checkbox label -#: src/lib/users/dialogs/inst_user_first.rb:619 +#: src/lib/users/dialogs/inst_user_first.rb:621 msgid "&Automatic Login" msgstr "自动登录(&A)" -#: src/lib/users/dialogs/inst_user_first.rb:626 +#: src/lib/users/dialogs/inst_user_first.rb:628 msgid "No users selected" msgstr "未选择任何用户" -#: src/lib/users/dialogs/inst_user_first.rb:628 +#: src/lib/users/dialogs/inst_user_first.rb:630 msgid "%d user will be imported" msgid_plural "%d users will be imported" msgstr[0] "将导入 %d 用户" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/vm.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/vm.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/vm.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: vm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -14,43 +14,41 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Manage VPN client secrets. -#: src/lib/vpn/edit_client_secrets.rb:56 +#. Manage VPN client secrets. +#: src/lib/vpn/edit_client_secrets.rb:56 msgid "Pre-shared key for gateways" msgstr "网关的预共享密钥" -#: src/lib/vpn/edit_client_secrets.rb:57 -#: src/lib/vpn/edit_client_secrets.rb:62 +#: src/lib/vpn/edit_client_secrets.rb:57 src/lib/vpn/edit_client_secrets.rb:62 msgid "Gateway IP" msgstr "网关 IP" -#: src/lib/vpn/edit_client_secrets.rb:57 +#: src/lib/vpn/edit_client_secrets.rb:57 msgid "Pre-shared key" msgstr "预共享密钥" -#: src/lib/vpn/edit_client_secrets.rb:59 -#: src/lib/vpn/edit_client_secrets.rb:63 +#: src/lib/vpn/edit_client_secrets.rb:59 src/lib/vpn/edit_client_secrets.rb:63 msgid "Set" msgstr "设置" -#: src/lib/vpn/edit_client_secrets.rb:60 src/lib/vpn/edit_gw_secrets.rb:188 +#: src/lib/vpn/edit_client_secrets.rb:60 src/lib/vpn/edit_gw_secrets.rb:188 msgid "Show key" msgstr "显示密钥" -#: src/lib/vpn/edit_client_secrets.rb:61 +#: src/lib/vpn/edit_client_secrets.rb:61 msgid "Certificate/key pair for gateways" msgstr "网关的证书/密钥对" -#: src/lib/vpn/edit_client_secrets.rb:62 +#: src/lib/vpn/edit_client_secrets.rb:62 msgid "Certificate" msgstr "证书" -#: src/lib/vpn/edit_client_secrets.rb:62 +#: src/lib/vpn/edit_client_secrets.rb:62 msgid "Key" msgstr "键" -#. Make sure that tables are filled, then save all settings. -#: src/lib/vpn/edit_client_secrets.rb:121 +#. Make sure that tables are filled, then save all settings. +#: src/lib/vpn/edit_client_secrets.rb:121 msgid "" "Shared keys for the following gateways are still missing:\n" "%s" @@ -58,7 +56,7 @@ "仍然缺少以下网关的共享密钥：\n" "%s" -#: src/lib/vpn/edit_client_secrets.rb:127 +#: src/lib/vpn/edit_client_secrets.rb:127 msgid "" "Certificates for the following gateways are still missing:\n" "%s" @@ -66,118 +64,116 @@ "仍然缺少以下网关的证书：\n" "%s" -#. Load PSKs -#. Reload gateway PSK text input. -#. Load XAuth -#. Load EAP -#: src/lib/vpn/edit_client_secrets.rb:140 src/lib/vpn/edit_gw_secrets.rb:224 -#: src/lib/vpn/edit_gw_secrets.rb:233 src/lib/vpn/edit_gw_secrets.rb:239 +#. Load PSKs +#. Reload gateway PSK text input. +#. Load XAuth +#. Load EAP +#: src/lib/vpn/edit_client_secrets.rb:140 src/lib/vpn/edit_gw_secrets.rb:224 +#: src/lib/vpn/edit_gw_secrets.rb:233 src/lib/vpn/edit_gw_secrets.rb:239 msgid "(hidden)" msgstr "（已隐藏）" -#. Remove the selected EAP user. -#. Remove the selected XAuth user. -#: src/lib/vpn/edit_gw_secrets.rb:120 src/lib/vpn/edit_gw_secrets.rb:141 +#. Remove the selected EAP user. +#. Remove the selected XAuth user. +#: src/lib/vpn/edit_gw_secrets.rb:120 src/lib/vpn/edit_gw_secrets.rb:141 msgid "Please select a user to delete." msgstr "请选择要删除的用户。" -#. Save PSK and certificate settings. Note that XAUTH and EAP user lists are already saved. -#: src/lib/vpn/edit_gw_secrets.rb:154 +#. Save PSK and certificate settings. Note that XAUTH and EAP user lists are already saved. +#: src/lib/vpn/edit_gw_secrets.rb:154 msgid "A pre-shared key is mandatory. Please enter a pre-shared key." msgstr "预共享密钥是必填字段。请输入预共享密钥。" -#: src/lib/vpn/edit_gw_secrets.rb:166 +#: src/lib/vpn/edit_gw_secrets.rb:166 msgid "Please enter both certificate file path and key file path." msgstr "请输入证书文件路径和密钥文件路径。" -#. Event handlers -#: src/lib/vpn/edit_gw_secrets.rb:175 -#: src/lib/vpn/set_client_cert_dialog.rb:64 +#. Event handlers +#: src/lib/vpn/edit_gw_secrets.rb:175 src/lib/vpn/set_client_cert_dialog.rb:64 msgid "Pick a PEM encoded certificate file" msgstr "选择一个 PEM 编码的证书文件" -#: src/lib/vpn/edit_gw_secrets.rb:180 -#: src/lib/vpn/set_client_cert_dialog.rb:69 +#: src/lib/vpn/edit_gw_secrets.rb:180 src/lib/vpn/set_client_cert_dialog.rb:69 msgid "Pick a PEM encoded certificate key file" msgstr "选择一个 PEM 编码的证书密钥文件" -#: src/lib/vpn/edit_gw_secrets.rb:186 +#: src/lib/vpn/edit_gw_secrets.rb:186 msgid "Gateway pre-shared key" msgstr "网关预共享密钥" -#: src/lib/vpn/edit_gw_secrets.rb:192 +#: src/lib/vpn/edit_gw_secrets.rb:192 msgid "Gateway certificate" msgstr "网关证书" -#: src/lib/vpn/edit_gw_secrets.rb:194 +#: src/lib/vpn/edit_gw_secrets.rb:194 msgid "Path to certificate file" msgstr "证书文件路径" -#: src/lib/vpn/edit_gw_secrets.rb:195 src/lib/vpn/edit_gw_secrets.rb:198 -#: src/lib/vpn/set_client_cert_dialog.rb:50 -#: src/lib/vpn/set_client_cert_dialog.rb:53 +#: src/lib/vpn/edit_gw_secrets.rb:195 src/lib/vpn/edit_gw_secrets.rb:198 +#: src/lib/vpn/set_client_cert_dialog.rb:50 +#: src/lib/vpn/set_client_cert_dialog.rb:53 msgid "Pick.." msgstr "选择.." -#: src/lib/vpn/edit_gw_secrets.rb:197 +#: src/lib/vpn/edit_gw_secrets.rb:197 msgid "Path to certificate key file" msgstr "证书密钥文件路径" -#: src/lib/vpn/edit_gw_secrets.rb:202 +#: src/lib/vpn/edit_gw_secrets.rb:202 msgid "User credentials for Android, iOS, MacOS X clients" msgstr "Android、iOS、MacOS X 客户端的用户身份凭证" -#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 +#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 msgid "Username" msgstr "用户名" -#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 +#: src/lib/vpn/edit_gw_secrets.rb:203 src/lib/vpn/edit_gw_secrets.rb:212 msgid "Password" msgstr "口令" -#: src/lib/vpn/edit_gw_secrets.rb:205 src/lib/vpn/edit_gw_secrets.rb:214 +#: src/lib/vpn/edit_gw_secrets.rb:205 src/lib/vpn/edit_gw_secrets.rb:214 msgid "Add" msgstr "添加" -#: src/lib/vpn/edit_gw_secrets.rb:206 src/lib/vpn/edit_gw_secrets.rb:215 +#: src/lib/vpn/edit_gw_secrets.rb:206 src/lib/vpn/edit_gw_secrets.rb:215 msgid "Delete" msgstr "删除" -#: src/lib/vpn/edit_gw_secrets.rb:207 src/lib/vpn/edit_gw_secrets.rb:216 +#: src/lib/vpn/edit_gw_secrets.rb:207 src/lib/vpn/edit_gw_secrets.rb:216 msgid "Show Password" msgstr "显示口令" -#: src/lib/vpn/edit_gw_secrets.rb:211 +#: src/lib/vpn/edit_gw_secrets.rb:211 msgid "User credentials for Windows 7, Windows 8 clients" msgstr "Windows 7、Windows 8 客户端的的用户身份凭证" -#. Return a user-friendly brief description of the connection. -#: src/lib/vpn/ipsec.rb:199 +#. Return a user-friendly brief description of the connection. +#: src/lib/vpn/ipsec.rb:199 msgid "Gateway - PSK" msgstr "网关 - PSK" -#: src/lib/vpn/ipsec.rb:201 +#: src/lib/vpn/ipsec.rb:201 msgid "Gateway - Certificate" msgstr "网关 - 证书" -#: src/lib/vpn/ipsec.rb:203 +#: src/lib/vpn/ipsec.rb:203 msgid "Gateway - Mobile clients" msgstr "网关 - 移动客户端" -#: src/lib/vpn/ipsec.rb:205 +#: src/lib/vpn/ipsec.rb:205 msgid "Gateway - Windows clients" msgstr "网关 - Windows 客户端" -#: src/lib/vpn/ipsec.rb:207 +#: src/lib/vpn/ipsec.rb:207 msgid "Client - PSK" msgstr "客户端 - PSK" -#: src/lib/vpn/ipsec.rb:209 +#: src/lib/vpn/ipsec.rb:209 msgid "Client - Certificate" msgstr "客户端 - 证书" -#. Load parameters from connections of known scenarios -#: src/lib/vpn/ipsec.rb:239 +#. Load parameters from connections of known scenarios +#: src/lib/vpn/ipsec.rb:239 msgid "" "ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n" "Continue using the module will remove your customisation." @@ -185,13 +181,13 @@ "已在此模块之外操作 ipsec.conf 和 ipsec.secrets。\n" "继续使用此模块将会去除您的自定义设置。" -#. Create a new connection, by default it is a site-to-site client. Return true if successful. -#: src/lib/vpn/ipsec.rb:310 +#. Create a new connection, by default it is a site-to-site client. Return true if successful. +#: src/lib/vpn/ipsec.rb:310 msgid "The connection name is already used." msgstr "该连接名称已被使用。" -#. Find an unused gateway scenario -#: src/lib/vpn/ipsec.rb:327 +#. Find an unused gateway scenario +#: src/lib/vpn/ipsec.rb:327 msgid "" "You may only have one gateway connection per scenario.\n" "All of gateway scenarios are already used." @@ -199,8 +195,8 @@ "您只能对每个方案建立一个网关连接。\n" "所有网关方案均已使用。" -#. Warn against duplicated configuration -#: src/lib/vpn/ipsec.rb:344 +#. Warn against duplicated configuration +#: src/lib/vpn/ipsec.rb:344 msgid "" "The scenario is already configured with another gateway.\n" "You may not have two gateways operating under one scenario." @@ -208,53 +204,53 @@ "已为该方案配置另一个网关。\n" "在一个方案下，不能有两个同时工作的网关。" -#. Create the user (:xauth or :eap). Return true if successful. -#: src/lib/vpn/ipsec.rb:442 +#. Create the user (:xauth or :eap). Return true if successful. +#: src/lib/vpn/ipsec.rb:442 msgid "The user name is already used." msgstr "此用户名已被使用。" -#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. -#: src/lib/vpn/ipsec.rb:506 +#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. +#: src/lib/vpn/ipsec.rb:506 msgid "Cannot find a matching client connection." msgstr "找不到匹配的客户端连接。" -#. Render global options, connection list, and connection configuration frames. -#: src/lib/vpn/main_dialog.rb:60 +#. Render global options, connection list, and connection configuration frames. +#: src/lib/vpn/main_dialog.rb:60 msgid "VPN Gateway and Client" msgstr "VPN 网关和客户端" -#. Left side: global config & connection management -#: src/lib/vpn/main_dialog.rb:66 +#. Left side: global config & connection management +#: src/lib/vpn/main_dialog.rb:66 msgid "Global Configuration" msgstr "全局配置" -#: src/lib/vpn/main_dialog.rb:68 +#: src/lib/vpn/main_dialog.rb:68 msgid "Enable VPN daemon" msgstr "启用 VPN 守护程序" -#: src/lib/vpn/main_dialog.rb:70 +#: src/lib/vpn/main_dialog.rb:70 msgid "Reduce TCP MSS" msgstr "降低 TCP MSS" -#: src/lib/vpn/main_dialog.rb:73 +#: src/lib/vpn/main_dialog.rb:73 msgid "All VPNs" msgstr "所有 VPN" -#: src/lib/vpn/main_dialog.rb:76 +#: src/lib/vpn/main_dialog.rb:76 msgid "New VPN" msgstr "新建 VPN" -#: src/lib/vpn/main_dialog.rb:77 +#: src/lib/vpn/main_dialog.rb:77 msgid "Delete VPN" msgstr "删除 VPN" -#: src/lib/vpn/main_dialog.rb:79 +#: src/lib/vpn/main_dialog.rb:79 msgid "View Connection Status" msgstr "查看连接状态" -#. Event handlers -#. Display a help text to let user know why reducing MSS is sometimes necessary. -#: src/lib/vpn/main_dialog.rb:103 +#. Event handlers +#. Display a help text to let user know why reducing MSS is sometimes necessary. +#: src/lib/vpn/main_dialog.rb:103 msgid "" "If VPN clients have trouble accessing certain Internet sites, it is possible that the affected hosts prevent automatic MTU (maximum transmission unit) discovery due to incorrect firewall configuration.\n" "Reducing TCP-MSS will correct the situation; however, the available bandwidth will be reduced by about 10%." @@ -262,22 +258,22 @@ "如果 VPN 客户端在访问特定因特网站点时出现问题，则可能是因为防火墙配置不正确而导致受影响的主机阻止了自动 MTU（最大传送单位）发现。\n" "降低 TCP-MSS 将会修正此情况；不过，可用带宽大约将减少 10%。" -#. Delete the chosen VPN connection. -#: src/lib/vpn/main_dialog.rb:124 +#. Delete the chosen VPN connection. +#: src/lib/vpn/main_dialog.rb:124 msgid "Delete connection" msgstr "删除连接" -#: src/lib/vpn/main_dialog.rb:125 +#: src/lib/vpn/main_dialog.rb:125 msgid "Are you sure to delete connection " msgstr "确定要删除连接吗 " -#. Check for incomplete configuration -#: src/lib/vpn/main_dialog.rb:144 +#. Check for incomplete configuration +#: src/lib/vpn/main_dialog.rb:144 msgid "Please complete configuration for the following connections:\n" msgstr "请完成以下连接的配置：\n" -#. Consider enabling the daemon -#: src/lib/vpn/main_dialog.rb:151 +#. Consider enabling the daemon +#: src/lib/vpn/main_dialog.rb:151 msgid "" "There are VPN connections but the daemon is not enabled.\n" "Would you like to enable the VPN daemon?" @@ -285,125 +281,125 @@ "存在 VPN 连接，但守护程序未启用。\n" "是否要启用 VPN 守护程序？" -#. Ask user whether he wants to view daemon log -#: src/lib/vpn/main_dialog.rb:172 +#. Ask user whether he wants to view daemon log +#: src/lib/vpn/main_dialog.rb:172 msgid "Settings have been successfully applied." msgstr "已成功应用设置。" -#: src/lib/vpn/main_dialog.rb:174 +#: src/lib/vpn/main_dialog.rb:174 msgid "Failed to configure IPSec daemon." msgstr "无法配置 IPSec 守护程序。" -#: src/lib/vpn/main_dialog.rb:177 +#: src/lib/vpn/main_dialog.rb:177 msgid "Would you like to view daemon log and connection status?" msgstr "是否要查看守护程序日志和连接状态？" -#. Open dialog to edit VPN client passwords/certificates. -#: src/lib/vpn/main_dialog.rb:289 +#. Open dialog to edit VPN client passwords/certificates. +#: src/lib/vpn/main_dialog.rb:289 msgid "Please enter gateway IP before editing credentials." msgstr "在编辑身份凭证之前，请先输入网关 IP。" -#. Render a table of configured gateway and client connections. -#: src/lib/vpn/main_dialog.rb:365 +#. Render a table of configured gateway and client connections. +#: src/lib/vpn/main_dialog.rb:365 msgid "Name" msgstr "名称" -#: src/lib/vpn/main_dialog.rb:365 +#: src/lib/vpn/main_dialog.rb:365 msgid "Description" msgstr "描述" -#. Render configuration controls for the chosen connection. -#: src/lib/vpn/main_dialog.rb:380 +#. Render configuration controls for the chosen connection. +#: src/lib/vpn/main_dialog.rb:380 msgid "Click 'New VPN' to create a gateway or client." msgstr "单击“新建 VPN”创建网关或客户端。" -#. Make widgets for connection configuration -#: src/lib/vpn/main_dialog.rb:390 +#. Make widgets for connection configuration +#: src/lib/vpn/main_dialog.rb:390 msgid "All IPv4 networks (0.0.0.0/0)" msgstr "所有 IPv4 网络 (0.0.0.0/0)" -#: src/lib/vpn/main_dialog.rb:391 +#: src/lib/vpn/main_dialog.rb:391 msgid "All IPv6 networks (::/0)" msgstr "所有 IPv6 网络 (::/0)" -#: src/lib/vpn/main_dialog.rb:393 +#: src/lib/vpn/main_dialog.rb:393 msgid "Limited CIDRs, comma separated:" msgstr "有限的 CIDR（以逗号分隔）：" -#: src/lib/vpn/main_dialog.rb:399 +#: src/lib/vpn/main_dialog.rb:399 msgid "Connection name: " msgstr "连接名称： " -#: src/lib/vpn/main_dialog.rb:400 +#: src/lib/vpn/main_dialog.rb:400 msgid "Type" msgstr "类型" -#: src/lib/vpn/main_dialog.rb:402 +#: src/lib/vpn/main_dialog.rb:402 msgid "Gateway (Server)" msgstr "网关（服务器）" -#: src/lib/vpn/main_dialog.rb:403 +#: src/lib/vpn/main_dialog.rb:403 msgid "Client" msgstr "客户端" -#: src/lib/vpn/main_dialog.rb:410 +#: src/lib/vpn/main_dialog.rb:410 msgid "The scenario is" msgstr "方案为" -#: src/lib/vpn/main_dialog.rb:412 +#: src/lib/vpn/main_dialog.rb:412 msgid "Secure communication with a pre-shared key" msgstr "使用预共享密钥的安全通讯" -#: src/lib/vpn/main_dialog.rb:413 +#: src/lib/vpn/main_dialog.rb:413 msgid "Secure communication with a certificate" msgstr "使用证书的安全通讯" -#: src/lib/vpn/main_dialog.rb:414 +#: src/lib/vpn/main_dialog.rb:414 msgid "Provide access to Android, iOS, MacOS X clients" msgstr "提供 Android、iOS、MacOS X 客户端的访问权" -#: src/lib/vpn/main_dialog.rb:415 +#: src/lib/vpn/main_dialog.rb:415 msgid "Provide access to Windows 7, Windows 8 clients" msgstr "提供 Windows 7、Windows 8 客户端的访问权" -#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431 +#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431 msgid "Edit Credentials" msgstr "编辑身份凭证" -#: src/lib/vpn/main_dialog.rb:420 +#: src/lib/vpn/main_dialog.rb:420 msgid "Provide VPN clients access to" msgstr "提供以下项目的 VPN 客户端访问权" -#: src/lib/vpn/main_dialog.rb:421 +#: src/lib/vpn/main_dialog.rb:421 msgid "Clients' address pool (e.g. 192.168.100.0/24)" msgstr "客户端的地址池（例如 192.168.100.0/24）" -#: src/lib/vpn/main_dialog.rb:425 +#: src/lib/vpn/main_dialog.rb:425 msgid "The gateway requires authentication" msgstr "服务器需要身份验证" -#: src/lib/vpn/main_dialog.rb:427 +#: src/lib/vpn/main_dialog.rb:427 msgid "By a pre-shared key" msgstr "通过预共享密钥" -#: src/lib/vpn/main_dialog.rb:428 +#: src/lib/vpn/main_dialog.rb:428 msgid "By a certificate" msgstr "通过证书" -#: src/lib/vpn/main_dialog.rb:430 +#: src/lib/vpn/main_dialog.rb:430 msgid "VPN gateway IP" msgstr "VPN 网关 IP" -#: src/lib/vpn/main_dialog.rb:434 +#: src/lib/vpn/main_dialog.rb:434 msgid "Use the VPN tunnel to access" msgstr "使用 VPN 隧道访问" -#. They are however allowed in password -#: src/lib/vpn/new_user_dialog.rb:64 +#. They are however allowed in password +#: src/lib/vpn/new_user_dialog.rb:64 msgid "Please enter both username and password." msgstr "请输入用户名和口令。" -#: src/lib/vpn/new_user_dialog.rb:68 +#: src/lib/vpn/new_user_dialog.rb:68 msgid "" "Please refrain from using special characters and spaces in the username.\n" "Acceptable characters are: A-Z, a-z, 0-9, dash, underscore" @@ -411,17 +407,17 @@ "请勿在用户名中使用特殊字符和空格。\n" "可接受的字符包括：A-Z、a-z、0-9、破折号、下划线" -#. Create a new VPN connection - by default it is a site-to-site gateway. -#: src/lib/vpn/new_vpn_dialog.rb:46 +#. Create a new VPN connection - by default it is a site-to-site gateway. +#: src/lib/vpn/new_vpn_dialog.rb:46 msgid "Please enter a name for the new VPN connection" msgstr "请输入新 VPN 连接的名称。" -#. Return :ok if new VPN connection is created, otherwise :cancel. -#: src/lib/vpn/new_vpn_dialog.rb:58 +#. Return :ok if new VPN connection is created, otherwise :cancel. +#: src/lib/vpn/new_vpn_dialog.rb:58 msgid "Please enter a VPN connection name." msgstr "请输入 VPN 连接名称。" -#: src/lib/vpn/new_vpn_dialog.rb:62 +#: src/lib/vpn/new_vpn_dialog.rb:62 msgid "" "Please refrain from using special characters and spaces in the name.\n" "Acceptable characters are: A-Z, a-z, 0-9, dash, underscore\n" @@ -431,44 +427,44 @@ "可接受的字符包括：A-Z、a-z、0-9、破折号、下划线\n" "名称必须以字母开头。" -#. Ask for a new certificate/key combination for a VPN client -#: src/lib/vpn/set_client_cert_dialog.rb:49 +#. Ask for a new certificate/key combination for a VPN client +#: src/lib/vpn/set_client_cert_dialog.rb:49 msgid "Path to certificate file:" msgstr "证书文件路径：" -#: src/lib/vpn/set_client_cert_dialog.rb:52 +#: src/lib/vpn/set_client_cert_dialog.rb:52 msgid "Path to certificate key file:" msgstr "证书密钥文件路径：" -#: src/lib/vpn/set_client_cert_dialog.rb:54 +#: src/lib/vpn/set_client_cert_dialog.rb:54 msgid "Please do not store the key in the certificate file itself." msgstr "请勿将密钥储存在证书文件本身中。" -#. Return tuple of certificate and certificate key locations. -#: src/lib/vpn/set_client_cert_dialog.rb:80 +#. Return tuple of certificate and certificate key locations. +#: src/lib/vpn/set_client_cert_dialog.rb:80 msgid "Please enter both certificate file and key file." msgstr "请输入证书文件和密钥文件。" -#. Return password string. -#: src/lib/vpn/set_client_psk_dialog.rb:59 +#. Return password string. +#: src/lib/vpn/set_client_psk_dialog.rb:59 msgid "Please enter a password." msgstr "请输入口令。" -#. View log dialog displays current status about all IPSec connections. -#: src/lib/vpn/view_log_dialog.rb:49 +#. View log dialog displays current status about all IPSec connections. +#: src/lib/vpn/view_log_dialog.rb:49 msgid "The logs are refreshed automatically every 3 seconds." msgstr "日志每 3 秒种自动刷新一次。" -#: src/lib/vpn/view_log_dialog.rb:51 +#: src/lib/vpn/view_log_dialog.rb:51 msgid "Restart VPN Daemon" msgstr "重启动 VPN 守护程序" -#. Restart IPSec daemon service. -#: src/lib/vpn/view_log_dialog.rb:76 +#. Restart IPSec daemon service. +#: src/lib/vpn/view_log_dialog.rb:76 msgid "Confirm daemon restart" msgstr "确认守护程序重启动" -#: src/lib/vpn/view_log_dialog.rb:77 +#: src/lib/vpn/view_log_dialog.rb:77 msgid "" "Existing connections will be interrupted.\n" "Do you still wish to continue?" @@ -476,32 +472,32 @@ "现有连接将会中断。\n" "仍要继续吗？" -#: src/lib/vpn/view_log_dialog.rb:81 +#: src/lib/vpn/view_log_dialog.rb:81 msgid "Failed to restart IPSec daemon" msgstr "未能重启动 IPSec 守护程序" -#. Read daemon status and refresh the content of log views. -#: src/lib/vpn/view_log_dialog.rb:100 +#. Read daemon status and refresh the content of log views. +#: src/lib/vpn/view_log_dialog.rb:100 msgid "Status not available: is the daemon running?" msgstr "无法获取状态：守护程序是否正在运行？" -#. Install packages -#: src/modules/IPSecConf.rb:174 +#. Install packages +#: src/modules/IPSecConf.rb:174 msgid "Failed to install IPSec packages." msgstr "未能安装 IPSec 包。" -#. Enable/disable daemon -#: src/modules/IPSecConf.rb:182 +#. Enable/disable daemon +#: src/modules/IPSecConf.rb:182 msgid "Failed to start IPSec daemon." msgstr "未能启动 IPSec 守护程序。" -#. Configure IP forwarding -#: src/modules/IPSecConf.rb:212 +#. Configure IP forwarding +#: src/modules/IPSecConf.rb:212 msgid "Failed to apply IP forwarding settings using sysctl:" msgstr "无法使用 sysctl 应用 IP 转发设置：" -#. Configure/deconfigure firewall -#: src/modules/IPSecConf.rb:228 +#. Configure/deconfigure firewall +#: src/modules/IPSecConf.rb:228 msgid "" "SuSE firewall is enabled but not activated.\n" "In order for VPN to function properly, SuSE firewall will now be activated." @@ -509,11 +505,11 @@ "SuSE 防火墙已启用，但未激活。\n" "为使 VPN 正常工作，现将激活 SuSE 防火墙。" -#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237 +#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237 msgid "Failed to restart SuSE firewall." msgstr "未能重启动 SuSE 防火墙。" -#: src/modules/IPSecConf.rb:243 +#: src/modules/IPSecConf.rb:243 msgid "" "Both VPN gateway and clients require special SuSE firewall configuration.\n" "SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n" @@ -523,29 +519,29 @@ "SuSE 防火墙未启用，因此每次重引导时，您都必须手动运行配置脚本。现将运行该脚本。\n" "该脚本位于 %s" -#. AutoYaST: Return a rich text summary of the current configuration. -#: src/modules/IPSecConf.rb:282 +#. AutoYaST: Return a rich text summary of the current configuration. +#: src/modules/IPSecConf.rb:282 msgid "VPN Global Settings" msgstr "VPN 全局设置" -#: src/modules/IPSecConf.rb:283 +#: src/modules/IPSecConf.rb:283 msgid "Enable VPN (IPSec) daemon: %s" msgstr "启用 VPN (IPSec) 守护程序：%s" -#: src/modules/IPSecConf.rb:284 +#: src/modules/IPSecConf.rb:284 msgid "Reduce TCP MSS: %s" msgstr "降低 TCP MSS：%s" -#: src/modules/IPSecConf.rb:285 +#: src/modules/IPSecConf.rb:285 msgid "Gateway and Connections" msgstr "网关和连接" -#. Gateway summary -#: src/modules/IPSecConf.rb:291 +#. Gateway summary +#: src/modules/IPSecConf.rb:291 msgid "A gateway serving clients in " msgstr "为客户端提供连接的网关 " -#. Client summary -#: src/modules/IPSecConf.rb:295 +#. Client summary +#: src/modules/IPSecConf.rb:295 msgid "A client connecting to " msgstr "连接至以下位置的客户端 " Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/wol.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/wol.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/wol.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: wol\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/xpram.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/xpram.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/xpram.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: xpram\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:56+0200\n" +"POT-Creation-Date: 2016-09-09 15:06+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/yast2-apparmor.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2016-09-13 13:04:17 UTC (rev 96906) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2016-09-13 13:06:04 UTC (rev 96907) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-04 14:54+0200\n" +"POT-Creation-Date: 2016-09-09 15:04+0200\n" "PO-Revision-Date: 2016-08-16 13:41\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n"