Author: keichwa Date: 2016-07-04 10:46:00 +0200 (Mon, 04 Jul 2016) New Revision: 95993 Added: branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po Modified: branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po Log: from SLE12-SP2 plus Factory 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-07-04 08:45:58 UTC (rev 95992) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/auth-client.zh_CN.po 2016-07-04 08:46:00 UTC (rev 95993) @@ -6,7 +6,7 @@ "Project-Id-Version: auth-client\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-06 16:57+0200\n" -"PO-Revision-Date: 2016-06-01 12:23\n" +"PO-Revision-Date: 2016-06-29 12:14\n" "Last-Translator: Novell language <language@novell.com>\n" "Language-Team: Novell language <language@novell.com>\n" "Language: \n" @@ -569,7 +569,7 @@ #: src/lib/authui/sssd/main_dialog.rb:151 msgid "Select Global Options, a service, or a domain to customise." -msgstr "选择要进行自定义的组选项（服务或域）。" +msgstr "选择要进行自定义的全局选项（服务或域）。" #. Additional widgets for a domain #: src/lib/authui/sssd/main_dialog.rb:157 @@ -700,7 +700,7 @@ "Do you still wish to proceed?" msgstr "" "您尚未配置任何身份验证域，却选择启用域身份验证。\n" -"SSSD 将无法启动，只有本地身份验证可以使用。\n" +"SSSD 将无法启动，本地身份验证将是唯一可用的身份验证。\n" "仍要继续吗？" #. Remove all SSSD cache files @@ -921,7 +921,7 @@ #: src/lib/authui/sssd/params.rb:161 msgid "Timeout in seconds between heartbeats for this service" -msgstr "此服务两次检测信号相隔的超时（以秒为单位）" +msgstr "此服务两次检测信号相隔的时间超时（以秒为单位）" #: src/lib/authui/sssd/params.rb:171 msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process" 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-07-04 08:45:58 UTC (rev 95992) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/crowbar.zh_CN.po 2016-07-04 08:46:00 UTC (rev 95993) @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:16+0200\n" -"PO-Revision-Date: 2016-03-02 22:26+0800\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" +"PO-Revision-Date: 2016-06-05 23:29+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" -"Language-Team: Chinese <kde-i18n-doc@kde.org>\n" +"Language-Team: Chinese <opensuse-zh@opensuse.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,66 +25,44 @@ msgid "Configuration of crowbar" msgstr "Crowbar 配置" -#. radio button item: target repository is common for all available platform -#: src/include/crowbar/complex.rb:90 -msgid "Common for All" -msgstr "全部通用" - #. target platform name -#: src/include/crowbar/complex.rb:92 -msgid "SLES 11 SP3" -msgstr "SLES 11 SP3" - -#. target platform name #: src/include/crowbar/complex.rb:94 -msgid "SLES 12" -msgstr "SLES 12" +msgid "SLES 12 SP1" +msgstr "SLES 12 SP1" #. combobox label #: src/include/crowbar/complex.rb:106 -#| msgid "&List of Repositories" msgid "&Location of Repositories" msgstr "软件源位置(&L)" #: src/include/crowbar/complex.rb:109 -#| msgid "" -#| "<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n" -#| "<p>\n" -#| "Some examples of how the URL could look like:\n" -#| "</p><p>\n" -#| "<ul>\n" -#| "<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n" -#| "<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i> for SUSE Manager Server.\n" -#| "</p><p>\n" -#| "For detailed description, check the Deployment Guide.\n" -#| "</p>" msgid "" "<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n" "<p>\n" -"If repositories are stored at SMT server or SUSE Manager server, it's enought " +"If repositories are stored at SMT server or SUSE Manager server, it's enough " "to enter server's URL and the paths\n" " to repositories will be filled automatically.</p>It is also " "possible to use custom paths. Some examples of how the URL could look like:\n" "</p><p>\n" "<ul>\n" -"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> " -"for SMT server\n" -"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sle" -"s11-sp3-x86_64/</i> for SUSE Manager Server.\n" +"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/" +"product</i> for SMT server\n" +"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/" +"sles11-sp3-x86_64/</i> for SUSE Manager Server.\n" "</p><p>\n" "For detailed description, check the Deployment Guide.\n" "</p>" msgstr "" "<p>在这里您可以编辑您<b>更新软件源</b>的位置。</p>\n" "<p>\n" -"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上，输入服务器 URL 就够了，软件源路径将自动填充。</p>也可以使用自定义路径。" -"一些 URL 示例：\n" +"若软件源存储在 SMT 服务器或 SUSE Manager 服务器上，输入服务器 URL 就够了，软" +"件源路径将自动填充。</p>也可以使用自定义路径。一些 URL 示例：\n" "</p><p>\n" "<ul>\n" -"<li>SMT 服务器：<i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/" -"</i>\n" -"<li>SUSE Manager 服务器：<i>http://manager.example.com/ks/dist/child/suse-cloud-3." -"0-pool-x86_64/sles11-sp3-x86_64/</i>\n" +"<li>SMT 服务器：<i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/" +"product</i>\n" +"<li>SUSE Manager 服务器：<i>http://manager.example.com/ks/dist/child/suse-" +"cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i>\n" "</p><p>\n" "详细描述请查阅部署指南。\n" "</p>" @@ -107,8 +85,8 @@ #. help text for the Network mode tab (do not translate bastion) #: src/include/crowbar/complex.rb:196 msgid "" -"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>" -"\n" +"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</" +"p>\n" "<p>You can also specify interface names for the bastion network conduits as " "space-separated list.</p>" msgstr "" @@ -208,32 +186,31 @@ msgstr "IP 地址(&I)" #. text entry label -#: src/include/crowbar/complex.rb:520 +#: src/include/crowbar/complex.rb:516 msgid "Name" msgstr "名称" #. text entry label -#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695 +#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704 msgid "URL" msgstr "URL" #. text entry label -#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696 +#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705 msgid "Ask On Error" msgstr "出错时询问" -#. frame label -#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697 -#: src/include/crowbar/complex.rb:715 -#| msgid "Target Name" +#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706 msgid "Target Platform" msgstr "目标平台" +#. radiobutton label +#: src/include/crowbar/complex.rb:542 +msgid "Architecture" +msgstr "架构" + #. error popup -#: src/include/crowbar/complex.rb:580 -#| msgid "" -#| "User '%1' already exists.\n" -#| "Choose a different name." +#: src/include/crowbar/complex.rb:583 msgid "" "Repository '%1' already exists.\n" "Choose a different name." @@ -242,77 +219,77 @@ "请选择一个不同的名称。" #. text entry label -#: src/include/crowbar/complex.rb:676 -#| msgid "LDAP Server &URL" +#: src/include/crowbar/complex.rb:685 msgid "Server &URL" msgstr "服务器 &URL" #. table header -#: src/include/crowbar/complex.rb:694 +#: src/include/crowbar/complex.rb:703 msgid "Repository Name" msgstr "软件源名称" #. checkbox label -#: src/include/crowbar/complex.rb:701 +#: src/include/crowbar/complex.rb:710 msgid "&Ask On Error" msgstr "出错时询问(&A)" #. text entry label -#: src/include/crowbar/complex.rb:707 +#: src/include/crowbar/complex.rb:716 msgid "Repository &URL" msgstr "软件源 &URL" #. label (hint for user) -#: src/include/crowbar/complex.rb:710 +#: src/include/crowbar/complex.rb:719 msgid "Empty URL means that default value will be used." msgstr "空白 URL 意味着将使用默认值。" #. push button label -#: src/include/crowbar/complex.rb:726 -#| msgid "Repository" +#: src/include/crowbar/complex.rb:722 msgid "A&dd Repository" msgstr "添加软件源(&d)" #. combobox item -#: src/include/crowbar/complex.rb:793 -#| msgid "Remote WINS Server" +#: src/include/crowbar/complex.rb:792 +msgid "Local SMT Server" +msgstr "本地 SMT 服务器" + +#. combobox item +#: src/include/crowbar/complex.rb:794 msgid "Remote SMT Server" msgstr "远程 SMT 服务器" #. combobox item -#: src/include/crowbar/complex.rb:795 -#| msgid "Finger Server" +#: src/include/crowbar/complex.rb:796 msgid "SUSE Manager Server" msgstr "SUSE Manager 服务器" #. combobox item -#: src/include/crowbar/complex.rb:797 +#: src/include/crowbar/complex.rb:798 msgid "Custom" msgstr "自定义" #. text entry label -#: src/include/crowbar/complex.rb:866 +#: src/include/crowbar/complex.rb:854 msgid "User Name" msgstr "用户名" #. text entry label -#: src/include/crowbar/complex.rb:868 +#: src/include/crowbar/complex.rb:856 msgid "Password" msgstr "密码" #. text entry label -#: src/include/crowbar/complex.rb:870 +#: src/include/crowbar/complex.rb:858 msgid "Repeat the Password" msgstr "重复密码" #. error popup -#: src/include/crowbar/complex.rb:900 -#| msgid "Server name cannot be empty." +#: src/include/crowbar/complex.rb:888 msgid "User name cannot be empty." msgstr "用户名不能为空。" #. error popup -#: src/include/crowbar/complex.rb:907 +#: src/include/crowbar/complex.rb:895 msgid "" "The passwords do not match.\n" "Try again." @@ -321,7 +298,7 @@ "请重试。" #. error popup -#: src/include/crowbar/complex.rb:915 +#: src/include/crowbar/complex.rb:903 msgid "" "User '%1' already exists.\n" "Choose a different name." @@ -330,17 +307,17 @@ "请选择一个不同的名称。" #. error popup -#: src/include/crowbar/complex.rb:1018 +#: src/include/crowbar/complex.rb:1006 msgid "The interface format '%1' is not valid" msgstr "接口格式 '%1' 无效。" #. Returns broadcast address. Based on current netmask and subnet -#: src/include/crowbar/complex.rb:1076 +#: src/include/crowbar/complex.rb:1064 msgid "disabled" msgstr "已禁用" #. error popup -#: src/include/crowbar/complex.rb:1173 +#: src/include/crowbar/complex.rb:1161 msgid "" "The netmask '%1' is invalid.\n" "%2" @@ -350,7 +327,7 @@ #. error popup #. error popup -#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216 +#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204 msgid "" "The IP address '%1' is invalid.\n" "%2" @@ -359,7 +336,7 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:1194 +#: src/include/crowbar/complex.rb:1182 msgid "" "The router address '%1' is invalid.\n" "%2" @@ -368,17 +345,17 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:1203 +#: src/include/crowbar/complex.rb:1191 msgid "The router address '%1' is not part of network '%2'." msgstr "路由器地址 '%1' 不是网络 '%2' 的一部分。" #. error popup -#: src/include/crowbar/complex.rb:1225 +#: src/include/crowbar/complex.rb:1213 msgid "The IP address '%1' is not part of network '%2'." msgstr "IP 地址 '%1' 不是网络 '%2' 的一部分。" #. popup message -#: src/include/crowbar/complex.rb:1246 +#: src/include/crowbar/complex.rb:1234 msgid "" "Some address ranges are not part of network '%1'.\n" "Adapt them using 'Edit ranges' button." @@ -387,66 +364,61 @@ "请使用 '编辑地址段' 按钮来调整它们。" #. inputfield label -#: src/include/crowbar/complex.rb:1335 +#: src/include/crowbar/complex.rb:1326 msgid "Min IP Address" msgstr "最小 IP 地址" #. inputfield label -#: src/include/crowbar/complex.rb:1342 +#: src/include/crowbar/complex.rb:1333 msgid "Max IP Address" msgstr "最大 IP 地址" -#: src/include/crowbar/complex.rb:1395 +#: src/include/crowbar/complex.rb:1386 msgid "The address '%1' is not part of network '%2'." msgstr "地址 '%1' 不是网络 '%2' 的一部分。" #. error message -#: src/include/crowbar/complex.rb:1407 +#: src/include/crowbar/complex.rb:1398 msgid "The lowest address must be lower than the highest one." msgstr "最低地址必须低于最高地址。" #. error message -#: src/include/crowbar/complex.rb:1431 +#: src/include/crowbar/complex.rb:1422 msgid "Ranges '%1' and '%2' are overlapping." msgstr "地址段 '%1' 和 '%2' 有重叠。" #. tab header -#: src/include/crowbar/complex.rb:1499 +#: src/include/crowbar/complex.rb:1490 msgid "&User Settings" msgstr "用户设置(&U)" #. label (hint for user) -#: src/include/crowbar/complex.rb:1511 +#: src/include/crowbar/complex.rb:1502 msgid "" "If no user is present, user 'crowbar' with default password will be used." msgstr "若没有用户则将使用 'crowbar' 用户和默认密码。" #. tab header -#: src/include/crowbar/complex.rb:1527 +#: src/include/crowbar/complex.rb:1518 msgid "N&etwork Mode" msgstr "网络模式(&e)" -#: src/include/crowbar/complex.rb:1535 +#: src/include/crowbar/complex.rb:1526 msgid "Bastion Network" msgstr "堡垒网络" #. tab header -#: src/include/crowbar/complex.rb:1578 +#: src/include/crowbar/complex.rb:1569 msgid "Net&works" msgstr "网络(&w)" #. tab header -#: src/include/crowbar/complex.rb:1614 +#: src/include/crowbar/complex.rb:1605 msgid "Re&positories" msgstr "软件源(&p)" #. popup message %1 is FQDN -#: src/include/crowbar/complex.rb:1731 -#| msgid "" -#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" -#| "currently not supported.\n" -#| "\n" -#| "You can visit the Crowbar web UI on http://%1:3000/" +#: src/include/crowbar/complex.rb:1722 msgid "" "The Crowbar Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" @@ -458,7 +430,7 @@ "您可通过 http://%1:3000/ 访问 Crowbar 网页界面" #. default dialog caption -#: src/include/crowbar/complex.rb:1749 +#: src/include/crowbar/complex.rb:1740 msgid "Crowbar Configuration Overview" msgstr "Crowbar 配置概览" @@ -491,11 +463,6 @@ #. Ovreview dialog help #: src/include/crowbar/helps.rb:49 -#| msgid "" -#| "<p>\n" -#| "See the SUSE Cloud deployment guide for details on the network\n" -#| "configuration and on using this YaST module.\n" -#| "</p>" msgid "" "<p>\n" "See the product deployment guide for details on the network\n" @@ -517,41 +484,47 @@ msgstr "正在初始化..." #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:142 +#: src/modules/Crowbar.rb:154 msgid "Initializing crowbar Configuration" msgstr "正在初始化 Crowbar 配置" #. Progress stage -#: src/modules/Crowbar.rb:153 +#: src/modules/Crowbar.rb:165 msgid "Read the configuraton" msgstr "读取配置" #. Progress step -#: src/modules/Crowbar.rb:157 +#: src/modules/Crowbar.rb:169 msgid "Reading the configuration..." msgstr "正在读取配置..." #. Progress finished #. Progress finished -#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249 +#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261 msgid "Finished" msgstr "已完成" #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:232 +#: src/modules/Crowbar.rb:244 msgid "Saving crowbar Configuration" msgstr "正在保存 Crowbar 配置" #. Progress stage 1/2 -#: src/modules/Crowbar.rb:243 +#: src/modules/Crowbar.rb:255 msgid "Write the settings" msgstr "写入设置" #. Progress step 1/2 -#: src/modules/Crowbar.rb:247 +#: src/modules/Crowbar.rb:259 msgid "Writing the settings..." msgstr "正在写入设置..." +#~ msgid "Common for All" +#~ msgstr "全部通用" + +#~ msgid "SLES 12" +#~ msgstr "SLES 12" + #~ msgid "Password for Crowbar Administrator" #~ msgstr "Crowbar 系统管理员密码" Added: branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po =================================================================== --- branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po (rev 0) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/journalctl.zh_CN.po 2016-07-04 08:46:00 UTC (rev 95993) @@ -0,0 +1,127 @@ +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# +# marguerite <marguerite@opensuse.org>, 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" +"PO-Revision-Date: 2016-06-06 00:41+0800\n" +"Last-Translator: marguerite <marguerite@opensuse.org>\n" +"Language-Team: Chinese <opensuse-zh@opensuse.org>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 2.0\n" + +#. Header +#: src/lib/journalctl/entries_dialog.rb:62 +msgid "Journal entries" +msgstr "日志项" + +#. Filters +#: src/lib/journalctl/entries_dialog.rb:67 +msgid "Displaying entries with the following text" +msgstr "显示带有以下文本的项" + +#. Footer buttons +#: src/lib/journalctl/entries_dialog.rb:81 +msgid "Change filter..." +msgstr "修改过滤器..." + +#: src/lib/journalctl/entries_dialog.rb:83 +msgid "Refresh" +msgstr "刷新" + +#. Header +#: src/lib/journalctl/query_dialog.rb:85 +msgid "Entries to display" +msgstr "要显示的项" + +#. Boot selector +#: src/lib/journalctl/query_dialog.rb:89 +msgid "Log entries for" +msgstr "日志项针对" + +#. Filter checkboxes +#: src/lib/journalctl/query_dialog.rb:96 +msgid "Filters" +msgstr "过滤器" + +#. User readable description of the current filters +#: src/lib/journalctl/query_presenter.rb:60 +msgid "from previous boot" +msgstr "自上次引导" + +#: src/lib/journalctl/query_presenter.rb:62 +msgid "since system's boot" +msgstr "自系统引导" + +#: src/lib/journalctl/query_presenter.rb:66 +msgid "unit (%s)" +msgstr "单元 (%s)" + +#: src/lib/journalctl/query_presenter.rb:67 +msgid "file (%s)" +msgstr "文件 (%s)" + +#: src/lib/journalctl/query_presenter.rb:68 +msgid "priority (%s)" +msgstr "优先级 (%s)" + +#: src/lib/journalctl/query_presenter.rb:79 +msgid "with no additional conditions" +msgstr "无额外条件" + +#: src/lib/journalctl/query_presenter.rb:81 +msgid "filtering by %s" +msgstr "按 %s 过滤" + +#. Possible options for the :boot filter to be used in forms +#. +#. @return [Array<Hash>] each option is represented by a hash with two keys +#. :value and :label +#: src/lib/journalctl/query_presenter.rb:93 +msgid "Since system's boot" +msgstr "自系统引导" + +#: src/lib/journalctl/query_presenter.rb:94 +msgid "From previous boot" +msgstr "自上次引导" + +#. Possible filters (in addition to :boot) to be used in forms +#. +#. @return [Array<Hash>] for each filter there are 3 possible keys +#. * :name name of the filter +#. * :label label for the widget used to set the filter +#. * :values optional list of valid values +#: src/lib/journalctl/query_presenter.rb:108 +msgid "For this systemd unit" +msgstr "针对此 systemd 单元" + +#: src/lib/journalctl/query_presenter.rb:112 +msgid "For this file (executable or device)" +msgstr "针对此文件 (可执行文件或设备)" + +#: src/lib/journalctl/query_presenter.rb:116 +msgid "With at least this priority" +msgstr "至少有此优先级" + +#. Fields to display for listing the entries +#. +#. @return [Array<Hash>] for each column a :label and a :method is provided +#: src/lib/journalctl/query_presenter.rb:128 +msgid "Time" +msgstr "时间" + +#: src/lib/journalctl/query_presenter.rb:129 +msgid "Source" +msgstr "来源" + +#: src/lib/journalctl/query_presenter.rb:130 +msgid "Message" +msgstr "消息" + Modified: 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-07-04 08:45:58 UTC (rev 95992) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/live-installer.zh_CN.po 2016-07-04 08:46:00 UTC (rev 95993) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2013-02-03 19:36+0800\n" "Last-Translator: 玛格丽特 · 苏 <i@marguerite.su>\n" "Language-Team: Chinese Simplified <opensuse-zh@opensuse.org>\n" @@ -41,27 +41,27 @@ #. #. Progress::NextStage (); #. Progress::Title (_("Evaluating filesystems to copy...")); -#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58 +#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59 msgid "Evaluating filesystems to copy..." msgstr "正在评估待复制的文件系统..." -#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61 +#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62 msgid "Copying root filesystem..." msgstr "正在复制根文件系统..." -#: src/clients/inst_live_doit.rb:62 +#: src/clients/inst_live_doit.rb:63 msgid "Copying live image..." msgstr "正在复制 Live 映像..." #. Copy all the symlinks as needed #. @param [Hash{String => String}] symlinks a map of resolved symlinks #. @return [Boolean] true on success -#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154 +#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151 msgid "Copying %1..." msgstr "正在复制 %1..." #. need to set some lower limit - roughly estimated maximum size of the last file which could have failed -#: src/clients/inst_live_doit.rb:222 +#: src/clients/inst_live_doit.rb:226 msgid "" "Copying the live image to hard disk failed.\n" "\n" @@ -74,80 +74,63 @@ "您的磁盘空间不足。选择一块大点的磁盘分区来安装 Live 系统。" #. generic error report -#: src/clients/inst_live_doit.rb:250 +#: src/clients/inst_live_doit.rb:254 msgid "Copying the live image to hard disk failed." msgstr "未能将 Live 映像复制到硬盘。" #. dialog caption -#: src/clients/inst_live_simple_proposal.rb:45 -#: src/clients/inst_live_simple_proposal.rb:211 +#: src/clients/inst_live_simple_proposal.rb:44 +#: src/clients/inst_live_simple_proposal.rb:179 msgid "Installation Settings" msgstr "安装设置" #. label -#: src/clients/inst_live_simple_proposal.rb:47 +#: src/clients/inst_live_simple_proposal.rb:46 msgid "Analyzing the system..." msgstr "正在分析系统..." #. partitioning summary -#: src/clients/inst_live_simple_proposal.rb:111 +#: src/clients/inst_live_simple_proposal.rb:110 msgid "Use %1%% of disk %2 for Linux" msgstr "将磁盘 %2 的 %1%% 用于 Linux" -#: src/clients/inst_live_simple_proposal.rb:120 +#: src/clients/inst_live_simple_proposal.rb:119 msgid "Do not use disk %1" msgstr "不使用磁盘 %1" -#: src/clients/inst_live_simple_proposal.rb:127 +#: src/clients/inst_live_simple_proposal.rb:126 msgid "Partitioning" msgstr "分区" #. end of partitioning summary -#. bootloader summary -#: src/clients/inst_live_simple_proposal.rb:143 -msgid "System start-up" -msgstr "系统启动" - -#: src/clients/inst_live_simple_proposal.rb:149 -msgid "Ask whether to boot Linux or existing system" -msgstr "询问引导 Linux 还是已有系统" - -#: src/clients/inst_live_simple_proposal.rb:150 -msgid "Boot only Linux" -msgstr "仅引导 Linux" - -#: src/clients/inst_live_simple_proposal.rb:158 -msgid "System start time-out: %1 seconds" -msgstr "系统启动倒计时：%1 秒" - -#. end of bootloader summary #. keyboard entry -#: src/clients/inst_live_simple_proposal.rb:167 +#: src/clients/inst_live_simple_proposal.rb:135 msgid "Keyboard" msgstr "键盘" #. end of keyboard entry #. timezone entry -#: src/clients/inst_live_simple_proposal.rb:177 +#: src/clients/inst_live_simple_proposal.rb:145 msgid "Time Zone" msgstr "时区" #. end of timezone entry -#: src/clients/inst_live_simple_proposal.rb:187 +#: src/clients/inst_live_simple_proposal.rb:155 msgid "Change Installation Settings" msgstr "修改安装设置" #. help text 1/3 -#: src/clients/inst_live_simple_proposal.rb:192 +#: src/clients/inst_live_simple_proposal.rb:160 msgid "" "<p>\n" -"Use <b>Accept</b> to perform a new installation with the values displayed.</p>" +"Use <b>Accept</b> to perform a new installation with the values displayed.</" +"p>" msgstr "" "<p>\n" "用<b>接受</b>来用显示的值执行全新安装。</p>" #. help text 2/3 -#: src/clients/inst_live_simple_proposal.rb:196 +#: src/clients/inst_live_simple_proposal.rb:164 msgid "" "<p>\n" "To change the values, click the respective headline\n" @@ -158,7 +141,7 @@ "或选择<b>修改安装设置</b>。</p>\n" #. help text 3/3 -#: src/clients/inst_live_simple_proposal.rb:202 +#: src/clients/inst_live_simple_proposal.rb:170 msgid "" "<p>\n" "Your hard disk has not been modified, you can still safely abort.\n" @@ -269,7 +252,7 @@ "请手动重启。您可能需要按下复位键来重启。" #. progress step title -#: src/clients/live_copy_files_finish.rb:76 +#: src/clients/live_copy_files_finish.rb:75 msgid "Copying files to installed system..." msgstr "正在复制文件到安装好的系统..." @@ -293,6 +276,18 @@ msgid "Saving time zone..." msgstr "正在保存时区..." +#~ msgid "System start-up" +#~ msgstr "系统启动" + +#~ msgid "Ask whether to boot Linux or existing system" +#~ msgstr "询问引导 Linux 还是已有系统" + +#~ msgid "Boot only Linux" +#~ msgstr "仅引导 Linux" + +#~ msgid "System start time-out: %1 seconds" +#~ msgstr "系统启动倒计时：%1 秒" + #~ msgid "Installation settings" #~ msgstr "初始设置" Modified: 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-07-04 08:45:58 UTC (rev 95992) +++ branches/plus-SLE12-SP2/yast/zh_CN/po/vpn.zh_CN.po 2016-07-04 08:46:00 UTC (rev 95993) @@ -3,15 +3,15 @@ # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2001 SuSE GmbH. # -# marguerite <marguerite@opensuse.org>, 2015. +# marguerite <marguerite@opensuse.org>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:17+0200\n" -"PO-Revision-Date: 2015-10-18 11:24+0800\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" +"PO-Revision-Date: 2016-06-05 16:57+0800\n" "Last-Translator: marguerite <marguerite@opensuse.org>\n" -"Language-Team: Chinese <kde-i18n-doc@kde.org>\n" +"Language-Team: Chinese <opensuse-zh@opensuse.org>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -210,12 +210,12 @@ "不能有两个网关运行于同一情景下。" #. Create the user (:xauth or :eap). Return true if successful. -#: src/lib/vpn/ipsec.rb:439 +#: 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:503 +#: src/lib/vpn/ipsec.rb:506 msgid "Cannot find a matching client connection." msgstr "无法找到匹配的客户端连接。" @@ -257,10 +257,14 @@ #. 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%." +"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%." msgstr "" -"若 VPN 客户端访问特定互联网站点发生问题，可能是受影响的站点由于防火墙配置不正确而阻止了自动 MTU (最大传输单元) 发现。\n" +"若 VPN 客户端访问特定互联网站点发生问题，可能是受影响的站点由于防火墙配置不正" +"确而阻止了自动 MTU (最大传输单元) 发现。\n" "降低 TCP-MSS 将纠正这种情况; 然而，可用带宽也将降低大约 10%。" #. Delete the chosen VPN connection. @@ -300,102 +304,102 @@ msgstr "您想要查看守护进程日志和连接状态吗？" #. Open dialog to edit VPN client passwords/certificates. -#: src/lib/vpn/main_dialog.rb:285 +#: 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:361 +#: src/lib/vpn/main_dialog.rb:365 msgid "Name" msgstr "名称" -#: src/lib/vpn/main_dialog.rb:361 +#: src/lib/vpn/main_dialog.rb:365 msgid "Description" msgstr "描述" #. Render configuration controls for the chosen connection. -#: src/lib/vpn/main_dialog.rb:376 +#: 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:386 +#: 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:387 +#: src/lib/vpn/main_dialog.rb:391 msgid "All IPv6 networks (::/0)" msgstr "全部 IPv6 网络 (::/0)" -#: src/lib/vpn/main_dialog.rb:389 +#: src/lib/vpn/main_dialog.rb:393 msgid "Limited CIDRs, comma separated:" msgstr "受限 CIDR (无类别域间路由)，以逗号分隔：" -#: src/lib/vpn/main_dialog.rb:395 +#: src/lib/vpn/main_dialog.rb:399 msgid "Connection name: " msgstr "连接名称：" -#: src/lib/vpn/main_dialog.rb:396 +#: src/lib/vpn/main_dialog.rb:400 msgid "Type" msgstr "类型" -#: src/lib/vpn/main_dialog.rb:398 +#: src/lib/vpn/main_dialog.rb:402 msgid "Gateway (Server)" msgstr "网关 (服务器)" -#: src/lib/vpn/main_dialog.rb:399 +#: src/lib/vpn/main_dialog.rb:403 msgid "Client" msgstr "客户端" -#: src/lib/vpn/main_dialog.rb:406 +#: src/lib/vpn/main_dialog.rb:410 msgid "The scenario is" msgstr "场景为" -#: src/lib/vpn/main_dialog.rb:408 +#: src/lib/vpn/main_dialog.rb:412 msgid "Secure communication with a pre-shared key" msgstr "通过预共享密钥进行安全通信" -#: src/lib/vpn/main_dialog.rb:409 +#: src/lib/vpn/main_dialog.rb:413 msgid "Secure communication with a certificate" msgstr "使用证书进行安全通信" -#: src/lib/vpn/main_dialog.rb:410 +#: 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:411 +#: src/lib/vpn/main_dialog.rb:415 msgid "Provide access to Windows 7, Windows 8 clients" msgstr "为 Windows 7/8 客户端提供访问" -#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427 +#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431 msgid "Edit Credentials" msgstr "编辑机要信息" -#: src/lib/vpn/main_dialog.rb:416 +#: src/lib/vpn/main_dialog.rb:420 msgid "Provide VPN clients access to" msgstr "为以下 VPN 客户端提供访问" -#: src/lib/vpn/main_dialog.rb:417 +#: 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:421 +#: src/lib/vpn/main_dialog.rb:425 msgid "The gateway requires authentication" msgstr "网关要求认证" -#: src/lib/vpn/main_dialog.rb:423 +#: src/lib/vpn/main_dialog.rb:427 msgid "By a pre-shared key" msgstr "通过预共享密钥" -#: src/lib/vpn/main_dialog.rb:424 +#: src/lib/vpn/main_dialog.rb:428 msgid "By a certificate" msgstr "通过证书" -#: src/lib/vpn/main_dialog.rb:426 +#: src/lib/vpn/main_dialog.rb:430 msgid "VPN gateway IP" msgstr "VPN 网关 IP" -#: src/lib/vpn/main_dialog.rb:430 +#: src/lib/vpn/main_dialog.rb:434 msgid "Use the VPN tunnel to access" msgstr "使用 VPN 隧道访问" @@ -487,22 +491,22 @@ msgstr "状态不可用：守护进程运行着吗？" #. Install packages -#: src/modules/IPSecConf.rb:172 +#: src/modules/IPSecConf.rb:174 msgid "Failed to install IPSec packages." msgstr "安装 IPSec 软件包失败。" #. Enable/disable daemon -#: src/modules/IPSecConf.rb:180 +#: src/modules/IPSecConf.rb:182 msgid "Failed to start IPSec daemon." msgstr "启动 IPSec 守护进程失败。" #. Configure IP forwarding -#: src/modules/IPSecConf.rb:210 +#: src/modules/IPSecConf.rb:212 msgid "Failed to apply IP forwarding settings using sysctl:" msgstr "使用 sysctl 应用 IP 转发设置失败：" #. Configure/deconfigure firewall -#: src/modules/IPSecConf.rb:225 +#: 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." @@ -510,14 +514,15 @@ "SuSE 防火墙启用但未激活。\n" "为了使 VPN 正常工作，将激活 SuSE 防火墙。" -#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234 +#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237 msgid "Failed to restart SuSE firewall." msgstr "重启 SuSE 防火墙失败。" -#: src/modules/IPSecConf.rb:240 +#: 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" +"SuSE firewall is not enabled, therefore you must manually run the " +"configuration script on every reboot. The script will be run now.\n" "The script is located at %s" msgstr "" "VPN 网关和客户端都需要特殊的 SuSE 防火墙配置。\n" @@ -526,28 +531,31 @@ "脚本位于 %s" #. AutoYaST: Return a rich text summary of the current configuration. -#: src/modules/IPSecConf.rb:279 +#: src/modules/IPSecConf.rb:282 msgid "VPN Global Settings" msgstr "VPN 全局设置" -#: src/modules/IPSecConf.rb:280 +#: src/modules/IPSecConf.rb:283 msgid "Enable VPN (IPSec) daemon: %s" msgstr "启用 VPN (IPSec) 守护进程：%s" -#: src/modules/IPSecConf.rb:281 -msgid "Reduce TCP MSS to 1024: %s" -msgstr "降低 TCP 最大段大小 (MSS) 到 1024：%s" +#: src/modules/IPSecConf.rb:284 +msgid "Reduce TCP MSS: %s" +msgstr "降低 TCP 最大段大小 (MSS)：%s" -#: src/modules/IPSecConf.rb:282 +#: src/modules/IPSecConf.rb:285 msgid "Gateway and Connections" msgstr "网关和连接" #. Gateway summary -#: src/modules/IPSecConf.rb:288 +#: src/modules/IPSecConf.rb:291 msgid "A gateway serving clients in " msgstr "一个网关正服务着客户端于" #. Client summary -#: src/modules/IPSecConf.rb:292 +#: src/modules/IPSecConf.rb:295 msgid "A client connecting to " msgstr "一个客户端正连接到" + +#~ msgid "Reduce TCP MSS to 1024: %s" +#~ msgstr "降低 TCP 最大段大小 (MSS) 到 1024：%s"