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

Author: keichwa Date: 2015-09-09 10:11:51 +0200 (Wed, 09 Sep 2015) New Revision: 92588 Added: trunk/yast/zh_CN/po/docker.zh_CN.po trunk/yast/zh_CN/po/fonts.zh_CN.po trunk/yast/zh_CN/po/journal.zh_CN.po trunk/yast/zh_CN/po/vpn.zh_CN.po Modified: trunk/yast/zh_CN/po/add-on-creator.zh_CN.po trunk/yast/zh_CN/po/add-on.zh_CN.po trunk/yast/zh_CN/po/audit-laf.zh_CN.po trunk/yast/zh_CN/po/auth-client.zh_CN.po trunk/yast/zh_CN/po/auth-server.zh_CN.po trunk/yast/zh_CN/po/autoinst.zh_CN.po trunk/yast/zh_CN/po/base.zh_CN.po trunk/yast/zh_CN/po/bootloader.zh_CN.po trunk/yast/zh_CN/po/ca-management.zh_CN.po trunk/yast/zh_CN/po/cio.zh_CN.po trunk/yast/zh_CN/po/cluster.zh_CN.po trunk/yast/zh_CN/po/control-center.zh_CN.po trunk/yast/zh_CN/po/control.zh_CN.po trunk/yast/zh_CN/po/country.zh_CN.po trunk/yast/zh_CN/po/crowbar.zh_CN.po trunk/yast/zh_CN/po/dhcp-server.zh_CN.po trunk/yast/zh_CN/po/dns-server.zh_CN.po trunk/yast/zh_CN/po/drbd.zh_CN.po trunk/yast/zh_CN/po/fcoe-client.zh_CN.po trunk/yast/zh_CN/po/firewall-services.zh_CN.po trunk/yast/zh_CN/po/firewall.zh_CN.po trunk/yast/zh_CN/po/firstboot.zh_CN.po trunk/yast/zh_CN/po/ftp-server.zh_CN.po trunk/yast/zh_CN/po/geo-cluster.zh_CN.po trunk/yast/zh_CN/po/gtk.zh_CN.po trunk/yast/zh_CN/po/http-server.zh_CN.po trunk/yast/zh_CN/po/inetd.zh_CN.po trunk/yast/zh_CN/po/installation.zh_CN.po trunk/yast/zh_CN/po/instserver.zh_CN.po trunk/yast/zh_CN/po/iplb.zh_CN.po trunk/yast/zh_CN/po/iscsi-client.zh_CN.po trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po trunk/yast/zh_CN/po/isns.zh_CN.po trunk/yast/zh_CN/po/kdump.zh_CN.po trunk/yast/zh_CN/po/languages_db.zh_CN.po trunk/yast/zh_CN/po/ldap-client.zh_CN.po trunk/yast/zh_CN/po/ldap.zh_CN.po trunk/yast/zh_CN/po/live-installer.zh_CN.po trunk/yast/zh_CN/po/mail.zh_CN.po trunk/yast/zh_CN/po/multipath.zh_CN.po trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po trunk/yast/zh_CN/po/ncurses.zh_CN.po trunk/yast/zh_CN/po/network.zh_CN.po trunk/yast/zh_CN/po/nfs.zh_CN.po trunk/yast/zh_CN/po/nfs_server.zh_CN.po trunk/yast/zh_CN/po/nis.zh_CN.po trunk/yast/zh_CN/po/nis_server.zh_CN.po trunk/yast/zh_CN/po/ntp-client.zh_CN.po trunk/yast/zh_CN/po/oneclickinstall.zh_CN.po trunk/yast/zh_CN/po/online-update-configuration.zh_CN.po trunk/yast/zh_CN/po/online-update.zh_CN.po trunk/yast/zh_CN/po/opensuse_mirror.zh_CN.po trunk/yast/zh_CN/po/packager.zh_CN.po trunk/yast/zh_CN/po/pam.zh_CN.po trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po trunk/yast/zh_CN/po/printer.zh_CN.po trunk/yast/zh_CN/po/product-creator.zh_CN.po trunk/yast/zh_CN/po/proxy.zh_CN.po trunk/yast/zh_CN/po/qt-pkg.zh_CN.po trunk/yast/zh_CN/po/qt.zh_CN.po trunk/yast/zh_CN/po/rdp.zh_CN.po trunk/yast/zh_CN/po/rear.zh_CN.po trunk/yast/zh_CN/po/registration.zh_CN.po trunk/yast/zh_CN/po/reipl.zh_CN.po trunk/yast/zh_CN/po/relocation-server.zh_CN.po trunk/yast/zh_CN/po/samba-client.zh_CN.po trunk/yast/zh_CN/po/samba-server.zh_CN.po trunk/yast/zh_CN/po/samba-users.zh_CN.po trunk/yast/zh_CN/po/scanner.zh_CN.po trunk/yast/zh_CN/po/security.zh_CN.po trunk/yast/zh_CN/po/services-manager.zh_CN.po trunk/yast/zh_CN/po/slp-server.zh_CN.po trunk/yast/zh_CN/po/snapper.zh_CN.po trunk/yast/zh_CN/po/sound.zh_CN.po trunk/yast/zh_CN/po/squid.zh_CN.po trunk/yast/zh_CN/po/sshd.zh_CN.po trunk/yast/zh_CN/po/storage.zh_CN.po trunk/yast/zh_CN/po/sudo.zh_CN.po trunk/yast/zh_CN/po/support.zh_CN.po trunk/yast/zh_CN/po/sysconfig.zh_CN.po trunk/yast/zh_CN/po/tftp-server.zh_CN.po trunk/yast/zh_CN/po/timezone_db.zh_CN.po trunk/yast/zh_CN/po/tune.zh_CN.po trunk/yast/zh_CN/po/update.zh_CN.po trunk/yast/zh_CN/po/users.zh_CN.po trunk/yast/zh_CN/po/vm.zh_CN.po trunk/yast/zh_CN/po/wol.zh_CN.po trunk/yast/zh_CN/po/yast2-apparmor.zh_CN.po Log: merged Modified: trunk/yast/zh_CN/po/add-on-creator.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/add-on-creator.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/add-on-creator.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: add-on-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-10-31 02:08+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/add-on.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/add-on.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/add-on.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:35+0200\n" "PO-Revision-Date: 2013-02-02 22:16+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -61,21 +61,21 @@ #. this is a heading #. Cleanup UI - Prepare it for progress callbacks #: src/clients/add-on.rb:105 src/clients/add-on_proposal.rb:76 -#: src/include/add-on/add-on-workflow.rb:1877 +#: src/include/add-on/add-on-workflow.rb:1873 msgid "Add-On Products" msgstr "附加产品" #. busy message (dialog) #. TRANSLATORS: dialog content - a very simple label #: src/clients/add-on.rb:107 src/clients/inst_language_add-on.rb:155 -#: src/include/add-on/add-on-workflow.rb:1878 +#: src/include/add-on/add-on-workflow.rb:1874 msgid "Initializing..." msgstr "正在初始化..." #. help #. TRANSLATORS: help text #: src/clients/add-on.rb:109 src/clients/inst_language_add-on.rb:157 -#: src/include/add-on/add-on-workflow.rb:1879 +#: src/include/add-on/add-on-workflow.rb:1875 msgid "<p>Initializing add-on products...</p>" msgstr "<p>正在初始化附加产品...</p>" @@ -101,10 +101,10 @@ #. placeholder for unknown path #. placeholder for unknown URL #: src/clients/add-on_proposal.rb:35 src/clients/add-on_proposal.rb:41 -#: src/include/add-on/add-on-workflow.rb:371 -#: src/include/add-on/add-on-workflow.rb:381 -#: src/include/add-on/add-on-workflow.rb:937 -#: src/include/add-on/add-on-workflow.rb:946 +#: src/include/add-on/add-on-workflow.rb:369 +#: src/include/add-on/add-on-workflow.rb:379 +#: src/include/add-on/add-on-workflow.rb:935 +#: src/include/add-on/add-on-workflow.rb:944 msgid "Unknown" msgstr "未知" @@ -128,7 +128,7 @@ #. main screen heading #: src/clients/inst_language_add-on.rb:153 #: src/clients/inst_language_add-on.rb:212 -#: src/include/add-on/add-on-workflow.rb:909 +#: src/include/add-on/add-on-workflow.rb:907 msgid "Add-On Product Installation" msgstr "附加产品安装" @@ -242,34 +242,34 @@ #. ], #. ... #. ] -#: src/include/add-on/add-on-workflow.rb:163 -#: src/include/add-on/add-on-workflow.rb:582 -#: src/include/add-on/add-on-workflow.rb:1592 -#: src/include/add-on/add-on-workflow.rb:1604 +#: src/include/add-on/add-on-workflow.rb:161 +#: src/include/add-on/add-on-workflow.rb:580 +#: src/include/add-on/add-on-workflow.rb:1588 +#: src/include/add-on/add-on-workflow.rb:1600 msgid "No product found in the repository." msgstr "在软件源中未找到产品。" #. error report -#: src/include/add-on/add-on-workflow.rb:316 +#: src/include/add-on/add-on-workflow.rb:314 msgid "No software repository found on medium." msgstr "在介质中未找到软件源。" #. busy message -#: src/include/add-on/add-on-workflow.rb:335 +#: src/include/add-on/add-on-workflow.rb:333 msgid "Initializing new source..." msgstr "正在初始化新资源..." -#: src/include/add-on/add-on-workflow.rb:376 +#: src/include/add-on/add-on-workflow.rb:374 msgid "URL: %1, Directory: %2" msgstr "URL： %1，目录： %2" #. dialog caption -#: src/include/add-on/add-on-workflow.rb:389 +#: src/include/add-on/add-on-workflow.rb:387 msgid "Software Repository Selection" msgstr "软件源选择" #. help text -#: src/include/add-on/add-on-workflow.rb:391 +#: src/include/add-on/add-on-workflow.rb:389 msgid "" "<p><big><b>Software Repository Selection</b></big><br>\n" "Multiple repositories were found on the selected medium.\n" @@ -279,7 +279,7 @@ "所选媒体中找到了多个软件源。\n" "请选择要使用的软件源。</p>\n" -#: src/include/add-on/add-on-workflow.rb:401 +#: src/include/add-on/add-on-workflow.rb:399 msgid "Repositories &Found" msgstr "找到的软件源(&F)" @@ -291,33 +291,33 @@ #. else #. { #. yes-no popup -#: src/include/add-on/add-on-workflow.rb:413 -#: src/include/add-on/add-on-workflow.rb:740 +#: src/include/add-on/add-on-workflow.rb:411 +#: src/include/add-on/add-on-workflow.rb:738 msgid "Really abort add-on product installation?" msgstr "真的要中止附加产品安装吗？" #. popup message -#: src/include/add-on/add-on-workflow.rb:424 +#: src/include/add-on/add-on-workflow.rb:422 msgid "Select a repository." msgstr "请选择一个软件源。" #. message popup -#: src/include/add-on/add-on-workflow.rb:629 +#: src/include/add-on/add-on-workflow.rb:627 msgid "Dependencies of the add-on product cannot be fulfilled." msgstr "无法满足附加产品的依赖关系。" #. dialog caption -#: src/include/add-on/add-on-workflow.rb:710 +#: src/include/add-on/add-on-workflow.rb:708 msgid "Product Selection" msgstr "产品选择" #. multi selection list -#: src/include/add-on/add-on-workflow.rb:716 +#: src/include/add-on/add-on-workflow.rb:714 msgid "Available Products" msgstr "可用产品" #. help text -#: src/include/add-on/add-on-workflow.rb:722 +#: src/include/add-on/add-on-workflow.rb:720 msgid "" "<p><b><big>Product Selection</big></b><br/>\n" "Multiple products were found in the repository. Select the products\n" @@ -328,12 +328,12 @@ "安装的产品。</p>\n" #. message popup -#: src/include/add-on/add-on-workflow.rb:790 +#: src/include/add-on/add-on-workflow.rb:788 msgid "Dependencies of the selected add-on products cannot be fulfilled." msgstr "无法满足所选附加产品的依赖关系。" #. Help for add-on products -#: src/include/add-on/add-on-workflow.rb:912 +#: src/include/add-on/add-on-workflow.rb:910 msgid "" "<p><big><b>Add-On Product Installation</b></big><br/>\n" "Here see all add-on products that are selected for installation.\n" @@ -346,102 +346,102 @@ "请选择它并点击<b>删除</b>。</p>" #. table cell, %1 is URL, %2 is directory name -#: src/include/add-on/add-on-workflow.rb:941 +#: src/include/add-on/add-on-workflow.rb:939 msgid "%1, Directory: %2" msgstr "%1，目录： %2" #. table header -#: src/include/add-on/add-on-workflow.rb:967 +#: src/include/add-on/add-on-workflow.rb:965 msgid "Product" msgstr "产品" #. table header -#: src/include/add-on/add-on-workflow.rb:969 +#: src/include/add-on/add-on-workflow.rb:967 msgid "Media" msgstr "介质" #. message report -#: src/include/add-on/add-on-workflow.rb:1124 +#: src/include/add-on/add-on-workflow.rb:1120 msgid "Select a product to delete." msgstr "选择要删除的产品。" #. TRANSLATORS: busy message -#: src/include/add-on/add-on-workflow.rb:1132 +#: src/include/add-on/add-on-workflow.rb:1128 msgid "Removing selected add-on..." msgstr "正在移除所选附加产品..." #. TRANSLATORS: dialog caption -#: src/include/add-on/add-on-workflow.rb:1259 +#: src/include/add-on/add-on-workflow.rb:1255 msgid "Installed Add-on Products" msgstr "已安装的附加产品" #. TRANSLATORS: table header item -#: src/include/add-on/add-on-workflow.rb:1266 +#: src/include/add-on/add-on-workflow.rb:1262 msgid "Add-on Product" msgstr "附加产品" #. TRANSLATORS: table header item -#: src/include/add-on/add-on-workflow.rb:1268 +#: src/include/add-on/add-on-workflow.rb:1264 msgid "URL" msgstr "URL" #. TRANSLATORS: push button -#: src/include/add-on/add-on-workflow.rb:1282 +#: src/include/add-on/add-on-workflow.rb:1278 msgid "Run &Software Manager..." msgstr "运行软件管理器(&S)..." #. TRANSLATORS: dialog help adp/1 -#: src/include/add-on/add-on-workflow.rb:1286 +#: src/include/add-on/add-on-workflow.rb:1282 msgid "<p>All add-on products installed on your system are displayed.</p>" msgstr "<p>这里显示了您系统中安装的全部附加产品.</p>" #. TRANSLATORS: dialog help adp/2 -#: src/include/add-on/add-on-workflow.rb:1288 +#: src/include/add-on/add-on-workflow.rb:1284 msgid "<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>" msgstr "<p>用<b>添加</b>来添加一个新的附加产品，或<b>删除</b>来删除一个使用中的附近产品。</p>" #. no items -#: src/include/add-on/add-on-workflow.rb:1341 +#: src/include/add-on/add-on-workflow.rb:1337 msgid "<b>Vendor:</b> %1<br>" msgstr "<b>厂商：</b> %1<br>" -#: src/include/add-on/add-on-workflow.rb:1342 +#: src/include/add-on/add-on-workflow.rb:1338 msgid "Unknown vendor" msgstr "未知厂商" -#: src/include/add-on/add-on-workflow.rb:1345 +#: src/include/add-on/add-on-workflow.rb:1341 msgid "<b>Version:</b> %1<br>" msgstr "<b>版本：</b> %1<br>" -#: src/include/add-on/add-on-workflow.rb:1346 +#: src/include/add-on/add-on-workflow.rb:1342 msgid "Unknown version" msgstr "未知版本" -#: src/include/add-on/add-on-workflow.rb:1349 +#: src/include/add-on/add-on-workflow.rb:1345 msgid "<b>Repository URL:</b> %1<br>" msgstr "<b>软件源 URL：</b> %1<br>" -#: src/include/add-on/add-on-workflow.rb:1355 +#: src/include/add-on/add-on-workflow.rb:1351 msgid "Unknown repository URL" msgstr "未知软件源 URL" -#: src/include/add-on/add-on-workflow.rb:1362 +#: src/include/add-on/add-on-workflow.rb:1358 msgid "<b>Repository Alias:</b> %1<br>" msgstr "<b>软件源别名：</b> %1<br>" #. Removes the currently selected Add-On #. #. @return [Boolean] whether something has changed its state -#: src/include/add-on/add-on-workflow.rb:1642 -#: src/include/add-on/add-on-workflow.rb:1695 +#: src/include/add-on/add-on-workflow.rb:1638 +#: src/include/add-on/add-on-workflow.rb:1691 msgid "Unknown product" msgstr "未知产品" -#: src/include/add-on/add-on-workflow.rb:1645 +#: src/include/add-on/add-on-workflow.rb:1641 msgid "Unknown URL" msgstr "未知 URL" -#: src/include/add-on/add-on-workflow.rb:1701 +#: src/include/add-on/add-on-workflow.rb:1697 msgid "" "Deleting the add-on product %1 may result in removing all the packages\n" "installed from this add-on.\n" @@ -453,7 +453,7 @@ "您确定想要删除它吗？" #. TRANSLATORS: busy popup message -#: src/include/add-on/add-on-workflow.rb:1718 +#: src/include/add-on/add-on-workflow.rb:1714 msgid "Removing product dependencies..." msgstr "正在移除产品依赖..." Modified: trunk/yast/zh_CN/po/audit-laf.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/audit-laf.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/audit-laf.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:32+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/auth-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/auth-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:52+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -15,147 +15,122 @@ "X-Generator: Lokalize 1.5\n" #. translators: command line help text for authentication client module -#: src/clients/auth-client.rb:49 +#: src/clients/auth-client.rb:46 msgid "Authentication client configuration module" msgstr "认证客户端配置模块" #. translators: command line help text for summary action -#: src/clients/auth-client.rb:59 +#: src/clients/auth-client.rb:56 msgid "Configuration summary of the authentication client" msgstr "认证客户端配置摘要" #. translators: command line help text for summary action -#: src/clients/auth-client.rb:64 +#: src/clients/auth-client.rb:61 msgid "Create autoyast rnc from @parameters" msgstr "从 @parameters 创建 autoyast rnc" -#. the auth configuration -#: src/include/dialogs.rb:33 -msgid "Do you really want to delete the domain '%1'?" -msgstr "您真的想要删除域 '%1' 吗？" +#. Create parameter editor controls (label, input, help text) and return them. +#: src/lib/yauthclient/initial_customisation_dialog.rb:70 +#, fuzzy +#| msgid "None" +msgid "None." +msgstr "无" -#: src/include/dialogs.rb:49 -msgid "There is no help for this parameter." -msgstr "此参数没有帮助。" +#. Render controls for editing parameter values, according to parameter data type. +#: src/lib/yauthclient/initial_customisation_dialog.rb:105 +#, fuzzy +#| msgid "Mount Parameters" +msgid "Mandatory Parameters" +msgstr "装入参数" -#: src/include/dialogs.rb:55 -msgid "Default value: " -msgstr "默认值：" +#: src/lib/yauthclient/initial_customisation_dialog.rb:112 +#, fuzzy +#| msgid "Optional Parameter File" +msgid "Optional Parameters" +msgstr "可选的参数文件" -#: src/include/dialogs.rb:59 -msgid "Available values: " -msgstr "可用值：" +#. Check that all mandatory parameters are set +#: src/lib/yauthclient/initial_customisation_dialog.rb:138 +msgid "Please complete all of the following mandatory parameters:\n" +msgstr "" -#. No we open the dialog -#: src/include/dialogs.rb:146 -msgid "Set Parameter Value in Section '%1'" -msgstr "请在 '%1' 部分设置参数值" +#. Render overview and edit buttons on left side, config editor on right side. +#: src/lib/yauthclient/main_dialog.rb:55 +#, fuzzy +#| msgid "Authentication Client" +msgid "Authentication Client Config" +msgstr "认证客户端" -#: src/include/dialogs.rb:148 src/include/dialogs.rb:220 -#: src/include/dialogs.rb:310 src/include/dialogs.rb:371 -msgid "Cancel" -msgstr "取消" +#. Overview of all config sections +#: src/lib/yauthclient/main_dialog.rb:62 +msgid "Global Configuration" +msgstr "全局配置" -#: src/include/dialogs.rb:149 src/include/dialogs.rb:222 -#: src/include/dialogs.rb:313 src/include/dialogs.rb:373 -msgid "OK" -msgstr "好" +#: src/lib/yauthclient/main_dialog.rb:65 +msgid "Create Home Directory on Login" +msgstr "在登录时创建主目录" -#. Waiting for response -#. Waiting for response -#: src/include/dialogs.rb:168 src/include/dialogs.rb:338 -msgid "Value for parameter '%1' is invalid." -msgstr "参数 '%1' 的值无效。" +#: src/lib/yauthclient/main_dialog.rb:68 +#, fuzzy +#| msgid "Enable the NTP daemon" +msgid "Enable SSSD daemon" +msgstr "启用 NTP 守护程序" -#: src/include/dialogs.rb:200 -msgid "Section '%1' has no attributes." -msgstr "部分 '%1' 无属性。" +#: src/lib/yauthclient/main_dialog.rb:73 +#, fuzzy +#| msgid "Selections" +msgid "Sections" +msgstr "选择" -#. No we open the dialog -#: src/include/dialogs.rb:212 -msgid "Select new Parameter for section '%1'" -msgstr "请为 '%1' 部分选择新参数" +#: src/lib/yauthclient/main_dialog.rb:76 +#, fuzzy +#| msgid "Network Services" +msgid "New Service/Domain" +msgstr "网络服务" -#: src/include/dialogs.rb:215 -msgid "New Parameter" -msgstr "新增参数" +#: src/lib/yauthclient/main_dialog.rb:77 +#, fuzzy +#| msgid "Selected Service" +msgid "Delete Service/Domain" +msgstr "所选服务" -#: src/include/dialogs.rb:221 src/include/dialogs.rb:311 -#: src/include/dialogs.rb:372 -msgid "Help" -msgstr "帮助" +#. For the currently selection config section, render customised parameters and values in a table. +#: src/lib/yauthclient/main_dialog.rb:112 +#, fuzzy +#| msgid "Custom Xgl options" +msgid "Customisation - %s" +msgstr "定制 Xgl 选项" -#. No we open the dialog -#: src/include/dialogs.rb:306 -msgid "Edit sssd section '%1'" -msgstr "编辑 sssd 的 '%1' 部分" +#: src/lib/yauthclient/main_dialog.rb:116 +#: src/lib/yauthclient/main_dialog.rb:141 +msgid "Name" +msgstr "名称" -#: src/include/dialogs.rb:312 -msgid "New" -msgstr "新建" +#: src/lib/yauthclient/main_dialog.rb:116 +msgid "Value" +msgstr "值" -#: src/include/dialogs.rb:356 -msgid "Add New Domain" -msgstr "添加新域" +#: src/lib/yauthclient/main_dialog.rb:116 +#: src/lib/yauthclient/main_dialog.rb:141 +msgid "Description" +msgstr "描述" -#: src/include/dialogs.rb:358 -msgid "Name:" -msgstr "名称：" +#. For the currently selected config section, render list of additional parameters for customisation. +#: src/lib/yauthclient/main_dialog.rb:135 +#, fuzzy +#| msgid "Modem Parameters" +msgid "More Parameters" +msgstr "调制解调器参数" -#: src/include/dialogs.rb:359 -msgid "Activate Domain" -msgstr "激活域" +#: src/lib/yauthclient/main_dialog.rb:138 +#, fuzzy +#| msgid "Filter:" +msgid "Name filter:" +msgstr "过滤器：" -#: src/include/dialogs.rb:361 -msgid "The identification provider used for the domain" -msgstr "该域所用的标识提供者" - -#: src/include/dialogs.rb:365 -msgid "The authentication provider used for the domain" -msgstr "该域所用的认证提供者" - -#. TODO -#: src/include/dialogs.rb:387 -msgid "Help for creating new domain" -msgstr "创建新域的帮助" - -#: src/include/dialogs.rb:391 -msgid "You have to provide a domain name!" -msgstr "您必须提供一个域名！" - -#. The default ldap schema rfc2307 is deprecated use rfc2307bis -#: src/include/dialogs.rb:421 -msgid "Basic Settings:" -msgstr "基本设置：" - -#: src/include/dialogs.rb:423 -msgid "Services:" -msgstr "服务：" - -#. Count of active domains -#: src/include/dialogs.rb:463 +#. Check system environment for the proper operation of SSSD +#: src/lib/yauthclient/main_dialog.rb:167 msgid "" -"There are no activated domains in the [sssd] section.\n" -"sssd will not be started. Only local authentication will be available.\n" -"Do you want to write this configuration?" -msgstr "" -"[sssd] 部分中没有激活的域。\n" -"sssd 将不会启动。仅有本地认证可用。\n" -"您想要写入此配置吗？" - -#. TRANSLATORS: %s stands for list of inactive domains -#: src/include/dialogs.rb:471 -msgid "" -"There are some domains you have not activated:\n" -"%s \n" -"Do you want to write this configuration?" -msgstr "" -"有一些您尚未激活的域：\n" -"%s\n" -"您想要写入此配置吗？" - -#: src/include/dialogs.rb:486 -msgid "" "Your system is configured for using nss_ldap.\n" "This module is designed to configure your system via sssd.\n" "If you continue, your nss_ldap configuration will be removed.\n" @@ -166,7 +141,7 @@ "若您继续，您的 nss_ldap 配置将会被移除。\n" "您想要继续吗？" -#: src/include/dialogs.rb:496 +#: src/lib/yauthclient/main_dialog.rb:177 msgid "" "Your system is configured as OES client.\n" "This module is designed to configure your system via sssd.\n" @@ -178,925 +153,1166 @@ "若您继续，您的 OES 客户端配置将被取消激活。\n" "您想要继续吗？" -#. Main dialog contents -#: src/include/dialogs.rb:512 -msgid "Authentication Client" -msgstr "认证客户端" +#. Delete the chosen section (domain or service) +#: src/lib/yauthclient/main_dialog.rb:221 +#, fuzzy +#| msgid "You cannot delete the active profile." +msgid "You may not delete section SSSD." +msgstr "无法删除活动简报。" -#: src/include/dialogs.rb:526 src/include/dialogs.rb:599 -#: src/include/dialogs.rb:605 -msgid "Configured Authentication Domains" -msgstr "配置认证域" +#: src/lib/yauthclient/main_dialog.rb:223 +#, fuzzy +#| msgid "Do you really want to delete partition %1?" +msgid "Do you really wish to delete section %s?" +msgstr "是否确实要删除分区 %1？" -#: src/include/dialogs.rb:538 -msgid "Add" -msgstr "添加" +#. Forbid removal of mandatory parameters +#: src/lib/yauthclient/main_dialog.rb:267 +msgid "This is a mandatory parameter and it may not be deleted." +msgstr "" -#: src/include/dialogs.rb:539 -msgid "Edit" -msgstr "编辑" +#. Warn against removal of important parameters +#: src/lib/yauthclient/main_dialog.rb:272 +#, fuzzy +#| msgid "Modem parameter details" +msgid "Confirm parameter removal: " +msgstr "调制解调器参数细节" -#: src/include/dialogs.rb:540 -msgid "Delete" -msgstr "删除" +#: src/lib/yauthclient/main_dialog.rb:273 +msgid "" +"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n" +"Please consult SSSD manual page before moving on.\n" +"Do you still wish to continue?" +msgstr "" -#. Inetd configure dialog caption -#: src/include/dialogs.rb:547 -msgid "Authentication Client Configuration (sssd)" -msgstr "认证客户端配置 (sssd)" +#. Save settings - validate +#: src/lib/yauthclient/main_dialog.rb:303 +#, fuzzy +#| msgid "Logging enabled" +msgid "No domain enabled" +msgstr "日志记录已启用" -#. initialize GUI -#: src/include/dialogs.rb:553 -msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>" -msgstr "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于所选身份和认证提供方的参数。SSSD 提供了以下 id_provider：<br><b>proxy</b>: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有：<br><b>ldap</b> 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活动目录提供方。<br><b>proxy</b> 用于对某些� �它 PAM 对象的延迟认证。<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>" +#: src/lib/yauthclient/main_dialog.rb:304 +#, fuzzy +#| msgid "" +#| "There are no activated domains in the [sssd] section.\n" +#| "sssd will not be started. Only local authentication will be available.\n" +#| "Do you want to write this configuration?" +msgid "" +"No domain has been enabled in [sssd] \"domains\" parameter.\n" +"SSSD will not start, and only local authentication will be available.\n" +"Do you still wish to proceed?" +msgstr "" +"[sssd] 部分中没有激活的域。\n" +"sssd 将不会启动。仅有本地认证可用。\n" +"您想要写入此配置吗？" +#. user must correct the mistake +#: src/lib/yauthclient/main_dialog.rb:321 +msgid "Inactive domain(s) found" +msgstr "" + +#. Render input box and dropdowns for service/domain creation +#: src/lib/yauthclient/new_section_dialog.rb:49 +#, fuzzy +#| msgid "Would you like to abort or try again?\n" +msgid "Would you like to enable another service or join a domain?" +msgstr "是中止还是重试？\n" + +#. New service +#: src/lib/yauthclient/new_section_dialog.rb:54 +msgid "Service" +msgstr "服务" + +#. New domain and provider types +#: src/lib/yauthclient/new_section_dialog.rb:58 +msgid "Domain" +msgstr "域" + +#: src/lib/yauthclient/new_section_dialog.rb:61 +msgid "Domain name (example.com):" +msgstr "" + +#: src/lib/yauthclient/new_section_dialog.rb:64 +#, fuzzy +#| msgid "Identification:" +msgid "Identification provider:" +msgstr "标识：" + +#: src/lib/yauthclient/new_section_dialog.rb:69 +#, fuzzy +#| msgid "&Authentication Mode" +msgid "Authentication provider:" +msgstr "身份验证方式(&A)" + +#: src/lib/yauthclient/new_section_dialog.rb:72 +msgid "Activate Domain" +msgstr "激活域" + +#. Create new service +#: src/lib/yauthclient/new_section_dialog.rb:105 +#, fuzzy +#| msgid "These services will be enabled" +msgid "There are no more services to be enabled." +msgstr "这些服务将被启用" + +#. Create new domain +#: src/lib/yauthclient/new_section_dialog.rb:123 +#, fuzzy +#| msgid "Enter a name for the new profile." +msgid "Please enter a name for the new domain." +msgstr "输入新配置文件的名称。" + +#: src/lib/yauthclient/new_section_dialog.rb:126 +#, fuzzy +#| msgid "This domain is already defined." +msgid "The domain name is already in-use." +msgstr "已定义了此域。" + #. Define Global Parameters -#: src/include/sssd-parameters.rb:17 +#: src/lib/yauthclient/params.rb:108 msgid "Indicates what is the syntax of the config file." msgstr "揭示了配置文件的语法。" -#: src/include/sssd-parameters.rb:21 +#: src/lib/yauthclient/params.rb:114 msgid "Comma separated list of services that are started when sssd itself starts." msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。" -#: src/include/sssd-parameters.rb:26 src/include/sssd-parameters.rb:79 +#: src/lib/yauthclient/params.rb:115 +msgid "" +"\n" +"Supported services: nss, pam, sudo, autofs, ssh" +msgstr "" + +#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" msgstr "当数据提供者崩溃或重启时在放弃前服务应尝试重连的次数" -#: src/include/sssd-parameters.rb:30 +#: src/lib/yauthclient/params.rb:125 msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." msgstr "SSSD 可同时使用更多域，但必须配置至少一个否则 SSSD 不会启动。" -#: src/include/sssd-parameters.rb:31 +#: src/lib/yauthclient/params.rb:126 msgid "This parameter contains the list of domains in the order these will be queried." msgstr "此参数包含了以查询顺序排列的域列表。" -#: src/include/sssd-parameters.rb:35 +#: src/lib/yauthclient/params.rb:130 msgid "Default regular expression that describes how to parse the string containing user name and domain into these components" msgstr "默认正则表达式描述了如何解析包含用户名和域的字符串到这些组件中" -#: src/include/sssd-parameters.rb:39 +#: src/lib/yauthclient/params.rb:134 msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." msgstr "默认的 printf(3) 兼容格式，描述了如何转义 (name, domain) 元组为完全限定名称。" -#: src/include/sssd-parameters.rb:43 +#: src/lib/yauthclient/params.rb:138 msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." msgstr "SSSD 监控着 resolv.conf 的状态来识别它是否需要更新其内部 DNS 解析器。" -#: src/include/sssd-parameters.rb:44 +#: src/lib/yauthclient/params.rb:139 msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." msgstr "默认我们将尝试使用 inotify，若 inotify 不可用则回退为每五秒轮询 resolv.conf 一次。" -#: src/include/sssd-parameters.rb:48 +#: src/lib/yauthclient/params.rb:143 msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files." msgstr "SSSD 应在文件系统上存放 Kerberos 回放缓存文件的文件夹。" -#: src/include/sssd-parameters.rb:52 +#: src/lib/yauthclient/params.rb:147 msgid "This string will be used as a default domain name for all names without a domain name component." msgstr "此字符串将用作全部没有域名组件的名称的默认域名。" #. Define Global Services Parameters -#: src/include/sssd-parameters.rb:59 +#: src/lib/yauthclient/params.rb:154 msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." msgstr "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值，0xFFF0是最详尽模式。" -#: src/include/sssd-parameters.rb:64 +#: src/lib/yauthclient/params.rb:159 msgid "Add a timestamp to the debug messages" msgstr "为调试信息添加时间戳" -#: src/include/sssd-parameters.rb:69 +#: src/lib/yauthclient/params.rb:164 msgid "Add microseconds to the timestamp in debug messages" msgstr "为调试信息中的时间戳添加毫秒" -#: src/include/sssd-parameters.rb:74 +#: src/lib/yauthclient/params.rb:169 msgid "Timeout in seconds between heartbeats for this service." msgstr "此服务心跳间超时秒数。" -#: src/include/sssd-parameters.rb:84 +#: src/lib/yauthclient/params.rb:179 msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." msgstr "此选项指定了此 SSSD 进程同一时间可打开的最大文件描述符数目。" -#: src/include/sssd-parameters.rb:89 +#: src/lib/yauthclient/params.rb:184 msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." msgstr "此选项指定了 SSSD 进程客户端可持有文件描述符而不与之通信的秒数。" -#: src/include/sssd-parameters.rb:94 +#: src/lib/yauthclient/params.rb:189 msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." msgstr "若服务不响应 ping 检查 (参考「超时」选项) ，它将会先发送 SIGTERM 信号引导服务优雅地退出。" #. NSS configuration options -#: src/include/sssd-parameters.rb:102 +#: src/lib/yauthclient/params.rb:197 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?" msgstr "缓存 nss_css 枚举 (对全部用户信息的请求) 的秒数" -#: src/include/sssd-parameters.rb:107 +#: src/lib/yauthclient/params.rb:202 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." msgstr "若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比，则可将条目缓存设为在后台自动更新条目。" -#: src/include/sssd-parameters.rb:112 +#: src/lib/yauthclient/params.rb:207 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." msgstr "指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即，针对无效数据库条目如不存在条目的查询) 的秒数。" -#: src/include/sssd-parameters.rb:117 -msgid "Exclude certain users from being fetched from the sss NSS database." +#: src/lib/yauthclient/params.rb:213 +#, fuzzy +#| msgid "Exclude certain users from being fetched from the sss NSS database." +msgid "Exclude certain users from being fetched by SSS backend" msgstr "从 sss NSS 数据库撷取用户时排除特定用户。" -#: src/include/sssd-parameters.rb:122 -msgid "Exclude certain groups from being fetched from the sss NSS database." +#: src/lib/yauthclient/params.rb:219 +#, fuzzy +#| msgid "Exclude certain groups from being fetched from the sss NSS database." +msgid "Exclude certain groups from being fetched by SSS backend" msgstr "从 sss NSS 数据库撷取组时排除特定组。" -#: src/include/sssd-parameters.rb:127 +#: src/lib/yauthclient/params.rb:224 msgid "If you want filtered user to still be group members set this option to false." msgstr "若您想使被过滤的用户仍留作组成员则请设置此选项为假。" -#: src/include/sssd-parameters.rb:131 +#: src/lib/yauthclient/params.rb:228 msgid "Override the user's home directory. You can either provide an absolute value or a template." msgstr "覆盖用户主文件夹。您可以提供一个绝对值或一个模板。" -#: src/include/sssd-parameters.rb:135 src/include/sssd-parameters.rb:1101 +#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider." msgstr "设置当某域的数据提供者未显式指定用户主文件夹时所用的默认模板。" -#: src/include/sssd-parameters.rb:139 +#: src/lib/yauthclient/params.rb:236 msgid "Override the login shell for all users." msgstr "覆盖全部用户的登录壳层。" -#: src/include/sssd-parameters.rb:143 +#: src/lib/yauthclient/params.rb:240 msgid "Restrict user shell to one of the listed values." msgstr "限制用户使用的壳层为列出值其一。" -#: src/include/sssd-parameters.rb:147 +#: src/lib/yauthclient/params.rb:244 msgid "Replace any instance of these shells with the shell_fallback" msgstr "使用 shell_fallback 替换这些壳层中的任何一种" -#: src/include/sssd-parameters.rb:152 +#: src/lib/yauthclient/params.rb:249 msgid "The default shell to use if an allowed shell is not installed on the machine." msgstr "机器上未安装获准使用的壳层时所使用的默认壳层。" -#: src/include/sssd-parameters.rb:156 src/include/sssd-parameters.rb:1105 +#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189 msgid "The default shell to use if the provider does not return one during lookup." msgstr "查询时提供者未返回值时所使用的默认壳层。" -#: src/include/sssd-parameters.rb:161 src/include/sssd-parameters.rb:204 +#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301 msgid "Specifies time in seconds for which the list of subdomains will be considered valid." msgstr "指定了子域列表被认定有效的秒数 。" -#: src/include/sssd-parameters.rb:166 +#: src/lib/yauthclient/params.rb:263 msgid "Specifies time in seconds for which records in the in-memory cache will be valid." msgstr "指定了内存缓存中记录的有效秒数。" #. PAM configuration options -#: src/include/sssd-parameters.rb:174 +#: src/lib/yauthclient/params.rb:271 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." msgstr "认证提供者离线时应允许缓存登入的天数 (自上次成功在线登入起的天数)" -#: src/include/sssd-parameters.rb:179 src/include/sssd-parameters.rb:184 +#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." msgstr "触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时间。" -#: src/include/sssd-parameters.rb:189 +#: src/lib/yauthclient/params.rb:286 msgid "Controls what kind of messages are shown to the user during authentication." msgstr "控制在认证期间展示给用户的消息类型。" -#: src/include/sssd-parameters.rb:194 +#: src/lib/yauthclient/params.rb:291 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information." msgstr "SSSD 在线时对于任何 PAM 请求，SSSD 均会尝试立即更新缓存的该用户身份信息以确保认证使用了最新信息。" #. The kerberos domain section -#: src/include/sssd-parameters.rb:199 src/include/sssd-parameters.rb:691 -#: src/include/sssd-parameters.rb:988 +#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788 +#: src/lib/yauthclient/params.rb:1073 msgid "Display a warning N days before the password expires." msgstr "在密码过期前 N 天展示一条警告。" #. SUDO configuration options -#: src/include/sssd-parameters.rb:212 +#: src/lib/yauthclient/params.rb:309 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。" #. AUTOFS configuration options -#: src/include/sssd-parameters.rb:220 +#: src/lib/yauthclient/params.rb:317 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." msgstr "指定了再次询问后端前 autofs 回应者应缓存否定次数的秒数。" #. SSH configuration options -#: src/include/sssd-parameters.rb:228 +#: src/lib/yauthclient/params.rb:325 msgid "Whether or not to hash host names and addresses in the managed known_hosts file." msgstr "是否在受管 known_hosts 文件中哈希化主机名和地址。" -#: src/include/sssd-parameters.rb:233 +#: src/lib/yauthclient/params.rb:330 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." msgstr "已请求主机密钥后在受管 known_hosts 文件中保存主机的秒数。" #. DOMAIN SECTIONS #. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]” -#: src/include/sssd-parameters.rb:242 src/include/sssd-parameters.rb:247 +#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." msgstr "该域的 UID 和 GID 限制。若某域含有一个超出这些限制的项，则忽略该项。" -#: src/include/sssd-parameters.rb:252 -msgid "Determines if a domain can be enumerated." -msgstr "确定某域是否可枚举。" +#: src/lib/yauthclient/params.rb:350 +msgid "Read all entities from backend database (increase server load)" +msgstr "" -#: src/include/sssd-parameters.rb:257 +#: src/lib/yauthclient/params.rb:355 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." msgstr "若服务在 \"force_timeout\" 秒后未终止，监控器将发送一个 SIGKILL 信号强制关闭它。" -#: src/include/sssd-parameters.rb:262 +#: src/lib/yauthclient/params.rb:360 msgid "How many seconds nss_sss should consider entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定条目有效的秒数。" -#: src/include/sssd-parameters.rb:267 +#: src/lib/yauthclient/params.rb:365 msgid "How many seconds nss_sss should consider user entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定用户项有效的秒数。" -#: src/include/sssd-parameters.rb:272 +#: src/lib/yauthclient/params.rb:370 msgid "How many seconds nss_sss should consider group entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定组项有效的秒数。" -#: src/include/sssd-parameters.rb:277 +#: src/lib/yauthclient/params.rb:375 msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定网络组项有效的秒数。" -#: src/include/sssd-parameters.rb:282 +#: src/lib/yauthclient/params.rb:380 msgid "How many seconds nss_sss should consider service entries valid before asking the backend again." msgstr "再次询问后端前 nss_sss 应认定服务项有效的秒数。" -#: src/include/sssd-parameters.rb:287 +#: src/lib/yauthclient/params.rb:385 msgid "How many seconds sudo should consider rules valid before asking the backend again." msgstr "再次询问后端前 sudo 应认定规则有效的秒数。" -#: src/include/sssd-parameters.rb:292 +#: src/lib/yauthclient/params.rb:390 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again." msgstr "再次询问后端前 autofs 服务应认定自动挂载器映射有效的秒数。" -#: src/include/sssd-parameters.rb:297 -msgid "Determines if user credentials are also cached in the local LDB cache." -msgstr "确定是否也在本地 LDB 缓存中缓存用户机要。" +#: src/lib/yauthclient/params.rb:396 +msgid "Cache credentials for offline use" +msgstr "" -#: src/include/sssd-parameters.rb:302 +#: src/lib/yauthclient/params.rb:401 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." msgstr "在自缓存清理期间移除前应在缓存中保留条目的从最后成功登入日起计的天数。" -#: src/include/sssd-parameters.rb:307 +#: src/lib/yauthclient/params.rb:408 msgid "The identification provider used for the domain." msgstr "该域所用的标识提供者。" -#: src/include/sssd-parameters.rb:312 +#: src/lib/yauthclient/params.rb:413 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." msgstr "使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录名。" -#: src/include/sssd-parameters.rb:318 -msgid "The authentication provider used for the domain." -msgstr "该域所用的认证提供者。" +#: src/lib/yauthclient/params.rb:420 +msgid "The authentication provider used for the domain" +msgstr "该域所用的认证提供者" -#: src/include/sssd-parameters.rb:324 +#: src/lib/yauthclient/params.rb:426 msgid "The access control provider used for the domain." msgstr "该域所用的访问控制提供者。" -#: src/include/sssd-parameters.rb:330 +#: src/lib/yauthclient/params.rb:431 msgid "The provider which should handle change password operations for the domain." msgstr "应受理该域的密码变更操作的提供者。" -#: src/include/sssd-parameters.rb:336 +#: src/lib/yauthclient/params.rb:437 msgid "The SUDO provider used for the domain." msgstr "该域所用的 SUDO 提供者。" -#: src/include/sssd-parameters.rb:342 +#: src/lib/yauthclient/params.rb:443 msgid "The provider which should handle loading of selinux settings." msgstr "应受理 selinux 设置加载的提供者。" -#: src/include/sssd-parameters.rb:348 +#: src/lib/yauthclient/params.rb:449 msgid "The provider which should handle fetching of subdomains." msgstr "应受理子域撷取的提供者。" -#: src/include/sssd-parameters.rb:354 +#: src/lib/yauthclient/params.rb:455 msgid "The autofs provider used for the domain." msgstr "该域所用的 autofs 提供者。" -#: src/include/sssd-parameters.rb:360 +#: src/lib/yauthclient/params.rb:461 msgid "The provider used for retrieving host identity information." msgstr "用于撷取主机身份信息的提供者。" -#: src/include/sssd-parameters.rb:365 +#: src/lib/yauthclient/params.rb:466 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." msgstr "用于此域的正则表达式，描述了如何解析包含用户名和域的字符串到这些组件中。" -#: src/include/sssd-parameters.rb:370 +#: src/lib/yauthclient/params.rb:471 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." msgstr "一种 printf(3) 兼容格式，描述了如何转义此域的 (name, domain) 元组为完全限定名称。" -#: src/include/sssd-parameters.rb:376 +#: src/lib/yauthclient/params.rb:477 msgid "Provides the ability to select preferred address family to use when performing DNS lookups." msgstr "提供了执行 DNS 查询时选择偏好的地址族的能力。" -#: src/include/sssd-parameters.rb:381 +#: src/lib/yauthclient/params.rb:482 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." msgstr "定义了假设其不可达前等待 DNS 解析者回复的以秒计的时间。" -#: src/include/sssd-parameters.rb:385 -msgid "Use the domain part of machine's hostname." -msgstr "使用机器主机名的域部分。" - -#: src/include/sssd-parameters.rb:386 +#: src/lib/yauthclient/params.rb:486 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." msgstr "若后端使用了服务发现，则指定了服务发现 DNS 查询的域部分。" -#: src/include/sssd-parameters.rb:390 +#: src/lib/yauthclient/params.rb:490 msgid "Override the primary GID value with the one specified." msgstr "使用指定组 ID 值覆盖主要组 ID 值。" -#: src/include/sssd-parameters.rb:395 +#: src/lib/yauthclient/params.rb:495 msgid "Treat user and group names as case sensitive." msgstr "视用户和组名称为大小写敏感的。" -#: src/include/sssd-parameters.rb:400 +#: src/lib/yauthclient/params.rb:500 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." msgstr "当在代理提供者上按名称查询某个用户或组时，也执行按 ID 的二次查询以 '规范化' 该名称以防止所请求的名称是一个别名。" -#: src/include/sssd-parameters.rb:405 +#: src/lib/yauthclient/params.rb:505 msgid "Use this homedir as default value for all subdomains within this domain." msgstr "使用此主文件夹作为此域中全部子域的默认值。" #. Following options will be provided by SSSD's 'simple' access-control provider -#: src/include/sssd-parameters.rb:411 +#: src/lib/yauthclient/params.rb:511 msgid "Comma separated list of users who are allowed to log in." msgstr "逗号分隔的允许登入用户列表。" -#: src/include/sssd-parameters.rb:416 +#: src/lib/yauthclient/params.rb:516 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." msgstr "逗号分隔的允许登入组列表。这仅应用于此 SSSD 域中的组。" -#: src/include/sssd-parameters.rb:421 -msgid "Comma separated list of users who are explicitly denied access." -msgstr "逗号分隔的显式拒绝访问用户列表。" - -#: src/include/sssd-parameters.rb:426 +#: src/lib/yauthclient/params.rb:521 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." msgstr "逗号分隔的显式拒绝访问组列表。这仅应用于此 SSSD 域中的组。" -#: src/include/sssd-parameters.rb:432 -msgid "The default base DN to use for performing LDAP sudo rules." -msgstr "用于执行 LDAP sudo 规则的默认基本判别名。" - #. The local domain section #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local. -#: src/include/sssd-parameters.rb:441 +#: src/lib/yauthclient/params.rb:530 msgid "The tools append the login name to base_directory and use that as the home directory." msgstr "此工具会追加登入名到 base_directory 并用其作为主文件夹。" -#: src/include/sssd-parameters.rb:446 +#: src/lib/yauthclient/params.rb:535 msgid "Indicate if a home directory should be created by default for new users." msgstr "指出是否应为新用户默认创建主文件夹。" -#: src/include/sssd-parameters.rb:451 +#: src/lib/yauthclient/params.rb:540 msgid "Indicate if a home directory should be removed by default for deleted users." msgstr "指出是否应默认移除已删除用户的主文件夹。" -#: src/include/sssd-parameters.rb:456 +#: src/lib/yauthclient/params.rb:545 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." msgstr "被 sss_useradd(8) 用来指定新创建的主文件夹的默认权限。" -#: src/include/sssd-parameters.rb:461 +#: src/lib/yauthclient/params.rb:550 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" msgstr "骨架文件夹，其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件和文件夹。" -#: src/include/sssd-parameters.rb:466 +#: src/lib/yauthclient/params.rb:555 msgid "The mail spool directory." msgstr "邮件卷文件夹。" -#: src/include/sssd-parameters.rb:470 +#: src/lib/yauthclient/params.rb:559 msgid "The command that is run after a user is removed." msgstr "移除用户后运行的命令。" #. The ldap domain section -#: src/include/sssd-parameters.rb:479 src/include/sssd-parameters.rb:484 +#: src/lib/yauthclient/params.rb:568 +msgid "URIs (ldap://) of LDAP servers (comma separated)" +msgstr "" + +#: src/lib/yauthclient/params.rb:574 +msgid "The default base DN to use for performing LDAP sudo rules." +msgstr "用于执行 LDAP sudo 规则的默认基本判别名。" + +#: src/lib/yauthclient/params.rb:579 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/include/sssd-parameters.rb:490 src/include/sssd-parameters.rb:496 +#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user." msgstr "指定了逗号分隔的 LDAP 服务器 URI 列表，SSSD 应以优先级顺序连接以修改用户密码。" -#: src/include/sssd-parameters.rb:501 -msgid "The default base DN to use for performing LDAP user operations." -msgstr "指定 LDAP 用户操作所用的默认基本判别名。" +#: src/lib/yauthclient/params.rb:597 +#, fuzzy +#| msgid "Base DN for the database" +msgid "Base DN for LDAP search" +msgstr "数据库的基 DN" -#: src/include/sssd-parameters.rb:507 -msgid "Specifies the Schema Type in use on the target LDAP server." -msgstr "指定了目标 LDAP 服务器上使用的方案类型。" +#: src/lib/yauthclient/params.rb:604 +#, fuzzy +#| msgid "LDAP secure port" +msgid "LDAP schema type" +msgstr "LDAP 安全端口" -#: src/include/sssd-parameters.rb:511 +#: src/lib/yauthclient/params.rb:608 msgid "The default bind DN to use for performing LDAP operations." msgstr "指定 LDAP 操作所用的默认绑定判别名。" -#: src/include/sssd-parameters.rb:517 +#: src/lib/yauthclient/params.rb:614 msgid "The type of the authentication token of the default bind DN." msgstr "默认绑定判别名的认证 token 的类型。" -#: src/include/sssd-parameters.rb:521 +#: src/lib/yauthclient/params.rb:618 msgid "The authentication token of the default bind DN." msgstr "默认绑定判别名的认证 token。" -#: src/include/sssd-parameters.rb:526 +#: src/lib/yauthclient/params.rb:623 msgid "The object class of a user entry in LDAP." msgstr "LDAP 中用户项的对象类。" -#: src/include/sssd-parameters.rb:531 +#: src/lib/yauthclient/params.rb:628 msgid "The LDAP attribute that corresponds to the user's login name." msgstr "对应着用户登录名的 LDAP 属性。" -#: src/include/sssd-parameters.rb:536 +#: src/lib/yauthclient/params.rb:633 msgid "The LDAP attribute that corresponds to the user's id." msgstr "对应着用户 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:541 +#: src/lib/yauthclient/params.rb:638 msgid "The LDAP attribute that corresponds to the user's primary group id." msgstr "对应着用户的首要组 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:546 +#: src/lib/yauthclient/params.rb:643 msgid "The LDAP attribute that corresponds to the user's gecos field." msgstr "对应着用户 gecos 字段的 LDAP 属性。" -#: src/include/sssd-parameters.rb:551 +#: src/lib/yauthclient/params.rb:648 msgid " The LDAP attribute that contains the name of the user's home directory." msgstr "存放用户主文件夹名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:556 +#: src/lib/yauthclient/params.rb:653 msgid "The LDAP attribute that contains the path to the user's default shell." msgstr "存放用户默认壳层路径的 LDAP 属性。" -#: src/include/sssd-parameters.rb:561 +#: src/lib/yauthclient/params.rb:658 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object." msgstr "存放 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:566 +#: src/lib/yauthclient/params.rb:663 msgid "The LDAP attribute that contains the objectSID of an LDAP user object." msgstr "存放 LDAP 用户对象的 objectSID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:571 src/include/sssd-parameters.rb:776 +#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "存放父对象最后修订时间戳记的 LDAP 属性。" -#: src/include/sssd-parameters.rb:576 +#: src/lib/yauthclient/params.rb:673 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/include/sssd-parameters.rb:581 +#: src/lib/yauthclient/params.rb:678 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/include/sssd-parameters.rb:586 +#: src/lib/yauthclient/params.rb:683 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/include/sssd-parameters.rb:591 +#: src/lib/yauthclient/params.rb:688 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/include/sssd-parameters.rb:596 +#: src/lib/yauthclient/params.rb:693 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/include/sssd-parameters.rb:601 +#: src/lib/yauthclient/params.rb:698 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/include/sssd-parameters.rb:606 +#: src/lib/yauthclient/params.rb:703 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/include/sssd-parameters.rb:611 +#: src/lib/yauthclient/params.rb:708 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/include/sssd-parameters.rb:616 +#: src/lib/yauthclient/params.rb:713 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/include/sssd-parameters.rb:621 +#: src/lib/yauthclient/params.rb:718 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/include/sssd-parameters.rb:626 +#: src/lib/yauthclient/params.rb:723 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/include/sssd-parameters.rb:631 +#: src/lib/yauthclient/params.rb:728 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not." msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了是否允许访问。" -#: src/include/sssd-parameters.rb:636 +#: src/lib/yauthclient/params.rb:733 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted." msgstr "当使用 ldap_account_expire_policy=nds 时，此属性确定了准予访问至的日期。" -#: src/include/sssd-parameters.rb:641 +#: src/lib/yauthclient/params.rb:738 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/include/sssd-parameters.rb:646 +#: src/lib/yauthclient/params.rb:743 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)." msgstr "存放用户的 Kerberos 用户实体名称 (UPN) 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:650 +#: src/lib/yauthclient/params.rb:747 msgid "The LDAP attribute that contains the user's SSH public keys." msgstr "存放用户 SSH 公钥的 LDAP 属性。" -#: src/include/sssd-parameters.rb:655 +#: src/lib/yauthclient/params.rb:752 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail." msgstr "某些目录服务器，例如活动目录服务器，可能会以小写传递 UPN 的领域部分，这可能造成认证失败。" -#: src/include/sssd-parameters.rb:656 +#: src/lib/yauthclient/params.rb:753 msgid "Set this option to true if you want to use an upper-case realm." msgstr "若您想要使用大写领域则请将此选项设为真。" -#: src/include/sssd-parameters.rb:661 +#: src/lib/yauthclient/params.rb:758 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records." msgstr "指定了刷新其枚举记录缓存前 SSSD 必须等待的秒数。" -#: src/include/sssd-parameters.rb:666 +#: src/lib/yauthclient/params.rb:763 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/include/sssd-parameters.rb:671 +#: src/lib/yauthclient/params.rb:768 msgid "The LDAP attribute that corresponds to the user's full name." msgstr "对应着用户完整名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:676 +#: src/lib/yauthclient/params.rb:773 msgid "The LDAP attribute that lists the user's group memberships." msgstr "列出了用户的组成员资格的 LDAP 属性。" -#: src/include/sssd-parameters.rb:681 +#: src/lib/yauthclient/params.rb:778 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege." msgstr "若 access_provider=ldap 且 ldap_access_order=authorized_service，SSSD 将依据 authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。" -#: src/include/sssd-parameters.rb:686 +#: src/lib/yauthclient/params.rb:783 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege." msgstr "若 access_provider=ldap 且 ldap_access_order=host，SSSD 将依据主机属性是否在该用户 LDAP 项中出现来确定访问权限。" -#: src/include/sssd-parameters.rb:696 +#: src/lib/yauthclient/params.rb:793 msgid "The object class of a group entry in LDAP." msgstr "LDAP 中组项的对象类。" -#: src/include/sssd-parameters.rb:701 +#: src/lib/yauthclient/params.rb:798 msgid "The LDAP attribute that corresponds to the group name." msgstr "对应着组名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:706 +#: src/lib/yauthclient/params.rb:803 msgid "The LDAP attribute that corresponds to the group's id." msgstr "对应着组 ID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:711 +#: src/lib/yauthclient/params.rb:808 msgid "The LDAP attribute that contains the names of the group's members." msgstr "存放组成员名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:716 +#: src/lib/yauthclient/params.rb:813 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object." msgstr "存放某 LDAP 组对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:721 +#: src/lib/yauthclient/params.rb:818 msgid "The LDAP attribute that contains the objectSID of an LDAP group object." msgstr "存放某 LDAP 组对象的 objectSID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:726 +#: src/lib/yauthclient/params.rb:823 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object." msgstr "存放父对象最后修订时间戳记的 LDAP 属性。" -#: src/include/sssd-parameters.rb:732 +#: src/lib/yauthclient/params.rb:829 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/include/sssd-parameters.rb:738 +#: src/lib/yauthclient/params.rb:835 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups." msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速在具有复杂或深度嵌套的组的部署上的组查询操作。" -#: src/include/sssd-parameters.rb:744 +#: src/lib/yauthclient/params.rb:841 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)." msgstr "此选项告知 SSSD 利用一项活动目录独有特性，其可能加速 initgroups 操作 (当处理复杂或深度嵌套的组时最为显著)。" -#: src/include/sssd-parameters.rb:750 +#: src/lib/yauthclient/params.rb:847 msgid " The object class of a netgroup entry in LDAP." msgstr " LDAP 中网络组项的对象类。" -#: src/include/sssd-parameters.rb:756 +#: src/lib/yauthclient/params.rb:853 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "对应着网络组名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:761 +#: src/lib/yauthclient/params.rb:858 msgid "The LDAP attribute that contains the names of the netgroup's members." msgstr "存放网络组成员名称的 LDAP 属性。" -#: src/include/sssd-parameters.rb:766 +#: src/lib/yauthclient/params.rb:863 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples." msgstr "存放 (主机，用户，域) 网络组铁三角的 LDAP 属性。" -#: src/include/sssd-parameters.rb:771 +#: src/lib/yauthclient/params.rb:868 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object." msgstr "存放某个 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。" -#: src/include/sssd-parameters.rb:781 +#: src/lib/yauthclient/params.rb:878 msgid "The object class of a service entry in LDAP." msgstr "LDAP 中服务项的对象类。" -#: src/include/sssd-parameters.rb:786 +#: src/lib/yauthclient/params.rb:883 msgid "The LDAP attribute that contains the name of service attributes and their aliases." msgstr "存放服务属性名称和其别名的 LDAP 属性。" -#: src/include/sssd-parameters.rb:791 +#: src/lib/yauthclient/params.rb:888 msgid "The LDAP attribute that contains the port managed by this service." msgstr "存放此服务管理的端口的 LDAP 属性。" -#: src/include/sssd-parameters.rb:796 +#: src/lib/yauthclient/params.rb:893 msgid "The LDAP attribute that contains the protocols understood by this service." msgstr "存放此服务可解析协议的 LDAP 属性。" -#: src/include/sssd-parameters.rb:802 +#: src/lib/yauthclient/params.rb:899 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type." msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器，可限制 LDAP 搜索只搜索此属性类型。" -#: src/include/sssd-parameters.rb:807 +#: src/lib/yauthclient/params.rb:904 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/include/sssd-parameters.rb:812 +#: src/lib/yauthclient/params.rb:909 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/include/sssd-parameters.rb:817 +#: src/lib/yauthclient/params.rb:914 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity." msgstr "指定了无活动时 poll(2)/select(2) 跟随 connect(2) 返回的以秒计超时。" -#: src/include/sssd-parameters.rb:822 +#: src/lib/yauthclient/params.rb:919 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received." msgstr "指定了无回应时同步 LDAP API 调用中止的以秒计超时。" -#: src/include/sssd-parameters.rb:827 +#: src/lib/yauthclient/params.rb:924 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained." msgstr "指定了维持到 LDAP 服务器连接的以秒计超时。" -#: src/include/sssd-parameters.rb:832 +#: src/lib/yauthclient/params.rb:929 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/include/sssd-parameters.rb:837 +#: src/lib/yauthclient/params.rb:934 msgid "Disable the LDAP paging control." msgstr "禁用 LDAP 分页控制。" -#: src/include/sssd-parameters.rb:842 +#: src/lib/yauthclient/params.rb:938 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection." msgstr "当使用 SASL 与 LDAP 服务器通信时，请指定建立连接必需的最小安全级别。" -#: src/include/sssd-parameters.rb:847 +#: src/lib/yauthclient/params.rb:943 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup." msgstr "指定了为触发解引用查询内部缓存必须缺失的组成员数。" -#: src/include/sssd-parameters.rb:853 -msgid "Specifies what checks to perform on server certificates in a TLS session, if any." -msgstr "指定了若需要检查则在 TLS 会话中对服务器证书要进行的检查。" +#: src/lib/yauthclient/params.rb:950 +msgid "Validate server certification in LDAP TLS session" +msgstr "" -#: src/include/sssd-parameters.rb:858 +#: src/lib/yauthclient/params.rb:954 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize." msgstr "指定了包含全部 sssd 应认得的证书授权机构证书的文件。" -#: src/include/sssd-parameters.rb:863 +#: src/lib/yauthclient/params.rb:958 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files." msgstr "指定了包含以几个单独文件形式存在的证书授权机构证书的文件夹路径。" -#: src/include/sssd-parameters.rb:867 +#: src/lib/yauthclient/params.rb:962 msgid "Specifies the file that contains the certificate for the client's key." msgstr "指定了包含客户端密钥证书的文件。" -#: src/include/sssd-parameters.rb:871 +#: src/lib/yauthclient/params.rb:966 msgid "Specifies the file that contains the client's key." msgstr "指定了包含客户端密钥的文件。" -#: src/include/sssd-parameters.rb:876 +#: src/lib/yauthclient/params.rb:971 msgid "Specifies acceptable cipher suites." msgstr "指定了可接受的密码套件。" -#: src/include/sssd-parameters.rb:881 +#: src/lib/yauthclient/params.rb:976 msgid "Specifies that the id_provider connection must also use tls to protect the channel." msgstr "指定了 id_provider 连接必须也使用 TLS 来保护通道。" -#: src/include/sssd-parameters.rb:886 +#: src/lib/yauthclient/params.rb:981 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/include/sssd-parameters.rb:890 +#: src/lib/yauthclient/params.rb:985 msgid "Specify the SASL mechanism to use." msgstr "指定了要使用的 SASL 机制。" -#: src/include/sssd-parameters.rb:895 +#: src/lib/yauthclient/params.rb:990 msgid "Specify the SASL authorization id to use." msgstr "指定了要使用的 SASL 认证 ID。" -#: src/include/sssd-parameters.rb:900 +#: src/lib/yauthclient/params.rb:995 msgid "Specify the SASL realm to use." msgstr "指定了要使用的 SASL 领域。" -#: src/include/sssd-parameters.rb:905 +#: src/lib/yauthclient/params.rb:1000 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind." msgstr "若设为真，LDAP 函数库在 SASL 绑定时应执行一次反向查询以规范化主机名。" -#: src/include/sssd-parameters.rb:910 +#: src/lib/yauthclient/params.rb:1005 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "指定了使用 SASL/GSSAPI 时使用的密钥表。" -#: src/include/sssd-parameters.rb:915 +#: src/lib/yauthclient/params.rb:1010 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "指定了 id_provider 应初始化 Kerberos 机要资料 (票据授权票据)。" -#: src/include/sssd-parameters.rb:920 +#: src/lib/yauthclient/params.rb:1015 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used." msgstr "指定了使用 GSSAPI 时票据授权票据以秒计的生命周期。" -#: src/include/sssd-parameters.rb:925 +#: src/lib/yauthclient/params.rb:1020 msgid "Select the policy to evaluate the password expiration on the client side." msgstr "选择客户端方面用于评估密码有效期的策略。" -#: src/include/sssd-parameters.rb:930 +#: src/lib/yauthclient/params.rb:1025 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "指定了是否应启用自动引用跟踪。" -#: src/include/sssd-parameters.rb:935 +#: src/lib/yauthclient/params.rb:1030 msgid "Specifies the service name to use when service discovery is enabled." msgstr "制定了当启用了服务发现时使用的服务名称。" -#: src/include/sssd-parameters.rb:939 +#: src/lib/yauthclient/params.rb:1034 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled." msgstr "指定了当启用了服务发现时用于查找允许密码变更的 LDAP 服务器的服务名称。" -#: src/include/sssd-parameters.rb:944 +#: src/lib/yauthclient/params.rb:1039 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/include/sssd-parameters.rb:949 +#: src/lib/yauthclient/params.rb:1044 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/include/sssd-parameters.rb:954 +#: src/lib/yauthclient/params.rb:1049 msgid " With this option a client side evaluation of access control attributes can be enabled." msgstr "使用此选项可启用客户端访问控制属性评估。" -#: src/include/sssd-parameters.rb:960 +#: src/lib/yauthclient/params.rb:1055 msgid "Comma separated list of access control options." msgstr "逗号分隔的访问控制选项列表。" -#: src/include/sssd-parameters.rb:965 +#: src/lib/yauthclient/params.rb:1060 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "指定了执行搜索时如何解引用别名。" -#: src/include/sssd-parameters.rb:970 +#: src/lib/yauthclient/params.rb:1065 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema." msgstr "针对使用 RFC2307 方案的服务器允许保留本地用户作为某个 LDAP 组的成员。" -#: src/include/sssd-parameters.rb:993 src/include/sssd-parameters.rb:997 +#: src/lib/yauthclient/params.rb:1078 +#, fuzzy +#| msgid "The IP address (or host name) of the host with a fixed address" +msgid "IP address or host names of Kerberos servers (comma separated)" +msgstr "具有固定地址的主机的 IP 地址（或主机名）" + +#: src/lib/yauthclient/params.rb:1082 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/include/sssd-parameters.rb:1002 -msgid "The name of the Kerberos realm." -msgstr "Kerberos 领域的名称。" +#: src/lib/yauthclient/params.rb:1087 +msgid "Kerberos realm (e.g. EXAMPLE.COM)" +msgstr "" -#: src/include/sssd-parameters.rb:1007 src/include/sssd-parameters.rb:1012 +#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096 msgid "If the change password service is not running on the KDC, alternative servers can be defined here." msgstr "若 KDC 上未运行密码变更服务，则可在此定义替代服务器。" -#: src/include/sssd-parameters.rb:1017 +#: src/lib/yauthclient/params.rb:1101 msgid "Directory to store credential caches." msgstr "存储机要缓存的文件夹。" -#: src/include/sssd-parameters.rb:1022 +#: src/lib/yauthclient/params.rb:1106 msgid "Location of the user's credential cache." msgstr "用户机要缓存的位置。" -#: src/include/sssd-parameters.rb:1027 +#: src/lib/yauthclient/params.rb:1111 msgid " Timeout in seconds after an online authentication request or change password request is aborted." msgstr "在线认证请求或密码变更请求以秒计的超时。" -#: src/include/sssd-parameters.rb:1032 +#: src/lib/yauthclient/params.rb:1116 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed." msgstr "在 krb5_keytab 的帮助下校验获取的票据授权票据未被冒名顶替。" -#: src/include/sssd-parameters.rb:1037 +#: src/lib/yauthclient/params.rb:1121 msgid "The location of the keytab to use when validating credentials obtained from KDCs." msgstr "当认证从 KDC 获取的机要资料时所用的密钥表的位置。" -#: src/include/sssd-parameters.rb:1042 +#: src/lib/yauthclient/params.rb:1126 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again." msgstr "若提供者离线则存储用户密码并在提供者再次上线时用其请求票据授权票据。" -#: src/include/sssd-parameters.rb:1046 +#: src/lib/yauthclient/params.rb:1130 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit." msgstr "请求可续期票据和其完整生命期，以整数后接时间单位的形式给出。" -#: src/include/sssd-parameters.rb:1050 +#: src/lib/yauthclient/params.rb:1134 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit." msgstr "请求票据和其生命期，以整数后接时间单位的形式给出。" -#: src/include/sssd-parameters.rb:1054 +#: src/lib/yauthclient/params.rb:1138 msgid "The time in seconds between two checks if the TGT should be renewed." msgstr "当票据授权票据应续期时两次检查间的秒数。" -#: src/include/sssd-parameters.rb:1059 +#: src/lib/yauthclient/params.rb:1143 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "为 Kerberos 预认证启用灵活认证安全隧道 (FAST)。" -#: src/include/sssd-parameters.rb:1063 +#: src/lib/yauthclient/params.rb:1147 msgid "Specifies the server principal to use for FAST." msgstr "指定了用于灵活认证安全隧道的服务器实体。" -#: src/include/sssd-parameters.rb:1068 +#: src/lib/yauthclient/params.rb:1152 msgid "Specifies if the host and user principal should be canonicalized." msgstr "指定了是否应规范化主机和用户实体。" #. The Active Directory domain section -#: src/include/sssd-parameters.rb:1081 +#: src/lib/yauthclient/params.rb:1164 msgid "Specifies the name of the Active Directory domain." msgstr "指定了活动目录域的名称。" -#: src/include/sssd-parameters.rb:1085 src/include/sssd-parameters.rb:1089 +#: src/lib/yauthclient/params.rb:1169 +#, fuzzy +#| msgid "The IP address (or host name) of the host with a fixed address" +msgid "IP addresses or host names of AD servers (comma separated)" +msgstr "具有固定地址的主机的 IP 地址（或主机名）" + +#: src/lib/yauthclient/params.rb:1173 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference." msgstr "以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名列表。" -#: src/include/sssd-parameters.rb:1093 +#: src/lib/yauthclient/params.rb:1177 msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host." msgstr "可选。可以在 hostname(5) 未反映在活动目录域中用于识别此主机的完全限定名称的机器上设置。" -#: src/include/sssd-parameters.rb:1097 +#: src/lib/yauthclient/params.rb:1181 msgid "Override the user's home directory." msgstr "覆盖用户主文件夹。" -#: src/include/sssd-parameters.rb:1110 +#: src/lib/yauthclient/params.rb:1194 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的下界。" -#: src/include/sssd-parameters.rb:1115 +#: src/lib/yauthclient/params.rb:1199 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs." msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的上界。" -#: src/include/sssd-parameters.rb:1120 +#: src/lib/yauthclient/params.rb:1204 msgid "Specifies the number of IDs available for each slice." msgstr "指定了每一切片可用的 ID 数。" -#: src/include/sssd-parameters.rb:1124 +#: src/lib/yauthclient/params.rb:1208 msgid "Specify the domain SID of the default domain." msgstr "指定默认域的域 SID。" -#: src/include/sssd-parameters.rb:1128 +#: src/lib/yauthclient/params.rb:1212 msgid "Specify the name of the default domain." msgstr "指定默认域的名称。" -#: src/include/sssd-parameters.rb:1133 +#: src/lib/yauthclient/params.rb:1217 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/include/sssd-parameters.rb:1145 +#: src/lib/yauthclient/params.rb:1229 msgid "Specifies the name of the IPA domain." msgstr "指定 IPA 域的名称。" -#: src/include/sssd-parameters.rb:1149 -msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." -msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列表。" +#: src/lib/yauthclient/params.rb:1234 +msgid "IP addresses or host names of IPA servers (comma separated)" +msgstr "" -#: src/include/sssd-parameters.rb:1153 +#: src/lib/yauthclient/params.rb:1238 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." msgstr "可以在 hostname(5) 未反映完全限定名称的机器上设置。" -#: src/include/sssd-parameters.rb:1158 +#: src/lib/yauthclient/params.rb:1243 +#, fuzzy +#| msgid "The configuration of the NIS client will be saved.\n" +msgid "The automounter location this IPA client will be using." +msgstr "NIS 客户端的配置将被保存.\n" + +#: src/lib/yauthclient/params.rb:1248 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/include/sssd-parameters.rb:1163 +#: src/lib/yauthclient/params.rb:1253 msgid "The TTL to apply to the client DNS record when updating it." msgstr "更新客户端 DNS 记录时应用的 TTL。" -#: src/include/sssd-parameters.rb:1167 +#: src/lib/yauthclient/params.rb:1257 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." msgstr "选择其 IP 地址应用于动态 DNS 更新的接口。" +#. autofs may only start after sssd is started +#: src/modules/AuthClient.rb:230 +msgid "Failed to enable %s service. Please use system journal to diagnose." +msgstr "" + +#: src/modules/AuthClient.rb:232 +msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose." +msgstr "" + #. end Export #. ################################################################ #. ################################################################ #. Summary() #. returns html formated configuration summary #. @return summary -#: src/modules/AuthClient.rb:336 +#: src/modules/AuthClient.rb:345 msgid "System is configured for using nss_ldap.\n" msgstr "系统配置为使用 nss_ldap。\n" -#: src/modules/AuthClient.rb:339 +#: src/modules/AuthClient.rb:348 msgid "System is configured for using sssd.\n" msgstr "系统配置为使用 sssd。\n" -#: src/modules/AuthClient.rb:345 +#: src/modules/AuthClient.rb:354 msgid "System is configured for using OES.\n" msgstr "系统配置为使用 OES。\n" -#: src/modules/AuthClient.rb:348 +#: src/modules/AuthClient.rb:357 msgid "System is configured for using /etc/passwd only.\n" msgstr "系统配置为仅使用 /etc/passwd。\n" +#~ msgid "Do you really want to delete the domain '%1'?" +#~ msgstr "您真的想要删除域 '%1' 吗？" + +#~ msgid "There is no help for this parameter." +#~ msgstr "此参数没有帮助。" + +#~ msgid "Default value: " +#~ msgstr "默认值：" + +#~ msgid "Available values: " +#~ msgstr "可用值：" + +#~ msgid "Set Parameter Value in Section '%1'" +#~ msgstr "请在 '%1' 部分设置参数值" + +#~ msgid "Cancel" +#~ msgstr "取消" + +#~ msgid "OK" +#~ msgstr "好" + +#~ msgid "Value for parameter '%1' is invalid." +#~ msgstr "参数 '%1' 的值无效。" + +#~ msgid "Section '%1' has no attributes." +#~ msgstr "部分 '%1' 无属性。" + +#~ msgid "Select new Parameter for section '%1'" +#~ msgstr "请为 '%1' 部分选择新参数" + +#~ msgid "New Parameter" +#~ msgstr "新增参数" + +#~ msgid "Help" +#~ msgstr "帮助" + +#~ msgid "Edit sssd section '%1'" +#~ msgstr "编辑 sssd 的 '%1' 部分" + +#~ msgid "New" +#~ msgstr "新建" + +#~ msgid "Add New Domain" +#~ msgstr "添加新域" + +#~ msgid "Name:" +#~ msgstr "名称：" + +#~ msgid "The identification provider used for the domain" +#~ msgstr "该域所用的标识提供者" + +#~ msgid "Help for creating new domain" +#~ msgstr "创建新域的帮助" + +#~ msgid "You have to provide a domain name!" +#~ msgstr "您必须提供一个域名！" + +#~ msgid "Basic Settings:" +#~ msgstr "基本设置：" + +#~ msgid "Services:" +#~ msgstr "服务：" + +#~ msgid "" +#~ "There are some domains you have not activated:\n" +#~ "%s \n" +#~ "Do you want to write this configuration?" +#~ msgstr "" +#~ "有一些您尚未激活的域：\n" +#~ "%s\n" +#~ "您想要写入此配置吗？" + +#~ msgid "Configured Authentication Domains" +#~ msgstr "配置认证域" + +#~ msgid "Add" +#~ msgstr "添加" + +#~ msgid "Edit" +#~ msgstr "编辑" + +#~ msgid "Delete" +#~ msgstr "删除" + +#~ msgid "Authentication Client Configuration (sssd)" +#~ msgstr "认证客户端配置 (sssd)" + +#~ msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Ident ity Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>" +#~ msgstr "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于所选身份和认证提供方的参数。SSSD 提供了以下 id_provider：<br><b>proxy</b>: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有：<br><b>ldap</b> 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活动目录提供方。<br><b>proxy</b> 用于对某� �其它 PAM 对象的延迟认证。<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>" + +#~ msgid "Determines if a domain can be enumerated." +#~ msgstr "确定某域是否可枚举。" + +#~ msgid "Determines if user credentials are also cached in the local LDB cache." +#~ msgstr "确定是否也在本地 LDB 缓存中缓存用户机要。" + +#~ msgid "The authentication provider used for the domain." +#~ msgstr "该域所用的认证提供者。" + +#~ msgid "Use the domain part of machine's hostname." +#~ msgstr "使用机器主机名的域部分。" + +#~ msgid "Comma separated list of users who are explicitly denied access." +#~ msgstr "逗号分隔的显式拒绝访问用户列表。" + +#~ msgid "The default base DN to use for performing LDAP user operations." +#~ msgstr "指定 LDAP 用户操作所用的默认基本判别名。" + +#~ msgid "Specifies the Schema Type in use on the target LDAP server." +#~ msgstr "指定了目标 LDAP 服务器上使用的方案类型。" + +#~ msgid "Specifies what checks to perform on server certificates in a TLS session, if any." +#~ msgstr "指定了若需要检查则在 TLS 会话中对服务器证书要进行的检查。" + +#~ msgid "The name of the Kerberos realm." +#~ msgstr "Kerberos 领域的名称。" + +#~ msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." +#~ msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列表。" + #~ msgid "SPAM Prevention" #~ msgstr "SPAM 防护" Modified: trunk/yast/zh_CN/po/auth-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/auth-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/auth-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:17+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/autoinst.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/autoinst.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:21+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -36,8 +36,8 @@ msgstr "正在读取配置数据..." #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123 -#: src/include/autoinstall/conftree.rb:613 -#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:339 +#: src/include/autoinstall/conftree.rb:622 +#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360 msgid "This may take a while" msgstr "这可能要花费一点时间" @@ -57,13 +57,14 @@ #. command line options #. Init variables -#. AutoInstall::PXELocalBoot(); +#. We will have to set default entries which are defined +#. in the import call of ServicesManager #. Backup #. Now check if there any classes defined in theis pre final control file #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148 -#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:403 -#: src/clients/inst_autosetup_upgrade.rb:482 -#: src/modules/AutoInstallRules.rb:1006 +#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389 +#: src/clients/inst_autosetup_upgrade.rb:484 +#: src/modules/AutoInstallRules.rb:1001 msgid "" "Error while parsing the control file.\n" "Check the log files for more details or fix the\n" @@ -72,7 +73,7 @@ "解析控制文件时出错。\n" "请检查日志文件了解更多细节，或修复该控制文件并重试。\n" -#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:612 +#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:621 #: src/include/autoinstall/dialogs.rb:332 msgid "Reading configuration data" msgstr "正在读取配置数据" @@ -114,7 +115,7 @@ msgid "enable/disable all package handling" msgstr "启用/禁用全部软件包处理" -#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:81 +#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:101 msgid "Empty parameter list" msgstr "空参数列表" @@ -125,29 +126,29 @@ msgstr "必须设置 AutoYaST 方案路径。" #. if we get no argument or map of options we are not in command line -#: src/clients/clone_system.rb:46 +#: src/clients/clone_system.rb:66 msgid "Client for creating an AutoYaST profile based on the currently running system" msgstr "基于当前运行中系统创建 AutoYaST 方案的客户端" -#: src/clients/clone_system.rb:56 +#: src/clients/clone_system.rb:76 msgid "known modules: %1" msgstr "已知模块：%1" -#: src/clients/clone_system.rb:63 +#: src/clients/clone_system.rb:83 msgid "comma separated list of modules to clone" msgstr "逗号分隔的待克隆模块列表" #. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten. -#: src/clients/clone_system.rb:94 +#: src/clients/clone_system.rb:114 msgid "File %s exists! Really overwrite?" msgstr "文件 %s 已存在！真的要覆盖吗？" -#: src/clients/clone_system.rb:98 +#: src/clients/clone_system.rb:118 msgid "Cloning the system..." msgstr "正在克隆系统..." #. TRANSLATORS: %s is path where profile can be found -#: src/clients/clone_system.rb:100 +#: src/clients/clone_system.rb:120 msgid "The resulting autoyast profile can be found in %s." msgstr "生成的 autoyast 方案可在 %s 找到。" @@ -210,7 +211,7 @@ msgstr "请至少提供文件名和文件内容。\n" #. OPEN -#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:596 +#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:605 #: src/include/autoinstall/script_dialogs.rb:397 msgid "Select a file to load." msgstr "请选择要加载的文件。" @@ -253,7 +254,7 @@ msgstr "请先从表中选择一个文件。" #. Help text for last dialog of base installation -#: src/clients/inst_autoconfigure.rb:32 +#: src/clients/inst_autoconfigure.rb:35 msgid "" "<p>\n" "Please wait while the system is being configured.\n" @@ -264,47 +265,73 @@ "</p>" #. Progress bar that displays overall progress in this dialog -#: src/clients/inst_autoconfigure.rb:53 +#: src/clients/inst_autoconfigure.rb:60 msgid "Progress" msgstr "进度" #. Dialog title for autoyast dialog -#: src/clients/inst_autoconfigure.rb:62 +#: src/clients/inst_autoconfigure.rb:69 msgid "Configuring System according to auto-install settings" msgstr "正在根据自动安装设置配置系统" +#. TRANSLATORS: Error message, %s is replaced by newline-separated +#. list of unsupported sections of the profile +#. Do not translate words in brackets +#: src/clients/inst_autoconfigure.rb:88 +msgid "" +"These sections of AutoYaST profile are not supported anymore:\n" +"\n" +"%s\n" +"\n" +"Please, use, e.g., <scripts/> or <files/> to change the configuration." +msgstr "" + +#. TRANSLATORS: Error message, %s is replaced by newline-separated +#. list of unknown sections of the profile +#. Do not translate words in brackets +#: src/clients/inst_autoconfigure.rb:103 +msgid "" +"These sections of AutoYaST profile cannot be processed on this system:\n" +"\n" +"%s\n" +"\n" +"Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section." +msgstr "" + #. determine name of client, if not use default name #. Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[]) ]); -#: src/clients/inst_autoconfigure.rb:157 src/clients/inst_autoconfigure.rb:186 -#: src/clients/inst_autoconfigure.rb:199 +#: src/clients/inst_autoconfigure.rb:192 src/clients/inst_autoconfigure.rb:221 +#: src/clients/inst_autoconfigure.rb:234 msgid "Configuring %1" msgstr "配置 %1" -#: src/clients/inst_autoconfigure.rb:159 src/clients/inst_autoconfigure.rb:188 -#: src/clients/inst_autoconfigure.rb:201 +#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223 +#: src/clients/inst_autoconfigure.rb:236 msgid "Not Configuring %1" msgstr "未配置 %1" #. online update -#: src/clients/inst_autoconfigure.rb:253 +#: src/clients/inst_autoconfigure.rb:288 msgid "Executing Post-Scripts" msgstr "正在执行安装后脚本" -#: src/clients/inst_autoconfigure.rb:268 +#. Do not restart dbus. Otherwise some services will hang. +#. bnc#937900 +#: src/clients/inst_autoconfigure.rb:304 msgid "Restarting all running services" msgstr "正在重启全部运行中的服务" -#: src/clients/inst_autoconfigure.rb:288 +#: src/clients/inst_autoconfigure.rb:327 msgid "Activating systemd default target" msgstr "正在激活 systemd 默认对象" #. Just in case, remove this file to avoid reconfiguring... -#: src/clients/inst_autoconfigure.rb:301 +#: src/clients/inst_autoconfigure.rb:342 msgid "Finishing Configuration" msgstr "正在完成配置" #. NetworkInterfaces::Write( ".*" ); -#: src/clients/inst_autoconfigure.rb:404 +#: src/clients/inst_autoconfigure.rb:448 msgid "Processing resource %1" msgstr "正在处理资源 %1" @@ -477,92 +504,92 @@ #. Uwe Gansert #. #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ -#: src/clients/inst_autosetup.rb:49 src/clients/inst_autosetup_upgrade.rb:47 +#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>" msgstr "<P>系统正在准备自动安装，请稍候。</P>" -#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:52 +#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52 msgid "Execute pre-install user scripts" msgstr "执行安装前用户脚本" -#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:51 +#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51 msgid "Configure General Settings " msgstr "配置常规设置" -#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:53 +#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53 msgid "Set up language" msgstr "设置语言" -#: src/clients/inst_autosetup.rb:56 +#: src/clients/inst_autosetup.rb:57 msgid "Create partition plans" msgstr "创建分区计划" -#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:56 +#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56 msgid "Configure Bootloader" msgstr "配置引导加载器" -#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:54 +#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54 msgid "Registration" msgstr "注册" -#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:55 +#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55 msgid "Configure Software selections" msgstr "配置软件选集" -#: src/clients/inst_autosetup.rb:60 +#: src/clients/inst_autosetup.rb:61 msgid "Configure Systemd Default Target" msgstr "配置 Systemd 默认对象" -#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:61 +#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "正在执行安装前用户脚本..." -#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:60 +#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60 msgid "Configuring general settings..." msgstr "正在配置常规设置..." -#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:62 +#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62 msgid "Setting up language..." msgstr "正在设置语言..." -#: src/clients/inst_autosetup.rb:67 +#: src/clients/inst_autosetup.rb:68 msgid "Creating partition plans..." msgstr "正在创建分区计划..." -#: src/clients/inst_autosetup.rb:68 src/clients/inst_autosetup_upgrade.rb:65 +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65 msgid "Configuring Bootloader..." msgstr "正在配置引导加载器..." -#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63 +#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63 msgid "Registering the system..." msgstr "正在注册系统..." -#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64 +#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." msgstr "正在配置软件选集..." -#: src/clients/inst_autosetup.rb:71 +#: src/clients/inst_autosetup.rb:72 msgid "Configuring Systemd Default Target..." msgstr "正在配置 Systemd 默认对象..." -#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:69 +#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69 msgid "Preparing System for Automated Installation" msgstr "准备系统以进行自动安装" #. configure general settings -#: src/clients/inst_autosetup.rb:163 +#: src/clients/inst_autosetup.rb:164 msgid "Handling Add-On Products..." msgstr "正在处理附加产品..." #. Set it in the Language module. #. #. Set it in the Language module. -#: src/clients/inst_autosetup.rb:183 src/clients/inst_autosetup_upgrade.rb:149 +#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149 msgid "Configuring language..." msgstr "正在配置语言..." #. Yes, do not set Storage testsuite here as we want really GUI with proposal -#: src/clients/inst_autosetup.rb:272 +#: src/clients/inst_autosetup.rb:273 msgid "" "Error while configuring partitions.\n" "Try again.\n" @@ -571,7 +598,7 @@ "请重试。\n" #. Software -#: src/clients/inst_autosetup.rb:328 +#: src/clients/inst_autosetup.rb:331 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -875,11 +902,11 @@ msgstr "高级(&C)" #. user selected this partition to be part of volgroup -#: src/include/autoinstall/PartitionDialog.rb:589 +#: src/include/autoinstall/PartitionDialog.rb:592 msgid "Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected." msgstr "大小 \"auto\" 仅在选中挂载点 \"/boot\" 或者 \"swap\" 时有效。" -#: src/include/autoinstall/PartitionDialog.rb:597 +#: src/include/autoinstall/PartitionDialog.rb:600 msgid "Size \"auto\" is invalid for physical volumes." msgstr "大小 \"auto\" 对于物理卷无效。" @@ -951,7 +978,7 @@ msgid "System Profile Location" msgstr "系统方案位置" -#: src/include/autoinstall/autoinst_dialogs.rb:44 +#: src/include/autoinstall/autoinst_dialogs.rb:45 msgid "&Profile Location:" msgstr "方案位置(&P)：" @@ -959,11 +986,11 @@ #. Below this label, all targets are listed that can be used as #. installation target #. heading text -#: src/include/autoinstall/autoinst_dialogs.rb:115 +#: src/include/autoinstall/autoinst_dialogs.rb:117 msgid "Choose a hard disk" msgstr "请选择一张硬盘" -#: src/include/autoinstall/autoinst_dialogs.rb:122 +#: src/include/autoinstall/autoinst_dialogs.rb:124 msgid "No disks found." msgstr "未找到磁盘。" @@ -972,7 +999,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:130 +#: src/include/autoinstall/autoinst_dialogs.rb:132 msgid "" "<p>\n" "All hard disks automatically detected on your system\n" @@ -984,13 +1011,13 @@ "</p>" #. force help text width -#: src/include/autoinstall/autoinst_dialogs.rb:152 +#: src/include/autoinstall/autoinst_dialogs.rb:154 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:175 +#: src/include/autoinstall/autoinst_dialogs.rb:177 msgid "Select one of the options to continue." msgstr "请选择其中一个选项以继续。" @@ -1175,19 +1202,19 @@ #. SAVE #: src/include/autoinstall/conftree.rb:35 -#: src/include/autoinstall/conftree.rb:688 +#: src/include/autoinstall/conftree.rb:697 msgid "Save as..." msgstr "另存为..." #: src/include/autoinstall/conftree.rb:42 -#: src/include/autoinstall/conftree.rb:700 +#: src/include/autoinstall/conftree.rb:709 msgid "File %1 was saved successfully." msgstr "已成功保存文件 %1。" #. Profile::checkProfile(); #. Profile::checkProfile(); #: src/include/autoinstall/conftree.rb:55 -#: src/include/autoinstall/conftree.rb:707 +#: src/include/autoinstall/conftree.rb:716 msgid "An error occurred while saving the file." msgstr "保存文件时出错。" @@ -1326,34 +1353,33 @@ msgid "Source" msgstr "来源" -#. Menu interface -#. @param list menu items -#. @return [Symbol] -#: src/include/autoinstall/conftree.rb:565 +#. Some configuration modules removes/exchange the menu bar. +#. So we have to reset. (bnc#872711) +#: src/include/autoinstall/conftree.rb:569 msgid "Do you really want to apply the settings of the module '%1' to your current system?" msgstr "您真的想要应用模块 '%1' 的设置到您当前系统吗？" #. opening/parsing the xml file failed -#: src/include/autoinstall/conftree.rb:635 +#: src/include/autoinstall/conftree.rb:644 msgid "An error occurred while opening/parsing the XML file." msgstr "打开/解析 XML 文件时出错。" #. NEW -#: src/include/autoinstall/conftree.rb:725 +#: src/include/autoinstall/conftree.rb:734 msgid "Available Modules" msgstr "可用模块" #. FIXME: sucks sucks sucks sucks sucks -#: src/include/autoinstall/conftree.rb:740 +#: src/include/autoinstall/conftree.rb:749 msgid "Do you really want to apply the settings of the profile to your current system?" msgstr "您真的想要应用方案中的设置到您当前系统吗？" #. EXIT -#: src/include/autoinstall/conftree.rb:781 +#: src/include/autoinstall/conftree.rb:790 msgid "Control file changed." msgstr "控制文件已修改。" -#: src/include/autoinstall/conftree.rb:782 +#: src/include/autoinstall/conftree.rb:791 msgid "Save the changes to %1?" msgstr "保存修改到 %1 吗？" @@ -1521,7 +1547,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:794 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815 msgid "Checking XML with RNG validation..." msgstr "正在进行 RNG 校验以检查 XML..." @@ -1531,7 +1557,7 @@ msgstr "部分 %1：" #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:806 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827 msgid "Checking XML with RNC validation..." msgstr "正在进行 RNC 校验以检查 XML..." @@ -1570,7 +1596,7 @@ msgstr "第二阶段后重启计算机" #: src/include/autoinstall/general_dialogs.rb:90 -#: src/modules/AutoinstGeneral.rb:121 +#: src/modules/AutoinstGeneral.rb:126 msgid "Signature Handling" msgstr "签名处理" @@ -1898,40 +1924,40 @@ "</p>\n" #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:122 +#: src/include/autoinstall/io.rb:123 msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." msgstr "无法通过 HTTP(S) 协议找到 URL '%1'。服务器返回了代码 %2。" #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:142 +#: src/include/autoinstall/io.rb:143 msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2." msgstr "无法通过 FTP 协议找到 URL '%1'。服务器返回了代码 %2。" #. FIXME: I have doubts this will ever work. Too early. -#: src/include/autoinstall/io.rb:158 +#: src/include/autoinstall/io.rb:159 msgid "Reading file on %1/%2 failed.\n" msgstr "读取 %1/%2 上的文件失败。\n" -#: src/include/autoinstall/io.rb:174 +#: src/include/autoinstall/io.rb:175 msgid "Reading file on %1 failed.\n" msgstr "读取 %1 上的文件失败。\n" #. autoyast tried to mount the CD but had no success. #. autoyast tried to mount a NFS directory which failed #. autoyast tried to mount a NFS directory which failed -#: src/include/autoinstall/io.rb:234 src/include/autoinstall/io.rb:290 -#: src/include/autoinstall/io.rb:334 +#: src/include/autoinstall/io.rb:237 src/include/autoinstall/io.rb:293 +#: src/include/autoinstall/io.rb:337 msgid "Mounting %1 failed." msgstr "挂载 %1 失败。" #. autoyast tried to read a file but had no success. -#: src/include/autoinstall/io.rb:265 +#: src/include/autoinstall/io.rb:268 msgid "Reading a file on CD failed. Path: %1/%2." msgstr "读取 CD 上的文件失败。路径：%1/%2." #. autoyast tried to copy a file via NFS which failed #. autoyast tried to copy a file via NFS which failed -#: src/include/autoinstall/io.rb:313 src/include/autoinstall/io.rb:357 +#: src/include/autoinstall/io.rb:316 src/include/autoinstall/io.rb:360 msgid "Remote file %1 cannot be retrieved" msgstr "无法撷取远程文件 %1" @@ -1939,22 +1965,22 @@ #. because of changes in autoyast startup this code is now #. called much sooner (before Storage stuff is initialized) #. call dummy method to trigger Storage initialization -#: src/include/autoinstall/io.rb:482 +#: src/include/autoinstall/io.rb:485 msgid "%1 is not mounted and mount failed" msgstr "%1 未挂载，尝试挂载但失败了" #. autoyast tried to copy a file but that file can't be found -#: src/include/autoinstall/io.rb:502 +#: src/include/autoinstall/io.rb:505 msgid "File %1 cannot be found" msgstr "未找到文件 %1" #. Device -#: src/include/autoinstall/io.rb:524 +#: src/include/autoinstall/io.rb:527 msgid "Cannot find URL '%1' via protocol TFTP." msgstr "无法通过 TFTP 协议找到 URL '%1'。" #. the user wanted autoyast to fetch it's profile via an unknown protocol -#: src/include/autoinstall/io.rb:531 +#: src/include/autoinstall/io.rb:534 msgid "Unknown protocol %1." msgstr "未知协议 %1。" @@ -2204,7 +2230,7 @@ #. Read rules file #. @return [void] -#: src/modules/AutoInstallRules.rb:453 +#: src/modules/AutoInstallRules.rb:448 msgid "Parsing the rules file failed. XML parser reports:\n" msgstr "解析规则文件失败。XML 解析器报告：\n" @@ -2212,12 +2238,12 @@ #. @param [String] result_profile the resulting control file path #. @return [Boolean] true on success #. autoyast has read the autoyast configuration file but something went wrong -#: src/modules/AutoInstallRules.rb:914 src/modules/Profile.rb:725 +#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为：\n" #. backdoor for merging problems. -#: src/modules/AutoInstallRules.rb:1059 +#: src/modules/AutoInstallRules.rb:1054 msgid "" "\n" "User-defined classes could not be retrieved. Make sure all classes \n" @@ -2231,45 +2257,45 @@ #. The line above needs to be fixed when we have more attributes #. comment will look like this: "(description=BLA BLA)" -#: src/modules/AutoinstConfig.rb:273 +#: src/modules/AutoinstConfig.rb:278 msgid "Choose Profile" msgstr "选择方案" #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:329 +#: src/modules/AutoinstConfig.rb:334 msgid "Retrieving control file from floppy." msgstr "正在软盘中撷取控制文件。" -#: src/modules/AutoinstConfig.rb:332 +#: src/modules/AutoinstConfig.rb:337 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "正在从 TFTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:338 +#: src/modules/AutoinstConfig.rb:343 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "正在从 NFS 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:344 +#: src/modules/AutoinstConfig.rb:349 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "正在从 HTTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:350 +#: src/modules/AutoinstConfig.rb:355 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "正在从 FTP 服务器中撷取控制文件(%1)：%2。" -#: src/modules/AutoinstConfig.rb:356 +#: src/modules/AutoinstConfig.rb:361 msgid "Copying control file from file: %1." msgstr "正在从文件中复制控制文件：%1。" -#: src/modules/AutoinstConfig.rb:361 +#: src/modules/AutoinstConfig.rb:366 msgid "Copying control file from device: /dev/%1." msgstr "正在从设备中复制控制文件：/dev/%1。" -#: src/modules/AutoinstConfig.rb:365 +#: src/modules/AutoinstConfig.rb:370 msgid "Copying control file from default location." msgstr "正在从默认位置复制控制文件。" -#: src/modules/AutoinstConfig.rb:367 +#: src/modules/AutoinstConfig.rb:372 msgid "Source unknown." msgstr "未知来源。" @@ -2279,7 +2305,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:447 +#: src/modules/AutoinstConfig.rb:452 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2288,7 +2314,7 @@ "<h3>AutoYaST 配置管理系统</h3>\n" "<p>使用配置管理系统几乎可以配置控制文件的全部资源。</p>\n" -#: src/modules/AutoinstConfig.rb:452 +#: src/modules/AutoinstConfig.rb:457 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" @@ -2301,7 +2327,7 @@ "而该文件可通过 AutoYaST 用于安装另一个系统。\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:459 +#: src/modules/AutoinstConfig.rb:464 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2332,79 +2358,103 @@ #. string language_name = ""; #. string keyboard_name = ""; -#: src/modules/AutoinstGeneral.rb:85 +#: src/modules/AutoinstGeneral.rb:90 msgid "Confirm installation?" msgstr "确认安装吗？" -#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 -#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110 -#: src/modules/AutoinstGeneral.rb:117 +#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:108 src/modules/AutoinstGeneral.rb:115 +#: src/modules/AutoinstGeneral.rb:122 msgid "Yes" msgstr "是" -#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 -#: src/modules/AutoinstGeneral.rb:103 +#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:108 msgid "No" msgstr "否" -#: src/modules/AutoinstGeneral.rb:91 +#: src/modules/AutoinstGeneral.rb:96 msgid "Second Stage of AutoYaST" msgstr "AutoYaST 第二阶段" -#: src/modules/AutoinstGeneral.rb:99 +#: src/modules/AutoinstGeneral.rb:104 msgid "Halting the machine after stage one" msgstr "第一阶段后挂起计算机" -#: src/modules/AutoinstGeneral.rb:108 +#: src/modules/AutoinstGeneral.rb:113 msgid "Halting the machine after stage two" msgstr "第二阶段后挂起计算机" -#: src/modules/AutoinstGeneral.rb:115 +#: src/modules/AutoinstGeneral.rb:120 msgid "Reboot the machine after stage two" msgstr "第二阶段后重启计算机" -#: src/modules/AutoinstGeneral.rb:125 +#: src/modules/AutoinstGeneral.rb:130 msgid "Accepting unsigned files" msgstr "接受未签名文件" -#: src/modules/AutoinstGeneral.rb:126 +#: src/modules/AutoinstGeneral.rb:131 msgid "Not accepting unsigned files" msgstr "不接受未签名文件" -#: src/modules/AutoinstGeneral.rb:135 +#: src/modules/AutoinstGeneral.rb:140 msgid "Accepting files without a checksum" msgstr "接受没有校验和的文件" -#: src/modules/AutoinstGeneral.rb:136 +#: src/modules/AutoinstGeneral.rb:141 msgid "Not accepting files without a checksum" msgstr "不接受没有校验和的文件" -#: src/modules/AutoinstGeneral.rb:145 +#: src/modules/AutoinstGeneral.rb:150 msgid "Accepting failed verifications" msgstr "接受失败的验证" -#: src/modules/AutoinstGeneral.rb:146 +#: src/modules/AutoinstGeneral.rb:151 msgid "Not accepting failed verifications" msgstr "不接受失败的验证" -#: src/modules/AutoinstGeneral.rb:151 +#: src/modules/AutoinstGeneral.rb:156 msgid "Accepting unknown GPG keys" msgstr "接受未知 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:152 +#: src/modules/AutoinstGeneral.rb:157 msgid "Not accepting unknown GPG Keys" msgstr "不接受未知 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:157 +#: src/modules/AutoinstGeneral.rb:162 msgid "Importing new GPG keys" msgstr "导入新 GPG 密钥" -#: src/modules/AutoinstGeneral.rb:158 +#: src/modules/AutoinstGeneral.rb:163 msgid "Not importing new GPG Keys" msgstr "不导入新 GPG 密钥" +#. NTP syncing +#: src/modules/AutoinstGeneral.rb:414 +#, fuzzy +#| msgid "Syncing server..." +msgid "Syncing time..." +msgstr "正在同步服务器..." + +#. TRANSLATORS: %s is the name of the ntp server +#: src/modules/AutoinstGeneral.rb:416 +msgid "Syncing time with %s." +msgstr "" + +#: src/modules/AutoinstGeneral.rb:420 +#, fuzzy +#| msgid "Parsing failed." +msgid "Time syncing failed." +msgstr "语法分析失败。" + +#: src/modules/AutoinstGeneral.rb:424 +#, fuzzy +#| msgid "Cannot mount file system." +msgid "Cannot update system time." +msgstr "无法装入文件系统。" + #. look for VGs to reuse -#: src/modules/AutoinstLVM.rb:111 +#: src/modules/AutoinstLVM.rb:113 msgid "Cannot reuse volume group %1. The volume group does not exist." msgstr "无法复用卷组 %1。该卷组不存在。" @@ -2420,14 +2470,22 @@ #. @return [String] configuration summary dialog #. return Summary of configuration #. @return [String] configuration summary dialog -#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:912 +#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913 msgid "Drives" msgstr "驱动器" -#: src/modules/AutoinstPartPlan.rb:686 src/modules/AutoinstStorage.rb:916 -msgid "Total of %1 drive" -msgstr "%1 驱动器总计" +#. We are counting harddisks only (type CT_DISK) +#: src/modules/AutoinstPartPlan.rb:688 +msgid "%s drive in total" +msgid_plural "%s drives in total" +msgstr[0] "" +#: src/modules/AutoinstPartPlan.rb:707 +#, fuzzy +#| msgid "Not detected." +msgid "Not yet cloned." +msgstr "未检测到。" + #. Return Summary #. @return [String] summary #: src/modules/AutoinstScripts.rb:328 @@ -2478,7 +2536,7 @@ msgstr "未知" #. warning text during the installation. %1 is a list of package names -#: src/modules/AutoinstSoftware.rb:169 +#: src/modules/AutoinstSoftware.rb:172 msgid "" "These packages could not be found in the software repositories:\n" "%1" @@ -2488,31 +2546,31 @@ #. 4 means "already exists" #. Add add-ons -#: src/modules/AutoinstSoftware.rb:315 src/modules/AutoinstSoftware.rb:335 +#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347 msgid "Adding repo %1 failed" msgstr "添加软件源 %1 失败" #. Install -#: src/modules/AutoinstSoftware.rb:363 +#: src/modules/AutoinstSoftware.rb:375 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log" msgstr "映像创建失败于软件集安装环节。请检查 /tmp/ay_image.log" -#: src/modules/AutoinstSoftware.rb:371 +#: src/modules/AutoinstSoftware.rb:383 msgid "Creating Image - installing packages" msgstr "正在创建映像 - 安装软件包" -#: src/modules/AutoinstSoftware.rb:381 +#: src/modules/AutoinstSoftware.rb:393 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log" msgstr "映像创建失败于软件包安装环节。请检查 /tmp/ay_image.log" #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); -#: src/modules/AutoinstSoftware.rb:392 +#: src/modules/AutoinstSoftware.rb:404 msgid "Store image to ..." msgstr "存储映像到..." #. Compress image: #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" . -#: src/modules/AutoinstSoftware.rb:421 +#: src/modules/AutoinstSoftware.rb:433 msgid "" "You can do changes to the image now in %1/\n" "If you press the ok-button, the image will be compressed and can't be changed anymore." @@ -2520,16 +2578,16 @@ "您现在可以在 %1/ 修改映像。\n" "您若按下确认按钮，%1/ 将被压缩成映像，便再也不能修改了。" -#: src/modules/AutoinstSoftware.rb:435 +#: src/modules/AutoinstSoftware.rb:447 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log" msgstr "映像压缩失败于 '%1'。请检查 /tmp/ay_image.log" -#: src/modules/AutoinstSoftware.rb:442 +#: src/modules/AutoinstSoftware.rb:454 msgid "Image created successfully" msgstr "已成功创建映像" #. copy a directory (ends with / in directory.yast) -#: src/modules/AutoinstSoftware.rb:478 +#: src/modules/AutoinstSoftware.rb:490 msgid "" "can not get the directory.yast file at `%1`.\n" "You can create that file with 'ls -F > directory.yast' if it's missing." @@ -2538,30 +2596,30 @@ "若缺失了它，您可以通过 'ls -F > directory.yast' 命令创建该文件。" #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir. -#: src/modules/AutoinstSoftware.rb:512 +#: src/modules/AutoinstSoftware.rb:524 msgid "can not read '%1'. Try again?" msgstr "无法读取 '%1'。重试吗？" #. copy a file -#: src/modules/AutoinstSoftware.rb:530 +#: src/modules/AutoinstSoftware.rb:542 msgid "can not read '%1'. ISO creation failed" msgstr "无法读取 '%1'。创建 ISO 失败" #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD -#: src/modules/AutoinstSoftware.rb:560 +#: src/modules/AutoinstSoftware.rb:572 msgid "Preparing ISO Filestructure ..." msgstr "正在准备 ISO 文件结构..." #. prepare and save isolinux.cfg boot menu of the media -#: src/modules/AutoinstSoftware.rb:609 +#: src/modules/AutoinstSoftware.rb:621 msgid "boot config for the DVD" msgstr "DVD 引导配置" -#: src/modules/AutoinstSoftware.rb:613 +#: src/modules/AutoinstSoftware.rb:625 msgid "Ok" msgstr "好呢" -#: src/modules/AutoinstSoftware.rb:616 +#: src/modules/AutoinstSoftware.rb:628 msgid "" "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n" "If you press the ok-button, the iso will be created." @@ -2571,43 +2629,43 @@ #. create the actual ISO file #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") ); -#: src/modules/AutoinstSoftware.rb:635 +#: src/modules/AutoinstSoftware.rb:647 msgid "Store ISO image to ..." msgstr "存储 ISO 映像到..." -#: src/modules/AutoinstSoftware.rb:636 +#: src/modules/AutoinstSoftware.rb:648 msgid "Creating ISO File ..." msgstr "正在创建 ISO 文件..." -#: src/modules/AutoinstSoftware.rb:657 +#: src/modules/AutoinstSoftware.rb:669 msgid "ISO successfully created at %1" msgstr "ISO 成功创建于 %1" #. Summary #. @return Html formatted configuration summary -#: src/modules/AutoinstSoftware.rb:733 +#: src/modules/AutoinstSoftware.rb:745 msgid "Selected Patterns" msgstr "所选软件集" -#: src/modules/AutoinstSoftware.rb:743 +#: src/modules/AutoinstSoftware.rb:755 msgid "Individually Selected Packages" msgstr "单选的软件包" -#: src/modules/AutoinstSoftware.rb:749 +#: src/modules/AutoinstSoftware.rb:761 msgid "Packages to Remove" msgstr "待移除软件包" -#: src/modules/AutoinstSoftware.rb:756 +#: src/modules/AutoinstSoftware.rb:768 msgid "Force Kernel Package" msgstr "强制内核软件包" #. set SoftLock to avoid the installation of recommended patterns (#159466) -#: src/modules/AutoinstSoftware.rb:846 +#: src/modules/AutoinstSoftware.rb:858 msgid "Could not set patterns: %1." msgstr "无法设置软件集：%1。" #. Solve dependencies -#: src/modules/AutoinstSoftware.rb:907 +#: src/modules/AutoinstSoftware.rb:919 msgid "The package resolver run failed. Please check your software section in the autoyast profile." msgstr "软件包依赖关系解决器运行失败。请检查 autoyast 方案中的软件部分。" @@ -2616,44 +2674,48 @@ msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing" msgstr "在您的 XML 方案中配置的分区计划并不适合该硬盘。缺少 %1MB" -#: src/modules/AutoinstStorage.rb:922 +#: src/modules/AutoinstStorage.rb:917 +msgid "Total of %1 drive" +msgstr "%1 驱动器总计" + +#: src/modules/AutoinstStorage.rb:923 msgid "No specific device configured" msgstr "未配置特种设备" #. Handle /etc/fstab usage #. @return [Boolean] -#: src/modules/AutoinstStorage.rb:1017 +#: src/modules/AutoinstStorage.rb:1018 msgid "Evaluating root partition. One moment please..." msgstr "正在评估根分区。请稍候..." #. a popup -#: src/modules/AutoinstStorage.rb:1025 +#: src/modules/AutoinstStorage.rb:1026 msgid "No Linux root partition found." msgstr "未找到 Linux 根分区。" #. We must only change RootPart::selectedRootPartition if booting #. is inevitable. -#: src/modules/AutoinstStorage.rb:1038 +#: src/modules/AutoinstStorage.rb:1039 msgid "" "Multiple root partitions found, but you did not configure\n" "which root partition should be used. Automatic installation not possible.\n" msgstr "找到多个根分区，但您没有配置应使用哪个根分区。自动安装不可行。\n" #. return list of available devices -#: src/modules/AutoinstStorage.rb:1121 +#: src/modules/AutoinstStorage.rb:1122 msgid "device '%1' not found by storage backend" msgstr "存储后端未找到设备 '%1'" #. Prepare Profile for saving and remove empty data structs #. @return [void] -#: src/modules/Profile.rb:338 +#: src/modules/Profile.rb:359 msgid "Collecting configuration data..." msgstr "正在嵬集配置数据..." #. Save YCP data into XML #. @param path to file #. @return [Boolean] true on success -#: src/modules/Profile.rb:441 +#: src/modules/Profile.rb:462 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "加密的 AutoYaST 方案。请输入两次密码。" @@ -2661,14 +2723,14 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:515 +#: src/modules/Profile.rb:536 msgid "Could not write section %1 to file %2." msgstr "无法将部分 %1 写入到文件 %2。" #. Read XML into YCP data #. @param path to file #. @return [Boolean] -#: src/modules/Profile.rb:682 src/modules/ProfileLocation.rb:190 +#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190 msgid "Encrypted AutoYaST profile. Enter the correct password." msgstr "加密的 AutoYaST 方案。请输入正确的密码。" Modified: trunk/yast/zh_CN/po/base.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/base.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/base.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:22+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-08-09 14:03+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -36,129 +36,129 @@ "继续使用 YaST 配置吗？" #. translators: help for 'help' option on command line -#: library/commandline/src/modules/CommandLine.rb:55 +#: library/commandline/src/modules/CommandLine.rb:54 msgid "Print the help for this module" msgstr "打印此模块的帮助" #. translators: help for 'longhelp' option on command line -#: library/commandline/src/modules/CommandLine.rb:61 +#: library/commandline/src/modules/CommandLine.rb:60 msgid "Print a long version of help for this module" msgstr "打印此模块的较长版本帮助" #. translators: help for 'xmlhelp' option on command line -#: library/commandline/src/modules/CommandLine.rb:67 +#: library/commandline/src/modules/CommandLine.rb:66 msgid "Print a long version of help for this module in XML format" msgstr "以 XML 格式打印此模块的较长版本帮助" #. translators: help for 'interactive' option on command line -#: library/commandline/src/modules/CommandLine.rb:73 +#: library/commandline/src/modules/CommandLine.rb:72 msgid "Start interactive shell to control the module" msgstr "启动交互壳层来控制模块" #. translators: help for 'exit' command line interactive mode -#: library/commandline/src/modules/CommandLine.rb:79 +#: library/commandline/src/modules/CommandLine.rb:78 msgid "Exit interactive mode and save the changes" msgstr "退出交互模式并保存更改" #. translators: help for 'abort' command line interactive mode -#: library/commandline/src/modules/CommandLine.rb:85 +#: library/commandline/src/modules/CommandLine.rb:84 msgid "Abort interactive mode without saving the changes" msgstr "中止交互模式且不保存更改" #. translators: command line "help" option -#: library/commandline/src/modules/CommandLine.rb:93 +#: library/commandline/src/modules/CommandLine.rb:92 msgid "Print the help for this command" msgstr "打印此命令的帮助" #. translators: command line "verbose" option -#: library/commandline/src/modules/CommandLine.rb:99 +#: library/commandline/src/modules/CommandLine.rb:98 msgid "Show progress information" msgstr "显示进度信息" #. translators: command line "xmlfile" option -#: library/commandline/src/modules/CommandLine.rb:105 +#: library/commandline/src/modules/CommandLine.rb:104 msgid "Where to store the XML output" msgstr "何处存储 XML 输出" #. string: command line interface is not supported -#: library/commandline/src/modules/CommandLine.rb:146 +#: library/commandline/src/modules/CommandLine.rb:144 msgid "This YaST2 module does not support the command line interface." msgstr "此 YaST2 模块不支持命令行界面。" #. translators: default error message for command line -#: library/commandline/src/modules/CommandLine.rb:328 +#: library/commandline/src/modules/CommandLine.rb:324 msgid "Use 'help' for a complete list of available commands." msgstr "请使用 'help' 来查看可用命令的完整列表。" #. translators: default error message for command line -#: library/commandline/src/modules/CommandLine.rb:333 +#: library/commandline/src/modules/CommandLine.rb:329 msgid "Use 'yast2 %1 help' for a complete list of available commands." msgstr "请使用 'yast2 %1 help' 来查看可用命令的完整列表。" #. translators: error message in command line interface -#: library/commandline/src/modules/CommandLine.rb:371 +#: library/commandline/src/modules/CommandLine.rb:367 msgid "Unknown Command: %1" msgstr "未知命令：%1" #. translators: error message - user did not provide a value for option %1 on the command line -#: library/commandline/src/modules/CommandLine.rb:409 +#: library/commandline/src/modules/CommandLine.rb:405 msgid "Option '%1' is missing value." msgstr "选项 '%1' 缺少值。" #. translators: error message, %1 is a command, %2 is the wrong option given by the user -#: library/commandline/src/modules/CommandLine.rb:445 +#: library/commandline/src/modules/CommandLine.rb:440 msgid "Unknown option for command '%1': %2" msgstr "命令 '%1' 的选项未知：%2" #. translators: error message, %2 is the value given #. translators: error message, %2 is the value given #. translators: error message, %2 is the value given -#: library/commandline/src/modules/CommandLine.rb:466 -#: library/commandline/src/modules/CommandLine.rb:478 -#: library/commandline/src/modules/CommandLine.rb:488 +#: library/commandline/src/modules/CommandLine.rb:461 +#: library/commandline/src/modules/CommandLine.rb:473 +#: library/commandline/src/modules/CommandLine.rb:483 msgid "Invalid value for option '%1': %2" msgstr "选项 '%1' 的值无效：%2" #. translators: error message, %2 is expected type, %3 is the value given -#: library/commandline/src/modules/CommandLine.rb:506 +#: library/commandline/src/modules/CommandLine.rb:501 msgid "Invalid value for option '%1' -- expected '%2', received %3" msgstr "选项 '%1' 的值无效 -- 预期为 '%2'，收到了 %3" #. translators: error message if option has a value, but cannot have one -#: library/commandline/src/modules/CommandLine.rb:527 +#: library/commandline/src/modules/CommandLine.rb:522 msgid "Option '%1' cannot have a value. Given value: %2" msgstr "选项 '%1' 无法赋值。给定值：%2" #. translators: error message, how to get command line help for interactive mode #. %1 is the module name, %2 is the action name -#: library/commandline/src/modules/CommandLine.rb:546 +#: library/commandline/src/modules/CommandLine.rb:541 msgid "Use '%1 %2 help' for a complete list of available options." msgstr "请使用 '%1 %2 help' 来查看可用选项的完整列表。" #. translators: error message, how to get command line help for non-interactive mode #. %1 is the module name, %2 is the action name -#: library/commandline/src/modules/CommandLine.rb:556 +#: library/commandline/src/modules/CommandLine.rb:551 msgid "Use 'yast2 %1 %2 help' for a complete list of available options." msgstr "请使用 'yast2 %1 %2 help' 来查看可用选项的完整列表。" #. translators: command line interface header, %1 is identification of the module -#: library/commandline/src/modules/CommandLine.rb:574 +#: library/commandline/src/modules/CommandLine.rb:569 msgid "YaST Configuration Module %1\n" msgstr "YaST 配置模块 %1\n" #. translators: the command does not provide any help -#: library/commandline/src/modules/CommandLine.rb:598 +#: library/commandline/src/modules/CommandLine.rb:593 msgid "No help available" msgstr "无帮助可用" #. Process <command> "help" #. translators: %1 is the command name -#: library/commandline/src/modules/CommandLine.rb:602 +#: library/commandline/src/modules/CommandLine.rb:597 msgid "Command '%1'" msgstr "命令 '%1'" #. translators: command line options -#: library/commandline/src/modules/CommandLine.rb:622 +#: library/commandline/src/modules/CommandLine.rb:617 msgid "" "\n" " Options:" @@ -167,7 +167,7 @@ " 选项：" #. additional help for using command line -#: library/commandline/src/modules/CommandLine.rb:712 +#: library/commandline/src/modules/CommandLine.rb:706 msgid "" "\n" " Options of the [string] type must be written in the form 'option=value'." @@ -176,7 +176,7 @@ " [string] 类型的选项必须以 '选项=值' 的格式书写。" #. translators: example title for command line -#: library/commandline/src/modules/CommandLine.rb:719 +#: library/commandline/src/modules/CommandLine.rb:713 msgid "" "\n" " Example:" @@ -185,137 +185,137 @@ " 示例：" #. translators: default module description if none is provided by the module itself -#: library/commandline/src/modules/CommandLine.rb:749 +#: library/commandline/src/modules/CommandLine.rb:743 msgid "This is a YaST module." msgstr "这是一个 YaST 模块。" #. translators: short help title for command line -#: library/commandline/src/modules/CommandLine.rb:754 +#: library/commandline/src/modules/CommandLine.rb:748 msgid "Basic Syntax:" msgstr "基本语法：" #. translators: module command line help, %1 is the module name #. translate <command> and [options] only! -#: library/commandline/src/modules/CommandLine.rb:769 +#: library/commandline/src/modules/CommandLine.rb:763 msgid " yast2 %1 <command> [verbose] [options]" msgstr " yast2 %1 <命令> [详细命令] [选项]" #. translators: module command line help, %1 is the module name #. translate <command> only! -#: library/commandline/src/modules/CommandLine.rb:796 +#: library/commandline/src/modules/CommandLine.rb:790 msgid " yast2 %1 <command> help" msgstr " yast2 %1 <命令> help" #. translators: module command line help #. translate <command> and [options] only! -#: library/commandline/src/modules/CommandLine.rb:803 +#: library/commandline/src/modules/CommandLine.rb:797 msgid " <command> [options]" msgstr " <命令> [选项]" #. translators: module command line help #. translate <command> only! -#: library/commandline/src/modules/CommandLine.rb:806 +#: library/commandline/src/modules/CommandLine.rb:800 msgid " <command> help" msgstr " <命令> help" #. translators: command line title: list of available commands -#: library/commandline/src/modules/CommandLine.rb:818 +#: library/commandline/src/modules/CommandLine.rb:812 msgid "Commands:" msgstr "命令：" #. translators: error message: module does not provide any help messages -#: library/commandline/src/modules/CommandLine.rb:834 +#: library/commandline/src/modules/CommandLine.rb:828 msgid "No help available." msgstr "无帮助可用。" #. fallback message - invalid help has been provided by the yast module -#: library/commandline/src/modules/CommandLine.rb:870 +#: library/commandline/src/modules/CommandLine.rb:864 msgid "" msgstr "<错误：无效帮助>" #. translators: module command line help, %1 is the module name -#: library/commandline/src/modules/CommandLine.rb:880 +#: library/commandline/src/modules/CommandLine.rb:874 msgid "Run 'yast2 %1 <command> help' for a list of available options." msgstr "请运行 'yast2 %1 <命令> help' 来查看可用选项的列表。" #. error message - command line option xmlfile is missing -#: library/commandline/src/modules/CommandLine.rb:944 +#: library/commandline/src/modules/CommandLine.rb:938 msgid "Target file name ('xmlfile' option) is missing. Use xmlfile= command line option." msgstr "缺少目标文件名 ('xmlfile' 选项)。请使用 xmlfile=<目标_XML_文件> 命令行选项。" #. error message - command line option xmlfile is missing -#: library/commandline/src/modules/CommandLine.rb:956 +#: library/commandline/src/modules/CommandLine.rb:950 msgid "Target file name ('xmlfile' option) is empty. Use xmlfile= command line option." msgstr "目标文件名 ('xmlfile' 选项) 为空。请使用 xmlfile=<目标_XML_文件> 命令行选项。" #. translators: fallback name for a module at command line -#: library/commandline/src/modules/CommandLine.rb:1096 +#: library/commandline/src/modules/CommandLine.rb:1087 msgid "unknown" msgstr "未知" #. translators: the last command %1 in a list of unique commands -#: library/commandline/src/modules/CommandLine.rb:1470 +#: library/commandline/src/modules/CommandLine.rb:1461 msgid "or '%1'" msgstr "或 '%1'" #. translators: error message - missing unique command for command line execution -#: library/commandline/src/modules/CommandLine.rb:1478 +#: library/commandline/src/modules/CommandLine.rb:1469 msgid "Specify the command '%1'." msgstr "请指定命令 '%1'。" #. translators: error message - missing unique command for command line execution -#: library/commandline/src/modules/CommandLine.rb:1485 +#: library/commandline/src/modules/CommandLine.rb:1476 msgid "Specify one of the commands: %1." msgstr "请仅指定以下命令之一：%1。" #. size( unique_options ) == 1 here does not make sense -#: library/commandline/src/modules/CommandLine.rb:1495 +#: library/commandline/src/modules/CommandLine.rb:1486 msgid "Specify only one of the commands: %1." msgstr "请仅指定以下命令之一：%1。" #. translators: error message - the module does not provide command line interface -#: library/commandline/src/modules/CommandLine.rb:1581 +#: library/commandline/src/modules/CommandLine.rb:1531 msgid "There is no user interface available for this module." msgstr "此模块没有可用的用户界面。" #. translators: progress message - command line interface ready -#: library/commandline/src/modules/CommandLine.rb:1619 +#: library/commandline/src/modules/CommandLine.rb:1560 msgid "Ready" msgstr "就绪" #. non-GUI handling -#: library/commandline/src/modules/CommandLine.rb:1643 +#: library/commandline/src/modules/CommandLine.rb:1574 msgid "Initializing" msgstr "正在初始化" #. translators: Progress message - the command line interface is about to finish -#: library/commandline/src/modules/CommandLine.rb:1690 +#: library/commandline/src/modules/CommandLine.rb:1610 msgid "Finishing" msgstr "正在完成" #. translators: The command line interface is finished -#: library/commandline/src/modules/CommandLine.rb:1707 +#: library/commandline/src/modules/CommandLine.rb:1617 msgid "Done" msgstr "完毕" #. translators: The command line interface is finished without writing the changes -#: library/commandline/src/modules/CommandLine.rb:1710 +#: library/commandline/src/modules/CommandLine.rb:1620 msgid "Quitting (without changes)" msgstr "退出(不修改)" #. prompt message displayed in the commandline mode #. when user is asked to replay "yes" or "no" (localized) -#: library/commandline/src/modules/CommandLine.rb:1724 +#: library/commandline/src/modules/CommandLine.rb:1634 msgid "yes or no?" msgstr "是或否？" #. yes - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/modules/CommandLine.rb:1729 +#: library/commandline/src/modules/CommandLine.rb:1639 msgid "yes" msgstr "是" #. no - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/modules/CommandLine.rb:1732 +#: library/commandline/src/modules/CommandLine.rb:1642 msgid "no" msgstr "否" @@ -379,7 +379,7 @@ #. %1 - link to our bugzilla #. %2 - directory where YaST logs are stored #. %3 - link to the Yast Bug Reporting HOWTO Web page -#: library/control/src/modules/InstError.rb:155 +#: library/control/src/modules/InstError.rb:157 msgid "" "This is worth reporting a bug at %1.\n" "Please, attach also all YaST logs stored in the '%2' directory.\n" @@ -395,13 +395,13 @@ #. link to the Yast Bug Reporting HOWTO #. for translators: use the localized page for your language if it exists, #. check the combo box "In other laguages" on top of the page -#: library/control/src/modules/InstError.rb:165 -#: library/control/src/modules/ProductControl.rb:1481 +#: library/control/src/modules/InstError.rb:167 +#: library/control/src/modules/ProductControl.rb:1444 msgid "http://en.opensuse.org/Bugs/YaST" msgstr "http://en.opensuse.org/Bugs/YaST" #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later -#: library/control/src/modules/InstError.rb:176 +#: library/control/src/modules/InstError.rb:178 msgid "&Save YaST Logs..." msgstr "保存 YaST 日志(&S)..." @@ -409,48 +409,70 @@ #. from YaST logs. #. #. @param [String] error_text (e.g., "Client inst_abc returned invalid data.") -#: library/control/src/modules/InstError.rb:223 +#: library/control/src/modules/InstError.rb:226 msgid "Installation Error" msgstr "安装出错" +#. Load a rpm package from the media into the inst-sys and ensure its +#. unloading after end of block. +#. @param [String] package to load +#. @param [Proc] Block to be yield +#. @raises [RuntimeError] when package loading failed +#. +#. @example +#. InstExtensionImage.with_extension("snapper") do +#. WFM.Execute(path(".local.bash"), "snapper magic") +#. end +#: library/control/src/modules/InstExtensionImage.rb:352 +#, fuzzy +#| msgid "Loading packages list..." +msgid "Loading to memory package '%s'" +msgstr "正在加载包列表..." + +#: library/control/src/modules/InstExtensionImage.rb:358 +#, fuzzy +#| msgid "Remove package %1?" +msgid "Removing from memory package '%s'" +msgstr "是否软件包 %1？" + #. error report -#: library/control/src/modules/ProductControl.rb:1289 +#: library/control/src/modules/ProductControl.rb:1253 msgid "No workflow defined for this installation mode." msgstr "没有为此安装方式定义工作流程。" #. last part of the question (variable) -#: library/control/src/modules/ProductProfile.rb:182 +#: library/control/src/modules/ProductProfile.rb:180 msgid "Do you want to continue or abort the installation?" msgstr "您想要继续或中止安装吗？" #. button label #. Button that will continue with the installation -#: library/control/src/modules/ProductProfile.rb:185 -#: library/general/src/modules/Popup.rb:837 +#: library/control/src/modules/ProductProfile.rb:183 +#: library/general/src/modules/Popup.rb:744 msgid "&Continue Installation" msgstr "继续安装(&C)" #. button label #. Button that will really abort the installation -#: library/control/src/modules/ProductProfile.rb:187 -#: library/general/src/modules/Popup.rb:835 +#: library/control/src/modules/ProductProfile.rb:185 +#: library/general/src/modules/Popup.rb:742 msgid "&Abort Installation" msgstr "中止安装(&A)" #. last part of the question (variable) -#: library/control/src/modules/ProductProfile.rb:192 +#: library/control/src/modules/ProductProfile.rb:190 msgid "Do you want to add new product anyway?" msgstr "无论如何您都想要添加新产品吗？" #. popup dialog caption #. this string is usually used as headline of a popup -#: library/control/src/modules/ProductProfile.rb:199 +#: library/control/src/modules/ProductProfile.rb:197 #: library/general/src/modules/Label.rb:256 msgid "Warning" msgstr "警告" #. popup message, %1 is list of problems -#: library/control/src/modules/ProductProfile.rb:202 +#: library/control/src/modules/ProductProfile.rb:200 msgid "" "The profile does not allow you to run the products on this system.\n" "Proceeding to run this installation will leave you in an unsupported state\n" @@ -473,7 +495,7 @@ #. make sure that every workflow is merged only once #. bugzilla #332436 -#: library/control/src/modules/WorkflowManager.rb:1319 +#: library/control/src/modules/WorkflowManager.rb:1315 msgid "An internal error occurred when integrating additional workflow." msgstr "整合附加工作流程时发生内部错误。" @@ -483,7 +505,7 @@ msgstr "%1 的值无效。" #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:68 +#: library/cwm/src/modules/CWMServiceStart.rb:67 msgid "Unavailable" msgstr "不可用" @@ -492,7 +514,7 @@ #. %1 is eg. "On -- Start Service when Booting" #. %2 is eg. "Off -- Start Service Manually" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:227 +#: library/cwm/src/modules/CWMServiceStart.rb:225 msgid "" "<p><b><big>Service Start</big></b><br>\n" "To start the service every time your computer is booted, set\n" @@ -508,7 +530,7 @@ #. %2 is eg. "Off -- Start Service Manually" #. %3 is eg. "Start Service via xinetd" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:243 +#: library/cwm/src/modules/CWMServiceStart.rb:241 msgid "" "<p><b><big>Service Start</big></b><br>\n" "To start the service every time your computer is booted, set\n" @@ -523,43 +545,43 @@ #. part of help text - radio button label, NO SHORTCUT!!! #. part of help text - radio button label, NO SHORTCUT!!! #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:257 -#: library/cwm/src/modules/CWMServiceStart.rb:269 -#: library/cwm/src/modules/CWMServiceStart.rb:317 +#: library/cwm/src/modules/CWMServiceStart.rb:255 +#: library/cwm/src/modules/CWMServiceStart.rb:267 +#: library/cwm/src/modules/CWMServiceStart.rb:315 msgid "During Boot" msgstr "引导期间" #. part of help text - radio button label, NO SHORTCUT!!! #. part of help text - radio button label, NO SHORTCUT!!! #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:259 -#: library/cwm/src/modules/CWMServiceStart.rb:271 -#: library/cwm/src/modules/CWMServiceStart.rb:324 +#: library/cwm/src/modules/CWMServiceStart.rb:257 +#: library/cwm/src/modules/CWMServiceStart.rb:269 +#: library/cwm/src/modules/CWMServiceStart.rb:322 msgid "Manually" msgstr "手动" #. part of help text - radio button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:273 +#: library/cwm/src/modules/CWMServiceStart.rb:271 msgid "Via xinetd" msgstr "通过 xinetd" #. radio button -#: library/cwm/src/modules/CWMServiceStart.rb:331 +#: library/cwm/src/modules/CWMServiceStart.rb:329 msgid "Via &xinetd" msgstr "通过 &xinetd" #. frame -#: library/cwm/src/modules/CWMServiceStart.rb:376 +#: library/cwm/src/modules/CWMServiceStart.rb:374 msgid "Service Start" msgstr "启动服务" #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:467 +#: library/cwm/src/modules/CWMServiceStart.rb:465 msgid "Service is running" msgstr "服务正在运行" #. service status - label -#: library/cwm/src/modules/CWMServiceStart.rb:473 +#: library/cwm/src/modules/CWMServiceStart.rb:471 msgid "Service is not running" msgstr "服务未运行" @@ -568,7 +590,7 @@ #. %1 is eg. "Start the Service Now" #. %2 is eg. "Stop the Service Now" #. (both without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:506 +#: library/cwm/src/modules/CWMServiceStart.rb:504 msgid "" "<p><b><big>Switch On or Off</big></b><br>\n" "To start or stop the service immediately, use \n" @@ -581,39 +603,39 @@ #. %3 is push button label, eg. "Save Changes and Restart Service Now" #. (without quotes) #. note: %3 is correct, do not replace with %1!!! -#: library/cwm/src/modules/CWMServiceStart.rb:518 +#: library/cwm/src/modules/CWMServiceStart.rb:516 msgid "" "<p>To save all changes and restart the\n" "service immediately, use <b>%3</b>.</p>\n" msgstr "<p>要立即保存全部修改并重启服务，请使用 <b>%3</b>。</p>\n" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:533 +#: library/cwm/src/modules/CWMServiceStart.rb:531 msgid "Start the Service Now" msgstr "立即启动服务" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:535 +#: library/cwm/src/modules/CWMServiceStart.rb:533 msgid "Stop the Service Now" msgstr "立即停止服务" #. part of help text - push button label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:537 +#: library/cwm/src/modules/CWMServiceStart.rb:535 msgid "Save Changes and Restart Service Now" msgstr "立即保存修改并重启服务" #. push button for immediate service starting -#: library/cwm/src/modules/CWMServiceStart.rb:579 +#: library/cwm/src/modules/CWMServiceStart.rb:577 msgid "&Start the Service Now" msgstr "立即启动服务(&S)" #. push button for immediate service stopping -#: library/cwm/src/modules/CWMServiceStart.rb:586 +#: library/cwm/src/modules/CWMServiceStart.rb:584 msgid "S&top the Service Now" msgstr "立即停止服务(&T)" #. push button for immediate saving of the settings and service starting -#: library/cwm/src/modules/CWMServiceStart.rb:593 +#: library/cwm/src/modules/CWMServiceStart.rb:591 msgid "S&ave Changes and Restart Service Now" msgstr "立即保存修改并重启服务(&A)" @@ -629,7 +651,7 @@ #. help text for LDAP enablement widget #. %1 is button label, eg. "LDAP Support Active" (without quotes) -#: library/cwm/src/modules/CWMServiceStart.rb:731 +#: library/cwm/src/modules/CWMServiceStart.rb:730 msgid "" "<p><b><big>LDAP Support</big></b><br>\n" "To store the settings in LDAP instead of native configuration files,\n" @@ -639,38 +661,38 @@ "要将设置存放在 LDAP 而非原生配置文件中，请设定 <b>%1</b>。</p>" #. part of help text - check box label, NO SHORTCUT!!! -#: library/cwm/src/modules/CWMServiceStart.rb:744 +#: library/cwm/src/modules/CWMServiceStart.rb:743 msgid "LDAP Support Active" msgstr "LDAP 支持处于活动状态" #. check box -#: library/cwm/src/modules/CWMServiceStart.rb:773 +#: library/cwm/src/modules/CWMServiceStart.rb:772 msgid "&LDAP Support Active" msgstr "&LDAP 支持处于活动状态" #. Fallback label for a tab if no is defined -#: library/cwm/src/modules/CWMTab.rb:49 +#: library/cwm/src/modules/CWMTab.rb:48 msgid "Tab" msgstr "制表键 (Tab)" #. push button #. push button #. Button label -#: library/cwm/src/modules/CWMTable.rb:368 -#: library/cwm/src/modules/TablePopup.rb:943 +#: library/cwm/src/modules/CWMTable.rb:370 +#: library/cwm/src/modules/TablePopup.rb:940 #: library/general/src/modules/Label.rb:166 msgid "&Up" msgstr "向上(&U)" #. push button #. push button -#: library/cwm/src/modules/CWMTable.rb:370 -#: library/cwm/src/modules/TablePopup.rb:945 +#: library/cwm/src/modules/CWMTable.rb:372 +#: library/cwm/src/modules/TablePopup.rb:942 msgid "&Down" msgstr "向下(&D)" #. popup message -#: library/cwm/src/modules/CWMTsigKeys.rb:306 +#: library/cwm/src/modules/CWMTsigKeys.rb:302 msgid "" "The selected TSIG key cannot be deleted,\n" "because it is in use.\n" @@ -681,37 +703,37 @@ "请先在配置中停止使用该密钥。" #. popup title -#: library/cwm/src/modules/CWMTsigKeys.rb:312 +#: library/cwm/src/modules/CWMTsigKeys.rb:308 msgid "Cannot delete TSIG key." msgstr "无法删除事务数字签名 (TSIG) 密钥。" #. popup headline -#: library/cwm/src/modules/CWMTsigKeys.rb:322 +#: library/cwm/src/modules/CWMTsigKeys.rb:318 msgid "Select File with the Authentication Key" msgstr "选择存有认证密钥的文件" #. popup headline -#: library/cwm/src/modules/CWMTsigKeys.rb:337 +#: library/cwm/src/modules/CWMTsigKeys.rb:333 msgid "Select File for the Authentication Key" msgstr "选择认证密钥文件" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:357 +#: library/cwm/src/modules/CWMTsigKeys.rb:353 msgid "Specified filename is an existing directory." msgstr "指定文件名是一个已存在的文件夹。" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:362 +#: library/cwm/src/modules/CWMTsigKeys.rb:358 msgid "Specified file exists. Rewrite it?" msgstr "指定文件已存在。覆盖它吗？" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:372 +#: library/cwm/src/modules/CWMTsigKeys.rb:368 msgid "The TSIG key ID was not specified." msgstr "未指定事务数字签名 (TSIG) 密钥 ID。" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:379 +#: library/cwm/src/modules/CWMTsigKeys.rb:375 msgid "" "The key with the specified ID exists and is used.\n" "Remove it?" @@ -720,7 +742,7 @@ "移除它吗？" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:399 +#: library/cwm/src/modules/CWMTsigKeys.rb:395 msgid "" "A key with the specified ID was found\n" "on your disk. Remove it?" @@ -729,27 +751,27 @@ "移除它吗？" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:424 +#: library/cwm/src/modules/CWMTsigKeys.rb:420 msgid "The key will be created now. Continue?" msgstr "现在将创建密钥。继续吗？" #. error report -#: library/cwm/src/modules/CWMTsigKeys.rb:440 +#: library/cwm/src/modules/CWMTsigKeys.rb:436 msgid "Creating the TSIG key failed." msgstr "创建事务数字签名 (TSIG) 密钥失败。" #. message popup -#: library/cwm/src/modules/CWMTsigKeys.rb:450 +#: library/cwm/src/modules/CWMTsigKeys.rb:446 msgid "The specified file does not exist." msgstr "指定文件不存在。" #. message popup -#: library/cwm/src/modules/CWMTsigKeys.rb:456 +#: library/cwm/src/modules/CWMTsigKeys.rb:452 msgid "The specified file does not contain any TSIG key." msgstr "指定文件不包含任何事务数字签名 (TSIG) 密钥。" #. yes-no popup -#: library/cwm/src/modules/CWMTsigKeys.rb:466 +#: library/cwm/src/modules/CWMTsigKeys.rb:462 msgid "" "The specified file contains a TSIG key with the same\n" "identifier as some of already present keys.\n" @@ -760,7 +782,7 @@ "旧密钥将被移除。继续吗？" #. tsig keys management dialog help 1/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:570 +#: library/cwm/src/modules/CWMTsigKeys.rb:565 msgid "" "<p><big><b>TSIG Key Management</b></big><br>\n" "Use this dialog to manage the TSIG keys.</p>\n" @@ -769,7 +791,7 @@ "使用此对话框管理事务数字签名密钥。</p>\n" #. tsig keys management dialog help 2/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:574 +#: library/cwm/src/modules/CWMTsigKeys.rb:569 msgid "" "<p><big><b>Adding an Existing TSIG Key</b></big><br>\n" "To add an already created TSIG key, select a <b>Filename</b> of the file\n" @@ -780,7 +802,7 @@ "并点击<b>添加</b>。</p>\n" #. tsig keys management dialog help 3/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:580 +#: library/cwm/src/modules/CWMTsigKeys.rb:575 msgid "" "<p><big><b>Creating a New TSIG Key</b></big><br>\n" "To create a new TSIG key, set the <b>Filename</b> of the file in which to\n" @@ -792,7 +814,7 @@ "以及用以识别密钥的<b>密钥 ID</b>，然后点击<b>生成</b>。</p>\n" #. tsig keys management dialog help 4/4 -#: library/cwm/src/modules/CWMTsigKeys.rb:587 +#: library/cwm/src/modules/CWMTsigKeys.rb:582 msgid "" "<p><big><b>Removing a TSIG Key</b></big><br>\n" "To remove a configured TSIG key, select it and click <b>Delete</b>.\n" @@ -808,27 +830,27 @@ "服务器必须先在配置中停止使用该密钥。</p>\n" #. Frame label - adding a created server key -#: library/cwm/src/modules/CWMTsigKeys.rb:599 +#: library/cwm/src/modules/CWMTsigKeys.rb:594 msgid "Add an Existing TSIG Key" msgstr "添加已有的事务数字签名 (TSIG) 密钥" #. Frame label - creating a new server key -#: library/cwm/src/modules/CWMTsigKeys.rb:648 +#: library/cwm/src/modules/CWMTsigKeys.rb:643 msgid "Create a New TSIG Key" msgstr "创建新的事务数字签名 (TSIG) 密钥" #. text entry -#: library/cwm/src/modules/CWMTsigKeys.rb:660 +#: library/cwm/src/modules/CWMTsigKeys.rb:655 msgid "&Key ID" msgstr "密钥 ID(&K)" #. push button -#: library/cwm/src/modules/CWMTsigKeys.rb:692 +#: library/cwm/src/modules/CWMTsigKeys.rb:687 msgid "&Generate" msgstr "生成(&G)" #. Table header - in fact label -#: library/cwm/src/modules/CWMTsigKeys.rb:704 +#: library/cwm/src/modules/CWMTsigKeys.rb:699 msgid "Current TSIG Keys" msgstr "当前事务数字签名 (TSIG) 密钥" @@ -836,54 +858,54 @@ #. table header - GPG key ID #. table header - GPG key ID #. GnuPG key ID used as "Key ID: 1144AAAA444" -#: library/cwm/src/modules/CWMTsigKeys.rb:712 -#: library/gpg/src/modules/GPGWidgets.rb:193 -#: library/gpg/src/modules/GPGWidgets.rb:225 +#: library/cwm/src/modules/CWMTsigKeys.rb:707 +#: library/gpg/src/modules/GPGWidgets.rb:192 +#: library/gpg/src/modules/GPGWidgets.rb:224 #: library/packages/src/modules/SignatureCheckDialogs.rb:57 msgid "Key ID" msgstr "密钥 ID" #. Table header item - DNS key listing -#: library/cwm/src/modules/CWMTsigKeys.rb:714 +#: library/cwm/src/modules/CWMTsigKeys.rb:709 msgid "Filename" msgstr "文件名" #. combobox header -#: library/cwm/src/modules/TablePopup.rb:490 +#: library/cwm/src/modules/TablePopup.rb:487 msgid "&Selected Option" msgstr "已选选项(&S)" #. heading / label -#: library/cwm/src/modules/TablePopup.rb:539 +#: library/cwm/src/modules/TablePopup.rb:536 msgid "Current Option: " msgstr "当前选项：" #. error report -#: library/cwm/src/modules/TablePopup.rb:726 +#: library/cwm/src/modules/TablePopup.rb:720 msgid "The selected option is already present." msgstr "所选选项已存在。" #. table header, shortcut for changed, keep very short -#: library/cwm/src/modules/TablePopup.rb:887 +#: library/cwm/src/modules/TablePopup.rb:882 msgid "Ch." msgstr "已修改" #. table header #. table header -#: library/cwm/src/modules/TablePopup.rb:889 -#: library/cwm/src/modules/TablePopup.rb:895 +#: library/cwm/src/modules/TablePopup.rb:884 +#: library/cwm/src/modules/TablePopup.rb:891 msgid "Option" msgstr "选项" #. table header #. table header -#: library/cwm/src/modules/TablePopup.rb:891 -#: library/cwm/src/modules/TablePopup.rb:897 +#: library/cwm/src/modules/TablePopup.rb:886 +#: library/cwm/src/modules/TablePopup.rb:893 msgid "Value" msgstr "值" #. help 1/4 -#: library/cwm/src/modules/TablePopup.rb:902 +#: library/cwm/src/modules/TablePopup.rb:899 msgid "" "<p><b><big>Editing the Settings</big></b><br>\n" "To edit the settings, choose the appropriate\n" @@ -893,21 +915,21 @@ "要编辑设置，请选择表中适宜的项，然后点击<b>编辑</b>。</p>" #. help 2/4, optional -#: library/cwm/src/modules/TablePopup.rb:911 +#: library/cwm/src/modules/TablePopup.rb:908 msgid "" "<p>To add a new option, click <b>Add</b>. To remove\n" "an option, select it and click <b>Delete</b>.</p>" msgstr "<p>要添加新选项，请点击<b>添加</b>。要移除某选项，请选择该选项并点击<b>删除</b>。</p>" #. help 3/4, optional -#: library/cwm/src/modules/TablePopup.rb:921 +#: library/cwm/src/modules/TablePopup.rb:918 msgid "" "<P>The <B>Ch.</B> column of the table shows \n" "whether the option was changed.</P>" msgstr "<P>表的<B>已修改</B>列显示了某选项是否已被修改。</P>" #. help 4/4, optional -#: library/cwm/src/modules/TablePopup.rb:931 +#: library/cwm/src/modules/TablePopup.rb:928 msgid "" "<p>To reorder the options, select an option\n" "and use <b>Up</b> and <b>Down</b> to move it up or down\n" @@ -915,38 +937,38 @@ msgstr "<p>要重新排序选项，请选择一个选项并使用<b>向上</b>或<b>向下</b>来将其在列表中上下移动。</p>" #. menu button -#: library/cwm/src/modules/WizardHW.rb:214 +#: library/cwm/src/modules/WizardHW.rb:209 msgid "&Other" msgstr "其它(&O)" #. translators: message for hardware configuration without any configured #. device -#: library/cwm/src/modules/WizardHW.rb:525 +#: library/cwm/src/modules/WizardHW.rb:509 msgid "The device is not configured" msgstr "设备未配置" #. translators: message for hardware configuration without any configured #. device -#: library/cwm/src/modules/WizardHW.rb:528 +#: library/cwm/src/modules/WizardHW.rb:512 msgid "Press <B>Edit</B> to configure" msgstr "请按<B>编辑</B>进行配置" #. Message shown while loading modules information -#: library/desktop/src/clients/menu.rb:198 +#: library/desktop/src/clients/menu.rb:197 msgid "Loading modules, please wait ..." msgstr "正在加载模块，请稍候..." #. Heading for NCurses Control Center -#: library/desktop/src/clients/menu.rb:226 +#: library/desktop/src/clients/menu.rb:224 msgid "YaST Control Center" msgstr "YaST 控制中心" -#: library/desktop/src/clients/menu.rb:264 +#: library/desktop/src/clients/menu.rb:262 msgid "Run" msgstr "运行" #. show popup when running as non-root -#: library/desktop/src/clients/menu.rb:275 +#: library/desktop/src/clients/menu.rb:273 msgid "" "YaST2 Control Center is not running as root.\n" "You can only see modules that do not require root privileges." @@ -955,12 +977,12 @@ "您只能看到不需要 root 特权的模块。" #. NCurses (textmode) Control Center headline -#: library/desktop/src/clients/menu.rb:323 +#: library/desktop/src/clients/menu.rb:320 msgid "Controlling YaST ncurses with the Keyboard" msgstr "使用键盘控制 YaST ncurses" #. NCurses Control Center help 1/ -#: library/desktop/src/clients/menu.rb:326 +#: library/desktop/src/clients/menu.rb:323 msgid "" "<p>1) <i>General</i><br>\n" "Navigate through the dialog elements with [TAB] to go to\n" @@ -975,12 +997,12 @@ "某些要素需要使用方向键 (例如在列表中滚动)。</p>" #. NCurses Control Center help 2/10 -#: library/desktop/src/clients/menu.rb:334 +#: library/desktop/src/clients/menu.rb:331 msgid "<p>Tree navigation is also done by arrow keys. To open or close a branch use [SPACE]. For modules showing a tree (might look like a list) of configuration items on the left side use [ENTER] to get corresponding dialog on the right.</p>" msgstr "<p>树形导航也可以使用箭头键完成。要打开或关闭一个分支请使用 [空格]。对于在左侧显示树形配置项 (可能看起来像一个列表) 的模块可使用 [回车] 来在右侧获得相应的对话框。</p>" #. NCurses Control Center help 3/10 -#: library/desktop/src/clients/menu.rb:341 +#: library/desktop/src/clients/menu.rb:338 msgid "" "<p>Buttons are equipped with shortcut keys (the highlighted\n" "letter). Use [ALT] and the letter to activate the button.</p>" @@ -989,14 +1011,14 @@ "可使用 [ALT] 和该字母来激活相应按钮。</p>" #. NCurses Control Center help 4/10 -#: library/desktop/src/clients/menu.rb:345 +#: library/desktop/src/clients/menu.rb:342 msgid "" "<p>Press [ESC] to close selection pop-ups (e.g., from\n" "menu buttons) without choosing anything.</p>\n" msgstr "<p>按 [ESC] 键可关闭选区弹窗 (例如，菜单按钮的弹窗) 而无需选择任何东西。</p>\n" #. NCurses Control Center help 5/10 -#: library/desktop/src/clients/menu.rb:349 +#: library/desktop/src/clients/menu.rb:346 msgid "" "<p>2) <i>Substitution of Keystrokes</i><br>\n" "<p>Because the environment can affect the use of the keyboard,\n" @@ -1009,7 +1031,7 @@ "若 [TAB] 和 [SHIFT] (或 [ALT])+ [TAB] 无效，可用 [CTRL] + [F] 使焦点前移，用 [CTRL] + [B] 使焦点后移。</p>" #. NCurses Control Center help 6/10 -#: library/desktop/src/clients/menu.rb:357 +#: library/desktop/src/clients/menu.rb:354 msgid "" "<p>If [ALT] + [letter] does not work,\n" "try [ESC] + [letter]. Example: [ESC] + [H] for [ALT] + [H].\n" @@ -1020,7 +1042,7 @@ "[ESC] + [TAB] 也可替代 [ALT] + [TAB]。</p>" #. NCurses Control Center help 7/10 -#: library/desktop/src/clients/menu.rb:363 +#: library/desktop/src/clients/menu.rb:360 msgid "" "<p>3) <i>Function Keys</i><br>\n" "F keys provide a quick access to main functions. The function key bindings for the current dialog are shown in the bottom line.</p>" @@ -1030,12 +1052,12 @@ "当前对话框的功能键绑定显示在底部。</p>" #. NCurses Control Center help 8/10 -#: library/desktop/src/clients/menu.rb:370 +#: library/desktop/src/clients/menu.rb:367 msgid "<p>The F keys are usually connected to a certain action:</p>" msgstr "<p>功能键通常与特定操作绑定：</p>" #. NCurses Control Center help 9/10 -#: library/desktop/src/clients/menu.rb:372 +#: library/desktop/src/clients/menu.rb:369 msgid "" "F1 = Help<br>\n" "F2 = Info or Description<br>\n" @@ -1060,7 +1082,7 @@ "F10 = 确定、下一步、完成或接受<br>" #. NCurses Control Center help 10/10 -#: library/desktop/src/clients/menu.rb:385 +#: library/desktop/src/clients/menu.rb:382 msgid "" "<p>In some environments, all or some\n" "F keys are not available.</p>" @@ -1068,7 +1090,7 @@ #. TRANSLATORS: popup question (with continue / cancel buttons) #. %1 is the filesystem path -#: library/general/src/modules/FileUtils.rb:295 +#: library/general/src/modules/FileUtils.rb:292 msgid "" "Although the path %1 exists, it is not a directory.\n" "Continue or cancel the operation?\n" @@ -1078,7 +1100,7 @@ #. TRANSLATORS: question popup (with yes / no buttons). A user entered non-existent path #. for a share, %1 is entered path -#: library/general/src/modules/FileUtils.rb:309 +#: library/general/src/modules/FileUtils.rb:306 msgid "" "The path %1 does not exist.\n" "Create it now?\n" @@ -1088,7 +1110,7 @@ #. TRANSLATORS: popup question (with continue / cancel buttons) #. %1 is the name (path) of the directory -#: library/general/src/modules/FileUtils.rb:328 +#: library/general/src/modules/FileUtils.rb:325 msgid "" "Failed to create the directory %1.\n" "Continue or cancel the current operation?\n" @@ -1266,8 +1288,8 @@ #. this media (CD) so no packages from this media will be installed #. PushButton label #: library/general/src/modules/Label.rb:250 -#: library/packages/src/modules/PackageCallbacks.rb:889 -#: library/wizard/src/modules/Confirm.rb:127 +#: library/packages/src/modules/PackageCallbacks.rb:664 +#: library/wizard/src/modules/Confirm.rb:126 msgid "&Skip" msgstr "跳过(&S)" @@ -1289,7 +1311,7 @@ #. TextEntry Label #. textentry label #: library/general/src/modules/Label.rb:319 -#: library/packages/src/modules/PackageCallbacks.rb:2581 +#: library/packages/src/modules/PackageCallbacks.rb:2230 msgid "&Password" msgstr "密码(&P)" @@ -1501,32 +1523,32 @@ #. #. @param [String] directory containing the installed system (/ in installed system) #. @return [String] the release information -#: library/general/src/modules/OSRelease.rb:63 +#: library/general/src/modules/OSRelease.rb:62 msgid "Release file %{file} not found" msgstr "未找到版本资讯文件 %{file}" #. Confirm user request to abort installation -#: library/general/src/modules/Popup.rb:833 +#: library/general/src/modules/Popup.rb:740 msgid "Really abort the installation?" msgstr "真的中止安装吗？" #. Confirm user request to abort System Repair -#: library/general/src/modules/Popup.rb:844 +#: library/general/src/modules/Popup.rb:749 msgid "Really abort YaST System Repair?" msgstr "真的中止 YaST 系统修复吗？" #. Button that will really abort the repair -#: library/general/src/modules/Popup.rb:846 +#: library/general/src/modules/Popup.rb:751 msgid "Abort System Repair" msgstr "中止系统修复" #. Button that will continue with the repair -#: library/general/src/modules/Popup.rb:848 +#: library/general/src/modules/Popup.rb:753 msgid "&Continue System Repair" msgstr "继续系统修复(&C)" #. Warning text for aborting an installation before anything is installed -#: library/general/src/modules/Popup.rb:851 +#: library/general/src/modules/Popup.rb:756 msgid "" "If you abort the installation now,\n" "Linux will not be installed.\n" @@ -1538,7 +1560,7 @@ #. Warning text for aborting an installation during the install process #. - After some installation steps have been performed - e.g. #. disks formatted / some packages already installed -#: library/general/src/modules/Popup.rb:862 +#: library/general/src/modules/Popup.rb:766 msgid "" "If you abort the installation now, you will\n" "have an incomplete Linux system\n" @@ -1551,7 +1573,7 @@ #. Warning text for aborting an installation during the install process #. right in the middle of some critical process (e.g. formatting) -#: library/general/src/modules/Popup.rb:871 +#: library/general/src/modules/Popup.rb:775 msgid "" "If you abort the installation now,\n" "Linux will be unusable.\n" @@ -1561,29 +1583,29 @@ "您将需要重装。" #. Confirm aborting the program -#: library/general/src/modules/Popup.rb:927 +#: library/general/src/modules/Popup.rb:829 msgid "Really abort?" msgstr "真的中止吗？" #. Additional hint when trying to abort program in spite of changes -#: library/general/src/modules/Popup.rb:935 +#: library/general/src/modules/Popup.rb:837 msgid "All changes will be lost!" msgstr "将丢失全部修改！" #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later #. button label -#: library/general/src/modules/Popup.rb:966 +#: library/general/src/modules/Popup.rb:867 msgid "&Details..." msgstr "细节(&D)..." #. translators: summary header for messages generated through autoinstallation -#: library/general/src/modules/Report.rb:105 +#: library/general/src/modules/Report.rb:101 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:113 +#: library/general/src/modules/Report.rb:109 msgid "Display Messages: %1" msgstr "显示消息：%1" @@ -1593,103 +1615,101 @@ #. translators: summary if the warnings should be written to log file #. translators: summary if the errors should be displayed #. translators: summary if the errors should be written to log file -#. human text for Boolean value -#: library/general/src/modules/Report.rb:116 -#: library/general/src/modules/Report.rb:134 -#: library/general/src/modules/Report.rb:150 -#: library/general/src/modules/Report.rb:168 -#: library/general/src/modules/Report.rb:184 -#: library/general/src/modules/Report.rb:202 -#: library/network/src/modules/NetworkPopup.rb:84 -#: library/types/src/modules/String.rb:113 +#. 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/network/src/modules/NetworkPopup.rb:86 +#: library/types/src/modules/String.rb:101 msgid "Yes" msgstr "是" -#. translators: summary if the errors should be written to log file -#. human text for Boolean value -#: library/general/src/modules/Report.rb:117 -#: library/general/src/modules/Report.rb:135 -#: library/general/src/modules/Report.rb:151 -#: library/general/src/modules/Report.rb:169 -#: library/general/src/modules/Report.rb:185 -#: library/general/src/modules/Report.rb:204 -#: library/network/src/modules/NetworkPopup.rb:83 -#: library/types/src/modules/String.rb:116 +#: 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/network/src/modules/NetworkPopup.rb:85 +#: library/types/src/modules/String.rb:101 msgid "No" msgstr "否" #. Report configuration - will have normal messages timeout? #. '%1' will be replaced by number of seconds -#: library/general/src/modules/Report.rb:124 +#: library/general/src/modules/Report.rb:118 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:131 +#: library/general/src/modules/Report.rb:125 msgid "Log Messages: %1" msgstr "日志消息：%1" #. translators: summary header for warnings generated through autoinstallation -#: library/general/src/modules/Report.rb:140 +#: library/general/src/modules/Report.rb:132 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:147 +#: library/general/src/modules/Report.rb:139 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:158 +#: library/general/src/modules/Report.rb:148 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:165 +#: library/general/src/modules/Report.rb:155 msgid "Log Warnings: %1" msgstr "日志警告：%1" #. translators: summary header for errors generated through autoinstallation -#: library/general/src/modules/Report.rb:174 +#: library/general/src/modules/Report.rb:162 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:181 +#: library/general/src/modules/Report.rb:169 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:192 +#: library/general/src/modules/Report.rb:178 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:199 +#: library/general/src/modules/Report.rb:185 msgid "Log Errors: %1" msgstr "日志错误：%1" #. translators: warnings summary header -#: library/general/src/modules/Report.rb:702 +#: library/general/src/modules/Report.rb:662 msgid "Warning:" msgstr "警告：" #. translators: errors summary header -#: library/general/src/modules/Report.rb:720 +#: library/general/src/modules/Report.rb:679 msgid "Error:" msgstr "错误：" #. translators: message summary header #. translators: message summary header -#: library/general/src/modules/Report.rb:738 -#: library/general/src/modules/Report.rb:756 +#: library/general/src/modules/Report.rb:696 +#: library/general/src/modules/Report.rb:713 msgid "Message:" msgstr "消息：" @@ -1742,25 +1762,25 @@ msgstr "删除(&L)" #. translators: Tree header -#: library/general/src/modules/ValueBrowser.rb:154 +#: library/general/src/modules/ValueBrowser.rb:153 msgid "&Variable" msgstr "变量(&V)" -#. TODO FIXME -#: library/gpg/src/modules/GPG.rb:242 +#. FIXME: do it +#: library/gpg/src/modules/GPG.rb:234 msgid "Xterm is missing, install xterm package." msgstr "缺少 Xterm，请安装 xterm 软件包。" #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:188 +#: library/gpg/src/modules/GPGWidgets.rb:187 msgid "GPG Private Keys" msgstr "GPG 私有密钥" #. table header - GPG key user ID #. table header - GPG key user ID -#: library/gpg/src/modules/GPGWidgets.rb:195 -#: library/gpg/src/modules/GPGWidgets.rb:227 +#: library/gpg/src/modules/GPGWidgets.rb:194 +#: library/gpg/src/modules/GPGWidgets.rb:226 msgid "User ID" msgstr "用户 ID" @@ -1769,14 +1789,14 @@ #. lazy #. Standard text strings #. GnuPG fingerprint used as "Fingerprint: AAA BBB CCC" -#: library/gpg/src/modules/GPGWidgets.rb:197 -#: library/gpg/src/modules/GPGWidgets.rb:229 +#: library/gpg/src/modules/GPGWidgets.rb:196 +#: library/gpg/src/modules/GPGWidgets.rb:228 #: library/packages/src/modules/SignatureCheckDialogs.rb:55 msgid "Fingerprint" msgstr "指纹" #. fill up the widget in init handler -#: library/gpg/src/modules/GPGWidgets.rb:208 +#: library/gpg/src/modules/GPGWidgets.rb:207 msgid "" "<p><big><b>GPG Private Key</b></big><br>\n" "The table contains list of the private GPG keys.</p>" @@ -1786,12 +1806,12 @@ #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:220 +#: library/gpg/src/modules/GPGWidgets.rb:219 msgid "GPG Public Keys" msgstr "GPG 公共密钥" #. fill up the widget in init handler -#: library/gpg/src/modules/GPGWidgets.rb:240 +#: library/gpg/src/modules/GPGWidgets.rb:239 msgid "" "<p><big><b>GPG Public Key</b></big><br>\n" "The table contains list of the public GPG keys.</p>" @@ -1801,11 +1821,11 @@ #. Get widget description map #. @return widget description map -#: library/gpg/src/modules/GPGWidgets.rb:283 +#: library/gpg/src/modules/GPGWidgets.rb:282 msgid "&Create a new GPG key..." msgstr "创建新的 GPG 密钥(&C)..." -#: library/gpg/src/modules/GPGWidgets.rb:286 +#: library/gpg/src/modules/GPGWidgets.rb:285 msgid "" "<p><big><b>Create a new GPG key</b></big><br>\n" "<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n" @@ -1818,12 +1838,12 @@ " </p>" #. text entry -#: library/gpg/src/modules/GPGWidgets.rb:326 +#: library/gpg/src/modules/GPGWidgets.rb:325 msgid "&Passphrase for GPG Key %1" msgstr "GPG 密钥 %1 的密码(&P)" #. help text -#: library/gpg/src/modules/GPGWidgets.rb:334 +#: library/gpg/src/modules/GPGWidgets.rb:333 msgid "" "<p><big><b>Passphrase</b></big><br>\n" "Enter passphrase to unlock the GPG key." @@ -1833,18 +1853,18 @@ #. Create a popup window term with the passphrase widget. #. @return [Yast::Term] definition of the popup -#: library/gpg/src/modules/GPGWidgets.rb:351 +#: library/gpg/src/modules/GPGWidgets.rb:350 msgid "Enter Passphrase" msgstr "输入密码" #. ask for the passphrase in the commandline (interactive) mode -#: library/gpg/src/modules/GPGWidgets.rb:381 +#: library/gpg/src/modules/GPGWidgets.rb:380 msgid "Enter Passphrase to Unlock GPG Key %1: " msgstr "输入密码以解锁 GPG 密钥 %1：" #. Prompt the user for a message to describe the changes #. that she did using YaST, logs it using {#Note} -#: library/log/src/modules/ALog.rb:107 +#: library/log/src/modules/ALog.rb:105 msgid "Enter a log message that describes the changes you made." msgstr "请输入一条日志消息描述您所做的修改。" @@ -1904,92 +1924,91 @@ #. @param [Hash{String => Object}] glob_param a map of global parameters of the log widget #. @param [Array Object>}] log_maps a list of maps describing all the logs #. @return [Yast::Term] the widget with buttons -#. menubutton -#: library/log/src/modules/LogView.rb:178 -#: library/log/src/modules/LogView.rb:279 -#: library/log/src/modules/LogView.rb:313 -#: library/log/src/modules/LogView.rb:553 +#: library/log/src/modules/LogView.rb:177 +#: library/log/src/modules/LogView.rb:277 +#: library/log/src/modules/LogView.rb:308 msgid "Ad&vanced" msgstr "高级(&V)" #. combo box entry (only used as fallback in case #. of error in the YaST code) -#: library/log/src/modules/LogView.rb:232 +#: library/log/src/modules/LogView.rb:231 msgid "Log" msgstr "日志" #. logview caption #. logview caption -#: library/log/src/modules/LogView.rb:239 -#: library/log/src/modules/LogView.rb:354 -#: library/log/src/modules/LogView.rb:474 -#: library/log/src/modules/LogView.rb:554 +#. menubutton +#: library/log/src/modules/LogView.rb:238 +#: library/log/src/modules/LogView.rb:349 +#: library/log/src/modules/LogView.rb:468 +#: library/log/src/modules/LogView.rb:545 msgid "&Log" msgstr "日志(&L)" #. menubutton entry -#: library/log/src/modules/LogView.rb:257 +#: library/log/src/modules/LogView.rb:255 msgid "&Save Log" msgstr "保存日志(&S)" #. popup caption, save into home directory by default (bnc#653601) -#: library/log/src/modules/LogView.rb:395 +#: library/log/src/modules/LogView.rb:390 msgid "Save Log as..." msgstr "日志另存为..." #. flag indicating if background process is (or should be) running -#: library/log/src/modules/LogViewCore.rb:72 +#: library/log/src/modules/LogViewCore.rb:67 msgid "Error occurred while reading the log." msgstr "读取日志时出错。" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:111 +#: library/network/src/modules/CWMFirewallInterfaces.rb:109 msgid "Firewall cannot be adjusted during first stage installation." msgstr "无法在安装第一阶段调整防火墙。" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:116 +#: library/network/src/modules/CWMFirewallInterfaces.rb:114 msgid "Firewall package is not installed." msgstr "未安装防火墙软件包。" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:120 +#: library/network/src/modules/CWMFirewallInterfaces.rb:118 msgid "Firewall is disabled" msgstr "防火墙已禁用" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:123 +#: library/network/src/modules/CWMFirewallInterfaces.rb:121 msgid "Firewall port is closed" msgstr "防火墙端口已关闭" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:126 +#: library/network/src/modules/CWMFirewallInterfaces.rb:124 msgid "Firewall port is open on all interfaces" msgstr "已在全部接口上打开了防火墙端口" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:129 +#: library/network/src/modules/CWMFirewallInterfaces.rb:127 msgid "Firewall port is open on selected interfaces" msgstr "已在所选接口上打开了防火墙端口" #. label -#: library/network/src/modules/CWMFirewallInterfaces.rb:132 +#: library/network/src/modules/CWMFirewallInterfaces.rb:130 msgid "No network interfaces are configured" msgstr "未配置网络接口" #. BNC #483455: Interface zone name -#: library/network/src/modules/CWMFirewallInterfaces.rb:157 +#: library/network/src/modules/CWMFirewallInterfaces.rb:155 msgid "Interface is not assigned to any zone" msgstr "未将接口指派到任何区域" #. transaltors: selection box title -#: library/network/src/modules/CWMFirewallInterfaces.rb:418 +#: library/network/src/modules/CWMFirewallInterfaces.rb:412 msgid "&Network Interfaces with Open Port in Firewall" msgstr "有打开的防火墙端口的网络接口(&N)" #. Check the INT zone, it's not protected by default #. See bnc #382686 -#: library/network/src/modules/CWMFirewallInterfaces.rb:511 +#: library/network/src/modules/CWMFirewallInterfaces.rb:499 msgid "" "These network interfaces assigned to internal network cannot be deselected:\n" "%1\n" @@ -1998,7 +2017,7 @@ "%1\n" #. question popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:532 +#: library/network/src/modules/CWMFirewallInterfaces.rb:520 msgid "" "No interface is selected. Service will not\n" "be available for other computers.\n" @@ -2010,7 +2029,7 @@ "继续吗？" #. yes-no popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:562 +#: library/network/src/modules/CWMFirewallInterfaces.rb:550 msgid "" "Because of SuSE Firewall settings, the port\n" "on the following interfaces will additionally be open:\n" @@ -2025,8 +2044,8 @@ #. yes-no popup #. yes-no popup -#: library/network/src/modules/CWMFirewallInterfaces.rb:581 -#: library/network/src/modules/CWMFirewallInterfaces.rb:635 +#: library/network/src/modules/CWMFirewallInterfaces.rb:569 +#: library/network/src/modules/CWMFirewallInterfaces.rb:623 msgid "" "Because of SuSE Firewall settings, the port\n" "on the following interfaces cannot be opened:\n" @@ -2040,22 +2059,22 @@ "继续吗？" #. translators: selection box title -#: library/network/src/modules/CWMFirewallInterfaces.rb:725 +#: library/network/src/modules/CWMFirewallInterfaces.rb:713 msgid "Network &Interfaces with Open Port in Firewall" msgstr "有打开的防火墙端口的网络接口(&I)" #. push button to select all network intefaces for firewall -#: library/network/src/modules/CWMFirewallInterfaces.rb:737 +#: library/network/src/modules/CWMFirewallInterfaces.rb:725 msgid "Select &All" msgstr "全选(&A)" #. push button to deselect all network intefaces for firewall -#: library/network/src/modules/CWMFirewallInterfaces.rb:745 +#: library/network/src/modules/CWMFirewallInterfaces.rb:733 msgid "Select &None" msgstr "全不选(&N)" #. TRANSLATORS: Error message, do not translate %{details} -#: library/network/src/modules/CWMFirewallInterfaces.rb:842 +#: library/network/src/modules/CWMFirewallInterfaces.rb:828 msgid "" "Error checking service status:\n" "%{details}" @@ -2064,7 +2083,7 @@ "%{details}" #. TRANSLATORS: Error message, do not translate %{details} -#: library/network/src/modules/CWMFirewallInterfaces.rb:877 +#: library/network/src/modules/CWMFirewallInterfaces.rb:862 msgid "" "Error setting service status:\n" "%{details}" @@ -2074,7 +2093,7 @@ #. help text for firewall settings widget 1/3, #. %1 is check box label, eg. "Open Port in Firewall" (without quotes) -#: library/network/src/modules/CWMFirewallInterfaces.rb:1013 +#: library/network/src/modules/CWMFirewallInterfaces.rb:998 msgid "" "<p><b><big>Firewall Settings</big></b><br>\n" "To open the firewall to allow access to the service from remote computers,\n" @@ -2086,60 +2105,60 @@ #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) #. note: %2 is correct, do not replace with %1!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1024 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1009 msgid "" "To select interfaces on which to open the port,\n" "click <b>%2</b>.<br>" msgstr "要选择将在其上打开端口的接口，请点击 <b>%2</b>。<br>" #. help text for firewall settings widget 3/3, -#: library/network/src/modules/CWMFirewallInterfaces.rb:1032 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1017 msgid "" "This option is available only if the firewall\n" "is enabled.</p>" msgstr "此选项只有启用了防火墙时才可用。</p>" #. part of help text - check box label, NO SHORTCUT!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1044 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1029 msgid "Open Port in Firewall" msgstr "打开防火墙中的端口" #. part of help text - push button label, NO SHORTCUT!!! -#: library/network/src/modules/CWMFirewallInterfaces.rb:1046 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1031 msgid "Firewall Details" msgstr "防火墙细节" #. check box -#: library/network/src/modules/CWMFirewallInterfaces.rb:1078 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1063 msgid "Open Port in &Firewall" msgstr "打开防火墙中的端口(&F)" #. push button -#: library/network/src/modules/CWMFirewallInterfaces.rb:1085 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1070 msgid "Firewall &Details..." msgstr "防火墙细节(&D)..." -#: library/network/src/modules/CWMFirewallInterfaces.rb:1113 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1098 msgid "Firewall Settings" msgstr "防火墙设置" #. label text -#: library/network/src/modules/CWMFirewallInterfaces.rb:1120 +#: library/network/src/modules/CWMFirewallInterfaces.rb:1105 msgid "Firewall is open" msgstr "防火墙已打开" #. pppN must be tried before pN, modem before netcard #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:405 -#: library/network/src/modules/NetworkInterfaces.rb:1206 -#: library/network/src/modules/NetworkInterfaces.rb:1217 +#: library/network/src/modules/NetworkInterfaces.rb:406 +#: library/network/src/modules/NetworkInterfaces.rb:1201 +#: library/network/src/modules/NetworkInterfaces.rb:1212 #: library/system/src/include/hwinfo/classnames.rb:108 #: library/system/src/include/hwinfo/classnames.rb:198 msgid "Modem" msgstr "调制解调器" -#: library/network/src/modules/NetworkInterfaces.rb:410 +#: library/network/src/modules/NetworkInterfaces.rb:411 msgid "Network Card" msgstr "网卡" @@ -2147,27 +2166,27 @@ #. Device type label #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:415 -#: library/network/src/modules/NetworkInterfaces.rb:1151 -#: library/network/src/modules/NetworkInterfaces.rb:1189 -#: library/network/src/modules/NetworkInterfaces.rb:1195 -#: library/network/src/modules/NetworkInterfaces.rb:1210 +#: library/network/src/modules/NetworkInterfaces.rb:416 +#: library/network/src/modules/NetworkInterfaces.rb:1146 +#: library/network/src/modules/NetworkInterfaces.rb:1184 +#: library/network/src/modules/NetworkInterfaces.rb:1190 +#: library/network/src/modules/NetworkInterfaces.rb:1205 msgid "ISDN" msgstr "综合业务数字网 (ISDN)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:420 -#: library/network/src/modules/NetworkInterfaces.rb:1158 +#: library/network/src/modules/NetworkInterfaces.rb:421 +#: library/network/src/modules/NetworkInterfaces.rb:1153 msgid "DSL" msgstr "数字用户线路 (DSL, 电话拨号)" -#: library/network/src/modules/NetworkInterfaces.rb:422 -#: library/packages/src/modules/SignatureCheckDialogs.rb:485 -#: library/packages/src/modules/SignatureCheckDialogs.rb:486 -#: library/packages/src/modules/SignatureCheckDialogs.rb:746 -#: library/packages/src/modules/SignatureCheckDialogs.rb:747 -#: library/packages/src/modules/SignatureCheckDialogs.rb:976 -#: library/packages/src/modules/SignatureCheckDialogs.rb:978 +#: library/network/src/modules/NetworkInterfaces.rb:423 +#: library/packages/src/modules/SignatureCheckDialogs.rb:487 +#: library/packages/src/modules/SignatureCheckDialogs.rb:488 +#: library/packages/src/modules/SignatureCheckDialogs.rb:760 +#: library/packages/src/modules/SignatureCheckDialogs.rb:761 +#: library/packages/src/modules/SignatureCheckDialogs.rb:996 +#: library/packages/src/modules/SignatureCheckDialogs.rb:998 msgid "Unknown" msgstr "未知" @@ -2177,326 +2196,326 @@ #. are represented as its sub-interfaces. #. And also we frequently confuse "device" and "interface" #. :-( -#: library/network/src/modules/NetworkInterfaces.rb:1127 +#: library/network/src/modules/NetworkInterfaces.rb:1122 msgid "Additional Address" msgstr "附加地址" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1132 +#: library/network/src/modules/NetworkInterfaces.rb:1127 msgid "ARCnet" msgstr "ARCnet" -#: library/network/src/modules/NetworkInterfaces.rb:1132 +#: library/network/src/modules/NetworkInterfaces.rb:1127 msgid "ARCnet Network Card" msgstr "ARCnet 网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1135 +#: library/network/src/modules/NetworkInterfaces.rb:1130 msgid "ATM" msgstr "ATM" -#: library/network/src/modules/NetworkInterfaces.rb:1136 +#: library/network/src/modules/NetworkInterfaces.rb:1131 msgid "Asynchronous Transfer Mode (ATM)" msgstr "异步传输模式 (ATM)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1140 +#: library/network/src/modules/NetworkInterfaces.rb:1135 msgid "Bluetooth" msgstr "蓝牙" -#: library/network/src/modules/NetworkInterfaces.rb:1141 +#: library/network/src/modules/NetworkInterfaces.rb:1136 msgid "Bluetooth Connection" msgstr "蓝牙连接" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1144 +#: library/network/src/modules/NetworkInterfaces.rb:1139 msgid "Bond" msgstr "绑定" -#: library/network/src/modules/NetworkInterfaces.rb:1144 +#: library/network/src/modules/NetworkInterfaces.rb:1139 msgid "Bond Network" msgstr "绑定网络" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1147 +#: library/network/src/modules/NetworkInterfaces.rb:1142 msgid "CLAW" msgstr "CLAW" -#: library/network/src/modules/NetworkInterfaces.rb:1148 +#: library/network/src/modules/NetworkInterfaces.rb:1143 msgid "Common Link Access for Workstation (CLAW)" msgstr "工作站通用链接访问 (CLAW)" -#: library/network/src/modules/NetworkInterfaces.rb:1151 +#: library/network/src/modules/NetworkInterfaces.rb:1146 msgid "ISDN Card" msgstr "ISDN 综合业务数字网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1154 +#: library/network/src/modules/NetworkInterfaces.rb:1149 #: library/system/src/include/hwinfo/classnames.rb:223 msgid "CTC" msgstr "CTC" -#: library/network/src/modules/NetworkInterfaces.rb:1155 +#: library/network/src/modules/NetworkInterfaces.rb:1150 msgid "Channel to Channel Interface (CTC)" msgstr "通道到通道接口 (CTC)" -#: library/network/src/modules/NetworkInterfaces.rb:1158 +#: library/network/src/modules/NetworkInterfaces.rb:1153 msgid "DSL Connection" msgstr "DSL 电话拨号连接" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1160 +#: library/network/src/modules/NetworkInterfaces.rb:1155 msgid "Dummy" msgstr "虚设" -#: library/network/src/modules/NetworkInterfaces.rb:1160 +#: library/network/src/modules/NetworkInterfaces.rb:1155 msgid "Dummy Network Device" msgstr "虚设网络设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1163 +#: library/network/src/modules/NetworkInterfaces.rb:1158 #: library/system/src/include/hwinfo/classnames.rb:227 msgid "ESCON" msgstr "ESCON" -#: library/network/src/modules/NetworkInterfaces.rb:1164 +#: library/network/src/modules/NetworkInterfaces.rb:1159 msgid "Enterprise System Connector (ESCON)" msgstr "企业系统连接器 (ESCON)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1168 +#: library/network/src/modules/NetworkInterfaces.rb:1163 #: library/system/src/include/hwinfo/classnames.rb:220 msgid "Ethernet" msgstr "有线网" -#: library/network/src/modules/NetworkInterfaces.rb:1169 +#: library/network/src/modules/NetworkInterfaces.rb:1164 msgid "Ethernet Network Card" msgstr "有线网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1172 +#: library/network/src/modules/NetworkInterfaces.rb:1167 #: library/system/src/include/hwinfo/classnames.rb:222 msgid "FDDI" msgstr "FDDI" -#: library/network/src/modules/NetworkInterfaces.rb:1172 +#: library/network/src/modules/NetworkInterfaces.rb:1167 msgid "FDDI Network Card" msgstr "光纤分布式数据接口 (FDDI) 网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1175 +#: library/network/src/modules/NetworkInterfaces.rb:1170 msgid "FICON" msgstr "FICON" -#: library/network/src/modules/NetworkInterfaces.rb:1176 +#: library/network/src/modules/NetworkInterfaces.rb:1171 msgid "Fiberchannel System Connector (FICON)" msgstr "光纤通道系统连接器 (FICON)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1180 +#: library/network/src/modules/NetworkInterfaces.rb:1175 msgid "HIPPI" msgstr "HIPPI" -#: library/network/src/modules/NetworkInterfaces.rb:1181 +#: library/network/src/modules/NetworkInterfaces.rb:1176 msgid "HIgh Performance Parallel Interface (HIPPI)" msgstr "高性能并行接口 (HIPPI)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1185 +#: library/network/src/modules/NetworkInterfaces.rb:1180 msgid "Hipersockets" msgstr "Hipersockets" -#: library/network/src/modules/NetworkInterfaces.rb:1186 +#: library/network/src/modules/NetworkInterfaces.rb:1181 msgid "Hipersockets Interface (HSI)" msgstr "超高速套接字接口 (HSI)" -#: library/network/src/modules/NetworkInterfaces.rb:1189 -#: library/network/src/modules/NetworkInterfaces.rb:1195 -#: library/network/src/modules/NetworkInterfaces.rb:1210 +#: library/network/src/modules/NetworkInterfaces.rb:1184 +#: library/network/src/modules/NetworkInterfaces.rb:1190 +#: library/network/src/modules/NetworkInterfaces.rb:1205 msgid "ISDN Connection" msgstr "ISDN 综合业务数字网连接" #. Device type label #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1191 -#: library/network/src/modules/NetworkInterfaces.rb:1193 +#: library/network/src/modules/NetworkInterfaces.rb:1186 +#: library/network/src/modules/NetworkInterfaces.rb:1188 msgid "IrDA" msgstr "IrDA" -#: library/network/src/modules/NetworkInterfaces.rb:1191 +#: library/network/src/modules/NetworkInterfaces.rb:1186 msgid "Infrared Network Device" msgstr "红外网络设备" -#: library/network/src/modules/NetworkInterfaces.rb:1193 +#: library/network/src/modules/NetworkInterfaces.rb:1188 msgid "Infrared Device" msgstr "红外设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1198 +#: library/network/src/modules/NetworkInterfaces.rb:1193 #: library/system/src/include/hwinfo/classnames.rb:224 msgid "IUCV" msgstr "IUCV" -#: library/network/src/modules/NetworkInterfaces.rb:1199 +#: library/network/src/modules/NetworkInterfaces.rb:1194 msgid "Inter User Communication Vehicle (IUCV)" msgstr "用户间通讯载体 (IUCV)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1202 +#: library/network/src/modules/NetworkInterfaces.rb:1197 msgid "OSA LCS" msgstr "OSA LCS" -#: library/network/src/modules/NetworkInterfaces.rb:1202 +#: library/network/src/modules/NetworkInterfaces.rb:1197 msgid "OSA LCS Network Card" msgstr "OSA 本地通道站 (LCS) 网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1204 +#: library/network/src/modules/NetworkInterfaces.rb:1199 #: library/system/src/include/hwinfo/classnames.rb:219 msgid "Loopback" msgstr "回路" -#: library/network/src/modules/NetworkInterfaces.rb:1204 +#: library/network/src/modules/NetworkInterfaces.rb:1199 msgid "Loopback Device" msgstr "回路设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1208 +#: library/network/src/modules/NetworkInterfaces.rb:1203 #: library/system/src/include/hwinfo/classnames.rb:228 msgid "Myrinet" msgstr "Myrinet" -#: library/network/src/modules/NetworkInterfaces.rb:1208 +#: library/network/src/modules/NetworkInterfaces.rb:1203 msgid "Myrinet Network Card" msgstr "Myrinet 网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1213 +#: library/network/src/modules/NetworkInterfaces.rb:1208 msgid "Parallel Line" msgstr "并行线路" -#: library/network/src/modules/NetworkInterfaces.rb:1214 +#: library/network/src/modules/NetworkInterfaces.rb:1209 msgid "Parallel Line Connection" msgstr "并行线路连接" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1220 +#: library/network/src/modules/NetworkInterfaces.rb:1215 #: library/system/src/include/hwinfo/classnames.rb:226 msgid "QETH" msgstr "QETH" -#: library/network/src/modules/NetworkInterfaces.rb:1221 +#: library/network/src/modules/NetworkInterfaces.rb:1216 msgid "OSA-Express or QDIO Device (QETH)" msgstr "OSA-Express 或 QDIO 设备 (QETH)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1225 +#: library/network/src/modules/NetworkInterfaces.rb:1220 msgid "IPv6-in-IPv4" msgstr "IPv6-in-IPv4" -#: library/network/src/modules/NetworkInterfaces.rb:1226 +#: library/network/src/modules/NetworkInterfaces.rb:1221 msgid "IPv6-in-IPv4 Encapsulation Device" msgstr "IPv6-in-IPv4 封装设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1230 +#: library/network/src/modules/NetworkInterfaces.rb:1225 msgid "Serial Line" msgstr "串行线路" -#: library/network/src/modules/NetworkInterfaces.rb:1231 +#: library/network/src/modules/NetworkInterfaces.rb:1226 msgid "Serial Line Connection" msgstr "串行线路连接" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1235 +#: library/network/src/modules/NetworkInterfaces.rb:1230 msgid "Token Ring" msgstr "令牌环" -#: library/network/src/modules/NetworkInterfaces.rb:1236 +#: library/network/src/modules/NetworkInterfaces.rb:1231 msgid "Token Ring Network Card" msgstr "令牌环网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1239 +#: library/network/src/modules/NetworkInterfaces.rb:1234 msgid "USB" msgstr "USB" -#: library/network/src/modules/NetworkInterfaces.rb:1239 +#: library/network/src/modules/NetworkInterfaces.rb:1234 msgid "USB Network Device" msgstr "USB 网络设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1241 +#: library/network/src/modules/NetworkInterfaces.rb:1236 msgid "VMWare" msgstr "VMWare" -#: library/network/src/modules/NetworkInterfaces.rb:1241 +#: library/network/src/modules/NetworkInterfaces.rb:1236 msgid "VMWare Network Device" msgstr "VMWare 网络设备" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1244 +#: library/network/src/modules/NetworkInterfaces.rb:1239 msgid "Wireless" msgstr "无线" -#: library/network/src/modules/NetworkInterfaces.rb:1245 +#: library/network/src/modules/NetworkInterfaces.rb:1240 msgid "Wireless Network Card" msgstr "无线网卡" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1248 +#: library/network/src/modules/NetworkInterfaces.rb:1243 msgid "XPNET" msgstr "XPNET" -#: library/network/src/modules/NetworkInterfaces.rb:1248 +#: library/network/src/modules/NetworkInterfaces.rb:1243 msgid "XP Network" msgstr "XP 网络" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1250 +#: library/network/src/modules/NetworkInterfaces.rb:1245 msgid "VLAN" msgstr "VLAN" -#: library/network/src/modules/NetworkInterfaces.rb:1250 +#: library/network/src/modules/NetworkInterfaces.rb:1245 msgid "Virtual LAN" msgstr "虚拟局域网" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1252 +#: library/network/src/modules/NetworkInterfaces.rb:1247 #: library/system/src/include/hwinfo/classnames.rb:89 #: library/system/src/include/hwinfo/classnames.rb:101 msgid "Bridge" msgstr "网桥" -#: library/network/src/modules/NetworkInterfaces.rb:1252 +#: library/network/src/modules/NetworkInterfaces.rb:1247 msgid "Network Bridge" msgstr "网桥" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1254 +#: library/network/src/modules/NetworkInterfaces.rb:1249 msgid "TUN" msgstr "TUN" -#: library/network/src/modules/NetworkInterfaces.rb:1254 +#: library/network/src/modules/NetworkInterfaces.rb:1249 msgid "Network TUNnel" msgstr "网络隧道" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1256 +#: library/network/src/modules/NetworkInterfaces.rb:1251 msgid "TAP" msgstr "TAP" -#: library/network/src/modules/NetworkInterfaces.rb:1256 +#: library/network/src/modules/NetworkInterfaces.rb:1251 msgid "Network TAP" msgstr "网络复写 (TAP)" #. Device type label -#: library/network/src/modules/NetworkInterfaces.rb:1258 +#: library/network/src/modules/NetworkInterfaces.rb:1253 #: library/system/src/include/hwinfo/classnames.rb:152 msgid "InfiniBand" msgstr "InfiniBand" -#: library/network/src/modules/NetworkInterfaces.rb:1258 +#: library/network/src/modules/NetworkInterfaces.rb:1253 msgid "InfiniBand Device" msgstr "无限宽带 (InfiniBand) 设备" @@ -2511,55 +2530,55 @@ msgstr "DHCP 地址" #. TRANSLATORS: table item, informing that device has no IP address -#: library/network/src/modules/NetworkPopup.rb:81 +#: library/network/src/modules/NetworkPopup.rb:83 msgid "No IP address assigned" msgstr "未指派 IP 地址" #. translators: table header - details about the network device -#: library/network/src/modules/NetworkPopup.rb:103 +#: library/network/src/modules/NetworkPopup.rb:105 msgid "Device Type" msgstr "设备类型" -#: library/network/src/modules/NetworkPopup.rb:104 +#: library/network/src/modules/NetworkPopup.rb:106 msgid "Device Name" msgstr "设备名称" -#: library/network/src/modules/NetworkPopup.rb:105 +#: library/network/src/modules/NetworkPopup.rb:107 msgid "IP Address" msgstr "IP 地址" -#: library/network/src/modules/NetworkPopup.rb:106 +#: library/network/src/modules/NetworkPopup.rb:108 msgid "Device ID" msgstr "设备 ID" -#: library/network/src/modules/NetworkPopup.rb:107 +#: library/network/src/modules/NetworkPopup.rb:109 msgid "Connected" msgstr "已连接" #. label message #. label message -#: library/network/src/modules/NetworkPopup.rb:193 -#: library/network/src/modules/NetworkPopup.rb:224 +#: library/network/src/modules/NetworkPopup.rb:191 +#: library/network/src/modules/NetworkPopup.rb:222 msgid "Scanning for hosts on this LAN..." msgstr "正在扫描此局域网中的主机..." #. selection box label -#: library/network/src/modules/NetworkPopup.rb:212 +#: library/network/src/modules/NetworkPopup.rb:210 msgid "&NFS Servers" msgstr "&NFS 服务器" #. selection box label -#: library/network/src/modules/NetworkPopup.rb:236 +#: library/network/src/modules/NetworkPopup.rb:234 msgid "Re&mote Hosts" msgstr "远程主机(&M)" #. selection box label -#: library/network/src/modules/NetworkPopup.rb:256 +#: library/network/src/modules/NetworkPopup.rb:254 msgid "&Exported Directories" msgstr "导出文件夹(&E)" #. TRANSLATORS: pop-up question when reading the service configuration -#: library/network/src/modules/NetworkService.rb:281 +#: library/network/src/modules/NetworkService.rb:280 msgid "" "Your network interfaces are currently controlled by NetworkManager\n" "but the service to configure might not work well with it.\n" @@ -2574,7 +2593,7 @@ #. If there is network running, return true. #. Otherwise show error popup depending on Stage and return false #. @return true if network running -#: library/network/src/modules/NetworkService.rb:349 +#: library/network/src/modules/NetworkService.rb:348 msgid "" "No running network detected.\n" "Restart installation and configure network in Linuxrc\n" @@ -2584,7 +2603,7 @@ "请重启安装程序并在 Linuxrc 中配置网络\n" "或无网络继续。" -#: library/network/src/modules/NetworkService.rb:355 +#: library/network/src/modules/NetworkService.rb:354 msgid "" "No running network detected.\n" "Configure network with YaST or Network Manager plug-in\n" @@ -2607,47 +2626,47 @@ "不允许使用空格。\n" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:114 +#: library/network/src/modules/SuSEFirewall.rb:115 msgid "External Zone" msgstr "外部区域" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:118 +#: library/network/src/modules/SuSEFirewall.rb:119 msgid "Internal Zone" msgstr "内部区域" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:122 +#: library/network/src/modules/SuSEFirewall.rb:123 msgid "Demilitarized Zone" msgstr "隔离区域" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:243 +#: library/network/src/modules/SuSEFirewall.rb:246 msgid "TCP" msgstr "TCP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:245 +#: library/network/src/modules/SuSEFirewall.rb:248 msgid "UDP" msgstr "UDP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:247 +#: library/network/src/modules/SuSEFirewall.rb:250 msgid "RPC" msgstr "RPC" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:249 +#: library/network/src/modules/SuSEFirewall.rb:252 msgid "IP" msgstr "IP" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/modules/SuSEFirewall.rb:1157 +#: library/network/src/modules/SuSEFirewall.rb:1158 msgid "Unknown Zone" msgstr "未知区域" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1504 +#: library/network/src/modules/SuSEFirewall.rb:1506 msgid "" "Interface '%1' is included in multiple firewall zones.\n" "Continuing with configuration can produce errors.\n" @@ -2663,7 +2682,7 @@ #. TRANSLATORS: Error message, %1 = interface name (like eth0) #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1970 +#: library/network/src/modules/SuSEFirewall.rb:1971 #: library/network/src/modules/SuSEFirewall.rb:2047 msgid "" "Interface '%1' is not assigned to any firewall zone.\n" @@ -2708,82 +2727,82 @@ msgstr "正在检查可能冲突的服务..." #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2655 +#: library/network/src/modules/SuSEFirewall.rb:2648 msgid "Writing Firewall Configuration" msgstr "写入防火墙配置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2663 +#: library/network/src/modules/SuSEFirewall.rb:2656 msgid "Write firewall settings" msgstr "写入防火墙设置" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2665 +#: library/network/src/modules/SuSEFirewall.rb:2658 msgid "Adjust firewall service" msgstr "调整防火墙服务" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2669 +#: library/network/src/modules/SuSEFirewall.rb:2662 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2671 +#: library/network/src/modules/SuSEFirewall.rb:2664 msgid "Adjusting firewall service..." msgstr "正在调整防火墙服务..." #. TRANSLATORS: a popup error message -#: library/network/src/modules/SuSEFirewall.rb:2690 +#: library/network/src/modules/SuSEFirewall.rb:2683 msgid "Writing settings failed" msgstr "写入设置失败" #. table item, %1 stands for the buggy protocol name -#: library/network/src/modules/SuSEFirewall.rb:3488 +#: library/network/src/modules/SuSEFirewall.rb:3476 msgid "Unknown protocol (%1)" msgstr "未知协议 (%1)" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/modules/SuSEFirewallProposal.rb:169 +#: library/network/src/modules/SuSEFirewallProposal.rb:167 msgid "New network device '%1' found; added as an internal firewall interface" msgstr "找到新的网络设备 '%1'；已添加为内部防火墙接口" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/modules/SuSEFirewallProposal.rb:180 +#: library/network/src/modules/SuSEFirewallProposal.rb:178 msgid "New network device '%1' found; added as an external firewall interface" msgstr "找到新的网络设备 '%1'；已添加为外部防火墙接口" #. TRANSLATORS: Proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:564 +#: library/network/src/modules/SuSEFirewallProposal.rb:547 msgid "SuSEfirewall2 package is not installed, firewall will be disabled." msgstr "未安装 SuSEfirewall2 软件包，防火墙将被禁用。" #. TRANSLATORS: Proposal informative text "Firewall is enabled (disable)" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:582 +#: library/network/src/modules/SuSEFirewallProposal.rb:565 msgid "Firewall is enabled (disable</a>)" msgstr "防火墙已启用 (禁用</a>)" #. TRANSLATORS: Proposal informative text "Firewall is disabled (enable)" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:587 +#: library/network/src/modules/SuSEFirewallProposal.rb:571 msgid "Firewall is disabled (enable</a>)" msgstr "防火墙已禁用 (启用</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:621 +#: library/network/src/modules/SuSEFirewallProposal.rb:606 msgid "SSH port is open (close</a>)" msgstr "SSH 端口已打开(关闭</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:626 +#: library/network/src/modules/SuSEFirewallProposal.rb:612 msgid "SSH port is blocked (open</a>)" msgstr "SSH 端口已屏蔽 (打开</a>)" #. TRANSLATORS: Network proposal informative text with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:646 +#: library/network/src/modules/SuSEFirewallProposal.rb:633 msgid "" "SSH port is open (close</a>), but\n" "there are no network interfaces configured" @@ -2792,39 +2811,39 @@ "但尚未配置网络接口" #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:661 +#: library/network/src/modules/SuSEFirewallProposal.rb:648 msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." msgstr "您正在通过 SSH 安装系统，但您尚未打开防火墙上的 SSH 端口。" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:703 +#: library/network/src/modules/SuSEFirewallProposal.rb:690 msgid "Remote Administration (VNC) ports are open (close</a>)" msgstr "远程管理 (VNC) 端口已打开 (关闭</a>)" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: library/network/src/modules/SuSEFirewallProposal.rb:708 +#: library/network/src/modules/SuSEFirewallProposal.rb:696 msgid "Remote Administration (VNC) ports are blocked (open</a>)" msgstr "远程管理 (VNC) 端口已屏蔽 (打开</a>)" #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:718 +#: library/network/src/modules/SuSEFirewallProposal.rb:707 msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." msgstr "您正在通过远程管理 (VNC) 安装系统，但您尚未打开防火墙上的 VNC 端口。" #. TRANSLATORS: Network proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:736 +#: library/network/src/modules/SuSEFirewallProposal.rb:725 msgid "iSCSI Target ports are open" msgstr "iSCSI 目标端口已打开" #. TRANSLATORS: Network proposal informative text -#: library/network/src/modules/SuSEFirewallProposal.rb:738 +#: library/network/src/modules/SuSEFirewallProposal.rb:728 msgid "iSCSI Target ports are blocked" msgstr "iSCSI 目标端口已屏蔽" #. TRANSLATORS: This is a warning message. Installation to iSCSI without iSCSI allowed on firewall -#: library/network/src/modules/SuSEFirewallProposal.rb:746 +#: library/network/src/modules/SuSEFirewallProposal.rb:737 msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall." msgstr "您正在通过 iSCSI 目标安装系统，但您尚未在防火墙上打开需要的端口。" @@ -2861,87 +2880,70 @@ #. "broadcast_ports" : [ ], #. ] #. ); -#: library/network/src/modules/SuSEFirewallServices.rb:355 -#: library/network/src/modules/SuSEFirewallServices.rb:638 +#: library/network/src/modules/SuSEFirewallServices.rb:354 +#: library/network/src/modules/SuSEFirewallServices.rb:637 msgid "Service with name '%{service_name}' does not exist" msgstr "名为 '%{service_name}' 的服务不存在" #. Fallback for presented service -#: library/network/src/modules/SuSEFirewallServices.rb:431 +#: library/network/src/modules/SuSEFirewallServices.rb:430 msgid "Service: %{filename}" msgstr "服务：%{filename}" #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server -#: library/network/src/modules/SuSEFirewallServices.rb:504 +#: library/network/src/modules/SuSEFirewallServices.rb:503 msgid "Unknown service '%1'" msgstr "未知服务 '%1'" #. the message is followed by list of required packages #. Popup Text #: library/packages/src/include/packages/common.rb:107 -#: library/packages/src/include/packages/common.rb:132 +#: library/packages/src/include/packages/common.rb:135 msgid "These packages need to be installed:" msgstr "需要安装这些软件包：" #. Popup Text -#: library/packages/src/include/packages/common.rb:108 -#: library/packages/src/include/packages/common.rb:134 +#: library/packages/src/include/packages/common.rb:109 +#: library/packages/src/include/packages/common.rb:137 msgid "These packages need to be removed:" msgstr "需要移除这些软件包：" #. labels changed for bug #215195 #. Label::ContinueButton (), Label::CancelButton (), #. push button label -#: library/packages/src/include/packages/common.rb:156 +#: library/packages/src/include/packages/common.rb:158 msgid "&Uninstall" msgstr "卸载(&U)" -#. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:207 -#: library/packages/src/modules/PackageCallbacks.rb:1727 -msgid "Package: " -msgstr "软件包：" - -#: library/packages/src/modules/PackageCallbacks.rb:208 -msgid "Size: " -msgstr "大小：" - -#: library/packages/src/modules/PackageCallbacks.rb:231 -msgid "Remaining time to automatic retry: %1" -msgstr "自动重试前剩余时间：%1" - +#. -------------------------------------------------------------------------- +#. defaults #. at start of file providal -#: library/packages/src/modules/PackageCallbacks.rb:244 -#: library/packages/src/modules/PackageCallbacks.rb:252 +#: library/packages/src/modules/PackageCallbacks.rb:149 +#: library/packages/src/modules/PackageCallbacks.rb:157 msgid "Downloading package %1 (%2)..." msgstr "正在下载软件包 %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:256 +#: library/packages/src/modules/PackageCallbacks.rb:161 msgid "Downloading Package" msgstr "正在下载软件包" -#. check box -#: library/packages/src/modules/PackageCallbacks.rb:314 -msgid "Show &details" -msgstr "显示细节(&D)" - #. error message, %1 is a package name -#: library/packages/src/modules/PackageCallbacks.rb:380 +#: library/packages/src/modules/PackageCallbacks.rb:220 msgid "Package %1 is broken, integrity check has failed." msgstr "软件包 %1 已损坏，完整性检查失败。" #. command line mode - ask user whether installation of the failed package should be retried #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:393 -#: library/packages/src/modules/PackageCallbacks.rb:610 +#: library/packages/src/modules/PackageCallbacks.rb:232 +#: library/packages/src/modules/PackageCallbacks.rb:447 msgid "Retry installation of the package?" msgstr "重试安装该软件包吗？" #. command line mode - ask user whether the installation should be aborted #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:401 -#: library/packages/src/modules/PackageCallbacks.rb:618 +#: library/packages/src/modules/PackageCallbacks.rb:240 +#: library/packages/src/modules/PackageCallbacks.rb:455 msgid "Abort the installation?" msgstr "中止安装吗？" @@ -2950,15 +2952,15 @@ #. detail string is appended to the end #. error message, %1 is code of the error, #. detail string is appended to the end -#: library/packages/src/modules/PackageCallbacks.rb:429 -#: library/packages/src/modules/PackageCallbacks.rb:463 -#: library/packages/src/modules/PackageCallbacks.rb:2493 +#: library/packages/src/modules/PackageCallbacks.rb:268 +#: library/packages/src/modules/PackageCallbacks.rb:302 +#: library/packages/src/modules/PackageCallbacks.rb:2143 msgid "Error: %1:" msgstr "错误：%1：" #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a download error -#: library/packages/src/modules/PackageCallbacks.rb:486 +#: library/packages/src/modules/PackageCallbacks.rb:326 msgid "" "Ignoring a download failure may result in a broken system.\n" "Verify the system later by running the Software Management module.\n" @@ -2967,35 +2969,35 @@ "请稍后运行软件管理模块校验系统。\n" #. At start of package install. -#: library/packages/src/modules/PackageCallbacks.rb:526 +#: library/packages/src/modules/PackageCallbacks.rb:364 msgid "Uninstalling package %1 (%2)..." msgstr "正在卸载软件包 %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:527 +#: library/packages/src/modules/PackageCallbacks.rb:366 msgid "Installing package %1 (%2)..." msgstr "正在安装软件包 %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:534 +#: library/packages/src/modules/PackageCallbacks.rb:374 msgid "Uninstalling Package" msgstr "正在卸载软件包" -#: library/packages/src/modules/PackageCallbacks.rb:534 +#: library/packages/src/modules/PackageCallbacks.rb:374 msgid "Installing Package" msgstr "正在安装软件包" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:595 +#: library/packages/src/modules/PackageCallbacks.rb:430 msgid "Removal of package %1 failed." msgstr "软件包 %1 移除失败。" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:597 +#: library/packages/src/modules/PackageCallbacks.rb:433 msgid "Installation of package %1 failed." msgstr "软件包 %1 安装失败。" #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a package installation error -#: library/packages/src/modules/PackageCallbacks.rb:669 +#: library/packages/src/modules/PackageCallbacks.rb:506 msgid "" "Ignoring a package failure may result in a broken system.\n" "The system should be later verified by running the Software Management module." @@ -3004,7 +3006,7 @@ "稍后应运行软件管理模块校验系统。" #. error report -#: library/packages/src/modules/PackageCallbacks.rb:792 +#: library/packages/src/modules/PackageCallbacks.rb:575 msgid "" "<p>The repository at the specified URL now provides a different media ID.\n" "If the URL is correct, this indicates that the repository content has changed. To \n" @@ -3019,27 +3021,27 @@ #. media is double sided, we want the user to insert the 'Side A' of the media #. the complete string will be "<product> <media> <number>, <side>" #. e.g. "'SuSE Linux 9.0' DVD 1, Side A" -#: library/packages/src/modules/PackageCallbacks.rb:807 +#: library/packages/src/modules/PackageCallbacks.rb:590 msgid "Side A" msgstr "A 面" #. media is double sided, we want the user to insert the 'Side B' of the media -#: library/packages/src/modules/PackageCallbacks.rb:810 +#: library/packages/src/modules/PackageCallbacks.rb:593 msgid "Side B" msgstr "B 面" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:824 +#: library/packages/src/modules/PackageCallbacks.rb:608 msgid "%1 (Disc %2)" msgstr "%1 (光盘 %2)" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:826 +#: library/packages/src/modules/PackageCallbacks.rb:611 msgid "%1 (Medium %2)" msgstr "%1 (介质 %2)" #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2") -#: library/packages/src/modules/PackageCallbacks.rb:831 +#: library/packages/src/modules/PackageCallbacks.rb:617 msgid "" "Insert\n" "'%1'" @@ -3048,7 +3050,7 @@ "'%1'" #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:836 +#: library/packages/src/modules/PackageCallbacks.rb:622 msgid "" "Cannot access installation media\n" "%1\n" @@ -3061,7 +3063,7 @@ "请检查能否访问文件夹。" #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:848 +#: library/packages/src/modules/PackageCallbacks.rb:634 msgid "" "Cannot access installation media \n" "%1\n" @@ -3073,90 +3075,85 @@ "%2。\n" "请检查能否访问服务器。" -#. currently unused -#: library/packages/src/modules/PackageCallbacks.rb:860 -msgid "The correct repository medium could not be mounted." -msgstr "无法挂载正确的软件源介质。" - #. wrong media id, offer "Ignore" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:881 -#: library/packages/src/modules/PackageCallbacks.rb:2170 +#: library/packages/src/modules/PackageCallbacks.rb:659 +#: library/packages/src/modules/PackageCallbacks.rb:1838 msgid "Skip Autorefresh" msgstr "跳过自动刷新" #. menu button label - used for more then one device #. push button label - in the media change popup, user can eject the CD/DVD -#: library/packages/src/modules/PackageCallbacks.rb:904 -#: library/packages/src/modules/PackageCallbacks.rb:909 +#: library/packages/src/modules/PackageCallbacks.rb:678 +#: library/packages/src/modules/PackageCallbacks.rb:681 msgid "&Eject" msgstr "弹出(&E)" -#: library/packages/src/modules/PackageCallbacks.rb:921 +#: library/packages/src/modules/PackageCallbacks.rb:688 msgid "A&utomatically Eject CD or DVD Medium" msgstr "自动弹出 CD 或 DVD 介质(&U)" #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:989 +#: library/packages/src/modules/PackageCallbacks.rb:755 msgid "Retry the installation?" msgstr "重试安装吗？" #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:997 +#: library/packages/src/modules/PackageCallbacks.rb:763 msgid "Skip the medium?" msgstr "跳过介质吗？" #. otherwise ignore the medium -#: library/packages/src/modules/PackageCallbacks.rb:1004 +#: library/packages/src/modules/PackageCallbacks.rb:770 msgid "Ignoring the bad medium..." msgstr "正在忽略损坏的介质..." #. TextEntry label #. TextEntry label -#: library/packages/src/modules/PackageCallbacks.rb:1025 -#: library/packages/src/modules/PackageCallbacks.rb:1086 +#: library/packages/src/modules/PackageCallbacks.rb:791 +#: library/packages/src/modules/PackageCallbacks.rb:847 msgid "&URL" msgstr "&URL" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1333 +#: library/packages/src/modules/PackageCallbacks.rb:1039 msgid "Creating Repository %1" msgstr "正在创建软件源 %1" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1366 +#: library/packages/src/modules/PackageCallbacks.rb:1072 msgid "An error occurred while creating the repository." msgstr "创建软件源时出错。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1370 -#: library/packages/src/modules/PackageCallbacks.rb:1501 -#: library/packages/src/modules/PackageCallbacks.rb:1613 +#: library/packages/src/modules/PackageCallbacks.rb:1076 +#: library/packages/src/modules/PackageCallbacks.rb:1203 +#: library/packages/src/modules/PackageCallbacks.rb:1313 msgid "Unable to retrieve the remote repository description." msgstr "不能撷取远程软件源描述。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1373 -#: library/packages/src/modules/PackageCallbacks.rb:1504 -#: library/packages/src/modules/PackageCallbacks.rb:1616 +#: library/packages/src/modules/PackageCallbacks.rb:1079 +#: library/packages/src/modules/PackageCallbacks.rb:1206 +#: library/packages/src/modules/PackageCallbacks.rb:1316 msgid "An error occurred while retrieving the new metadata." msgstr "撷取新的元数据时出错。" #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1376 -#: library/packages/src/modules/PackageCallbacks.rb:1507 -#: library/packages/src/modules/PackageCallbacks.rb:1619 +#: library/packages/src/modules/PackageCallbacks.rb:1082 +#: library/packages/src/modules/PackageCallbacks.rb:1209 +#: library/packages/src/modules/PackageCallbacks.rb:1319 msgid "The repository is not valid." msgstr "该软件源无效。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1379 +#: library/packages/src/modules/PackageCallbacks.rb:1085 msgid "The repository metadata is invalid." msgstr "软件源元数据无效。" @@ -3164,96 +3161,92 @@ #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether target initializatin can be restarted -#: library/packages/src/modules/PackageCallbacks.rb:1392 -#: library/packages/src/modules/PackageCallbacks.rb:1526 -#: library/packages/src/modules/PackageCallbacks.rb:1632 -#: library/packages/src/modules/PackageCallbacks.rb:2447 +#: library/packages/src/modules/PackageCallbacks.rb:1098 +#: library/packages/src/modules/PackageCallbacks.rb:1228 +#: library/packages/src/modules/PackageCallbacks.rb:1332 +#: library/packages/src/modules/PackageCallbacks.rb:2097 msgid "Retry?" msgstr "重试吗？" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1440 -#: library/packages/src/modules/PackageCallbacks.rb:1448 +#: library/packages/src/modules/PackageCallbacks.rb:1144 +#: library/packages/src/modules/PackageCallbacks.rb:1152 msgid "Probing Repository %1" msgstr "正在检测软件源 %1" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1497 +#: library/packages/src/modules/PackageCallbacks.rb:1199 msgid "Error occurred while probing the repository." msgstr "检测软件源时出错。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1510 +#: library/packages/src/modules/PackageCallbacks.rb:1212 msgid "Repository probing details." msgstr "检测到的软件源细节。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1513 +#: library/packages/src/modules/PackageCallbacks.rb:1215 msgid "Repository metadata is invalid." msgstr "软件源元数据无效。" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1609 +#: library/packages/src/modules/PackageCallbacks.rb:1309 msgid "Repository %1" msgstr "软件源 %1" #. at start of delta providal -#: library/packages/src/modules/PackageCallbacks.rb:1697 +#: library/packages/src/modules/PackageCallbacks.rb:1397 msgid "Downloading delta RPM package %1 (%2)..." msgstr "正在下载增量 RPM 包 %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1705 +#: library/packages/src/modules/PackageCallbacks.rb:1405 msgid "Downloading Delta RPM package" msgstr "正在下载增量 RPM 包" #. at start of delta application -#: library/packages/src/modules/PackageCallbacks.rb:1718 +#: library/packages/src/modules/PackageCallbacks.rb:1418 msgid "Applying delta RPM package %1..." msgstr "正在应用增量 RPM 包 %1..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1725 +#: library/packages/src/modules/PackageCallbacks.rb:1425 msgid "Applying delta RPM package" msgstr "正在应用增量 RPM 包" -#. at start of patch providal -#: library/packages/src/modules/PackageCallbacks.rb:1746 -msgid "Downloading patch RPM package %1 (%2)..." -msgstr "正在下载补丁 RPM 包 %1 (%2)..." - #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1754 -msgid "Downloading Patch RPM Package" -msgstr "正在下载补丁 RPM 包" +#: library/packages/src/modules/PackageCallbacks.rb:1427 +#: library/packages/src/modules/PackageCallbacks.rb:3075 +msgid "Package: " +msgstr "软件包：" #. close popup -#: library/packages/src/modules/PackageCallbacks.rb:1824 +#: library/packages/src/modules/PackageCallbacks.rb:1493 msgid "Starting script %1 (patch %2)..." msgstr "正在启动脚本 %1 (补丁 %2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1833 +#: library/packages/src/modules/PackageCallbacks.rb:1502 msgid "Running Script" msgstr "正在运行脚本" #. label, patch name follows -#: library/packages/src/modules/PackageCallbacks.rb:1838 +#: library/packages/src/modules/PackageCallbacks.rb:1507 msgid "Patch: " msgstr "补丁：" #. label, script name follows -#: library/packages/src/modules/PackageCallbacks.rb:1845 +#: library/packages/src/modules/PackageCallbacks.rb:1516 msgid "Script: " msgstr "脚本：" #. label -#: library/packages/src/modules/PackageCallbacks.rb:1851 +#: library/packages/src/modules/PackageCallbacks.rb:1522 msgid "Output of the Script" msgstr "脚本输出" #. label, %1 is patch name with version and architecture -#: library/packages/src/modules/PackageCallbacks.rb:1939 +#: library/packages/src/modules/PackageCallbacks.rb:1610 msgid "" "Patch: %1\n" "\n" @@ -3262,7 +3255,7 @@ "\n" #. a popup question with "Continue", "Skip" and "Abort" buttons -#: library/packages/src/modules/PackageCallbacks.rb:1956 +#: library/packages/src/modules/PackageCallbacks.rb:1627 msgid "" "The repositories are being refreshed.\n" "Continue with refreshing?\n" @@ -3276,44 +3269,36 @@ "注意：若跳过刷新，某些软件包可能会缺失或者过时。" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:1971 +#: library/packages/src/modules/PackageCallbacks.rb:1642 msgid "&Skip Refresh" msgstr "跳过刷新(&S)" #. heading of popup -#. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2005 -#: library/packages/src/modules/PackageCallbacks.rb:2047 +#: library/packages/src/modules/PackageCallbacks.rb:1676 msgid "Downloading" msgstr "正在下载" #. message in a progress popup #. progress bar label, %1 is URL with optional download rate -#: library/packages/src/modules/PackageCallbacks.rb:2055 -#: library/packages/src/modules/PackageCallbacks.rb:2103 +#: library/packages/src/modules/PackageCallbacks.rb:1723 +#: library/packages/src/modules/PackageCallbacks.rb:1771 msgid "Downloading: %1" msgstr "正在下载：%1" #. heading of popup #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:2208 -#: library/packages/src/modules/PackageCallbacks.rb:2283 +#: library/packages/src/modules/PackageCallbacks.rb:1875 +#: library/packages/src/modules/PackageCallbacks.rb:1941 msgid "Checking Package Database" msgstr "正在检查软件包数据库" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2211 +#: library/packages/src/modules/PackageCallbacks.rb:1878 msgid "Rebuilding package database. This process can take some time." msgstr "正在重建软件包数据库。此过程要花费一点时间。" -#. progress bar label -#: library/packages/src/modules/PackageCallbacks.rb:2216 -#: library/packages/src/modules/PackageCallbacks.rb:2299 -msgid "Status" -msgstr "状态" - #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2249 +#: library/packages/src/modules/PackageCallbacks.rb:1911 msgid "" "Rebuilding of package database failed:\n" "%1" @@ -3322,12 +3307,16 @@ "%1" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:2286 +#: library/packages/src/modules/PackageCallbacks.rb:1944 msgid "Converting package database. This process can take some time." msgstr "正在转换软件包数据库。此过程要花费一点时间。" +#: library/packages/src/modules/PackageCallbacks.rb:1957 +msgid "Status" +msgstr "状态" + #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:2325 +#: library/packages/src/modules/PackageCallbacks.rb:1981 msgid "" "Conversion of package database failed:\n" "%1" @@ -3336,12 +3325,12 @@ "%1" #. progress message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2365 +#: library/packages/src/modules/PackageCallbacks.rb:2017 msgid "Reading RPM database..." msgstr "正在读取 RPM 数据库..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:2375 +#: library/packages/src/modules/PackageCallbacks.rb:2027 msgid "Reading Installed Packages" msgstr "正在读取已安装的软件包" @@ -3352,27 +3341,27 @@ #. `Label(""), #. `PushButton(`id(`abort), Label::AbortButton()) #. ) -#: library/packages/src/modules/PackageCallbacks.rb:2381 -#: library/packages/src/modules/PackageCallbacks.rb:2397 +#: library/packages/src/modules/PackageCallbacks.rb:2033 +#: library/packages/src/modules/PackageCallbacks.rb:2049 msgid "Scanning RPM database..." msgstr "正在扫描 RPM 数据库..." #. error message, could not read RPM database -#: library/packages/src/modules/PackageCallbacks.rb:2436 +#: library/packages/src/modules/PackageCallbacks.rb:2086 msgid "Initialization of the target failed." msgstr "目标初始化失败。" #. status message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2527 +#: library/packages/src/modules/PackageCallbacks.rb:2178 msgid "RPM database read" msgstr "已读取 RPM 数据库" #. heading in a popup window -#: library/packages/src/modules/PackageCallbacks.rb:2563 +#: library/packages/src/modules/PackageCallbacks.rb:2212 msgid "User Authentication" msgstr "用户认证" -#: library/packages/src/modules/PackageCallbacks.rb:2569 +#: library/packages/src/modules/PackageCallbacks.rb:2218 msgid "" "URL: %1\n" "\n" @@ -3383,10 +3372,23 @@ "%2" #. textentry label -#: library/packages/src/modules/PackageCallbacks.rb:2578 +#: library/packages/src/modules/PackageCallbacks.rb:2227 msgid "&User Name" msgstr "用户名(&U)" +#. check box +#: library/packages/src/modules/PackageCallbacks.rb:3010 +msgid "Show &details" +msgstr "显示细节(&D)" + +#: library/packages/src/modules/PackageCallbacks.rb:3076 +msgid "Size: " +msgstr "大小：" + +#: library/packages/src/modules/PackageCallbacks.rb:3099 +msgid "Remaining time to automatic retry: %1" +msgstr "自动重试前剩余时间：%1" + #. ask to send quit signal to PackageKit #: library/packages/src/modules/PackageLock.rb:58 msgid "" @@ -3396,7 +3398,7 @@ "PackageKit 仍在运行 (可能正忙)。\n" "再次请求退出 PackageKit？" -#: library/packages/src/modules/PackageLock.rb:61 +#: library/packages/src/modules/PackageLock.rb:62 msgid "" "PackageKit is blocking software management.\n" "This happens when the updater applet or another software management\n" @@ -3412,21 +3414,21 @@ #. TRANSLATORS: a popup headline #. TRANSLATORS: a popup headline #. TRANSLATORS: a popup headline -#: library/packages/src/modules/PackageLock.rb:106 -#: library/packages/src/modules/PackageLock.rb:157 -#: library/packages/src/modules/PackageLock.rb:181 +#: library/packages/src/modules/PackageLock.rb:108 +#: library/packages/src/modules/PackageLock.rb:159 +#: library/packages/src/modules/PackageLock.rb:183 msgid "Accessing the Software Management Failed" msgstr "访问软件管理失败" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:110 +#: library/packages/src/modules/PackageLock.rb:112 msgid "" "Would you like to continue without having access\n" "to the software management or retry to access it?\n" msgstr "您愿意在无法访问软件管理的情况下继续，还是重试访问软件管理呢？\n" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:161 +#: library/packages/src/modules/PackageLock.rb:163 msgid "" "Would you like to retry accessing the software manager,\n" "continue without having access to the software management,\n" @@ -3434,19 +3436,19 @@ msgstr "您愿意重试访问软件管理器，在无法访问软件管理的情况下继续，还是中止本程序呢？\n" #. TRANSLATORS: an error message with question -#: library/packages/src/modules/PackageLock.rb:185 +#: library/packages/src/modules/PackageLock.rb:187 msgid "Would you like to abort or try again?\n" msgstr "您希望中止还是重试呢？\n" #. print the question #. popup heading, with rich text widget and Yes/No buttons -#: library/packages/src/modules/PackageSystem.rb:187 -#: library/packages/src/modules/PackageSystem.rb:193 +#: library/packages/src/modules/PackageSystem.rb:188 +#: library/packages/src/modules/PackageSystem.rb:194 msgid "Do you accept this license agreement?" msgstr "您接受此许可协议吗？" #. error message, after pressing [OK] the package manager is displayed -#: library/packages/src/modules/PackageSystem.rb:223 +#: library/packages/src/modules/PackageSystem.rb:224 msgid "" "There are unresolved dependencies which need\n" "to be solved manually in the software manager." @@ -3478,17 +3480,17 @@ msgstr "若未安装必需的软件包就继续，YaST 可能无法正常工作。\n" #. dialog heading, %1 is package name -#: library/packages/src/modules/PackagesUI.rb:153 +#: library/packages/src/modules/PackagesUI.rb:152 msgid "Confirm Package License: %1" msgstr "确认软件包许可：%1" #. push button -#: library/packages/src/modules/PackagesUI.rb:160 +#: library/packages/src/modules/PackagesUI.rb:159 msgid "I &Agree" msgstr "我同意(&A)" #. push button -#: library/packages/src/modules/PackagesUI.rb:162 +#: library/packages/src/modules/PackagesUI.rb:161 msgid "I &Disagree" msgstr "我不同意(&D)" @@ -3511,7 +3513,7 @@ "要拒绝软件包许可，请点击<b>我不同意</b>。" #. Help text for software patterns / selections dialog -#: library/packages/src/modules/PackagesUI.rb:331 +#: library/packages/src/modules/PackagesUI.rb:326 msgid "" "<p>\n" "\t\t This dialog allows you to define this system's tasks and what software to install.\n" @@ -3525,7 +3527,7 @@ "\t\t 要查看某个项的描述，请在列表中选择它。\n" "\t\t </p>" -#: library/packages/src/modules/PackagesUI.rb:338 +#: library/packages/src/modules/PackagesUI.rb:333 msgid "" "<p>\n" "\t\t Change the status of an item by clicking its status icon\n" @@ -3539,7 +3541,7 @@ "\t\t 右键菜单也可以更改全部条目的状态。\n" "\t\t </p>" -#: library/packages/src/modules/PackagesUI.rb:345 +#: library/packages/src/modules/PackagesUI.rb:340 msgid "" "<p>\n" "\t\t <b>Details</b> opens the detailed software package selection\n" @@ -3551,7 +3553,7 @@ "\t\t 您可在其中查看和选择单个软件包。\n" "\t\t </p>" -#: library/packages/src/modules/PackagesUI.rb:351 +#: library/packages/src/modules/PackagesUI.rb:346 msgid "" "<p>\n" "\t\t The disk usage display in the lower right corner shows the remaining disk space\n" @@ -3571,124 +3573,124 @@ #. Dialog title #. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems" -#: library/packages/src/modules/PackagesUI.rb:372 +#: library/packages/src/modules/PackagesUI.rb:367 msgid "Software Selection and System Tasks" msgstr "软件选择和系统任务" #. don't get all the way out - the user might just have #. been scared of the gory details. -#: library/packages/src/modules/PackagesUI.rb:412 +#: library/packages/src/modules/PackagesUI.rb:408 msgid "(more)" msgstr "(更多)" -#: library/packages/src/modules/PackagesUI.rb:428 +#: library/packages/src/modules/PackagesUI.rb:424 msgid "Installation Successfully Finished" msgstr "安装已成功完成" -#: library/packages/src/modules/PackagesUI.rb:429 +#: library/packages/src/modules/PackagesUI.rb:426 msgid "Package Installation Failed" msgstr "软件包安装失败" -#: library/packages/src/modules/PackagesUI.rb:440 +#: library/packages/src/modules/PackagesUI.rb:438 msgid "Error Message: %1" msgstr "错误消息：%1" -#: library/packages/src/modules/PackagesUI.rb:457 +#: library/packages/src/modules/PackagesUI.rb:455 msgid "Failed Packages: %1" msgstr "失败的软件包：%1" -#: library/packages/src/modules/PackagesUI.rb:476 +#: library/packages/src/modules/PackagesUI.rb:474 msgid "Installed Packages: %1" msgstr "已安装的软件包：%1" -#: library/packages/src/modules/PackagesUI.rb:495 +#: library/packages/src/modules/PackagesUI.rb:493 msgid "Updated Packages: %1" msgstr "已更新的软件包：%1" -#: library/packages/src/modules/PackagesUI.rb:514 +#: library/packages/src/modules/PackagesUI.rb:512 msgid "Removed Packages: %1" msgstr "已移除的软件包：%1" -#: library/packages/src/modules/PackagesUI.rb:536 +#: library/packages/src/modules/PackagesUI.rb:534 msgid "Not Installed Packages: %1" msgstr "未安装的软件包：%1" #. Table headings for CD statistics during installation -#: library/packages/src/modules/PackagesUI.rb:552 -#: library/packages/src/modules/SlideShow.rb:545 +#: library/packages/src/modules/PackagesUI.rb:550 +#: library/packages/src/modules/SlideShow.rb:533 msgid "Packages" msgstr "软件包" #. reset the items list -#: library/packages/src/modules/PackagesUI.rb:563 +#: library/packages/src/modules/PackagesUI.rb:561 msgid "Elapsed Time: %1" msgstr "耗时：%1" -#: library/packages/src/modules/PackagesUI.rb:573 +#: library/packages/src/modules/PackagesUI.rb:571 msgid "Total Installed Size: %1" msgstr "总安装大小：%1" -#: library/packages/src/modules/PackagesUI.rb:583 +#: library/packages/src/modules/PackagesUI.rb:581 msgid "Total Downloaded Size: %1" msgstr "总下载大小：%1" -#: library/packages/src/modules/PackagesUI.rb:592 +#: library/packages/src/modules/PackagesUI.rb:590 msgid "Statistics" msgstr "统计" #. display installation log -#: library/packages/src/modules/PackagesUI.rb:605 -#: library/packages/src/modules/PackagesUI.rb:694 +#: library/packages/src/modules/PackagesUI.rb:603 +#: library/packages/src/modules/PackagesUI.rb:691 msgid "Installation log" msgstr "安装日志" -#: library/packages/src/modules/PackagesUI.rb:612 +#: library/packages/src/modules/PackagesUI.rb:610 msgid "Details" msgstr "细节" #. open a new wizard dialog if needed -#: library/packages/src/modules/PackagesUI.rb:661 +#: library/packages/src/modules/PackagesUI.rb:658 msgid "After Installing Packages" msgstr "在安装软件包后" -#: library/packages/src/modules/PackagesUI.rb:662 +#: library/packages/src/modules/PackagesUI.rb:659 msgid "Show This Report" msgstr "显示此报告" -#: library/packages/src/modules/PackagesUI.rb:663 +#: library/packages/src/modules/PackagesUI.rb:660 msgid "Finish" msgstr "已完成" -#: library/packages/src/modules/PackagesUI.rb:664 +#: library/packages/src/modules/PackagesUI.rb:661 msgid "Continue in the Software Manager" msgstr "在软件管理器中继续" -#: library/packages/src/modules/PackagesUI.rb:669 +#: library/packages/src/modules/PackagesUI.rb:666 msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>" msgstr "<P><BIG><B>安装报告</B><BIG></P><P>这里是一份已安装或已移除软件包的摘要。</P>" -#: library/packages/src/modules/PackagesUI.rb:677 +#: library/packages/src/modules/PackagesUI.rb:674 msgid "Installation Report" msgstr "安装报告" -#: library/packages/src/modules/PackagesUI.rb:699 +#: library/packages/src/modules/PackagesUI.rb:696 msgid "Installed Packages" msgstr "已安装的软件包" -#: library/packages/src/modules/PackagesUI.rb:704 +#: library/packages/src/modules/PackagesUI.rb:701 msgid "Updated Packages" msgstr "已更新的软件包" -#: library/packages/src/modules/PackagesUI.rb:709 +#: library/packages/src/modules/PackagesUI.rb:706 msgid "Removed Packages" msgstr "已移除的软件包" -#: library/packages/src/modules/PackagesUI.rb:714 +#: library/packages/src/modules/PackagesUI.rb:711 msgid "Remaining Packages" msgstr "其余软件包" #. disabling installation report dialog, inform the user how to enable it back -#: library/packages/src/modules/PackagesUI.rb:735 +#: library/packages/src/modules/PackagesUI.rb:732 msgid "" "If you want to show this report dialog again edit\n" "\n" @@ -3727,7 +3729,7 @@ #. popup question, %1 stands for the filename #. %2 is a repository name #. %3 is URL of the repository -#: library/packages/src/modules/SignatureCheckDialogs.rb:475 +#: library/packages/src/modules/SignatureCheckDialogs.rb:476 msgid "" "The file %1 from repository %2\n" "%3\n" @@ -3746,16 +3748,16 @@ "无论如何都使用该文件吗？\n" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:498 +#: library/packages/src/modules/SignatureCheckDialogs.rb:500 msgid "Unsigned Package" msgstr "未签名的软件包" -#: library/packages/src/modules/SignatureCheckDialogs.rb:499 +#: library/packages/src/modules/SignatureCheckDialogs.rb:502 msgid "Unsigned File" msgstr "未签名的文件" #. popup question, %1 stands for the package name -#: library/packages/src/modules/SignatureCheckDialogs.rb:547 +#: library/packages/src/modules/SignatureCheckDialogs.rb:551 msgid "" "No checksum for package %1 was found in the repository.\n" "While the package is part of the signed repository, it is not contained \n" @@ -3772,7 +3774,7 @@ "无论如何都安装该软件包吗？\n" #. popup question, %1 stands for the filename -#: library/packages/src/modules/SignatureCheckDialogs.rb:556 +#: library/packages/src/modules/SignatureCheckDialogs.rb:561 msgid "" "No checksum for file %1 was found in the repository.\n" "This means that the file is part of the signed repository,\n" @@ -3788,62 +3790,62 @@ "无论如何都使用该文件吗？" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:573 +#: library/packages/src/modules/SignatureCheckDialogs.rb:579 msgid "No Checksum Found" msgstr "未找到校验码" #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID -#: library/packages/src/modules/SignatureCheckDialogs.rb:616 -#: library/packages/src/modules/SignatureCheckDialogs.rb:815 +#: library/packages/src/modules/SignatureCheckDialogs.rb:622 +#: library/packages/src/modules/SignatureCheckDialogs.rb:833 msgid "ID: %1" msgstr "ID：%1" #. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint -#: library/packages/src/modules/SignatureCheckDialogs.rb:624 +#: library/packages/src/modules/SignatureCheckDialogs.rb:631 msgid "Fingerprint: %1" msgstr "指纹：%1" #. Part of the GnuPG key description in popup, %1 is a GnuPG key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:629 +#: library/packages/src/modules/SignatureCheckDialogs.rb:637 msgid "Name: %1" msgstr "名称：%1" -#: library/packages/src/modules/SignatureCheckDialogs.rb:635 +#: library/packages/src/modules/SignatureCheckDialogs.rb:643 msgid "Created: %1" msgstr "创建于：%1" -#: library/packages/src/modules/SignatureCheckDialogs.rb:645 +#: library/packages/src/modules/SignatureCheckDialogs.rb:655 msgid "Expires: %1" msgstr "失效于：%1" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:659 +#: library/packages/src/modules/SignatureCheckDialogs.rb:671 msgid "ID: " msgstr "ID：" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:665 +#: library/packages/src/modules/SignatureCheckDialogs.rb:677 msgid "Name: " msgstr "名称：" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:678 +#: library/packages/src/modules/SignatureCheckDialogs.rb:690 msgid "Fingerprint: " msgstr "指纹：" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:689 +#: library/packages/src/modules/SignatureCheckDialogs.rb:701 msgid "Created: " msgstr "创建于：" #. GPG key property -#: library/packages/src/modules/SignatureCheckDialogs.rb:700 +#: library/packages/src/modules/SignatureCheckDialogs.rb:712 msgid "Expires: " msgstr "失效于：" #. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline) -#: library/packages/src/modules/SignatureCheckDialogs.rb:722 +#: library/packages/src/modules/SignatureCheckDialogs.rb:734 msgid "" "Package %1 from repository %2\n" "%3\n" @@ -3865,7 +3867,7 @@ "无论如何都安装该软件包吗？\n" #. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline) -#: library/packages/src/modules/SignatureCheckDialogs.rb:734 +#: library/packages/src/modules/SignatureCheckDialogs.rb:747 msgid "" "File %1 from repository %2\n" "%3\n" @@ -3888,12 +3890,12 @@ "无论如何都使用该文件吗？\n" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:757 +#: library/packages/src/modules/SignatureCheckDialogs.rb:771 msgid "Validation Check Failed" msgstr "校验检查失败" #. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key -#: library/packages/src/modules/SignatureCheckDialogs.rb:787 +#: library/packages/src/modules/SignatureCheckDialogs.rb:801 msgid "" "The package %1 is digitally signed\n" "with the following unknown GnuPG key: %2.\n" @@ -3912,7 +3914,7 @@ "无论如何都安装该软件包吗？" #. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key -#: library/packages/src/modules/SignatureCheckDialogs.rb:798 +#: library/packages/src/modules/SignatureCheckDialogs.rb:813 msgid "" "The file %1\n" "is digitally signed with the following unknown GnuPG key: %2.\n" @@ -3932,12 +3934,12 @@ "无论如何都使用该文件吗？" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:825 +#: library/packages/src/modules/SignatureCheckDialogs.rb:843 msgid "Unknown GnuPG Key" msgstr "未知 GnuPG 密钥" #. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:876 +#: library/packages/src/modules/SignatureCheckDialogs.rb:894 msgid "" "The package %1 is digitally signed\n" "with key '%2 (%3)'.\n" @@ -3958,7 +3960,7 @@ "最保险的方法是跳过该软件包。\n" #. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name -#: library/packages/src/modules/SignatureCheckDialogs.rb:888 +#: library/packages/src/modules/SignatureCheckDialogs.rb:907 msgid "" "The file %1 is digitally signed\n" "with key '%2 (%3)'.\n" @@ -3979,17 +3981,17 @@ "最保险的方法是跳过该文件。\n" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:910 +#: library/packages/src/modules/SignatureCheckDialogs.rb:930 msgid "Signed with Untrusted Public Key" msgstr "经未信任公共密钥签名" #. push button -#: library/packages/src/modules/SignatureCheckDialogs.rb:919 +#: library/packages/src/modules/SignatureCheckDialogs.rb:939 msgid "&Trust and Import the Key" msgstr "信任并导入该密钥(&T)" #. additional Richtext (HTML) warning text (kind of help), 1/2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:953 +#: library/packages/src/modules/SignatureCheckDialogs.rb:973 msgid "" "<p>The owner of the key may distribute updates,\n" "packages, and package repositories that your system will trust and offer\n" @@ -4003,7 +4005,7 @@ "将允许该密钥的所有者拥有对您系统上的软件的一定量的控制权。</p>" #. additional Richtext (HTML) warning text (kind of help), 2/2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:961 +#: library/packages/src/modules/SignatureCheckDialogs.rb:981 msgid "" "<p>A warning dialog opens for every package that\n" "is not signed by a trusted (imported) key. If you do not trust the key,\n" @@ -4013,7 +4015,7 @@ "若您不信任该密钥，将不会使用由该密钥的所有者创建的软件包或软件源。</p>" #. popup message - label, part 1, %1 stands for repository name, %2 for its URL -#: library/packages/src/modules/SignatureCheckDialogs.rb:971 +#: library/packages/src/modules/SignatureCheckDialogs.rb:991 msgid "" "The following GnuPG key has been found in repository\n" "%1\n" @@ -4024,7 +4026,7 @@ "(%2)：" #. popup message - label, part 2 -#: library/packages/src/modules/SignatureCheckDialogs.rb:982 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1002 msgid "" "You can choose to import it into your keyring of trusted\n" "public keys, meaning that you trust the owner of the key.\n" @@ -4035,23 +4037,23 @@ "导入前应确保您可以信任该所有者，并且该密钥确实属于该所有者。" #. warning label - the key to import is expired -#: library/packages/src/modules/SignatureCheckDialogs.rb:994 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1014 msgid "WARNING: The key has expired!" msgstr "警告：该密钥已过期！" #. popup heading -#: library/packages/src/modules/SignatureCheckDialogs.rb:1020 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1042 msgid "Import Untrusted GnuPG Key" msgstr "导入未信任 GnuPG 密钥" #. push button -#: library/packages/src/modules/SignatureCheckDialogs.rb:1036 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1058 msgid "&Trust" msgstr "信任(&T)" #. popup question, %1 stands for the filename, %2 is expected checksum #. %3 is the current checksum (e.g. "803a8ff00d00c9075a1bd223a480bcf92d2481c1") -#: library/packages/src/modules/SignatureCheckDialogs.rb:1113 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1134 msgid "" "The expected checksum of file %1\n" "is %2,\n" @@ -4074,12 +4076,12 @@ "无论如何都使用该文件吗？\n" #. dialog heading - displayed in a big bold font -#: library/packages/src/modules/SignatureCheckDialogs.rb:1130 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1151 msgid "Wrong Digest" msgstr "错误摘要" #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest -#: library/packages/src/modules/SignatureCheckDialogs.rb:1149 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1170 msgid "" "The checksum of file %1\n" "is %2,\n" @@ -4100,7 +4102,7 @@ "无论如何都使用该文件吗？\n" #. dialog heading - displayed in a big bold font -#: library/packages/src/modules/SignatureCheckDialogs.rb:1163 +#: library/packages/src/modules/SignatureCheckDialogs.rb:1184 msgid "Unknown Digest" msgstr "未知摘要" @@ -4111,91 +4113,92 @@ #. translators: default global progress bar label #: library/packages/src/modules/SlideShow.rb:151 #: library/packages/src/modules/SlideShow.rb:152 -#: library/packages/src/modules/SlideShow.rb:326 -#: library/packages/src/modules/SlideShow.rb:347 +#: library/packages/src/modules/SlideShow.rb:323 +#: library/packages/src/modules/SlideShow.rb:344 msgid "Installing..." msgstr "正在安装..." #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:541 +#: library/packages/src/modules/SlideShow.rb:529 msgid "Media" msgstr "介质" #. Table headings for CD statistics during installation - keep as short as possible! -#: library/packages/src/modules/SlideShow.rb:543 +#: library/packages/src/modules/SlideShow.rb:531 msgid "Remaining" msgstr "剩余" #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:547 +#: library/packages/src/modules/SlideShow.rb:535 msgid "Time" msgstr "时间" #. Construct widgets for the "details" page #. #. @return A term describing the widgets -#: library/packages/src/modules/SlideShow.rb:563 +#: library/packages/src/modules/SlideShow.rb:551 msgid "Actions performed:" msgstr "执行的操作：" #. Help text while software packages are being installed (displayed only in rare cases) -#: library/packages/src/modules/SlideShow.rb:647 +#: library/packages/src/modules/SlideShow.rb:633 msgid "<p>Packages are being installed.</p>" msgstr "<p>正在安装软件包。</p>" -#: library/packages/src/modules/SlideShow.rb:648 +#: library/packages/src/modules/SlideShow.rb:634 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>" msgstr "<P><B>中止安装</B>可用<B>中止</B>按钮中止安装软件包。然而，之后系统可能处于不连贯或不稳定的状态，若未安装基础系统组件，它甚至可能无法引导。</P>" #. Translators: Tab name, keep short, %s is product name, e.g. SLES -#: library/packages/src/modules/SlideShow.rb:666 +#: library/packages/src/modules/SlideShow.rb:652 msgid "%s Release Notes" msgstr "%s 版本资讯" #. tab -#: library/packages/src/modules/SlideShow.rb:678 +#: library/packages/src/modules/SlideShow.rb:664 msgid "Slide Sho&w" msgstr "幻灯片演示(&W)" #. tab -#: library/packages/src/modules/SlideShow.rb:680 +#: library/packages/src/modules/SlideShow.rb:666 msgid "&Details" msgstr "细节(&D)" #. Dialog heading - software packages are being upgraded -#: library/packages/src/modules/SlideShow.rb:719 +#: library/packages/src/modules/SlideShow.rb:705 msgid "Performing Upgrade" msgstr "正在执行升级" #. Dialog heading - software packages are being installed -#: library/packages/src/modules/SlideShow.rb:722 +#: library/packages/src/modules/SlideShow.rb:708 msgid "Performing Installation" msgstr "正在执行安装" #. Dialog heading while software packages are being installed -#: library/packages/src/modules/SlideShow.rb:759 +#: library/packages/src/modules/SlideShow.rb:743 msgid "Package Installation" msgstr "软件包安装" #. popup yes-no -#: library/packages/src/modules/SlideShow.rb:835 +#: library/packages/src/modules/SlideShow.rb:815 msgid "" "Do you really want\n" "to quit the installation?" msgstr "您真的想要退出安装吗？" #. Mode::update (), Stage::cont () -#: library/packages/src/modules/SlideShow.rb:847 +#: library/packages/src/modules/SlideShow.rb:827 msgid "Aborted" msgstr "已中止" -#. read file content -#: library/system/src/clients/view_anymsg.rb:187 +#. remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL)) +#. except new line (LF = 0xa) and carriage return (CR = 0xd) +#: library/system/src/clients/view_anymsg.rb:196 msgid "File not found." msgstr "未找到文件。" #. Fill the LogView with file content -#: library/system/src/clients/view_anymsg.rb:199 +#: library/system/src/clients/view_anymsg.rb:202 msgid "System Log (%1)" msgstr "系统日志 (%1)" @@ -4780,7 +4783,7 @@ msgstr "蓝牙设备" #. Continue/Cancel question, %1 is a file name -#: library/system/src/modules/FileChanges.rb:174 +#: library/system/src/modules/FileChanges.rb:175 msgid "" "File %1 has been changed manually.\n" "YaST might lose some of the changes.\n" @@ -4789,7 +4792,7 @@ "YaST 可能会丢失一些修改。\n" #. Continue/Cancel question, %1 is a coma separated list of file names -#: library/system/src/modules/FileChanges.rb:179 +#: library/system/src/modules/FileChanges.rb:180 msgid "" "Files %1 have been changed manually.\n" "YaST might lose some of the changes" @@ -4797,36 +4800,62 @@ "文件 %1 已被手动修改。\n" "YaST 可能会丢失一些修改" -#: library/system/src/modules/FileChanges.rb:192 +#: library/system/src/modules/FileChanges.rb:193 msgid "Do not show this message anymore" msgstr "不再显示此消息" +#. Continue/Cancel question, %s is a file name +#: library/system/src/modules/FileChanges.rb:236 +#, fuzzy +#| msgid "" +#| "File %1 has been changed manually.\n" +#| "YaST might lose some of the changes.\n" +msgid "" +"File %s has been created manually.\n" +"YaST might lose this file." +msgstr "" +"文件 %1 已被手动修改。\n" +"YaST 可能会丢失一些修改。\n" + +#. Continue/Cancel question, %s is a comma separated list of file names +#: library/system/src/modules/FileChanges.rb:239 +#, fuzzy +#| msgid "" +#| "Files %1 have been changed manually.\n" +#| "YaST might lose some of the changes" +msgid "" +"Files %s have been created manually.\n" +"YaST might lose these files." +msgstr "" +"文件 %1 已被手动修改。\n" +"YaST 可能会丢失一些修改" + #. error report -#: library/system/src/modules/Initrd.rb:416 +#: library/system/src/modules/Initrd.rb:415 msgid "An error occurred during initrd creation." msgstr "initrd 创建过程中出错。" #. inform the user that he/she has to reboot to activate new kernel -#: library/system/src/modules/Kernel.rb:659 +#: library/system/src/modules/Kernel.rb:665 msgid "" "Reboot your system\n" "to activate the new kernel.\n" msgstr "请重新引导您的系统以激活新内核。\n" #. bnc #421002 -#: library/system/src/modules/ModuleLoading.rb:179 +#: library/system/src/modules/ModuleLoading.rb:177 msgid "Confirm driver activation" msgstr "确认激活驱动" #. This is in information message. Next come the #. vendor and device information strings as stored #. in the hardware-probing database. -#: library/system/src/modules/ModuleLoading.rb:186 +#: library/system/src/modules/ModuleLoading.rb:184 msgid "YaST2 detected the following device" msgstr "YaST2 检测到了以下设备" #. Caption for Textentry with module information -#: library/system/src/modules/ModuleLoading.rb:195 +#: library/system/src/modules/ModuleLoading.rb:193 msgid "&Driver/Module to load" msgstr "要挂载的驱动/模块(&D)" @@ -4838,7 +4867,7 @@ msgstr "有效 MAC 地址由 6 对十六进制数字组成，由英文冒号分隔。" #. Translators: dot: ".", hyphen: "-" -#: library/types/src/modules/Hostname.rb:53 +#: library/types/src/modules/Hostname.rb:55 msgid "" "A valid domain name consists of components separated by dots.\n" "Each component contains letters, digits, and hyphens. A hyphen may not\n" @@ -4850,7 +4879,7 @@ "并且最后一部分不能以数字开头。" #. Translators: hyphen: "-" -#: library/types/src/modules/Hostname.rb:64 +#: library/types/src/modules/Hostname.rb:66 msgid "" "A valid host name consists of letters, digits, and hyphens.\n" "A host name may not begin or end with a hyphen.\n" @@ -4859,14 +4888,14 @@ "主机名不能以连字符开头或结尾。\n" #. Translators: dot: "." -#: library/types/src/modules/IP.rb:53 +#: library/types/src/modules/IP.rb:56 msgid "" "A valid IPv4 address consists of four integers\n" "in the range 0-255 separated by dots." msgstr "有效 IPv4 地址由范围在 0-255 的 4 个整数组成，数字间由英文句号分隔。" #. Translators: colon: ":" -#: library/types/src/modules/IP.rb:71 +#: library/types/src/modules/IP.rb:74 msgid "" "A valid IPv6 address consists of up to eight\n" "hexadecimal numbers in the range 0 - FFFF separated by colons.\n" @@ -4876,7 +4905,7 @@ "数字间由英文冒号分隔。可包含最多一个双冒号。" #. TRANSLATORS: description of the valid network definition -#: library/types/src/modules/IP.rb:138 +#: library/types/src/modules/IP.rb:128 msgid "" "A valid network definition can contain the IP,\n" "IP/Netmask, IP/Netmask_Bits, or 0/0 for all networks.\n" @@ -4894,49 +4923,49 @@ "IP/网络掩码位：192.168.0.0/24 或 192.168.0.1/32 或 2001:db8:0::1/ffff::0\n" #. Byte abbreviated -#: library/types/src/modules/String.rb:144 +#: library/types/src/modules/String.rb:127 msgid "B" msgstr "B" #. KiloByte abbreviated -#: library/types/src/modules/String.rb:146 +#: library/types/src/modules/String.rb:129 msgid "KiB" msgstr "KiB" #. MegaByte abbreviated -#: library/types/src/modules/String.rb:148 +#: library/types/src/modules/String.rb:131 msgid "MiB" msgstr "MiB" #. GigaByte abbreviated -#: library/types/src/modules/String.rb:150 +#: library/types/src/modules/String.rb:133 msgid "GiB" msgstr "GiB" #. TeraByte abbreviated -#: library/types/src/modules/String.rb:152 +#: library/types/src/modules/String.rb:135 msgid "TiB" msgstr "TiB" -#. covert a number to download rate string -#. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB -#: library/types/src/modules/String.rb:238 -msgid "%1/s" -msgstr "%1/秒" - #. format download rate message: %1 = the current download rate (e.g. "242.6kB/s") #. %2 is the average download rate (e.g. "228.3kB/s") #. to translators: keep translation of "on average" as short as possible -#: library/types/src/modules/String.rb:261 +#: library/types/src/modules/String.rb:201 msgid "%1 (on average %2)" msgstr "%1 (平均 %2)" #. ellipsis - used to replace part of text to make it shorter #. example: "/really/very/long/file/name", "/.../file/name") -#: library/types/src/modules/String.rb:1258 +#: library/types/src/modules/String.rb:738 msgid "..." msgstr "..." +#. covert a number to download rate string +#. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB +#: library/types/src/modules/String.rb:855 +msgid "%1/s" +msgstr "%1/秒" + #. Popup-Box for manual hardware detection. #. If the user selects 'manual installation' when #. booting from CD, YaST2 does not load any modules @@ -4948,18 +4977,18 @@ #. the suggested load command #. #. This is the heading of the popup box -#: library/wizard/src/modules/Confirm.rb:103 +#: library/wizard/src/modules/Confirm.rb:102 msgid "Confirm Hardware Detection" msgstr "确认检测硬件" #. This is in information message. Next come the #. hardware class name (network cards). -#: library/wizard/src/modules/Confirm.rb:108 +#: library/wizard/src/modules/Confirm.rb:107 msgid "YaST will detect the following hardware:" msgstr "YaST 将检测以下硬件：" #. Message in a continue/cancel popup -#: library/wizard/src/modules/Confirm.rb:183 +#: library/wizard/src/modules/Confirm.rb:182 msgid "" "This module must be run as root.\n" "If you continue now, the module may not function properly.\n" @@ -4971,49 +5000,49 @@ "例如，某些设置可能读取不当，并绝无可能写入设置。\n" #. Popup headline -#: library/wizard/src/modules/Confirm.rb:191 +#: library/wizard/src/modules/Confirm.rb:190 msgid "Root Privileges Needed" msgstr "需要 Root 特权" #. Popup question -#: library/wizard/src/modules/Confirm.rb:208 +#: library/wizard/src/modules/Confirm.rb:207 msgid "Really delete selected entry?" msgstr "真的删除所选项吗？" #. Popup question, %1 is an item to delete (or filename, etc.) -#: library/wizard/src/modules/Confirm.rb:222 +#: library/wizard/src/modules/Confirm.rb:221 msgid "Really delete '%1'?" msgstr "真的删除 '%1' 吗？" #. button text #. Open a dialog with "Accept", "Cancel" #. and set the keyboard focus to "Accept". -#: library/wizard/src/modules/Wizard.rb:266 -#: library/wizard/src/modules/Wizard.rb:534 +#: library/wizard/src/modules/Wizard.rb:259 +#: library/wizard/src/modules/Wizard.rb:508 msgid "&Apply" msgstr "应用(&A)" #. translators: dialog title to appear before any content is initialized -#: library/wizard/src/modules/Wizard.rb:294 +#: library/wizard/src/modules/Wizard.rb:286 msgid "Initializing ..." msgstr "正在初始化..." #. translators: dialog title to appear before any content is initialized -#: library/wizard/src/modules/Wizard.rb:348 +#: library/wizard/src/modules/Wizard.rb:339 msgid "" "YaST\n" "Initializing ...\n" msgstr "正在初始化 YaST...\n" #. Heading for help popup window -#: library/wizard/src/modules/Wizard.rb:386 +#: library/wizard/src/modules/Wizard.rb:375 msgid "Help" msgstr "帮助" #. fallback name for the dialog title #. fallback name for the dialog title -#: library/wizard/src/modules/Wizard.rb:1228 -#: library/wizard/src/modules/Wizard.rb:1277 +#: library/wizard/src/modules/Wizard.rb:1139 +#: library/wizard/src/modules/Wizard.rb:1193 msgid "Module" msgstr "模块" @@ -5789,6 +5818,77 @@ "DNS 服务器管理的 %1 没有反向区域。\n" "无法添加主机名 %2。" +#: src/lib/ui/srv_status_component.rb:60 +#, fuzzy +#| msgid "Service Start" +msgid "Service Status" +msgstr "启动服务" + +#. Content for the help +#: src/lib/ui/srv_status_component.rb:114 +msgid "" +"<p><b><big>Current status</big></b><br>\n" +"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n" +"<p><b><big>Reload After Saving Settings</big></b><br>\n" +"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>\n" +"<p><b><big>Start During System Boot</big></b><br>\n" +"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n" +msgstr "" + +#. Widget displaying the status and associated buttons +#: src/lib/ui/srv_status_component.rb:181 +msgid "Current status:" +msgstr "当前状态：" + +#. Widget to configure the status on boot +#: src/lib/ui/srv_status_component.rb:194 +#, fuzzy +#| msgid "Operating System Boot" +msgid "Start During System Boot" +msgstr "操作系统引导" + +#. Widget to configure reloading of the running service +#: src/lib/ui/srv_status_component.rb:208 +#, fuzzy +#| msgid "Read Other Settings." +msgid "Reload After Saving Settings" +msgstr "读取其他设置" + +#. TRANSLATORS: status of a service +#: src/lib/ui/srv_status_component.rb:218 +#, fuzzy +#| msgid "Not running" +msgid "running" +msgstr "未运行" + +#: src/lib/ui/srv_status_component.rb:220 +#, fuzzy +#| msgid "S&top now ..." +msgid "Stop now" +msgstr "立即停止(&T)..." + +#. TRANSLATORS: status of a service +#: src/lib/ui/srv_status_component.rb:225 +#, fuzzy +#| msgid "Stopped" +msgid "stopped" +msgstr "已停止" + +#: src/lib/ui/srv_status_component.rb:227 +#, fuzzy +#| msgid "Start it now?" +msgid "Start now" +msgstr "立即启动？" + +#~ msgid "The correct repository medium could not be mounted." +#~ msgstr "无法挂载正确的软件源介质。" + +#~ msgid "Downloading patch RPM package %1 (%2)..." +#~ msgstr "正在下载补丁 RPM 包 %1 (%2)..." + +#~ msgid "Downloading Patch RPM Package" +#~ msgstr "正在下载补丁 RPM 包" + #~ msgid "Read dynamic definitions of installed services" #~ msgstr "读取已安装服务的动态定义" Modified: trunk/yast/zh_CN/po/bootloader.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/bootloader.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/bootloader.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:34+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -59,71 +59,25 @@ msgstr "选项的值" #. command line error report -#: src/clients/bootloader.rb:154 +#: src/clients/bootloader.rb:152 msgid "Value was not specified." msgstr "未指定值。" #. command line error report -#: src/clients/bootloader.rb:176 +#: src/clients/bootloader.rb:174 msgid "Option was not specified." msgstr "未指定选项。" #. command line, %1 is the value of bootloader option -#: src/clients/bootloader.rb:182 +#: src/clients/bootloader.rb:180 msgid "Value: %s" msgstr "值：%s" #. command line error report -#: src/clients/bootloader.rb:185 +#: src/clients/bootloader.rb:183 msgid "Specified option does not exist." msgstr "指定选项不存在。" -#. progress step title -#: src/clients/bootloader_finish.rb:52 -msgid "Saving bootloader configuration..." -msgstr "正在保存引导加载器配置..." - -#. TRANSLATORS: reboot message -#. %1 is replaced with additional message from reIPL -#: src/clients/bootloader_finish.rb:133 -msgid "" -"\n" -"Your system will now shut down.%1\n" -"For details, read the related chapter \n" -"in the documentation. \n" -msgstr "" -"\n" -"您的系统即将关闭。%1\n" -"细节请阅读文档中的相关章节。\n" - -#. Final message after all packages from CD1 are installed -#. and we're ready to start (boot into) the installed system -#. Message that will be displayed along with information -#. how the boot loader was installed -#: src/clients/bootloader_finish.rb:146 -msgid "The system will reboot now..." -msgstr "系统将立即重引导..." - -#. warning text in the summary richtext -#: src/clients/bootloader_proposal.rb:115 -msgid "No boot loader is selected for installation. Your system might not be bootable." -msgstr "未选择安装任何引导加载器。您的系统可能无法引导。" - -#. error in the proposal -#: src/clients/bootloader_proposal.rb:125 -msgid "Because of the partitioning, the bootloader cannot be installed properly" -msgstr "出于分区原因，无法正确安装引导加载器" - -#. proposal part - bootloader label -#: src/clients/bootloader_proposal.rb:224 -msgid "Booting" -msgstr "引导" - -#. menubutton entry -#: src/clients/bootloader_proposal.rb:226 -msgid "&Booting" -msgstr "引导(&B)" - #. encoding: utf-8 #. File: #. include/bootloader/grup/helps.ycp @@ -245,9 +199,16 @@ "细节请参考 grub 文档 (<code>info grub2</code>)。</p>" #: src/include/bootloader/grub/helps.rb:68 +#, fuzzy +#| msgid "" +#| "<p><b>Terminal Definition</b></p><br>\n" +#| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +#| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" +#| "command, as <code>serial console</code>. In this case, a terminal in which you\n" +#| "press any key will be selected as a GRUB terminal.</p>" msgid "" "<p><b>Terminal Definition</b></p><br>\n" -"Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n" "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" "command, as <code>serial console</code>. In this case, a terminal in which you\n" "press any key will be selected as a GRUB terminal.</p>" @@ -271,17 +232,21 @@ msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>" #: src/include/bootloader/grub/helps.rb:81 +#, fuzzy +#| msgid "" +#| "<p><b>Protect Boot Loader with Password</b><br>\n" +#| "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" +#| "it in <b>Retype Password</b>.</p>" msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" -"Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" -"it in <b>Retype Password</b>.</p>" +"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>" msgstr "" "<p><b>使用密码保护引导加载器</b><br>\n" "定义访问引导菜单所需的密码。\n" "YaST 只在您在<b>重新键入密码</b>中重复了密码后才会接受该密码。</p>" #. help text 1/5 -#: src/include/bootloader/grub/helps.rb:88 +#: src/include/bootloader/grub/helps.rb:91 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" @@ -295,64 +260,64 @@ "要添加磁盘，请按<b>添加</b>。\n" "要移除磁盘，请按<b>移除</b>。</p>" -#: src/include/bootloader/grub/helps.rb:99 +#: src/include/bootloader/grub/helps.rb:101 msgid "Boot Loader Locations" msgstr "引导加载器位置" -#: src/include/bootloader/grub/helps.rb:100 +#: src/include/bootloader/grub/helps.rb:102 msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "在分区表中为引导分区设置活动旗标(&A)" -#: src/include/bootloader/grub/helps.rb:103 -#: src/include/bootloader/routines/common_helps.rb:29 +#: src/include/bootloader/grub/helps.rb:105 +#: src/include/bootloader/routines/common_helps.rb:28 msgid "&Timeout in Seconds" msgstr "超时 (以秒计)(&T)" -#: src/include/bootloader/grub/helps.rb:104 +#: src/include/bootloader/grub/helps.rb:106 msgid "&Default Boot Section" msgstr "默认引导项(&D)" -#: src/include/bootloader/grub/helps.rb:105 +#: src/include/bootloader/grub/helps.rb:107 msgid "Write &generic Boot Code to MBR" msgstr "将通用引导代码写入主引导记录(&G)" -#: src/include/bootloader/grub/helps.rb:106 +#: src/include/bootloader/grub/helps.rb:108 msgid "Custom Boot Partition" msgstr "自定义引导分区" -#: src/include/bootloader/grub/helps.rb:107 +#: src/include/bootloader/grub/helps.rb:109 msgid "Boot from Master Boot Record" msgstr "从主引导记录引导" -#: src/include/bootloader/grub/helps.rb:108 +#: src/include/bootloader/grub/helps.rb:110 msgid "Boot from Root Partition" msgstr "从根分区引导" -#: src/include/bootloader/grub/helps.rb:109 +#: src/include/bootloader/grub/helps.rb:111 msgid "Boot from Boot Partition" msgstr "从引导分区引导" -#: src/include/bootloader/grub/helps.rb:110 +#: src/include/bootloader/grub/helps.rb:112 msgid "Boot from Extended Partition" msgstr "从扩展分区引导" -#: src/include/bootloader/grub/helps.rb:111 +#: src/include/bootloader/grub/helps.rb:113 msgid "Serial Connection &Parameters" msgstr "串行连接参数(&P)" -#: src/include/bootloader/grub/helps.rb:112 +#: src/include/bootloader/grub/helps.rb:114 msgid "Fallback Sections if Default fails" msgstr "默认引导项失败时的备用引导项" -#: src/include/bootloader/grub/helps.rb:113 +#: src/include/bootloader/grub/helps.rb:115 msgid "&Hide Menu on Boot" msgstr "引导时隐藏菜单(&H)" -#: src/include/bootloader/grub/helps.rb:114 +#: src/include/bootloader/grub/helps.rb:116 msgid "Pa&ssword for the Menu Interface" msgstr "菜单界面密码(&S)" -#: src/include/bootloader/grub/helps.rb:115 +#: src/include/bootloader/grub/helps.rb:117 msgid "Debugg&ing Flag" msgstr "调试旗标(&I)" @@ -364,86 +329,91 @@ msgid "Prot&ect Boot Loader with Password" msgstr "使用密码保护引导加载器(&E)" +#. TRANSLATORS: checkbox entry +#: src/include/bootloader/grub/options.rb:79 +msgid "P&rotect Entry Modification Only" +msgstr "" + #. text entry -#: src/include/bootloader/grub/options.rb:78 +#: src/include/bootloader/grub/options.rb:85 msgid "&Password" msgstr "密码(&P)" #. text entry -#: src/include/bootloader/grub/options.rb:81 +#: src/include/bootloader/grub/options.rb:88 msgid "Re&type Password" msgstr "再次键入密码(&T)" #. Create Frame "Boot Loader Location" #. #. @return [Yast::Term] with widgets -#: src/include/bootloader/grub/options.rb:217 +#: src/include/bootloader/grub/options.rb:222 msgid "Boot from &Root Partition" msgstr "从根分区引导(&R)" -#: src/include/bootloader/grub/options.rb:218 +#: src/include/bootloader/grub/options.rb:224 msgid "Boo&t from Boot Partition" msgstr "从引导分区引导(&T)" -#: src/include/bootloader/grub/options.rb:228 +#: src/include/bootloader/grub/options.rb:235 msgid "C&ustom Boot Partition" msgstr "自定义引导分区(&U)" -#: src/include/bootloader/grub/options.rb:243 -#: src/include/bootloader/grub/options.rb:271 -#: src/include/bootloader/grub/options.rb:292 +#: src/include/bootloader/grub/options.rb:250 +#: src/include/bootloader/grub/options.rb:280 +#: src/include/bootloader/grub/options.rb:301 msgid "Boot Loader Location" msgstr "引导加载器位置" -#: src/include/bootloader/grub/options.rb:249 -#: src/include/bootloader/grub/options.rb:277 -#: src/include/bootloader/grub/options.rb:298 +#: src/include/bootloader/grub/options.rb:256 +#: src/include/bootloader/grub/options.rb:286 +#: src/include/bootloader/grub/options.rb:307 msgid "Boot from &Master Boot Record" msgstr "从主引导记录引导(&M)" -#: src/include/bootloader/grub/options.rb:256 +#: src/include/bootloader/grub/options.rb:263 msgid "Boot from &Extended Partition" msgstr "从扩展分区引导(&E)" -#: src/include/bootloader/grub/options.rb:303 +#: src/include/bootloader/grub/options.rb:312 msgid "Enable Red&undancy for MD Array" msgstr "启用多设备 (MD) 阵列冗余(&U)" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:57 +#: src/include/bootloader/grub2/dialogs.rb:56 msgid "Boot Code Options" msgstr "引导代码选项" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:82 +#: src/include/bootloader/grub2/dialogs.rb:84 msgid "Kernel Parameters" msgstr "内核参数" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:102 +#: src/include/bootloader/grub2/dialogs.rb:103 msgid "Bootloader Options" msgstr "引导加载器选项" #. Window title -#: src/include/bootloader/grub2/dialogs.rb:143 +#: src/include/bootloader/grub2/dialogs.rb:149 msgid "Boot Loader Options" msgstr "引导加载器选项" -#: src/include/bootloader/grub2/dialogs.rb:183 +#: src/include/bootloader/grub2/dialogs.rb:190 msgid "Secure Boot" msgstr "安全引导 (Secure Boot)" -#: src/include/bootloader/grub2/dialogs.rb:189 +#: src/include/bootloader/grub2/dialogs.rb:196 msgid "Enable &Secure Boot Support" msgstr "启用安全引导支持 (Secure Boot)" #. TRANSLATORS: place where boot code is installed -#: src/include/bootloader/grub2/dialogs.rb:240 +#: src/include/bootloader/grub2/dialogs.rb:247 msgid "Boot &Loader Location" msgstr "引导加载器位置(&L)" #. help text -#: src/include/bootloader/grub2/dialogs.rb:259 +#: src/include/bootloader/grub2/dialogs.rb:266 msgid "Choose partition where is boot sequence installed." msgstr "请选择将安装引导程序的分区。" @@ -470,42 +440,34 @@ msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>" #: src/include/bootloader/grub2/helps.rb:29 -msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" -msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>" - -#: src/include/bootloader/grub2/helps.rb:32 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>" msgstr "<p>可通过 os-prober <b>探测外来操作系统</b>以与其它外来操作系统多重引导</p>" -#: src/include/bootloader/grub2/helps.rb:35 +#: src/include/bootloader/grub2/helps.rb:32 msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>" msgstr "<p><b>保护性 MBR 旗标</b>是一个专家设置，仅在一些诡异的硬件上需要。细节请参考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>" -#: src/include/bootloader/grub2/helps.rb:38 +#: src/include/bootloader/grub2/helps.rb:35 msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>" msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>" -#: src/include/bootloader/grub2/helps.rb:44 +#: src/include/bootloader/grub2/helps.rb:41 msgid "O&ptional Kernel Command Line Parameter" msgstr "可选内核命令行参数(&P)" -#: src/include/bootloader/grub2/helps.rb:45 +#: src/include/bootloader/grub2/helps.rb:42 msgid "D&istributor" msgstr "发行方(&I)" -#: src/include/bootloader/grub2/helps.rb:46 +#: src/include/bootloader/grub2/helps.rb:43 msgid "&Vga Mode" msgstr "&VGA 模式" -#: src/include/bootloader/grub2/helps.rb:47 -msgid "&Failsafe Kernel Command Line Parameter" -msgstr "安全模式内核命令行参数(&F)" - -#: src/include/bootloader/grub2/helps.rb:48 +#: src/include/bootloader/grub2/helps.rb:44 msgid "Probe Foreign OS" msgstr "探测外来操作系统" -#: src/include/bootloader/grub2/helps.rb:49 +#: src/include/bootloader/grub2/helps.rb:45 msgid "Protective MBR flag" msgstr "保护性 MBR 旗标" @@ -548,71 +510,70 @@ #. Init function for console #. @param [String] widget -#: src/include/bootloader/grub2/options.rb:174 +#: src/include/bootloader/grub2/options.rb:173 msgid "Autodetect by grub2" msgstr "由 grub2 自动检测" #. FATE: #110038: Serial console #. add or remove console key with value for sections -#: src/include/bootloader/grub2/options.rb:249 +#: src/include/bootloader/grub2/options.rb:246 msgid "Choose new graphical theme file" msgstr "选择新图形主题文件" -#: src/include/bootloader/grub2/options.rb:261 +#: src/include/bootloader/grub2/options.rb:258 msgid "Use &graphical console" msgstr "使用图形控制台(&G)" -#: src/include/bootloader/grub2/options.rb:268 +#: src/include/bootloader/grub2/options.rb:265 msgid "&Console resolution" msgstr "控制台分辨率(&C)" -#: src/include/bootloader/grub2/options.rb:276 +#: src/include/bootloader/grub2/options.rb:273 msgid "&Console theme" msgstr "控制台主题(&C)" -#: src/include/bootloader/grub2/options.rb:295 +#: src/include/bootloader/grub2/options.rb:292 msgid "Use &serial console" msgstr "使用串行控制台(&S)" -#: src/include/bootloader/grub2/options.rb:302 +#: src/include/bootloader/grub2/options.rb:299 msgid "&Console arguments" msgstr "控制台参数(&C)" -#. FIXME this should be better handled by exception and show it properly, but it require too big change now -#: src/include/bootloader/routines/autoinstall.rb:132 +#. FIXME: this should be better handled by exception and show it properly, but it require too big change now +#: src/include/bootloader/routines/autoinstall.rb:131 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly." msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。" #. file open popup caption -#: src/include/bootloader/routines/common_options.rb:102 +#: src/include/bootloader/routines/common_options.rb:98 msgid "Select File" msgstr "选择文件" #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:85 src/modules/Bootloader.rb:256 +#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237 msgid "The boot partition is of type NFS. Bootloader cannot be installed." msgstr "引导分区类型是 NFS。无法安装引导加载器。" #. dialog caption -#: src/include/bootloader/routines/dialogs.rb:115 +#: src/include/bootloader/routines/dialogs.rb:114 msgid "Boot Loader Settings" msgstr "引导加载器设置" #. message -#: src/include/bootloader/routines/dialogs.rb:143 +#: src/include/bootloader/routines/dialogs.rb:142 msgid "There are no options to set for the current boot loader." msgstr "没有要为当前引导加载器设置的选项。" #. combo box -#: src/include/bootloader/routines/global_widgets.rb:114 +#: src/include/bootloader/routines/global_widgets.rb:109 msgid "&Boot Loader" msgstr "引导加载器(&B)" #. popup - Continue/Cancel -#: src/include/bootloader/routines/global_widgets.rb:144 +#: src/include/bootloader/routines/global_widgets.rb:138 msgid "" "\n" "If you do not install any boot loader, the system\n" @@ -626,62 +587,62 @@ "继续咩？后果很严重哦\n" #. menu button entry -#: src/include/bootloader/routines/global_widgets.rb:181 +#: src/include/bootloader/routines/global_widgets.rb:175 msgid "E&dit Configuration Files" msgstr "编辑配置文件(&D)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:188 +#: src/include/bootloader/routines/global_widgets.rb:182 msgid "&Propose New Configuration" msgstr "建议新配置(&P)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:195 +#: src/include/bootloader/routines/global_widgets.rb:189 msgid "&Start from Scratch" msgstr "从零开始(&S)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:203 +#: src/include/bootloader/routines/global_widgets.rb:197 msgid "&Reread Configuration from Disk" msgstr "从磁盘重新读取配置(&R)" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:220 +#: src/include/bootloader/routines/global_widgets.rb:214 msgid "Restore MBR of Hard Disk" msgstr "恢复硬盘的主引导记录" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:228 +#: src/include/bootloader/routines/global_widgets.rb:222 msgid "Write bootloader boot code to disk" msgstr "将引导加载器引导代码写入磁盘" #. menu button -#: src/include/bootloader/routines/global_widgets.rb:236 +#: src/include/bootloader/routines/global_widgets.rb:230 msgid "Other" msgstr "其它" #. message popup -#: src/include/bootloader/routines/global_widgets.rb:260 +#: src/include/bootloader/routines/global_widgets.rb:254 msgid "MBR restored successfully." msgstr "已成功恢复主引导记录。" #. message popup -#: src/include/bootloader/routines/global_widgets.rb:263 +#: src/include/bootloader/routines/global_widgets.rb:257 msgid "Failed to restore MBR." msgstr "恢复主引导记录失败。" #. Bootloader::blSave (false, false, false); -#: src/include/bootloader/routines/global_widgets.rb:286 +#: src/include/bootloader/routines/global_widgets.rb:280 msgid "Writing bootloader settings failed." msgstr "写入引导加载器设置失败。" #. push button -#: src/include/bootloader/routines/global_widgets.rb:340 +#: src/include/bootloader/routines/global_widgets.rb:329 msgid "Boot &Loader Options" msgstr "引导加载器选项(&L)" #. push button -#: src/include/bootloader/routines/global_widgets.rb:353 +#: src/include/bootloader/routines/global_widgets.rb:342 msgid "Boot Loader Installation &Details" msgstr "引导加载器安装细节(&D)" @@ -720,21 +681,21 @@ msgstr "<P>要手动编辑引导加载器配置文件，请点击<B>编辑配置文件</B>。</P>" #. help 1/4 -#: src/include/bootloader/routines/helps.rb:77 +#: src/include/bootloader/routines/helps.rb:76 msgid "" "<P> In the table, each section represents one item\n" "in the boot menu.</P>" msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>" #. help 2/4 -#: src/include/bootloader/routines/helps.rb:81 +#: src/include/bootloader/routines/helps.rb:80 msgid "" "<P> Press <B>Edit</B> to display the properties of the\n" "selected section.</P>" msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>" #. help 3/4 -#: src/include/bootloader/routines/helps.rb:85 +#: src/include/bootloader/routines/helps.rb:84 msgid "" "<P> By pressing <b>Set as Default</b>, mark the selected \n" "section as default. When booting, the boot loader will provide \n" @@ -749,7 +710,7 @@ "引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>" #. help 4/4 -#: src/include/bootloader/routines/helps.rb:94 +#: src/include/bootloader/routines/helps.rb:93 msgid "" "<P>Press <B>Add</B> to create a new boot loader section\n" "or <B>Delete</B> to delete the selected section.</P>" @@ -760,7 +721,7 @@ #. help text for the custom boot manager installation, 1 of 7 #. %1 = name of boot loader (e.g. "LILO") #. this should be per architecture -#: src/include/bootloader/routines/helps.rb:109 +#: src/include/bootloader/routines/helps.rb:107 msgid "" "<p><big><b>Boot Loader Location</b></big><br>\n" "The boot manager (%1) can be installed in the following ways:</p>" @@ -769,7 +730,7 @@ "引导管理器 (%1) 可以以下方式安装：</p>" #. custom bootloader help text, 2 of 7 -#: src/include/bootloader/routines/helps.rb:118 +#: src/include/bootloader/routines/helps.rb:116 msgid "" "<p>- In the <b>Master Boot Record</b> (MBR).\n" "This is not recommended if there is another operating system installed\n" @@ -779,7 +740,7 @@ "若计算机上安装了其它操作系统则不推荐此方法。</p>" #. custom bootloader help text, 3 of 7 -#: src/include/bootloader/routines/helps.rb:128 +#: src/include/bootloader/routines/helps.rb:126 msgid "" "<p>\n" "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n" @@ -798,7 +759,7 @@ "或者也可以配置您其它的引导管理器去启动 &product;。</p>" #. custom bootloader help text, 5 of 7 -#: src/include/bootloader/routines/helps.rb:143 +#: src/include/bootloader/routines/helps.rb:141 msgid "" "<p>\n" "- In some <b>Other</b> partition. Consider your system's restrictions\n" @@ -809,7 +770,7 @@ "当选择此选项时请考虑到您系统的限制。</p>" #. optional part, only inserted on x86 architectures. 6 of 7 -#: src/include/bootloader/routines/helps.rb:153 +#: src/include/bootloader/routines/helps.rb:151 msgid "" "<p>For example, most PCs have a BIOS\n" "limit that restricts booting to\n" @@ -820,7 +781,7 @@ "取决于所用的引导管理器，您可能能够也可能不能从一个逻辑分区引导。</p>" #. custom bootloader help text, 7 of 7 -#: src/include/bootloader/routines/helps.rb:165 +#: src/include/bootloader/routines/helps.rb:163 msgid "" "<p>\n" "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n" @@ -830,7 +791,7 @@ "请在输入字段中输入分区的设备名 (例如，<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</tt>)。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:178 +#: src/include/bootloader/routines/helps.rb:176 msgid "" "<p><b>Boot Loader Installation Details</b><br>\n" "To adjust advanced boot loader installation options (such as the device\n" @@ -841,7 +802,7 @@ "请点击<b>引导加载器安装细节</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:189 +#: src/include/bootloader/routines/helps.rb:187 msgid "" "<p><b>Boot Loader Type</b><br>\n" "To select whether to install a boot loader and which bootloader to install,\n" @@ -851,7 +812,7 @@ "要选择是否安装引导加载器以及安装哪个引导加载器，请使用<b>引导加载器</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:201 +#: src/include/bootloader/routines/helps.rb:198 msgid "" "<p><b>Boot Loader Options</b><br>\n" "To adjust options of the boot loader, such as the time-out, click\n" @@ -861,7 +822,7 @@ "要调整引导加载器的选项，诸如超时，请点击<b>引导加载器选项</b>。</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:212 +#: src/include/bootloader/routines/helps.rb:209 msgid "" "<P><B>Expert Manual Configuration</B><BR>\n" "Here, manually edit the boot loader configuration.</P>\n" @@ -872,7 +833,7 @@ "<P>注意：最终配置文件中的缩进可能有所不同。</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:223 +#: src/include/bootloader/routines/helps.rb:220 msgid "" "<p><b>Section Name</b><br>\n" "Use <b>Section Name</b> to specify the boot loader section name. The section\n" @@ -883,7 +844,7 @@ "引导项必须是唯一。</p>" #. help text 1/5 -#: src/include/bootloader/routines/helps.rb:234 +#: src/include/bootloader/routines/helps.rb:231 msgid "" "<p><big><b>Type of the New Section</b></big><br>\n" "Select the type of the new section to create.</p>" @@ -892,7 +853,7 @@ "选择要创建的新引导项类型。</p>" #. help text 2/5 -#: src/include/bootloader/routines/helps.rb:238 +#: src/include/bootloader/routines/helps.rb:235 msgid "" "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n" "section. Then modify the options that should differ from the\n" @@ -902,21 +863,21 @@ "然后再修改应与所选引导项不同的选项。</p>" #. help text 3/5 -#: src/include/bootloader/routines/helps.rb:244 +#: src/include/bootloader/routines/helps.rb:241 msgid "" "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n" "to load and start.</p>" msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>" #. help text 4/5 -#: src/include/bootloader/routines/helps.rb:248 +#: src/include/bootloader/routines/helps.rb:245 msgid "" "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" "but to start it in a Xen environment.</p>" msgstr "<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像，但需要在 XEN 环境中启动它。</p>" #. help text 5/5 -#: src/include/bootloader/routines/helps.rb:252 +#: src/include/bootloader/routines/helps.rb:249 msgid "" "<p>Select <b>Other System (Chainloader)</b> to add a section that \n" "loads and starts a boot sector of a partition of the disk. This is used for\n" @@ -925,7 +886,7 @@ "<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区的项。\n" "这用于引导其它操作系统。</p>" -#: src/include/bootloader/routines/helps.rb:257 +#: src/include/bootloader/routines/helps.rb:254 msgid "" "<p>Select <b>Menu Section</b> to add a section that \n" "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n" @@ -935,7 +896,7 @@ "这用于引导其它操作系统。</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:266 +#: src/include/bootloader/routines/lilolike.rb:101 msgid "Order of Hard Disks: %1" msgstr "硬盘顺序：%1" @@ -945,27 +906,27 @@ msgstr "不安装任何引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:53 +#: src/include/bootloader/routines/misc.rb:54 msgid "Do Not Install Any Boot Loader" msgstr "不安装任何引导加载器" #. summary string -#: src/include/bootloader/routines/misc.rb:58 +#: src/include/bootloader/routines/misc.rb:60 msgid "Install the default boot loader" msgstr "安装默认引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:60 +#: src/include/bootloader/routines/misc.rb:63 msgid "Install Default Boot Loader" msgstr "安装默认引导加载器" #. summary string -#: src/include/bootloader/routines/misc.rb:64 +#: src/include/bootloader/routines/misc.rb:68 msgid "Boot loader" msgstr "引导加载器" #. combo box item -#: src/include/bootloader/routines/misc.rb:66 +#: src/include/bootloader/routines/misc.rb:71 msgid "Boot Loader" msgstr "引导加载器" @@ -1055,40 +1016,116 @@ msgid "Because of the partitioning, the boot loader cannot be installed properly." msgstr "出于分区原因，无法正确安装引导加载器。" +#. Represents dialog for modification of device map +#: src/lib/bootloader/device_map_dialog.rb:53 +msgid "Device map must contain at least one device" +msgstr "设备映射必须包含至少一个设备" + +#. we just go back to original dialog +#: src/lib/bootloader/device_map_dialog.rb:96 +msgid "Disk order settings" +msgstr "磁盘顺序设置" + +#: src/lib/bootloader/device_map_dialog.rb:101 +msgid "D&isks" +msgstr "磁盘(&I)" + +#. textentry header +#: src/lib/bootloader/device_map_dialog.rb:146 +msgid "&Device" +msgstr "设备(&D)" + +#. TRANSLATORS: %s stands for partition +#: src/lib/bootloader/disk_change_detector.rb:47 +msgid "Selected custom bootloader partition %s is not available any more." +msgstr "" + +#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to install and +#. the %{device} is device where it should be, but isn't +#: src/lib/bootloader/disk_change_detector.rb:61 +msgid "Selected bootloader location %{path} is not on %{device} any more." +msgstr "" + +#. Finish client for bootloader configuration +#: src/lib/bootloader/finish_client.rb:28 +msgid "Saving bootloader configuration..." +msgstr "正在保存引导加载器配置..." + +#. TRANSLATORS: reboot message +#. %1 is replaced with additional message from reIPL +#: src/lib/bootloader/finish_client.rb:145 +msgid "" +"\n" +"Your system will now shut down.%1\n" +"For details, read the related chapter \n" +"in the documentation. \n" +msgstr "" +"\n" +"您的系统即将关闭。%1\n" +"细节请阅读文档中的相关章节。\n" + +#. Final message after all packages from CD1 are installed +#. and we're ready to start (boot into) the installed system +#. Message that will be displayed along with information +#. how the boot loader was installed +#: src/lib/bootloader/finish_client.rb:158 +msgid "The system will reboot now..." +msgstr "系统将立即重引导..." + +#. proposal part - bootloader label +#: src/lib/bootloader/proposal_client.rb:94 +msgid "Booting" +msgstr "引导" + +#. menubutton entry +#: src/lib/bootloader/proposal_client.rb:96 +msgid "&Booting" +msgstr "引导(&B)" + +#. warning text in the summary richtext +#: src/lib/bootloader/proposal_client.rb:178 +msgid "No boot loader is selected for installation. Your system might not be bootable." +msgstr "未选择安装任何引导加载器。您的系统可能无法引导。" + +#. error in the proposal +#: src/lib/bootloader/proposal_client.rb:187 +msgid "Because of the partitioning, the bootloader cannot be installed properly" +msgstr "出于分区原因，无法正确安装引导加载器" + #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:193 +#: src/modules/BootGRUB2.rb:194 msgid "Install bootcode into MBR (do not install</a>)" msgstr "安装引导代码至 MBR(不安装</a>)" -#: src/modules/BootGRUB2.rb:197 +#: src/modules/BootGRUB2.rb:198 msgid "Do not install bootcode into MBR (install</a>)" msgstr "不安装引导代码至 MBR(安装</a>)" #. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB2.rb:210 +#: src/modules/BootGRUB2.rb:211 msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "安装引导代码至 /boot 分区(不安装</a>)" -#: src/modules/BootGRUB2.rb:214 +#: src/modules/BootGRUB2.rb:215 msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "不安装引导代码至 /boot 分区(安装</a>)" -#: src/modules/BootGRUB2.rb:220 +#: src/modules/BootGRUB2.rb:221 msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "安装引导代码至 \"/\" 分区(不安装</a>)" -#: src/modules/BootGRUB2.rb:224 +#: src/modules/BootGRUB2.rb:225 msgid "Do not install bootcode into \"/\" partition (install</a>)" msgstr "不安装引导代码至 \"/\" 分区(安装</a>)" #. no location chosen, so warn user that it is problem unless he is sure -#: src/modules/BootGRUB2.rb:234 +#: src/modules/BootGRUB2.rb:235 msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." msgstr "警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。" #. TRANSLATORS: title for list of location proposals -#: src/modules/BootGRUB2.rb:242 +#: src/modules/BootGRUB2.rb:243 msgid "Change Location: %s" msgstr "变动位置：%s" @@ -1096,7 +1133,7 @@ #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:96 +#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100 msgid "Boot Loader Type: %1" msgstr "引导加载器类型：%1" @@ -1115,110 +1152,116 @@ msgid "Status Location: %1" msgstr "状态位置：%1" -#: src/modules/BootGRUB2EFI.rb:104 +#: src/modules/BootGRUB2EFI.rb:108 msgid "Enable Secure Boot: %1" msgstr "启用安全引导：%1" #. Check that bootloader is known and supported -#: src/modules/BootSupportCheck.rb:70 +#: src/modules/BootSupportCheck.rb:65 msgid "Unknown bootloader: %1" msgstr "未知引导加载器：%1" #. grub2 is sooo cool... -#: src/modules/BootSupportCheck.rb:101 +#: src/modules/BootSupportCheck.rb:99 msgid "Unsupported combination of hardware platform %1 and bootloader %2" msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合" #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation. -#: src/modules/BootSupportCheck.rb:140 +#: src/modules/BootSupportCheck.rb:139 msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR." msgstr "从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使用。要修复此问题，可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区，或不要把 stage 1 安装到 MBR。" #. check if boot device is on raid0 -#: src/modules/BootSupportCheck.rb:168 +#: src/modules/BootSupportCheck.rb:167 msgid "The boot device is on raid type: %1. System will not boot." msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。" #. bnc#501043 added check for valid configuration -#: src/modules/BootSupportCheck.rb:188 +#: src/modules/BootSupportCheck.rb:187 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置，例如，主引导记录" #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:244 +#: src/modules/BootSupportCheck.rb:243 msgid "Missing ext partition for booting. Cannot install boot code." msgstr "缺失用于引导的 ext 分区。无法安装引导代码。" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:159 +#: src/modules/Bootloader.rb:144 msgid "Check boot loader" msgstr "检查引导加载器" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:161 +#: src/modules/Bootloader.rb:146 msgid "Read partitioning" msgstr "读取分区" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:163 +#: src/modules/Bootloader.rb:148 msgid "Load boot loader settings" msgstr "加载引导加载器设置" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:167 +#: src/modules/Bootloader.rb:152 msgid "Checking boot loader..." msgstr "正在检查引导加载器..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:169 +#: src/modules/Bootloader.rb:154 msgid "Reading partitioning..." msgstr "正在读取分区..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:171 +#: src/modules/Bootloader.rb:156 msgid "Loading boot loader settings..." msgstr "正在加载引导加载器设置..." #. dialog header -#: src/modules/Bootloader.rb:175 +#: src/modules/Bootloader.rb:160 msgid "Initializing Boot Loader Configuration" msgstr "正在初始化引导加载器配置" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:322 +#: src/modules/Bootloader.rb:279 msgid "Create initrd" msgstr "创建 initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:324 +#: src/modules/Bootloader.rb:281 msgid "Save boot loader configuration files" msgstr "保存引导加载器配置文件" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:326 +#: src/modules/Bootloader.rb:283 msgid "Install boot loader" msgstr "安装引导加载器" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:330 +#: src/modules/Bootloader.rb:287 msgid "Creating initrd..." msgstr "正在创建 initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:332 +#: src/modules/Bootloader.rb:289 msgid "Saving boot loader configuration files..." msgstr "正在保存引导加载器配置文件..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:334 +#: src/modules/Bootloader.rb:291 msgid "Installing boot loader..." msgstr "正在安装引导加载器..." #. progress line -#: src/modules/Bootloader.rb:340 +#: src/modules/Bootloader.rb:297 msgid "Saving Boot Loader Configuration" msgstr "正在保存引导加载器配置" +#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" +#~ msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>" + +#~ msgid "&Failsafe Kernel Command Line Parameter" +#~ msgstr "安全模式内核命令行参数(&F)" + #~ msgid "Delete a global option or option of a section" #~ msgstr "删除全局选项或某引导项的选项" @@ -1243,9 +1286,6 @@ #~ msgid "Disk Order" #~ msgstr "磁盘顺序" -#~ msgid "Disk order settings" -#~ msgstr "磁盘顺序设置" - #~ msgid "Boot Menu" #~ msgstr "引导菜单" @@ -1274,15 +1314,6 @@ #~ msgid "Enable Acoustic &Signals" #~ msgstr "启用声音信号(&S)" -#~ msgid "&Device" -#~ msgstr "设备(&D)" - -#~ msgid "Device map must contain at least one device" -#~ msgstr "设备映射必须包含至少一个设备" - -#~ msgid "D&isks" -#~ msgstr "磁盘(&I)" - #~ msgid "&Up" #~ msgstr "向上(&U)" Modified: trunk/yast/zh_CN/po/ca-management.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ca-management.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ca-management.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-08 10:25+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -2512,8 +2512,8 @@ #: src/modules/YaPI/CaManagement.pm:676 src/modules/YaPI/CaManagement.pm:1357 #: src/modules/YaPI/CaManagement.pm:1849 src/modules/YaPI/CaManagement.pm:2124 #: src/modules/YaPI/CaManagement.pm:2880 src/modules/YaPI/CaManagement.pm:2978 -#: src/modules/YaPI/CaManagement.pm:4429 src/modules/YaPI/CaManagement.pm:7305 -#: src/modules/YaPI/CaManagement.pm:7428 +#: src/modules/YaPI/CaManagement.pm:4429 src/modules/YaPI/CaManagement.pm:7306 +#: src/modules/YaPI/CaManagement.pm:7429 msgid "Missing value 'caName'." msgstr "缺少值 'caName'。" @@ -2552,7 +2552,7 @@ msgid "Missing parameter 'certType'." msgstr "缺少参数 'certType'。" -#: src/modules/YaPI/CaManagement.pm:1260 src/modules/YaPI/CaManagement.pm:7243 +#: src/modules/YaPI/CaManagement.pm:1260 src/modules/YaPI/CaManagement.pm:7244 msgid "Getting defaults failed." msgstr "获取默认值失败。" @@ -2566,11 +2566,11 @@ #: src/modules/YaPI/CaManagement.pm:3322 src/modules/YaPI/CaManagement.pm:3614 #: src/modules/YaPI/CaManagement.pm:3788 src/modules/YaPI/CaManagement.pm:4122 #: src/modules/YaPI/CaManagement.pm:4487 src/modules/YaPI/CaManagement.pm:6127 -#: src/modules/YaPI/CaManagement.pm:6812 src/modules/YaPI/CaManagement.pm:7326 +#: src/modules/YaPI/CaManagement.pm:6813 src/modules/YaPI/CaManagement.pm:7327 msgid "Initializing the CA failed." msgstr "初始化 CA 失败。" -#: src/modules/YaPI/CaManagement.pm:1635 src/modules/YaPI/CaManagement.pm:7369 +#: src/modules/YaPI/CaManagement.pm:1635 src/modules/YaPI/CaManagement.pm:7370 msgid "Writing the defaults failed." msgstr "写入默认值失败。" @@ -2581,16 +2581,16 @@ #: src/modules/YaPI/CaManagement.pm:4070 src/modules/YaPI/CaManagement.pm:4251 #: src/modules/YaPI/CaManagement.pm:4822 src/modules/YaPI/CaManagement.pm:5078 #: src/modules/YaPI/CaManagement.pm:5867 src/modules/YaPI/CaManagement.pm:6098 -#: src/modules/YaPI/CaManagement.pm:6528 src/modules/YaPI/CaManagement.pm:6894 -#: src/modules/YaPI/CaManagement.pm:6982 src/modules/YaPI/CaManagement.pm:7088 -#: src/modules/YaPI/CaManagement.pm:7193 +#: src/modules/YaPI/CaManagement.pm:6529 src/modules/YaPI/CaManagement.pm:6895 +#: src/modules/YaPI/CaManagement.pm:6983 src/modules/YaPI/CaManagement.pm:7089 +#: src/modules/YaPI/CaManagement.pm:7194 msgid "Invalid value for parameter 'caName'." msgstr "参数 'caName' 的值无效。" #. parameter check failed #: src/modules/YaPI/CaManagement.pm:1704 src/modules/YaPI/CaManagement.pm:2768 #: src/modules/YaPI/CaManagement.pm:3123 src/modules/YaPI/CaManagement.pm:5465 -#: src/modules/YaPI/CaManagement.pm:6536 +#: src/modules/YaPI/CaManagement.pm:6537 msgid "Invalid value for parameter 'type'." msgstr "参数 'type' 的值无效。" @@ -2614,7 +2614,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2135 src/modules/YaPI/CaManagement.pm:2887 #: src/modules/YaPI/CaManagement.pm:2984 src/modules/YaPI/CaManagement.pm:4446 -#: src/modules/YaPI/CaManagement.pm:7006 +#: src/modules/YaPI/CaManagement.pm:7007 msgid "Missing value 'caPasswd'." msgstr "缺少值 'caPasswd'。" @@ -2624,7 +2624,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2547 src/modules/YaPI/CaManagement.pm:2652 -#: src/modules/YaPI/CaManagement.pm:6663 src/modules/YaPI/CaManagement.pm:6769 +#: src/modules/YaPI/CaManagement.pm:6664 src/modules/YaPI/CaManagement.pm:6770 msgid "Missing parameter 'caName'." msgstr "缺少参数 'caName'。" @@ -2639,7 +2639,7 @@ #. parameter check failed #: src/modules/YaPI/CaManagement.pm:2658 src/modules/YaPI/CaManagement.pm:3303 #: src/modules/YaPI/CaManagement.pm:3566 src/modules/YaPI/CaManagement.pm:3727 -#: src/modules/YaPI/CaManagement.pm:4077 src/modules/YaPI/CaManagement.pm:7095 +#: src/modules/YaPI/CaManagement.pm:4077 src/modules/YaPI/CaManagement.pm:7096 msgid "Invalid value for parameter 'caPasswd'." msgstr "参数 'caPasswd' 的值无效。" @@ -2677,7 +2677,7 @@ msgid "Missing value 'days'." msgstr "缺少值 'days'。" -#: src/modules/YaPI/CaManagement.pm:3041 src/modules/YaPI/CaManagement.pm:7358 +#: src/modules/YaPI/CaManagement.pm:3041 src/modules/YaPI/CaManagement.pm:7359 msgid "Modifying CRLGenerationData failed." msgstr "修改 CRLGenerationData 失败。" @@ -2731,8 +2731,8 @@ msgstr "缺少参数 'P12Password'。" #. parameter check failed -#: src/modules/YaPI/CaManagement.pm:3572 src/modules/YaPI/CaManagement.pm:6543 -#: src/modules/YaPI/CaManagement.pm:6901 +#: src/modules/YaPI/CaManagement.pm:3572 src/modules/YaPI/CaManagement.pm:6544 +#: src/modules/YaPI/CaManagement.pm:6902 msgid "Invalid value for parameter 'request'." msgstr "参数 'request' 的值无效。" @@ -2940,100 +2940,100 @@ msgid "Importing the certificate failed." msgstr "导入证书失败。" -#: src/modules/YaPI/CaManagement.pm:6320 +#: src/modules/YaPI/CaManagement.pm:6321 msgid "Missing parameter 'inFile'." msgstr "缺少参数 'inFile'。" -#: src/modules/YaPI/CaManagement.pm:6325 +#: src/modules/YaPI/CaManagement.pm:6326 msgid "File not found." msgstr "未找到文件。" -#: src/modules/YaPI/CaManagement.pm:6331 +#: src/modules/YaPI/CaManagement.pm:6332 msgid "Missing parameter 'type'." msgstr "缺少参数 'type'。" -#: src/modules/YaPI/CaManagement.pm:6335 +#: src/modules/YaPI/CaManagement.pm:6336 #, perl-format msgid "Invalid value '%s' in 'type'." msgstr "'type' 中的值 '%s' 无效。" -#: src/modules/YaPI/CaManagement.pm:6342 +#: src/modules/YaPI/CaManagement.pm:6343 msgid "Missing parameter 'datatype'." msgstr "缺少参数 'datatype'。" -#: src/modules/YaPI/CaManagement.pm:6346 +#: src/modules/YaPI/CaManagement.pm:6347 #, perl-format msgid "Unknown value '%s' in 'datatype'." msgstr "'datatype' 中的值 '%s' 未知。" -#: src/modules/YaPI/CaManagement.pm:6352 +#: src/modules/YaPI/CaManagement.pm:6353 msgid "Missing parameter 'inForm'." msgstr "缺少参数 'inForm'。" -#: src/modules/YaPI/CaManagement.pm:6356 +#: src/modules/YaPI/CaManagement.pm:6357 #, perl-format msgid "Unknown value '%s' in 'inForm'." msgstr "'inForm' 中的值 '%s' 未知。" -#: src/modules/YaPI/CaManagement.pm:6461 +#: src/modules/YaPI/CaManagement.pm:6462 msgid "Parsing failed." msgstr "解析失败。" -#: src/modules/YaPI/CaManagement.pm:6589 +#: src/modules/YaPI/CaManagement.pm:6590 msgid "Parsing the request failed." msgstr "解析请求失败。" -#: src/modules/YaPI/CaManagement.pm:6703 +#: src/modules/YaPI/CaManagement.pm:6704 msgid "Getting the request list failed." msgstr "获取请求列表失败。" -#: src/modules/YaPI/CaManagement.pm:6778 +#: src/modules/YaPI/CaManagement.pm:6779 #, perl-format msgid "Request not found in %s." msgstr "在 %s 中未找到请求。" -#: src/modules/YaPI/CaManagement.pm:6785 +#: src/modules/YaPI/CaManagement.pm:6786 msgid "Cannot read the request." msgstr "无法读取请求。" -#: src/modules/YaPI/CaManagement.pm:6791 +#: src/modules/YaPI/CaManagement.pm:6792 msgid "No request data found." msgstr "未找到请求数据。" -#: src/modules/YaPI/CaManagement.pm:6834 +#: src/modules/YaPI/CaManagement.pm:6835 msgid "Importing the request failed." msgstr "导入请求失败。" -#: src/modules/YaPI/CaManagement.pm:6925 +#: src/modules/YaPI/CaManagement.pm:6926 msgid "Deleting the request failed." msgstr "删除请求失败。" -#: src/modules/YaPI/CaManagement.pm:6988 +#: src/modules/YaPI/CaManagement.pm:6989 msgid "Invalid value for parameter 'caCertificate'." msgstr "参数 'caCertifiCAte' 的值无效。" -#: src/modules/YaPI/CaManagement.pm:6993 +#: src/modules/YaPI/CaManagement.pm:6994 msgid "Invalid value for parameter 'caKey'." msgstr "参数 'caKey' 的值无效。" -#: src/modules/YaPI/CaManagement.pm:7000 +#: src/modules/YaPI/CaManagement.pm:7001 #, perl-format msgid "CA key not available in %s." msgstr "CA 密钥在 %s 中不可用。" -#: src/modules/YaPI/CaManagement.pm:7029 +#: src/modules/YaPI/CaManagement.pm:7030 msgid "Importing the CA failed." msgstr "导入 CA 失败。" -#: src/modules/YaPI/CaManagement.pm:7126 +#: src/modules/YaPI/CaManagement.pm:7127 msgid "Deleting the CA failed." msgstr "删除 CA 失败。" -#: src/modules/YaPI/CaManagement.pm:7466 src/modules/YaPI/CaManagement.pm:7482 +#: src/modules/YaPI/CaManagement.pm:7467 src/modules/YaPI/CaManagement.pm:7483 msgid "Keyfile does not exist." msgstr "密钥文件不存在。" -#: src/modules/YaPI/CaManagement.pm:7501 +#: src/modules/YaPI/CaManagement.pm:7502 msgid "Password change failed." msgstr "密码修改失败。" Modified: trunk/yast/zh_CN/po/cio.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/cio.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/cio.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-08 10:32+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -43,13 +43,13 @@ msgstr "已用" #: src/lib/iochannel/channels_dialog.rb:142 +msgid "yes" +msgstr "是" + +#: src/lib/iochannel/channels_dialog.rb:142 msgid "no" msgstr "否" -#: src/lib/iochannel/channels_dialog.rb:142 -msgid "yes" -msgstr "是" - #. filter can be empty if dialog is not yet created #: src/lib/iochannel/channels_dialog.rb:160 msgid "Filter channels" Modified: trunk/yast/zh_CN/po/cluster.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/cluster.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/cluster.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 22:44+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -80,123 +80,125 @@ msgstr "配置 conntrackd" #. return `cancel or a string -#: src/include/cluster/dialogs.rb:85 src/include/cluster/dialogs.rb:120 +#: src/include/cluster/dialogs.rb:87 src/include/cluster/dialogs.rb:122 msgid "OK" msgstr "好" -#: src/include/cluster/dialogs.rb:86 src/include/cluster/dialogs.rb:121 +#: src/include/cluster/dialogs.rb:88 src/include/cluster/dialogs.rb:123 msgid "Cancel" msgstr "取消" #. BNC#871970, change member address struct -#: src/include/cluster/dialogs.rb:111 +#: src/include/cluster/dialogs.rb:113 msgid "IP Address" msgstr "IP 地址" -#: src/include/cluster/dialogs.rb:113 +#: src/include/cluster/dialogs.rb:115 msgid "Redundant IP Address" msgstr "冗余 IP 地址" -#: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501 msgid "Node ID" msgstr "节点 ID" #. Set need to require 'set' -#: src/include/cluster/dialogs.rb:163 +#: src/include/cluster/dialogs.rb:165 msgid "Node ID has to be fulfilled with a positive integer" msgstr "节点 ID 必须是一个正整数" -#: src/include/cluster/dialogs.rb:170 +#: src/include/cluster/dialogs.rb:172 msgid "Node ID must be unique" msgstr "节点 ID 必须是唯一的" #. BNC#871970, change member address struct -#: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245 +#: src/include/cluster/dialogs.rb:193 src/include/cluster/dialogs.rb:247 msgid "The Bind Network Address has to be fulfilled" msgstr "必须填写绑定网络地址" -#: src/include/cluster/dialogs.rb:197 +#: src/include/cluster/dialogs.rb:199 msgid "The cluster name has to be fulfilled" msgstr "必须填写集群名称" -#: src/include/cluster/dialogs.rb:214 +#: src/include/cluster/dialogs.rb:216 msgid "The Member Address has to be fulfilled" msgstr "必须填写成员地址" #. BNC#880242, expected_votes must have value when "udp" -#: src/include/cluster/dialogs.rb:220 -msgid "The Expected Votes has to be fulfilled when udp is configured" +#: src/include/cluster/dialogs.rb:222 +#, fuzzy +#| msgid "The Expected Votes has to be fulfilled when udp is configured" +msgid "The Expected Votes has to be fulfilled when multicast transport is configured" msgstr "当配置了 udp 时必须填写期望票数" -#: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 -#: src/include/cluster/dialogs.rb:1463 +#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256 +#: src/include/cluster/dialogs.rb:1427 msgid "The Multicast Address has to be fulfilled" msgstr "必须填写多播地址" -#: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 +#: src/include/cluster/dialogs.rb:238 src/include/cluster/dialogs.rb:266 msgid "The Multicast port must be a positive integer" msgstr "多播端口必须为正整数" -#: src/include/cluster/dialogs.rb:270 +#: src/include/cluster/dialogs.rb:272 msgid "Only passive or active can be chosen if multiple interface used. Set to passive." msgstr "若使用了多个接口则只能选择主动或被动。设置为被动。" #. BNC#871970, change member address struct to memberaddr -#: src/include/cluster/dialogs.rb:439 +#: src/include/cluster/dialogs.rb:441 msgid "Transport:" msgstr "传输：" -#: src/include/cluster/dialogs.rb:447 +#: src/include/cluster/dialogs.rb:449 msgid "Channel" msgstr "频道" -#: src/include/cluster/dialogs.rb:452 src/include/cluster/dialogs.rb:473 +#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475 msgid "Bind Network Address:" msgstr "绑定网络地址：" -#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:476 -#: src/include/cluster/dialogs.rb:1399 +#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478 +#: src/include/cluster/dialogs.rb:1363 msgid "Multicast Address:" msgstr "多播地址：" -#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:477 +#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479 msgid "Multicast Port:" msgstr "多播端口：" -#: src/include/cluster/dialogs.rb:467 +#: src/include/cluster/dialogs.rb:469 msgid "Redundant Channel" msgstr "冗余频道" -#: src/include/cluster/dialogs.rb:483 +#: src/include/cluster/dialogs.rb:485 msgid "Cluster Name:" msgstr "集群名称：" -#: src/include/cluster/dialogs.rb:484 +#: src/include/cluster/dialogs.rb:486 msgid "Expected Votes:" msgstr "期望票数：" -#: src/include/cluster/dialogs.rb:488 +#: src/include/cluster/dialogs.rb:490 msgid "rrp mode:" msgstr "rrp 模式：" -#: src/include/cluster/dialogs.rb:493 +#: src/include/cluster/dialogs.rb:495 msgid "Auto Generate Node ID" msgstr "自动生成节点 ID" -#: src/include/cluster/dialogs.rb:498 +#: src/include/cluster/dialogs.rb:500 msgid "Member Address:" msgstr "成员地址：" -#: src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:501 msgid "IP" msgstr "IP" -#: src/include/cluster/dialogs.rb:499 +#: src/include/cluster/dialogs.rb:501 msgid "Redundant IP" msgstr "冗余 IP" #. BNC#879596, check the corosync.conf format -#: src/include/cluster/dialogs.rb:539 +#: src/include/cluster/dialogs.rb:541 msgid "" " NOTICE: Detected old corosync configuration.\n" " Please reconfigure the member list and confirm all other settings." @@ -205,135 +207,123 @@ " 请重新配置成员列表并确认全部其它设置。" #. Notice, current could be "nil" if the list is empty. -#: src/include/cluster/dialogs.rb:690 -msgid "Number of threads must be integer" -msgstr "线程数必须为整数" - -#: src/include/cluster/dialogs.rb:696 -msgid "Number of threads must larger then 0" -msgstr "线程数必须大于 0" - -#: src/include/cluster/dialogs.rb:734 +#: src/include/cluster/dialogs.rb:715 msgid "Enable Security Auth" msgstr "启用安全认证" -#: src/include/cluster/dialogs.rb:737 -msgid "Threads:" -msgstr "线程：" - -#: src/include/cluster/dialogs.rb:740 +#: src/include/cluster/dialogs.rb:719 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." msgstr "新创建的集群，请按下面按钮生成 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:745 +#: src/include/cluster/dialogs.rb:724 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." msgstr "要加入一个已有集群，请从其他节点手动复制 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:773 +#: src/include/cluster/dialogs.rb:750 msgid "Failed to create /etc/corosync/authkey" msgstr "创建 /etc/corosync/authkey 失败" -#: src/include/cluster/dialogs.rb:775 +#: src/include/cluster/dialogs.rb:752 msgid "Create /etc/corosync/authkey succeeded" msgstr "创建 /etc/corosync/authkey 成功" -#: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 +#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883 msgid "Running" msgstr "运行中" -#: src/include/cluster/dialogs.rb:852 +#: src/include/cluster/dialogs.rb:815 msgid "Not running" msgstr "未运行" #. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster -#: src/include/cluster/dialogs.rb:888 +#: src/include/cluster/dialogs.rb:851 msgid "Booting" msgstr "引导时" -#: src/include/cluster/dialogs.rb:898 +#: src/include/cluster/dialogs.rb:861 msgid "On -- Start pacemaker during boot" msgstr "开 -- 引导时启动 pacemaker" -#: src/include/cluster/dialogs.rb:905 +#: src/include/cluster/dialogs.rb:868 msgid "Off -- Start pacemaker manually" msgstr "关 -- 手动启动 pacemaker" -#: src/include/cluster/dialogs.rb:914 +#: src/include/cluster/dialogs.rb:877 msgid "Switch On and Off" msgstr "打开和关闭" -#: src/include/cluster/dialogs.rb:919 +#: src/include/cluster/dialogs.rb:882 msgid "Current Status: " msgstr "当前状态：" -#: src/include/cluster/dialogs.rb:928 +#: src/include/cluster/dialogs.rb:891 msgid "Start pacemaker Now" msgstr "立即启动 pacemaker" -#: src/include/cluster/dialogs.rb:929 +#: src/include/cluster/dialogs.rb:892 msgid "Stop pacemaker Now" msgstr "立即停止 pacemaker" #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed -#: src/include/cluster/dialogs.rb:1027 +#: src/include/cluster/dialogs.rb:990 msgid "Sync Host" msgstr "同步主机" -#: src/include/cluster/dialogs.rb:1031 src/include/cluster/dialogs.rb:1043 +#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006 msgid "Add" msgstr "添加" -#: src/include/cluster/dialogs.rb:1032 src/include/cluster/dialogs.rb:1044 +#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007 msgid "Del" msgstr "删除" -#: src/include/cluster/dialogs.rb:1033 src/include/cluster/dialogs.rb:1045 +#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008 msgid "Edit" msgstr "编辑" -#: src/include/cluster/dialogs.rb:1039 +#: src/include/cluster/dialogs.rb:1002 msgid "Sync File" msgstr "同步文件" -#: src/include/cluster/dialogs.rb:1046 +#: src/include/cluster/dialogs.rb:1009 msgid "Add Suggested Files" msgstr "添加建议的文件" -#: src/include/cluster/dialogs.rb:1055 +#: src/include/cluster/dialogs.rb:1018 msgid "Generate Pre-Shared-Keys" msgstr "生成预共享密钥" #. remove duplicated elements -#: src/include/cluster/dialogs.rb:1179 +#: src/include/cluster/dialogs.rb:1143 msgid "Csync2 Status Unknown" msgstr "Csync2 状态未知" -#: src/include/cluster/dialogs.rb:1182 +#: src/include/cluster/dialogs.rb:1146 msgid "Turn csync2 ON" msgstr "开启 csync2" -#: src/include/cluster/dialogs.rb:1185 +#: src/include/cluster/dialogs.rb:1149 msgid "Turn csync2 OFF" msgstr "关闭 csync2" -#: src/include/cluster/dialogs.rb:1215 +#: src/include/cluster/dialogs.rb:1179 msgid "Enter a hostname" msgstr "请输入一个主机名" -#: src/include/cluster/dialogs.rb:1229 +#: src/include/cluster/dialogs.rb:1193 msgid "Edit the hostname" msgstr "编辑主机名" -#: src/include/cluster/dialogs.rb:1243 +#: src/include/cluster/dialogs.rb:1207 msgid "Enter a filename to synchronize" msgstr "请输入要同步的文件名" -#: src/include/cluster/dialogs.rb:1258 +#: src/include/cluster/dialogs.rb:1222 msgid "Edit the filename" msgstr "编辑文件名" #. key file exist -#: src/include/cluster/dialogs.rb:1290 +#: src/include/cluster/dialogs.rb:1254 msgid "" "Key file %1 already exist.\n" "Do you want to overwrite it?" @@ -342,12 +332,12 @@ "您想要覆盖它吗？" #. remove exist key file -#: src/include/cluster/dialogs.rb:1300 +#: src/include/cluster/dialogs.rb:1264 msgid "Delete key file %1 failed." msgstr "未能删除密钥文件 %1。" #. generate key file -#: src/include/cluster/dialogs.rb:1314 +#: src/include/cluster/dialogs.rb:1278 msgid "" "Key file %1 is generated.\n" "Clicking \"Add Suggested Files\" button adds it to sync list." @@ -355,12 +345,12 @@ "已生成密钥文件 %1。\n" "点击\"添加建议的文件\"按钮将它添加到同步列表。" -#: src/include/cluster/dialogs.rb:1321 +#: src/include/cluster/dialogs.rb:1285 msgid "Key generation failed." msgstr "未能生成密钥。" #. SaveCsync2(); -#: src/include/cluster/dialogs.rb:1383 +#: src/include/cluster/dialogs.rb:1347 msgid "" "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n" "YaST can help to configure some basic aspects of conntrackd.\n" @@ -370,28 +360,38 @@ "YaST 可辅助配置 conntrackd 的一些基础部分。\n" "您需要与 ocf:heartbeat:conntrackd 一起启动它。" -#: src/include/cluster/dialogs.rb:1394 +#: src/include/cluster/dialogs.rb:1358 msgid "Dedicated Interface:" msgstr "专用接口：" -#: src/include/cluster/dialogs.rb:1397 +#: src/include/cluster/dialogs.rb:1361 msgid "IP:" msgstr "IP：" -#: src/include/cluster/dialogs.rb:1400 +#: src/include/cluster/dialogs.rb:1364 msgid "Group Number:" msgstr "组编号：" -#: src/include/cluster/dialogs.rb:1404 +#: src/include/cluster/dialogs.rb:1368 msgid "Generate /etc/conntrackd/conntrackd.conf" msgstr "生成 /etc/conntrackd/conntrackd.conf" -#: src/include/cluster/dialogs.rb:1471 +#: src/include/cluster/dialogs.rb:1435 msgid "The Group Number must be a positive integer" msgstr "组编号必须为正整数" #. All helps are here #: src/include/cluster/helps.rb:35 +#, fuzzy +#| msgid "" +#| "<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n" +#| "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n" +#| "<p><b><big>Port</big></b><br>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports.<br></p>\n" +#| "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n" +#| "<p><b><big>Node ID</big></b><br>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used.<br></p>\n" +#| "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen.<br></p>\n" +#| "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n" +#| "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n" msgid "" "<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n" "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n" @@ -399,7 +399,7 @@ "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n" "<p><b><big>Node ID</big></b><br>This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used.<br></p>\n" "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen.<br></p>\n" -"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n" +"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<br></p>\n" "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n" msgstr "" "<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem 流量应通过 192.168.5.92 中转，则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6 地址，那样将会使用 IPV6 网络。这种情况下，必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6 网络，则必须指定节点 ID 字段。<br></p>\n" @@ -412,16 +412,20 @@ "<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<br></p>\n" #: src/include/cluster/helps.rb:45 +#, fuzzy +#| msgid "" +#| "\n" +#| "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" +#| "<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. <br></p>\n" msgid "" "\n" -"<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. <br></p>\n" "<p><b><big>Enable Security Auth</big></b><br>This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. <b r></p>\n" msgstr "" "\n" "<p><b><big>线程</big></b><br>该指令控制用于加密和发送多播消息的线程数。若安全认证为关，则协议永不使用多线程发送。若安全认证为开，此指令允许系统配置使用多线程来加密和发送多播消息。线程指令为 0 表明不使用多线程发送。此模式为非 SMP 系统提供了最大性能。默认为 0。</br></p>\n" "<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用 sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 TOTEM 发送的消息，这将降低总吞吐量。启用后，据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU 帧传输的 100mbit 网络来说，在开启了此选项的 3ghz CPU 上，100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的 3ghz CPU 上，20% 的 CPU 使用率可以达到 10mb/sec 的吞吐量。对于帧传输很大的 gig-e 网络来说：在启用了此选项的 3ghz CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n" -#: src/include/cluster/helps.rb:50 +#: src/include/cluster/helps.rb:49 msgid "" "\n" "\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n" @@ -433,7 +437,7 @@ "\t\t\t<p><b><big>防火墙设置</big></b><br>当启用防火墙时启用端口</p>\n" "\t\t\t" -#: src/include/cluster/helps.rb:56 +#: src/include/cluster/helps.rb:55 msgid "" "\n" "\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n" @@ -447,7 +451,7 @@ "\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n" "\t" -#: src/include/cluster/helps.rb:63 +#: src/include/cluster/helps.rb:62 msgid "" "\n" "\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n" @@ -464,7 +468,7 @@ "\t" #. Read dialog help 1/2 -#: src/include/cluster/helps.rb:72 +#: src/include/cluster/helps.rb:71 msgid "" "<p><b><big>Initializing cluster Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -473,7 +477,7 @@ "请稍候...<br></p>\n" #. Read dialog help 2/2 -#: src/include/cluster/helps.rb:76 +#: src/include/cluster/helps.rb:75 msgid "" "<p><b><big>Aborting Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" @@ -482,7 +486,7 @@ "现在按<b>中止</b>安全地中止配置工具。</p>\n" #. Write dialog help 1/2 -#: src/include/cluster/helps.rb:80 +#: src/include/cluster/helps.rb:79 msgid "" "<p><b><big>Saving cluster Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -491,7 +495,7 @@ "请稍候...<br></p>\n" #. Write dialog help 2/2 -#: src/include/cluster/helps.rb:84 +#: src/include/cluster/helps.rb:83 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -514,100 +518,109 @@ msgstr "正在初始化..." #. Cluster read dialog caption -#: src/modules/Cluster.rb:395 +#: src/modules/Cluster.rb:390 msgid "Initializing cluster Configuration" msgstr "正在初始化集群配置" #. Progress stage 1/3 -#: src/modules/Cluster.rb:411 +#: src/modules/Cluster.rb:406 msgid "Read the database" msgstr "读取数据库" #. Progress stage 2/3 -#: src/modules/Cluster.rb:413 +#: src/modules/Cluster.rb:408 msgid "Read the previous settings" msgstr "读取以前的设置" #. Progress stage 3/3 -#: src/modules/Cluster.rb:415 +#: src/modules/Cluster.rb:410 msgid "Read SuSEFirewall Settings" msgstr "读取 SuSEFirewall 设置" #. Progress step 1/3 -#: src/modules/Cluster.rb:419 +#: src/modules/Cluster.rb:414 msgid "Reading the database..." msgstr "正在读取数据库..." #. Progress step 2/3 -#: src/modules/Cluster.rb:421 +#: src/modules/Cluster.rb:416 msgid "Reading the previous settings..." msgstr "正在读取以前的设置..." #. Progress step 3/3 -#: src/modules/Cluster.rb:423 +#: src/modules/Cluster.rb:418 msgid "Reading SuSEFirewall settings..." msgstr "正在读取 SuSEFirewall 设置..." #. Progress finished #. Progress finished -#: src/modules/Cluster.rb:425 src/modules/Cluster.rb:527 +#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522 msgid "Finished" msgstr "已完成" -#: src/modules/Cluster.rb:440 +#: src/modules/Cluster.rb:435 msgid "Cannot install required package" msgstr "无法安装所需的软件包" #. read database -#: src/modules/Cluster.rb:449 +#: src/modules/Cluster.rb:444 msgid "Cannot load existing configuration" msgstr "无法加载已有配置" #. Error message -#: src/modules/Cluster.rb:460 +#: src/modules/Cluster.rb:455 msgid "Cannot read database1." msgstr "无法读取数据库 1。" #. Error message -#: src/modules/Cluster.rb:468 +#: src/modules/Cluster.rb:463 msgid "Cannot read database2." msgstr "无法读取数据库 2。" #. Error message -#: src/modules/Cluster.rb:484 +#: src/modules/Cluster.rb:479 msgid "Cannot detect devices." msgstr "无法检测设备。" #. Cluster read dialog caption -#: src/modules/Cluster.rb:502 +#: src/modules/Cluster.rb:497 msgid "Saving cluster Configuration" msgstr "正在保存集群配置" #. Progress stage 1/2 -#: src/modules/Cluster.rb:517 +#: src/modules/Cluster.rb:512 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Cluster.rb:519 +#: src/modules/Cluster.rb:514 msgid "Save changes to SuSEFirewall" msgstr "保存修改到 SuSEFirewall" #. Progress step 1/2 -#: src/modules/Cluster.rb:523 +#: src/modules/Cluster.rb:518 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Cluster.rb:525 +#: src/modules/Cluster.rb:520 msgid "Saving changes to SuSEFirewall..." msgstr "正在保存修改到 SuSEFirewall..." #. Error message -#: src/modules/Cluster.rb:537 +#: src/modules/Cluster.rb:532 msgid "Cannot write settings." msgstr "无法写入设置。" +#~ msgid "Number of threads must be integer" +#~ msgstr "线程数必须为整数" + +#~ msgid "Number of threads must larger then 0" +#~ msgstr "线程数必须大于 0" + +#~ msgid "Threads:" +#~ msgstr "线程：" + #~ msgid "nodeid" #~ msgstr "节点 ID" Modified: trunk/yast/zh_CN/po/control-center.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/control-center.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/control-center.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: control center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-01 20:30+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/control.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/control.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/control.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-10-30 17:30+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/country.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/country.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/country.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-08 16:20+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Traditional \n" @@ -25,38 +25,38 @@ "X-Generator: Lokalize 1.5\n" #. translators: command line help text for Securoty module -#: keyboard/src/clients/keyboard.rb:58 +#: keyboard/src/clients/keyboard.rb:59 msgid "Keyboard configuration." msgstr "键盘配置。" #. command line help text for 'summary' action -#: keyboard/src/clients/keyboard.rb:71 +#: keyboard/src/clients/keyboard.rb:72 msgid "Keyboard configuration summary." msgstr "键盘配置摘要。" #. command line help text for 'set' action -#: keyboard/src/clients/keyboard.rb:78 +#: keyboard/src/clients/keyboard.rb:79 msgid "Set new values for keyboard configuration." msgstr "为键盘配置设置新值。" #. command line help text for 'list' action -#: keyboard/src/clients/keyboard.rb:85 +#: keyboard/src/clients/keyboard.rb:86 msgid "List all available keyboard layouts." msgstr "列出所有可用的键盘布局。" #. command line help text for 'set layout' option -#: keyboard/src/clients/keyboard.rb:93 +#: keyboard/src/clients/keyboard.rb:94 msgid "New keyboard layout" msgstr "新键盘布局" #. summary label #. summary label -#: keyboard/src/clients/keyboard.rb:155 keyboard/src/modules/Keyboard.rb:1390 +#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402 msgid "Current Keyboard Layout: %1" msgstr "当前键盘布局：%1" #. error message (%1 is given layout); do not translate 'list' -#: keyboard/src/clients/keyboard.rb:179 +#: keyboard/src/clients/keyboard.rb:184 msgid "Keyboard layout '%1' is invalid. Use a 'list' command to see possible values." msgstr "键盘布局\"%1\"无效。使用\"list\"命令查看可能的值。" @@ -217,7 +217,7 @@ #. 2 radio-buttons follow this label. #. Such keyboard layout is used only for the time of the update, #. it is not saved to the system. -#: keyboard/src/modules/Keyboard.rb:1315 +#: keyboard/src/modules/Keyboard.rb:1313 msgid "" "You are currently using a keyboard layout\n" "different from the one in the system to update.\n" @@ -227,6 +227,14 @@ "不同的键盘布局进行更新。\n" " 选择在更新期间使用的布局：" +#. Executes the command to set the keyboard in X11, reporting +#. any error to the user +#: keyboard/src/modules/Keyboard.rb:1513 +#, fuzzy +#| msgid "Failed to test backend %1." +msgid "Failed to set X11 keyboard to '%s'" +msgstr "未能测试后端 %1。" + #. summary label <%1>-<%2> are HTML tags, leave untouched #: language/src/clients/country_simple_proposal.rb:45 msgid "<%1>Keyboard Layout<%2>: %3" @@ -320,24 +328,24 @@ msgstr "正在更新引导程序菜单中的翻译..." #. help for write dialog -#: language/src/clients/language.rb:235 +#: language/src/clients/language.rb:233 msgid "<p><b>Saving Configuration</b><br>Please wait...</p>" msgstr "<p><b>正在保存配置</b><br>请稍候...</p>" #. summary label -#: language/src/clients/language.rb:254 +#: language/src/clients/language.rb:252 msgid "Current Language: %1 (%2)" msgstr "当前语言：%1 (%2)" #. summary label #. summary label -#: language/src/clients/language.rb:268 language/src/modules/Language.rb:793 +#: language/src/clients/language.rb:266 language/src/modules/Language.rb:793 #: language/src/modules/Language.rb:827 msgid "Additional Languages: %1" msgstr "其它语言：%1" #. error message (%1 is given layout); do not translate 'list' -#: language/src/clients/language.rb:303 +#: language/src/clients/language.rb:301 msgid "%1 is not a valid language. Use the list command to see possible values." msgstr "%1 不是有效的语言。请使用 list 命令来查看可能的值。" @@ -676,8 +684,8 @@ #. label text (Clock setting) #. AutoYaST interface function: Return the summary of Timezone configuration as a map. #. @return summary string (html) -#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:732 -#: timezone/src/modules/Timezone.rb:968 +#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733 +#: timezone/src/modules/Timezone.rb:969 msgid "UTC" msgstr "协调世界时（UTC）" @@ -692,7 +700,7 @@ msgstr "当前时间和日期：\t%1" #. error text, %1 is output of 'date' command -#: timezone/src/clients/timezone_proposal.rb:49 +#: timezone/src/clients/timezone_proposal.rb:39 msgid "" "Time %1 is in the past.\n" "Set a correct time before starting installation." @@ -701,12 +709,12 @@ "请在开始安装前设置正确的时间。" #. summary item -#: timezone/src/clients/timezone_proposal.rb:95 +#: timezone/src/clients/timezone_proposal.rb:85 msgid "Time Zone" msgstr "时区" #. menue label text -#: timezone/src/clients/timezone_proposal.rb:97 +#: timezone/src/clients/timezone_proposal.rb:87 msgid "&Time Zone" msgstr "时区(&T)" @@ -853,15 +861,15 @@ #. frame label #. frame label #: timezone/src/include/timezone/dialogs.rb:613 -#: timezone/src/include/timezone/dialogs.rb:930 +#: timezone/src/include/timezone/dialogs.rb:910 msgid "Date and Time (NTP is configured)" msgstr "日期和时间(NTP 已配置)" #. frame label #. frame label #: timezone/src/include/timezone/dialogs.rb:615 -#: timezone/src/include/timezone/dialogs.rb:701 -#: timezone/src/include/timezone/dialogs.rb:932 +#: timezone/src/include/timezone/dialogs.rb:693 +#: timezone/src/include/timezone/dialogs.rb:912 msgid "Date and Time" msgstr "日期和时间" @@ -873,27 +881,21 @@ #. label text #. label text #: timezone/src/include/timezone/dialogs.rb:650 -#: timezone/src/include/timezone/dialogs.rb:688 +#: timezone/src/include/timezone/dialogs.rb:684 msgid "&Region" msgstr "区域(&R)" -#. title for combo box 'timezone' -#. title for selection box 'timezone' -#. label text -#. label text -#: timezone/src/include/timezone/dialogs.rb:660 -#: timezone/src/include/timezone/dialogs.rb:695 -#: timezone/src/include/timezone/dialogs.rb:768 -#: timezone/src/include/timezone/dialogs.rb:775 +#: timezone/src/include/timezone/dialogs.rb:657 +#: timezone/src/include/timezone/dialogs.rb:688 msgid "Time &Zone" msgstr "时区(&Z)" -#: timezone/src/include/timezone/dialogs.rb:673 +#: timezone/src/include/timezone/dialogs.rb:669 msgid "Date and Time:" msgstr "日期和时间：" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:812 +#: timezone/src/include/timezone/dialogs.rb:791 msgid "" "\n" "<p><b><big>Time Zone and Clock Settings</big></b></p>" @@ -902,7 +904,7 @@ "<p><b><big>时区和时钟设置</big></b></p>" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:814 +#: timezone/src/include/timezone/dialogs.rb:793 msgid "" "<p>\n" "To select the time zone to use in your system, first select the <b>Region</b>.\n" @@ -917,7 +919,7 @@ "</p>\n" #. general help trailer -#: timezone/src/include/timezone/dialogs.rb:831 +#: timezone/src/include/timezone/dialogs.rb:810 msgid "" "<p>\n" "If the current time is not correct, use <b>Change</b> to adjust it.\n" @@ -928,34 +930,34 @@ "</p>" #. Screen title for timezone screen -#: timezone/src/include/timezone/dialogs.rb:841 +#: timezone/src/include/timezone/dialogs.rb:820 msgid "Clock and Time Zone" msgstr "时钟和时区" #. popup text -#: timezone/src/include/timezone/dialogs.rb:965 +#: timezone/src/include/timezone/dialogs.rb:945 msgid "Select a valid time zone." msgstr "选择有效的时区。" #. label text, Clock setting: local time (not UTC) #. label text, Clock setting: local time (not UTC) -#: timezone/src/modules/Timezone.rb:736 timezone/src/modules/Timezone.rb:972 +#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973 msgid "Local Time" msgstr "本地时间" #. label text #. label text -#: timezone/src/modules/Timezone.rb:740 timezone/src/modules/Timezone.rb:976 +#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977 msgid "Hardware Clock Set To" msgstr "硬件时钟设置为" #. summary label -#: timezone/src/modules/Timezone.rb:754 +#: timezone/src/modules/Timezone.rb:755 msgid "NTP configured" msgstr "网络时间协议（NTP）已配置" #. summary label -#: timezone/src/modules/Timezone.rb:980 +#: timezone/src/modules/Timezone.rb:981 msgid "Current Time Zone: %1" msgstr "当前时区：%1" @@ -1005,197 +1007,197 @@ msgstr "加拿大语(多种语言)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:146 +#: keyboard/src/data/keyboard_raw.ycp:145 msgid "Spanish" msgstr "西班牙语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:158 +#: keyboard/src/data/keyboard_raw.ycp:157 msgid "Spanish (Latin America)" msgstr "西班牙语(拉丁美洲)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:170 +#: keyboard/src/data/keyboard_raw.ycp:169 msgid "Spanish (CP 850)" msgstr "西班牙语(CP 850)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:182 +#: keyboard/src/data/keyboard_raw.ycp:181 msgid "Italian" msgstr "意大利语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:194 +#: keyboard/src/data/keyboard_raw.ycp:193 msgid "Portuguese" msgstr "葡萄牙语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:206 +#: keyboard/src/data/keyboard_raw.ycp:205 msgid "Portuguese (Brazil)" msgstr "葡萄牙语(巴西)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:218 +#: keyboard/src/data/keyboard_raw.ycp:217 msgid "Portuguese (Brazil -- US accents)" msgstr "葡萄牙语(巴西 -- 美国口音)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:230 +#: keyboard/src/data/keyboard_raw.ycp:229 msgid "Greek" msgstr "希腊语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:242 +#: keyboard/src/data/keyboard_raw.ycp:241 msgid "Dutch" msgstr "荷兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:254 +#: keyboard/src/data/keyboard_raw.ycp:253 msgid "Danish" msgstr "丹麦语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:266 +#: keyboard/src/data/keyboard_raw.ycp:265 msgid "Norwegian" msgstr "挪威语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:278 +#: keyboard/src/data/keyboard_raw.ycp:277 msgid "Swedish" msgstr "瑞典语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:290 +#: keyboard/src/data/keyboard_raw.ycp:289 msgid "Finnish" msgstr "芬兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:302 +#: keyboard/src/data/keyboard_raw.ycp:301 msgid "Czech" msgstr "捷克语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:317 +#: keyboard/src/data/keyboard_raw.ycp:316 msgid "Czech (qwerty)" msgstr "捷克语 (qwerty)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:332 +#: keyboard/src/data/keyboard_raw.ycp:331 msgid "Slovak" msgstr "斯洛伐克语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:347 +#: keyboard/src/data/keyboard_raw.ycp:346 msgid "Slovak (qwerty)" msgstr "斯洛伐克语 (qwerty)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:362 +#: keyboard/src/data/keyboard_raw.ycp:361 msgid "Slovene" msgstr "斯洛文尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:377 +#: keyboard/src/data/keyboard_raw.ycp:375 msgid "Hungarian" msgstr "匈牙利语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:392 +#: keyboard/src/data/keyboard_raw.ycp:389 msgid "Polish" msgstr "波兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:407 +#: keyboard/src/data/keyboard_raw.ycp:403 msgid "Russian" msgstr "俄语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:421 +#: keyboard/src/data/keyboard_raw.ycp:417 msgid "Serbian" msgstr "塞尔维亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:433 +#: keyboard/src/data/keyboard_raw.ycp:429 msgid "Estonian" msgstr "爱沙尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:445 +#: keyboard/src/data/keyboard_raw.ycp:441 msgid "Lithuanian" msgstr "立陶宛语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:457 +#: keyboard/src/data/keyboard_raw.ycp:453 msgid "Turkish" msgstr "土耳其语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:468 +#: keyboard/src/data/keyboard_raw.ycp:464 msgid "Croatian" msgstr "克罗地亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:491 +#: keyboard/src/data/keyboard_raw.ycp:486 msgid "Japanese" msgstr "日语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:503 +#: keyboard/src/data/keyboard_raw.ycp:498 msgid "Belgian" msgstr "比利时语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:515 +#: keyboard/src/data/keyboard_raw.ycp:510 msgid "Dvorak" msgstr "德沃夏克键盘" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:527 +#: keyboard/src/data/keyboard_raw.ycp:522 msgid "Icelandic" msgstr "冰岛语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:539 +#: keyboard/src/data/keyboard_raw.ycp:534 msgid "Ukrainian" msgstr "乌克兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:561 +#: keyboard/src/data/keyboard_raw.ycp:556 msgid "Khmer" msgstr "高棉语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:583 +#: keyboard/src/data/keyboard_raw.ycp:578 msgid "Korean" msgstr "韩语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:605 +#: keyboard/src/data/keyboard_raw.ycp:600 msgid "Arabic" msgstr "阿拉伯语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:626 +#: keyboard/src/data/keyboard_raw.ycp:621 msgid "Tajik" msgstr "塔吉克语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:640 +#: keyboard/src/data/keyboard_raw.ycp:635 msgid "Traditional Chinese" msgstr "繁体中文" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:662 +#: keyboard/src/data/keyboard_raw.ycp:657 msgid "Simplified Chinese" msgstr "简体中文" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:684 +#: keyboard/src/data/keyboard_raw.ycp:679 msgid "Romanian" msgstr "罗马尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:705 +#: keyboard/src/data/keyboard_raw.ycp:700 msgid "US International" msgstr "美国国际" Modified: trunk/yast/zh_CN/po/crowbar.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/crowbar.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/crowbar.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:12+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -21,29 +21,50 @@ "X-Generator: Lokalize 1.5\n" #. Command line help text for the Xcrowbar module -#: src/clients/crowbar.rb:56 +#: src/clients/crowbar.rb:51 msgid "Configuration of crowbar" msgstr "Crowbar 配置" -#. table header -#: src/include/crowbar/complex.rb:96 -msgid "Repository Name" -msgstr "软件源名称" +#. radio button item: target repository is common for all available platform +#: src/include/crowbar/complex.rb:90 +msgid "Common for All" +msgstr "" -#: src/include/crowbar/complex.rb:96 -msgid "URL" -msgstr "URL" +#. target platform name +#: src/include/crowbar/complex.rb:92 +msgid "SLES 11 SP3" +msgstr "" -#: src/include/crowbar/complex.rb:96 -msgid "Ask On Error" -msgstr "出错时询问" +#. target platform name +#: src/include/crowbar/complex.rb:94 +msgid "SLES 12" +msgstr "" -#. help text +#. combobox label #: src/include/crowbar/complex.rb:106 +#, fuzzy +#| msgid "&List of Repositories" +msgid "&Location of Repositories" +msgstr "安装源列表(&L)" + +#: src/include/crowbar/complex.rb:109 +#, fuzzy +#| 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-s...</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" -"Some examples of how the URL could look like:\n" +"If repositories are stored at SMT server or SUSE Manager server, it's enought 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" @@ -63,33 +84,23 @@ "详细描述请查阅部署指南。\n" "</p>" -#. textentry label -#: src/include/crowbar/complex.rb:122 -msgid "Repository &URL" -msgstr "软件源 &URL" - -#. textentry label -#: src/include/crowbar/complex.rb:135 -msgid "&Ask On Error" -msgstr "出错时询问(&A)" - #. table header -#: src/include/crowbar/complex.rb:155 +#: src/include/crowbar/complex.rb:148 msgid "Administrator Name" msgstr "管理员名称" #. help text -#: src/include/crowbar/complex.rb:165 +#: src/include/crowbar/complex.rb:158 msgid "<p>Manage user names and passwords for Crowbar administrators.</p>" msgstr "<p>管理 Crowbar 管理员的用户名和密码。</p>" #. textentry label -#: src/include/crowbar/complex.rb:201 +#: src/include/crowbar/complex.rb:194 msgid "&Mode" msgstr "模式(&M)" #. help text for the Network mode tab (do not translate bastion) -#: src/include/crowbar/complex.rb:203 +#: 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>" @@ -98,17 +109,17 @@ "<p>您也可以空格分隔列表指定堡垒网络管道的接口名称。</p>" #. textentry label -#: src/include/crowbar/complex.rb:213 +#: src/include/crowbar/complex.rb:206 msgid "Bonding &Policy" msgstr "绑定策略(&P)" #. textentry label -#: src/include/crowbar/complex.rb:222 +#: src/include/crowbar/complex.rb:215 msgid "P&hysical interfaces mapping for bastion network" msgstr "堡垒网络物理接口绑定(&h)" #. help text for conduit if list -#: src/include/crowbar/complex.rb:231 +#: src/include/crowbar/complex.rb:224 msgid "" "<p>Each physical interface definition needs to fit the pattern\n" "<tt>[Quantifier][Speed][Order]</tt>.\n" @@ -119,93 +130,189 @@ "有效示例如 <tt>+1g2</tt>, <tt>10g1</tt> 或 <tt>?1g2</tt>。</p>" #. table header -#: src/include/crowbar/complex.rb:265 +#: src/include/crowbar/complex.rb:254 msgid "Network" msgstr "网络" -#: src/include/crowbar/complex.rb:266 +#: src/include/crowbar/complex.rb:255 msgid "Subnet Address" msgstr "子网地址" -#: src/include/crowbar/complex.rb:267 +#: src/include/crowbar/complex.rb:256 msgid "Network Mask" msgstr "网络掩码" -#: src/include/crowbar/complex.rb:268 +#: src/include/crowbar/complex.rb:257 msgid "VLAN" msgstr "虚拟局域网" #. checkbox label -#: src/include/crowbar/complex.rb:286 +#: src/include/crowbar/complex.rb:275 msgid "Use &VLAN" msgstr "使用虚拟局域网(&V)" #. textentry label -#: src/include/crowbar/complex.rb:296 +#: src/include/crowbar/complex.rb:285 msgid "VLAN &ID" msgstr "虚拟局域网 &ID" #. textentry label -#: src/include/crowbar/complex.rb:306 +#: src/include/crowbar/complex.rb:295 msgid "Rou&ter" msgstr "路由(&t)" #. textentry label -#: src/include/crowbar/complex.rb:328 +#: src/include/crowbar/complex.rb:317 msgid "Router pre&ference" msgstr "路由偏好(&f)" #. textentry label -#: src/include/crowbar/complex.rb:338 +#: src/include/crowbar/complex.rb:327 msgid "&Subnet" msgstr "子网(&S)" #. textentry label -#: src/include/crowbar/complex.rb:361 +#: src/include/crowbar/complex.rb:350 msgid "Net&mask" msgstr "网络掩码(&M)" -#: src/include/crowbar/complex.rb:383 +#: src/include/crowbar/complex.rb:372 msgid "Broa&dcast" msgstr "广播(&d)" #. checkbox label -#: src/include/crowbar/complex.rb:393 +#: src/include/crowbar/complex.rb:382 msgid "&Add Bridge" msgstr "添加网桥(&A)" #. push button label& -#: src/include/crowbar/complex.rb:402 +#: src/include/crowbar/complex.rb:391 msgid "Edit Ran&ges..." msgstr "编辑地址段(&g)..." #. checkbox label -#: src/include/crowbar/complex.rb:413 +#: src/include/crowbar/complex.rb:402 msgid "Add &Bastion Network" msgstr "添加堡垒网络(&B)" #. textentry label -#: src/include/crowbar/complex.rb:425 +#: src/include/crowbar/complex.rb:414 msgid "&IP Address" msgstr "IP 地址(&I)" #. text entry label -#: src/include/crowbar/complex.rb:585 +#: src/include/crowbar/complex.rb:520 +msgid "Name" +msgstr "名称" + +#. text entry label +#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695 +msgid "URL" +msgstr "URL" + +#. text entry label +#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696 +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 +#, fuzzy +#| msgid "Target Name" +msgid "Target Platform" +msgstr "目标名称" + +#. error popup +#: src/include/crowbar/complex.rb:580 +#, fuzzy +#| msgid "" +#| "User '%1' already exists.\n" +#| "Choose a different name." +msgid "" +"Repository '%1' already exists.\n" +"Choose a different name." +msgstr "" +"用户 '%1' 已存在。\n" +"请选择一个不同的名称。" + +#. text entry label +#: src/include/crowbar/complex.rb:676 +#, fuzzy +#| msgid "LDAP Server &URL" +msgid "Server &URL" +msgstr "LDAP 服务器 URL(&U)" + +#. table header +#: src/include/crowbar/complex.rb:694 +msgid "Repository Name" +msgstr "软件源名称" + +#. checkbox label +#: src/include/crowbar/complex.rb:701 +msgid "&Ask On Error" +msgstr "出错时询问(&A)" + +#. text entry label +#: src/include/crowbar/complex.rb:707 +msgid "Repository &URL" +msgstr "软件源 &URL" + +#. label (hint for user) +#: src/include/crowbar/complex.rb:710 +msgid "Empty URL means that default value will be used." +msgstr "空白 URL 意味着将使用默认值。" + +#. push button label +#: src/include/crowbar/complex.rb:726 +#, fuzzy +#| msgid "Repository" +msgid "A&dd Repository" +msgstr "仓库" + +#. combobox item +#: src/include/crowbar/complex.rb:793 +#, fuzzy +#| msgid "Remote WINS Server" +msgid "Remote SMT Server" +msgstr "远程 WINS 服务器" + +#. combobox item +#: src/include/crowbar/complex.rb:795 +#, fuzzy +#| msgid "Finger Server" +msgid "SUSE Manager Server" +msgstr "Finger 服务器" + +#. combobox item +#: src/include/crowbar/complex.rb:797 +msgid "Custom" +msgstr "自定义" + +#. text entry label +#: src/include/crowbar/complex.rb:866 msgid "User Name" msgstr "用户名" #. text entry label -#: src/include/crowbar/complex.rb:587 +#: src/include/crowbar/complex.rb:868 msgid "Password" msgstr "密码" #. text entry label -#: src/include/crowbar/complex.rb:589 +#: src/include/crowbar/complex.rb:870 msgid "Repeat the Password" msgstr "重复密码" #. error popup -#: src/include/crowbar/complex.rb:627 +#: src/include/crowbar/complex.rb:900 +#, fuzzy +#| msgid "Server name cannot be empty." +msgid "User name cannot be empty." +msgstr "服务器名不能为空。" + +#. error popup +#: src/include/crowbar/complex.rb:907 msgid "" "The passwords do not match.\n" "Try again." @@ -214,7 +321,7 @@ "请重试。" #. error popup -#: src/include/crowbar/complex.rb:636 +#: src/include/crowbar/complex.rb:915 msgid "" "User '%1' already exists.\n" "Choose a different name." @@ -223,17 +330,17 @@ "请选择一个不同的名称。" #. error popup -#: src/include/crowbar/complex.rb:781 +#: src/include/crowbar/complex.rb:1018 msgid "The interface format '%1' is not valid" msgstr "接口格式 '%1' 无效。" -#. table entry (VLAN status) -#: src/include/crowbar/complex.rb:861 +#. Returns broadcast address. Based on current netmask and subnet +#: src/include/crowbar/complex.rb:1076 msgid "disabled" msgstr "已禁用" #. error popup -#: src/include/crowbar/complex.rb:986 +#: src/include/crowbar/complex.rb:1173 msgid "" "The netmask '%1' is invalid.\n" "%2" @@ -243,7 +350,7 @@ #. error popup #. error popup -#: src/include/crowbar/complex.rb:999 src/include/crowbar/complex.rb:1036 +#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216 msgid "" "The IP address '%1' is invalid.\n" "%2" @@ -252,7 +359,7 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:1011 +#: src/include/crowbar/complex.rb:1194 msgid "" "The router address '%1' is invalid.\n" "%2" @@ -261,17 +368,17 @@ "%2" #. error popup -#: src/include/crowbar/complex.rb:1023 +#: src/include/crowbar/complex.rb:1203 msgid "The router address '%1' is not part of network '%2'." msgstr "路由器地址 '%1' 不是网络 '%2' 的一部分。" #. error popup -#: src/include/crowbar/complex.rb:1047 +#: src/include/crowbar/complex.rb:1225 msgid "The IP address '%1' is not part of network '%2'." msgstr "IP 地址 '%1' 不是网络 '%2' 的一部分。" #. popup message -#: src/include/crowbar/complex.rb:1068 +#: src/include/crowbar/complex.rb:1246 msgid "" "Some address ranges are not part of network '%1'.\n" "Adapt them using 'Edit ranges' button." @@ -280,65 +387,60 @@ "请使用 '编辑地址段' 按钮来调整它们。" #. inputfield label -#: src/include/crowbar/complex.rb:1173 +#: src/include/crowbar/complex.rb:1335 msgid "Min IP Address" msgstr "最小 IP 地址" #. inputfield label -#: src/include/crowbar/complex.rb:1180 +#: src/include/crowbar/complex.rb:1342 msgid "Max IP Address" msgstr "最大 IP 地址" -#: src/include/crowbar/complex.rb:1247 +#: src/include/crowbar/complex.rb:1395 msgid "The address '%1' is not part of network '%2'." msgstr "地址 '%1' 不是网络 '%2' 的一部分。" #. error message -#: src/include/crowbar/complex.rb:1263 +#: src/include/crowbar/complex.rb:1407 msgid "The lowest address must be lower than the highest one." msgstr "最低地址必须低于最高地址。" #. error message -#: src/include/crowbar/complex.rb:1296 +#: src/include/crowbar/complex.rb:1431 msgid "Ranges '%1' and '%2' are overlapping." msgstr "地址段 '%1' 和 '%2' 有重叠。" #. tab header -#: src/include/crowbar/complex.rb:1373 +#: src/include/crowbar/complex.rb:1499 msgid "&User Settings" msgstr "用户设置(&U)" #. label (hint for user) -#: src/include/crowbar/complex.rb:1385 +#: src/include/crowbar/complex.rb:1511 msgid "If no user is present, user 'crowbar' with default password will be used." msgstr "若没有用户则将使用 'crowbar' 用户和默认密码。" #. tab header -#: src/include/crowbar/complex.rb:1403 +#: src/include/crowbar/complex.rb:1527 msgid "N&etwork Mode" msgstr "网络模式(&e)" -#: src/include/crowbar/complex.rb:1411 +#: src/include/crowbar/complex.rb:1535 msgid "Bastion Network" msgstr "堡垒网络" #. tab header -#: src/include/crowbar/complex.rb:1454 +#: src/include/crowbar/complex.rb:1578 msgid "Net&works" msgstr "网络(&w)" #. tab header -#: src/include/crowbar/complex.rb:1490 +#: src/include/crowbar/complex.rb:1614 msgid "Re&positories" msgstr "软件源(&p)" -#. label (hint for user) -#: src/include/crowbar/complex.rb:1501 -msgid "Empty URL means that default value will be used." -msgstr "空白 URL 意味着将使用默认值。" - #. popup message %1 is FQDN -#: src/include/crowbar/complex.rb:1653 +#: src/include/crowbar/complex.rb:1731 msgid "" "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" @@ -350,7 +452,7 @@ "您可通过 http://%1:3000/ 访问 Crowbar 网页用户界面。" #. default dialog caption -#: src/include/crowbar/complex.rb:1671 +#: src/include/crowbar/complex.rb:1749 msgid "Crowbar Configuration Overview" msgstr "Crowbar 配置概览" @@ -394,48 +496,48 @@ "</p>" #. Initialization dialog caption -#: src/include/crowbar/wizards.rb:89 +#: src/include/crowbar/wizards.rb:87 msgid "Crowbar Configuration" msgstr "Crowbar 配置" #. Initialization dialog contents -#: src/include/crowbar/wizards.rb:91 +#: src/include/crowbar/wizards.rb:89 msgid "Initializing..." msgstr "正在初始化..." #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:144 +#: src/modules/Crowbar.rb:142 msgid "Initializing crowbar Configuration" msgstr "正在初始化 Crowbar 配置" #. Progress stage -#: src/modules/Crowbar.rb:155 +#: src/modules/Crowbar.rb:153 msgid "Read the configuraton" msgstr "读取配置" #. Progress step -#: src/modules/Crowbar.rb:159 +#: src/modules/Crowbar.rb:157 msgid "Reading the configuration..." msgstr "正在读取配置..." #. Progress finished #. Progress finished -#: src/modules/Crowbar.rb:161 src/modules/Crowbar.rb:255 +#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249 msgid "Finished" msgstr "已完成" #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:238 +#: src/modules/Crowbar.rb:232 msgid "Saving crowbar Configuration" msgstr "正在保存 Crowbar 配置" #. Progress stage 1/2 -#: src/modules/Crowbar.rb:249 +#: src/modules/Crowbar.rb:243 msgid "Write the settings" msgstr "写入设置" #. Progress step 1/2 -#: src/modules/Crowbar.rb:253 +#: src/modules/Crowbar.rb:247 msgid "Writing the settings..." msgstr "正在写入设置..." Modified: trunk/yast/zh_CN/po/dhcp-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: dhcp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-18 12:43+0000\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-08-23 02:05+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -2500,57 +2500,57 @@ msgstr "DHCP 服务器专家配置(&E)..." #. Dhcp-server read dialog caption -#: src/modules/DhcpServer.pm:1387 +#: src/modules/DhcpServer.pm:1388 msgid "Initializing DHCP Server Configuration" msgstr "初始化 DHCP 服务器配置" #. progress stage -#: src/modules/DhcpServer.pm:1391 +#: src/modules/DhcpServer.pm:1392 msgid "Check the environment" msgstr "检查环境" #. progress stage -#: src/modules/DhcpServer.pm:1393 +#: src/modules/DhcpServer.pm:1394 msgid "Read firewall settings" msgstr "读取防火墙设置" #. progress stage -#: src/modules/DhcpServer.pm:1395 +#: src/modules/DhcpServer.pm:1396 msgid "Read DHCP server settings" msgstr "读取 DHCP 服务器设置" #. progress stage -#: src/modules/DhcpServer.pm:1397 +#: src/modules/DhcpServer.pm:1398 msgid "Read DNS server settings" msgstr "读取 DNS 服务器设置" #. progress step -#: src/modules/DhcpServer.pm:1401 +#: src/modules/DhcpServer.pm:1402 msgid "Checking the environment..." msgstr "正在检查环境..." #. progress step -#: src/modules/DhcpServer.pm:1403 +#: src/modules/DhcpServer.pm:1404 msgid "Reading firewall settings..." msgstr "正在读取防火墙设置..." #. progress step -#: src/modules/DhcpServer.pm:1405 +#: src/modules/DhcpServer.pm:1406 msgid "Reading DHCP server settings..." msgstr "正在读取 DHCP 服务器设置..." #. progress step -#: src/modules/DhcpServer.pm:1407 +#: src/modules/DhcpServer.pm:1408 msgid "Reading DNS server settings..." msgstr "正在读取 DNS 服务器设置..." #. progress step -#: src/modules/DhcpServer.pm:1409 src/modules/DhcpServer.pm:1637 +#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638 msgid "Finished" msgstr "已完成" #. TRANSLATORS: error report popup -#: src/modules/DhcpServer.pm:1439 +#: src/modules/DhcpServer.pm:1440 msgid "" "This server needs at least one\n" "configured network device (besides loopback) to\n" @@ -2567,101 +2567,101 @@ "现在正在中止。" #. error report -#: src/modules/DhcpServer.pm:1474 +#: src/modules/DhcpServer.pm:1475 msgid "" "Cannot determine hostname. LDAP-based configuration of \n" "DHCP server will not be available." msgstr "不能确定主机名。基于 LDAP 的DHCP 服务器配置将不可用。" #. yes-no popup -#: src/modules/DhcpServer.pm:1542 +#: src/modules/DhcpServer.pm:1543 msgid "" "The DHCP server does not seem to have been\n" "configured yet. Create a new configuration?" msgstr "DHCP 服务器似乎尚未配置。是否创建新配置？" #. Dhcp-server read dialog caption */ -#: src/modules/DhcpServer.pm:1615 +#: src/modules/DhcpServer.pm:1616 msgid "Saving DHCP Server Configuration" msgstr "正在保存 DHCP 服务器配置" #. progress stage -#: src/modules/DhcpServer.pm:1620 +#: src/modules/DhcpServer.pm:1621 msgid "Write DHCP server settings" msgstr "写入 DHCP 服务器设置" #. progress stage -#: src/modules/DhcpServer.pm:1622 +#: src/modules/DhcpServer.pm:1623 msgid "Write firewall settings" msgstr "写入防火墙设置" #. progress stage -#: src/modules/DhcpServer.pm:1624 +#: src/modules/DhcpServer.pm:1625 msgid "Restart DHCP server" msgstr "重启 DHCP 服务器" #. progress stage -#: src/modules/DhcpServer.pm:1626 +#: src/modules/DhcpServer.pm:1627 msgid "Write DNS server settings" msgstr "写入 DNS 服务器设置" #. progress step -#: src/modules/DhcpServer.pm:1629 +#: src/modules/DhcpServer.pm:1630 msgid "Writing DHCP server settings..." msgstr "正在写入 DHCP 服务器设置..." #. progress step -#: src/modules/DhcpServer.pm:1631 +#: src/modules/DhcpServer.pm:1632 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. progress step -#: src/modules/DhcpServer.pm:1633 +#: src/modules/DhcpServer.pm:1634 msgid "Restarting DHCP server..." msgstr "正在重启 DHCP 服务器..." #. progress step -#: src/modules/DhcpServer.pm:1635 +#: src/modules/DhcpServer.pm:1636 msgid "Writing DNS server settings..." msgstr "正在写入 DNS 服务器设置..." #. error report -#: src/modules/DhcpServer.pm:1748 +#: src/modules/DhcpServer.pm:1749 msgid "Error occurred while restarting the DHCP daemon." msgstr "重新启动 DHCP 守护精灵时出错。" #. summary string -#: src/modules/DhcpServer.pm:1887 +#: src/modules/DhcpServer.pm:1888 msgid "The DHCP server is started at boot time" msgstr "在引导时启动 DHCP 服务器" #. summary string -#: src/modules/DhcpServer.pm:1892 +#: src/modules/DhcpServer.pm:1893 msgid "The DHCP server is not started at boot time" msgstr "在引导时不启动 DHCP 服务器" #. summary string, %1 is list of network interfaces -#: src/modules/DhcpServer.pm:1900 +#: src/modules/DhcpServer.pm:1901 msgid "Listen On: %1" msgstr "监听：%1" #. summary string, %1 is IP address range -#: src/modules/DhcpServer.pm:1919 +#: src/modules/DhcpServer.pm:1920 msgid "Dynamic Address Range: %1" msgstr "动态地址范围：%1" #. error message -#: src/modules/DhcpServer.pm:2312 +#: src/modules/DhcpServer.pm:2313 msgid "Invalid LDAP configuration. Cannot use LDAP." msgstr "LDAP 配置无效。无法使用 LDAP。" #. error report -#: src/modules/DhcpServer.pm:2552 src/modules/DhcpServer.pm:2593 +#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594 msgid "Support for multiple dhcpServiceDN not implemented." msgstr "没有实施对多 dhcpServiceDN 的支持。" #. error report -#: src/modules/DhcpServer.pm:2558 +#: src/modules/DhcpServer.pm:2559 msgid "DHCP service DN is not defined." msgstr "未定义 DHCP 服务 DN。" @@ -2669,23 +2669,23 @@ #. Error report, %1 is LDAP record key #. Error report #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2673 src/modules/DhcpServer.pm:2707 -#: src/modules/DhcpServer.pm:2771 src/modules/DhcpServer.pm:2846 +#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708 +#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847 msgid "Error occurred while creating %1." msgstr "创建 %1 时出错。" #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2738 +#: src/modules/DhcpServer.pm:2739 msgid "Error occurred while updating %1." msgstr "更新 %1 时出错。" #. error report, %1=ldap domain, %2=dhcp server -#: src/modules/DhcpServer.pm:2809 +#: src/modules/DhcpServer.pm:2810 msgid "Error occurred while creating cn=%2,ou=DHCP,%1." msgstr "创建 cn=%2、ou=DHCP 的 %1 时出错。" #. error report, /etc/dhcpd.conf is filename -#: src/modules/DhcpServer.pm:2906 +#: src/modules/DhcpServer.pm:2907 msgid "Error occurred while writing /etc/dhcpd.conf." msgstr "写入 /etc/dhcpd.conf 时出错。" Modified: trunk/yast/zh_CN/po/dns-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/dns-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/dns-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: dns server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-04-16 15:26+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -22,15 +22,238 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" +#. TRANSLATORS: commandline general name of the module in help +#: src/include/dns-server/cmdline.rb:24 +msgid "DNS server configuration" +msgstr "DNS 服务器配置" + +#: src/include/dns-server/cmdline.rb:32 +msgid "Start-up settings" +msgstr "启动设置" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:38 +msgid "DNS forwarders" +msgstr "DNS 转发对象" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:50 +msgid "Logging settings" +msgstr "日志记录设置" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:63 +msgid "DNS zones" +msgstr "DNS 区域" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:79 +msgid "Access control lists" +msgstr "访问控制列表" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:87 +msgid "Zone transport rules" +msgstr "区域传输规则" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:102 +msgid "Zone name servers" +msgstr "区域名称服务器" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:119 +msgid "Zone mail servers" +msgstr "区域邮件服务器" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:133 +msgid "Start of authority (SOA)" +msgstr "授权起始记录 (SOA)" + +#. TRANSLATORS: commandline short help for command, base cmdline command +#: src/include/dns-server/cmdline.rb:148 +msgid "Zone resource records, such as A, CNAME, NS, MX, or PTR" +msgstr "区域资源记录，诸如 A、CNAME、NS、MX 或 PTR" + +#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type +#: src/include/dns-server/cmdline.rb:166 +msgid "Handles A and corresponding PTR record at once" +msgstr "同时处理 A 和相应的 PTR 记录" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:180 +msgid "Show current settings" +msgstr "显示当前设置" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:186 +msgid "Start DNS server in the boot process" +msgstr "在引导过程中启动 DNS 服务器" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:192 +msgid "Start DNS server manually" +msgstr "手动启动 DNS 服务器" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:198 +msgid "Add a new record" +msgstr "添加新记录" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:204 +msgid "Remove a record" +msgstr "移除记录" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:211 +msgid "IPv4 address" +msgstr "IPv4 地址" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:218 +msgid "Logging destination (syslog|file)" +msgstr "日志记录目标 (syslog|file)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:224 +msgid "Set option" +msgstr "设置选项" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:231 +msgid "Filename for logging (full path)" +msgstr "日志记录文件名 (完整路径)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:238 +msgid "Maximum log size [0-9]+(KMG)*" +msgstr "最大日志大小 [0-9]+(KMG)*" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:245 +msgid "Maximum number of versions for rotation, '0' means no rotation" +msgstr "用于轮替的最大版本数，\"0\"表示不轮替" + +#. TRANSLATORS: commandline short help for command +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:252 src/include/dns-server/cmdline.rb:273 +msgid "Zone name" +msgstr "区域名称" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:259 +msgid "Zone type, master or slave" +msgstr "区域类型 (主或从属)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:266 +msgid "DNS zone master server" +msgstr "DNS 区域主服务器" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:280 +msgid "Enable option" +msgstr "启用选项" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:287 +msgid "Disable option" +msgstr "禁用选项" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:294 +msgid "Name server (in fully qualified format finished with a dot or relative name)" +msgstr "名称服务器 (使用以一个点结尾的完全限定格式或相对名称)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:301 +msgid "Mail server (in fully qualified format finished with a dot or relative name)" +msgstr "邮件服务器 (使用以一个点结尾的完全限定格式或相对名称)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:308 +msgid "Mail server priority (number from 0 to 65535)" +msgstr "邮件服务器优先级 (从 0 到 65535 的数字)" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:315 +msgid "Serial number of zone update" +msgstr "区域更新序列号" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:322 +msgid "General time to live of records in zone" +msgstr "区域中记录的常规存活时间" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:329 +msgid "An interval before the zone records should be refreshed" +msgstr "刷新区域记录的周期" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:336 +msgid "Interval between retries of failed refresh" +msgstr "刷新失败后重试的周期" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:343 +msgid "Interval after which zone records are no longer authoritative" +msgstr "区域记录不再权威的周期" + +#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated +#: src/include/dns-server/cmdline.rb:350 +msgid "Minimum TTL that should be exported with records in this zone" +msgstr "应与此区域中的记录一同导出的最小 TTL" + +#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated +#: src/include/dns-server/cmdline.rb:357 +msgid "DNS resource record type, such as A, CNAME, NS, MX, or PTR" +msgstr "DNS 资源记录类型，诸如 A、CNAME、NS、MX 或 PTR" + +#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) +#: src/include/dns-server/cmdline.rb:364 +msgid "DNS query, such as example.org for A record" +msgstr "DNS 查询，诸如查询 example.org 的 A 记录" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:371 +msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record" +msgstr "DNS 资源记录值，诸如表示 example.org 的 A 记录的 192.0.34.166" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:378 +msgid "Hostname for the DNS record" +msgstr "DNS 记录主机名" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:386 +msgid "Log named queries %1" +msgstr "记录命名查询 %1" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:394 +msgid "Log zone updates %1" +msgstr "记录区域更新 %1" + +#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" +#: src/include/dns-server/cmdline.rb:402 +msgid "Log zone transfers %1" +msgstr "记录区域传输 %1" + +#. TRANSLATORS: commandline short help for command +#: src/include/dns-server/cmdline.rb:409 +msgid "Comma-separated list of zone forwarders" +msgstr "逗号分隔的区域转发对象列表" + #. TRANSLATORS: command line error message, %1 is a missing required parameter -#. TRANSLATORS: command line error message, %1 is a missing required parameter -#: src/clients/dns-server.rb:58 src/include/dns-server/cmdline.rb:494 +#: src/include/dns-server/cmdline.rb:494 msgid "Parameter %1 is required." msgstr "参数 %1 是必需的。" #. TRANSLATORS: command line error message, %1 is a parameter name -#. TRANSLATORS: command line error message, %1 is a parameter name -#: src/clients/dns-server.rb:71 src/include/dns-server/cmdline.rb:507 +#: src/include/dns-server/cmdline.rb:507 msgid "Unknown value for parameter %1." msgstr "参数 %1 的值未知。" @@ -38,68 +261,50 @@ #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:86 src/clients/dns-server.rb:93 -#: src/clients/dns-server.rb:103 src/clients/dns-server.rb:120 #: src/include/dns-server/cmdline.rb:521 src/include/dns-server/cmdline.rb:528 #: src/include/dns-server/cmdline.rb:538 src/include/dns-server/cmdline.rb:555 msgid "Start-Up Settings:" msgstr "启动设置：" #. TRANSLATORS: commandline error message -#. TRANSLATORS: commandline error message -#: src/clients/dns-server.rb:88 src/include/dns-server/cmdline.rb:523 +#: src/include/dns-server/cmdline.rb:523 msgid "Only one parameter is allowed." msgstr "只允许一个参数。" #. TRANSLATORS: commandline progress information -#. TRANSLATORS: commandline progress information -#: src/clients/dns-server.rb:95 src/include/dns-server/cmdline.rb:530 +#: src/include/dns-server/cmdline.rb:530 msgid "Enabling DNS server in the boot process..." msgstr "正在引导过程中启用 DNS 服务器..." #. TRANSLATORS: commandline progress information -#. TRANSLATORS: commandline progress information -#: src/clients/dns-server.rb:105 src/include/dns-server/cmdline.rb:540 +#: src/include/dns-server/cmdline.rb:540 msgid "Removing DNS server from the boot process..." msgstr "正在从引导过程中移除 DNS 服务器..." #. TRANSLATORS: commandline DNS service status information -#. TRANSLATORS: commandline DNS service status information -#: src/clients/dns-server.rb:114 src/include/dns-server/cmdline.rb:549 +#: src/include/dns-server/cmdline.rb:549 msgid "DNS server is enabled in the boot process." msgstr "已在引导进程中启用了 DNS 服务器。" #. TRANSLATORS: commandline DNS service status information -#. TRANSLATORS: commandline DNS service status information -#: src/clients/dns-server.rb:117 src/include/dns-server/cmdline.rb:552 +#: src/include/dns-server/cmdline.rb:552 msgid "DNS server needs manual starting." msgstr "DNS 服务器需要手动启动。" #. TRANSLATORS: commandline section header, -#. TRANSLATORS: commandline section header, -#: src/clients/dns-server.rb:138 src/include/dns-server/cmdline.rb:573 +#: src/include/dns-server/cmdline.rb:573 msgid "Forwarding:" msgstr "转发：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:140 src/include/dns-server/cmdline.rb:575 +#: src/include/dns-server/cmdline.rb:575 msgid "Forwarder IP" msgstr "转发对象 IP" #. TRANSLATORS: commandline error message #. Both Add and Remove defined => Error! -#. TRANSLATORS: commandline error message -#. Both Add and Remove defined => Error! -#: src/clients/dns-server.rb:146 src/clients/dns-server.rb:439 -#: src/clients/dns-server.rb:574 src/clients/dns-server.rb:625 -#: src/clients/dns-server.rb:685 src/clients/dns-server.rb:822 -#: src/clients/dns-server.rb:882 src/include/dns-server/cmdline.rb:580 -#: src/include/dns-server/cmdline.rb:867 src/include/dns-server/cmdline.rb:999 +#: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867 +#: src/include/dns-server/cmdline.rb:999 #: src/include/dns-server/cmdline.rb:1049 #: src/include/dns-server/cmdline.rb:1108 #: src/include/dns-server/cmdline.rb:1244 @@ -109,70 +314,57 @@ #. TRANSLATORS: commandline table item #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:220 src/clients/dns-server.rb:230 #: src/include/dns-server/cmdline.rb:651 src/include/dns-server/cmdline.rb:661 msgid "Logging destination" msgstr "日志记录目标" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:222 src/include/dns-server/cmdline.rb:653 +#: src/include/dns-server/cmdline.rb:653 msgid "System log" msgstr "系统日志" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:232 src/include/dns-server/cmdline.rb:663 +#: src/include/dns-server/cmdline.rb:663 msgid "File" msgstr "文件" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:240 src/include/dns-server/cmdline.rb:671 +#: src/include/dns-server/cmdline.rb:671 msgid "Filename" msgstr "文件名" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:248 src/include/dns-server/cmdline.rb:679 +#: src/include/dns-server/cmdline.rb:679 msgid "Maximum size" msgstr "最大大小" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:256 src/include/dns-server/cmdline.rb:687 +#: src/include/dns-server/cmdline.rb:687 msgid "Maximum versions" msgstr "最大版本数" #. TRANSLATORS: commandline table item, do not translate named -#. TRANSLATORS: commandline table item, do not translate named -#: src/clients/dns-server.rb:269 src/include/dns-server/cmdline.rb:700 +#: src/include/dns-server/cmdline.rb:700 msgid "Log named queries" msgstr "记录命名查询" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:277 src/include/dns-server/cmdline.rb:708 +#: src/include/dns-server/cmdline.rb:708 msgid "Log zone updates" msgstr "记录区域更新" #. TRANSLATORS: commandline table item -#. TRANSLATORS: commandline table item -#: src/clients/dns-server.rb:285 src/include/dns-server/cmdline.rb:716 +#: src/include/dns-server/cmdline.rb:716 msgid "Log zone transfers" msgstr "记录区域传输" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:292 src/include/dns-server/cmdline.rb:723 +#: src/include/dns-server/cmdline.rb:723 msgid "Logging Settings:" msgstr "日志记录设置：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:298 src/include/dns-server/cmdline.rb:729 +#: src/include/dns-server/cmdline.rb:729 msgid "Setting" msgstr "设置" @@ -180,99 +372,79 @@ #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - basic-options listing #. Table header item - ACL-options #. Table menu item - Records listing -#: src/clients/dns-server.rb:300 src/clients/dns-server.rb:312 -#: src/clients/dns-server.rb:519 src/clients/dns-server.rb:734 #: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743 #: src/include/dns-server/cmdline.rb:944 #: src/include/dns-server/cmdline.rb:1157 -#: src/include/dns-server/dialog-main.rb:1220 -#: src/include/dns-server/dialog-main.rb:1813 +#: src/include/dns-server/dialog-main.rb:1032 +#: src/include/dns-server/dialog-main.rb:1625 #: src/include/dns-server/dialog-masterzone.rb:1419 msgid "Value" msgstr "值" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:310 src/include/dns-server/cmdline.rb:741 +#: src/include/dns-server/cmdline.rb:741 msgid "Logging Rule" msgstr "日志记录规则" #. TRANSLATORS: commandline section header, -#. TRANSLATORS: commandline section header, -#: src/clients/dns-server.rb:406 src/include/dns-server/cmdline.rb:835 +#: src/include/dns-server/cmdline.rb:835 msgid "DNS Zones:" msgstr "DNS 区域：" #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Textentry - DNS adding zone - Name -#: src/clients/dns-server.rb:411 src/clients/dns-server.rb:515 #: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940 -#: src/include/dns-server/dialog-main.rb:2047 +#: src/include/dns-server/dialog-main.rb:1859 msgid "Name" msgstr "名称" #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Combobox - DNS adding zone - Type #. Table header item - DNS listing zones #. Table menu item - Records listing -#: src/clients/dns-server.rb:413 src/clients/dns-server.rb:517 #: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942 -#: src/include/dns-server/dialog-main.rb:2053 -#: src/include/dns-server/dialog-main.rb:2095 +#: src/include/dns-server/dialog-main.rb:1865 +#: src/include/dns-server/dialog-main.rb:1907 #: src/include/dns-server/dialog-masterzone.rb:1417 msgid "Type" msgstr "类型" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:415 src/include/dns-server/cmdline.rb:844 +#: src/include/dns-server/cmdline.rb:844 msgid "Master Server" msgstr "主服务器" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/clients/dns-server.rb:417 src/include/dns-server/cmdline.rb:846 -#: src/include/dns-server/dialog-main.rb:490 -#: src/include/dns-server/dialog-main.rb:493 +#: src/include/dns-server/cmdline.rb:846 +#: src/include/dns-server/dialog-main.rb:443 +#: src/include/dns-server/dialog-main.rb:446 msgid "Forwarders" msgstr "转发对象" #. TRANSLATORS: table item - ACL type -#. TRANSLATORS: table item - ACL type -#: src/clients/dns-server.rb:500 src/include/dns-server/cmdline.rb:925 +#: src/include/dns-server/cmdline.rb:925 msgid "Predefined" msgstr "预定义" #. TRANSLATORS: table item - ACL type -#. TRANSLATORS: table item - ACL type -#: src/clients/dns-server.rb:502 src/include/dns-server/cmdline.rb:927 +#: src/include/dns-server/cmdline.rb:927 msgid "Custom" msgstr "自定义" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:510 src/include/dns-server/cmdline.rb:935 +#: src/include/dns-server/cmdline.rb:935 msgid "ACLs:" msgstr "访问控制列表：" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:550 src/include/dns-server/cmdline.rb:975 +#: src/include/dns-server/cmdline.rb:975 msgid "Zone Transport:" msgstr "区域传输：" @@ -281,386 +453,92 @@ #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - DNS listing zones -#: src/clients/dns-server.rb:555 src/clients/dns-server.rb:607 -#: src/clients/dns-server.rb:665 src/clients/dns-server.rb:797 -#: src/clients/dns-server.rb:862 src/include/dns-server/cmdline.rb:980 +#: src/include/dns-server/cmdline.rb:980 #: src/include/dns-server/cmdline.rb:1032 #: src/include/dns-server/cmdline.rb:1089 #: src/include/dns-server/cmdline.rb:1220 #: src/include/dns-server/cmdline.rb:1284 -#: src/include/dns-server/dialog-main.rb:2093 +#: src/include/dns-server/dialog-main.rb:1905 msgid "Zone" msgstr "区域" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:557 src/include/dns-server/cmdline.rb:982 +#: src/include/dns-server/cmdline.rb:982 msgid "Enabled ACL" msgstr "已启用的访问控制列表" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:602 src/include/dns-server/cmdline.rb:1027 +#: src/include/dns-server/cmdline.rb:1027 msgid "Name Servers:" msgstr "名称服务器：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:609 src/include/dns-server/cmdline.rb:1034 +#: src/include/dns-server/cmdline.rb:1034 msgid "Name Server" msgstr "名称服务器" #. TRANSLATORS: commandline section header #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:660 src/clients/dns-server.rb:792 #: src/include/dns-server/cmdline.rb:1084 #: src/include/dns-server/cmdline.rb:1215 msgid "Mail Servers:" msgstr "邮件服务器：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - listing mail servers -#: src/clients/dns-server.rb:667 src/include/dns-server/cmdline.rb:1091 +#: src/include/dns-server/cmdline.rb:1091 #: src/include/dns-server/dialog-masterzone.rb:739 msgid "Mail Server" msgstr "邮件服务器" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item #. Table header item - listing mail servers -#: src/clients/dns-server.rb:669 src/include/dns-server/cmdline.rb:1093 +#: src/include/dns-server/cmdline.rb:1093 #: src/include/dns-server/dialog-masterzone.rb:741 msgid "Priority" msgstr "优先级" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:727 src/include/dns-server/cmdline.rb:1150 +#: src/include/dns-server/cmdline.rb:1150 msgid "Start of Authority (SOA):" msgstr "授权起始记录 (SOA)：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:732 src/include/dns-server/cmdline.rb:1155 +#: src/include/dns-server/cmdline.rb:1155 msgid "Key" msgstr "密钥" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:799 src/include/dns-server/cmdline.rb:1222 +#: src/include/dns-server/cmdline.rb:1222 msgid "Record Query" msgstr "记录查询" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:801 src/include/dns-server/cmdline.rb:1224 +#: src/include/dns-server/cmdline.rb:1224 msgid "Record Type" msgstr "记录类型" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:803 src/include/dns-server/cmdline.rb:1226 +#: src/include/dns-server/cmdline.rb:1226 msgid "Record Value" msgstr "记录值" #. TRANSLATORS: commandline section header -#. TRANSLATORS: commandline section header -#: src/clients/dns-server.rb:857 src/include/dns-server/cmdline.rb:1279 +#: src/include/dns-server/cmdline.rb:1279 msgid "Hostname Record:" msgstr "主机名记录：" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:864 src/include/dns-server/cmdline.rb:1286 +#: src/include/dns-server/cmdline.rb:1286 msgid "Hostname" msgstr "主机名" #. TRANSLATORS: commandline table header item -#. TRANSLATORS: commandline table header item -#: src/clients/dns-server.rb:866 src/include/dns-server/cmdline.rb:1288 +#: src/include/dns-server/cmdline.rb:1288 msgid "IP" msgstr "IP" -#. TRANSLATORS: commandline general name of the module in help -#. TRANSLATORS: commandline general name of the module in help -#: src/clients/dns-server.rb:904 src/include/dns-server/cmdline.rb:24 -msgid "DNS server configuration" -msgstr "DNS 服务器配置" - -#: src/clients/dns-server.rb:912 src/include/dns-server/cmdline.rb:32 -msgid "Start-up settings" -msgstr "启动设置" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:921 src/include/dns-server/cmdline.rb:38 -msgid "DNS forwarders" -msgstr "DNS 转发对象" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:933 src/include/dns-server/cmdline.rb:50 -msgid "Logging settings" -msgstr "日志记录设置" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:946 src/include/dns-server/cmdline.rb:63 -msgid "DNS zones" -msgstr "DNS 区域" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:962 src/include/dns-server/cmdline.rb:79 -msgid "Access control lists" -msgstr "访问控制列表" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:973 src/include/dns-server/cmdline.rb:87 -msgid "Zone transport rules" -msgstr "区域传输规则" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:988 src/include/dns-server/cmdline.rb:102 -msgid "Zone name servers" -msgstr "区域名称服务器" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1005 src/include/dns-server/cmdline.rb:119 -msgid "Zone mail servers" -msgstr "区域邮件服务器" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1019 src/include/dns-server/cmdline.rb:133 -msgid "Start of authority (SOA)" -msgstr "授权起始记录 (SOA)" - -#. TRANSLATORS: commandline short help for command, base cmdline command -#. TRANSLATORS: commandline short help for command, base cmdline command -#: src/clients/dns-server.rb:1034 src/include/dns-server/cmdline.rb:148 -msgid "Zone resource records, such as A, CNAME, NS, MX, or PTR" -msgstr "区域资源记录，诸如 A、CNAME、NS、MX 或 PTR" - -#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type -#. TRANSLATORS: commandline short help for command, base cmdline command, A is record type -#: src/clients/dns-server.rb:1052 src/include/dns-server/cmdline.rb:166 -msgid "Handles A and corresponding PTR record at once" -msgstr "同时处理 A 和相应的 PTR 记录" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1066 src/include/dns-server/cmdline.rb:180 -msgid "Show current settings" -msgstr "显示当前设置" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1072 src/include/dns-server/cmdline.rb:186 -msgid "Start DNS server in the boot process" -msgstr "在引导过程中启动 DNS 服务器" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1078 src/include/dns-server/cmdline.rb:192 -msgid "Start DNS server manually" -msgstr "手动启动 DNS 服务器" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1084 src/include/dns-server/cmdline.rb:198 -msgid "Add a new record" -msgstr "添加新记录" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1090 src/include/dns-server/cmdline.rb:204 -msgid "Remove a record" -msgstr "移除记录" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1097 src/include/dns-server/cmdline.rb:211 -msgid "IPv4 address" -msgstr "IPv4 地址" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1104 src/include/dns-server/cmdline.rb:218 -msgid "Logging destination (syslog|file)" -msgstr "日志记录目标 (syslog|file)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1110 src/include/dns-server/cmdline.rb:224 -msgid "Set option" -msgstr "设置选项" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1117 src/include/dns-server/cmdline.rb:231 -msgid "Filename for logging (full path)" -msgstr "日志记录文件名 (完整路径)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1124 src/include/dns-server/cmdline.rb:238 -msgid "Maximum log size [0-9]+(KMG)*" -msgstr "最大日志大小 [0-9]+(KMG)*" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1131 src/include/dns-server/cmdline.rb:245 -msgid "Maximum number of versions for rotation, '0' means no rotation" -msgstr "用于轮替的最大版本数，\"0\"表示不轮替" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1138 src/clients/dns-server.rb:1159 -#: src/include/dns-server/cmdline.rb:252 src/include/dns-server/cmdline.rb:273 -msgid "Zone name" -msgstr "区域名称" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1145 src/include/dns-server/cmdline.rb:259 -msgid "Zone type, master or slave" -msgstr "区域类型 (主或从属)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1152 src/include/dns-server/cmdline.rb:266 -msgid "DNS zone master server" -msgstr "DNS 区域主服务器" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1166 src/include/dns-server/cmdline.rb:280 -msgid "Enable option" -msgstr "启用选项" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1173 src/include/dns-server/cmdline.rb:287 -msgid "Disable option" -msgstr "禁用选项" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1180 src/include/dns-server/cmdline.rb:294 -msgid "Name server (in fully qualified format finished with a dot or relative name)" -msgstr "名称服务器 (使用以一个点结尾的完全限定格式或相对名称)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1187 src/include/dns-server/cmdline.rb:301 -msgid "Mail server (in fully qualified format finished with a dot or relative name)" -msgstr "邮件服务器 (使用以一个点结尾的完全限定格式或相对名称)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1194 src/include/dns-server/cmdline.rb:308 -msgid "Mail server priority (number from 0 to 65535)" -msgstr "邮件服务器优先级 (从 0 到 65535 的数字)" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1201 src/include/dns-server/cmdline.rb:315 -msgid "Serial number of zone update" -msgstr "区域更新序列号" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1208 src/include/dns-server/cmdline.rb:322 -msgid "General time to live of records in zone" -msgstr "区域中记录的常规存活时间" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1215 src/include/dns-server/cmdline.rb:329 -msgid "An interval before the zone records should be refreshed" -msgstr "刷新区域记录的周期" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1222 src/include/dns-server/cmdline.rb:336 -msgid "Interval between retries of failed refresh" -msgstr "刷新失败后重试的周期" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1229 src/include/dns-server/cmdline.rb:343 -msgid "Interval after which zone records are no longer authoritative" -msgstr "区域记录不再权威的周期" - -#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated -#. TRANSLATORS: commandline short help for command, TTL is DNS-Specific (Time to Live), shouldn't be translated -#: src/clients/dns-server.rb:1236 src/include/dns-server/cmdline.rb:350 -msgid "Minimum TTL that should be exported with records in this zone" -msgstr "应与此区域中的记录一同导出的最小 TTL" - -#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated -#. TRANSLATORS: commandline short help for command, Types are DNS-Specific, cannot be translated -#: src/clients/dns-server.rb:1243 src/include/dns-server/cmdline.rb:357 -msgid "DNS resource record type, such as A, CNAME, NS, MX, or PTR" -msgstr "DNS 资源记录类型，诸如 A、CNAME、NS、MX 或 PTR" - -#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) -#. TRANSLATORS: commandline short help for command, DNS query is a question for value when we have a /key/ and type, ('A' record for 'example.org'? -> 192.0.34.166) -#: src/clients/dns-server.rb:1250 src/include/dns-server/cmdline.rb:364 -msgid "DNS query, such as example.org for A record" -msgstr "DNS 查询，诸如查询 example.org 的 A 记录" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1257 src/include/dns-server/cmdline.rb:371 -msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record" -msgstr "DNS 资源记录值，诸如表示 example.org 的 A 记录的 192.0.34.166" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1264 src/include/dns-server/cmdline.rb:378 -msgid "Hostname for the DNS record" -msgstr "DNS 记录主机名" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1272 src/include/dns-server/cmdline.rb:386 -msgid "Log named queries %1" -msgstr "记录命名查询 %1" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1280 src/include/dns-server/cmdline.rb:394 -msgid "Log zone updates %1" -msgstr "记录区域更新 %1" - -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#. TRANSLATORS: commandline short help for command, %1 are possible untranlatable parameters "(yes|no)" -#: src/clients/dns-server.rb:1288 src/include/dns-server/cmdline.rb:402 -msgid "Log zone transfers %1" -msgstr "记录区域传输 %1" - -#. TRANSLATORS: commandline short help for command -#. TRANSLATORS: commandline short help for command -#: src/clients/dns-server.rb:1295 src/include/dns-server/cmdline.rb:409 -msgid "Comma-separated list of zone forwarders" -msgstr "逗号分隔的区域转发对象列表" - #. Dialog caption (before a colon) #. Dialog caption (before a colon) #. Dialog caption (before a colon) @@ -679,8 +557,8 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings #: src/include/dns-server/dialog-installwizard.rb:79 -#: src/include/dns-server/dialog-main.rb:560 -#: src/include/dns-server/dialog-main.rb:563 +#: src/include/dns-server/dialog-main.rb:517 +#: src/include/dns-server/dialog-main.rb:520 msgid "DNS Zones" msgstr "DNS 区域" @@ -701,10 +579,8 @@ #. check box #. TRANSLATORS: checkbox label, turning LDAP support on or off -#. check box #: src/include/dns-server/dialog-installwizard.rb:175 -#: src/include/dns-server/dialog-main.rb:338 -#: src/include/dns-server/dialog-main.rb:597 +#: src/include/dns-server/dialog-main.rb:291 msgid "&LDAP Support Active" msgstr "激活 &LDAP 支持" @@ -729,99 +605,34 @@ msgstr "DNS 服务器专家配置(&E)..." #. Dialog label DNS - expert settings -#: src/include/dns-server/dialog-main.rb:256 +#: src/include/dns-server/dialog-main.rb:261 msgid "DNS Server" msgstr "DNS 服务器" -#. radio button (starting DNS service - option 1) -#: src/include/dns-server/dialog-main.rb:270 -msgid "When &Booting" -msgstr "引导时(&B)" +#. FIXME: new startup +#: src/include/dns-server/dialog-main.rb:419 +#, fuzzy +#| msgid "Apply Changes to Dialog" +msgid "Apply Changes" +msgstr "对对话应用更改" -#. radio button (starting DNS service - option 2) -#: src/include/dns-server/dialog-main.rb:274 -msgid "&Manually" -msgstr "手动(&M)" - -#. part of help text, used to describe radiobuttons (matching starting DNS service but without "&") -#: src/include/dns-server/dialog-main.rb:280 -msgid "When Booting" -msgstr "引导时" - -#. part of help text, used to describe radiobuttons (matching starting DNS service but without "&") -#: src/include/dns-server/dialog-main.rb:282 -msgid "Manually" -msgstr "手动" - -#. label - service status, informative text -#. service status - label -#. service sttus - label -#: src/include/dns-server/dialog-main.rb:290 -#: src/include/dns-server/dialog-main.rb:612 -#: src/include/dns-server/dialog-main.rb:651 -msgid "DNS server is running." -msgstr "DNS 服务器正在运行。" - -#. label - service status, informative text -#. service sttus - label -#: src/include/dns-server/dialog-main.rb:294 -#: src/include/dns-server/dialog-main.rb:653 -msgid "DNS server is not running." -msgstr "DNS 服务器没有运行。" - -#. push button (DNS service handling) -#. Pushbutton for starting the DNS server -#: src/include/dns-server/dialog-main.rb:298 -#: src/include/dns-server/dialog-main.rb:620 -msgid "&Start DNS Server Now" -msgstr "立即启动 DNS 服务器(&S)" - -#. push button (DNS service handling) -#. Pushbutton for stopping the DNS server -#: src/include/dns-server/dialog-main.rb:302 -#: src/include/dns-server/dialog-main.rb:626 -msgid "S&top DNS Server Now" -msgstr "立即停止 DNS 服务器(&T)" - -#. push button (DNS service handling) -#: src/include/dns-server/dialog-main.rb:310 -msgid "Save Settings and Reload DNS Server &Now" -msgstr "保存设置并立即重载 DNS 服务器(&N)" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:316 -msgid "Start DNS Server Now" -msgstr "立即启动 DNS 服务器" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:318 -msgid "Stop DNS Server Now" -msgstr "立即停止 DNS 服务器" - -#. part of help text, used to describe pusbuttons (matching DNS service handling but without "&") -#: src/include/dns-server/dialog-main.rb:320 -msgid "Save Settings and Reload DNS Server Now" -msgstr "保存设置并立即重载 DNS 服务器" - #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#. Frame label (DNS starting) -#: src/include/dns-server/dialog-main.rb:472 -#: src/include/dns-server/dialog-main.rb:475 -#: src/include/dns-server/dialog-main.rb:580 +#: src/include/dns-server/dialog-main.rb:425 +#: src/include/dns-server/dialog-main.rb:428 msgid "Start-Up" msgstr "启动" #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:503 -#: src/include/dns-server/dialog-main.rb:506 +#: src/include/dns-server/dialog-main.rb:456 +#: src/include/dns-server/dialog-main.rb:459 msgid "Basic Options" msgstr "基本选项" #. Dialog Label - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:516 -#: src/include/dns-server/dialog-main.rb:518 +#: src/include/dns-server/dialog-main.rb:469 +#: src/include/dns-server/dialog-main.rb:471 msgid "Logging" msgstr "日志记录" @@ -829,8 +640,8 @@ #. Tree Menu Item - DNS - expert settings #. multi selection box #. multi selection box -#: src/include/dns-server/dialog-main.rb:529 -#: src/include/dns-server/dialog-main.rb:532 +#: src/include/dns-server/dialog-main.rb:482 +#: src/include/dns-server/dialog-main.rb:485 #: src/include/dns-server/dialog-masterzone.rb:163 #: src/include/dns-server/dialog-masterzone.rb:2729 msgid "ACLs" @@ -838,121 +649,89 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:546 -#: src/include/dns-server/dialog-main.rb:549 +#: src/include/dns-server/dialog-main.rb:499 +#: src/include/dns-server/dialog-main.rb:502 msgid "TSIG Keys" msgstr "TSIG 密钥" -#. Radiobutton label -#: src/include/dns-server/dialog-main.rb:586 -msgid "Now and When Booting" -msgstr "立即和在引导时" - -#. Radiobutton label -#: src/include/dns-server/dialog-main.rb:588 -msgid "Only Manually" -msgstr "仅手动" - -#. Frame label (stoping starting DNS server) -#: src/include/dns-server/dialog-main.rb:602 -msgid "Switch On and Off" -msgstr "打开和关闭" - -#. Current status -#: src/include/dns-server/dialog-main.rb:608 -msgid "Current Status: " -msgstr "当前状态：" - -#. yes-no popup -#. if (! Popup::YesNo ( -#: src/include/dns-server/dialog-main.rb:719 -msgid "" -"All your changes will be lost. Settings will\n" -"be reread from new data storage.\n" -"Continue?\n" -msgstr "" -"您的全部修改均将不复存在。\n" -"将从新数据存储重新读取设置。\n" -"继续吗？\n" - #. T: ComboBox label -#: src/include/dns-server/dialog-main.rb:751 +#: src/include/dns-server/dialog-main.rb:563 msgid "Local DNS Resolution &Policy" msgstr "本地 DNS 解析策略(&P)" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:754 +#: src/include/dns-server/dialog-main.rb:566 msgid "Merging forwarders is disabled" msgstr "已禁用了合并转发对象" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:756 +#: src/include/dns-server/dialog-main.rb:568 msgid "Automatic merging" msgstr "自动合并" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:758 +#: src/include/dns-server/dialog-main.rb:570 msgid "Merging forwarders is enabled" msgstr "已启用了合并转发对象" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:760 +#: src/include/dns-server/dialog-main.rb:572 msgid "Custom configuration" msgstr "自定义配置" -#: src/include/dns-server/dialog-main.rb:764 +#: src/include/dns-server/dialog-main.rb:576 msgid "Custom policy" msgstr "自定义策略" #. T: ComboBox label -#: src/include/dns-server/dialog-main.rb:771 +#: src/include/dns-server/dialog-main.rb:583 msgid "Local DNS Resolution &Forwarder" msgstr "本地 DNS 解析转发对象(&F)" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:774 +#: src/include/dns-server/dialog-main.rb:586 msgid "Using system name servers" msgstr "使用系统名称服务器" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:776 +#: src/include/dns-server/dialog-main.rb:588 msgid "This name server (bind)" msgstr "此名称服务器 (bind)" #. T: ComboBox item -#: src/include/dns-server/dialog-main.rb:778 +#: src/include/dns-server/dialog-main.rb:590 msgid "Local dnsmasq server" msgstr "本地 dnsmasq 服务器" #. Frame label for DNS-Forwarders adding IP -#: src/include/dns-server/dialog-main.rb:788 +#: src/include/dns-server/dialog-main.rb:600 msgid "Add IP Address" msgstr "添加 IP 地址" #. Textentry for DNS-Forwarders adding IP -#: src/include/dns-server/dialog-main.rb:797 +#: src/include/dns-server/dialog-main.rb:609 msgid "IPv4 or IPv6 A&ddress" msgstr "IPv4 或 IPv6 地址(&D)" #. Selectionbox for listing current DNS-Forwarders #. Selectionbox for listing current DNS-Forwarders -#: src/include/dns-server/dialog-main.rb:826 -#: src/include/dns-server/dialog-main.rb:857 +#: src/include/dns-server/dialog-main.rb:638 +#: src/include/dns-server/dialog-main.rb:669 msgid "Forwarder &List" msgstr "转发对象列表(&L)" #. Store settings of a tab of a dialog -#: src/include/dns-server/dialog-main.rb:1001 +#: src/include/dns-server/dialog-main.rb:813 msgid "Cannot set local forwarder to %{forwarder}" msgstr "无法将本地转发对象设为 %{forwarder}" #. An error message, %1 is replaced with a variable IP -#: src/include/dns-server/dialog-main.rb:1065 +#: src/include/dns-server/dialog-main.rb:877 msgid "Cannot find local equivalent for IP %1." msgstr "无法找到 IP %1 的本地等价。" #. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP -#: src/include/dns-server/dialog-main.rb:1071 +#: src/include/dns-server/dialog-main.rb:883 msgid "" "Forwarding DNS queries to itself would create an infinite loop.\n" "IP address %1 is currently used by this server, so it has\n" @@ -962,64 +741,64 @@ "IP 地址 %1 目前正由此服务器使用，因此它已被修改为它的本地等价 %2。" #. both IPv4 and IPv6 -#: src/include/dns-server/dialog-main.rb:1099 +#: src/include/dns-server/dialog-main.rb:911 msgid "Invalid IPv4 or IPv6 address." msgstr "无效的 IPv4 或 IPv6 地址。" -#: src/include/dns-server/dialog-main.rb:1102 +#: src/include/dns-server/dialog-main.rb:914 msgid "" "A valid IPv6 address consists of letters a-f, numbers,\n" "and colons." msgstr "有效 IPv6 地址由字母 a 到 f，数字，和冒号组成。" #. error report -#: src/include/dns-server/dialog-main.rb:1118 +#: src/include/dns-server/dialog-main.rb:930 msgid "The specified forwarder is already present." msgstr "指定转发对象已存在。" #. Frame label for Basic-Options -#: src/include/dns-server/dialog-main.rb:1147 +#: src/include/dns-server/dialog-main.rb:959 msgid "Add or Change Option" msgstr "添加或修改选项" #. Combobox for choosing the basic-option -#: src/include/dns-server/dialog-main.rb:1161 +#: src/include/dns-server/dialog-main.rb:973 msgid "O&ption" msgstr "选项(&P)" #. Textentry for setting the basic-option value #. Textentry - adding ACL-optiopn - value -#: src/include/dns-server/dialog-main.rb:1171 -#: src/include/dns-server/dialog-main.rb:1776 +#: src/include/dns-server/dialog-main.rb:983 +#: src/include/dns-server/dialog-main.rb:1588 msgid "&Value" msgstr "值(&V)" #. Pushbutton for changing the basic-option #. Pushbutton - Change Record -#: src/include/dns-server/dialog-main.rb:1195 +#: src/include/dns-server/dialog-main.rb:1007 #: src/include/dns-server/dialog-masterzone.rb:1387 msgid "C&hange" msgstr "修改(&H)" #. Table label for basic-options listing -#: src/include/dns-server/dialog-main.rb:1209 +#: src/include/dns-server/dialog-main.rb:1021 msgid "Current Options" msgstr "当前选项" #. Table header item - basic-options listing -#: src/include/dns-server/dialog-main.rb:1218 +#: src/include/dns-server/dialog-main.rb:1030 msgid "Option" msgstr "选项" #. TRANSLATORS: Popup question -#: src/include/dns-server/dialog-main.rb:1349 +#: src/include/dns-server/dialog-main.rb:1161 msgid "" "Really set this\n" "option without any value?\n" msgstr "真的要设置此选项为没有任何值吗？\n" #. TRANSLATORS: Popup question. Please, do not translate 'yes' and 'no' strings. %1 is a name of the option, %2 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1361 +#: src/include/dns-server/dialog-main.rb:1173 msgid "" "Option %1 can only have a yes or no value set.\n" "Really set it to %2?\n" @@ -1028,7 +807,7 @@ "真的将它设为 %2 吗？\n" #. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1378 +#: src/include/dns-server/dialog-main.rb:1190 msgid "" "Option %1 can only be a number.\n" "Really set it to %2?\n" @@ -1037,7 +816,7 @@ "真的将它设置为 %2 吗？\n" #. TRANSLATORS: Popup question. %1 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1390 +#: src/include/dns-server/dialog-main.rb:1202 msgid "" "Quotes are not used correctly in this option.\n" "Really set it to %1?\n" @@ -1046,7 +825,7 @@ "真的将它设为 %1 吗？\n" #. TRANSLATORS: Popup question. %1 is the value of the option. -#: src/include/dns-server/dialog-main.rb:1402 +#: src/include/dns-server/dialog-main.rb:1214 msgid "" "Brackets are not used correctly in this option.\n" "Really set it to %1?\n" @@ -1055,7 +834,7 @@ "真的将它设为 %1 吗？\n" #. Popup question, %1 is the name of the option -#: src/include/dns-server/dialog-main.rb:1446 +#: src/include/dns-server/dialog-main.rb:1258 msgid "" "Option %1 should be set only once.\n" "Really add another one?\n" @@ -1064,77 +843,77 @@ "真的要添加另一个吗？\n" #. Table header - logging options -#: src/include/dns-server/dialog-main.rb:1486 +#: src/include/dns-server/dialog-main.rb:1298 msgid "Log Type" msgstr "日志类型" #. Radiobutton - log type -#: src/include/dns-server/dialog-main.rb:1498 +#: src/include/dns-server/dialog-main.rb:1310 msgid "&System Log" msgstr "系统日志(&S)" #. Radiobutton - log type -#: src/include/dns-server/dialog-main.rb:1507 +#: src/include/dns-server/dialog-main.rb:1319 msgid "&File" msgstr "文件(&F)" #. IntField - max. log size -#: src/include/dns-server/dialog-main.rb:1540 +#: src/include/dns-server/dialog-main.rb:1352 msgid "Maximum &Size (MB)" msgstr "最大大小 (MB)(&S)" #. IntField - max. log age -#: src/include/dns-server/dialog-main.rb:1551 +#: src/include/dns-server/dialog-main.rb:1363 msgid "Maximum &Versions" msgstr "最大版本数(&V)" #. Frame label - additional-logging -#: src/include/dns-server/dialog-main.rb:1569 +#: src/include/dns-server/dialog-main.rb:1381 msgid "Additional Logging" msgstr "额外日志记录" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1574 +#: src/include/dns-server/dialog-main.rb:1386 msgid "Log All DNS &Queries" msgstr "记录全部 DNS 查询(&Q)" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1577 +#: src/include/dns-server/dialog-main.rb:1389 msgid "Log Zone &Updates" msgstr "记录区域更新(&U)" #. Checkbox - additional-logging -#: src/include/dns-server/dialog-main.rb:1580 +#: src/include/dns-server/dialog-main.rb:1392 msgid "Log Zone &Transfers" msgstr "记录区域传输(&T)" #. popup headline -#: src/include/dns-server/dialog-main.rb:1737 +#: src/include/dns-server/dialog-main.rb:1549 msgid "Select File for Log" msgstr "选择日志文件" #. Frame label - adding ACL-optiopn -#: src/include/dns-server/dialog-main.rb:1754 +#: src/include/dns-server/dialog-main.rb:1566 msgid "Option Setup" msgstr "选项设置" #. Textentry - adding ACL-optiopn - name -#: src/include/dns-server/dialog-main.rb:1767 +#: src/include/dns-server/dialog-main.rb:1579 msgid "&Name" msgstr "名称(&N)" #. Table header - ACL-options listing -#: src/include/dns-server/dialog-main.rb:1803 +#: src/include/dns-server/dialog-main.rb:1615 msgid "Current ACL List" msgstr "当前访问控制列表列表" #. Table header item - ACL-options -#: src/include/dns-server/dialog-main.rb:1811 +#: src/include/dns-server/dialog-main.rb:1623 msgid "ACL" msgstr "访问控制列表" #. A popup question, %1 is number of zones -#: src/include/dns-server/dialog-main.rb:1931 +#: src/include/dns-server/dialog-main.rb:1743 msgid "" "This ACL is used by %1 zones.\n" "Really remove it?\n" @@ -1143,12 +922,12 @@ "真的移除它吗？\n" #. An error popup message -#: src/include/dns-server/dialog-main.rb:2018 +#: src/include/dns-server/dialog-main.rb:1830 msgid "The specified ACL entry already exists." msgstr "指定访问控制列表项已存在。" #. frame label -#: src/include/dns-server/dialog-main.rb:2035 +#: src/include/dns-server/dialog-main.rb:1847 msgid "Add New Zone " msgstr "添加新区域" @@ -1157,8 +936,8 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2056 -#: src/include/dns-server/dialog-main.rb:2146 src/modules/DnsServer.pm:1582 +#: src/include/dns-server/dialog-main.rb:1868 +#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658 msgid "Master" msgstr "主" @@ -1168,9 +947,9 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2058 -#: src/include/dns-server/dialog-main.rb:2149 -#: src/include/dns-server/dialog-main.rb:2152 src/modules/DnsServer.pm:1584 +#: src/include/dns-server/dialog-main.rb:1870 +#: src/include/dns-server/dialog-main.rb:1961 +#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660 msgid "Slave" msgstr "从属" @@ -1179,23 +958,36 @@ #. TRANSLATORS: Table item - Server type #. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-# #. type of zone to be used in summary -#: src/include/dns-server/dialog-main.rb:2060 -#: src/include/dns-server/dialog-main.rb:2155 src/modules/DnsServer.pm:1590 +#: src/include/dns-server/dialog-main.rb:1872 +#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666 msgid "Forward" msgstr "转发" #. Table header - DNS listing zones -#: src/include/dns-server/dialog-main.rb:2083 +#: src/include/dns-server/dialog-main.rb:1895 msgid "Configured DNS Zones" msgstr "已配置的 DNS 区域" #. error report -#: src/include/dns-server/dialog-main.rb:2292 +#: src/include/dns-server/dialog-main.rb:2104 msgid "A zone with the specified name is already configured." msgstr "指定名称的区域已配置。" +#. Write settings dialog +#. @return `abort if aborted and `next otherwise +#: src/include/dns-server/dialog-main.rb:2153 +msgid "Saving the configuration failed. Change the settings?" +msgstr "保存配置失败。修改设置吗？" + +#. Writes settings and restores the dialog without exiting +#: src/include/dns-server/dialog-main.rb:2169 +#, fuzzy +#| msgid "Save configuration files" +msgid "Saving the configuration failed" +msgstr "保存配置文件" + #. Yes-No popup -#: src/include/dns-server/dialog-main.rb:2347 +#: src/include/dns-server/dialog-main.rb:2182 msgid "" "All changes will be lost.\n" "Really leave the DNS server configuration without saving?" @@ -1682,13 +1474,8 @@ "全部修改均将不复存在。\n" "真的退出吗？" -#. yes-no popup -#: src/include/dns-server/dialogs.rb:70 -msgid "Saving the configuration failed. Change the settings?" -msgstr "保存配置失败。修改设置吗？" - #. message popup -#: src/include/dns-server/dialogs.rb:96 +#: src/include/dns-server/dialogs.rb:81 msgid "A zone of this type cannot be edited with this tool." msgstr "此类型的区域不能用此工具编辑。" @@ -2633,56 +2420,56 @@ msgstr "邮件中继(&M)" #. DNS server read dialog caption -#: src/modules/DnsServer.pm:934 +#: src/modules/DnsServer.pm:960 msgid "Initializing DNS Server Configuration" msgstr "正在初始化 DNS 服务器配置" #. progress stage -#: src/modules/DnsServer.pm:938 +#: src/modules/DnsServer.pm:964 msgid "Check the environment" msgstr "检查环境" #. progress stage -#: src/modules/DnsServer.pm:940 src/modules/DnsServer.pm:1275 +#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337 msgid "Flush caches of the DNS daemon" msgstr "刷新 DNS 守护进程的缓存" #. progress stage -#: src/modules/DnsServer.pm:942 +#: src/modules/DnsServer.pm:968 msgid "Read the firewall settings" msgstr "读取防火墙设置" #. progress stage -#: src/modules/DnsServer.pm:944 +#: src/modules/DnsServer.pm:970 msgid "Read the settings" msgstr "读取设置" #. progress step -#: src/modules/DnsServer.pm:948 +#: src/modules/DnsServer.pm:974 msgid "Checking the environment..." msgstr "正在检查环境..." #. progress step -#: src/modules/DnsServer.pm:950 src/modules/DnsServer.pm:1291 +#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353 msgid "Flushing caches of the DNS daemon..." msgstr "正在刷新 DNS 守护进程的缓存..." #. progress step -#: src/modules/DnsServer.pm:952 +#: src/modules/DnsServer.pm:978 msgid "Reading the firewall settings..." msgstr "正在读取防火墙设置..." #. progress step -#: src/modules/DnsServer.pm:954 +#: src/modules/DnsServer.pm:980 msgid "Reading the settings..." msgstr "正在读取设置..." #. progress step -#: src/modules/DnsServer.pm:956 src/modules/DnsServer.pm:1305 +#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367 msgid "Finished" msgstr "已完成" -#: src/modules/DnsServer.pm:1233 +#: src/modules/DnsServer.pm:1266 msgid "" "Error occurred while calling netconfig.\n" "Error: " @@ -2691,72 +2478,72 @@ "错误：" #. DNS server read dialog caption -#: src/modules/DnsServer.pm:1271 +#: src/modules/DnsServer.pm:1333 msgid "Saving DNS Server Configuration" msgstr "正在保存 DNS 服务器配置" #. progress stage -#: src/modules/DnsServer.pm:1277 +#: src/modules/DnsServer.pm:1339 msgid "Save configuration files" msgstr "保存配置文件" #. progress stage -#: src/modules/DnsServer.pm:1279 +#: src/modules/DnsServer.pm:1341 msgid "Restart the DNS daemon" msgstr "重启 DNS 守护进程" #. progress stage -#: src/modules/DnsServer.pm:1281 +#: src/modules/DnsServer.pm:1343 msgid "Update zone files" msgstr "更新区域文件" #. progress stage -#: src/modules/DnsServer.pm:1283 +#: src/modules/DnsServer.pm:1345 msgid "Adjust the DNS service" msgstr "调整 DNS 服务" #. progress stage -#: src/modules/DnsServer.pm:1285 +#: src/modules/DnsServer.pm:1347 msgid "Call netconfig" msgstr "调用 netconfig" #. progress stage -#: src/modules/DnsServer.pm:1287 +#: src/modules/DnsServer.pm:1349 msgid "Write the firewall settings" msgstr "写入防火墙设置" #. progress step -#: src/modules/DnsServer.pm:1293 +#: src/modules/DnsServer.pm:1355 msgid "Saving configuration files..." msgstr "正在保存配置文件..." #. progress step -#: src/modules/DnsServer.pm:1295 +#: src/modules/DnsServer.pm:1357 msgid "Restarting the DNS daemon..." msgstr "正在重启 DNS 守护进程..." #. progress step -#: src/modules/DnsServer.pm:1297 +#: src/modules/DnsServer.pm:1359 msgid "Updating zone files..." msgstr "正在更新区域文件..." #. progress step -#: src/modules/DnsServer.pm:1299 +#: src/modules/DnsServer.pm:1361 msgid "Adjusting the DNS service..." msgstr "正在调整 DNS 服务..." #. progress step -#: src/modules/DnsServer.pm:1301 +#: src/modules/DnsServer.pm:1363 msgid "Calling netconfig..." msgstr "正在调用 netconfig..." #. progress step -#: src/modules/DnsServer.pm:1303 +#: src/modules/DnsServer.pm:1365 msgid "Writing the firewall settings..." msgstr "正在写入防火墙设置..." #. Cannot start service 'named', because of error that follows Error:. Do not translate named. -#: src/modules/DnsServer.pm:1475 +#: src/modules/DnsServer.pm:1538 msgid "" "Error occurred while starting service named.\n" "\n" @@ -2765,43 +2552,43 @@ "\n" #. type of zone to be used in summary -#: src/modules/DnsServer.pm:1586 +#: src/modules/DnsServer.pm:1662 msgid "Stub" msgstr "存根" #. type of zone to be used in summary -#: src/modules/DnsServer.pm:1588 +#: src/modules/DnsServer.pm:1664 msgid "Hint" msgstr "提示" #. summary string -#: src/modules/DnsServer.pm:1597 +#: src/modules/DnsServer.pm:1673 msgid "The DNS server starts when booting the system." msgstr "在引导系统时启动 DNS 服务器。" #. summary string -#: src/modules/DnsServer.pm:1603 +#: src/modules/DnsServer.pm:1679 msgid "The DNS server does not start when booting the system." msgstr "在引导系统时不启动 DNS 服务器。" #. summary string, %s is list of DNS zones (their names), coma separated -#: src/modules/DnsServer.pm:1632 +#: src/modules/DnsServer.pm:1707 #, perl-format msgid "Configured Zones: %s" msgstr "已配置的区域：%s" #. error message -#: src/modules/DnsServer.pm:1646 +#: src/modules/DnsServer.pm:1721 msgid "Invalid LDAP configuration. Cannot use LDAP." msgstr "无效的 LDAP 配置。无法使用 LDAP。" #. yes-no popup -#: src/modules/DnsServer.pm:1727 +#: src/modules/DnsServer.pm:1802 msgid "Enable LDAP support?" msgstr "激活 LDAP 支持吗？" #. error popup -#: src/modules/DnsServer.pm:1815 +#: src/modules/DnsServer.pm:1890 msgid "" "Installation of required packages failed.\n" "LDAP support will not be active." @@ -2810,30 +2597,87 @@ "LDAP 支持将不会激活。" #. BNC #679960 -#: src/modules/DnsServer.pm:1874 +#: src/modules/DnsServer.pm:1949 msgid "Unknown LDAP initialization error." msgstr "未知的 LDAP 初始化错误。" #. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed -#: src/modules/DnsServer.pm:1910 +#: src/modules/DnsServer.pm:1985 msgid "Error occurred while creating %1." msgstr "创建 %1 时出错。" #. error report, %1 is ldap object -#: src/modules/DnsServer.pm:1946 +#: src/modules/DnsServer.pm:2021 msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP." msgstr "创建 cn=defaultDNS,%1 时出错。未在使用 LDAP。" #. error report, %1 is LDAP record DN -#: src/modules/DnsServer.pm:1972 +#: src/modules/DnsServer.pm:2047 msgid "Error occurred while updating %1." msgstr "更新 %1 时出错。" #. error report, %1 is LDAP record DN -#: src/modules/DnsServer.pm:2007 +#: src/modules/DnsServer.pm:2082 msgid "Error occurred while creating %1. Not using LDAP." msgstr "创建 %1 时出错。未在使用 LDAP。" +#~ msgid "When &Booting" +#~ msgstr "引导时(&B)" + +#~ msgid "&Manually" +#~ msgstr "手动(&M)" + +#~ msgid "When Booting" +#~ msgstr "引导时" + +#~ msgid "Manually" +#~ msgstr "手动" + +#~ msgid "DNS server is running." +#~ msgstr "DNS 服务器正在运行。" + +#~ msgid "DNS server is not running." +#~ msgstr "DNS 服务器没有运行。" + +#~ msgid "&Start DNS Server Now" +#~ msgstr "立即启动 DNS 服务器(&S)" + +#~ msgid "S&top DNS Server Now" +#~ msgstr "立即停止 DNS 服务器(&T)" + +#~ msgid "Save Settings and Reload DNS Server &Now" +#~ msgstr "保存设置并立即重载 DNS 服务器(&N)" + +#~ msgid "Start DNS Server Now" +#~ msgstr "立即启动 DNS 服务器" + +#~ msgid "Stop DNS Server Now" +#~ msgstr "立即停止 DNS 服务器" + +#~ msgid "Save Settings and Reload DNS Server Now" +#~ msgstr "保存设置并立即重载 DNS 服务器" + +#~ msgid "Now and When Booting" +#~ msgstr "立即和在引导时" + +#~ msgid "Only Manually" +#~ msgstr "仅手动" + +#~ msgid "Switch On and Off" +#~ msgstr "打开和关闭" + +#~ msgid "Current Status: " +#~ msgstr "当前状态：" + +#~ msgid "" +#~ "All your changes will be lost. Settings will\n" +#~ "be reread from new data storage.\n" +#~ "Continue?\n" +#~ msgstr "" +#~ "您的全部修改均将不复存在。\n" +#~ "将从新数据存储重新读取设置。\n" +#~ "继续吗？\n" + #~ msgid "Netconfig DNS policy" #~ msgstr "Netconfig DNS 策略" Added: trunk/yast/zh_CN/po/docker.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/docker.zh_CN.po (rev 0) +++ trunk/yast/zh_CN/po/docker.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -0,0 +1,189 @@ +# 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: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2004-04-02 10:52+0200\n" +"Last-Translator: 裴寒牧 \n" +"Language-Team: 中华 \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" + +#. Only root can start process +#: src/lib/ydocker/main_dialog.rb:74 +msgid "Docker service does not run. Should YaST start docker? Otherwise YaST quits." +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:78 +msgid "Docker service does not run. Run this module as root or start docker service manually." +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:141 +#, fuzzy +#| msgid "Communication with fingerprint reader failed." +msgid "Communication with docker failed with error: %s. Please try again." +msgstr "与指纹识别程序通信失败。" + +#: src/lib/ydocker/main_dialog.rb:152 +#, fuzzy +#| msgid "" +#| "Do you really want\n" +#| "to quit the installation?" +msgid "Do you really want to stop the running container?" +msgstr "" +"是否确实要\n" +"退出安装？" + +#: src/lib/ydocker/main_dialog.rb:154 src/lib/ydocker/main_dialog.rb:163 +#, fuzzy +#| msgid "Do you really want to remove the current volume group?" +msgid "Do you want to remove the container?" +msgstr "你真想删除当前卷组吗？" + +#: src/lib/ydocker/main_dialog.rb:161 +#, fuzzy +#| msgid "" +#| "Do you really want\n" +#| "to quit the installation?" +msgid "Do you really want to kill the running container?" +msgstr "" +"是否确实要\n" +"退出安装？" + +#: src/lib/ydocker/main_dialog.rb:173 +#, fuzzy +#| msgid "Image" +msgid "&Images" +msgstr "映像" + +#: src/lib/ydocker/main_dialog.rb:174 +#, fuzzy +#| msgid " Container" +msgid "&Containers" +msgstr " 树枝" + +#: src/lib/ydocker/main_dialog.rb:184 +#, fuzzy +#| msgid "Disk Image" +msgid "Docker Images" +msgstr "磁盘映象" + +#: src/lib/ydocker/main_dialog.rb:194 +#, fuzzy +#| msgid "Running Internet Connection Test" +msgid "Running Docker Containers" +msgstr "正在运行因特网连接测试" + +#: src/lib/ydocker/main_dialog.rb:217 +msgid "Repository" +msgstr "仓库" + +#: src/lib/ydocker/main_dialog.rb:218 +#, fuzzy +#| msgid "Tab" +msgid "Tag" +msgstr "选项卡" + +#: src/lib/ydocker/main_dialog.rb:219 +#, fuzzy +#| msgid "Image" +msgid "Image ID" +msgstr "映像" + +#: src/lib/ydocker/main_dialog.rb:220 src/lib/ydocker/main_dialog.rb:234 +#, fuzzy +#| msgid "Create" +msgid "Created" +msgstr "创建" + +#: src/lib/ydocker/main_dialog.rb:221 +#, fuzzy +#| msgid "Virtual Device" +msgid "Virtual Size" +msgstr "虚拟设备" + +#: src/lib/ydocker/main_dialog.rb:231 +#, fuzzy +#| msgid " Container" +msgid "Container ID" +msgstr " 树枝" + +#: src/lib/ydocker/main_dialog.rb:232 +msgid "Image" +msgstr "映像" + +#: src/lib/ydocker/main_dialog.rb:233 +msgid "Command" +msgstr "命令" + +#: src/lib/ydocker/main_dialog.rb:235 +msgid "Status" +msgstr "状态" + +#: src/lib/ydocker/main_dialog.rb:236 +#, fuzzy +#| msgid "Port" +msgid "Ports" +msgstr "端口" + +#: src/lib/ydocker/main_dialog.rb:283 src/lib/ydocker/main_dialog.rb:293 +msgid "Re&fresh" +msgstr "刷新(&F)" + +#: src/lib/ydocker/main_dialog.rb:284 +msgid "R&un" +msgstr "" + +#: src/lib/ydocker/main_dialog.rb:285 +msgid "&Delete" +msgstr "删除(&D)" + +#: src/lib/ydocker/main_dialog.rb:294 +#, fuzzy +#| msgid "&Show Changes" +msgid "S&how Changes" +msgstr "显示更改(&S)" + +#: src/lib/ydocker/main_dialog.rb:295 +#, fuzzy +#| msgid "Terminals" +msgid "Inject &Terminal" +msgstr "终端" + +#: src/lib/ydocker/main_dialog.rb:296 +#, fuzzy +#| msgid " Container" +msgid "&Stop Container" +msgstr " 树枝" + +#: src/lib/ydocker/main_dialog.rb:297 +#, fuzzy +#| msgid " Container" +msgid "&Kill Container" +msgstr " 树枝" + +#: src/lib/ydocker/main_dialog.rb:298 +#, fuzzy +#| msgid "Comment" +msgid "&Commit" +msgstr "注释" + +#: src/lib/ydocker/main_dialog.rb:304 +#, fuzzy +#| msgid "Exit" +msgid "&Exit" +msgstr "退出" + +#: src/lib/ydocker/main_dialog.rb:315 +#, fuzzy +#| msgid "Do you really want to delete %1?" +msgid "Do you really want to delete image \"%s\"?" +msgstr "你真地想删除「%1」吗？" Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/drbd.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/drbd.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:29+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -73,10 +73,14 @@ msgstr "资源配置" #: src/include/drbd/common.rb:47 +msgid "LVM Configuration" +msgstr "LVM 配置" + +#: src/include/drbd/common.rb:48 msgid "Resource Basic Configuration" msgstr "基本资源配置" -#: src/include/drbd/common.rb:48 +#: src/include/drbd/common.rb:49 msgid "Resource Advanced Configuration" msgstr "高级资源配置" @@ -238,11 +242,21 @@ "\t\t" #: src/include/drbd/helps.rb:75 +#, fuzzy +#| msgid "" +#| "\n" +#| "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" +#| "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" +#| "\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" +#| "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" +#| "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" +#| "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" +#| "\t\t" msgid "" "\n" "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n" "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n" -"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n" +"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n" "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" @@ -306,14 +320,34 @@ "\t\t" #: src/include/drbd/helps.rb:112 +#, fuzzy +#| msgid "<p><b><big>Connection Configuration</big></b></p>" +msgid "<p><b><big>LVM Configuration</big></b></p>" +msgstr "<p><b><big>连接配置</big></b></p>" + +#: src/include/drbd/helps.rb:115 +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. Disable cache when for network storage, like nfs. </p>\n" +"\n" +"\t\t" +msgstr "" + +#: src/include/drbd/helps.rb:130 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>" msgstr "<p><b><big>分布式复制块设备 (DRBD) 全局配置</big></b></p>" -#: src/include/drbd/helps.rb:115 +#: src/include/drbd/helps.rb:133 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>" msgstr "<p>勾选<b>\"禁用 IP 验证\"</b>来禁用 drbdadm 的一个合理性检查</p>" -#: src/include/drbd/helps.rb:118 +#: src/include/drbd/helps.rb:136 msgid "" "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n" " far. You might want to disable this if you have the console\n" @@ -326,7 +360,7 @@ " 若您服务器的终端连接到了一个日志功能有限的串行终端服务器上，您可能想要禁用此功能。\n" " 该对话框每到 '对话框刷新' 秒数时将打印计数，设为 0 将完全禁用重绘功能。</p>" -#: src/include/drbd/helps.rb:126 +#: src/include/drbd/helps.rb:144 msgid "" "<p><b>Minor Count:</b>\n" " use this if you want to define more resources later\n" @@ -339,7 +373,7 @@ " 默认在加载模块时会加载此文件 中配置的全部设备。</p>" #. Summary dialog help 1/3 -#: src/include/drbd/helps.rb:134 +#: src/include/drbd/helps.rb:152 msgid "" "<p><b><big>DRBD Configuration</big></b><br>\n" "Configure drbd here.<br></p>\n" @@ -348,7 +382,7 @@ "在此配置分布式复制块设备 (DRBD)。<br></p>\n" #. Summary dialog help 2/3 -#: src/include/drbd/helps.rb:138 +#: src/include/drbd/helps.rb:156 msgid "" "<p><b><big>Adding a drbd:</big></b><br>\n" "Choose an drbd from the list of detected drbds.\n" @@ -361,7 +395,7 @@ "然后按<b>配置</b>。</p>\n" #. Summary dialog help 3/3 -#: src/include/drbd/helps.rb:145 +#: src/include/drbd/helps.rb:163 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "If you press <b>Edit</b>, an additional dialog in which to change\n" @@ -371,7 +405,7 @@ "您若按<b>编辑</b>，将打开另一个对话框，在其中您可修改相应配置。</p>\n" #. Ovreview dialog help 1/3 -#: src/include/drbd/helps.rb:151 +#: src/include/drbd/helps.rb:169 msgid "" "<p><b><big>DRBD Configuration Overview</big></b><br>\n" "Obtain an overview of installed drbds. Additionally\n" @@ -382,7 +416,7 @@ "此外，还可编辑它们的配置。<br></p>\n" #. Ovreview dialog help 2/3 -#: src/include/drbd/helps.rb:157 +#: src/include/drbd/helps.rb:175 msgid "" "<p><b><big>Adding a drbd:</big></b><br>\n" "Press <b>Add</b> to configure a drbd.</p>" @@ -391,7 +425,7 @@ "请按<b>添加</b>来配置一个分布式复制块设备。</p>" #. Ovreview dialog help 3/3 -#: src/include/drbd/helps.rb:161 +#: src/include/drbd/helps.rb:179 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "Choose a drbd to change or remove.\n" @@ -402,7 +436,7 @@ "然后按需按<b>编辑</b>或<b>删除</b>。</p>\n" #. Configure1 dialog help 1/2 -#: src/include/drbd/helps.rb:167 +#: src/include/drbd/helps.rb:185 msgid "" "<p><b><big>Configuration Part One</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -414,7 +448,7 @@ #. Configure1 dialog help 2/2 #. Configure2 dialog help 2/2 -#: src/include/drbd/helps.rb:173 src/include/drbd/helps.rb:185 +#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203 msgid "" "<p><b><big>Selecting Something</big></b><br>\n" "It is not possible. You must code it first. :-)\n" @@ -425,7 +459,7 @@ " </p>" #. Configure2 dialog help 1/2 -#: src/include/drbd/helps.rb:179 +#: src/include/drbd/helps.rb:197 msgid "" "<p><b><big>Configuration Part Two</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -435,25 +469,56 @@ "请按<b>下一步</b>继续。\n" " <br></p>\n" +#. Default is always true (auto) +#: src/include/drbd/lvm_conf.rb:36 +#, fuzzy +#| msgid "Configuration of DRBD" +msgid "LVM Filter Configuration of DRBD" +msgstr "分布式复制块设备 (DRBD) 配置" + +#: src/include/drbd/lvm_conf.rb:44 +msgid "Modify LVM Device filter Automatically" +msgstr "" + +#: src/include/drbd/lvm_conf.rb:54 +#, fuzzy +#| msgid "Device type" +msgid "Device Filter" +msgstr "设备类型" + +#: src/include/drbd/lvm_conf.rb:64 +#, fuzzy +#| msgid "Writing the SCPM database..." +msgid "Writing the LVM cache" +msgstr "正在写入 SCPM 数据库..." + +#: src/include/drbd/lvm_conf.rb:73 +#, fuzzy +#| msgid "Enable Microphone." +msgid "Enable LVM Cache" +msgstr "启用麦克风。" + #. encoding: utf-8 #: src/include/drbd/resource_conf.rb:134 msgid "Resource Name" msgstr "资源名称" -#: src/include/drbd/resource_conf.rb:300 +#. Update new add disk used of drbd res for LVM filter +#. Ignore the removed disk +#: src/include/drbd/resource_conf.rb:326 msgid "Protocol" msgstr "协议" #. myHelp("basic_conf"); -#: src/include/drbd/resource_conf.rb:546 +#: src/include/drbd/resource_conf.rb:572 msgid "Node names must be different." msgstr "节点名称不能相同。" -#: src/include/drbd/resource_conf.rb:552 +#: src/include/drbd/resource_conf.rb:578 msgid "Node names must not include \".\" , using the local hostname." msgstr "节点名称必须不包含 \".\"，使用本机主机名。" -#: src/include/drbd/resource_conf.rb:582 +#: src/include/drbd/resource_conf.rb:608 msgid "Please fill out all fields." msgstr "请填写全部字段。" @@ -462,70 +527,73 @@ #. Authors: Martin Lazar #. #. $Id: startup_conf.ycp 30707 2006-05-04 13:19:08Z lslezak $ -#: src/include/drbd/startup_conf.rb:28 +#: src/include/drbd/startup_conf.rb:29 msgid "Booting" msgstr "引导时" -#: src/include/drbd/startup_conf.rb:36 -msgid "On -- Start DRBD Server Now and when Booting" +#: src/include/drbd/startup_conf.rb:37 +#, fuzzy +#| msgid "On -- Start DRBD Server Now and when Booting" +msgid "On -- Start DRBD Server when Booting" msgstr "开 -- 立即以及在系统引导时启动分布式复制块设备 (DRBD) 服务器" -#: src/include/drbd/startup_conf.rb:40 +#: src/include/drbd/startup_conf.rb:41 msgid "Off -- Server Only Starts Manually" msgstr "关 － 仅手动启动服务器" -#: src/include/drbd/startup_conf.rb:49 +#: src/include/drbd/startup_conf.rb:50 msgid "Switch On and Off" msgstr "打开和关闭" -#: src/include/drbd/startup_conf.rb:54 +#: src/include/drbd/startup_conf.rb:55 msgid "Current Status: " msgstr "当前状态：" -#: src/include/drbd/startup_conf.rb:61 +#: src/include/drbd/startup_conf.rb:62 msgid "Start DRBD Server Now" msgstr "立即启动分布式复制块设备 (DRBD) 服务器" -#: src/include/drbd/startup_conf.rb:66 +#: src/include/drbd/startup_conf.rb:67 msgid "Stop DRBD Server Now" msgstr "立即停止分布式复制块设备 (DRBD) 服务器" -#: src/include/drbd/startup_conf.rb:74 +#. firewall_layout is just a dialog +#: src/include/drbd/startup_conf.rb:89 msgid "Propagate Configuration" msgstr "传布配置" -#: src/include/drbd/startup_conf.rb:81 +#: src/include/drbd/startup_conf.rb:96 msgid "" "To propagate this configuration ,\n" "copy the configuration file '/etc/drbd.conf' to the rest of nodes manually." msgstr "要传播此配置，请手动复制配置文件 '/etc/drbd.conf' 到剩余节点。" #. } -#: src/include/drbd/startup_conf.rb:122 +#: src/include/drbd/startup_conf.rb:141 msgid "DRBD server is running." msgstr "分布式复制块设备 (DRBD) 服务器运行中。" -#: src/include/drbd/startup_conf.rb:123 +#: src/include/drbd/startup_conf.rb:142 msgid "DRBD server is not running." msgstr "分布式复制块设备 (DRBD) 服务器未运行。" #. Report::Error ( Service::Error()); -#: src/include/drbd/startup_conf.rb:142 +#: src/include/drbd/startup_conf.rb:166 msgid "Start DRBD service failed" msgstr "启动分布式复制块设备 (DRBD) 服务失败" #. Report::Error ( Service::Error() ); -#: src/include/drbd/startup_conf.rb:150 +#: src/include/drbd/startup_conf.rb:174 msgid "Stop DRBD service failed" msgstr "停止分布式复制块设备 (DRBD) 服务失败" #. Initialization dialog caption -#: src/include/drbd/wizards.rb:137 +#: src/include/drbd/wizards.rb:139 msgid "Heartbeat Configuration" msgstr "心跳配置" #. Initialization dialog contents -#: src/include/drbd/wizards.rb:139 +#: src/include/drbd/wizards.rb:141 msgid "Initializing..." msgstr "正在初始化..." @@ -557,58 +625,76 @@ #. #. Representation of the configuration of drbd. #. Input and output routines. -#: src/modules/Drbd.rb:101 +#: src/modules/Drbd.rb:110 msgid "Failed to merge separated DRBD conf files\n" msgstr "合并独立的 DRBD 配置文件失败\n" -#: src/modules/Drbd.rb:123 +#: src/modules/Drbd.rb:132 msgid "Failed to write drbd.conf.YaST2prepare" msgstr "写入 drbd.conf.YaST2prepare 失败" #. DRBD read dialog caption -#: src/modules/Drbd.rb:133 +#: src/modules/Drbd.rb:185 msgid "Initializing DRBD Configuration" msgstr "正在初始化分布式复制块设备 (DRBD) 配置" #. We do not set help text here, because it was set outside -#: src/modules/Drbd.rb:141 +#: src/modules/Drbd.rb:193 msgid "Read global settings" msgstr "读取全局设置" -#: src/modules/Drbd.rb:142 +#: src/modules/Drbd.rb:194 msgid "Read resources" msgstr "读取资源" -#: src/modules/Drbd.rb:143 +#: src/modules/Drbd.rb:195 +#, fuzzy +#| msgid "LVM configuration" +msgid "Read LVM configurations" +msgstr "LVM 配置" + +#: src/modules/Drbd.rb:196 msgid "Read daemon status" msgstr "读取守护程序状态" -#: src/modules/Drbd.rb:146 +#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204 +#, fuzzy +#| msgid "Read Firewall Settings." +msgid "Read SuSEFirewall Settings" +msgstr "读取防火墙设置。" + +#: src/modules/Drbd.rb:200 msgid "Reading global settings..." msgstr "正在读取全局设置..." -#: src/modules/Drbd.rb:147 +#: src/modules/Drbd.rb:201 msgid "Reading resources..." msgstr "正在读取资源..." -#: src/modules/Drbd.rb:148 +#: src/modules/Drbd.rb:202 +#, fuzzy +#| msgid "Reading the configuration..." +msgid "Reading LVM configurations..." +msgstr "正在读取配置..." + +#: src/modules/Drbd.rb:203 msgid "Reading daemon status..." msgstr "正在读取守护程序状态..." -#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:494 +#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629 msgid "Finished" msgstr "已完成" #. new_map = remove(new_map, key); -#: src/modules/Drbd.rb:412 +#: src/modules/Drbd.rb:497 msgid "Failed to backup drbd.conf" msgstr "备份 drbd.conf 失败" -#: src/modules/Drbd.rb:421 +#: src/modules/Drbd.rb:506 msgid "Failed to clean drbd.conf for drbdadm test" msgstr "清理 drbd.conf 以进行 drbdadm 测试失败" -#: src/modules/Drbd.rb:445 +#: src/modules/Drbd.rb:530 msgid "" "Invalid configuration of resource %1\n" "%2" @@ -616,12 +702,12 @@ "无效的资源配置 %1\n" "%2" -#: src/modules/Drbd.rb:464 +#: src/modules/Drbd.rb:549 msgid "Failed to bring drbd.conf back" msgstr "恢复 drbd.conf 失败" #. DRBD write dialog caption -#: src/modules/Drbd.rb:474 +#: src/modules/Drbd.rb:605 msgid "Writing DRBD Configuration" msgstr "正在写入分布式复制块设备 (DRBD) 配置" @@ -629,31 +715,55 @@ #. 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:486 +#: src/modules/Drbd.rb:617 msgid "Write global settings" msgstr "写入全局设置" -#: src/modules/Drbd.rb:487 +#: src/modules/Drbd.rb:618 msgid "Write resources" msgstr "写入资源" -#: src/modules/Drbd.rb:488 +#: src/modules/Drbd.rb:619 +#, fuzzy +#| msgid "Write configuration" +msgid "Write LVM configurations" +msgstr "写入配置" + +#: src/modules/Drbd.rb:620 msgid "Set daemon status" msgstr "设置守护程序状态" -#: src/modules/Drbd.rb:491 +#: src/modules/Drbd.rb:621 +#, fuzzy +#| msgid "Write the firewall settings" +msgid "Write the SuSEfirewall settings" +msgstr "写入防火墙设置" + +#: src/modules/Drbd.rb:624 msgid "Writing global settings..." msgstr "正在写入全局设置..." -#: src/modules/Drbd.rb:492 +#: src/modules/Drbd.rb:625 msgid "Writing resources..." msgstr "正在写入资源..." -#: src/modules/Drbd.rb:493 +#: src/modules/Drbd.rb:626 +#, fuzzy +#| msgid "Writing configuration..." +msgid "Writing LVM configurations..." +msgstr "正在写入配置..." + +#: src/modules/Drbd.rb:627 msgid "Setting daemon status..." msgstr "正在设置守护程序状态..." -#: src/modules/Drbd.rb:504 +#: src/modules/Drbd.rb:628 +#, fuzzy +#| msgid "Writing the firewall settings..." +msgid "Writing the SuSEFirewall settings" +msgstr "正在写入防火墙设置..." + +#: src/modules/Drbd.rb:639 msgid "Failed to make directory /etc/drbd.d" msgstr "创建文件夹 /etc/drbd.d 失败" Modified: trunk/yast/zh_CN/po/fcoe-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/fcoe-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/fcoe-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-11 13:33+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/firewall-services.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/firewall-services.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/firewall-services.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:54+0200\n" +"POT-Creation-Date: 2015-08-25 18:38+0200\n" "PO-Revision-Date: 2013-02-02 02:16+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/firewall.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/firewall.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/firewall.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-10-14 15:52+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: American English \n" Modified: trunk/yast/zh_CN/po/firstboot.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/firstboot.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/firstboot.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-03 00:40+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -121,13 +121,13 @@ msgstr "标签" #: src/clients/firstboot_config.rb:68 +msgid "Module Name" +msgstr "模块名" + +#: src/clients/firstboot_config.rb:68 msgid "Status" msgstr "状态" -#: src/clients/firstboot_config.rb:68 -msgid "Module Name" -msgstr "模块名" - #. translators: dialog text #: src/clients/firstboot_desktop.rb:90 msgid "" @@ -226,7 +226,7 @@ "的后退按钮。</p>\n" #. popup text -#: src/clients/firstboot_language.rb:124 +#: src/clients/firstboot_language.rb:123 msgid "" "Your language setting has been changed.\n" "\n" @@ -242,22 +242,22 @@ #. Build dialog #. ---------------------------------------------------------------------- #. heading text -#: src/clients/firstboot_language_keyboard.rb:73 +#: src/clients/firstboot_language_keyboard.rb:72 msgid "Language and Keyboard Layout" msgstr "语言和键盘布局" #. combo box label -#: src/clients/firstboot_language_keyboard.rb:79 +#: src/clients/firstboot_language_keyboard.rb:78 msgid "&Language" msgstr "语言(&L)" #. combo box label -#: src/clients/firstboot_language_keyboard.rb:87 +#: src/clients/firstboot_language_keyboard.rb:86 msgid "&Keyboard Layout" msgstr "键盘布局(&K)" #. help text for firstboot language + keyboard screen -#: src/clients/firstboot_language_keyboard.rb:114 +#: src/clients/firstboot_language_keyboard.rb:113 msgid "" "<p>\n" "Choose the <b>Language</b> and the <b>Keyboard Layout</b> to be used during\n" @@ -270,7 +270,7 @@ "</p>\n" #. help text, continued -#: src/clients/firstboot_language_keyboard.rb:121 +#: src/clients/firstboot_language_keyboard.rb:120 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -281,7 +281,7 @@ "</p>\n" #. help text, continued -#: src/clients/firstboot_language_keyboard.rb:127 +#: src/clients/firstboot_language_keyboard.rb:126 msgid "" "<p>\n" "Select <b>Abort</b> to abort the\n" @@ -293,7 +293,7 @@ "</p>\n" #. error message -#: src/clients/firstboot_language_keyboard.rb:272 +#: src/clients/firstboot_language_keyboard.rb:271 msgid "There is not enough space to install all additional packages." msgstr "磁盘空间不足以安装全部的附加软件包。" Added: trunk/yast/zh_CN/po/fonts.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/fonts.zh_CN.po (rev 0) +++ trunk/yast/zh_CN/po/fonts.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -0,0 +1,684 @@ +# 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: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2004-04-02 10:52+0200\n" +"Last-Translator: 裴寒牧 \n" +"Language-Team: 中华 \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" + +#. in case of changing profiles, please reflect +#. edits in test/data/sysconfig.fonts-config.* +#. otherwise testsuite will fail +#: src/lib/fonts/fonts-config-state.rb:58 +#, fuzzy +#| msgid "Bitmap Editors" +msgid "Bitmap Fonts" +msgstr "位图编辑器" + +#: src/lib/fonts/fonts-config-state.rb:103 +msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:106 +msgid "Black and White Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:123 +msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:126 +msgid "Black and White Rendering for Monospaced Fonts" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:143 +msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:146 +msgid "Default" +msgstr "默认值" + +#: src/lib/fonts/fonts-config-state.rb:163 +msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:166 +#, fuzzy +#| msgid "Fonts" +msgid "CFF Fonts" +msgstr "字体" + +#: src/lib/fonts/fonts-config-state.rb:206 +msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:209 +msgid "Exclusive Autohinter Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:226 +msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used." +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818 +msgid "Subpixel Rendering" +msgstr "" + +#: src/lib/fonts/fonts-config-state.rb:254 +msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library." +msgstr "" + +#. for testsuite +#: src/lib/fonts/fonts-dialog.rb:181 +#, fuzzy +#| msgid "Not installed" +msgid "installed" +msgstr "未安装" + +#: src/lib/fonts/fonts-dialog.rb:181 +#, fuzzy +#| msgid "Not installed" +msgid "not installed" +msgstr "未安装" + +#: src/lib/fonts/fonts-dialog.rb:190 +#, fuzzy +#| msgid "Preferences" +msgid "Preference List for %s" +msgstr "参考设置" + +#. nothing to do here, initialize_familylist_widget will +#. toggle off/on btn_add_manual as appropriate +#: src/lib/fonts/fonts-dialog.rb:324 +#, fuzzy +#| msgid "<p><b>Warning:</b></p>" +msgid "<p><b>Family:</b> %s</b></p>" +msgstr "<p><b>警告:</b></p>" + +#: src/lib/fonts/fonts-dialog.rb:325 +#, fuzzy +#| msgid "<p><b> Description for %1 </b></p>" +msgid "<p><b>Specimen for %s</b></p>" +msgstr "<p><b> %1 的描述 </b></p>" + +#: src/lib/fonts/fonts-dialog.rb:328 +#, fuzzy +#| msgid "No UID is available for this type of user." +msgid "<p>No specimen available for this font and script.</p>" +msgstr "此类型的用户没有可用的 UID。" + +#. unlikely +#: src/lib/fonts/fonts-dialog.rb:333 +#, fuzzy +#| msgid "<p><b> Description for %1 </b></p>" +msgid "<b>No script found for %s.</b>" +msgstr "<p><b> %1 的描述 </b></p>" + +#: src/lib/fonts/fonts-dialog.rb:341 +#, fuzzy +#| msgid "<p><b>Issued By:</b></p>" +msgid "<p><b>Family:</b> %s</p>" +msgstr "<p><b>发出方：</b></p>" + +#: src/lib/fonts/fonts-dialog.rb:342 +#, fuzzy +#| msgid "<p><b>Description</b></p>" +msgid "<p><b>Scripts</b><ul>" +msgstr "<p><b>描述</b></p>" + +#. nothing to do nowadays +#: src/lib/fonts/fonts-dialog.rb:496 +msgid "" +"Family preference list for %s\n" +"do not contain any installed family.\n" +"\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:499 +msgid "" +"Please make sure to install at least one for each\n" +"alias, otherwise this preference setting has no effect.\n" +"\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:502 +msgid "" +"Fonts can be installed e. g. via fontinfo.opensuse.org. \n" +"If you install them when this yast module is running,\n" +"reread the profile to see results.\n" +msgstr "" + +#. <table> do not work for text mode +#: src/lib/fonts/fonts-dialog.rb:542 +#, fuzzy +#| msgid "You have to select a configuration type" +msgid "You have set LCD filter type (%s)." +msgstr "您必须选择一种配置类型" + +#: src/lib/fonts/fonts-dialog.rb:543 +msgid "" +" This needs subpixel rendering capabality\n" +"compiled in FreeType library." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:545 +msgid " Unfortunately, we can not ship it due patent reasons.\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:547 +msgid "See README.subpixel-patents from yast2-fonts package documentation.\n" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:560 +msgid "Match for %s" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:577 src/lib/fonts/fonts-dialog.rb:766 +#, fuzzy +#| msgid "Initializing" +msgid "Font &Antialiasing" +msgstr "初始化" + +#: src/lib/fonts/fonts-dialog.rb:588 +msgid "Antialias Also &Monospaced Fonts" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:599 src/lib/fonts/fonts-dialog.rb:769 +#, fuzzy +#| msgid "For&ce ASCII printing" +msgid "Force A&utohinting On" +msgstr "强迫 ASCII 打印 (&c)" + +#: src/lib/fonts/fonts-dialog.rb:613 src/lib/fonts/fonts-dialog.rb:772 +msgid "Force Hint St&yle" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:623 +msgid "Embedded Bitmaps" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:626 +msgid "Use &Embedded Bitmaps" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:632 +#, fuzzy +#| msgid "Add Lan&guage" +msgid "All Lan&guages" +msgstr "添加语言(&G)" + +#: src/lib/fonts/fonts-dialog.rb:637 +#, fuzzy +#| msgid "Bamileke Languages" +msgid "Limit to &Selected Languages" +msgstr "巴米累克语" + +#: src/lib/fonts/fonts-dialog.rb:644 +msgid "&Select" +msgstr "选择(&S)" + +#: src/lib/fonts/fonts-dialog.rb:666 src/lib/fonts/fonts-dialog.rb:777 +#, fuzzy +#| msgid "&Filter" +msgid "LCD &Filter" +msgstr "过滤器(&F)" + +#: src/lib/fonts/fonts-dialog.rb:677 +#, fuzzy +#| msgid "&Keyboard Layout" +msgid "&Layout" +msgstr "键盘布局(&K)" + +#: src/lib/fonts/fonts-dialog.rb:688 +msgid "Alias" +msgstr "别名" + +#: src/lib/fonts/fonts-dialog.rb:707 +#, fuzzy +#| msgid "Net Family" +msgid "Font Family" +msgstr "网络家族" + +#: src/lib/fonts/fonts-dialog.rb:707 +msgid "Available" +msgstr "可用" + +#: src/lib/fonts/fonts-dialog.rb:708 +msgid "Remove" +msgstr "删除" + +#: src/lib/fonts/fonts-dialog.rb:710 +msgid "Down" +msgstr "向下" + +#: src/lib/fonts/fonts-dialog.rb:711 +msgid "Up" +msgstr "向上" + +#: src/lib/fonts/fonts-dialog.rb:717 src/lib/fonts/fpl-add-dialog.rb:66 +msgid "&Add" +msgstr "添加(&A)" + +#: src/lib/fonts/fonts-dialog.rb:719 +#, fuzzy +#| msgid "Installed Patches" +msgid "&Installed families..." +msgstr "已安装的补丁" + +#: src/lib/fonts/fonts-dialog.rb:735 +#, fuzzy +#| msgid "Search &description" +msgid "Search &Metric Compatible" +msgstr "搜索描述(&D)" + +#: src/lib/fonts/fonts-dialog.rb:746 +msgid "Never use o&ther fonts" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:775 +msgid "Subpixel &Rendering" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:799 +#, fuzzy +#| msgid "&Connection Details" +msgid "&Rendering Details" +msgstr "连接细节(&C)" + +#: src/lib/fonts/fonts-dialog.rb:803 +#, fuzzy +#| msgid "Initializing" +msgid "Antialiasing" +msgstr "初始化" + +#: src/lib/fonts/fonts-dialog.rb:810 +#, fuzzy +#| msgid "Printing" +msgid "Hinting" +msgstr "打印" + +#: src/lib/fonts/fonts-dialog.rb:837 +#, fuzzy +#| msgid "Preferences" +msgid "Prefered &Families" +msgstr "参考设置" + +#: src/lib/fonts/fonts-dialog.rb:844 +#, fuzzy +#| msgid "Storing user preferences..." +msgid "Forcing Family Preferences" +msgstr "正在保存用户首选项..." + +#: src/lib/fonts/fonts-dialog.rb:860 +#, fuzzy +#| msgid "Patch Level" +msgid "Match &Preview" +msgstr "补丁级别" + +#: src/lib/fonts/fonts-dialog.rb:879 +#, fuzzy +#| msgid "Preserve" +msgid "&Presets" +msgstr "保留" + +#. create copy of system settings; remove fonts-config generated +#. config files to have such fontconfig setup as fonts-config +#. would never run; point fontconfig to this configuration +#: src/lib/fonts/fonts-dialog.rb:933 +#, fuzzy +#| msgid "Reading the Configuration" +msgid "Reading Font Configuration" +msgstr "正在读取配置" + +#: src/lib/fonts/fonts-dialog.rb:936 +#, fuzzy +#| msgid "Read sysconfig values" +msgid "Read sysconfig file" +msgstr "读取系统配置值" + +#: src/lib/fonts/fonts-dialog.rb:937 +#, fuzzy +#| msgid "Reading routes..." +msgid "Reading %s..." +msgstr "正在读取路由..." + +#: src/lib/fonts/fonts-dialog.rb:957 +#, fuzzy +#| msgid "Host Configuration" +msgid "Font Configuration" +msgstr "主机配置" + +#: src/lib/fonts/fonts-dialog.rb:958 +#, fuzzy +#| msgid "&User Code" +msgid " (User Mode)" +msgstr "用户代码(&U)" + +#. misuse back_button a bit +#: src/lib/fonts/fonts-dialog.rb:963 +#, fuzzy +#| msgid "Save system settings" +msgid "&Use system settings" +msgstr "保存系统设置" + +#: src/lib/fonts/fonts-dialog.rb:975 +#, fuzzy +#| msgid "Writing NFS Configuration" +msgid "Writing Font Configuration" +msgstr "正在写入 NFS 配置" + +#: src/lib/fonts/fonts-dialog.rb:978 +#, fuzzy +#| msgid "Write the sysconfig settings" +msgid "Write sysconfig file" +msgstr "写入 sysconfig 设置" + +#: src/lib/fonts/fonts-dialog.rb:979 +#, fuzzy +#| msgid "Run SuSEconfig" +msgid "Run fonts-config" +msgstr "运行 SuSEconfig" + +#: src/lib/fonts/fonts-dialog.rb:980 +#, fuzzy +#| msgid "Writing users..." +msgid "Writing %s..." +msgstr "正在写入用户..." + +#: src/lib/fonts/fonts-dialog.rb:981 +#, fuzzy +#| msgid "Running SuSEconfig..." +msgid "Running fonts-config..." +msgstr "正在运行SuSEconfig..." + +#. we are in user mode +#: src/lib/fonts/fonts-dialog.rb:999 +msgid "This will irrecoverably remove user setting done previously with this module." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1026 +#, fuzzy +#| msgid "Configuration &Module" +msgid "<h1>Font Configuraution Module</h1>" +msgstr "配置模块(&M)" + +#: src/lib/fonts/fonts-dialog.rb:1027 +msgid "<p>Module to control <b>system wide</b> or <b>user</b> font rendering setting.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1028 +msgid "<i>Distribution default</i> is font setting shipped on media and it is that one almost same for years (not counting decisions of individual DE). " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1030 +msgid "This setting can be changed:<ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1031 +msgid "<li>system wide when module is run with <tt>root</tt> credentials to create <i>system setting.</i> " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1033 +msgid "System, where font module never run or <b>Default</b> preset was chosen, uses distribution default.</li>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1035 +msgid "<li>for <i>user setting</i> when module is run as ordindary user. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1036 +msgid "User, which never run this module or chooses to <b>Use system settings</b>, uses system settings. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1037 +msgid "User, which chooses <b>Default</b> preset, uses distribution default.</li></ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1038 +msgid "<p><b>NOTE:</b> " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1039 +msgid "In general, it is not recommended to combine font module user mode with other font setting. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1040 +msgid "Nevertheless, setting in <tt>~/.config/fontconfig/fonts.conf</tt> should always have precendence before arbitrary font module setting.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1042 +msgid "<p>Help for <i>Presets</i> button and for the current tab follows.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1043 +msgid "<p><b>Presets</b> button serves a possibility to choose predefined profiles: <ul>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1045 +msgid "<li><b>%{name}: </b>%{help}</li>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1050 +msgid "Every single menu item there just fills appropriate setting in all tabs. That setting can be later arbitrarily customized in depth by respective individual fields of corresponding tabs.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1056 +msgid "<h2>Match Preview Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1057 +msgid "<p>In this paragraph, <i>current setting</i> means setting of the system plus changes made in currently running fonts module.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1059 +msgid "<p>Matches to system generic aliases can be seen in this initial tab. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1060 +msgid "In other words, for every alias (%s) you can see family name, which resolves to given alias according to <i>current setting.</i></p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1063 +msgid "<p>In adition to that, graphical mode allows to display font specimen of the matched font rendered (again) taking <i>current setting</i> into account. " +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1066 +msgid "In the corresponding combo box, script coverage of matched font can be seen and specimen string for given script can be chosen.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1068 +msgid "<p>At the bottom, there are crucial rendering options duplicated from Rendered Details Tab, which can be used to see changes in the rendering on the fly.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1074 +msgid "

Rendering Details Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1075 +msgid "<p>This tab controls <b>how</b> fonts are rendered. It allows you to amend font rendering algorithms to be used and change their options.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1078 +#, fuzzy +#| msgid "<h3>Login Settings</h3>" +msgid "<h3>Antialiasing</h3>" +msgstr "<h3>登录设置</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1079 +msgid "<p>By default, all outline fonts are smoothed by method called <i>antialiasing.</i>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1081 +msgid " Black and white rendering can be forced for all fonts or for monospaced only.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1083 src/lib/fonts/fonts-dialog.rb:1097 +#: src/lib/fonts/fonts-dialog.rb:1118 +msgid "<p>See: %s<p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1087 +#, fuzzy +#| msgid "<h3>Login Settings</h3>" +msgid "<h3>Hinting</h3>" +msgstr "<h3>登录设置</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1088 +msgid "<p>Hinting instructions helps rasterizer to fit glyphs stems to the grid.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1090 +msgid "<p>In the default setting, FreeType's autohinter can be used depending on font type and quality of own instructions. Use of autohinter can be forced by <b>Force Autohinting On</b> option.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1094 +msgid "<p>For each hinting algorithm, hint style (hinting level) is chosen." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1095 +msgid " It is possible to set hint style globally by <b>Force Hint Style</b> option.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1101 +msgid "<h3>Embedded Bitmaps</h3>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1102 +msgid "<p>Some outline fonts contain so called bitmap strikes, i. e. bitmap version of given font for certain sizes. In this section it can be turned off entirely, on only for fonts which cover specified languages, or on for every font." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1109 +#, fuzzy +#| msgid "<h3>Login Settings</h3>" +msgid "<h3>Subpixel Rendering</h3>" +msgstr "<h3>登录设置</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1110 +msgid "<p>Subpixel rendering multiples resolution in one direction by using colour primaries (subpixels) of an LCD display.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1112 +msgid "<p>Choose LCD filter, which should be used, and subpixel layout corresponding to display and its rotation.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1114 +msgid "<p>Note, that due to patent reasons, FreeType has subpixel rendering turned off by default." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1116 +msgid " Without FreeType's subpixel rendering support compiled in, setting in this section has no effect.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1122 +msgid "<h2>Prefered Families Tab</h2>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1123 +msgid "<p>This tab controls <b>which</b> fonts are rendered.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1124 +#, fuzzy +#| msgid "<h3>Users</h3>" +msgid "<h3>Preference Lists</h3>" +msgstr "<h3>用户</h3>" + +#: src/lib/fonts/fonts-dialog.rb:1125 +msgid "<p>Here, Family Preference Lists (FPL) for generic aliases (%s) can be defined." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1127 +msgid " These are sorted lists of family names, with most prefered family first." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1129 +msgid " There is default (system-wide) FPL yet defined for each generic alias." +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1130 +msgid " FPLs defined in this dialog will be prepended to them.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1131 +msgid "<p>System will look for the first <b>installed</b> family in the list, other query elements taking into account of course. Available font packages for SUSE distributions can be browsed and installed from <b>fontinfo.opensuse.org.</b></p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1138 +msgid "<h3>Forcing Family Preferences</h3>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1139 +msgid "<p>In some circumstances, FPLs defined in this dialog are not taken into account. Following two options strenghten their role.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1142 +msgid "<h4>Search Metric Compatible</h4>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1143 +msgid "<p>Two fonts are metric compatible, when all corresponding letters are of the same size. That implies, document displayed using these fonts has the same same size too, same line wraps etc.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1146 +msgid "<p>Via default setting, system substitutes metric compatible fonts preferably, and FPLs defined in this dialog can be circumvented by this rule.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1148 +msgid "<p>Where metric compatibility does not matter, this option can be unchecked.</p>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1149 +msgid "<h4>Never use other fonts</h4>" +msgstr "" + +#: src/lib/fonts/fonts-dialog.rb:1150 +msgid "<p>When checked, this option introduces very strong position for here defined preference lists. It pushes families from there before document or GUI requests, if they cover required charset.</p>" +msgstr "" + +#. delete families, that are part of list for some alias +#: src/lib/fonts/fpl-add-dialog.rb:57 +msgid "&Filter" +msgstr "过滤器(&F)" + +#: src/lib/fonts/fpl-add-dialog.rb:61 +#, fuzzy +#| msgid "Installed Patches" +msgid "Installed Families" +msgstr "已安装的补丁" + +#: src/lib/fonts/fpl-add-dialog.rb:62 +#, fuzzy +#| msgid "Export Format" +msgid "Font Format" +msgstr "导出格式" + +#: src/lib/fonts/fpl-add-dialog.rb:63 +#, fuzzy +#| msgid "Script Name" +msgid "Script Coverages" +msgstr "脚本名称" + +#: src/lib/fonts/fpl-add-dialog.rb:65 src/lib/fonts/select-ebl-dialog.rb:242 +msgid "&Cancel" +msgstr "取消(&C)" + +#: src/lib/fonts/rich-text-dialog.rb:24 src/lib/fonts/select-ebl-dialog.rb:243 +msgid "&Ok" +msgstr "确定(&O)" + +#. save unknown langs +#: src/lib/fonts/select-ebl-dialog.rb:240 +msgid "&Languages" +msgstr "语言(&L)" Modified: trunk/yast/zh_CN/po/ftp-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ftp-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ftp-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2012-07-13 17:45+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified \n" @@ -1984,21 +1984,21 @@ msgstr "无法为匿名连接创建上传目录。" #. anonymous dir -#: src/modules/FtpServer.rb:1074 +#: src/modules/FtpServer.rb:1079 msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>" msgstr "<p><ul><i>FTP 守护精灵未配置。</i></ul></p>" #. Translators: Summary head, if nothing configured -#: src/modules/FtpServer.rb:1084 +#: src/modules/FtpServer.rb:1089 msgid "FTP daemon" msgstr "FTP 守护精灵" #. Translators: Summary head, if something configured -#: src/modules/FtpServer.rb:1089 +#: src/modules/FtpServer.rb:1094 msgid "FTP daemon %1" msgstr "FTP 守护精灵 %1" -#: src/modules/FtpServer.rb:1093 +#: src/modules/FtpServer.rb:1098 msgid "These options will be configured" msgstr "这些选项将被配置" Modified: trunk/yast/zh_CN/po/geo-cluster.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:36+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -61,10 +61,10 @@ #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ #. Initialization dialog caption #: src/include/geo-cluster/complex.rb:83 -#: src/include/geo-cluster/dialogs.rb:416 -#: src/include/geo-cluster/dialogs.rb:689 +#: src/include/geo-cluster/dialogs.rb:465 +#: src/include/geo-cluster/dialogs.rb:814 #: src/include/geo-cluster/wizards.rb:46 -#: src/include/geo-cluster/wizards.rb:140 +#: src/include/geo-cluster/wizards.rb:141 msgid "Geo Cluster Configuration" msgstr "地理集群配置" @@ -115,17 +115,17 @@ msgstr "仲裁主机" #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85 -#: src/include/geo-cluster/dialogs.rb:679 +#: src/include/geo-cluster/dialogs.rb:804 msgid "Add" msgstr "添加" #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86 -#: src/include/geo-cluster/dialogs.rb:680 +#: src/include/geo-cluster/dialogs.rb:805 msgid "Edit" msgstr "编辑" #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87 -#: src/include/geo-cluster/dialogs.rb:681 +#: src/include/geo-cluster/dialogs.rb:806 msgid "Delete" msgstr "删除" @@ -133,237 +133,310 @@ msgid "site" msgstr "站点" -#: src/include/geo-cluster/dialogs.rb:94 -#: src/include/geo-cluster/dialogs.rb:186 +#: src/include/geo-cluster/dialogs.rb:93 +#: src/include/geo-cluster/dialogs.rb:235 msgid "ticket" msgstr "票据" -#. return `cacel or a string #: src/include/geo-cluster/dialogs.rb:106 -#: src/include/geo-cluster/dialogs.rb:128 -#: src/include/geo-cluster/dialogs.rb:205 +#, fuzzy +#| msgid "Authentication" +msgid "Authentification" +msgstr "身份验证" + +#: src/include/geo-cluster/dialogs.rb:108 +#: src/include/geo-cluster/dialogs.rb:156 +#, fuzzy +#| msgid "Cancel" +msgid "Ca&ncel" +msgstr "取消" + +#. return `cancel or a string +#: src/include/geo-cluster/dialogs.rb:109 +#: src/include/geo-cluster/dialogs.rb:157 +#: src/include/geo-cluster/dialogs.rb:177 +#: src/include/geo-cluster/dialogs.rb:254 msgid "OK" msgstr "好" -#: src/include/geo-cluster/dialogs.rb:107 -#: src/include/geo-cluster/dialogs.rb:129 -#: src/include/geo-cluster/dialogs.rb:206 +#: src/include/geo-cluster/dialogs.rb:122 +#, fuzzy +#| msgid "Enable &GSS Security" +msgid "Enable Security Auth" +msgstr "启用 GSS 安全(&G)" + +#: src/include/geo-cluster/dialogs.rb:128 +#, fuzzy +#| msgid "Authentication Key" +msgid "Authentification file" +msgstr "身份验证密钥" + +#: src/include/geo-cluster/dialogs.rb:132 +msgid "A relative path will be saved in /etc/booth, or using absolute path directly." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:137 +msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:142 +msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:146 +#, fuzzy +#| msgid "Authentication Key" +msgid "Generate Authentification Key File" +msgstr "身份验证密钥" + +#: src/include/geo-cluster/dialogs.rb:154 +#, fuzzy +#| msgid "&Basics" +msgid "Basic" +msgstr "基础(&B)" + +#: src/include/geo-cluster/dialogs.rb:178 +#: src/include/geo-cluster/dialogs.rb:255 msgid "Cancel" msgstr "取消" -#: src/include/geo-cluster/dialogs.rb:143 +#: src/include/geo-cluster/dialogs.rb:192 msgid "Please enter a valid ip address" msgstr "请输入一个有效的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:184 +#: src/include/geo-cluster/dialogs.rb:233 msgid "Enter ticket and timeout" msgstr "请输入票据和超时" -#: src/include/geo-cluster/dialogs.rb:190 +#: src/include/geo-cluster/dialogs.rb:239 msgid "timeout" msgstr "超时" -#: src/include/geo-cluster/dialogs.rb:192 +#: src/include/geo-cluster/dialogs.rb:241 msgid "retries" msgstr "重试次数" -#: src/include/geo-cluster/dialogs.rb:194 +#: src/include/geo-cluster/dialogs.rb:243 msgid "weights" msgstr "权重" -#: src/include/geo-cluster/dialogs.rb:196 +#: src/include/geo-cluster/dialogs.rb:245 msgid "expire" msgstr "过期时间" -#: src/include/geo-cluster/dialogs.rb:198 +#: src/include/geo-cluster/dialogs.rb:247 msgid "acquire-after" msgstr "acquire-after" -#: src/include/geo-cluster/dialogs.rb:200 +#: src/include/geo-cluster/dialogs.rb:249 msgid "before-acquire-handler" msgstr "before-acquire-handler" -#: src/include/geo-cluster/dialogs.rb:237 +#: src/include/geo-cluster/dialogs.rb:286 msgid "timeout is invalid" msgstr "超时无效" -#: src/include/geo-cluster/dialogs.rb:239 +#: src/include/geo-cluster/dialogs.rb:288 msgid "expire is invalid" msgstr "过期时间无效" -#: src/include/geo-cluster/dialogs.rb:241 +#: src/include/geo-cluster/dialogs.rb:290 msgid "acquireafter is invalid" msgstr "acquireafter 无效" -#: src/include/geo-cluster/dialogs.rb:243 +#: src/include/geo-cluster/dialogs.rb:292 msgid "retries is invalid" msgstr "重试次数无效" -#: src/include/geo-cluster/dialogs.rb:245 +#: src/include/geo-cluster/dialogs.rb:294 msgid "retries values lower than 3 is illegal" msgstr "小于 3 的重试次数值是非法的" -#: src/include/geo-cluster/dialogs.rb:247 +#: src/include/geo-cluster/dialogs.rb:296 msgid "weights is invalid" msgstr "权重无效" -#: src/include/geo-cluster/dialogs.rb:249 +#: src/include/geo-cluster/dialogs.rb:298 msgid "ticket can not be empty" msgstr "票据不能为空" #. fill confs with global_files -#: src/include/geo-cluster/dialogs.rb:358 -#: src/include/geo-cluster/wizards.rb:47 +#: src/include/geo-cluster/dialogs.rb:407 +#: src/include/geo-cluster/wizards.rb:48 msgid "Firewall Configuration" msgstr "防火墙配置" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:494 +#: src/include/geo-cluster/dialogs.rb:554 msgid "Enter an IP address of your arbitrator" msgstr "请输入一个您的仲裁主机的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:505 +#: src/include/geo-cluster/dialogs.rb:565 msgid "Edit IP address of your arbitrator" msgstr "编辑您仲裁主机的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:521 +#: src/include/geo-cluster/dialogs.rb:581 msgid "Enter an IP address of your site" msgstr "请输入您站点的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:532 +#: src/include/geo-cluster/dialogs.rb:592 msgid "Edit IP address of your site" msgstr "编辑您站点的 IP 地址" -#: src/include/geo-cluster/dialogs.rb:554 +#: src/include/geo-cluster/dialogs.rb:614 msgid "Ticket name already exist!" msgstr "票据名称已存在！" -#. abort? -#: src/include/geo-cluster/dialogs.rb:600 +#. Validation check before switch to authentification +#. Still fall to :authentification or :ok +#: src/include/geo-cluster/dialogs.rb:646 msgid "Configuration name can not be empty." msgstr "配置名称不能为空。" -#: src/include/geo-cluster/dialogs.rb:603 +#: src/include/geo-cluster/dialogs.rb:649 msgid "Configuration name can not be duplicated." msgstr "无法复制配置名称。" -#: src/include/geo-cluster/dialogs.rb:610 +#. "5405d4" will show like "5405" +#: src/include/geo-cluster/dialogs.rb:657 msgid "port is invalid!" msgstr "端口无效！" -#: src/include/geo-cluster/dialogs.rb:616 +#: src/include/geo-cluster/dialogs.rb:663 msgid "transport have to be filled!" msgstr "必须填写「传输」！" -#: src/include/geo-cluster/dialogs.rb:621 +#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == "" +#: src/include/geo-cluster/dialogs.rb:669 msgid "arbitrator have to be filled!" msgstr "必须填写仲裁主机！" -#: src/include/geo-cluster/dialogs.rb:626 +#: src/include/geo-cluster/dialogs.rb:674 msgid "site have to be filled!" msgstr "必须填写「站点」！" -#: src/include/geo-cluster/dialogs.rb:631 +#: src/include/geo-cluster/dialogs.rb:679 msgid "ticket have to be filled!" msgstr "必须填写票据！" +#. Validation check before switch to basic +#. Still fall to :basic or :ok +#: src/include/geo-cluster/dialogs.rb:733 +#, fuzzy +#| msgid "Failed to create the installation RAM disk." +msgid "Failed to create authentification file " +msgstr "无法创建安装 RAM 磁盘。" + +#: src/include/geo-cluster/dialogs.rb:736 +#, fuzzy +#| msgid "Set the authentication for proxy" +msgid "Succeed to created authentification file " +msgstr "设置代理身份验证" + #. GeoCluster choose configure dialog caption -#: src/include/geo-cluster/dialogs.rb:670 +#: src/include/geo-cluster/dialogs.rb:795 msgid "GeoCluster Configuration Select" msgstr "GeoCluster 配置选择" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:676 +#: src/include/geo-cluster/dialogs.rb:801 msgid "Choose configuration file:" msgstr "请选择配置文件：" +#: src/include/geo-cluster/wizards.rb:47 +#, fuzzy +#| msgid "Autoinstallation - Configuration" +msgid "Authentification Configuration" +msgstr "自动安装－配置" + #. Initialization dialog contents -#: src/include/geo-cluster/wizards.rb:142 +#: src/include/geo-cluster/wizards.rb:143 msgid "Initializing..." msgstr "正在初始化..." -#. Not necessary to use remove_list_quote? -#: src/modules/GeoCluster.rb:224 +#. SCR won't write authfile when empty("") +#. Convert relative path to absolute path +#: src/modules/GeoCluster.rb:235 msgid "Cannot write global conf settings." msgstr "无法写入全局配置设置。" #. List like site -#: src/modules/GeoCluster.rb:242 +#: src/modules/GeoCluster.rb:253 msgid "Cannot write global settings." msgstr "无法写入全局设置。" #. Empty (all Int) ticket will be ignore by ag_booth #. Create a ticket item -#: src/modules/GeoCluster.rb:266 +#: src/modules/GeoCluster.rb:277 msgid "Cannot write global ticket settings." msgstr "无法写入全局票据设置。" #. GeoCluster read dialog caption -#: src/modules/GeoCluster.rb:273 +#: src/modules/GeoCluster.rb:284 msgid "Initializing Geo Cluster Configuration" msgstr "正在初始化地理集群配置" -#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289 -msgid "Read SuSEFirewall Settings" -msgstr "读取 SuSEFirewall 设置" - #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. TODO FIXME Names of real stages #. We do not set help text here, because it was set outside #. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# #. Progress stage 2/3 -#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster2.pm:143 +#: src/modules/GeoCluster.rb:297 src/modules/GeoCluster2.pm:143 msgid "Read the previous settings" msgstr "读取之前的设置" +#: src/modules/GeoCluster.rb:297 src/modules/GeoCluster.rb:300 +msgid "Read SuSEFirewall Settings" +msgstr "读取 SuSEFirewall 设置" + #. #-#-#-#-# geo-cluster.xgettext.pot #-#-#-#-# #. Progress step 2/3 -#: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150 +#: src/modules/GeoCluster.rb:299 src/modules/GeoCluster2.pm:150 msgid "Reading the previous settings..." msgstr "正在读取之前的设置..." #. Progress finished -#: src/modules/GeoCluster.rb:290 src/modules/GeoCluster.rb:358 +#: src/modules/GeoCluster.rb:301 src/modules/GeoCluster.rb:369 #: src/modules/GeoCluster2.pm:154 src/modules/GeoCluster2.pm:232 msgid "Finished" msgstr "已完成" #. GeoCluster write dialog caption -#: src/modules/GeoCluster.rb:332 +#: src/modules/GeoCluster.rb:343 msgid "Saving Geo Cluster Configuration" msgstr "正在保存地理集群配置" #. Progress stage 1/2 -#: src/modules/GeoCluster.rb:348 src/modules/GeoCluster2.pm:223 +#: src/modules/GeoCluster.rb:359 src/modules/GeoCluster2.pm:223 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/GeoCluster.rb:350 +#: src/modules/GeoCluster.rb:361 msgid "Write the SuSEfirewall settings" msgstr "写入 SuSEfirewall 设置" #. Progress step 1/2 -#: src/modules/GeoCluster.rb:354 src/modules/GeoCluster2.pm:228 +#: src/modules/GeoCluster.rb:365 src/modules/GeoCluster2.pm:228 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/GeoCluster.rb:356 +#: src/modules/GeoCluster.rb:367 msgid "Writing the SuSEFirewall settings" msgstr "正在写入 SuSEFirewall 设置" #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. Error message -#: src/modules/GeoCluster.rb:379 src/modules/GeoCluster2.pm:242 +#: src/modules/GeoCluster.rb:390 src/modules/GeoCluster2.pm:242 msgid "Cannot write settings." msgstr "无法写入设置。" #. TODO FIXME: your code here... #. Configuration summary text for autoyast -#: src/modules/GeoCluster.rb:440 +#: src/modules/GeoCluster.rb:451 msgid "Configuration summary..." msgstr "配置摘要..." Modified: trunk/yast/zh_CN/po/gtk.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/gtk.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/gtk.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-12-03 00:24+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/http-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/http-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/http-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: http server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2012-07-20 05:03+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified \n" @@ -150,10 +150,10 @@ #. string status = (string) select( (term) UI::QueryWidget( `id(`modules), `Item(ci) ), 2, _("Enabled") ); #. string name = (string) select( (term) UI::QueryWidget( `id(`modules), `Item(ci) ), 1, nil ); #: src/clients/http-server.rb:350 src/modules/HttpServerWidgets.rb:357 -#: src/modules/HttpServerWidgets.rb:3068 src/modules/HttpServerWidgets.rb:3091 -#: src/modules/HttpServerWidgets.rb:3138 src/modules/HttpServerWidgets.rb:3147 -#: src/modules/HttpServerWidgets.rb:3150 src/modules/HttpServerWidgets.rb:3154 -#: src/modules/HttpServerWidgets.rb:3183 +#: src/modules/HttpServerWidgets.rb:3066 src/modules/HttpServerWidgets.rb:3089 +#: src/modules/HttpServerWidgets.rb:3136 src/modules/HttpServerWidgets.rb:3145 +#: src/modules/HttpServerWidgets.rb:3148 src/modules/HttpServerWidgets.rb:3152 +#: src/modules/HttpServerWidgets.rb:3181 msgid "Enabled" msgstr "已启用" @@ -161,8 +161,8 @@ #. translators: service status radio button label #. translators: server module status #: src/clients/http-server.rb:352 src/modules/HttpServerWidgets.rb:355 -#: src/modules/HttpServerWidgets.rb:3070 src/modules/HttpServerWidgets.rb:3148 -#: src/modules/HttpServerWidgets.rb:3170 +#: src/modules/HttpServerWidgets.rb:3068 src/modules/HttpServerWidgets.rb:3146 +#: src/modules/HttpServerWidgets.rb:3168 msgid "Disabled" msgstr "已禁用" @@ -173,9 +173,9 @@ #. translators: server module status unknown #. list of all installed modules #: src/clients/http-server.rb:353 src/include/http-server/wizard-dialog.rb:167 -#: src/modules/HttpServerWidgets.rb:3041 src/modules/HttpServerWidgets.rb:3051 -#: src/modules/HttpServerWidgets.rb:3052 src/modules/HttpServerWidgets.rb:3061 -#: src/modules/HttpServerWidgets.rb:3210 +#: src/modules/HttpServerWidgets.rb:3039 src/modules/HttpServerWidgets.rb:3049 +#: src/modules/HttpServerWidgets.rb:3050 src/modules/HttpServerWidgets.rb:3059 +#: src/modules/HttpServerWidgets.rb:3208 msgid "unknown" msgstr "未知" @@ -716,9 +716,9 @@ #. translators: all network addresses Listen type #. translators: all network addresses Listen type #: src/include/http-server/routines.rb:59 -#: src/modules/HttpServerWidgets.rb:2397 src/modules/HttpServerWidgets.rb:2399 -#: src/modules/HttpServerWidgets.rb:2413 src/modules/HttpServerWidgets.rb:2417 -#: src/modules/HttpServerWidgets.rb:3297 src/modules/HttpServerWidgets.rb:3302 +#: src/modules/HttpServerWidgets.rb:2395 src/modules/HttpServerWidgets.rb:2397 +#: src/modules/HttpServerWidgets.rb:2411 src/modules/HttpServerWidgets.rb:2415 +#: src/modules/HttpServerWidgets.rb:3295 src/modules/HttpServerWidgets.rb:3300 msgid "All Addresses" msgstr "全部地址" @@ -772,37 +772,37 @@ msgstr "正在初始化..." #. HttpServer read dialog caption -#: src/modules/HttpServer.rb:116 +#: src/modules/HttpServer.rb:131 msgid "Initializing HTTP Server Configuration" msgstr "正在初始化 HTTP 服务器配置" #. translators: progress stage -#: src/modules/HttpServer.rb:127 +#: src/modules/HttpServer.rb:142 msgid "Check the environment" msgstr "检查环境" #. translators: progress stage -#: src/modules/HttpServer.rb:129 +#: src/modules/HttpServer.rb:144 msgid "Read Apache2 configuration" msgstr "读取 Apache2 配置" #. translators: progress stage -#: src/modules/HttpServer.rb:131 +#: src/modules/HttpServer.rb:146 msgid "Read network configuration" msgstr "读取网络配置" #. translators: progress step -#: src/modules/HttpServer.rb:135 +#: src/modules/HttpServer.rb:150 msgid "Checking the environment..." msgstr "正在检查环境..." #. translators: progress step -#: src/modules/HttpServer.rb:137 +#: src/modules/HttpServer.rb:152 msgid "Reading Apache2 configuration..." msgstr "正在读取 Apache2 配置..." #. translators: progress step -#: src/modules/HttpServer.rb:139 +#: src/modules/HttpServer.rb:154 msgid "Reading network configuration..." msgstr "正在读取网络配置..." @@ -811,23 +811,23 @@ #. translators: progress step #. translators: progress finished #. translators: progress finished -#: src/modules/HttpServer.rb:141 src/modules/HttpServer.rb:367 -#: src/modules/HttpServer.rb:408 src/modules/HttpServer.rb:489 +#: src/modules/HttpServer.rb:156 src/modules/HttpServer.rb:388 +#: src/modules/HttpServer.rb:429 src/modules/HttpServer.rb:510 msgid "Finished" msgstr "已完成" #. notification about package needed 1/2 -#: src/modules/HttpServer.rb:170 +#: src/modules/HttpServer.rb:185 msgid "<p>To configure the HTTP server, the <b>%1</b> packages must be installed.</p>" msgstr "<p>要配置该 HTTP 服务器，必须安装 <b>%1</b> 包。</p>" #. notification about package needed 2/2 -#: src/modules/HttpServer.rb:174 +#: src/modules/HttpServer.rb:189 msgid "<p>Do you want to install it now?</p>" msgstr "<p>是否要立即安装？</p>" #. translators: error popup before aborting the module -#: src/modules/HttpServer.rb:180 +#: src/modules/HttpServer.rb:195 msgid "" "The package %1 is not available.\n" "\n" @@ -843,52 +843,52 @@ #. translators: error message, %1 is the file name of expected configuration file #. translators: warning message, %1 is the file name of expected configuration file -#: src/modules/HttpServer.rb:208 src/modules/HttpServer.rb:232 +#: src/modules/HttpServer.rb:223 src/modules/HttpServer.rb:247 msgid "The configuration file '%1' does not exist." msgstr "配置文件\"%1\"不存在。" #. off(); -#: src/modules/HttpServer.rb:264 +#: src/modules/HttpServer.rb:279 msgid "There is no DNS server running on this machine." msgstr "没有 DNS 服务器在此机器上运行。" #. HttpServer read dialog caption -#: src/modules/HttpServer.rb:381 +#: src/modules/HttpServer.rb:402 msgid "Saving HTTP Server Configuration" msgstr "正在保存 HTTP 服务器配置" #. translators: progress stage 1/3 -#: src/modules/HttpServer.rb:392 +#: src/modules/HttpServer.rb:413 msgid "Write the Apache2 settings" msgstr "写入 Apache2 设置" #. translators: progress stage 2/3 -#: src/modules/HttpServer.rb:395 +#: src/modules/HttpServer.rb:416 msgid "Enable Apache2 service" msgstr "启用 Apache2 服务" #. translators: progress stage 3/3 -#: src/modules/HttpServer.rb:397 +#: src/modules/HttpServer.rb:418 msgid "Disable Apache2 service" msgstr "禁用 Apache2 服务" #. translators: progress step 1/3 -#: src/modules/HttpServer.rb:401 +#: src/modules/HttpServer.rb:422 msgid "Writing the settings..." msgstr "正在写入设置..." #. translators: progress step 2/3 -#: src/modules/HttpServer.rb:404 +#: src/modules/HttpServer.rb:425 msgid "Enabling Apache2 service..." msgstr "正在启用 Apache2 服务..." #. translators: progress step 3/3 -#: src/modules/HttpServer.rb:406 +#: src/modules/HttpServer.rb:427 msgid "Disabling Apache2 service..." msgstr "正在禁用 Apache2 服务..." #. install required RPMs for modules -#: src/modules/HttpServer.rb:420 +#: src/modules/HttpServer.rb:441 msgid "" "The enabled modules require\n" "installation of some of these additional packages:\n" @@ -901,17 +901,17 @@ "是否立即安装？\n" #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:529 +#: src/modules/HttpServer.rb:550 msgid "Module description does not have a name specified, ignoring." msgstr "模块描述没有指定名称，可以将其忽略。" #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:541 +#: src/modules/HttpServer.rb:562 msgid "Unknown change of a module for autoinstallation: %1" msgstr "在自动安装中模块出现未知的更改：%1" #. translators: warning in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:560 +#: src/modules/HttpServer.rb:581 msgid "" "Default value for module %1 does not match.\n" "This can cause inconsistent module configuration." @@ -920,38 +920,38 @@ "这可能导致不一致的模块配置。" #. translators: error in autoyast loading the configuration description. -#: src/modules/HttpServer.rb:575 +#: src/modules/HttpServer.rb:596 msgid "Listen statement without port found." msgstr "找到无端口的监听语句。" #. "Listen on " information (interfaces, port) -#: src/modules/HttpServer.rb:678 +#: src/modules/HttpServer.rb:730 msgid "<h3>Listen On</h3>" msgstr "<h3>监听</h3>" #. "Default host" information -#: src/modules/HttpServer.rb:698 +#: src/modules/HttpServer.rb:750 msgid "<h3>Default Host</h3>" msgstr "<h3>默认主机</h3>" #. translators: assiciation server name with document root #. translators: assiciation server name with document root -#: src/modules/HttpServer.rb:717 src/modules/HttpServer.rb:747 +#: src/modules/HttpServer.rb:769 src/modules/HttpServer.rb:799 msgid " in " msgstr " 于 " #. translators: whether SSL is enabled or disabled #. translators: whether SSL is enabled or disable -#: src/modules/HttpServer.rb:722 src/modules/HttpServer.rb:751 +#: src/modules/HttpServer.rb:774 src/modules/HttpServer.rb:803 msgid "enabled" msgstr "已启用" -#: src/modules/HttpServer.rb:722 src/modules/HttpServer.rb:751 +#: src/modules/HttpServer.rb:774 src/modules/HttpServer.rb:803 msgid "disabled" msgstr "已禁用" #. the same information as in default host but for other virtual hosts -#: src/modules/HttpServer.rb:726 +#: src/modules/HttpServer.rb:778 msgid "<h3>Virtual Hosts</h3>" msgstr "<h3>虚拟主机</h3>" @@ -1065,7 +1065,7 @@ #. translators: multi selection box #. translators: multi selection box -#: src/modules/HttpServerWidgets.rb:572 src/modules/HttpServerWidgets.rb:3476 +#: src/modules/HttpServerWidgets.rb:572 src/modules/HttpServerWidgets.rb:3474 msgid "&Listen on Interfaces" msgstr "监听接口(&L)" @@ -1272,24 +1272,24 @@ msgid "Administrator E-Mail cannot be empty." msgstr "管理员电子邮件地址不能为空。" -#: src/modules/HttpServerWidgets.rb:1710 +#: src/modules/HttpServerWidgets.rb:1709 msgid "All addresses (*)" msgstr "全部地址(*)" -#: src/modules/HttpServerWidgets.rb:1715 +#: src/modules/HttpServerWidgets.rb:1714 msgid "IP Addresses" msgstr "IP 地址" -#: src/modules/HttpServerWidgets.rb:1717 +#: src/modules/HttpServerWidgets.rb:1716 msgid "ServerName" msgstr "服务器名称" -#: src/modules/HttpServerWidgets.rb:1804 +#: src/modules/HttpServerWidgets.rb:1803 msgid "Name for VirtualHost ID cannot be empty." msgstr "虚拟主机 ID 的名称不能为空。" #. regexp matches '*' and '*:80' -#: src/modules/HttpServerWidgets.rb:1819 +#: src/modules/HttpServerWidgets.rb:1818 msgid "" "To use name-based virtual hosting,\n" "you must designate the IP address on the server\n" @@ -1301,61 +1301,61 @@ "主机接受请求的 IP 地址。\n" " * 为全部地址，*:port 可接受。" -#: src/modules/HttpServerWidgets.rb:1855 +#: src/modules/HttpServerWidgets.rb:1854 msgid "Master Zone %1" msgstr "主区域 %1" -#: src/modules/HttpServerWidgets.rb:1873 +#: src/modules/HttpServerWidgets.rb:1872 msgid "Record %1 already exists in zone %2." msgstr "记录 %1 已存在于区域 %2 中。" -#: src/modules/HttpServerWidgets.rb:1881 src/modules/HttpServerWidgets.rb:1926 +#: src/modules/HttpServerWidgets.rb:1880 src/modules/HttpServerWidgets.rb:1925 msgid "DNS Settings" msgstr "DNS 设置" -#: src/modules/HttpServerWidgets.rb:1885 +#: src/modules/HttpServerWidgets.rb:1884 msgid "Add to Zone" msgstr "添加到区域" -#: src/modules/HttpServerWidgets.rb:1930 +#: src/modules/HttpServerWidgets.rb:1929 msgid "Zone Name" msgstr "区域名" -#: src/modules/HttpServerWidgets.rb:1931 +#: src/modules/HttpServerWidgets.rb:1930 msgid "Create New Zone" msgstr "创建新的区域" #. disable using SSL for name-based virtual host -#: src/modules/HttpServerWidgets.rb:2022 +#: src/modules/HttpServerWidgets.rb:2021 msgid "CGI Directory" msgstr "CGI 目录" -#: src/modules/HttpServerWidgets.rb:2029 +#: src/modules/HttpServerWidgets.rb:2028 msgid "Choose Certificate File" msgstr "选择证书文件" #. translators: error popup -#: src/modules/HttpServerWidgets.rb:2040 +#: src/modules/HttpServerWidgets.rb:2039 msgid "Enter the certificate file." msgstr "输入证书文件。" -#: src/modules/HttpServerWidgets.rb:2046 +#: src/modules/HttpServerWidgets.rb:2045 msgid "Choose Certificate Key File" msgstr "选择证书密钥文件" #. translators: error popup -#: src/modules/HttpServerWidgets.rb:2058 +#: src/modules/HttpServerWidgets.rb:2057 msgid "Enter the key file." msgstr "输入密钥文件。" #. translators: dialog to set *.pem file with certificate #. translators: dialog to set *.pem file with certificate -#: src/modules/HttpServerWidgets.rb:2194 src/modules/HttpServerWidgets.rb:2232 +#: src/modules/HttpServerWidgets.rb:2192 src/modules/HttpServerWidgets.rb:2230 msgid "Select Certificate" msgstr "选择证书" #. translators: error message un failed certificate import -#: src/modules/HttpServerWidgets.rb:2224 +#: src/modules/HttpServerWidgets.rb:2222 msgid "" "Cannot import certificate\n" "%1" @@ -1364,61 +1364,61 @@ "%1" #. translators: combo box label for list of configured IPs -#: src/modules/HttpServerWidgets.rb:2431 +#: src/modules/HttpServerWidgets.rb:2429 msgid "Network &Address:" msgstr "网络地址(&A)：" #. translators: error message when validating Listen statement #. translators: popup error -#: src/modules/HttpServerWidgets.rb:2476 src/modules/HttpServerWidgets.rb:3444 +#: src/modules/HttpServerWidgets.rb:2474 src/modules/HttpServerWidgets.rb:3442 msgid "Invalid port number." msgstr "无效的端口号。" #. translators: table entry text for name-based vhosts -#: src/modules/HttpServerWidgets.rb:2942 +#: src/modules/HttpServerWidgets.rb:2940 msgid "Resolution via HTTP Headers" msgstr "通过 HTTP 报头解析" #. translators: table entry text for IP-based vhosts -#: src/modules/HttpServerWidgets.rb:2945 +#: src/modules/HttpServerWidgets.rb:2943 msgid "Resolution via IP Address Used" msgstr "通过使用的 IP 地址解析" -#: src/modules/HttpServerWidgets.rb:3109 +#: src/modules/HttpServerWidgets.rb:3107 msgid "Modules dependency problem" msgstr "模块依赖性问题" -#: src/modules/HttpServerWidgets.rb:3111 +#: src/modules/HttpServerWidgets.rb:3109 msgid "requires" msgstr "需要" -#: src/modules/HttpServerWidgets.rb:3113 +#: src/modules/HttpServerWidgets.rb:3111 msgid "Enable required module or disable first one." msgstr "启用需要的模块或禁用第一个模块。" #. translators: combo box for selsect module from installed unknown modules -#: src/modules/HttpServerWidgets.rb:3223 +#: src/modules/HttpServerWidgets.rb:3221 msgid "New Module &Name:" msgstr "新模块名(&N)" #. translators: error message -#: src/modules/HttpServerWidgets.rb:3241 +#: src/modules/HttpServerWidgets.rb:3239 msgid "A name for the module to add is required." msgstr "要添加的模块必须有名称。" #. translators: error message -#: src/modules/HttpServerWidgets.rb:3244 +#: src/modules/HttpServerWidgets.rb:3242 msgid "The module is already in the list." msgstr "模块已在列表中。" #. FIXME: CreateListen error reporting #. translators: error message for adding a new Listen statement -#: src/modules/HttpServerWidgets.rb:3307 +#: src/modules/HttpServerWidgets.rb:3305 msgid "The entry '%1' already exists." msgstr "项\"%1\"已存在。" #. translators: error message -#: src/modules/HttpServerWidgets.rb:3328 +#: src/modules/HttpServerWidgets.rb:3326 msgid "" "The list of the ports to which the server should\n" "listen cannot be empty." @@ -1427,84 +1427,84 @@ "不能为空。" #. translators: popup error - multi selection box with server network adresses -#: src/modules/HttpServerWidgets.rb:3495 +#: src/modules/HttpServerWidgets.rb:3493 msgid "At least one interface must be selected." msgstr "至少必须选择一个接口。" #. translators: checkbox - support for php script language -#: src/modules/HttpServerWidgets.rb:3522 +#: src/modules/HttpServerWidgets.rb:3520 msgid "Enable &PHP5 Scripting" msgstr "启用 PHP5 脚本编制(&P)" #. translators: checkbox - support for perl script language -#: src/modules/HttpServerWidgets.rb:3530 +#: src/modules/HttpServerWidgets.rb:3528 msgid "Enable P&erl Scripting" msgstr "启用 Perl 脚本(&E)" #. translators: checkbox - support for python script language -#: src/modules/HttpServerWidgets.rb:3538 +#: src/modules/HttpServerWidgets.rb:3536 msgid "Enable P&ython Scripting" msgstr "启用 Python 脚本(&Y)" #. illegal keys in vhost -#: src/modules/YaPI/HTTPD.pm:679 src/modules/YaPI/HTTPD.pm:762 +#: src/modules/YaPI/HTTPD.pm:670 src/modules/YaPI/HTTPD.pm:753 #, perl-format msgid "Illegal key in virtual host '%s'." msgstr "虚拟主机\"%s\"中密钥非法。" -#: src/modules/YaPI/HTTPD.pm:748 +#: src/modules/YaPI/HTTPD.pm:739 #, perl-format msgid "Internal Error: Data must be an array ref and not %s." msgstr "内部错误：数据必须是 array ref 而不能是 %s。" -#: src/modules/YaPI/HTTPD.pm:773 +#: src/modules/YaPI/HTTPD.pm:764 msgid "Illegal host ID." msgstr "非法主机 ID。" -#: src/modules/YaPI/HTTPD.pm:795 +#: src/modules/YaPI/HTTPD.pm:786 msgid "hostid already exists" msgstr "主机 ID 已存在" -#: src/modules/YaPI/HTTPD.pm:834 +#: src/modules/YaPI/HTTPD.pm:825 msgid "can not delete default host" msgstr "无法删除默认主机" -#: src/modules/YaPI/HTTPD.pm:855 +#: src/modules/YaPI/HTTPD.pm:846 msgid "hostid not found" msgstr "未找到主机 ID" -#: src/modules/YaPI/HTTPD.pm:1270 +#: src/modules/YaPI/HTTPD.pm:1261 msgid "illegal port" msgstr "非法端口" -#: src/modules/YaPI/HTTPD.pm:1287 +#: src/modules/YaPI/HTTPD.pm:1278 msgid "writing the firewall rules failed" msgstr "写入防火墙规则失败" -#: src/modules/YaPI/HTTPD.pm:1334 +#: src/modules/YaPI/HTTPD.pm:1325 msgid "listen value to delete not found" msgstr "未找到要删除的监听值" -#: src/modules/YaPI/HTTPD.pm:1587 src/modules/YaPI/HTTPD.pm:1635 -#: src/modules/YaPI/HTTPD.pm:1680 src/modules/YaPI/HTTPD.pm:1763 -#: src/modules/YaPI/HTTPD.pm:1807 +#: src/modules/YaPI/HTTPD.pm:1578 src/modules/YaPI/HTTPD.pm:1626 +#: src/modules/YaPI/HTTPD.pm:1671 src/modules/YaPI/HTTPD.pm:1754 +#: src/modules/YaPI/HTTPD.pm:1798 msgid "Unable to fetch a host with the specified ID." msgstr "无法提取具有指定 ID 的主机。" -#: src/modules/YaPI/HTTPD.pm:1596 src/modules/YaPI/HTTPD.pm:1643 -#: src/modules/YaPI/HTTPD.pm:1690 +#: src/modules/YaPI/HTTPD.pm:1587 src/modules/YaPI/HTTPD.pm:1634 +#: src/modules/YaPI/HTTPD.pm:1681 msgid "Corrupt PEM data." msgstr "PEM 数据已损坏。" -#: src/modules/YaPI/HTTPD.pm:1770 +#: src/modules/YaPI/HTTPD.pm:1761 msgid "No certificate key file configured for this host ID." msgstr "没有为此主机 ID 配置任何证书密钥文件。" -#: src/modules/YaPI/HTTPD.pm:1779 +#: src/modules/YaPI/HTTPD.pm:1770 msgid "Parsing the key file failed." msgstr "解析密钥文件失败。" -#: src/modules/YaPI/HTTPD.pm:1812 +#: src/modules/YaPI/HTTPD.pm:1803 msgid "No CA certificate file configured for this host ID." msgstr "没有为此主机 ID 配置任何 CA 证书文件。" @@ -1512,223 +1512,223 @@ msgid "Provides access control based on client host name, IP address, etc." msgstr "根据客户机主机名、IP 地址等提供访问控制。" -#: src/modules/YaPI/HTTPDModules.pm:23 +#: src/modules/YaPI/HTTPDModules.pm:21 msgid "Executing CGI scripts based on media type or request method" msgstr "根据媒体类型或请求方法执行 CGI 脚本" -#: src/modules/YaPI/HTTPDModules.pm:32 +#: src/modules/YaPI/HTTPDModules.pm:30 msgid "Mapping different parts of the host file system in the document tree and for URL redirection" msgstr "在文档树中映射主机文件系统的不同部分和 URL 重定向" -#: src/modules/YaPI/HTTPDModules.pm:47 +#: src/modules/YaPI/HTTPDModules.pm:45 msgid "Basic authentication" msgstr "基础身份验证" -#: src/modules/YaPI/HTTPDModules.pm:56 +#: src/modules/YaPI/HTTPDModules.pm:54 msgid "User authentication using text files" msgstr "使用文本文件进行用户验证" -#: src/modules/YaPI/HTTPDModules.pm:64 +#: src/modules/YaPI/HTTPDModules.pm:62 msgid "User Authorization" msgstr "用户验证" -#: src/modules/YaPI/HTTPDModules.pm:72 +#: src/modules/YaPI/HTTPDModules.pm:70 msgid "Group authorization using plaintext files" msgstr "使用纯文本文件进行组验证" -#: src/modules/YaPI/HTTPDModules.pm:81 +#: src/modules/YaPI/HTTPDModules.pm:79 msgid "User authentication using DBM files" msgstr "使用 DBM 文件进行验证" -#: src/modules/YaPI/HTTPDModules.pm:96 +#: src/modules/YaPI/HTTPDModules.pm:94 msgid "Generates directory indices, automatically, similar to the Unix ls command" msgstr "自动生成与 Unix ls 命令类似的目录索引" -#: src/modules/YaPI/HTTPDModules.pm:117 +#: src/modules/YaPI/HTTPDModules.pm:115 msgid "Execution of CGI scripts" msgstr "执行 CGI 脚本" -#: src/modules/YaPI/HTTPDModules.pm:127 +#: src/modules/YaPI/HTTPDModules.pm:125 msgid "Provides for trailing slash redirects and serving directory index files" msgstr "提供尾部反斜线重定向和目录索引文件服务" -#: src/modules/YaPI/HTTPDModules.pm:136 +#: src/modules/YaPI/HTTPDModules.pm:134 msgid "Modifies the environment passed to CGI scripts and SSI pages" msgstr "修改传递给 CGI 脚本和 SSI 页的环境" -#: src/modules/YaPI/HTTPDModules.pm:146 +#: src/modules/YaPI/HTTPDModules.pm:144 msgid "Generation of Expires HTTP headers according to user-specified criteria" msgstr "根据用户指定的条件生成 HTTP 报头的失效信息" -#: src/modules/YaPI/HTTPDModules.pm:161 +#: src/modules/YaPI/HTTPDModules.pm:159 msgid "Server-parsed HTML documents (Server Side Includes)" msgstr "服务器解析的 HTML 文档（服务器端包含）" -#: src/modules/YaPI/HTTPDModules.pm:175 +#: src/modules/YaPI/HTTPDModules.pm:173 msgid "Logging of the requests made to the server" msgstr "记录发往服务器的请求" -#: src/modules/YaPI/HTTPDModules.pm:187 +#: src/modules/YaPI/HTTPDModules.pm:185 msgid "Associates the requested file name's extensions with the file's behavior and content" msgstr "将被请求文件名的扩展名与文件的行为和内容相关联" -#: src/modules/YaPI/HTTPDModules.pm:212 +#: src/modules/YaPI/HTTPDModules.pm:210 msgid "Provides for content negotiation" msgstr "提供用于内容协商" -#: src/modules/YaPI/HTTPDModules.pm:222 +#: src/modules/YaPI/HTTPDModules.pm:220 msgid "Allows the setting of environment variables based on characteristics of the request" msgstr "允许根据请求的特征设置环境变量" -#: src/modules/YaPI/HTTPDModules.pm:233 +#: src/modules/YaPI/HTTPDModules.pm:231 msgid "Provides information about server activity and performance" msgstr "提供有关服务器活动和性能的信息" -#: src/modules/YaPI/HTTPDModules.pm:241 +#: src/modules/YaPI/HTTPDModules.pm:239 msgid "Allows CGI scripts to run as a specified user and group" msgstr "允许以指定用户和组的身份运行 CGI 脚本" -#: src/modules/YaPI/HTTPDModules.pm:252 +#: src/modules/YaPI/HTTPDModules.pm:250 msgid "User-specific directories" msgstr "用户特定的目录" -#: src/modules/YaPI/HTTPDModules.pm:260 +#: src/modules/YaPI/HTTPDModules.pm:258 msgid "Sends files that contain their own HTTP headers" msgstr "发送包含它们自己的 HTTP 报头的文件" -#: src/modules/YaPI/HTTPDModules.pm:266 +#: src/modules/YaPI/HTTPDModules.pm:264 msgid "Allows \"anonymous\" user access to authenticated areas" msgstr "允许\"匿名\"用户访问已验证的区域" -#: src/modules/YaPI/HTTPDModules.pm:287 +#: src/modules/YaPI/HTTPDModules.pm:285 msgid "User authentication using MD5 Digest Authentication" msgstr "使用 MD5 摘要验证进行验证" -#: src/modules/YaPI/HTTPDModules.pm:302 +#: src/modules/YaPI/HTTPDModules.pm:300 msgid "Allows an LDAP directory to be used to store the database for HTTP Basic authentication" msgstr "允许 LDAP 目录用于储存 HTTP 基本验证的数据库" -#: src/modules/YaPI/HTTPDModules.pm:320 src/modules/YaPI/HTTPDModules.pm:495 +#: src/modules/YaPI/HTTPDModules.pm:318 src/modules/YaPI/HTTPDModules.pm:493 msgid "Content cache keyed to URIs" msgstr "用 URI 索引的内容缓存" -#: src/modules/YaPI/HTTPDModules.pm:337 +#: src/modules/YaPI/HTTPDModules.pm:335 msgid "Specify character set translation or recoding" msgstr "指定字符集转换或重编码" -#: src/modules/YaPI/HTTPDModules.pm:347 +#: src/modules/YaPI/HTTPDModules.pm:345 msgid "Distributed Authoring and Versioning (WebDAV) functionality" msgstr "分布式创作和版本控制 (WebDAV) 功能" -#: src/modules/YaPI/HTTPDModules.pm:362 +#: src/modules/YaPI/HTTPDModules.pm:360 msgid "File system provider for mod_dav" msgstr "mod_dav 的文件系统提供程序" -#: src/modules/YaPI/HTTPDModules.pm:373 +#: src/modules/YaPI/HTTPDModules.pm:371 msgid "Compress content before it is delivered to the client" msgstr "在将内容提供给客户机前压缩内容" -#: src/modules/YaPI/HTTPDModules.pm:392 +#: src/modules/YaPI/HTTPDModules.pm:390 msgid "Content cache storage manager keyed to URIs" msgstr "用 URI 索引的内容缓存储存管理器" -#: src/modules/YaPI/HTTPDModules.pm:405 +#: src/modules/YaPI/HTTPDModules.pm:403 msgid "A simple echo server to illustrate protocol modules" msgstr "用于说明协议模块的简单回应服务器" -#: src/modules/YaPI/HTTPDModules.pm:413 +#: src/modules/YaPI/HTTPDModules.pm:411 msgid "Pass the response body through an external program before delivery to the client" msgstr "在提供给客户机前，通过外部程序传递响应正文" -#: src/modules/YaPI/HTTPDModules.pm:426 +#: src/modules/YaPI/HTTPDModules.pm:424 msgid "Caches a static list of files in memory" msgstr "在内存中缓存文件的静态列表" -#: src/modules/YaPI/HTTPDModules.pm:436 +#: src/modules/YaPI/HTTPDModules.pm:434 msgid "Customization of HTTP request and response headers" msgstr "自定义 HTTP 请求和响应报头" -#: src/modules/YaPI/HTTPDModules.pm:449 +#: src/modules/YaPI/HTTPDModules.pm:447 msgid "Server-side image map processing" msgstr "服务器端图象映射处理" -#: src/modules/YaPI/HTTPDModules.pm:460 +#: src/modules/YaPI/HTTPDModules.pm:458 msgid "Provides a comprehensive overview of the server configuration" msgstr "提供服务器配置的全面概览" -#: src/modules/YaPI/HTTPDModules.pm:469 +#: src/modules/YaPI/HTTPDModules.pm:467 msgid "LDAP connection pooling and result caching services for use by other LDAP modules" msgstr "由其他 LDAP 模块使用的 LDAP 连接池和结果缓存服务" -#: src/modules/YaPI/HTTPDModules.pm:489 +#: src/modules/YaPI/HTTPDModules.pm:487 msgid "Logging of input and output bytes per request" msgstr "记录每个请求的输入和输出字节" -#: src/modules/YaPI/HTTPDModules.pm:509 +#: src/modules/YaPI/HTTPDModules.pm:507 msgid "Determines the MIME type of a file by looking at a few bytes of its contents" msgstr "通过查看文件内容的几个字节确定它的 MIME 类型" -#: src/modules/YaPI/HTTPDModules.pm:518 +#: src/modules/YaPI/HTTPDModules.pm:516 msgid "HTTP/1.1 proxy/gateway server" msgstr "HTTP/1.1 代理/网关服务器" -#: src/modules/YaPI/HTTPDModules.pm:566 +#: src/modules/YaPI/HTTPDModules.pm:564 msgid "AJP support module for mod_proxy" msgstr "mod_proxy 的 AJP 支持模块" -#: src/modules/YaPI/HTTPDModules.pm:573 +#: src/modules/YaPI/HTTPDModules.pm:571 msgid "mod_proxy extension for CONNECT request handling" msgstr "CONNECT 请求处理的 mod_proxy 扩展" -#: src/modules/YaPI/HTTPDModules.pm:580 +#: src/modules/YaPI/HTTPDModules.pm:578 msgid "FTP support module for mod_proxy" msgstr "mod_proxy 的 FTP 支持模块" -#: src/modules/YaPI/HTTPDModules.pm:586 +#: src/modules/YaPI/HTTPDModules.pm:584 msgid "HTTP support module for mod_proxy" msgstr "mod_proxy 的 HTTP 支持模块" -#: src/modules/YaPI/HTTPDModules.pm:592 +#: src/modules/YaPI/HTTPDModules.pm:590 msgid "Provides a rule-based rewriting engine to rewrite requested URLs on the fly" msgstr "提供一个基于规则的重写引擎来动态重写请求的 URL" -#: src/modules/YaPI/HTTPDModules.pm:619 +#: src/modules/YaPI/HTTPDModules.pm:617 msgid "Attempts to correct mistaken URLs that users might have entered" msgstr "尝试更正用户可能输入的错误 URL" -#: src/modules/YaPI/HTTPDModules.pm:628 +#: src/modules/YaPI/HTTPDModules.pm:626 msgid "Strong cryptography using the Secure Sockets Layer (SSL) and Transport Layer Security (TLS) protocols" msgstr "使用安全套接字层 (SSL) 和传输层安全 (TLS) 协议的强加密" -#: src/modules/YaPI/HTTPDModules.pm:668 +#: src/modules/YaPI/HTTPDModules.pm:666 msgid "Provides an environment variable with a unique identifier for each request" msgstr "为每个请求提供一个有唯一标识符的环境变量" -#: src/modules/YaPI/HTTPDModules.pm:674 +#: src/modules/YaPI/HTTPDModules.pm:672 msgid "Clickstream logging of user activity on a site" msgstr "站点上用户活动的点击流日志记录 " -#: src/modules/YaPI/HTTPDModules.pm:694 +#: src/modules/YaPI/HTTPDModules.pm:692 msgid "Provides support for dynamically configured mass virtual hosting" msgstr "提供对动态配置的大量虚拟主机的支持" -#: src/modules/YaPI/HTTPDModules.pm:711 +#: src/modules/YaPI/HTTPDModules.pm:709 msgid "Provides support for PHP5 dynamically generated pages" msgstr "提供对 PHP5 动态生成页的支持" -#: src/modules/YaPI/HTTPDModules.pm:717 +#: src/modules/YaPI/HTTPDModules.pm:715 msgid "Provides support for Perl dynamically generated pages" msgstr "提供对 Perl 动态生成页的支持" -#: src/modules/YaPI/HTTPDModules.pm:723 +#: src/modules/YaPI/HTTPDModules.pm:721 msgid "Provides support for Python dynamically generated pages" msgstr "提供对 Python 动态生成页的支持" -#: src/modules/YaPI/HTTPDModules.pm:729 +#: src/modules/YaPI/HTTPDModules.pm:727 msgid "Provides support for AppArmor subprocess confinement within apache" msgstr "提供在 apache 限制 AppArmor 子进程支持" -#: src/modules/YaPI/HTTPDModules.pm:735 src/modules/YaPI/HTTPDModules.pm:742 +#: src/modules/YaPI/HTTPDModules.pm:733 src/modules/YaPI/HTTPDModules.pm:740 msgid "Provides support for subversion" msgstr "提供对 subversion 的支持" Modified: trunk/yast/zh_CN/po/inetd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/inetd.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/inetd.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: inetd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2012-07-20 02:04+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/installation.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/installation.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/installation.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"POT-Creation-Date: 2015-08-27 10:52+0200\n" "PO-Revision-Date: 2015-01-16 22:14+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -23,197 +23,421 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" +#. help for the dialog - busy message +#: src/include/installation/inst_inc_all.rb:52 +msgid "<p>Initializing the installation...</p>" +msgstr "<p>正在初始化安装...</p>" + +#. dialog content - busy message +#: src/include/installation/inst_inc_all.rb:57 +msgid "Preparing the 1st system configuration..." +msgstr "正在准备首次系统配置..." + +#. help for the dialog - busy message +#. TRANSLATORS: dialog help +#: src/include/installation/inst_inc_all.rb:59 +#: src/lib/installation/clients/inst_initialization.rb:48 +msgid "<p>Please wait...</p>" +msgstr "<p>请稍候...</p>" + +#. dialog caption +#. TRANSLATORS: progress message +#: src/include/installation/inst_inc_all.rb:64 +#: src/lib/installation/clients/inst_installation_options.rb:154 +msgid "Initializing..." +msgstr "正在初始化..." + +#. TRANSLATORS: Error message +#: src/include/installation/inst_inc_all.rb:77 +msgid "" +"No installation control file has been found,\n" +"the installer cannot continue." +msgstr "未找到安装控制文件，安装器无法继续。" + +#. TRANSLATORS: busy message #. progress step title -#: src/clients/clone_finish.rb:47 +#: src/include/installation/inst_inc_all.rb:112 +#: src/lib/installation/clients/yast_inf_finish.rb:73 +msgid "Writing YaST configuration..." +msgstr "正在写入 YaST 配置..." + +#. TRANSLATORS: busy message +#. Dialog busy message +#: src/include/installation/inst_inc_all.rb:126 +#: src/lib/installation/clients/inst_congratulate.rb:267 +msgid "Finishing the installation..." +msgstr "正在完成安装..." + +#. Somehow the graphical frontend failed and we're running in +#. text mode. Inform the user about this fact. +#: src/include/installation/inst_inc_all.rb:174 +msgid "" +"Your computer does not fulfill all requirements for\n" +"a graphical installation. There is either less than %1 MB\n" +"memory or the X server could not be started.\n" +"\n" +"As fallback, the text front-end of YaST2 will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" +msgstr "" +"您的计算机不满足图形安装的全部要求。\n" +"要么您的内存小于 %1 MB，要么系统无法启动 X 服务器。\n" +"\n" +"作为后备措施，YaST2 的文本前端将指引您完成安装过程。\n" +"该前端与图形前端提供了相同的功能，只不过看到的屏幕与手\n" +"册中的屏幕有所不同。\n" + +#. The script YaST2 wants to inform about a problem with the +#. option no_x11 but it's broken. +#. else if (Installation::no_x11 ()) +#. Somehow the graphical frontend failed and we're running in +#. text mode. Inform the user about this fact. +#: src/include/installation/inst_inc_all.rb:193 +msgid "" +"The graphical interface could not be started.\n" +"\n" +"Either the required packages were not installed (minimal installation) \n" +"or the graphics card is not properly supported.\n" +"\n" +"As fallback, the text front-end of YaST2 will guide you\n" +"through the installation. This front-end offers the\n" +"same functionality as the graphical one, but the screens\n" +"differ from those in the manual.\n" +msgstr "" +"无法启动图形界面。\n" +"\n" +"要么没有安装必需的包 (极简安装)，要么显卡支持不够好。\n" +"\n" +"作为后备措施，YaST2 的文本前端将指引您完成安装过程。\n" +"该前端与图形前端提供了相同的功能，只不过看到的屏幕\n" +"与手册中的屏幕有所不同。\n" + +#. TRANSLATORS: progress stage, %1 stands for service name +#: src/include/installation/inst_inc_second.rb:277 +msgid "Start service %1" +msgstr "启动服务 %1" + +#. TRANSLATORS: progress stage, %1 stands for service name +#. TRANSLATORS: busy message +#: src/include/installation/inst_inc_second.rb:282 +#: src/lib/installation/clients/inst_restore_settings.rb:47 +msgid "Starting service %1..." +msgstr "正在启动服务 %1..." + +#. TRANSLATORS: dialog caption +#: src/include/installation/inst_inc_second.rb:297 +msgid "Adjusting Network Settings" +msgstr "正在调整网络设置" + +#. TRANSLATORS: dialog help +#: src/include/installation/inst_inc_second.rb:303 +msgid "Network settings are being adjusted." +msgstr "正在调整网络设置。" + +#. popup question (#x1) +#: src/include/installation/inst_inc_second.rb:356 +msgid "" +"The previous installation has failed.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." +msgstr "" +"上一次安装失败了。\n" +"您希望继续上一次安装吗？\n" +"\n" +"注意：您可能需要再次输入一些信息。" + +#. popup question (#x1) +#: src/include/installation/inst_inc_second.rb:364 +msgid "" +"The previous installation has been aborted.\n" +"Would you like it to continue?\n" +"\n" +"Note: You may have to enter some information again." +msgstr "" +"上一次安装被中止了。\n" +"您希望继续上一次安装吗？\n" +"\n" +"注意：您可能需要再次输入一些信息。" + +#. popup headline (#x1) +#. TRANSLATORS: starting the installation process +#. dialog cotent (progress information) +#: src/include/installation/inst_inc_second.rb:378 +#: src/lib/installation/clients/inst_doit.rb:60 +msgid "Starting Installation..." +msgstr "正在启动安装..." + +#. Heading for confirmation popup before the installation really starts +#: src/include/installation/misc.rb:167 +msgid "Confirm Installation" +msgstr "确认安装" + +#. Text for confirmation popup before the installation really starts 1/3 +#: src/include/installation/misc.rb:170 +msgid "<p>Information required for the base installation is now complete.</p>" +msgstr "<p>现在已完成了基本安装所需的信息。</p>" + +#. Text for confirmation popup before the installation really starts 2/3 +#: src/include/installation/misc.rb:182 +msgid "" +"<p>If you continue now, <b>existing\n" +"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n" +"(<b>erasing any existing data</b> in those partitions) according to the\n" +"installation settings in the previous dialogs.</p>" +msgstr "" +"<p>现在您若继续，则会根据之前对话框中的安装设置<b>删除</b>或<b>格式化</b>\n" +"您硬盘上的<b>已有分区</b>。(这些分区将被<b>擦除任何已有数据</b>)</p>" + +#. Text for confirmation popup before the installation really starts 2/3 +#: src/include/installation/misc.rb:193 +msgid "" +"<p>If you continue now, partitions on your\n" +"hard disk will be modified according to the installation settings in the\n" +"previous dialogs.</p>" +msgstr "<p>现在您若继续，则会根据之前对话框中的安装设置修改您硬盘上的分区。</p>" + +#. Text for confirmation popup before the installation really starts 3/3 +#. Text for confirmation popup before the update really starts 3/3 +#. Text for confirmation popup before the update really starts 3/3 +#: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222 +#: src/lib/installation/proposal_runner.rb:136 +msgid "<p>Go back and check the settings if you are unsure.</p>" +msgstr "<p>若您不确定请返回并检查设置。</p>" + +#. Heading for confirmation popup before the update really starts +#. Heading for confirmation popup before the update really starts +#: src/include/installation/misc.rb:210 +#: src/lib/installation/proposal_runner.rb:124 +msgid "Confirm Update" +msgstr "确认更新" + +#. Text for confirmation popup before the update really starts 1/3 +#. Text for confirmation popup before the update really starts 1/3 +#: src/include/installation/misc.rb:214 +#: src/lib/installation/proposal_runner.rb:128 +msgid "<p>Information required to perform an update is now complete.</p>" +msgstr "<p>现在已完成了执行更新所需的信息。</p>" + +#. Text for confirmation popup before the update really starts 2/3 +#. Text for confirmation popup before the update really starts 2/3 +#: src/include/installation/misc.rb:216 +#: src/lib/installation/proposal_runner.rb:130 +msgid "" +"\n" +"<p>If you continue now, data on your hard disk will be overwritten\n" +"according to the settings in the previous dialogs.</p>" +msgstr "" +"\n" +"<p>现在您若继续，则会根据之前对话框中的设置覆盖您硬盘上的数据。</p>" + +#. Label for the button that confirms startint the installation +#. Label for the button that confirms startint the installation +#: src/include/installation/misc.rb:225 +#: src/lib/installation/proposal_runner.rb:139 +msgid "Start &Update" +msgstr "开始更新(&U)" + +#. this is a heading +#: src/lib/installation/cio_ignore.rb:66 +msgid "Blacklist Devices" +msgstr "屏蔽设备" + +#. this is a menu entry +#: src/lib/installation/cio_ignore.rb:68 +msgid "B&lacklist Devices" +msgstr "屏蔽设备(&L)" + +#. TRANSLATORS: Installation overview +#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text +#: src/lib/installation/cio_ignore.rb:87 +msgid "Blacklist devices enabled (disable</a>)." +msgstr "已启用屏蔽设备功能 (禁用</a>)。" + +#. TRANSLATORS: Installation overview +#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text +#: src/lib/installation/cio_ignore.rb:93 +msgid "Blacklist devices disabled (enable</a>)." +msgstr "已禁用屏蔽设备功能 (启用</a>)。" + +#. TRANSLATORS: help text +#: src/lib/installation/cio_ignore.rb:102 +msgid "<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to such devices which will reduce kernel memory footprint.</p>" +msgstr "<p>若您想要为某些设备创建黑名单通道以降低内核内存占用，请使用<b>屏蔽设备</b>。</p>" + +#. progress step title +#: src/lib/installation/cio_ignore.rb:157 +msgid "Blacklisting Devices..." +msgstr "正在屏蔽设备..." + +#. progress step title +#: src/lib/installation/clients/clone_finish.rb:43 msgid "Generating AutoYaST profile if needed..." msgstr "若需要则生成 AutoYaST 方案..." #. TRANSLATORS: help text -#: src/clients/clone_proposal.rb:39 +#: src/lib/installation/clients/clone_proposal.rb:39 msgid "" -"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST " -"profile.\n" -"AutoYaST is a way to do a complete SUSE Linux installation without user " -"interaction. AutoYaST\n" -"needs a profile to know what the installed system should look like. If this " -"option is\n" -"selected, a profile of the current system is stored in <tt>/root/autoinst." -"xml</tt>.</p>" +"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n" +"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" +"needs a profile to know what the installed system should look like. If this option is\n" +"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>" msgstr "" "<p>若您想要创建一个 AutoYaST 方案请使用<b>复制系统设置</b>。\n" "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n" "AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n" "若选择了此选项，将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</p>" -#: src/clients/clone_proposal.rb:60 +#: src/lib/installation/clients/clone_proposal.rb:60 msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗？" #. this is a heading -#: src/clients/clone_proposal.rb:71 +#: src/lib/installation/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "复制系统配置" #. this is a menu entry -#: src/clients/clone_proposal.rb:73 +#: src/lib/installation/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "复制系统配置(&C)" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:101 -msgid "" -"The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)." +#: src/lib/installation/clients/clone_proposal.rb:101 +msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)." msgstr "AutoYaST 方案将被写入在 /root/autoinst.xml 下(不写入</a>)。" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:110 +#: src/lib/installation/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (write it</a>)." msgstr "将不会保存 AutoYaST 方案(写入</a>)。" #. progress step title -#: src/clients/copy_files_finish.rb:81 +#: src/lib/installation/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "正在将文件复制到安装好的系统..." #. progress step title -#: src/clients/copy_logs_finish.rb:67 -msgid "Copying log files to installed system..." -msgstr "正在将日志文件复制到安装好的系统..." - -#. progress step title -#: src/clients/copy_systemfiles_finish.rb:61 +#: src/lib/installation/clients/copy_systemfiles_finish.rb:60 msgid "Copying system files to the installed system..." msgstr "正在将系统文件复制到安装好的系统..." #. Create a summary #. return string -#: src/clients/deploy_image_auto.rb:90 +#: src/lib/installation/clients/deploy_image_auto.rb:90 msgid "Installation from images is: <b>enabled</b>" msgstr "从映像安装已<b>启用</b>" -#: src/clients/deploy_image_auto.rb:91 +#: src/lib/installation/clients/deploy_image_auto.rb:92 msgid "Installation from images is: <b>disabled</b>" msgstr "从映像安装已<b>禁用</b>" #. TRANSLATORS: dialog caption #. this is a heading -#: src/clients/deploy_image_auto.rb:111 src/clients/deploy_image_auto.rb:116 -#: src/clients/deploying_proposal.rb:133 +#: src/lib/installation/clients/deploy_image_auto.rb:113 +#: src/lib/installation/clients/deploy_image_auto.rb:118 +#: src/lib/installation/clients/deploying_proposal.rb:133 msgid "Installation from Images" msgstr "从映像安装" -#: src/clients/deploy_image_auto.rb:119 -msgid "" -"Here you can choose to use Novell pre-defined images to speed up RPM " -"installation." +#: src/lib/installation/clients/deploy_image_auto.rb:121 +msgid "Here you can choose to use Novell pre-defined images to speed up RPM installation." msgstr "在此您可以选择使用 Novell 预制映像来加速 RPM 安装。" -#: src/clients/deploy_image_auto.rb:133 +#: src/lib/installation/clients/deploy_image_auto.rb:135 msgid "&Install from Images" msgstr "从映像安装(&I)" -#: src/clients/deploy_image_auto.rb:142 +#: src/lib/installation/clients/deploy_image_auto.rb:144 msgid "&Do not Install from Images" msgstr "不从映像安装(&D)" -#: src/clients/deploy_image_auto.rb:153 -msgid "" -"Custom images deployment - this needs a URL to be configured as installation " -"source" +#: src/lib/installation/clients/deploy_image_auto.rb:155 +msgid "Custom images deployment - this needs a URL to be configured as installation source" msgstr "自定义映像部署 - 这需要配置一个 URL 作为安装来源" #. Image name, Image location -#: src/clients/deploy_image_auto.rb:162 +#: src/lib/installation/clients/deploy_image_auto.rb:164 msgid "Here you can create custom images.\n" msgstr "在此您可以创建自定义映像。\n" -#: src/clients/deploy_image_auto.rb:163 -msgid "" -"You have to configure the software selection first before you can create an " -"image here" +#: src/lib/installation/clients/deploy_image_auto.rb:165 +msgid "You have to configure the software selection first before you can create an image here" msgstr "您必须先配置软件选集才能在此创建映像" -#: src/clients/deploy_image_auto.rb:174 -msgid "" -"Create an image file (AutoYaST will fetch it from the given location during " -"installation)" +#: src/lib/installation/clients/deploy_image_auto.rb:176 +msgid "Create an image file (AutoYaST will fetch it from the given location during installation)" msgstr "创建一个映像文件 (AutoYaST 将在安装时从给定位置撷取它)" -#: src/clients/deploy_image_auto.rb:181 +#: src/lib/installation/clients/deploy_image_auto.rb:183 msgid "Create Image" msgstr "创建映像" -#: src/clients/deploy_image_auto.rb:186 +#: src/lib/installation/clients/deploy_image_auto.rb:188 msgid "Where will AutoYaST find the image? (e.g. http://host/)" msgstr "AutoYaST 查找映像位置 (例如 http://主机名/)" -#: src/clients/deploy_image_auto.rb:198 +#: src/lib/installation/clients/deploy_image_auto.rb:200 msgid "What is the name of the image? (e.g. my_image)" msgstr "映像名称 (例如 my_image)" -#: src/clients/deploy_image_auto.rb:211 +#: src/lib/installation/clients/deploy_image_auto.rb:213 msgid "Create ISO (image and autoinst.xml will be on the media)" msgstr "创建 ISO (介质上会有映像和 autoinst.xml)" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/deploy_image_auto.rb:227 src/clients/deploying_proposal.rb:69 +#: src/lib/installation/clients/deploy_image_auto.rb:229 +#: src/lib/installation/clients/deploying_proposal.rb:69 msgid "" "<p><b>Installation from Images</b> is used to speed the installation up.\n" "Images contain compressed snapshots of an installed system matching your\n" -"selection of patterns. The rest of the packages which are not contained in " -"the\n" +"selection of patterns. The rest of the packages which are not contained in the\n" "images will be installed from packages the standard way.</p>\n" msgstr "" "<p><b>从映像安装</b>用于加快安装速度。\n" "映像包含了一份匹配您的软件选集的已安装系统的压缩快照。\n" "其余映像未包含的软件包将按标准方法从软件包安装。</p>\n" -#: src/clients/deploy_image_auto.rb:233 +#: src/lib/installation/clients/deploy_image_auto.rb:235 msgid "" "<p><b>Creating own Images</b> is used if you\n" -"want to skip the complete step of RPM installation. Instead AutoYaST will " -"dump an\n" -"image on the harddisk which is a lot faster and can be pre-configured " -"already.\n" -"Everything else than RPM installation is done like during a normal auto-" -"installation.</p>" +"want to skip the complete step of RPM installation. Instead AutoYaST will dump an\n" +"image on the harddisk which is a lot faster and can be pre-configured already.\n" +"Everything else than RPM installation is done like during a normal auto-installation.</p>" msgstr "" "<p>若您想要跳过整个 RPM 安装步骤可使用<b>创建自用映像</b>。\n" "AutoYaST 将转储一个安装更快、可预配置好的映像到硬盘。\n" "除了 RPM 安装步骤其他都跟正常的自动安装一样。</p>" -#: src/clients/deploy_image_auto.rb:336 src/clients/deploy_image_auto.rb:347 +#: src/lib/installation/clients/deploy_image_auto.rb:338 +#: src/lib/installation/clients/deploy_image_auto.rb:349 msgid "you need to do the software selection before creating an image" msgstr "您在创建映像前需要选择一些软件" #. TRANSLATORS: help text -#: src/clients/deploying_proposal.rb:76 +#: src/lib/installation/clients/deploying_proposal.rb:76 msgid "" -"<p>Note that when installing from images, the time stamps of all packages " -"originating from the images will\n" -"not match the installation date but rather the date the image was created." -msgstr "" -"<p>注意当从映像安装时，全部源自映像的软件包的时间戳记将不会匹配安装日期，而是" -"映像创建日期。</p>" +"<p>Note that when installing from images, the time stamps of all packages originating from the images will\n" +"not match the installation date but rather the date the image was created.</p>" +msgstr "<p>注意当从映像安装时，全部源自映像的软件包的时间戳记将不会匹配安装日期，而是映像创建日期。</p>" #. TRANSLATORS: help text -#: src/clients/deploying_proposal.rb:80 +#: src/lib/installation/clients/deploying_proposal.rb:80 msgid "" "<p>Installation from images is disabled by default if the current\n" "pattern selection does not fit any set of images.</p>" msgstr "<p>若当前软件选集不匹配任何一组映像，将默认禁用从映像安装。</p>" -#: src/clients/deploying_proposal.rb:90 +#: src/lib/installation/clients/deploying_proposal.rb:90 msgid "Error: Images should not be used for mode: %1." msgstr "错误：映像不应用于模式：%1。" #. changed to true -#: src/clients/deploying_proposal.rb:119 +#: src/lib/installation/clients/deploying_proposal.rb:119 msgid "" "Cannot enable installation from images.\n" "\n" @@ -225,45 +449,45 @@ "当前所选软件集不匹配安装介质上存储的映像。\n" #. this is a menu entry -#: src/clients/deploying_proposal.rb:135 +#: src/lib/installation/clients/deploying_proposal.rb:135 msgid "Installation from &Images" msgstr "从映像安装(&I)" #. TRANSLATORS: Installation overview -#: src/clients/deploying_proposal.rb:155 +#: src/lib/installation/clients/deploying_proposal.rb:155 msgid "No installation images are available" msgstr "没有可用安装映像" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/deploying_proposal.rb:166 +#: src/lib/installation/clients/deploying_proposal.rb:166 msgid "Installation from images is enabled (disable</a>)." msgstr "从映像安装已启用 (禁用</a>)。" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/deploying_proposal.rb:181 +#: src/lib/installation/clients/deploying_proposal.rb:181 msgid "Installation from images is disabled (enable</a>)." msgstr "从映像安装已禁用 (启用</a>)。" #. progress step title -#: src/clients/desktop_finish.rb:70 +#: src/lib/installation/clients/desktop_finish.rb:70 msgid "Initializing default window manager..." msgstr "正在初始化默认窗口管理器..." #. feedback heading -#: src/clients/inst_addon_update_sources.rb:52 +#: src/lib/installation/clients/inst_addon_update_sources.rb:51 msgid "Add-on Product Installation" msgstr "附加产品安装" #. feedback message -#: src/clients/inst_addon_update_sources.rb:54 +#: src/lib/installation/clients/inst_addon_update_sources.rb:53 msgid "Reading packages available in the repositories..." msgstr "正在读取软件源中可用的软件包..." #. popup error message #. %1 represents the the error message details -#: src/clients/inst_addon_update_sources.rb:110 +#: src/lib/installation/clients/inst_addon_update_sources.rb:109 msgid "" "An error occurred while connecting to the server.\n" "Details: %1\n" @@ -277,33 +501,33 @@ #. bnc #542792 #. Repository name must be generated from product details -#: src/clients/inst_addon_update_sources.rb:166 +#: src/lib/installation/clients/inst_addon_update_sources.rb:165 msgid "Updates for %1 %2" msgstr "%1 的更新 %2" -#: src/clients/inst_addon_update_sources.rb:173 -#: src/clients/inst_system_analysis.rb:301 +#: src/lib/installation/clients/inst_addon_update_sources.rb:172 +#: src/lib/installation/clients/inst_system_analysis.rb:304 msgid "Unknown Product" msgstr "未知产品" #. strings for "ask for online update"-popup -#: src/clients/inst_ask_online_update.rb:71 +#: src/lib/installation/clients/inst_ask_online_update.rb:70 msgid "Run Update" msgstr "运行更新" -#: src/clients/inst_ask_online_update.rb:72 +#: src/lib/installation/clients/inst_ask_online_update.rb:71 msgid "Skip Update" msgstr "跳过更新" -#: src/clients/inst_ask_online_update.rb:74 +#: src/lib/installation/clients/inst_ask_online_update.rb:73 msgid "Online Update" msgstr "在线更新" -#: src/clients/inst_ask_online_update.rb:75 +#: src/lib/installation/clients/inst_ask_online_update.rb:74 msgid "Run Online Update now?" msgstr "立即运行在线更新吗？" -#: src/clients/inst_ask_online_update.rb:77 +#: src/lib/installation/clients/inst_ask_online_update.rb:76 msgid "" "Select whether to run an online update now.\n" "You may skip this step and run an online update later.\n" @@ -315,43 +539,50 @@ #. Build dialog #. ---------------------------------------------------------------------- #. heading text -#: src/clients/inst_complex_welcome.rb:86 +#: src/lib/installation/clients/inst_complex_welcome.rb:65 msgid "Language, Keyboard and License Agreement" msgstr "语言、键盘和许可协议" #. combo box label #. combobox #. TRANSLATORS: Combo box -#: src/clients/inst_complex_welcome.rb:92 -#: src/clients/inst_release_notes.rb:218 src/clients/inst_release_notes.rb:437 +#: src/lib/installation/clients/inst_complex_welcome.rb:71 +#: src/lib/installation/clients/inst_release_notes.rb:217 +#: src/lib/installation/clients/inst_release_notes.rb:431 msgid "&Language" msgstr "语言(&L)" #. combo box label -#: src/clients/inst_complex_welcome.rb:100 +#: src/lib/installation/clients/inst_complex_welcome.rb:79 msgid "&Keyboard Layout" msgstr "键盘布局(&K)" #. bnc #359456 #. TRANSLATORS: check-box -#: src/clients/inst_complex_welcome.rb:112 +#: src/lib/installation/clients/inst_complex_welcome.rb:91 msgid "I &Agree to the License Terms." msgstr "我同意许可条款。(&A)" #. this type of contents will be shown only for initial installation dialog +#: src/lib/installation/clients/inst_complex_welcome.rb:110 +#, fuzzy +#| msgid "Keyboard &test:" +msgid "K&eyboard Test" +msgstr "键盘测试(&T)：" + #. TRANSLATORS: dialog caption -#: src/clients/inst_complex_welcome.rb:137 -#: src/clients/inst_complex_welcome.rb:318 +#: src/lib/installation/clients/inst_complex_welcome.rb:119 +#: src/lib/installation/clients/inst_complex_welcome.rb:299 msgid "License Agreement" msgstr "许可协议" #. TRANSLATORS: button label -#: src/clients/inst_complex_welcome.rb:143 +#: src/lib/installation/clients/inst_complex_welcome.rb:141 msgid "License &Translations..." msgstr "许可译文(&T)..." #. help text for initial (first time) language screen -#: src/clients/inst_complex_welcome.rb:172 +#: src/lib/installation/clients/inst_complex_welcome.rb:153 msgid "" "<p>\n" "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n" @@ -364,12 +595,11 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/clients/inst_complex_welcome.rb:180 +#: src/lib/installation/clients/inst_complex_welcome.rb:161 msgid "" "<p>\n" "The license must be accepted before the installation continues.\n" -"Use <b>License Translations...</b> to show the license in all available " -"translations.\n" +"Use <b>License Translations...</b> to show the license in all available translations.\n" "</p>\n" msgstr "" "<P>\n" @@ -378,7 +608,7 @@ "</p>\n" #. help text, continued -#: src/clients/inst_complex_welcome.rb:187 +#: src/lib/installation/clients/inst_complex_welcome.rb:168 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -389,7 +619,7 @@ "</p>\n" #. help text, continued -#: src/clients/inst_complex_welcome.rb:193 +#: src/lib/installation/clients/inst_complex_welcome.rb:174 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -401,7 +631,7 @@ "</p>\n" #. help text, continued -#: src/clients/inst_complex_welcome.rb:200 +#: src/lib/installation/clients/inst_complex_welcome.rb:181 msgid "" "<p>\n" "Select <b>Abort</b> to abort the\n" @@ -418,23 +648,23 @@ #. 7 = Failed to connect to host. #. 28 = Operation timeout. #. push button -#: src/clients/inst_complex_welcome.rb:230 -#: src/clients/inst_download_release_notes.rb:139 -#: src/clients/inst_system_analysis.rb:299 +#: src/lib/installation/clients/inst_complex_welcome.rb:211 +#: src/lib/installation/clients/inst_download_release_notes.rb:126 +#: src/lib/installation/clients/inst_system_analysis.rb:302 msgid "Re&lease Notes..." msgstr "版本资讯(&L)..." -#: src/clients/inst_complex_welcome.rb:342 +#: src/lib/installation/clients/inst_complex_welcome.rb:323 msgid "You must accept the license to install this product" msgstr "您必须接受许可才能安装本产品" #. TRANSLATORS: check box, see #ZMD -#: src/clients/inst_congratulate.rb:107 +#: src/lib/installation/clients/inst_congratulate.rb:107 msgid "&Disable ZMD Service" msgstr "禁用 ZMD 服务(&D)" #. TRANSLATORS: help text, see #ZMD -#: src/clients/inst_congratulate.rb:114 +#: src/lib/installation/clients/inst_congratulate.rb:114 msgid "" "<p>Select <b>Disable ZMD Service</b> to stop and disable\n" "the ZMD service during system start.</p>\n" @@ -442,22 +672,22 @@ #. Check box: start the clone process and store the AutoYaST #. profile in /root/autoinst.xml -#: src/clients/inst_congratulate.rb:149 +#: src/lib/installation/clients/inst_congratulate.rb:149 msgid "&Clone This System for AutoYaST" msgstr "为 Autoyast 克隆本系统(&C)" #. caption for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:155 +#: src/lib/installation/clients/inst_congratulate.rb:155 msgid "Installation Completed" msgstr "安装完成" #. congratulation text 1/4 -#: src/clients/inst_congratulate.rb:163 +#: src/lib/installation/clients/inst_congratulate.rb:163 msgid "<p><b>Congratulations!</b></p>" msgstr "<p><b>愿原力与你同在！德玛西亚！</b></p>" #. congratulation text 2/4 -#: src/clients/inst_congratulate.rb:165 +#: src/lib/installation/clients/inst_congratulate.rb:165 msgid "" "<p>The installation of &product; on your machine is complete.\n" "After clicking <b>Finish</b>, you can log in to the system.</p>\n" @@ -466,29 +696,29 @@ "点击<b>完成</b>后，您就可以登入该系统了。</p>\n" #. congratulation text 3/4 -#: src/clients/inst_congratulate.rb:169 +#: src/lib/installation/clients/inst_congratulate.rb:169 msgid "<p>Visit us at %1.</p>" msgstr "<p>欢迎访问我们的官网 %1。</p>" #. congratulation text 4/4 -#: src/clients/inst_congratulate.rb:172 +#: src/lib/installation/clients/inst_congratulate.rb:172 msgid "<p>Have a lot of fun!<br>Your SUSE Development Team</p>" msgstr "<p>祝您使用愉快！<br>您的 SUSE 开发团队</p>" #. help 1/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:197 +#: src/lib/installation/clients/inst_congratulate.rb:196 msgid "<p>Your system is ready for use.</p>" msgstr "<p>您的系统可以使用了。</p>" #. help 2/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:199 +#: src/lib/installation/clients/inst_congratulate.rb:198 msgid "" "<p><b>Finish</b> will close the YaST installation and take you\n" "to the login screen.</p>\n" msgstr "<p><b>完成</b>将关闭 YaST 安装程序并带您到登录屏幕。</p>\n" #. help 3/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.rb:204 +#: src/lib/installation/clients/inst_congratulate.rb:203 msgid "" "<p>If you choose the default graphical desktop KDE, you can\n" "adjust some KDE settings to your hardware. Also notice\n" @@ -498,46 +728,34 @@ "也请留意我们的 SUSE 欢迎界面。</p>\n" #. Show this help only in case of KDE as the default windowmanager -#: src/clients/inst_congratulate.rb:214 +#: src/lib/installation/clients/inst_congratulate.rb:215 msgid "" "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n" -"AutoYaST is a way to do a complete SUSE Linux installation without user " -"interaction. AutoYaST\n" -"needs a profile to know what the installed system should look like. If this " -"option is\n" -"selected, a profile of the current system is stored in <tt>/root/autoinst." -"xml</tt>.</p>" +"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" +"needs a profile to know what the installed system should look like. If this option is\n" +"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>" msgstr "" "<p>若您想要创建一个 AutoYaST 方案请使用<b>克隆</b>。\n" "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n" "AutoYaST 需要一个方案来了解安装好的系统应该是怎样的。\n" -"若选中此选项，将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。" -"</p>" +"若选中此选项，将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。</p>" -#. Dialog busy message -#. TRANSLATORS: busy message -#: src/clients/inst_congratulate.rb:265 -#: src/include/installation/inst_inc_all.rb:126 -msgid "Finishing the installation..." -msgstr "正在完成安装..." - #. #187558 #. Load Add-On products configured in the fist stage -#: src/clients/inst_congratulate.rb:308 -msgid "" -"<p>To clone the current system, the <b>%1</b> package must be installed.</p>" +#: src/lib/installation/clients/inst_congratulate.rb:310 +msgid "<p>To clone the current system, the <b>%1</b> package must be installed.</p>" msgstr "<p>要克隆当前系统，您必须安装 <b>%1</b> 软件包。</p>" -#: src/clients/inst_congratulate.rb:311 +#: src/lib/installation/clients/inst_congratulate.rb:313 msgid "<p>Install it now?</p>" msgstr "<p>立即安装它吗？</p>" -#: src/clients/inst_congratulate.rb:313 +#: src/lib/installation/clients/inst_congratulate.rb:315 msgid "autoyast2 package not installed. Cloning disabled." msgstr "未安装 autoyast2 软件包。克隆已禁用。" #. OEM image if target disk is defined -#: src/clients/inst_deploy_image.rb:46 +#: src/lib/installation/clients/inst_deploy_image.rb:46 msgid "The system will reboot now..." msgstr "系统将立即重新引导..." @@ -546,15 +764,16 @@ #. twice more steps #. FIXME: 2 minutes #. own workflow for OEM image deployment -#: src/clients/inst_deploy_image.rb:106 src/clients/inst_deploy_image.rb:351 -#: src/clients/inst_prepareprogress.rb:110 -#: src/clients/inst_prepareprogress.rb:151 +#: src/lib/installation/clients/inst_deploy_image.rb:106 +#: src/lib/installation/clients/inst_deploy_image.rb:351 +#: src/lib/installation/clients/inst_prepareprogress.rb:110 +#: src/lib/installation/clients/inst_prepareprogress.rb:152 msgid "Deploying Images..." msgstr "正在部署映像..." #. BNC #444209 #. false == error -#: src/clients/inst_deploy_image.rb:167 +#: src/lib/installation/clients/inst_deploy_image.rb:167 msgid "" "Deploying images has failed.\n" "Aborting the installation...\n" @@ -563,296 +782,266 @@ "正在中止安装...\n" #. TRANSLATORS: pop-up message -#: src/clients/inst_deploy_image.rb:199 +#: src/lib/installation/clients/inst_deploy_image.rb:199 msgid "" "Debugging has been turned on.\n" -"YaST will open a software manager for you to check the current status of " -"packages." +"YaST will open a software manager for you to check the current status of packages." msgstr "" "已经打开调试功能。\n" "YaST 将打开一个软件包管理器来让您检查软件包当前状态。" #. unknown image -#: src/clients/inst_deploy_image.rb:375 +#: src/lib/installation/clients/inst_deploy_image.rb:375 msgid "Downloading image at speed %1/s" msgstr "正在下载映像，速度：%1/秒" -#: src/clients/inst_deploy_image.rb:380 +#: src/lib/installation/clients/inst_deploy_image.rb:380 msgid "Downloading image %1 at speed %2/s" msgstr "正在下载映像 %1，速度：%2/秒" #. reset the label -#: src/clients/inst_deploy_image.rb:442 +#: src/lib/installation/clients/inst_deploy_image.rb:442 msgid "Deploying image..." msgstr "正在部署映像..." -#: src/clients/inst_deploy_image.rb:445 +#: src/lib/installation/clients/inst_deploy_image.rb:445 msgid "Deploying image %1..." msgstr "正在部署映像 %1..." #. FIXME: move blacklist to Storage -#: src/clients/inst_disk_for_image.rb:84 +#: src/lib/installation/clients/inst_disk_for_image.rb:84 msgid "Select the disk to deploy the image to." msgstr "选择要部署映像的磁盘。" -#: src/clients/inst_disk_for_image.rb:85 +#: src/lib/installation/clients/inst_disk_for_image.rb:85 msgid "All data on the disk will be lost!!!" msgstr "该磁盘上的全部数据均将被摧毁！！！" -#: src/clients/inst_disk_for_image.rb:87 +#: src/lib/installation/clients/inst_disk_for_image.rb:87 msgid "&Disk to Use" msgstr "要使用的磁盘(&D)" -#: src/clients/inst_disk_for_image.rb:93 -msgid "" -"Select the disk, which the image will be deployed to. All data on the disk " -"will be lost and the disk will be partitioned as defined in the image." -msgstr "" -"请选择将部署映像的磁盘。该磁盘上的全部数据均将被摧毁，磁盘将以映像中定义的方" -"式被重新分区。" +#: src/lib/installation/clients/inst_disk_for_image.rb:93 +msgid "Select the disk, which the image will be deployed to. All data on the disk will be lost and the disk will be partitioned as defined in the image." +msgstr "请选择将部署映像的磁盘。该磁盘上的全部数据均将被摧毁，磁盘将以映像中定义的方式被重新分区。" -#: src/clients/inst_disk_for_image.rb:100 +#: src/lib/installation/clients/inst_disk_for_image.rb:100 msgid "Hard Disk for Image Deployment" msgstr "用于部署映像的硬盘" #. popup label -#: src/clients/inst_disks_activate.rb:60 +#: src/lib/installation/clients/inst_disks_activate.rb:60 msgid "Detecting Available Controllers" msgstr "正在检测可用控制器" #. dialog caption -#: src/clients/inst_disks_activate.rb:77 +#: src/lib/installation/clients/inst_disks_activate.rb:76 msgid "Disk Activation" msgstr "磁盘激活" -#: src/clients/inst_disks_activate.rb:87 +#: src/lib/installation/clients/inst_disks_activate.rb:86 msgid "Configure &DASD Disks" msgstr "配置 &DASD 磁盘" -#: src/clients/inst_disks_activate.rb:93 +#: src/lib/installation/clients/inst_disks_activate.rb:92 msgid "Configure &ZFCP Disks" msgstr "配置 &ZFCP 磁盘" -#: src/clients/inst_disks_activate.rb:99 +#: src/lib/installation/clients/inst_disks_activate.rb:98 msgid "Configure &FCoE Interfaces" msgstr "配置以太网络光纤通道接口(&F)" -#: src/clients/inst_disks_activate.rb:111 +#: src/lib/installation/clients/inst_disks_activate.rb:110 msgid "Configure &iSCSI Disks" msgstr "配置 &iSCSI 磁盘" -#: src/clients/inst_disks_activate.rb:112 +#: src/lib/installation/clients/inst_disks_activate.rb:111 msgid "Change Net&work Configuration" msgstr "修改网络配置(&W)" #. TRANSLATORS: dialog caption -#: src/clients/inst_doit.rb:63 +#: src/lib/installation/clients/inst_doit.rb:56 msgid "Installation - Warming Up" msgstr "安装 - 热身" -#. TRANSLATORS: starting the installation process -#. dialog cotent (progress information) -#. popup headline (#x1) -#: src/clients/inst_doit.rb:67 src/include/installation/inst_inc_second.rb:379 -msgid "Starting Installation..." -msgstr "正在启动安装..." - #. TRANSLATORS: dialog help -#: src/clients/inst_doit.rb:70 +#: src/lib/installation/clients/inst_doit.rb:63 msgid "<p>Installation is just about to start!</p>" msgstr "<p>安装即将开始！</p>" #. Set the UI content to show some progress. -#. TODO FIXME: use a better title (reused existing texts because of text freeze) +#. FIXME: use a better title (reused existing texts because of text freeze) #. TRANSLATORS: dialog caption #. bug #302384 -#: src/clients/inst_download_release_notes.rb:147 -#: src/clients/inst_initialization.rb:56 -#: src/clients/inst_installation_options.rb:151 +#: src/lib/installation/clients/inst_download_release_notes.rb:134 +#: src/lib/installation/clients/inst_initialization.rb:56 +#: src/lib/installation/clients/inst_installation_options.rb:152 msgid "Initializing" msgstr "正在初始化" #. TRANSLATORS: dialog progress message -#: src/clients/inst_download_release_notes.rb:147 -#: src/clients/inst_initialization.rb:44 +#: src/lib/installation/clients/inst_download_release_notes.rb:134 +#: src/lib/installation/clients/inst_initialization.rb:44 msgid "Initializing the installation..." msgstr "正在初始化安装..." #. popup message, list of repositores is appended to the text -#: src/clients/inst_extrasources.rb:150 +#: src/lib/installation/clients/inst_extrasources.rb:142 msgid "Package updates have been found in these additional repositories:" msgstr "在这些额外的软件源中找到了软件包更新：" #. yes/no popup question -#: src/clients/inst_extrasources.rb:168 +#: src/lib/installation/clients/inst_extrasources.rb:160 msgid "Start the software manager to check and install the updates?" msgstr "启动软件包管理器来检查和安装这些更新吗？" #. check box -#: src/clients/inst_extrasources.rb:512 +#: src/lib/installation/clients/inst_extrasources.rb:501 msgid "Show &package updates" msgstr "显示软件包更新(&P)" #. Adjust a SlideShow dialog if not configured #. kilobytes #. just make it longer than inst_finish, TODO: better value later -#: src/clients/inst_finish.rb:88 src/clients/inst_prepareprogress.rb:139 -#: src/clients/inst_prepareprogress.rb:157 +#: src/lib/installation/clients/inst_finish.rb:79 +#: src/lib/installation/clients/inst_prepareprogress.rb:140 +#: src/lib/installation/clients/inst_prepareprogress.rb:158 msgid "Finishing Basic Installation" msgstr "正在完成基础安装" #. Might be left from the previous stage -#: src/clients/inst_finish.rb:114 +#: src/lib/installation/clients/inst_finish.rb:105 msgid "Creating list of finish scripts to call..." msgstr "正在创建要调用的收尾脚本列表..." #. progress stage -#: src/clients/inst_finish.rb:213 +#: src/lib/installation/clients/inst_finish.rb:204 msgid "Copy files to installed system" msgstr "复制文件到安装好的系统" #. progress stage -#: src/clients/inst_finish.rb:220 +#: src/lib/installation/clients/inst_finish.rb:211 msgid "Save configuration" msgstr "保存配置" #. progress stage -#: src/clients/inst_finish.rb:227 +#: src/lib/installation/clients/inst_finish.rb:218 msgid "Save installation settings" msgstr "保存安装设置" #. progress stage -#: src/clients/inst_finish.rb:236 +#: src/lib/installation/clients/inst_finish.rb:227 msgid "Install boot manager" msgstr "安装引导管理器" #. progress stage -#: src/clients/inst_finish.rb:243 +#: src/lib/installation/clients/inst_finish.rb:234 msgid "Prepare system for initial boot" msgstr "为首次引导准备系统" #. merge steps from add-on products #. bnc #438678 -#: src/clients/inst_finish.rb:348 +#: src/lib/installation/clients/inst_finish.rb:338 msgid "Checking stage: %1..." msgstr "正在检查阶段：%1..." #. a fallback busy message -#: src/clients/inst_finish.rb:437 +#: src/lib/installation/clients/inst_finish.rb:425 msgid "Calling step %1..." msgstr "正在调用步骤 %1..." #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log -#: src/clients/inst_finish.rb:457 +#: src/lib/installation/clients/inst_finish.rb:445 msgid " * %1" msgstr " * %1" #. Anything else -#: src/clients/inst_finish.rb:494 +#: src/lib/installation/clients/inst_finish.rb:482 msgid "Finished" msgstr "已完成" #. get the latest errors -#: src/clients/inst_finish.rb:625 +#: src/lib/installation/clients/inst_finish.rb:614 msgid "Installation Error" msgstr "安装出错" #. Button to accept a license agreement -#: src/clients/inst_info.rb:63 +#: src/lib/installation/clients/inst_info.rb:63 msgid "I &Agree" msgstr "我愿意(&A)" #. Button to reject a license agreement -#: src/clients/inst_info.rb:67 +#: src/lib/installation/clients/inst_info.rb:67 msgid "I Do &Not Agree" msgstr "我当时就不干了(&N)" #. TRANSLATORS: dialog help -#: src/clients/inst_initialization.rb:42 +#: src/lib/installation/clients/inst_initialization.rb:42 msgid "Installation is being initialized." msgstr "正在初始化安装。" -#. TRANSLATORS: dialog help -#. help for the dialog - busy message -#: src/clients/inst_initialization.rb:48 -#: src/include/installation/inst_inc_all.rb:59 -msgid "<p>Please wait...</p>" -msgstr "<p>请稍候...</p>" - #. TRANSLATORS: dialog progress message -#: src/clients/inst_initialization.rb:50 +#: src/lib/installation/clients/inst_initialization.rb:50 msgid "Preparing the initial system configuration..." msgstr "正在准备初始系统配置..." #. dialog caption -#: src/clients/inst_installation_options.rb:83 +#: src/lib/installation/clients/inst_installation_options.rb:83 msgid "Installation Options" msgstr "安装选项" -#. TRANSLATORS: progress message -#. dialog caption -#: src/clients/inst_installation_options.rb:153 -#: src/include/installation/inst_inc_all.rb:64 -msgid "Initializing..." -msgstr "正在初始化..." - #. check box -#: src/clients/inst_installation_options.rb:180 +#: src/lib/installation/clients/inst_installation_options.rb:181 msgid "&Add Online Repositories Before Installation" msgstr "在安装前添加在线软件源(&A)" #. check box -#: src/clients/inst_installation_options.rb:190 +#: src/lib/installation/clients/inst_installation_options.rb:193 msgid "In&clude Add-on Products from Separate Media" msgstr "包括独立介质中的附加产品(&C)" #. help text for installation method -#: src/clients/inst_installation_options.rb:201 +#: src/lib/installation/clients/inst_installation_options.rb:204 msgid "<p><big><b>Installation Options</b></big></p>" msgstr "<p><big><b>安装选项</b></big></p>" #. help text for installation option -#: src/clients/inst_installation_options.rb:204 +#: src/lib/installation/clients/inst_installation_options.rb:207 msgid "" "<p>\n" "To use suggested remote repositories during installation or update, select\n" "<b>Add Online Repositories Before Installation</b>.</p>" msgstr "" "<p>\n" -"要在安装或者更新时使用建议的远程软件源，请选择<b>在安装前添加在线软件源</b>。" -"</p>" +"要在安装或者更新时使用建议的远程软件源，请选择<b>在安装前添加在线软件源</b>。</p>" #. help text for installation method -#: src/clients/inst_installation_options.rb:208 +#: src/lib/installation/clients/inst_installation_options.rb:213 msgid "" "<p>\n" -"To install an add-on product from separate media together with &product;, " -"select\n" +"To install an add-on product from separate media together with &product;, select\n" "<b>Include Add-on Products from Separate Media</b>.</p>\n" msgstr "" "<p>\n" -"要在安装 &product; 时从独立介质安装附加产品，请选择<b>包括独立介质中的附加产" -"品</b>。</p>\n" +"要在安装 &product; 时从独立介质安装附加产品，请选择<b>包括独立介质中的附加产品</b>。</p>\n" #. help text: additional help for installation -#: src/clients/inst_installation_options.rb:211 -msgid "" -"<p>If you need specific hardware drivers for installation, see <i>http://" -"drivers.suse.com</i> site.</p>" +#: src/lib/installation/clients/inst_installation_options.rb:216 +msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>" msgstr "<p>若您需要安装特种硬件驱动，请参考 <i>http://drivers.suse.com</i> 站点。</p>" #. Error message -#: src/clients/inst_license.rb:128 +#: src/lib/installation/clients/inst_license.rb:128 msgid "Internal error: Missing license to show" msgstr "内部错误：缺少应显示的许可" #. TRANSLATORS: dialog caption -#: src/clients/inst_network_check.rb:82 +#: src/lib/installation/clients/inst_network_check.rb:82 msgid "Network Setup" msgstr "网络设置" #. TRANSLATORS: dialog label -#: src/clients/inst_network_check.rb:97 +#: src/lib/installation/clients/inst_network_check.rb:95 msgid "" "No network setup has been found.\n" "It is important if using remote repositories,\n" @@ -863,44 +1052,43 @@ "否则您可以放心地跳过该步骤。\n" #. TRANSLATORS: dialog label -#: src/clients/inst_network_check.rb:107 +#: src/lib/installation/clients/inst_network_check.rb:105 msgid "Configure your network card now?" msgstr "立即配置您的网卡吗？" #. TRANSLATORS: frame label -#: src/clients/inst_network_check.rb:111 +#: src/lib/installation/clients/inst_network_check.rb:109 msgid "Select" msgstr "选择" #. TRANSLATORS: radio button -#: src/clients/inst_network_check.rb:120 +#: src/lib/installation/clients/inst_network_check.rb:118 msgid "&Yes, Run the Network Setup" msgstr "是，运行网络设置(&Y)" #. TRANSLATORS: radio button -#: src/clients/inst_network_check.rb:128 +#: src/lib/installation/clients/inst_network_check.rb:126 msgid "No, &Skip the Network Setup" msgstr "否，跳过网络设置(&S)" #. TRANSLATORS: help text, part 1/2 -#: src/clients/inst_network_check.rb:141 +#: src/lib/installation/clients/inst_network_check.rb:139 msgid "" "<p>The current installation system does not\n" "have a configured network.</p>\n" msgstr "<p>当前安装的系统没有配置好的网络。</p>\n" #. TRANSLATORS: help text, part 2/2 -#: src/clients/inst_network_check.rb:145 +#: src/lib/installation/clients/inst_network_check.rb:143 msgid "" "<p>A configured network is needed for using remote repositories\n" -"or add-on products. If you do not use remote repositories, skip the " -"configuration.</p>\n" +"or add-on products. If you do not use remote repositories, skip the configuration.</p>\n" msgstr "" "<p>您需要配置一个网络连接来使用远程的软件源或附加产品。\n" "若您不使用远程软件源也可以跳过该配置。</p>\n" #. error popup -#: src/clients/inst_network_check.rb:187 +#: src/lib/installation/clients/inst_network_check.rb:185 msgid "" "Network configuration has failed.\n" "Check the log file %1 for details." @@ -909,41 +1097,33 @@ "详情请查看日志文件 %1。" #. TRANSLATORS: help text, part 1 -#: src/clients/inst_new_desktop.rb:57 +#: src/lib/installation/clients/inst_new_desktop.rb:57 msgid "" -"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a " -"number \n" -"of different desktop environments. Below you see a list of the 2 major " -"ones \n" +"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n" +"of different desktop environments. Below you see a list of the 2 major ones \n" "<b>GNOME</b> and <b>KDE</b>.</p>" msgstr "" -"<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环" -"境。\n" +"<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环境。\n" "下面您可以看到两种主流的桌面：<b>GNOME</b> 和 <b>KDE</b>。</p>" #. TRANSLATORS: help text, part 3 -#: src/clients/inst_new_desktop.rb:63 +#: src/lib/installation/clients/inst_new_desktop.rb:63 msgid "" -"<p>You may select alternative desktop environments (or one of minimal " -"installation patterns)\n" -"that could fit your needs better using the <b>Other</b> option . Later in " -"the software \n" -"selection or after installation, you can change your selection or add " -"additional desktop \n" +"<p>You may select alternative desktop environments (or one of minimal installation patterns)\n" +"that could fit your needs better using the <b>Other</b> option . Later in the software \n" +"selection or after installation, you can change your selection or add additional desktop \n" "environments. This screen allows you to set the default.</p>" msgstr "" -"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极" -"简安装软件集)。\n" -"稍后在软件选择中或安装后，您仍可以修改您的选择或添加额外桌面环境。本屏幕允许" -"您设置默认桌面环境。</p>" +"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极简安装软件集)。\n" +"稍后在软件选择中或安装后，您仍可以修改您的选择或添加额外桌面环境。本屏幕允许您设置默认桌面环境。</p>" #. TRANSLATORS: dialog caption -#: src/clients/inst_new_desktop.rb:121 +#: src/lib/installation/clients/inst_new_desktop.rb:121 msgid "Desktop Selection" msgstr "桌面选择" #. UI wait loop -#: src/clients/inst_new_desktop.rb:190 +#: src/lib/installation/clients/inst_new_desktop.rb:190 msgid "" "No desktop type was selected.\n" "Select the desired desktop environment." @@ -952,329 +1132,60 @@ "请选择中意的桌面环境。" #. BNC #449818 -#: src/clients/inst_new_desktop.rb:380 +#: src/lib/installation/clients/inst_new_desktop.rb:383 msgid "Other" msgstr "其它" #. hide the RN button and set the release notes for SlideShow (bnc#871158) -#: src/clients/inst_prepareprogress.rb:56 +#: src/lib/installation/clients/inst_prepareprogress.rb:56 msgid "Cannot find base product. Release notes will not be shown." msgstr "无法找到基础产品。将不会显示版本资讯。" #. 1 GB is a good approximation -#: src/clients/inst_prepareprogress.rb:104 +#: src/lib/installation/clients/inst_prepareprogress.rb:104 msgid "Preparing disks..." msgstr "正在准备磁盘..." -#. kilobytes -#: src/clients/inst_prepareprogress.rb:125 +#. Use 'zero' if image installation is not used +#. BNC #439104 +#: src/lib/installation/clients/inst_prepareprogress.rb:126 msgid "Installing Packages..." msgstr "正在安装软件包..." -#. question in a popup box -#: src/clients/inst_proposal.rb:214 -msgid "Really reset everything to default values?" -msgstr "真的全部重置为默认值吗？" - -#. explain consequences of a decision -#: src/clients/inst_proposal.rb:216 -msgid "You will lose all changes." -msgstr "您将丢失全部修改。" - -#. force_reset -#: src/clients/inst_proposal.rb:220 -msgid "Location of Stored Configuration" -msgstr "已存储配置位置" - -#. force write, so it always write profile even if user do not want -#. to store profile after installation -#: src/clients/inst_proposal.rb:227 -msgid "Failed to store configuration. Details can be found in log." -msgstr "存储配置失败。可在日志中找到细节。" - -#. message show when user has disabled the configuration -#: src/clients/inst_proposal.rb:238 -msgid "Skipping configuration upon user request" -msgstr "根据用户请求跳过配置" - -#. error message is a popup -#: src/clients/inst_proposal.rb:255 -msgid "" -"The proposal contains an error that must be\n" -"resolved before continuing.\n" -msgstr "提案存在一处错误，继续前必须解决掉它。\n" - -#. not using tabs -#. heading in proposal, in case the module doesn't create one -#. heading in proposal, in case the module doesn't create one -#: src/clients/inst_proposal.rb:496 src/clients/inst_proposal.rb:498 -#: src/clients/inst_proposal.rb:512 src/clients/inst_proposal.rb:555 -#: src/clients/inst_proposal.rb:557 src/clients/inst_proposal.rb:567 -msgid "ERROR: Missing Title" -msgstr "错误：缺少标题" - -#. busy message -#: src/clients/inst_proposal.rb:523 -msgid "Adapting the proposal to the current settings..." -msgstr "正在调整提案到当前设置..." - -#. busy message; -#. Initial contents of proposal subwindow while proposals are calculated -#: src/clients/inst_proposal.rb:527 src/clients/inst_proposal.rb:1029 -msgid "Analyzing your system..." -msgstr "正在分析您的系统..." - -#. fallback proposal, means usually an internal error -#: src/clients/inst_proposal.rb:698 -msgid "ERROR: No proposal" -msgstr "错误：无提案" - -#. Submodules handle their own error reporting -#. text for a message box -#: src/clients/inst_proposal.rb:743 -msgid "" -"Configuration saved.\n" -"There were errors." -msgstr "" -"配置已保存，\n" -"但存在错误。" - -#. dialog headline -#: src/clients/inst_proposal.rb:947 -msgid "Installation Overview" -msgstr "安装概览" - -#. Check box: Skip all the configurations in this dialog - -#. do this later manually or not at all -#. Translators: About 40 characters max, -#. use newlines for longer translations. -#. radio button -#: src/clients/inst_proposal.rb:971 -msgid "&Skip Configuration" -msgstr "跳过配置(&S)" - -#. radio button -#: src/clients/inst_proposal.rb:980 -msgid "&Use Following Configuration" -msgstr "使用以下配置(&U)" - -#. menu button -#. menu button -#. TRANSLATORS: Push button -#: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:247 -msgid "&Change..." -msgstr "修改(&C)..." - -#. menu button -#: src/clients/inst_proposal.rb:998 src/clients/inst_proposal.rb:1171 -msgid "&Export Configuration" -msgstr "导出配置(&E)" - -#. Help message between headline and installation proposal / settings summary. -#. May contain newlines, but don't make it very much longer than the original. -#: src/clients/inst_proposal.rb:1069 -msgid "Click a headline to make changes or use the \"Change...\" menu below." -msgstr "点击任一标题或使用下面的 \"修改...\" 菜单进行修改。" - -#: src/clients/inst_proposal.rb:1073 -msgid "Click a headline to make changes." -msgstr "点击标题作出修改。" - -#. menu button item -#: src/clients/inst_proposal.rb:1170 -msgid "&Reset to defaults" -msgstr "重置为默认值(&R)" - -#. General part of the help text for all types of proposals -#: src/clients/inst_proposal.rb:1206 -msgid "" -"<p>\n" -"Change the values by clicking on the respective headline\n" -"or by using the <b>Change...</b> menu.\n" -"</p>\n" -msgstr "" -"<p>\n" -"点击相应的标题或使用<b>修改...</b>菜单修改这些值。\n" -"</p>\n" - -#. Help text for installation proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1217 -msgid "" -"<p>\n" -"Select <b>Install</b> to perform a new installation with the values " -"displayed.\n" -"</p>\n" -msgstr "" -"<p>\n" -"选择<b>安装</b>用显示的值执行全新安装。\n" -"</p>\n" - -#. kicking out, bug #203811 -#. no such headline -#. // Help text for installation proposal, continued -#. help_text_string = help_text_string + _("<p> -#. To update an existing &product; system instead of doing a new install, -#. click the <b>Mode</b> headline or select <b>Mode</b> in the -#. <b>Change...</b> menu. -#. </p> -#. "); -#. Deliberately omitting "boot installed system" here to avoid -#. confusion: The user will be prompted for that if Linux -#. partitions are found. -#. - sh@suse.de 2002-02-26 -#. -#. Help text for installation proposal, continued -#. Deliberately omitting "boot installed system" here to avoid -#. confusion: The user will be prompted for that if Linux -#. partitions are found. -#. - sh@suse.de 2002-02-26 -#. -#. Help text for installation proposal, continued -#: src/clients/inst_proposal.rb:1243 src/clients/inst_proposal.rb:1270 -msgid "" -"<p>\n" -"Your hard disk has not been modified yet. You can still safely abort.\n" -"</p>\n" -msgstr "" -"<p>\n" -"尚未改动您的硬盘。您仍可以安全地中止。\n" -"</p>\n" - -#. Help text for update proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1253 -msgid "" -"<p>\n" -"Select <b>Update</b> to perform an update with the values displayed.\n" -"</p>\n" -msgstr "" -"<p>\n" -"选择<b>更新</b>用显示的值执行更新。\n" -"</p>\n" - -#. Help text for network configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1280 -msgid "" -"<p>\n" -"Put the network settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"按<b>下一步</b>使网络设置生效。\n" -"</p>\n" - -#. Help text for service configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1291 -msgid "" -"<p>\n" -"Put the service settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"按<b>下一步</b>使服务设置生效。\n" -"</p>\n" - -#. Help text for hardware configuration proposal -#. General part ("You can change values...") is added as the next paragraph. -#: src/clients/inst_proposal.rb:1302 -msgid "" -"<p>\n" -"Put the hardware settings into effect by pressing <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"按<b>下一步</b>使硬件设置生效。\n" -"</p>\n" - -#. Proposal in uml module -#: src/clients/inst_proposal.rb:1311 -msgid "<P><B>UML Installation Proposal</B></P>" -msgstr "<P><B>UML 安装提案</B></P>" - -#. help text -#: src/clients/inst_proposal.rb:1313 -msgid "" -"<P>UML (User Mode Linux) installation allows you to start independent\n" -"Linux virtual machines in the host system.</P>" -msgstr "<P>UML (用户模式 Linux) 安装允许您在主机系统中启动独立的 Linux 虚拟机。</P>" - -#. 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/clients/inst_proposal.rb:1330 -msgid "" -"<p>\n" -"To use the settings as displayed, press <b>Next</b>.\n" -"</p>\n" -msgstr "" -"<p>\n" -"要使用显示的设置，请按<b>下一步</b>。\n" -"</p>\n" - -#. help text -#: src/clients/inst_proposal.rb:1343 -msgid "" -"<p>Some proposals might be\n" -"locked by the system administrator and therefore cannot be changed. If a\n" -"locked proposal needs to be changed, ask your system administrator.</p>\n" -msgstr "" -"<p>系统管理员可能锁定了某些提案，因而您无法修改它们。\n" -"若需要修改锁定的提案，请垂询您的系统管理员。</p>\n" - -#. FATE #120373 -#: src/clients/inst_proposal.rb:1369 -msgid "&Update" -msgstr "更新(&U)" - -#: src/clients/inst_proposal.rb:1370 -msgid "&Install" -msgstr "安装(&I)" - #. TRANSLATORS: error message - the module does not provide command line interface -#: src/clients/inst_release_notes.rb:59 +#: src/lib/installation/clients/inst_release_notes.rb:59 msgid "There is no user interface available for this module." msgstr "该模块没有可用的用户界面。" #. combobox item -#: src/clients/inst_release_notes.rb:159 +#: src/lib/installation/clients/inst_release_notes.rb:159 msgid "Language: %1" msgstr "语言：%1" #. caption for dialog "Release Notes" -#: src/clients/inst_release_notes.rb:207 +#: src/lib/installation/clients/inst_release_notes.rb:206 msgid "Release Notes" msgstr "版本资讯" #. +2 thingies on the right -#: src/clients/inst_release_notes.rb:249 +#: src/lib/installation/clients/inst_release_notes.rb:248 msgid "&Product" msgstr "产品(&P)" #. help text for dialog "Release Notes" -#: src/clients/inst_release_notes.rb:261 +#: src/lib/installation/clients/inst_release_notes.rb:260 msgid "" "<p>The <b>release notes</b> for the installed Linux system provide a brief\n" "summary of new features and changes.</p>\n" msgstr "<p>安装好的 Linux 系统的<b>版本资讯</b>摘要说明了其新功能和改动。</p>\n" #. informative message in RichText widget -#: src/clients/inst_release_notes.rb:463 +#: src/lib/installation/clients/inst_release_notes.rb:457 msgid "<p>No release notes have been installed.</p>" msgstr "<p>未安装版本资讯。</p>" -#. TRANSLATORS: busy message -#. TRANSLATORS: progress stage, %1 stands for service name -#: src/clients/inst_restore_settings.rb:47 -#: src/include/installation/inst_inc_second.rb:283 -msgid "Starting service %1..." -msgstr "正在启动服务 %1..." - #. TRANSLATORS: help text -#: src/clients/inst_scenarios.rb:108 +#: src/lib/installation/clients/inst_scenarios.rb:108 msgid "" "<p>Select the scenario that meets your needs best.\n" "Additional software can be selected later in software proposal.</p>\n" @@ -1283,109 +1194,108 @@ "稍后可在软件提案中选择额外需要的软件。</p>\n" #. TRANSLATORS: pop-up message -#: src/clients/inst_scenarios.rb:138 +#: src/lib/installation/clients/inst_scenarios.rb:138 msgid "Choose one scenario, please." msgstr "请选择一个使用场景。" #. TRANSLATORS: frame label -#: src/clients/inst_scenarios.rb:298 +#: src/lib/installation/clients/inst_scenarios.rb:300 msgid "Choose Scenario" msgstr "选择使用场景" #. This dialog in not interactive #. always return `back when came from the previous dialog -#: src/clients/inst_system_analysis.rb:80 +#: src/lib/installation/clients/inst_system_analysis.rb:80 msgid "Analyzing the Computer" msgstr "正在分析计算机" #. TRANSLATORS: progress steps in system probing -#: src/clients/inst_system_analysis.rb:99 +#: src/lib/installation/clients/inst_system_analysis.rb:99 msgid "Probe USB devices" msgstr "检测 USB 设备" -#: src/clients/inst_system_analysis.rb:100 +#: src/lib/installation/clients/inst_system_analysis.rb:100 msgid "Probing USB devices..." msgstr "正在检测 USB 设备..." -#: src/clients/inst_system_analysis.rb:103 +#: src/lib/installation/clients/inst_system_analysis.rb:103 msgid "Probe FireWire devices" msgstr "检测火线设备..." -#: src/clients/inst_system_analysis.rb:104 +#: src/lib/installation/clients/inst_system_analysis.rb:104 msgid "Probing FireWire devices..." msgstr "正在检测火线设备..." -#: src/clients/inst_system_analysis.rb:107 +#: src/lib/installation/clients/inst_system_analysis.rb:107 msgid "Probe floppy disk devices" msgstr "检测软盘设备" -#: src/clients/inst_system_analysis.rb:108 +#: src/lib/installation/clients/inst_system_analysis.rb:108 msgid "Probing floppy disk devices..." msgstr "正在检测软盘设备..." -#: src/clients/inst_system_analysis.rb:112 +#: src/lib/installation/clients/inst_system_analysis.rb:112 msgid "Probe hard disk controllers" msgstr "检测硬盘控制器" -#: src/clients/inst_system_analysis.rb:113 +#: src/lib/installation/clients/inst_system_analysis.rb:113 msgid "Probing hard disk controllers..." msgstr "正在检测硬盘控制器..." -#: src/clients/inst_system_analysis.rb:116 +#: src/lib/installation/clients/inst_system_analysis.rb:116 msgid "Load kernel modules for hard disk controllers" msgstr "为硬盘控制器加载内核模块" -#: src/clients/inst_system_analysis.rb:117 +#: src/lib/installation/clients/inst_system_analysis.rb:117 msgid "Loading kernel modules for hard disk controllers..." msgstr "正在为硬盘控制器加载内核模块..." -#: src/clients/inst_system_analysis.rb:120 +#: src/lib/installation/clients/inst_system_analysis.rb:120 msgid "Probe hard disks" msgstr "检测硬盘" -#: src/clients/inst_system_analysis.rb:121 +#: src/lib/installation/clients/inst_system_analysis.rb:121 msgid "Probing hard disks..." msgstr "正在检测硬盘..." #. FATE #302980: Simplified user config during installation -#: src/clients/inst_system_analysis.rb:128 +#: src/lib/installation/clients/inst_system_analysis.rb:128 msgid "Search for system files" msgstr "搜索系统文件" -#: src/clients/inst_system_analysis.rb:129 +#: src/lib/installation/clients/inst_system_analysis.rb:129 msgid "Searching for system files..." msgstr "正在搜索系统文件..." -#: src/clients/inst_system_analysis.rb:132 +#: src/lib/installation/clients/inst_system_analysis.rb:132 msgid "Initialize software manager" msgstr "初始化软件包管理器" -#: src/clients/inst_system_analysis.rb:133 +#: src/lib/installation/clients/inst_system_analysis.rb:133 msgid "Initializing software manager..." msgstr "正在初始化软件包管理器..." #. TRANSLATORS: dialog caption -#: src/clients/inst_system_analysis.rb:138 +#: src/lib/installation/clients/inst_system_analysis.rb:138 msgid "System Probing" msgstr "系统检测" #. TRANSLATORS: dialog help -#: src/clients/inst_system_analysis.rb:144 +#: 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/clients/inst_system_analysis.rb:241 +#: src/lib/installation/clients/inst_system_analysis.rb:240 msgid "" "\n" -"Check 'drivers.suse.com' if you need specific hardware drivers for " -"installation." +"Check 'drivers.suse.com' if you need specific hardware drivers for installation." msgstr "" "\n" "若您需要安装特种硬件驱动请查看 'drivers.suse.com'。" #. pop-up error report -#: src/clients/inst_system_analysis.rb:255 +#: src/lib/installation/clients/inst_system_analysis.rb:254 msgid "" "No hard disks were found for the installation.\n" "Please check your hardware!\n" @@ -1395,7 +1305,7 @@ "请检查您的硬件！\n" "%1\n" -#: src/clients/inst_system_analysis.rb:265 +#: src/lib/installation/clients/inst_system_analysis.rb:264 msgid "" "No hard disks were found for the installation.\n" "During an automatic installation, they might be detected later.\n" @@ -1406,7 +1316,7 @@ "(尤其是在 S/390 或 iSCSI 系统上)\n" #. pop-up error report -#: src/clients/inst_system_analysis.rb:276 +#: src/lib/installation/clients/inst_system_analysis.rb:275 msgid "" "No hard disks and no hard disk controllers were\n" "found for the installation.\n" @@ -1418,7 +1328,7 @@ "%1\n" #. popup message -#: src/clients/inst_system_analysis.rb:318 +#: src/lib/installation/clients/inst_system_analysis.rb:320 msgid "" "Failed to initialize the software repositories.\n" "Aborting the installation." @@ -1427,68 +1337,77 @@ "即将中止安装。" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:109 +#: src/lib/installation/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "已移除" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:113 +#: src/lib/installation/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "已启用" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:117 +#: src/lib/installation/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "已禁用" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 -#: src/clients/inst_upgrade_urls.rb:675 +#: src/lib/installation/clients/inst_upgrade_urls.rb:220 +#: src/lib/installation/clients/inst_upgrade_urls.rb:617 +#: src/lib/installation/clients/inst_upgrade_urls.rb:676 msgid "Previously Used Repositories" msgstr "之前用过的软件源" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:226 +#: src/lib/installation/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "在您正在升级的系统中发现以下软件源：" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:236 +#: src/lib/installation/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "当前状态" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:238 +#: src/lib/installation/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "软件源" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:240 +#: src/lib/installation/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:250 +#. menu button +#. menu button +#: src/lib/installation/clients/inst_upgrade_urls.rb:247 +#: src/lib/installation/proposal_runner.rb:659 +#: src/lib/installation/proposal_runner.rb:783 +msgid "&Change..." +msgstr "修改(&C)..." + +#. TRANSLATORS: Push button +#: src/lib/installation/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "切换状态(&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:256 +#: src/lib/installation/clients/inst_upgrade_urls.rb:256 msgid "" "<p>Here you see all software repositories found\n" -"on the system you are upgrading. Enable the ones you want to include in the " -"upgrade process.</p>" +"on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>" msgstr "" "<p>在此您可以看到从您正在升级的系统中发现的全部软件源。\n" "请启用您想要在升级过程中使用的软件源。</p>" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:260 +#: src/lib/installation/clients/inst_upgrade_urls.rb:260 msgid "" "<p>To enable, remove or disable an URL, click on the\n" "<b>Toggle Status</b> button or double-click on the respective table item.</p>" @@ -1497,30 +1416,31 @@ "<b>切换状态</b>按钮或双击相应的表格项。</p>" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:264 +#: src/lib/installation/clients/inst_upgrade_urls.rb:264 msgid "<p>To change the URL, click on the <b>Change...</b> button.</p>" msgstr "<p>要修改 URL，请点击<b>修改...</b>按钮。</p>" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 -#: src/clients/inst_upgrade_urls.rb:299 +#: src/lib/installation/clients/inst_upgrade_urls.rb:286 +#: src/lib/installation/clients/inst_upgrade_urls.rb:293 +#: src/lib/installation/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "未知" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:373 +#: src/lib/installation/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "软件源 URL(&R)" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:586 +#: src/lib/installation/clients/inst_upgrade_urls.rb:587 msgid "Network is not Configured" msgstr "网络尚未配置" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:588 +#: src/lib/installation/clients/inst_upgrade_urls.rb:589 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1529,49 +1449,54 @@ "配置互联网连接吗？" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 +#: src/lib/installation/clients/inst_upgrade_urls.rb:620 +#: src/lib/installation/clients/inst_upgrade_urls.rb:677 msgid "Adding and removing repositories..." msgstr "正在添加和移除软件源..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 +#: src/lib/installation/clients/inst_upgrade_urls.rb:623 +#: src/lib/installation/clients/inst_upgrade_urls.rb:682 msgid "<p>Repositories are being added and removed.</p>" msgstr "<p>正在添加和移除软件源。</p>" -#: src/clients/inst_upgrade_urls.rb:641 +#: src/lib/installation/clients/inst_upgrade_urls.rb:642 msgid "Remove unused repositories" msgstr "移除无用的软件源" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 +#: src/lib/installation/clients/inst_upgrade_urls.rb:646 +#: src/lib/installation/clients/inst_upgrade_urls.rb:803 msgid "Removing unused repositories..." msgstr "正在移除无用的软件源..." -#: src/clients/inst_upgrade_urls.rb:652 +#: src/lib/installation/clients/inst_upgrade_urls.rb:653 msgid "Add enabled repositories" msgstr "添加已启用的软件源" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 +#: src/lib/installation/clients/inst_upgrade_urls.rb:656 +#: src/lib/installation/clients/inst_upgrade_urls.rb:869 msgid "Adding enabled repositories..." msgstr "正在添加已启用的软件源..." -#: src/clients/inst_upgrade_urls.rb:664 +#: src/lib/installation/clients/inst_upgrade_urls.rb:665 msgid "Add disabled repositories" msgstr "添加已禁用的软件源" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 +#: src/lib/installation/clients/inst_upgrade_urls.rb:669 +#: src/lib/installation/clients/inst_upgrade_urls.rb:1026 msgid "Adding disabled repositories..." msgstr "正在添加已禁用的软件源..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:838 +#: src/lib/installation/clients/inst_upgrade_urls.rb:843 msgid "Correct Media Requested" msgstr "需要正确的介质" -#: src/clients/inst_upgrade_urls.rb:840 +#: src/lib/installation/clients/inst_upgrade_urls.rb:845 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1584,7 +1509,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:903 +#: src/lib/installation/clients/inst_upgrade_urls.rb:908 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1598,7 +1523,7 @@ "该软件源将以已禁用模式添加。" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:940 +#: src/lib/installation/clients/inst_upgrade_urls.rb:945 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1610,7 +1535,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:960 +#: src/lib/installation/clients/inst_upgrade_urls.rb:965 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1622,7 +1547,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:980 +#: src/lib/installation/clients/inst_upgrade_urls.rb:985 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1633,7 +1558,7 @@ "URL：%2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1061 +#: src/lib/installation/clients/inst_upgrade_urls.rb:1066 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1644,17 +1569,17 @@ "URL：%2" #. dialog caption -#: src/clients/inst_welcome.rb:69 +#: src/lib/installation/clients/inst_welcome.rb:68 msgid "Welcome" msgstr "欢迎" #. welcome text 1/4 -#: src/clients/inst_welcome.rb:72 +#: src/lib/installation/clients/inst_welcome.rb:71 msgid "<p><b>Welcome!</b></p>" msgstr "<p><b>欢迎！</b></p>" #. welcome text 2/4 -#: src/clients/inst_welcome.rb:74 +#: src/lib/installation/clients/inst_welcome.rb:73 msgid "" "<p>There are a few more steps to take before your system is ready to\n" "use. YaST will now guide you through some basic configuration. Click\n" @@ -1667,116 +1592,109 @@ " \n" #. help ttext -#: src/clients/inst_welcome.rb:88 +#: src/lib/installation/clients/inst_welcome.rb:85 msgid "" "<p>Click <b>Next</b> to perform the\n" "basic configuration of the system.</p>\n" msgstr "<p>请点击<b>下一步</b>执行基本系统配置。</p>\n" #. TRANSLATORS: error message -#: src/clients/installation.rb:83 +#: src/lib/installation/clients/installation.rb:83 msgid "No workflow defined for this kind of installation." msgstr "没有为此类安装方式定义安装流程。" #. progress step title -#: src/clients/installation_settings_finish.rb:60 +#: src/lib/installation/clients/installation_settings_finish.rb:60 msgid "Writing automatic configuration..." msgstr "正在写入自动配置..." #. progress step title -#: src/clients/kernel_finish.rb:64 +#: src/lib/installation/clients/kernel_finish.rb:63 msgid "Updating kernel module dependencies..." msgstr "正在更新内核模块依赖关系..." #. progress step title -#: src/clients/ldconfig_finish.rb:61 +#: src/lib/installation/clients/ldconfig_finish.rb:60 msgid "Setting up linker cache..." msgstr "正在设置链接器超速缓存..." #. progress step title -#: src/clients/network_finish.rb:69 +#: src/lib/installation/clients/network_finish.rb:68 msgid "Saving network configuration..." msgstr "正在保存网络配置..." #. progress step title -#: src/clients/pre_umount_finish.rb:65 +#: src/lib/installation/clients/pre_umount_finish.rb:65 msgid "Checking the installed system..." msgstr "正在检查安装好的系统..." #. progress step title -#: src/clients/proxy_finish.rb:63 +#: src/lib/installation/clients/proxy_finish.rb:62 msgid "Saving proxy configuration..." msgstr "正在保存代理配置..." #. progress step title -#: src/clients/save_config_finish.rb:136 +#: src/lib/installation/clients/save_config_finish.rb:134 msgid "Saving time zone..." msgstr "正在保存时区设置..." #. progress step title -#: src/clients/save_config_finish.rb:145 +#: src/lib/installation/clients/save_config_finish.rb:143 msgid "Saving language..." msgstr "正在保存语言设置..." #. progress step title -#: src/clients/save_config_finish.rb:150 +#: src/lib/installation/clients/save_config_finish.rb:148 msgid "Saving console configuration..." msgstr "正在保存控制台配置..." #. progress step title -#: src/clients/save_config_finish.rb:169 +#: src/lib/installation/clients/save_config_finish.rb:167 msgid "Saving keyboard configuration..." msgstr "正在保存键盘配置..." #. progress step title -#: src/clients/save_config_finish.rb:174 +#: src/lib/installation/clients/save_config_finish.rb:172 msgid "Saving product information..." msgstr "正在保存产品信息..." #. progress step title -#: src/clients/save_config_finish.rb:179 +#: src/lib/installation/clients/save_config_finish.rb:177 msgid "Saving automatic installation settings..." msgstr "正在保存自动安装设置..." #. progress step title -#: src/clients/save_config_finish.rb:185 +#: src/lib/installation/clients/save_config_finish.rb:183 msgid "Saving security settings..." msgstr "正在保存安全设置..." #. progress step title -#: src/clients/save_hw_status_finish.rb:67 +#: src/lib/installation/clients/save_hw_status_finish.rb:66 msgid "Saving hardware configuration..." msgstr "正在保存硬件配置..." #. progress step title -#: src/clients/ssh_settings_finish.rb:65 +#: src/lib/installation/clients/ssh_settings_finish.rb:64 msgid "Copying SSH settings to installed system..." msgstr "正在将 SSH 设置复制到安装好的系统..." #. progress step title -#: src/clients/switch_scr_finish.rb:65 +#: src/lib/installation/clients/switch_scr_finish.rb:65 msgid "Moving to installed system..." msgstr "正在移动到安装好的系统..." #. progress step title -#: src/clients/umount_finish.rb:71 +#: src/lib/installation/clients/umount_finish.rb:71 msgid "Unmounting all mounted devices..." msgstr "正在卸载全部已挂载的设备..." #. progress step title -#: src/clients/x11_finish.rb:66 +#: src/lib/installation/clients/x11_finish.rb:65 msgid "Copying X Window System configuration into system..." msgstr "正在将 X 窗口系统配置复制进系统..." -#. progress step title -#. TRANSLATORS: busy message -#: src/clients/yast_inf_finish.rb:74 -#: src/include/installation/inst_inc_all.rb:112 -msgid "Writing YaST configuration..." -msgstr "正在写入 YaST 配置..." - #. call command -#: src/clients/yast_inf_finish.rb:109 +#: src/lib/installation/clients/yast_inf_finish.rb:108 msgid "" "\n" "**************************************************************\n" @@ -1800,231 +1718,280 @@ "**************************************************************\n" "\t\t" -#. dialog content - busy message -#: src/include/installation/inst_inc_all.rb:50 -msgid "Initializing the installation environment..." -msgstr "正在初始化安装环境..." +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006-2015 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#: src/lib/installation/copy_logs_finish.rb:42 +msgid "Copying log files to installed system..." +msgstr "正在将日志文件复制到安装好的系统..." -#. help for the dialog - busy message -#: src/include/installation/inst_inc_all.rb:52 -msgid "<p>Initializing the installation...</p>" -msgstr "<p>正在初始化安装...</p>" +#. progress step title +#: src/lib/installation/prep_shrink.rb:34 +msgid "Shrinking PREP partition..." +msgstr "正在收缩 PREP (PowerPC 参考平台) 分区..." -#. dialog content - busy message -#: src/include/installation/inst_inc_all.rb:57 -msgid "Preparing the 1st system configuration..." -msgstr "正在准备首次系统配置..." +#. question in a popup box +#: src/lib/installation/proposal_runner.rb:207 +msgid "Really reset everything to default values?" +msgstr "真的全部重置为默认值吗？" -#. TRANSLATORS: Error message -#: src/include/installation/inst_inc_all.rb:77 -msgid "" -"No installation control file has been found,\n" -"the installer cannot continue." -msgstr "未找到安装控制文件，安装器无法继续。" +#. explain consequences of a decision +#: src/lib/installation/proposal_runner.rb:209 +msgid "You will lose all changes." +msgstr "您将丢失全部修改。" -#. Somehow the graphical frontend failed and we're running in -#. text mode. Inform the user about this fact. -#: src/include/installation/inst_inc_all.rb:174 -msgid "" -"Your computer does not fulfill all requirements for\n" -"a graphical installation. There is either less than %1 MB\n" -"memory or the X server could not be started.\n" -"\n" -"As fallback, the text front-end of YaST2 will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" -msgstr "" -"您的计算机不满足图形安装的全部要求。\n" -"要么您的内存小于 %1 MB，要么系统无法启动 X 服务器。\n" -"\n" -"作为后备措施，YaST2 的文本前端将指引您完成安装过程。\n" -"该前端与图形前端提供了相同的功能，只不过看到的屏幕与手\n" -"册中的屏幕有所不同。\n" +#. while input loop +#: src/lib/installation/proposal_runner.rb:251 +msgid "Location of Stored Configuration" +msgstr "已存储配置位置" -#. The script YaST2 wants to inform about a problem with the -#. option no_x11 but it's broken. -#. else if (Installation::no_x11 ()) -#. Somehow the graphical frontend failed and we're running in -#. text mode. Inform the user about this fact. -#: src/include/installation/inst_inc_all.rb:193 +#. force write, so it always write profile even if user do not want +#. to store profile after installation +#: src/lib/installation/proposal_runner.rb:257 +msgid "Failed to store configuration. Details can be found in log." +msgstr "存储配置失败。可在日志中找到细节。" + +#. message show when user has disabled the configuration +#: src/lib/installation/proposal_runner.rb:268 +msgid "Skipping configuration upon user request" +msgstr "根据用户请求跳过配置" + +#. error message is a popup +#: src/lib/installation/proposal_runner.rb:288 msgid "" -"The graphical interface could not be started.\n" -"\n" -"Either the required packages were not installed (minimal installation) \n" -"or the graphics card is not properly supported.\n" -"\n" -"As fallback, the text front-end of YaST2 will guide you\n" -"through the installation. This front-end offers the\n" -"same functionality as the graphical one, but the screens\n" -"differ from those in the manual.\n" -msgstr "" -"无法启动图形界面。\n" -"\n" -"要么没有安装必需的包 (极简安装)，要么显卡支持不够好。\n" -"\n" -"作为后备措施，YaST2 的文本前端将指引您完成安装过程。\n" -"该前端与图形前端提供了相同的功能，只不过看到的屏幕\n" -"与手册中的屏幕有所不同。\n" +"The proposal contains an error that must be\n" +"resolved before continuing.\n" +msgstr "提案存在一处错误，继续前必须解决掉它。\n" -#. TRANSLATORS: progress stage, %1 stands for service name -#: src/include/installation/inst_inc_second.rb:278 -msgid "Start service %1" -msgstr "启动服务 %1" +#. busy message +#: src/lib/installation/proposal_runner.rb:394 +msgid "Adapting the proposal to the current settings..." +msgstr "正在调整提案到当前设置..." -#. TRANSLATORS: dialog caption -#: src/include/installation/inst_inc_second.rb:298 -msgid "Adjusting Network Settings" -msgstr "正在调整网络设置" +#. busy message; +#. Initial contents of proposal subwindow while proposals are calculated +#: src/lib/installation/proposal_runner.rb:398 +#: src/lib/installation/proposal_runner.rb:687 +msgid "Analyzing your system..." +msgstr "正在分析您的系统..." -#. TRANSLATORS: dialog help -#: src/include/installation/inst_inc_second.rb:304 -msgid "Network settings are being adjusted." -msgstr "正在调整网络设置。" +#. fallback proposal, means usually an internal error +#: src/lib/installation/proposal_runner.rb:500 +msgid "ERROR: No proposal" +msgstr "错误：无提案" -#. popup question (#x1) -#: src/include/installation/inst_inc_second.rb:357 +#. Submodules handle their own error reporting +#. text for a message box +#: src/lib/installation/proposal_runner.rb:539 msgid "" -"The previous installation has failed.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." +"Configuration saved.\n" +"There were errors." msgstr "" -"上一次安装失败了。\n" -"您希望继续上一次安装吗？\n" -"\n" -"注意：您可能需要再次输入一些信息。" +"配置已保存，\n" +"但存在错误。" -#. popup question (#x1) -#: src/include/installation/inst_inc_second.rb:365 -msgid "" -"The previous installation has been aborted.\n" -"Would you like it to continue?\n" -"\n" -"Note: You may have to enter some information again." -msgstr "" -"上一次安装被中止了。\n" -"您希望继续上一次安装吗？\n" -"\n" -"注意：您可能需要再次输入一些信息。" +#. Check box: Skip all the configurations in this dialog - +#. do this later manually or not at all +#. Translators: About 40 characters max, +#. use newlines for longer translations. +#. radio button +#: src/lib/installation/proposal_runner.rb:634 +msgid "&Skip Configuration" +msgstr "跳过配置(&S)" -#. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:181 -msgid "Confirm Installation" -msgstr "确认安装" +#. radio button +#: src/lib/installation/proposal_runner.rb:643 +msgid "&Use Following Configuration" +msgstr "使用以下配置(&U)" -#. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:184 -msgid "<p>Information required for the base installation is now complete.</p>" -msgstr "<p>现在已完成了基本安装所需的信息。</p>" +#. menu button +#: src/lib/installation/proposal_runner.rb:667 +#: src/lib/installation/proposal_runner.rb:778 +msgid "&Export Configuration" +msgstr "导出配置(&E)" -#. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:196 -msgid "" -"<p>If you continue now, <b>existing\n" -"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n" -"(<b>erasing any existing data</b> in those partitions) according to the\n" -"installation settings in the previous dialogs.</p>" -msgstr "" -"<p>现在您若继续，则会根据之前对话框中的安装设置<b>删除</b>或<b>格式化</b>\n" -"您硬盘上的<b>已有分区</b>。(这些分区将被<b>擦除任何已有数据</b>)</p>" +#. Help message between headline and installation proposal / settings summary. +#. May contain newlines, but don't make it very much longer than the original. +#: src/lib/installation/proposal_runner.rb:713 +msgid "Click a headline to make changes or use the \"Change...\" menu below." +msgstr "点击任一标题或使用下面的 \"修改...\" 菜单进行修改。" -#. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:207 -msgid "" -"<p>If you continue now, partitions on your\n" -"hard disk will be modified according to the installation settings in the\n" -"previous dialogs.</p>" -msgstr "<p>现在您若继续，则会根据之前对话框中的安装设置修改您硬盘上的分区。</p>" +#: src/lib/installation/proposal_runner.rb:717 +msgid "Click a headline to make changes." +msgstr "点击标题作出修改。" -#. Text for confirmation popup before the installation really starts 3/3 -#. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 -msgid "<p>Go back and check the settings if you are unsure.</p>" -msgstr "<p>若您不确定请返回并检查设置。</p>" +#. menu button item +#: src/lib/installation/proposal_runner.rb:777 +msgid "&Reset to defaults" +msgstr "重置为默认值(&R)" -#. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:224 -msgid "Confirm Update" -msgstr "确认更新" +#. FATE #120373 +#: src/lib/installation/proposal_runner.rb:800 +msgid "&Update" +msgstr "更新(&U)" -#. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:228 -msgid "<p>Information required to perform an update is now complete.</p>" -msgstr "<p>现在已完成了执行更新所需的信息。</p>" +#: src/lib/installation/proposal_runner.rb:800 +msgid "&Install" +msgstr "安装(&I)" -#. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:230 +#. @return [String] translated headline +#: src/lib/installation/proposal_store.rb:57 +msgid "Installation Overview" +msgstr "安装概览" + +#. General part of the help text for all types of proposals +#: src/lib/installation/proposal_store.rb:77 msgid "" -"\n" -"<p>If you continue now, data on your hard disk will be overwritten\n" -"according to the settings in the previous dialogs.</p>" +"<p>\n" +"Change the values by clicking on the respective headline\n" +"or by using the <b>Change...</b> menu.\n" +"</p>\n" msgstr "" -"\n" -"<p>现在您若继续，则会根据之前对话框中的设置覆盖您硬盘上的数据。</p>" +"<p>\n" +"点击相应的标题或使用<b>修改...</b>菜单修改这些值。\n" +"</p>\n" -#. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:240 -msgid "Start &Update" -msgstr "开始更新(&U)" +#. Help text for installation proposal, continued +#: src/lib/installation/proposal_store.rb:85 +msgid "" +"<p>\n" +"Your hard disk has not been modified yet. You can still safely abort.\n" +"</p>\n" +msgstr "" +"<p>\n" +"尚未改动您的硬盘。您仍可以安全地中止。\n" +"</p>\n" -#. this is a heading -#: src/lib/installation/cio_ignore.rb:42 -msgid "Blacklist Devices" -msgstr "屏蔽设备" +#. Help text for installation proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:417 +msgid "" +"<p>\n" +"Select <b>Install</b> to perform a new installation with the values displayed.\n" +"</p>\n" +msgstr "" +"<p>\n" +"选择<b>安装</b>用显示的值执行全新安装。\n" +"</p>\n" -#. this is a menu entry -#: src/lib/installation/cio_ignore.rb:44 -msgid "B&lacklist Devices" -msgstr "屏蔽设备(&L)" +#. so update +#. Help text for update proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:425 +msgid "" +"<p>\n" +"Select <b>Update</b> to perform an update with the values displayed.\n" +"</p>\n" +msgstr "" +"<p>\n" +"选择<b>更新</b>用显示的值执行更新。\n" +"</p>\n" -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/cio_ignore.rb:63 -msgid "Blacklist devices enabled (disable</a>)." -msgstr "已启用屏蔽设备功能 (禁用</a>)。" +#. Help text for network configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:434 +msgid "" +"<p>\n" +"Put the network settings into effect by pressing <b>Next</b>.\n" +"</p>\n" +msgstr "" +"<p>\n" +"按<b>下一步</b>使网络设置生效。\n" +"</p>\n" -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/cio_ignore.rb:69 -msgid "Blacklist devices disabled (enable</a>)." -msgstr "已禁用屏蔽设备功能 (启用</a>)。" +#. Help text for service configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:442 +msgid "" +"<p>\n" +"Put the service settings into effect by pressing <b>Next</b>.\n" +"</p>\n" +msgstr "" +"<p>\n" +"按<b>下一步</b>使服务设置生效。\n" +"</p>\n" -#. TRANSLATORS: help text -#: src/lib/installation/cio_ignore.rb:78 +#. Help text for hardware configuration proposal +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:450 msgid "" -"<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to " -"such devices which will reduce kernel memory footprint.</p>" +"<p>\n" +"Put the hardware settings into effect by pressing <b>Next</b>.\n" +"</p>\n" msgstr "" -"<p>若您想要为某些设备创建黑名单通道以降低内核内存占用，请使用<b>屏蔽设备。</p>" +"<p>\n" +"按<b>下一步</b>使硬件设置生效。\n" +"</p>\n" -#. progress step title -#: src/lib/installation/cio_ignore.rb:135 -msgid "Blacklisting Devices..." -msgstr "正在屏蔽设备..." +#. Proposal in uml module +#: src/lib/installation/proposal_store.rb:457 +msgid "<P><B>UML Installation Proposal</B></P>" +msgstr "<P><B>UML 安装提案</B></P>" -#. progress step title -#: src/lib/installation/prep_shrink.rb:35 -msgid "Shrinking PREP partition..." -msgstr "正在收缩 PREP (PowerPC 参考平台) 分区..." +#. help text +#: src/lib/installation/proposal_store.rb:459 +msgid "" +"<P>UML (User Mode Linux) installation allows you to start independent\n" +"Linux virtual machines in the host system.</P>" +msgstr "<P>UML (用户模式 Linux) 安装允许您在主机系统中启动独立的 Linux 虚拟机。</P>" +#. Generic help text for other proposals (not basic installation or +#. hardhware configuration. +#. General part ("You can change values...") is added as the next paragraph. +#: src/lib/installation/proposal_store.rb:473 +msgid "" +"<p>\n" +"To use the settings as displayed, press <b>Next</b>.\n" +"</p>\n" +msgstr "" +"<p>\n" +"要使用显示的设置，请按<b>下一步</b>。\n" +"</p>\n" + #. Text to display #. #. @return String -#: src/lib/installation/remote_finish_client.rb:68 +#: src/lib/installation/remote_finish_client.rb:67 msgid "Enabling remote administration..." msgstr "正在启用远程管理..." +#. Writes configuration +#. +#. It creates a snapshot when no second stage is required and +#. Snapper is configured. +#. +#. @return [TrueClass,FalseClass] True if snapshot was created; +#. otherwise it returns false. +#: src/lib/installation/snapshots_finish.rb:40 +#, fuzzy +#| msgid "Copying root filesystem..." +msgid "Creating root filesystem snapshot..." +msgstr "正在复制根文件系统..." + #. checking whether images are supported #. BNC #409927 #. Checking files for signatures -#: src/modules/ImageInstallation.rb:845 +#: src/modules/ImageInstallation.rb:840 msgid "Failed to read information about installation images" msgstr "无法读取安装映像信息" -#. sleep in order not to kill -USR1 to dd too early, otherwise it finishes -#: src/modules/ImageInstallation.rb:1193 +#. count megabytes +#: src/modules/ImageInstallation.rb:1196 msgid "Deploying..." msgstr "正在部署..." @@ -2032,19 +1999,19 @@ #. #. @see #all_supported_types #. @see #objects_state -#: src/modules/ImageInstallation.rb:1216 +#: src/modules/ImageInstallation.rb:1219 msgid "Storing user preferences..." msgstr "正在储存用户偏好..." #. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade. #. #. @return [Boolean] if successful -#: src/modules/ImageInstallation.rb:1348 +#: src/modules/ImageInstallation.rb:1351 msgid "Restoring user preferences..." msgstr "正在恢复用户偏好..." #. Error message -#: src/modules/ImageInstallation.rb:1446 +#: src/modules/ImageInstallation.rb:1448 msgid "" "Installation was unable to solve package dependencies automatically.\n" "Software manager will be opened for you to solve them manually." @@ -2052,6 +2019,20 @@ "安装未能自动解决软件包依赖关系。\n" "将打开软件包管理器来让您手动解决那些依赖关系。" +#~ msgid "ERROR: Missing Title" +#~ msgstr "错误：缺少标题" + +#~ msgid "" +#~ "<p>Some proposals might be\n" +#~ "locked by the system administrator and therefore cannot be changed. If a\n" +#~ "locked proposal needs to be changed, ask your system administrator.</p>\n" +#~ msgstr "" +#~ "<p>系统管理员可能锁定了某些提案，因而您无法修改它们。\n" +#~ "若需要修改锁定的提案，请垂询您的系统管理员。</p>\n" + +#~ msgid "Initializing the installation environment..." +#~ msgstr "正在初始化安装环境..." + #~ msgid "Dummy" #~ msgstr "演示" @@ -2160,8 +2141,7 @@ #~ msgid "Hardware Information of the Selected Network Card" #~ msgstr "所选网卡的硬件信息" -#~ msgid "" -#~ "<p>Here you can configure your network cards to be used immediately.</p>" +#~ msgid "<p>Here you can configure your network cards to be used immediately.</p>" #~ msgstr "<p>在此您可以配置您要立即使用的网卡。</p>" #~ msgid "" @@ -2282,9 +2262,7 @@ #~ msgstr "" #~ "<p><big><b>代理</b></big>\n" #~ "<br>代理是一个基于服务器的网络访问缓存。\n" -#~ "在大多数情况下，若您能直接连接到互联网，就没有必要使用代理。(注意，这不是" -#~ "科学上网代理。科学上网的软件需要您另装，具体垂询https://forum.suse.org.cn " -#~ "请以暗号形式转义掉敏感词！)</p>\n" +#~ "在大多数情况下，若您能直接连接到互联网，就没有必要使用代理。(注意，这不是科学上网代理。科学上网的软件需要您另装，具体垂询https://forum.suse.org.cn 请以暗号形式转义掉敏感词！)</p>\n" #~ msgid "" #~ "<p>Command: <tt>%1</tt> has failed.</p>\n" @@ -2363,9 +2341,7 @@ #~ msgid "Writing Network Setup..." #~ msgstr "正在写入网络设置..." -#~ msgid "" -#~ "<p>Please, wait while network configuration is being written and tested..." -#~ "</p>" +#~ msgid "<p>Please, wait while network configuration is being written and tested...</p>" #~ msgstr "<p>正在写入和测试网络配置, 请稍候...</p>" #~ msgid "" @@ -2449,8 +2425,7 @@ #~ msgid "" #~ "<p>\n" -#~ "Select <b>New Installation</b> if there is no existing Linux system on " -#~ "your\n" +#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n" #~ "machine or if you want to replace an existing Linux system completely,\n" #~ "discarding all its configuration data.\n" #~ "</p>\n" @@ -2475,8 +2450,7 @@ #~ msgid "" #~ "<p>\n" -#~ "Select <b>Use Automatic Configuration</b> to let the installation " -#~ "program\n" +#~ "Select <b>Use Automatic Configuration</b> to let the installation program\n" #~ "configure your network and hardware automatically. Otherwise you will\n" #~ "be offered a configuration proposal with the possibility to tune all the\n" #~ "settings manually. Inexperienced users are advised to use automatic\n" @@ -2614,8 +2588,7 @@ #~ msgid "Connecting to the inst-sys failed. Debugger cannot continue." #~ msgstr "连接 inst-sys 失败，调试工具无法继续。" -#~ msgid "" -#~ "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>" +#~ msgid "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>" #~ msgstr "<p>要访问 X11 系统，必须安装 <b>%1</b> 软件包。</p>" #~ msgid "<p>Do you want to install it now?</p>" @@ -2667,27 +2640,21 @@ #~ msgstr "正在初始化字体..." #~ msgid "" -#~ "<p><b>Installation from Images</b> is used to speed the installation " -#~ "up. \n" -#~ "Images contain compressed snapshots of installed system matching your " -#~ "selection \n" -#~ "of patterns. The rest of packages which are not in images will be " -#~ "installed from \n" +#~ "<p><b>Installation from Images</b> is used to speed the installation up. \n" +#~ "Images contain compressed snapshots of installed system matching your selection \n" +#~ "of patterns. The rest of packages which are not in images will be installed from \n" #~ "packages the standard way.</p>" #~ msgstr "" #~ "<p><b>从映像安装</b>可以用来加快安装速度。\n" #~ "映像中包含压缩的安装系统快照，和您选择的模式相匹配。\n" #~ "其他不在映像中的软件包将以标准方法安装。</p>" -#~ msgid "" -#~ "<p>Installation is currently writing the automatic configuration. Please " -#~ "wait...</p>" +#~ msgid "<p>Installation is currently writing the automatic configuration. Please wait...</p>" #~ msgstr "<p>安装程序正在写入自动安装配置。请稍等...</p>" #~ msgid "" #~ "<p>\n" -#~ "Select <b>New Installation</b> if there is no existing Linux system on " -#~ "your\n" +#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n" #~ "machine or if you want to replace an existing Linux system completely,\n" #~ "abandoning all its configuration data.\n" #~ "</p>" @@ -2700,8 +2667,7 @@ #~ msgid "" #~ "<p>\n" -#~ "To install an add-on product from separate media together with &product;, " -#~ "select\n" +#~ "To install an add-on product from separate media together with &product;, select\n" #~ "<b>Include Add-On Products from Separate Media</b>.</p>" #~ msgstr "" #~ "<p>\n" @@ -2713,8 +2679,7 @@ #~ msgid "" #~ "<p>\n" -#~ "Your hard disk has not been modified in any way, so you can still safely " -#~ "abort.\n" +#~ "Your hard disk has not been modified in any way, so you can still safely abort.\n" #~ "</p>\n" #~ msgstr "" #~ "<p>\n" @@ -2743,8 +2708,7 @@ #~ msgstr "修复已安装系统(&P)" #~ msgid "" -#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux " -#~ "system on\n" +#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux system on\n" #~ "your hard disk. This option can try to fix problems automatically.\n" #~ "</p>" #~ msgstr "" @@ -2770,8 +2734,7 @@ #~ msgid "" #~ "Accessing the YaST module %1 has failed.\n" #~ "More information can be found in the '%2' file.\n" -#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' " -#~ "directory." +#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' directory." #~ msgstr "" #~ "访问 YaST 模块 %1 失败。\n" #~ "更多信息可以在文件“%2”中找到。\n" @@ -2814,14 +2777,10 @@ #~ msgstr "正在运行调试程序..." #~ msgid "" -#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a " -#~ "number\n" -#~ "of different desktop environments. Below you see a list of the 2 major " -#~ "ones\n" -#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a " -#~ "large number\n" -#~ "of desktop applications such as email, file browser, games and many " -#~ "others.</p>" +#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number\n" +#~ "of different desktop environments. Below you see a list of the 2 major ones\n" +#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a large number\n" +#~ "of desktop applications such as email, file browser, games and many others.</p>" #~ msgstr "" #~ "<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i>提供了几种\n" #~ " 不同的桌面环境。下面您可以看到两种主流的桌面：\n" @@ -2829,8 +2788,7 @@ #~ "带有很多桌面软件，比如 Email、文件浏览器、游戏等。</p>" #~ msgid "" -#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation " -#~ "can't be\n" +#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation can't be\n" #~ "given</i>.</p>" #~ msgstr "<p>桌面选择，在于品味，所以并<i>没有明确的推荐</i>。</p>" @@ -2870,11 +2828,9 @@ #, fuzzy #~ msgid "" -#~ "<p>Installation from images is faster than installation from RPM " -#~ "packages\n" +#~ "<p>Installation from images is faster than installation from RPM packages\n" #~ "because it does not need to handle with RPM database, locks etc.\n" -#~ "One of the images also contains the joint RPM database and other metadata." -#~ "</p>" +#~ "One of the images also contains the joint RPM database and other metadata.</p>" #~ msgstr "" #~ "<p>从映像安装比从 RPM 软件包安装的速度块。\n" #~ "因为不需要处理 RPM 数据库，比如锁定等。\n" @@ -2882,21 +2838,16 @@ #~ msgid "" #~ "<p>If there is no direct access to installation images,\n" -#~ "installation program has to download them first before they are deployed." -#~ "</p>" +#~ "installation program has to download them first before they are deployed.</p>" #~ msgstr "" #~ "<p>如果不能直接访问到安装映像，\n" #~ "安装程序必须先下载它们，然后才能部署。<p>" #~ msgid "" -#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a " -#~ "number \n" -#~ "of different desktop environments. Below you see a list of the 2 major " -#~ "ones \n" -#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an " -#~ "easy to use desktop\n" -#~ "with a large number of desktop applications such as email, file browser, " -#~ "games and many others.</p>" +#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n" +#~ "of different desktop environments. Below you see a list of the 2 major ones \n" +#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an easy to use desktop\n" +#~ "with a large number of desktop applications such as email, file browser, games and many others.</p>" #~ msgstr "" #~ "<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i>提供了\n" #~ "几种不同的桌面环境。下面您可以看到两种主流的桌面：\n" @@ -2905,13 +2856,10 @@ #~ msgid "" #~ "openSUSE offers you a choice of user interfaces. The two major complete \n" -#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a " -#~ "full \n" -#~ "suite of applications including email, a file manager, games and " -#~ "utilities.\n" +#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n" +#~ "suite of applications including email, a file manager, games and utilities.\n" #~ "\n" -#~ "As desktop selection is a matter of taste, we do not give a " -#~ "recommendation." +#~ "As desktop selection is a matter of taste, we do not give a recommendation." #~ msgstr "" #~ "openSUSE 给您用户界面的选择。两种主流桌面 KDE 和 GNOME\n" #~ "都容易使用，并带有一整套应用程序，包括 Email、文件管理器、\n" Modified: trunk/yast/zh_CN/po/instserver.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/instserver.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/instserver.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-01-31 22:44+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/iplb.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/iplb.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/iplb.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-07-14 16:43+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/iscsi-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-08 16:41+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -116,8 +116,10 @@ msgstr "编辑" #: src/include/iscsi-client/dialogs.rb:161 -msgid "Log Out" -msgstr "注销" +#, fuzzy +#| msgid "Disconnected" +msgid "Disconnect" +msgstr "已断开" #: src/include/iscsi-client/dialogs.rb:186 msgid "Connected" @@ -128,9 +130,6 @@ msgstr "发现" #: src/include/iscsi-client/dialogs.rb:193 -msgid "Log In" -msgstr "登入" - #: src/include/iscsi-client/dialogs.rb:223 msgid "Connect" msgstr "连接" @@ -212,8 +211,8 @@ #. dialog for all targets from portal (connected/disconnected) #. authentification dialog for add/discovery target #: src/include/iscsi-client/dialogs.rb:404 -#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119 -#: src/include/iscsi-client/helps.rb:126 +#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122 +#: src/include/iscsi-client/helps.rb:129 msgid "<h1>iSCSI Initiator</h1>" msgstr "<h1>iSCSI 发起端</h1>" @@ -331,34 +330,32 @@ #. table of connected targets #: src/include/iscsi-client/helps.rb:90 -msgid "" -"List of current sessions. To add a new target, select it and press <b>Add</b>.\n" -"To remove it, press <b>Log Out</b>.\n" -"To change the start-up status, press <b>Toggle</b>.\n" +msgid "<p>List of current sessions.</p><p>Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>Use <b>Disconnect</b> to cancel the connection and with it remove the target from the list.<br>To change the start-up status, press <b>Edit</b>.</p>" msgstr "" -"当前会话列表。要添加新目标，请选择它并按<b>添加</b>。\n" -"要移除某个目标，请按<b>注销</b>。\n" -"要修改启动状态，请按<b>切换</b>。\n" #. Warning #. Warning -#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114 +#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117 msgid "<h1>Warning</h1>" msgstr "<h1>警告</h1>" -#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115 +#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118 msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n" msgstr "<p>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时，请确保此访问是排它的。否则会有潜在的数据损坏风险。</p>\n" -#: src/include/iscsi-client/helps.rb:100 +#: src/include/iscsi-client/helps.rb:103 +#, fuzzy +#| msgid "" +#| "<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" +#| "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>" msgid "" -"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" +"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>" msgstr "" "<p><b>发起端名称</b> 是 <tt>/etc/initiatorname.iscsi</tt> 中的一个值。\n" "若您有 iBFT，此值将从那里添加，并且您只能在 BIOS 设置中修改它。</p>" -#: src/include/iscsi-client/helps.rb:103 +#: src/include/iscsi-client/helps.rb:106 msgid "" "If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n" "fill in the IP address of the iSNS server and port. The default port should be 3205.\n" @@ -366,9 +363,14 @@ "若您想用 <b>iSNS</b> (互联网存储名称服务) 来发现目标，而不是用默认的 SendTargets 方法，\n" "请填上 iSNS 服务器的 IP 地址和端口。默认端口应是 3205。\n" -#: src/include/iscsi-client/helps.rb:108 +#: src/include/iscsi-client/helps.rb:111 +#, fuzzy +#| msgid "" +#| "Enter the <b>IP Address</b> of the discovered server.\n" +#| "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" +#| "select <b>No Authentication</b>.\n" msgid "" -"Enter the <b>IP Address</b> of the discovered server.\n" +"Enter the <b>IP Address</b> of the iSCSI target server.\n" "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" "select <b>No Authentication</b>.\n" msgstr "" @@ -376,14 +378,10 @@ "只有需要时才能修改<b>端口</b>。若需要认证，请使用<b>用户名</b>和<b>密码</b>。若无需认证，\n" "请选择<b>无认证</b>。\n" -#: src/include/iscsi-client/helps.rb:122 +#: src/include/iscsi-client/helps.rb:125 msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. " msgstr "iSCSI 目标提供的节点列表。请选择一项并按<b>连接</b>。" -#: src/include/iscsi-client/helps.rb:129 -msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." -msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。" - #: src/include/iscsi-client/helps.rb:132 msgid "<h1>Startup</h1>" msgstr "<h1>启动</h1>" @@ -401,12 +399,22 @@ "<p><b>引导时</b>用于在引导时连接的 iSCSI 目标，例如，当 root 在 iSCSI 上时。因为这样 initrd 就需要评估位于 iSCSI 上的 root 分区了。</p>\n" "<p><b>自动</b>用于当 iSCSI 服务启动时自动连接的 iSCSI 目标。</p>\n" -#. list of discovered targets +#: src/include/iscsi-client/helps.rb:141 +#, fuzzy +#| msgid "Authentication" +msgid "<h1>Authentication</h1>" +msgstr "身份验证" + #: src/include/iscsi-client/helps.rb:142 -msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." -msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。" +msgid "<p>The default setting here is <i>No Authentication</i>. Uncheck the checkbox if authentication is needed for security reasons. Enter <b>Username</b> and <b>Password</b> for 'Incoming Authentication', 'Outgoing Authentication' or for both.</p><p><b>Please note:</b><br>'Incoming Authentication' here correlates to 'Outgoing Authentication' on iSCSI target server side and the other way round.</p>" +msgstr "" -#: src/include/iscsi-client/helps.rb:145 +#. list of discovered targets +#: src/include/iscsi-client/helps.rb:151 +msgid "<p>This screen shows the list of discovered targets.</p><p>Use the <b>Discovery</b> button to get available iSCSI targets from a server specified by IP address.<br><b>Connect</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>To remove a target use the <b>Delete</b> button.<br> <b>Hint:</b> Removing of targets is only possible for not connected onces. If required, <b>Disconnect</b> at <i>Connected Targets</i> first.</p><p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual'). Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.</p>" +msgstr "" + +#: src/include/iscsi-client/helps.rb:167 msgid "<h1>iBTF</h1>" msgstr "<h1>iBTF</h1>" @@ -457,15 +465,32 @@ msgstr "端口号不能为空" #. regexp for "cz.suse" or just "suse", "cz.su-se" -#: src/include/iscsi-client/widgets.rb:423 +#: src/include/iscsi-client/widgets.rb:428 +#, fuzzy +#| msgid "Initiator Name" +msgid "Incorrect Initiator Name" +msgstr "发起人名称" + +#: src/include/iscsi-client/widgets.rb:429 +#, fuzzy +#| msgid "" +#| "Incorrect InitiatorName.\n" +#| "The correct syntax is\n" +#| "iqn.yyyy-mm.reversed.domain.name[:identifier]\n" +#| "or eui.yyyy-mm.reversed.domain.name[:identifier]\n" +#| "\n" +#| "Example:\n" +#| "iqn.2007-04.cz.server:storage.disk.sdb\n" msgid "" -"Incorrect InitiatorName.\n" +"\n" "The correct syntax is\n" "iqn.yyyy-mm.reversed.domain.name[:identifier]\n" "or eui.yyyy-mm.reversed.domain.name[:identifier]\n" "\n" "Example:\n" "iqn.2007-04.cz.server:storage.disk.sdb\n" +"\n" +"Do you want to use the name?\n" msgstr "" "错误的发起端名称。\n" "正确语法为\n" @@ -476,12 +501,12 @@ "iqn.2007-04.cz.server:storage.disk.sdb\n" #. brackets needed around IPv6 -#: src/include/iscsi-client/widgets.rb:625 +#: src/include/iscsi-client/widgets.rb:635 msgid "Insert the IP address." msgstr "请输入 IP 地址。" #. validate port number -#: src/include/iscsi-client/widgets.rb:631 +#: src/include/iscsi-client/widgets.rb:641 msgid "Insert the port." msgstr "请输入端口。" @@ -489,36 +514,36 @@ #. ******************* target table ************************* #. initialize dialog for all targets from portal (connected/disconnected) #. enable/disable connect button according target is or not already connected -#: src/include/iscsi-client/widgets.rb:733 -#: src/include/iscsi-client/widgets.rb:838 -#: src/include/iscsi-client/widgets.rb:866 +#: src/include/iscsi-client/widgets.rb:754 +#: src/include/iscsi-client/widgets.rb:859 +#: src/include/iscsi-client/widgets.rb:887 msgid "True" msgstr "真" -#: src/include/iscsi-client/widgets.rb:733 -#: src/include/iscsi-client/widgets.rb:838 +#: src/include/iscsi-client/widgets.rb:754 +#: src/include/iscsi-client/widgets.rb:859 msgid "False" msgstr "假" #. check if not already connected #. check if not already connected -#: src/include/iscsi-client/widgets.rb:771 -#: src/include/iscsi-client/widgets.rb:891 +#: src/include/iscsi-client/widgets.rb:792 +#: src/include/iscsi-client/widgets.rb:912 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption." msgstr "已连接名称为此目标名称的目标。请确保启用了多路径以防止数据损坏。" -#: src/include/iscsi-client/widgets.rb:774 -#: src/include/iscsi-client/widgets.rb:894 +#: src/include/iscsi-client/widgets.rb:795 +#: src/include/iscsi-client/widgets.rb:915 msgid "Continue" msgstr "继续" -#: src/include/iscsi-client/widgets.rb:775 -#: src/include/iscsi-client/widgets.rb:895 +#: src/include/iscsi-client/widgets.rb:796 +#: src/include/iscsi-client/widgets.rb:916 msgid "Cancel" msgstr "取消" #. check if is not already connected -#: src/include/iscsi-client/widgets.rb:885 +#: src/include/iscsi-client/widgets.rb:906 msgid "The target is already connected." msgstr "目标已连接。" @@ -607,7 +632,7 @@ msgstr "全部" #. } -#: src/modules/IscsiClientLib.rb:694 +#: src/modules/IscsiClientLib.rb:698 msgid "" "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n" "differ. The old initiator name will be replaced by the value of iBFT and a \n" @@ -618,11 +643,39 @@ "旧的发起端名称将替换为 iBFT 中的值并创建备份。\n" "您若想要使用不同的发起端名称，请到 BIOS 中修改之。\n" +#. change startup status (manual/onboot) for target +#: src/modules/IscsiClientLib.rb:1013 +#, fuzzy +#| msgid "Image creation failed." +msgid "Target connection failed.\n" +msgstr "映像创建失败。" + #. do discovery first -#: src/modules/IscsiClientLib.rb:1147 +#: src/modules/IscsiClientLib.rb:1156 msgid "Configuration summary..." msgstr "配置摘要..." +#~ msgid "Log Out" +#~ msgstr "注销" + +#~ msgid "Log In" +#~ msgstr "登入" + +#~ msgid "" +#~ "List of current sessions. To add a new target, select it and press <b>Add</b>.\n" +#~ "To remove it, press <b>Log Out</b>.\n" +#~ "To change the start-up status, press <b>Toggle</b>.\n" +#~ msgstr "" +#~ "当前会话列表。要添加新目标，请选择它并按<b>添加</b>。\n" +#~ "要移除某个目标，请按<b>注销</b>。\n" +#~ "要修改启动状态，请按<b>切换</b>。\n" + +#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." +#~ msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。" + +#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." +#~ msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。" + #~ msgid "Toggle Start-Up" #~ msgstr "转换启动" Modified: trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:18+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -165,7 +165,7 @@ #: src/include/iscsi-lio-server/dialogs.rb:253 #: src/include/iscsi-lio-server/widgets.rb:223 #: src/include/iscsi-lio-server/widgets.rb:236 -#: src/include/iscsi-lio-server/widgets.rb:720 +#: src/include/iscsi-lio-server/widgets.rb:721 msgid "Username" msgstr "用户名" @@ -173,7 +173,7 @@ #: src/include/iscsi-lio-server/dialogs.rb:254 #: src/include/iscsi-lio-server/widgets.rb:224 #: src/include/iscsi-lio-server/widgets.rb:237 -#: src/include/iscsi-lio-server/widgets.rb:721 +#: src/include/iscsi-lio-server/widgets.rb:722 msgid "Password" msgstr "密码" @@ -554,7 +554,7 @@ msgstr "从目标门户组导入逻辑单元编号" #: src/include/iscsi-lio-server/widgets.rb:638 -#: src/include/iscsi-lio-server/widgets.rb:694 +#: src/include/iscsi-lio-server/widgets.rb:695 msgid "Client name must not be empty!" msgstr "客户端名称不能为空！" @@ -562,101 +562,110 @@ #. client name. It's allowed to have several LUNs accessable for same client. #. TODO: verify whether it's necessary to check @changed_lun here? #: src/include/iscsi-lio-server/widgets.rb:644 -#: src/include/iscsi-lio-server/widgets.rb:700 +#: src/include/iscsi-lio-server/widgets.rb:701 msgid "Client name already exists!" msgstr "客户端名称已存在！" #. Copy exisiting LUN, i.e. give additional client access to the LUN #. (which is allowed, makes sense e.g. with multipath) -#: src/include/iscsi-lio-server/widgets.rb:677 +#: src/include/iscsi-lio-server/widgets.rb:678 msgid "New client name:" msgstr "新客户端名称：" -#: src/include/iscsi-lio-server/widgets.rb:723 +#: src/include/iscsi-lio-server/widgets.rb:724 msgid "OK" msgstr "确定" -#: src/include/iscsi-lio-server/widgets.rb:724 +#: src/include/iscsi-lio-server/widgets.rb:725 msgid "Cancel" msgstr "取消" #. remove a item #. **************** Edit Dialog ***************************** #. init values for modifying target (read it from stored map) -#: src/include/iscsi-lio-server/widgets.rb:819 -#: src/include/iscsi-lio-server/widgets.rb:933 -#: src/include/iscsi-lio-server/widgets.rb:1291 +#: src/include/iscsi-lio-server/widgets.rb:820 +#: src/include/iscsi-lio-server/widgets.rb:934 +#: src/include/iscsi-lio-server/widgets.rb:1288 msgid "Really delete the selected item?" msgstr "真的删除所选项吗？" -#: src/include/iscsi-lio-server/widgets.rb:1001 +#: src/include/iscsi-lio-server/widgets.rb:1002 msgid "Problem creating target %1 with tpg %2" msgstr "使用目标门户组 %2 创建目标 %1 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1023 +#: src/include/iscsi-lio-server/widgets.rb:1024 msgid "Problem setting network portal to %1" msgstr "设置网络门户为 %1 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1044 +#: src/include/iscsi-lio-server/widgets.rb:1045 msgid "Problem removing lun %1" msgstr "移除逻辑单元编号 %1 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1069 +#: src/include/iscsi-lio-server/widgets.rb:1070 msgid "Problem setting lun %1 (name:%2) to path %3" msgstr "设置逻辑单元编号 %1 (名称：%2) 到路径 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1083 +#: src/include/iscsi-lio-server/widgets.rb:1084 msgid "Problem setting auth on %1:%2 to %3" msgstr "设置 %1:%2 上的认证为 %3 时出现问题" #. validate function checks if target/tpg are unique and not empty -#: src/include/iscsi-lio-server/widgets.rb:1201 +#: src/include/iscsi-lio-server/widgets.rb:1198 msgid "The target cannot be empty." msgstr "目标不能为空。" -#: src/include/iscsi-lio-server/widgets.rb:1205 +#: src/include/iscsi-lio-server/widgets.rb:1202 msgid "The target portal group cannot be empty." msgstr "目标门户组不能为空。" -#: src/include/iscsi-lio-server/widgets.rb:1216 +#: src/include/iscsi-lio-server/widgets.rb:1213 msgid "The target already exists." msgstr "目标已存在。" -#: src/include/iscsi-lio-server/widgets.rb:1236 +#: src/include/iscsi-lio-server/widgets.rb:1233 msgid "Incoming" msgstr "进站" -#: src/include/iscsi-lio-server/widgets.rb:1239 +#: src/include/iscsi-lio-server/widgets.rb:1236 msgid "Outgoing" msgstr "出站" -#: src/include/iscsi-lio-server/widgets.rb:1241 +#: src/include/iscsi-lio-server/widgets.rb:1238 msgid "None" msgstr "无" -#: src/include/iscsi-lio-server/widgets.rb:1264 -#: src/include/iscsi-lio-server/widgets.rb:1367 -#: src/include/iscsi-lio-server/widgets.rb:1404 +#: src/include/iscsi-lio-server/widgets.rb:1261 +#: src/include/iscsi-lio-server/widgets.rb:1364 +#: src/include/iscsi-lio-server/widgets.rb:1401 msgid "Disabled" msgstr "已禁用" -#: src/include/iscsi-lio-server/widgets.rb:1456 +#: src/include/iscsi-lio-server/widgets.rb:1450 +msgid "" +"There isn't any client specified.\n" +"To allow a client login to the target, please\n" +"use the 'Add' button and enter the name\n" +"(see /etc/iscsi/initiatorname.iscsi on initiator).\n" +"Really want to continue without client access?" +msgstr "" + +#: src/include/iscsi-lio-server/widgets.rb:1464 msgid "Problem removing lun %4 for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 移除逻辑单元编号 %4 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1471 +#: src/include/iscsi-lio-server/widgets.rb:1479 msgid "Problem adding lun %4:%5 for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 添加逻辑单元编号 %4:%5 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1492 +#: src/include/iscsi-lio-server/widgets.rb:1500 msgid "Problem removing client %3 from %1:%2" msgstr "从 %1:%2 中移除客户端 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1516 +#: src/include/iscsi-lio-server/widgets.rb:1524 msgid "Problem creating client %3 for %1:%2" msgstr "为 %1:%2 创建客户端 %3 时出现问题" -#: src/include/iscsi-lio-server/widgets.rb:1551 +#: src/include/iscsi-lio-server/widgets.rb:1559 msgid "Problem changing auth for client %3 in %1:%2" msgstr "在 %1:%2 中为客户端 %3 修改认证时出现问题" @@ -670,12 +679,12 @@ msgid "Initializing..." msgstr "正在初始化..." -#. local IPv6 -#: src/modules/IscsiLioData.rb:1420 +#. scope link IPv6 +#: src/modules/IscsiLioData.rb:1424 msgid "Cannot save lio setup" msgstr "无法保存 LIO 设置" -#: src/modules/IscsiLioData.rb:1424 +#: src/modules/IscsiLioData.rb:1428 msgid "Cannot save tcm setup" msgstr "无法保存 tcm 设置" Modified: trunk/yast/zh_CN/po/isns.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/isns.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/isns.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:18+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Added: trunk/yast/zh_CN/po/journal.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/journal.zh_CN.po (rev 0) +++ trunk/yast/zh_CN/po/journal.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -0,0 +1,150 @@ +# 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: 2015-08-25 18:36+0200\n" +"PO-Revision-Date: 2004-04-02 10:52+0200\n" +"Last-Translator: 裴寒牧 \n" +"Language-Team: 中华 \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" + +#. Header +#: src/lib/systemd_journal/entries_dialog.rb:43 +#, fuzzy +#| msgid "&Countries" +msgid "Journal entries" +msgstr "国家/地区(&C)" + +#. Filters +#: src/lib/systemd_journal/entries_dialog.rb:47 +msgid "Displaying entries with the following text" +msgstr "" + +#. Return the result as an array of Items +#: src/lib/systemd_journal/entries_dialog.rb:117 +#, fuzzy +#| msgid "Change Suffix" +msgid "Change filter..." +msgstr "更改后缀" + +#: src/lib/systemd_journal/entries_dialog.rb:119 +msgid "Refresh" +msgstr "刷新" + +#. Header +#: src/lib/systemd_journal/query_dialog.rb:50 +#, fuzzy +#| msgid "Braille display" +msgid "Entries to display" +msgstr "点字显示器" + +#. Interval +#: src/lib/systemd_journal/query_dialog.rb:53 +#, fuzzy +#| msgid "Periodic interval" +msgid "Time interval" +msgstr "间隔周期" + +#. Filters +#: src/lib/systemd_journal/query_dialog.rb:59 +#, fuzzy +#| msgid "Filters:" +msgid "Filters" +msgstr "过滤：" + +#. User readable description of the current filters +#: src/lib/systemd_journal/query_presenter.rb:65 +#, fuzzy +#| msgid "Additional options" +msgid "With no additional conditions" +msgstr "附加选项" + +#. User readable description of the time interval +#: src/lib/systemd_journal/query_presenter.rb:82 +msgid "Since system's boot" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:84 +msgid "From previous boot" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:90 +msgid "Between %{since} and %{until}" +msgstr "" + +#. Possible intervals for a QueryPresenter object to be used in forms +#. +#. @return [Array<Hash>] each interval is represented by a hash with two keys +#. :value and :label +#: src/lib/systemd_journal/query_presenter.rb:102 +msgid "Between these dates" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:104 +msgid "Since system's boot (%s)" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:108 +msgid "From previous boot (%s)" +msgstr "" + +#. Possible filters for a QueryPresenter object +#. +#. @return [Array<Hash>] for each filter there are 4 possible keys +#. +#. * :name name of the filter +#. * :label short label for the filter +#. * :form_label label for the widget used to set the filter +#. * :multiple boolean indicating if an array is a valid value +#. * :values optional list of valid values +#: src/lib/systemd_journal/query_presenter.rb:128 +#, fuzzy +#| msgid "&Units" +msgid "Units" +msgstr "单位(&U)" + +#: src/lib/systemd_journal/query_presenter.rb:129 +msgid "For these systemd units" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:134 +msgid "Files" +msgstr "文件" + +#: src/lib/systemd_journal/query_presenter.rb:135 +msgid "For these files (executable or device)" +msgstr "" + +#: src/lib/systemd_journal/query_presenter.rb:140 +msgid "Priority" +msgstr "优先级" + +#: src/lib/systemd_journal/query_presenter.rb:141 +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/systemd_journal/query_presenter.rb:164 +msgid "Time" +msgstr "时间" + +#: src/lib/systemd_journal/query_presenter.rb:165 +msgid "Source" +msgstr "源" + +#: src/lib/systemd_journal/query_presenter.rb:166 +#, fuzzy +#| msgid "Messages" +msgid "Message" +msgstr "消息" Modified: trunk/yast/zh_CN/po/kdump.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/kdump.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/kdump.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-08 16:51+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -51,197 +51,199 @@ msgstr "转储目标包括保存转储映像的位置" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:116 +#: src/clients/kdump.rb:117 msgid "The naming scheme is:/boot/vmlinu[zx]-[.gz] Please enter only \"kernel_string\"." msgstr "命名方式是：/boot/vmlinu[zx]-[.gz] 请只输入 \"kernel_string\"。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:127 +#: src/clients/kdump.rb:128 msgid "The kdump commandline is the command line that needs to be passed off to the kdump kernel." msgstr "kdump 命令行是需要被传送到 kdump 内核的命令行。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:138 +#: src/clients/kdump.rb:139 msgid "Set this variable if you only want to _append_ values to the default command line string." msgstr "如果您想要附加值到默认命令行字符串，请设定此变量。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:149 +#: src/clients/kdump.rb:150 msgid "Immediately reboot after saving the core in the kdump kernel." msgstr "在保存 kdump 内核核心后立即重启。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:157 +#: src/clients/kdump.rb:158 msgid "Copy kernel into dump directory." msgstr "复制内核到转储目录。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:165 +#: src/clients/kdump.rb:166 msgid "Specifies how many old dumps are kept. 0 means keep all." msgstr "指定保留多少旧转储文件。0 意味着保留全部。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:173 +#: src/clients/kdump.rb:174 msgid "SMTP server for sending notification messages." msgstr "发送通知消息的 SMTP 服务器" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:181 +#: src/clients/kdump.rb:182 msgid "SMTP username for sending notification messages." msgstr "发送通知消息的 SMTP 用户名。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:189 +#: src/clients/kdump.rb:190 msgid "SMTP password for sending notification messages. Path of file which includes password (plain text file)." msgstr "发送通知消息的 SMTP 密码。密码文件 (普通文本文件) 的路径。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:197 +#: src/clients/kdump.rb:198 msgid "Email address for sending notification messages" msgstr "发送通知消息的电子邮件地址" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:208 +#: src/clients/kdump.rb:209 msgid "Email address for sending copy of notification messages" msgstr "发送通知消息副本的电子邮件地址" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:220 +#: src/clients/kdump.rb:221 msgid "Enable option" msgstr "启用选项" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:224 +#: src/clients/kdump.rb:225 msgid "Disable option" msgstr "禁用选项" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:228 +#: src/clients/kdump.rb:229 msgid "Shows current option status" msgstr "显示当前选项状态" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:233 +#: src/clients/kdump.rb:234 msgid "Size of allocated memory MB" msgstr "分配的内存大小 MB" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:240 +#: src/clients/kdump.rb:241 msgid "Number for dump level includes pages for saving" msgstr "转储级别的数目包括要保存的页面" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:247 +#: src/clients/kdump.rb:248 msgid "Dump format can be none, ELF, compressed or lzo" msgstr "转储格式可以为 none、ELF、compressed 或 lzo" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:254 -msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, nfs, cifs" +#: src/clients/kdump.rb:255 +#, fuzzy +#| msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, nfs, cifs" +msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, sftp, nfs, cifs" msgstr "转储目标包括以下目标类型：文件 (本地文件系统), ftp, ssh, nfs, cifs" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:261 +#: src/clients/kdump.rb:262 msgid "Name of server" msgstr "服务器名称" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:266 +#: src/clients/kdump.rb:267 msgid "Port for connection" msgstr "连接端口" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:271 +#: src/clients/kdump.rb:272 msgid "Directory for saving dump images" msgstr "转储映像保存目录" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:278 +#: src/clients/kdump.rb:279 msgid "Exported share" msgstr "导出共享" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:283 +#: src/clients/kdump.rb:284 msgid "User name" msgstr "用户名" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:288 +#: src/clients/kdump.rb:289 msgid "Path of file which includes password (plain text file)" msgstr "密码文件 (普通文本文件) 路径" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:295 +#: src/clients/kdump.rb:296 msgid "udev_id of raw partition" msgstr "原始分区的 udev_id" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:302 +#: src/clients/kdump.rb:303 msgid "The naming scheme is: /boot/vmlinu[zx]-[.gz] kernel means only \"kernel_string\"." msgstr "命名方式是：/boot/vmlinu[zx]-[.gz] 内核只意味着 \"kernel_string\"。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:309 +#: src/clients/kdump.rb:310 msgid "Include command line options." msgstr "包括命令行选项。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:316 +#: src/clients/kdump.rb:317 msgid "Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed" msgstr "选项意味着引导 kdump 内核的运行级别。只允许如 1,2,3,5 这样的数值或 s" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:323 +#: src/clients/kdump.rb:324 msgid "Number of dumps. 0 means keep all." msgstr "转储数目。0 表示全部保留。" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:330 +#: src/clients/kdump.rb:331 msgid "Email address" msgstr "电子邮件地址" #. TRANSLATORS: CommandLine help -#: src/clients/kdump.rb:364 +#: src/clients/kdump.rb:365 msgid "Handles usage of firmware-assisted dump" msgstr "处理使用固件辅助转储" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:414 +#: src/clients/kdump.rb:415 msgid "Display Settings:" msgstr "显示设置：" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:419 +#: src/clients/kdump.rb:420 msgid "Kdump is enabled (boot option \"crashkernel\" is added)" msgstr "已启用 Kdump (引导选项 \"crashkernel\" 已添加)" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:424 +#: src/clients/kdump.rb:425 msgid "Allocate memory (MB) for kdump is: %1" msgstr "为 kdump 分配的内存为 (MB) ：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:430 +#: src/clients/kdump.rb:431 msgid "Kdump is disabled" msgstr "已禁用 kdump" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:436 +#: src/clients/kdump.rb:437 msgid "Dump Level: %1" msgstr "转储级别：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:444 +#: src/clients/kdump.rb:445 msgid "Dump Format: %1" msgstr "转储格式：%1" #. parsing target info -#: src/clients/kdump.rb:451 +#: src/clients/kdump.rb:452 msgid "Dump Target Settings" msgstr "转储目标设置" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:456 +#: src/clients/kdump.rb:457 msgid "target: %1" msgstr "目标：%1" @@ -250,8 +252,8 @@ #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:466 src/clients/kdump.rb:493 src/clients/kdump.rb:536 -#: src/clients/kdump.rb:564 src/clients/kdump.rb:581 +#: src/clients/kdump.rb:467 src/clients/kdump.rb:494 src/clients/kdump.rb:537 +#: src/clients/kdump.rb:565 src/clients/kdump.rb:582 msgid "file directory: %1" msgstr "文件目录：%1" @@ -259,113 +261,113 @@ #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:476 src/clients/kdump.rb:517 src/clients/kdump.rb:557 -#: src/clients/kdump.rb:574 +#: src/clients/kdump.rb:477 src/clients/kdump.rb:518 src/clients/kdump.rb:558 +#: src/clients/kdump.rb:575 msgid "server name: %1" msgstr "服务器名：%1" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:485 src/clients/kdump.rb:527 +#: src/clients/kdump.rb:486 src/clients/kdump.rb:528 msgid "port: %1" msgstr "端口：%1" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:501 src/clients/kdump.rb:596 +#: src/clients/kdump.rb:502 src/clients/kdump.rb:597 msgid "user name: anonymous connection is allowed" msgstr "用户名：允许匿名连接" #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:506 src/clients/kdump.rb:546 src/clients/kdump.rb:601 +#: src/clients/kdump.rb:507 src/clients/kdump.rb:547 src/clients/kdump.rb:602 msgid "user name: %1" msgstr "用户名：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:588 +#: src/clients/kdump.rb:589 msgid "share: %1" msgstr "共享：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:609 +#: src/clients/kdump.rb:610 msgid "EMPTY" msgstr "空" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:617 +#: src/clients/kdump.rb:618 msgid "Custom kdump kernel: %1" msgstr "自定义 kdump 内核：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:628 +#: src/clients/kdump.rb:629 msgid "Kdump command line: %1" msgstr "Kdump 命令行：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:639 +#: src/clients/kdump.rb:640 msgid "Kdump command line append: %1" msgstr "Kdump 命令行附加：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:649 +#: src/clients/kdump.rb:650 msgid "Kdump immediate reboots: %1" msgstr "Kdump 立即重启：%1" -#: src/clients/kdump.rb:651 src/clients/kdump.rb:1258 +#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 msgid "Enabled" msgstr "已启用" -#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 +#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260 msgid "Disabled" msgstr "已禁用" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:661 +#: src/clients/kdump.rb:662 msgid "Numbers of old dumps: All dumps are saved without deleting old dumps" msgstr "旧转储数目：保存所有转储，不删除旧转储" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:669 +#: src/clients/kdump.rb:670 msgid "Numbers of old dumps: %1" msgstr "旧转储数目：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:680 +#: src/clients/kdump.rb:681 msgid "Kdump SMTP Server: %1" msgstr "Kdump SMTP 服务器：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:691 +#: src/clients/kdump.rb:692 msgid "Kdump SMTP User: %1" msgstr "Kdump SMTP 用户：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:700 +#: src/clients/kdump.rb:701 msgid "Kdump SMTP Password: ********" msgstr "Kdump SMTP 密码：********" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:708 +#: src/clients/kdump.rb:709 msgid "Kdump Sending Notification To: %1" msgstr "Kdump 发送通知给：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:719 +#: src/clients/kdump.rb:720 msgid "Kdump Sending Copy of Notification To: %1" msgstr "Kdump 发送通知副本给：%1" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:746 +#: src/clients/kdump.rb:747 msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." msgstr "内核选项 \"crashkernel\" 包含范围。它们将被重写。" #. TRANSLATORS: CommandLine printed text #. Popup::Message(crash_value); #. delete crashkernel paramter from bootloader -#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:559 -#: src/modules/Kdump.rb:578 +#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570 +#: src/modules/Kdump.rb:589 msgid "To apply changes a reboot is necessary." msgstr "需要重启来应用变更。" @@ -384,39 +386,39 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:760 src/clients/kdump.rb:786 src/clients/kdump.rb:815 -#: src/clients/kdump.rb:1047 src/clients/kdump.rb:1064 -#: src/clients/kdump.rb:1081 src/clients/kdump.rb:1098 -#: src/clients/kdump.rb:1113 src/clients/kdump.rb:1129 -#: src/clients/kdump.rb:1152 src/clients/kdump.rb:1172 -#: src/clients/kdump.rb:1192 src/clients/kdump.rb:1206 -#: src/clients/kdump.rb:1229 src/clients/kdump.rb:1249 +#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816 +#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065 +#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099 +#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130 +#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173 +#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207 +#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250 msgid "Wrong options were used." msgstr "使用了错误的选项。" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:777 +#: src/clients/kdump.rb:778 msgid "Dump level was set." msgstr "已设置转储级别。" #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:781 src/clients/kdump.rb:806 +#: src/clients/kdump.rb:782 src/clients/kdump.rb:807 msgid "Wrong value of option." msgstr "选项值错误。" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:802 +#: src/clients/kdump.rb:803 msgid "Dump format was set." msgstr "已设置转储格式。" #. TRANSLATORS: CommandLine printed text help -#: src/clients/kdump.rb:809 +#: src/clients/kdump.rb:810 msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value." msgstr "选项只能包括 \"none\"、\"ELF\"、\"compressed\" 或 \"lzo\" 值。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:829 +#: src/clients/kdump.rb:830 msgid "File %1 does not exist." msgstr "文件 %1 不存在。" @@ -424,8 +426,8 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:851 src/clients/kdump.rb:885 src/clients/kdump.rb:934 -#: src/clients/kdump.rb:968 src/clients/kdump.rb:1015 +#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935 +#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016 msgid "Value for \"dir\" missing." msgstr "\"文件夹\" 的值缺失。" @@ -433,48 +435,48 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:865 src/clients/kdump.rb:915 src/clients/kdump.rb:956 -#: src/clients/kdump.rb:982 +#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957 +#: src/clients/kdump.rb:983 msgid "Value for \"server\" missing." msgstr "\"服务器\" 的值缺失。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:994 +#: src/clients/kdump.rb:995 msgid "Value for \"share\" missing." msgstr "\"共享\" 的值缺失。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1036 +#: src/clients/kdump.rb:1037 msgid "Wrong value for target." msgstr "错误的目标值。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1147 +#: src/clients/kdump.rb:1148 msgid "Wrong value of options \"no\"." msgstr "错误的选项值 \"无\"。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1167 +#: src/clients/kdump.rb:1168 msgid "Wrong value for option \"server\"." msgstr "错误的选项值 \"服务器\"。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1187 +#: src/clients/kdump.rb:1188 msgid "Wrong value for option \"user\"." msgstr "错误的选项值 \"用户\"。" #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1224 src/clients/kdump.rb:1244 +#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245 msgid "Wrong value for option \"email\"." msgstr "错误的选项值 \"电子邮件\"。" -#: src/clients/kdump.rb:1256 +#: src/clients/kdump.rb:1257 msgid "Firmware-assisted dump: %{status}" msgstr "固件辅助转储：%{status}" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1274 +#: src/clients/kdump.rb:1275 msgid "No option has been defined." msgstr "未定义选项。" @@ -484,12 +486,12 @@ msgstr "正在保存 kdump 配置..." #. proposal part - kdump label -#: src/clients/kdump_proposal.rb:68 +#: src/clients/kdump_proposal.rb:82 msgid "Kdump" msgstr "Kdump" #. menubutton entry -#: src/clients/kdump_proposal.rb:70 +#: src/clients/kdump_proposal.rb:84 msgid "&Kdump" msgstr "Kdump(&K)" @@ -579,20 +581,24 @@ msgid "FTP" msgstr "FTP" -#: src/include/kdump/dialogs.rb:223 src/include/kdump/uifunctions.rb:143 -msgid "SSH (scp)" -msgstr "SSH (scp)" +#: src/include/kdump/dialogs.rb:223 +msgid "SSH" +msgstr "SSH" -#: src/include/kdump/dialogs.rb:224 src/include/kdump/uifunctions.rb:173 +#: src/include/kdump/dialogs.rb:224 +msgid "SFTP" +msgstr "" + +#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173 msgid "NFS" msgstr "NFS" -#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:188 +#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188 msgid "CIFS (SMB)" msgstr "CIFS (SMB)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:250 +#: src/include/kdump/dialogs.rb:251 msgid "&SMTP Server" msgstr "SMTP 服务器(&S)" @@ -600,7 +606,7 @@ #. text entry #. text entry #. text entry -#: src/include/kdump/dialogs.rb:262 src/include/kdump/uifunctions.rb:130 +#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130 #: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212 msgid "&User Name" msgstr "用户名(&U)" @@ -609,114 +615,114 @@ #. password entry #. password entry #. password entry -#: src/include/kdump/dialogs.rb:274 src/include/kdump/uifunctions.rb:133 +#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133 #: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215 msgid "&Password" msgstr "密码(&P)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:286 +#: src/include/kdump/dialogs.rb:287 msgid "Notification &To" msgstr "通知接收对象(&T)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:302 +#: src/include/kdump/dialogs.rb:303 msgid "Notifica&tion CC" msgstr "通知抄送对象(&t)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:319 +#: src/include/kdump/dialogs.rb:320 msgid "Custom Kdump &Kernel" msgstr "自定义 Kdump 内核(&K)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:331 +#: src/include/kdump/dialogs.rb:332 msgid "Kdump Co&mmand Line" msgstr "Kdump 命令行(&m)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:343 +#: src/include/kdump/dialogs.rb:344 msgid "Kdump Command &Line Append" msgstr "Kdump 命令行附加(&L)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:360 +#: src/include/kdump/dialogs.rb:361 msgid "&Enable Immediate Reboot After Saving the Core" msgstr "启用保存核心后立即重启(&E)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:374 +#: src/include/kdump/dialogs.rb:375 msgid "Enable Copy Ke&rnel into the Dump Directory" msgstr "启用复制内核到转储目录(&r)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:388 +#: src/include/kdump/dialogs.rb:389 msgid "Enable &Delete Old Dump Images" msgstr "启用删除旧的转储映像(&D)" #. TRANSLATORS: IntField Label -#: src/include/kdump/dialogs.rb:405 +#: src/include/kdump/dialogs.rb:406 msgid "N&umber of Old Dumps" msgstr "旧的转储的数量(&U)" #. "handle" : -#: src/include/kdump/dialogs.rb:426 +#: src/include/kdump/dialogs.rb:427 msgid "Kdump Memory" msgstr "Kdump 内存" -#: src/include/kdump/dialogs.rb:431 +#: src/include/kdump/dialogs.rb:432 msgid "Kdump Start-Up" msgstr "Kdump 启动" -#: src/include/kdump/dialogs.rb:432 +#: src/include/kdump/dialogs.rb:433 msgid "Start-Up" msgstr "启动" -#: src/include/kdump/dialogs.rb:447 +#: src/include/kdump/dialogs.rb:448 msgid "Kdump - Dump Filtering" msgstr "Kdump - 转储过滤" -#: src/include/kdump/dialogs.rb:448 +#: src/include/kdump/dialogs.rb:449 msgid "Dump Filtering" msgstr "转储过滤" -#: src/include/kdump/dialogs.rb:454 +#: src/include/kdump/dialogs.rb:455 msgid "Saving Target for Kdump Image" msgstr "Kdump 映像的保存目标" -#: src/include/kdump/dialogs.rb:461 src/include/kdump/dialogs.rb:462 +#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463 msgid "Dump Target" msgstr "转储目标" -#: src/include/kdump/dialogs.rb:468 +#: src/include/kdump/dialogs.rb:469 msgid "SMTP Server" msgstr "SMTP 服务器" -#: src/include/kdump/dialogs.rb:478 +#: src/include/kdump/dialogs.rb:479 msgid "Notification Email Addresses" msgstr "通知电子邮件地址" -#: src/include/kdump/dialogs.rb:486 src/include/kdump/dialogs.rb:487 +#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488 msgid "Email Notification" msgstr "电子邮件通知" -#: src/include/kdump/dialogs.rb:500 +#: src/include/kdump/dialogs.rb:501 msgid "Custom Kernel for Kdump" msgstr "自定义转储内核" -#: src/include/kdump/dialogs.rb:505 +#: src/include/kdump/dialogs.rb:506 msgid "Command Line" msgstr "命令行" -#: src/include/kdump/dialogs.rb:513 +#: src/include/kdump/dialogs.rb:514 msgid "Dump Settings" msgstr "转储设置" -#: src/include/kdump/dialogs.rb:526 +#: src/include/kdump/dialogs.rb:527 msgid "Kdump Expert Settings" msgstr "Kdump 专家设置" -#: src/include/kdump/dialogs.rb:527 +#: src/include/kdump/dialogs.rb:528 msgid "Expert Settings" msgstr "专家设置" @@ -780,7 +786,7 @@ " <i>LZO 压缩格式</i> - 文件会大一些，但更快速。<br>\n" "</p>" -#. Dump Format - RadioButtons 1/6 +#. Dump Format - RadioButtons 1/7 #: src/include/kdump/helps.rb:72 msgid "" "<p><b>Saving Target for Kdump Image</b><br>\n" @@ -789,7 +795,7 @@ "<p><b>Kdump 映像的保存目标</b><br>\n" " 保存 Kdump 映像的目标。选择保存转储的目标类型。<br></p>" -#. Dump Format - RadioButtons 2/6 +#. Dump Format - RadioButtons 2/7 #: src/include/kdump/helps.rb:76 msgid "" "<p><b>Local Filestem</b> - Save kdump image in the local filesystem.\n" @@ -801,7 +807,7 @@ " <i>保存转储的目录</i> - 保存 kdump 映像的路径。n 通过按浏览选择对话框中的文件夹作为保存 kdump 映像的位置。</i>\n" " <br></p>" -#. Dump Format - RadioButtons 3/6 +#. Dump Format - RadioButtons 3/7 #: src/include/kdump/helps.rb:83 msgid "" "<p><b>FTP</b> - Save kdump image via FTP.\n" @@ -818,10 +824,18 @@ " <i>启用匿名 FTP</i> 启用服务器匿名连接。\n" " FTP 连接的<i>用户名</i>。FTP 连接的<i>密码</i>。<br></p>" -#. Dump Format - RadioButtons 4/6 +#. Dump Format - RadioButtons 4/7 #: src/include/kdump/helps.rb:92 +#, fuzzy +#| msgid "" +#| "<p><b>SSH</b> - Save kdump image via SSH.\n" +#| " <i>Server Name</i> - The name of server.\n" +#| " <i>Port</i> - The port number for connection.\n" +#| " <i>Directory on Server</i> - The path for saving kdump images.\n" +#| " <i>User Name</i> for SSH connection. \n" +#| " <i>Password</i> for SSH connection.<br></p>\n" msgid "" -"<p><b>SSH</b> - Save kdump image via SSH.\n" +"<p><b>SSH</b> - Save kdump image via SSH and 'dd' on target machine.\n" " <i>Server Name</i> - The name of server.\n" " <i>Port</i> - The port number for connection.\n" " <i>Directory on Server</i> - The path for saving kdump images.\n" @@ -835,9 +849,41 @@ " SSH 连接的 <i>用户名</i>。\n" " SSH 连接的 <i>密码</i>。<br></p>\n" -#. Dump Format - RadioButtons 5/6 +#. Dump Format - RadioButtons 5/7 #: src/include/kdump/helps.rb:101 +#, fuzzy +#| msgid "" +#| "<p><b>SSH</b> - Save kdump image via SSH.\n" +#| " <i>Server Name</i> - The name of server.\n" +#| " <i>Port</i> - The port number for connection.\n" +#| " <i>Directory on Server</i> - The path for saving kdump images.\n" +#| " <i>User Name</i> for SSH connection. \n" +#| " <i>Password</i> for SSH connection.<br></p>\n" msgid "" +"<p><b>SFTP</b> - Save kdump image via SFTP.\n" +" <i>Server Name</i> - The name of server.\n" +" <i>Port</i> - The port number for connection.\n" +" <i>Directory on Server</i> - The path for saving kdump images.\n" +" <i>User Name</i> for SSH connection. \n" +" <i>Password</i> for SSH connection.<br></p>\n" +msgstr "" +"<p><b>SSH</b> - 通过 SSH 保存 kdump 映像。\n" +" <i>服务器名</i> - 服务器的名称。\n" +" <i>端口</i> - 连接的端口号。\n" +" <i>服务器目录</i> - 保存 kdump 映像的路径。\n" +" SSH 连接的 <i>用户名</i>。\n" +" SSH 连接的 <i>密码</i>。<br></p>\n" + +#: src/include/kdump/helps.rb:109 +msgid "" +"<p>The choice between SSH and SFTP depends\n" +"on details of server configuration. SLE servers support both\n" +"by default.</p>" +msgstr "" + +#. Dump Format - RadioButtons 6/7 +#: src/include/kdump/helps.rb:115 +msgid "" "<p><b>NFS</b> - Save kdump image on NFS.\n" " <i>Server Name</i> - The name of nfs server.\n" " <i>Directory on Server</i> - The path for saving kdump images.<br></p>" @@ -846,8 +892,8 @@ " <i>服务器名</i> - NFS 服务器的名称。\n" " <i>服务器目录</i> - 保存 kdump 映像的路径。<br></p>" -#. Dump Format - RadioButtons 6/6 -#: src/include/kdump/helps.rb:107 +#. Dump Format - RadioButtons 7/7 +#: src/include/kdump/helps.rb:121 msgid "" "<p><b>CIFS</b> - Save kdump image via CIFS.\n" " <i>Server Name</i> - The name of server.\n" @@ -864,7 +910,7 @@ " 连接的 <i>用户名</i>。连接的 <i>密码</i>。<br></p>" #. Custom Kdump Kernel - TextEntry 1/1 -#: src/include/kdump/helps.rb:116 +#: src/include/kdump/helps.rb:130 msgid "" "<p><b>Custom Kdump Kernel</b> The user can enter the custom kernel.\n" " The naming scheme is:<i>/boot/vmlinu[zx]-[.gz]</i>\n" @@ -875,7 +921,7 @@ " 请只输入 <i>kernel_string</i>。<br></p>" #. Kdump Command Line - TextEntry 1/1 -#: src/include/kdump/helps.rb:122 +#: src/include/kdump/helps.rb:136 msgid "" "<p><b>Kdump Command Line</b>\n" " Additional arguments passed to kexec. <br></p>" @@ -884,7 +930,7 @@ " 要传递给 kexec 的额外参数。<br></p>" #. Kdump Command Line Append - TextEntry 1/1 -#: src/include/kdump/helps.rb:126 +#: src/include/kdump/helps.rb:140 msgid "" "<p><b>Kdump Command Line Append</b>\n" " Set this option to _append_ values to the default command line string. \n" @@ -896,7 +942,7 @@ " 只有设置了 <i>Kdump 命令行</i> 该字符串才能附加。<br></p>\n" #. Enable Immediate Reboot After Saving the Core - CheckBox 1/1 -#: src/include/kdump/helps.rb:133 +#: src/include/kdump/helps.rb:147 msgid "" "<p><b>Enable Immediate Reboot After Saving the Core</b> - \n" " Enable immediately reboot after saving the core in the kdump.<br></p>" @@ -905,7 +951,7 @@ " 启用保存核心到 kdump 后立即重新引导。<br></p>" #. Enable Delete Old Dump Images - CheckBox 1/1 -#: src/include/kdump/helps.rb:137 +#: src/include/kdump/helps.rb:151 msgid "" "<p><b>Enable Delete Old Dump Images</b> - \n" " Enable Delete Old Dump Images. If the number of dump files in \n" @@ -915,7 +961,7 @@ " 启用删除旧转储映像。如果转储文件数目超出了 <i>旧转储数目</i> 指定的数字，将删除旧转储映像。<br></p>" #. Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1 -#: src/include/kdump/helps.rb:143 +#: src/include/kdump/helps.rb:157 msgid "" "<p><b>Enable Copy Kernel into the Dump Directory</b> - \n" " If this option is selected, the kernel and the\n" @@ -927,45 +973,45 @@ " 如果选中了此选项，内核和调试信息 (若安装) 将复制到转储目录。默认为 \"关\"。备份所有文件有助于调试。<br></p>\n" #. SMTP Server -#: src/include/kdump/helps.rb:151 +#: src/include/kdump/helps.rb:165 msgid "<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>" msgstr "<p><b>SMTP 服务器</b>用来在转储后发送通知邮件。</p>" #. SMTP User Name -#: src/include/kdump/helps.rb:155 +#: src/include/kdump/helps.rb:169 msgid "" "<p><b>User Name</b> for SMTP authetication when <i>SMTP Server</i> is\n" " set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>\n" msgstr "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>用户名</b>。可选。如果您不指定用户名和密码，将使用普通 SMTP。</p>\n" #. SMTP Password -#: src/include/kdump/helps.rb:159 +#: src/include/kdump/helps.rb:173 msgid "" "<p><b>Password</b> for SMTP authetication when <i>SMTP Server</i> is set. This\n" " is optional. If you do not specify a username and password, plain SMTP will be used.</p>\n" msgstr "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>密码</b>。可选。如果您不指定用户名和密码，将使用普通 SMTP。</p>\n" #. Notification To (email addresses) -#: src/include/kdump/helps.rb:163 +#: src/include/kdump/helps.rb:177 msgid "<p><b>Notification To</b> Specify the email address to which a notification email will be sent when a dump has been saved.</p>\n" msgstr "<p><b>通知接收对象</b>指定了当转储保存后发送通知邮件的电子邮件地址。</p>\n" #. Notification CC (email addresses) -#: src/include/kdump/helps.rb:167 +#: src/include/kdump/helps.rb:181 msgid "" "<p><b>Notification CC</b> Specify a list of space-separated email addresses to\n" " which a notification email will be sent via cc if a dump has been saved.</p>\n" msgstr "<p><b>通知抄送对象</b>指定了当转储保存后，通过抄送方式发送通知电子邮件的以空格分割的电子邮件地址列表。</p>\n" #. Number of Old Dumps (number) -#: src/include/kdump/helps.rb:171 +#: src/include/kdump/helps.rb:185 msgid "" "<p><b>Number of Old Dumps</b> specifies how many old dumps are kept. If the number of dump files \n" "exceeds this number, older dumps are removed.</p>" msgstr "<p><b>旧转储数目</b>指定了保存多少旧转储文件。如果转储文件数目超过了该数字，旧转储文件将被删除。</p>" #. Read dialog help 1/2 -#: src/include/kdump/helps.rb:175 +#: src/include/kdump/helps.rb:189 msgid "" "<p><b><big>Initializing Kdump Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -974,7 +1020,7 @@ "请稍候...<br></p>\n" #. Read dialog help 2/2 -#: src/include/kdump/helps.rb:179 +#: src/include/kdump/helps.rb:193 msgid "" "<p><b><big>Aborting Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n" @@ -983,7 +1029,7 @@ "请您现在点击<b>终止</b>, 以便安全中断配置工具.</p>\n" #. Write dialog help 1/2 -#: src/include/kdump/helps.rb:183 +#: src/include/kdump/helps.rb:197 msgid "" "<p><b><big>Saving Kdump Configuration</big></b><br>\n" "Please wait...<br></p>\n" @@ -992,7 +1038,7 @@ "请稍候...<br></p>\n" #. Write dialog help 2/2 -#: src/include/kdump/helps.rb:187 +#: src/include/kdump/helps.rb:201 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -1005,7 +1051,7 @@ "</p>\n" #. Summary dialog help 1/3 -#: src/include/kdump/helps.rb:194 +#: src/include/kdump/helps.rb:208 msgid "" "<p><b><big>Kdump Configuration</big></b><br>\n" "Configure kdump here.<br></p>\n" @@ -1014,7 +1060,7 @@ "请在此配置 kdump。<br></p>\n" #. Summary dialog help 2/3 -#: src/include/kdump/helps.rb:198 +#: src/include/kdump/helps.rb:212 msgid "" "<p><b><big>Adding a Kdump:</big></b><br>\n" "Choose an kdump from the list of detected kdumps.\n" @@ -1027,7 +1073,7 @@ "然后按<b>配置</b>。</p>\n" #. Summary dialog help 3/3 -#: src/include/kdump/helps.rb:205 +#: src/include/kdump/helps.rb:219 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "If you press <b>Edit</b>, an additional dialog in which to change\n" @@ -1038,7 +1084,7 @@ "在这个对话框里, 您可以更改您的配置。</p>\n" #. Ovreview dialog help 1/3 -#: src/include/kdump/helps.rb:211 +#: src/include/kdump/helps.rb:225 msgid "" "<p><b><big>Kdump Configuration Overview</big></b><br>\n" "Obtain an overview of installed kdumps. Additionally\n" @@ -1049,7 +1095,7 @@ "对它们的配置进行编辑。<br></p>\n" #. Ovreview dialog help 2/3 -#: src/include/kdump/helps.rb:217 +#: src/include/kdump/helps.rb:231 msgid "" "<p><b><big>Adding a Kdump:</big></b><br>\n" "Press <b>Add</b> to configure a kdump.</p>" @@ -1058,7 +1104,7 @@ "按<b>添加</b>以配置 kdump。</p>" #. Ovreview dialog help 3/3 -#: src/include/kdump/helps.rb:221 +#: src/include/kdump/helps.rb:235 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "Choose a kdump to change or remove.\n" @@ -1103,6 +1149,10 @@ msgid "Enable Anon&ymous FTP" msgstr "启用匿名 FTP (&Y)" +#: src/include/kdump/uifunctions.rb:143 +msgid "SSH / SFTP" +msgstr "" + #. text entries #: src/include/kdump/uifunctions.rb:196 msgid "Exported Sha&re" @@ -1159,7 +1209,7 @@ #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:484 +#: src/modules/Kdump.rb:495 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." @@ -1168,119 +1218,125 @@ "细节请参考 %{log}。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:594 +#: src/modules/Kdump.rb:605 msgid "Initializing kdump Configuration" msgstr "初始化 kdump 配置" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:603 src/modules/Kdump.rb:611 +#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622 msgid "Reading the config file..." msgstr "正在读取配置文件..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:605 +#: src/modules/Kdump.rb:616 msgid "Reading kernel boot options..." msgstr "正在读取内核引导选项..." #. Progress stage 4/4 #. Progress finished 3/4 -#: src/modules/Kdump.rb:607 src/modules/Kdump.rb:615 +#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626 msgid "Reading available memory..." msgstr "正在读取可用的内存..." #. Progress step 2/4 -#: src/modules/Kdump.rb:613 +#: src/modules/Kdump.rb:624 msgid "Reading partitions of disks..." msgstr "正在读取磁盘分区..." #. Error message -#: src/modules/Kdump.rb:627 +#: src/modules/Kdump.rb:638 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "无法读取配置文件 /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:635 +#: src/modules/Kdump.rb:646 msgid "Cannot read kernel boot options." msgstr "无法读取内核引导选项。" #. Error message -#: src/modules/Kdump.rb:642 +#: src/modules/Kdump.rb:653 msgid "Cannot read available memory." msgstr "无法读取可用内存。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:668 +#: src/modules/Kdump.rb:679 msgid "Saving kdump Configuration" msgstr "保存 kdump 配置" #. Progress stage 1/2 -#: src/modules/Kdump.rb:697 +#: src/modules/Kdump.rb:708 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Kdump.rb:699 +#: src/modules/Kdump.rb:710 msgid "Update boot options" msgstr "更新引导选项" #. Progress step 1/2 -#: src/modules/Kdump.rb:703 +#: src/modules/Kdump.rb:714 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Kdump.rb:705 +#: src/modules/Kdump.rb:716 msgid "Updating boot options..." msgstr "正在更新引导选项..." #. Progress finished -#: src/modules/Kdump.rb:707 +#: src/modules/Kdump.rb:718 msgid "Finished" msgstr "已完成" #. Error message -#: src/modules/Kdump.rb:717 +#: src/modules/Kdump.rb:728 msgid "Cannot write settings." msgstr "无法写入设置。" #. Error message -#: src/modules/Kdump.rb:726 +#: src/modules/Kdump.rb:737 msgid "Adding crashkernel parameter to bootloader fault." msgstr "添加 crashkernel 参数到引导加载器失败。" #. Create a textual summary and a list of unconfigured cards #. @return summary of the current configuration -#: src/modules/Kdump.rb:833 +#: src/modules/Kdump.rb:851 msgid "Kdump status: %1" msgstr "Kdump 状态：%1" -#: src/modules/Kdump.rb:834 +#: src/modules/Kdump.rb:852 msgid "enabled" msgstr "已启用" -#: src/modules/Kdump.rb:834 +#: src/modules/Kdump.rb:852 msgid "disabled" msgstr "已禁用" -#: src/modules/Kdump.rb:841 +#: src/modules/Kdump.rb:859 msgid "Value of crashkernel option: %1" msgstr "crashkernel 选项的值：%1" -#: src/modules/Kdump.rb:848 +#: src/modules/Kdump.rb:866 msgid "Dump format: %1" msgstr "转储格式：%1" -#: src/modules/Kdump.rb:855 +#: src/modules/Kdump.rb:873 msgid "Target of dumps: %1" msgstr "转储目标：%1" -#: src/modules/Kdump.rb:862 +#: src/modules/Kdump.rb:880 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:972 +msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available." +msgstr "" + #. Trying to use fadump on unsupported hardware -#: src/modules/Kdump.rb:950 +#: src/modules/Kdump.rb:1065 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." @@ -1288,6 +1344,9 @@ "无法使用固件辅助转储。\n" "此硬件不支持。" +#~ msgid "SSH (scp)" +#~ msgstr "SSH (scp)" + #~ msgid "Package for kexec-tools is not available." #~ msgstr "kexec-tools 的软件包不可用。" Modified: trunk/yast/zh_CN/po/languages_db.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/languages_db.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/languages_db.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-02 16:59+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/ldap-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ldap-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ldap-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: ldap client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-18 19:44+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -22,847 +22,628 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#. translators: command line help text for Ldap client module -#: src/clients/ldap.rb:53 -msgid "LDAP client configuration module" -msgstr "LDAP 客户端配置模块" +#. popup text +#: src/ui.rb:88 +msgid "Really abort the writing process?" +msgstr "真的中止写入过程吗？" -#. translators: command line help text for pam action -#: src/clients/ldap.rb:66 -msgid "Enable or disable authentication with LDAP" -msgstr "启用或禁用 LDAP 认证" +#. help text +#: src/ui.rb:96 +msgid "Writing LDAP Client Settings" +msgstr "正在写入 LDAP 客户端设置" -#. translators: command line help text for summary action -#: src/clients/ldap.rb:73 -msgid "Configuration summary of the LDAP client" -msgstr "LDAP 客户端配置摘要" +#. yes/no popup +#: src/ui.rb:144 +msgid "" +"If you reread settings from the server,\n" +"all changes will be lost. Really reread?\n" +msgstr "若您从服务器重新读取设置将丢失全部修改。真的重新读取吗？\n" -#. translators: command line help text for configure action -#: src/clients/ldap.rb:83 -msgid "Change the global settings of the LDAP client" -msgstr "修改 LDAP 客户端全局设置" +#. help text 1/3 +#: src/ui.rb:168 +msgid "" +"<p>Configure the template used for creating \n" +"new objects (like users or groups).</p>\n" +msgstr "<p>配置用于创建新对象 (如用户或组) 的模板。</p>\n" -#. translators: command line help text for pam enable option -#: src/clients/ldap.rb:91 -msgid "Enable the service" -msgstr "启用服务" +#. help text 2/3 +#: src/ui.rb:172 +msgid "" +"<p>Edit the template attribute values with <b>Edit</b>.\n" +"Changing the <b>cn</b> value renames the template.</p>\n" +msgstr "" +"<p>使用<b>编辑</b>编辑模板属性值。\n" +"修改 <b>CN</b> 值可重命名模板。</p>\n" -#. translators: command line help text for pam disable option -#: src/clients/ldap.rb:97 -msgid "Disable the service" -msgstr "禁用服务" +#. help text 3/3 +#: src/ui.rb:176 +msgid "" +"<p>The second table contains a list of <b>default values</b> used\n" +"for new objects. Modify the list by adding new values, editing or\n" +"removing current ones.</p>\n" +msgstr "<p>第二个表包含一个用于新对象的<b>默认值</b>列表。可以通过添加新值、编辑或删除当前值修改该列表。</p>\n" -#. translators: command line help text for the server option -#: src/clients/ldap.rb:103 -msgid "The LDAP server name" -msgstr "LDAP 服务器名称" +#. table header 1/2 +#. table header 1/2 +#: src/ui.rb:245 src/ui.rb:580 +msgid "Attribute" +msgstr "属性" -#. translators: command line help text for the base option -#: src/clients/ldap.rb:110 -msgid "Distinguished name (DN) of the search base" -msgstr "搜索基址判别名 (DN)" +#. table header 2/2 +#. table header 2/2 +#: src/ui.rb:247 src/ui.rb:582 +msgid "Value" +msgstr "值" -#. command line help text for the 'createconfig' option -#: src/clients/ldap.rb:117 -msgid "Create default configuration objects." -msgstr "创建默认配置对象。" +#. label (table folows) +#: src/ui.rb:253 +msgid "Default Values for New Objects" +msgstr "新对象默认值" -#. command line help text for the 'ldappw' option -#: src/clients/ldap.rb:123 -msgid "LDAP Server Password" -msgstr "LDAP 服务器密码" +#. table header 1/2 +#: src/ui.rb:259 +msgid "Attribute of Object" +msgstr "对象属性" -#. help text for the 'automounter' option -#: src/clients/ldap.rb:130 -msgid "Start or stop automounter" -msgstr "启动或停止自动挂载器" +#. table header 2/2 +#: src/ui.rb:261 +msgid "Default Value" +msgstr "默认值" -#. help text for the 'mkhomedir' option -#: src/clients/ldap.rb:138 -msgid "Create Home Directory on Login" -msgstr "在登录时创建家文件夹" +#. button label (with non-default shortcut) +#: src/ui.rb:267 +msgid "A&dd" +msgstr "添加(&D)" -#. help text for the 'tls' option -#: src/clients/ldap.rb:146 -msgid "Encrypted connection (StartTLS)" -msgstr "加密连接 (StartTLS)" +#. button label +#: src/ui.rb:269 +msgid "&Edit" +msgstr "编辑(&E)" -#. help text for the 'sssd' option -#: src/clients/ldap.rb:154 -msgid "Use System Security Services Daemon (SSSD)" -msgstr "使用系统安全服务守护程序 (SSSD)" +#. dialog label +#: src/ui.rb:281 +msgid "Object Template Configuration" +msgstr "对象模板配置" -#. help text for the 'cache_credentials' option -#: src/clients/ldap.rb:162 -msgid "SSSD Offline Authentication" -msgstr "SSSD 脱机认证" +#. yes/no popup, %1 is name +#: src/ui.rb:384 +msgid "Really delete default attribute \"%1\"?" +msgstr "真的删除默认属性 \"%1\" 吗？" -#. command line help text for the 'realm' option -#: src/clients/ldap.rb:170 -msgid "Kerberos Realm" -msgstr "Kerberos 领域" +#. error popup, %1 is attribute name +#. error popup, %1 is attribute name +#: src/ui.rb:417 src/ui.rb:636 +msgid "" +"The \"%1\" attribute is mandatory.\n" +"Enter a value." +msgstr "" +"'%1' 属性是必需的。\n" +"请输入一个值。" -#. command line help text for the 'kdc' option -#: src/clients/ldap.rb:177 -msgid "KDC Server Address" -msgstr "KDC 服务器地址" +#. helptext 1/4 +#: src/ui.rb:438 +msgid "<p>Manage the configuration stored in the LDAP directory.</p>" +msgstr "<p>管理存储在 LDAP 文件夹中的配置。</p>" -#. password entering label -#: src/clients/ldap.rb:313 -msgid "LDAP Server Password:" -msgstr "LDAP 服务器密码：" +#. helptext 2/4 +#: src/ui.rb:442 +msgid "" +"<p>Each configuration set is called a \"configuration module.\" If there\n" +"is no configuration module in the provided location (base configuration),\n" +"create one with <b>New</b>. Delete the current module\n" +"using <b>Delete</b>.</p>\n" +msgstr "" +"<p>每个配置集都被称为一个 \"配置模块\"。\n" +"若给定位置中没有配置模块 (基本配置)，请使用<b>新建</b>创建一个。\n" +"使用<b>删除</b>删除当前模块。</p>\n" -#. popup text -#: src/include/ldap/ui.rb:88 -msgid "Really abort the writing process?" -msgstr "真的中止写入过程吗？" +#. helptext 3/4 +#: src/ui.rb:449 +msgid "" +"<p>Edit the values of attributes in the table with <b>Edit</b>.\n" +"Some values have special meanings, for example, changing the <b>cn</b> value renames the\n" +"current module.</p>\n" +msgstr "" +"<p>使用<b>编辑</b>编辑表中属性的值。\n" +"某些值具有特殊含义，例如修改 <b>cn</b> 值可以重命名当前模块。</p>\n" -#. help text -#: src/include/ldap/ui.rb:96 -msgid "Writing LDAP Client Settings" -msgstr "正在写入 LDAP 客户端设置" +#. helptext 4/4 +#: src/ui.rb:455 +msgid "" +"<p>To configure the default template of the current module,\n" +"click <b>Configure Template</b>.\n" +"</p>\n" +msgstr "" +"<p>要配置当前模块的默认模板，请点击<b>配置模板</b>。\n" +"</p>\n" -#. popup window -#: src/include/ldap/ui.rb:130 -msgid "Scanning for LDAP servers provided by SLP..." -msgstr "正在扫描 SLP 提供的 LDAP 服务器..." +#. combobox label +#: src/ui.rb:535 +msgid "Configuration &Module" +msgstr "配置模块(&M)" -#. multiselection box label -#: src/include/ldap/ui.rb:152 -msgid "LDAP &Servers Provided by SLP" -msgstr "SLP 提供的 LDAP 服务器(&S)" +#. button label +#: src/ui.rb:559 +msgid "C&onfigure Template" +msgstr "配置模板(&O)" -#. warning popup -#: src/include/ldap/ui.rb:206 -msgid "The certificate file does not seem to have valid format." -msgstr "证书文件格式似乎不是有效的。" +#. dialog label +#: src/ui.rb:598 +msgid "Module Configuration" +msgstr "模块配置" -#. Popup for TLS/SSL related stuff -#: src/include/ldap/ui.rb:248 -msgid "SSL/TLS Configuration" -msgstr "SSL/TLS 配置" +#~ msgid "LDAP client configuration module" +#~ msgstr "LDAP 客户端配置模块" -#: src/include/ldap/ui.rb:255 -msgid "Use SSL/TLS" -msgstr "使用 SSL/TLS" +#~ msgid "Enable or disable authentication with LDAP" +#~ msgstr "启用或禁用 LDAP 认证" -#: src/include/ldap/ui.rb:264 -msgid "Protocols" -msgstr "协议" +#~ msgid "Configuration summary of the LDAP client" +#~ msgstr "LDAP 客户端配置摘要" -#: src/include/ldap/ui.rb:278 -msgid "StartTLS" -msgstr "StartTLS" +#~ msgid "Change the global settings of the LDAP client" +#~ msgstr "修改 LDAP 客户端全局设置" -#: src/include/ldap/ui.rb:286 -msgid "LDAPS" -msgstr "LDAPS" +#~ msgid "Enable the service" +#~ msgstr "启用服务" -#: src/include/ldap/ui.rb:300 -msgid "TLS Options" -msgstr "TLS 选项" +#~ msgid "Disable the service" +#~ msgstr "禁用服务" -#: src/include/ldap/ui.rb:310 -msgid "Request server certificate" -msgstr "需要服务器证书" +#~ msgid "The LDAP server name" +#~ msgstr "LDAP 服务器名称" -#: src/include/ldap/ui.rb:320 -msgid "Certificates" -msgstr "证书" +#~ msgid "Distinguished name (DN) of the search base" +#~ msgstr "搜索基址判别名 (DN)" -#. inputfield label -#: src/include/ldap/ui.rb:330 -msgid "Cer&tificate Directory" -msgstr "证书文件夹(&T)" +#~ msgid "Create default configuration objects." +#~ msgstr "创建默认配置对象。" -#. button label -#: src/include/ldap/ui.rb:336 -msgid "B&rowse" -msgstr "浏览(&B)" +#~ msgid "LDAP Server Password" +#~ msgstr "LDAP 服务器密码" -#. inputfield label -#: src/include/ldap/ui.rb:345 -msgid "CA Cert&ificate File" -msgstr "CA 证书文件(&I)" +#~ msgid "Start or stop automounter" +#~ msgstr "启动或停止自动挂载器" -#. button label -#: src/include/ldap/ui.rb:351 -msgid "Brows&e" -msgstr "浏览(&E)" +#~ msgid "Create Home Directory on Login" +#~ msgstr "在登录时创建家文件夹" -#. inputfield label -#: src/include/ldap/ui.rb:360 -msgid "CA Certificate URL for Download" -msgstr "CA 证书下载 URL" +#~ msgid "Encrypted connection (StartTLS)" +#~ msgstr "加密连接 (StartTLS)" -#. push button label -#: src/include/ldap/ui.rb:365 -msgid "Do&wnload CA Certificate" -msgstr "下载 CA 证书(&W)" +#~ msgid "Use System Security Services Daemon (SSSD)" +#~ msgstr "使用系统安全服务守护程序 (SSSD)" -#. popup label -#: src/include/ldap/ui.rb:425 -msgid "Choose the directory with certificates" -msgstr "选择证书文件夹" +#~ msgid "SSSD Offline Authentication" +#~ msgstr "SSSD 脱机认证" -#. popup label -#: src/include/ldap/ui.rb:437 -msgid "Choose the certificate file" -msgstr "选择证书文件" +#~ msgid "Kerberos Realm" +#~ msgstr "Kerberos 领域" -#. error message -#: src/include/ldap/ui.rb:462 -msgid "Could not download the certificate file from specified URL." -msgstr "无法从指定 URL 下载证书文件。" +#~ msgid "KDC Server Address" +#~ msgstr "KDC 服务器地址" -#. popup message, %1 is file name, %2 directory -#: src/include/ldap/ui.rb:497 -msgid "" -"The downloaded certificate file\n" -"\n" -"'%1'\n" -"\n" -"has been copied to '%2' directory.\n" -msgstr "" -"下载的证书文件\n" -"\n" -"'%1'\n" -"\n" -"已复制到 '%2' 文件夹。\n" +#~ msgid "LDAP Server Password:" +#~ msgstr "LDAP 服务器密码：" -#. help text 1/9 -#: src/include/ldap/ui.rb:533 -msgid "<p>Set up your machine as an LDAP client.</p>\n" -msgstr "<p>将您的计算机设置为 LDAP 客户端。</p>\n" +#~ msgid "Scanning for LDAP servers provided by SLP..." +#~ msgstr "正在扫描 SLP 提供的 LDAP 服务器..." -#. help text 2/9 -#: src/include/ldap/ui.rb:535 -msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" -msgstr "<p>要与 OpenLDAP 服务器认证您的用户，请选择<b>使用 LDAP</b>。相应地还将配置 NSS 和 PAM。</p>" +#~ msgid "LDAP &Servers Provided by SLP" +#~ msgstr "SLP 提供的 LDAP 服务器(&S)" -#. help text 3/9 -#: src/include/ldap/ui.rb:539 -msgid "" -"<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" -"If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" -"will be removed. The PAM configuration will be modified and the LDAP entry\n" -"removed.</p>" -msgstr "" -"<p>要取消激活 LDAP 服务，请点击<b>不使用 LDAP</b>。\n" -"若您取消激活了 LDAP，则将移除 /etc/nsswitch.conf 中的当前 LDAP 密码项。\n" -"PAM 配置将被修改并且 LDAP 项将被移除。</p>" +#~ msgid "The certificate file does not seem to have valid format." +#~ msgstr "证书文件格式似乎不是有效的。" -#. help text 3.5/9 -#: src/include/ldap/ui.rb:546 -msgid "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" -msgstr "<p>要激活 LDAP 但禁止用户登录到此计算机，请选择<b>启用 LDAP 用户但禁用登录</b>。</p>" +#~ msgid "SSL/TLS Configuration" +#~ msgstr "SSL/TLS 配置" -#. help text -#: src/include/ldap/ui.rb:550 -msgid "<p>Check <b>Use System Security Services Daemon</b> if you want the system to use SSSD instead of nss_ldap.</p>" -msgstr "<p>若您想要系统使用 SSSD 而不是 nss_ldap，请勾选<b>使用系统安全服务守护程序</b>。</p>" +#~ msgid "Use SSL/TLS" +#~ msgstr "使用 SSL/TLS" -#. help text 4/9 -#: src/include/ldap/ui.rb:554 -msgid "" -"<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" -"by separating their addresses with spaces. It must be possible to resolve the\n" -"addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" -"</p>\n" -msgstr "" -"<p>请在<b>地址</b>中输入 LDAP 服务器的地址 (诸如 ldap.example.com 或 10.20.0.2) 和搜索基址的判别名 (<b>基本判别名</b>，如 dc=example,dc=com)。\n" -"指定多个服务器时请使用空格分隔它们的地址。\n" -"地址必须在不使用 LDAP 的情况下也能解析。\n" -"您也可以使用语法 \"服务器:端口\" 来指定服务器运行的端口，\n" -"例如，<tt>ldap.example.com:379</tt>。\n" -"</p>\n" +#~ msgid "Protocols" +#~ msgstr "协议" -#. help text 5/9 -#: src/include/ldap/ui.rb:561 -msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" -msgstr "<p>通过<b>查找</b>可从服务定位协议 (SLP) 提供的列表中选择 LDAP 服务器。使用<b>提取判别名</b>可从服务器读取基本判别名。</p>" +#~ msgid "StartTLS" +#~ msgstr "StartTLS" -#. help text 6/9 -#: src/include/ldap/ui.rb:565 -msgid "" -"<p>Some LDAP servers support StartTLS (RFC2830).\n" -"If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" -"to encrypt your communication with the LDAP server. You may download a CA\n" -"certificate file in PEM format from a given URL.</p>\n" -msgstr "" -"<p>有些 LDAP 服务器支持 StartTLS (RFC2830)。\n" -"若您的服务器支持并已配置了 StartTLS，请激活 <b>LDAP TLS/SSL</b> 以加密您与 LDAP 服务器的通讯。\n" -"您或许需要从给定 URL 下载一个 PEM 格式的 CA 证书文件。</p>\n" +#~ msgid "LDAPS" +#~ msgstr "LDAPS" -#: src/include/ldap/ui.rb:571 -msgid "" -"<p>A TLS session may require special client configuration. One of the config\n" -" options is TLS_REQCERT which specifies what checks to perform on server certificates.\n" -" The value is the <b>level</b> that can be specified with keywords <i>never</i>, <i>allow</i>,\n" -" <i>try</i> and <i>demand</i>. In the <b>SSL/TLS Configuration</b> dialog there is\n" -" the option <b>Request server certificate</b> which will set the TLS_REQCERT\n" -" configuration option to <i>demand</i> if it's enabled or to <i>allow</i> if it's disabled.</p>\n" -msgstr "" -"<p>TLS 会话可能需要特殊的客户端配置。\n" -" 配置选项之一是 TLS_REQCERT 其指定了要对服务器证书执行哪些检查。\n" -" 该值为 <b>level</b> 可以使用关键字 <i>never</i>、<i>allow</i>、\n" -" <i>try</i> 和 <i>demand</i> 指定。在 <b>SSL/TLS 配置</b> 对话框中\n" -" 有一个 <b>请求服务器证书</b> 选项，若启用则其将把 TLS_REQCERT\n" -" 配置选项设为 <i>demand</i>，若禁用则设为 <i>allow</i>。</p>\n" +#~ msgid "TLS Options" +#~ msgstr "TLS 选项" -#: src/include/ldap/ui.rb:579 -msgid "" -"<p>In addition to LDAP URLs and TLS/SSL encryption, LDAP supports LDAPS URLs.\n" -" LDAPS URLs use SSL connections instead of plain connections. They have a syntax\n" -" similar to LDAP URLs except the schemes are different and the default port for LDAPS URLs\n" -" is 636 instead of 389.</p>\n" -msgstr "" -"<p>除了 LDAP URLs 和 TLS/SSL 加密外，LDAP 也支持 LDAPS URLs。\n" -" LDAPS URLs 使用 SSL 连接而非普通连接。\n" -" 它们的语法和 LDAP URLs 很相似除了样式有所不同\n" -" 且 LDAPS URLs 的默认端口是 636 而非 389。</p>\n" +#~ msgid "Request server certificate" +#~ msgstr "需要服务器证书" -#. help text 8/9 -#: src/include/ldap/ui.rb:586 -msgid "" -"<p>To configure advanced LDAP settings, click\n" -"<b>Advanced Configuration</b>.</p>\n" -"<p>To configure security settings, click\n" -"<b>SSL/TLS Configuration</b>.</p>\n" -msgstr "" -"<p>要配置高级 LDAP 设置，请点击<b>高级配置</b>。</p>\n" -"<p>要配置安全设置，请点击<b>SSL/TLS 配置</b>。</p>\n" +#~ msgid "Certificates" +#~ msgstr "证书" -#. help text 9/9 (additional) -#: src/include/ldap/ui.rb:591 -msgid "" -"<p><b>Automounter</b> is a daemon that automatically mounts directories, such\n" -"as users' home directories. Its configuration files (auto.*) should already\n" -"exist locally or over LDAP. If the automounter is not installed yet but you\n" -"want to use it, it will be installed automatically.</p>\n" -msgstr "" -"<p><b>自动挂载器</b>是一个自动挂载文件夹，例如用户的家文件夹，的守护程序。\n" -"其配置文件 (auto.*) 应已存在于本地或通过 LDAP 存在。\n" -"若尚未安装自动挂载器，而您又想要使用它，那么将自动安装它。</p>\n" +#~ msgid "Cer&tificate Directory" +#~ msgstr "证书文件夹(&T)" -#. check box label -#: src/include/ldap/ui.rb:614 -msgid "Start Auto&mounter" -msgstr "启动自动挂载器(&M)" +#~ msgid "B&rowse" +#~ msgstr "浏览(&B)" -#. checkbox label -#: src/include/ldap/ui.rb:625 -msgid "C&reate Home Directory on Login" -msgstr "登录时创建家文件夹(&R)" +#~ msgid "CA Cert&ificate File" +#~ msgstr "CA 证书文件(&I)" -#. checkbox label -#: src/include/ldap/ui.rb:635 -msgid "Disable User &Logins" -msgstr "禁用用户登录(&L)" +#~ msgid "Brows&e" +#~ msgstr "浏览(&E)" -#. frame label -#: src/include/ldap/ui.rb:648 -msgid "User Authentication" -msgstr "用户认证" +#~ msgid "CA Certificate URL for Download" +#~ msgstr "CA 证书下载 URL" -#. radio button label -#: src/include/ldap/ui.rb:663 -msgid "Do &Not Use LDAP" -msgstr "不使用 LDAP(&N)" +#~ msgid "Do&wnload CA Certificate" +#~ msgstr "下载 CA 证书(&W)" -#. radio button label -#: src/include/ldap/ui.rb:672 -msgid "&Use LDAP" -msgstr "使用 LDAP(&U)" +#~ msgid "Choose the directory with certificates" +#~ msgstr "选择证书文件夹" -#. frame label -#: src/include/ldap/ui.rb:687 -msgid "LDAP Client" -msgstr "LDAP 客户端" +#~ msgid "Choose the certificate file" +#~ msgstr "选择证书文件" -#. text entry label -#: src/include/ldap/ui.rb:697 -msgid "Addresses of LDAP &Servers" -msgstr "LDAP 服务器地址(&S)" +#~ msgid "Could not download the certificate file from specified URL." +#~ msgstr "无法从指定 URL 下载证书文件。" -#. push button label -#: src/include/ldap/ui.rb:703 -msgid "F&ind" -msgstr "查找(&I)" +#~ msgid "" +#~ "The downloaded certificate file\n" +#~ "\n" +#~ "'%1'\n" +#~ "\n" +#~ "has been copied to '%2' directory.\n" +#~ msgstr "" +#~ "下载的证书文件\n" +#~ "\n" +#~ "'%1'\n" +#~ "\n" +#~ "已复制到 '%2' 文件夹。\n" -#. text entry label -#: src/include/ldap/ui.rb:711 -msgid "LDAP Base &DN" -msgstr "LDAP 基本判别名(&D)" +#~ msgid "<p>Set up your machine as an LDAP client.</p>\n" +#~ msgstr "<p>将您的计算机设置为 LDAP 客户端。</p>\n" -#. push button label -#: src/include/ldap/ui.rb:717 -msgid "F&etch DN" -msgstr "提取判别名(&E)" +#~ msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>" +#~ msgstr "<p>要与 OpenLDAP 服务器认证您的用户，请选择<b>使用 LDAP</b>。相应地还将配置 NSS 和 PAM。</p>" -#. pushbutton label -#: src/include/ldap/ui.rb:731 -msgid "SSL/TLS Configuration..." -msgstr "SSL/TLS 配置..." +#~ msgid "" +#~ "<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n" +#~ "If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n" +#~ "will be removed. The PAM configuration will be modified and the LDAP entry\n" +#~ "removed.</p>" +#~ msgstr "" +#~ "<p>要取消激活 LDAP 服务，请点击<b>不使用 LDAP</b>。\n" +#~ "若您取消激活了 LDAP，则将移除 /etc/nsswitch.conf 中的当前 LDAP 密码项。\n" +#~ "PAM 配置将被修改并且 LDAP 项将被移除。</p>" -#. pushbutton label -#: src/include/ldap/ui.rb:733 -msgid "&Advanced Configuration..." -msgstr "高级配置(&A)..." +#~ msgid "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>" +#~ msgstr "<p>要激活 LDAP 但禁止用户登录到此计算机，请选择<b>启用 LDAP 用户但禁用登录</b>。</p>" -#. dialog title -#. dialog label -#: src/include/ldap/ui.rb:742 src/include/ldap/wizards.rb:90 -msgid "LDAP Client Configuration" -msgstr "LDAP 客户端配置" +#~ msgid "<p>Check <b>Use System Security Services Daemon</b> if you want the system to use SSSD instead of nss_ldap.</p>" +#~ msgstr "<p>若您想要系统使用 SSSD 而不是 nss_ldap，请勾选<b>使用系统安全服务守护程序</b>。</p>" -#. question popup -#: src/include/ldap/ui.rb:765 -msgid "" -"Previous LDAP client configuration was detected.\n" -"\n" -"Current configuration does not use SSSD but nss_ldap.\n" -"Only SSSD based configurations are supported by YaST.\n" -"Do you want to continue and use SSSD or cancel to keep the old configuration?" -msgstr "" -"检测到之前的 LDAP 客户端配置。\n" -"\n" -"当前配置没有使用 SSSD，而是用了 nss_ldap。\n" -"YaST 只支持基于 SSSD 的配置。\n" -"您想要继续并使用 SSSD 还是取消并保留旧配置？" +#~ msgid "" +#~ "<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n" +#~ "by separating their addresses with spaces. It must be possible to resolve the\n" +#~ "addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n" +#~ "</p>\n" +#~ msgstr "" +#~ "<p>请在<b>地址</b>中输入 LDAP 服务器的地址 (诸如 ldap.example.com 或 10.20.0.2) 和搜索基址的判别名 (<b>基本判别名</b>，如 dc=example,dc=com)。\n" +#~ "指定多个服务器时请使用空格分隔它们的地址。\n" +#~ "地址必须在不使用 LDAP 的情况下也能解析。\n" +#~ "您也可以使用语法 \"服务器:端口\" 来指定服务器运行的端口，\n" +#~ "例如，<tt>ldap.example.com:379</tt>。\n" +#~ "</p>\n" -#. error popup label -#: src/include/ldap/ui.rb:838 -msgid "Enter an LDAP base DN." -msgstr "请输入 LDAP 基本判别名。" +#~ msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>" +#~ msgstr "<p>通过<b>查找</b>可从服务定位协议 (SLP) 提供的列表中选择 LDAP 服务器。使用<b>提取判别名</b>可从服务器读取基本判别名。</p>" -#. error popup label -#: src/include/ldap/ui.rb:845 -msgid "Enter at least one address of an LDAP server." -msgstr "请至少输入一个 LDAP 服务器地址。" +#~ msgid "" +#~ "<p>Some LDAP servers support StartTLS (RFC2830).\n" +#~ "If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n" +#~ "to encrypt your communication with the LDAP server. You may download a CA\n" +#~ "certificate file in PEM format from a given URL.</p>\n" +#~ msgstr "" +#~ "<p>有些 LDAP 服务器支持 StartTLS (RFC2830)。\n" +#~ "若您的服务器支持并已配置了 StartTLS，请激活 <b>LDAP TLS/SSL</b> 以加密您与 LDAP 服务器的通讯。\n" +#~ "您或许需要从给定 URL 下载一个 PEM 格式的 CA 证书文件。</p>\n" -#. error popup label -#: src/include/ldap/ui.rb:853 -msgid "The LDAP server address is invalid." -msgstr "LDAP 服务器地址无效。" +#~ msgid "" +#~ "<p>A TLS session may require special client configuration. One of the config\n" +#~ " options is TLS_REQCERT which specifies what checks to perform on server certificates.\n" +#~ " The value is the <b>level</b> that can be specified with keywords <i>never</i>, <i>allow</i>,\n" +#~ " <i>try</i> and <i>demand</i>. In the <b>SSL/TLS Configuration</b> dialog there is\n" +#~ " the option <b>Request server certificate</b> which will set the TLS_REQCERT\n" +#~ " configuration option to <i>demand</i> if it's enabled or to <i>allow</i> if it's disabled.</p>\n" +#~ msgstr "" +#~ "<p>TLS 会话可能需要特殊的客户端配置。\n" +#~ " 配置选项之一是 TLS_REQCERT 其指定了要对服务器证书执行哪些检查。\n" +#~ " 该值为 <b>level</b> 可以使用关键字 <i>never</i>、<i>allow</i>、\n" +#~ " <i>try</i> 和 <i>demand</i> 指定。在 <b>SSL/TLS 配置</b> 对话框中\n" +#~ " 有一个 <b>请求服务器证书</b> 选项，若启用则其将把 TLS_REQCERT\n" +#~ " 配置选项设为 <i>demand</i>，若禁用则设为 <i>allow</i>。</p>\n" -#. popup question: user enabled LDAP now, but probably has -#. enabled NIS client before -#: src/include/ldap/ui.rb:871 -msgid "" -"When you configure your machine as an LDAP client,\n" -"you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" -msgstr "" -"若您将您的计算机配置为了 LDAP 客户端，\n" -"您将无法使用 NIS 撷取数据。真的使用 LDAP 而不是 NIS 吗？\n" +#~ msgid "" +#~ "<p>In addition to LDAP URLs and TLS/SSL encryption, LDAP supports LDAPS URLs.\n" +#~ " LDAPS URLs use SSL connections instead of plain connections. They have a syntax\n" +#~ " similar to LDAP URLs except the schemes are different and the default port for LDAPS URLs\n" +#~ " is 636 instead of 389.</p>\n" +#~ msgstr "" +#~ "<p>除了 LDAP URLs 和 TLS/SSL 加密外，LDAP 也支持 LDAPS URLs。\n" +#~ " LDAPS URLs 使用 SSL 连接而非普通连接。\n" +#~ " 它们的语法和 LDAP URLs 很相似除了样式有所不同\n" +#~ " 且 LDAPS URLs 的默认端口是 636 而非 389。</p>\n" -#. popup text -#: src/include/ldap/ui.rb:941 -msgid "LDAP is now enabled." -msgstr "LDAP 现已启用。" +#~ msgid "" +#~ "<p>To configure advanced LDAP settings, click\n" +#~ "<b>Advanced Configuration</b>.</p>\n" +#~ "<p>To configure security settings, click\n" +#~ "<b>SSL/TLS Configuration</b>.</p>\n" +#~ msgstr "" +#~ "<p>要配置高级 LDAP 设置，请点击<b>高级配置</b>。</p>\n" +#~ "<p>要配置安全设置，请点击<b>SSL/TLS 配置</b>。</p>\n" -#. message popup, part 1/2 -#: src/include/ldap/ui.rb:947 -msgid "" -"This change only affects newly created processes and not already\n" -"running services. Restart your services manually or reboot \n" -"the machine to enable it for all services.\n" -msgstr "" -"此修改只影响新创建的进程和尚未运行的服务。\n" -"请手动重启服务或重启计算机以为全部服务启用它。\n" +#~ msgid "" +#~ "<p><b>Automounter</b> is a daemon that automatically mounts directories, such\n" +#~ "as users' home directories. Its configuration files (auto.*) should already\n" +#~ "exist locally or over LDAP. If the automounter is not installed yet but you\n" +#~ "want to use it, it will be installed automatically.</p>\n" +#~ msgstr "" +#~ "<p><b>自动挂载器</b>是一个自动挂载文件夹，例如用户的家文件夹，的守护程序。\n" +#~ "其配置文件 (auto.*) 应已存在于本地或通过 LDAP 存在。\n" +#~ "若尚未安装自动挂载器，而您又想要使用它，那么将自动安装它。</p>\n" -#. message popup, part 1/2 -#: src/include/ldap/ui.rb:958 -msgid "" -"\n" -"To enable remote login for LDAP users, sshd is\n" -"restarted automatically by YaST.\n" -msgstr "" -"\n" -"为启用 LDAP 用户远程登录，YaST 将自动重启 sshd。\n" +#~ msgid "Start Auto&mounter" +#~ msgstr "启动自动挂载器(&M)" -#. yes/no question -#: src/include/ldap/ui.rb:970 -msgid "" -"The security connection is enabled, but server certificate verification is disabled.\n" -"Enable certificate checks now?" -msgstr "" -"已启用了安全连接，但服务器证书校验被禁用。\n" -"现在启用证书检查吗？" +#~ msgid "C&reate Home Directory on Login" +#~ msgstr "登录时创建家文件夹(&R)" -#. help text caption 1 -#: src/include/ldap/ui.rb:1015 -msgid "<p><b>Advanced LDAP Client Settings</b></p>" -msgstr "<p><b>高级 LDAP 客户端设置</b></p>" +#~ msgid "Disable User &Logins" +#~ msgstr "禁用用户登录(&L)" -#. help text 1/3 -#: src/include/ldap/ui.rb:1017 -msgid "" -"<p>If Kerberos authentication should be used, specify the <b>realm</b> and <b>KDC Address</b>.\n" -"Determine if user credentials should be cached locally by checking <b>SSSD Offline Authentication</b>.\n" -"For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>.</p>\n" -msgstr "" -"<p>若应使用 Kerberos 认证，请指定<b>领域</b>和 <b>KDC 地址</b>。\n" -"通过点击 <b>SSSD 脱机认证</b>来决定是否本地缓存用户机要资料。\n" -"更多 SSSD 设置信息，请参考 <tt>sssd.conf</tt> 的 man 页面。</p>\n" +#~ msgid "User Authentication" +#~ msgstr "用户认证" -#. help text 2/3 -#: src/include/ldap/ui.rb:1023 -msgid "" -"<p><b>Password Change Protocol</b> refers to the pam_password attribute of the\n" -"<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.</p>" -msgstr "<p><b>密码修改协议</b>指的是 <tt>/etc/ldap.conf</tt> 文件的 pam_password 属性。请参考 <tt>man pam_ldap</tt> 了解其值的解释。</p>" +#~ msgid "Do &Not Use LDAP" +#~ msgstr "不使用 LDAP(&N)" -#. help text 3/3, %1 is attribute name -#: src/include/ldap/ui.rb:1028 -msgid "" -"<p>Set the type of LDAP groups to use.\n" -"The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" -msgstr "" -"<p>请设置要使用的 LDAP 组类型。\n" -"<b>组成员属性</b>的默认值为 <i>%1</i>。</p>\n" +#~ msgid "&Use LDAP" +#~ msgstr "使用 LDAP(&U)" -#: src/include/ldap/ui.rb:1034 -msgid "" -"<p>If secure connection requires certificate checking, specify where your\n" -"certificate file is located. Enter either a directory containing certificates\n" -"or the explicit path to one certificate file.</p>" -msgstr "<p>若安全连接要求证书检查，请指定您证书文件的位置。请输入包含证书的文件夹或一个证书文件的明确路径。</p>" +#~ msgid "LDAP Client" +#~ msgstr "LDAP 客户端" -#. help text caption 2 -#: src/include/ldap/ui.rb:1042 -msgid "<p><b>Access to Server</b></p>" -msgstr "<p><b>服务器访问</b></p>" +#~ msgid "Addresses of LDAP &Servers" +#~ msgstr "LDAP 服务器地址(&S)" -#. help text 1/4 -#: src/include/ldap/ui.rb:1044 -msgid "" -"<p>First, set <b>Configuration Base DN</b>.\n" -"This is the base for storing your configuration data on the LDAP\n" -"server.</p>\n" -msgstr "" -"<p>首先请设置<b>配置基本判别名</b>。\n" -"它是 LDAP 服务器上存储您的配置数据的基础。</p>\n" +#~ msgid "F&ind" +#~ msgstr "查找(&I)" -#. help text 2/4 -#: src/include/ldap/ui.rb:1050 -msgid "" -"<p>To access the data stored on the server, enter the\n" -"<b>Administrator DN</b>.\n" -"You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or \n" -"the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" -msgstr "" -"<p>要访问存储在服务器上的数据，请输入<b>管理员判别名</b>。\n" -"您可以输入完整判别名 (例如 cn=Administrator,dc=mydomain,dc=com)，也可以只输入相对判别名 (例如 cn=Administrator)。\n" -"若勾选了适当的选项则会自动追加 LDAP 基本判别名。</p>\n" +#~ msgid "LDAP Base &DN" +#~ msgstr "LDAP 基本判别名(&D)" -#. help text 3/4 -#: src/include/ldap/ui.rb:1057 -msgid "" -"<p>To create the default configuration objects for LDAP users and groups,\n" -"check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" -msgstr "" -"<p>要为 LDAP 用户和组创建默认的配置对象，请勾选<b>创建默认配置对象</b>。\n" -"只有在不存在时才会创建这些对象。</p>\n" +#~ msgid "F&etch DN" +#~ msgstr "提取判别名(&E)" -#. help text 4/4 -#: src/include/ldap/ui.rb:1061 -msgid "" -"<p>Press <b>Configure</b> to configure settings stored on the\n" -"LDAP server. You will be asked for the password if you are not connected yet or\n" -"have changed your configuration.</p>\n" -msgstr "" -"<p>按<b>配置</b>配置存储在 LDAP 服务器上的设置。\n" -"若您尚未连接或已修改了配置，系统将请求您输入密码。</p>\n" +#~ msgid "SSL/TLS Configuration..." +#~ msgstr "SSL/TLS 配置..." -#. help text 1/1 -#: src/include/ldap/ui.rb:1068 -msgid "" -"<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are\n" -"set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>\n" -msgstr "" -"<p>若特定映射 (用户或组) 的搜索基址与基本判别名不同请指定用于特定映射的搜索基址。\n" -"这些值将被设置到 /etc/sssd/sssd.conf 文件中的 ldap_user_search_base 和 ldap_group_search_base 和 ldap_autofs_search_base 属性。</p>\n" +#~ msgid "&Advanced Configuration..." +#~ msgstr "高级配置(&A)..." -#. tab label -#: src/include/ldap/ui.rb:1142 -msgid "C&lient Settings" -msgstr "客户端设置(&L)" +#~ msgid "LDAP Client Configuration" +#~ msgstr "LDAP 客户端配置" -#. tab label -#: src/include/ldap/ui.rb:1144 -msgid "Ad&ministration Settings" -msgstr "管理设置(&M)" +#~ msgid "" +#~ "Previous LDAP client configuration was detected.\n" +#~ "\n" +#~ "Current configuration does not use SSSD but nss_ldap.\n" +#~ "Only SSSD based configurations are supported by YaST.\n" +#~ "Do you want to continue and use SSSD or cancel to keep the old configuration?" +#~ msgstr "" +#~ "检测到之前的 LDAP 客户端配置。\n" +#~ "\n" +#~ "当前配置没有使用 SSSD，而是用了 nss_ldap。\n" +#~ "YaST 只支持基于 SSSD 的配置。\n" +#~ "您想要继续并使用 SSSD 还是取消并保留旧配置？" -#. tab label -#: src/include/ldap/ui.rb:1146 -msgid "Naming Contexts" -msgstr "命名环境" +#~ msgid "Enter an LDAP base DN." +#~ msgstr "请输入 LDAP 基本判别名。" -#. textentry label -#: src/include/ldap/ui.rb:1180 -msgid "&User Map" -msgstr "用户映射(&U)" +#~ msgid "Enter at least one address of an LDAP server." +#~ msgstr "请至少输入一个 LDAP 服务器地址。" -#. button label -#: src/include/ldap/ui.rb:1186 -msgid "&Browse" -msgstr "浏览(&B)" +#~ msgid "The LDAP server address is invalid." +#~ msgstr "LDAP 服务器地址无效。" -#. textentry label -#: src/include/ldap/ui.rb:1194 -msgid "&Group Map" -msgstr "组映射(&G)" +#~ msgid "" +#~ "When you configure your machine as an LDAP client,\n" +#~ "you cannot retrieve data with NIS. Really use LDAP instead of NIS?\n" +#~ msgstr "" +#~ "若您将您的计算机配置为了 LDAP 客户端，\n" +#~ "您将无法使用 NIS 撷取数据。真的使用 LDAP 而不是 NIS 吗？\n" -#. button label -#. button label -#. button label -#: src/include/ldap/ui.rb:1200 src/include/ldap/ui.rb:1214 -#: src/include/ldap/ui.rb:1332 -msgid "Bro&wse" -msgstr "浏览(&W)" +#~ msgid "LDAP is now enabled." +#~ msgstr "LDAP 现已启用。" -#. textentry label -#: src/include/ldap/ui.rb:1208 -msgid "&Autofs Map" -msgstr "&Autofs 映射" +#~ msgid "" +#~ "This change only affects newly created processes and not already\n" +#~ "running services. Restart your services manually or reboot \n" +#~ "the machine to enable it for all services.\n" +#~ msgstr "" +#~ "此修改只影响新创建的进程和尚未运行的服务。\n" +#~ "请手动重启服务或重启计算机以为全部服务启用它。\n" -#. checkbox label -#: src/include/ldap/ui.rb:1240 -msgid "&Use Kerberos" -msgstr "使用 Kerberos(&U)" +#~ msgid "" +#~ "\n" +#~ "To enable remote login for LDAP users, sshd is\n" +#~ "restarted automatically by YaST.\n" +#~ msgstr "" +#~ "\n" +#~ "为启用 LDAP 用户远程登录，YaST 将自动重启 sshd。\n" -#. textentry label -#: src/include/ldap/ui.rb:1248 -msgid "Default Real&m" -msgstr "默认领域(&M)" +#~ msgid "" +#~ "The security connection is enabled, but server certificate verification is disabled.\n" +#~ "Enable certificate checks now?" +#~ msgstr "" +#~ "已启用了安全连接，但服务器证书校验被禁用。\n" +#~ "现在启用证书检查吗？" -#. textentry label -#: src/include/ldap/ui.rb:1250 -msgid "&KDC Server Address" -msgstr "&KDC 服务器地址" +#~ msgid "<p><b>Advanced LDAP Client Settings</b></p>" +#~ msgstr "<p><b>高级 LDAP 客户端设置</b></p>" -#. combobox label -#: src/include/ldap/ui.rb:1257 -msgid "LDAP Schema" -msgstr "LDAP 方案" +#~ msgid "" +#~ "<p>If Kerberos authentication should be used, specify the <b>realm</b> and <b>KDC Address</b>.\n" +#~ "Determine if user credentials should be cached locally by checking <b>SSSD Offline Authentication</b>.\n" +#~ "For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>.</p>\n" +#~ msgstr "" +#~ "<p>若应使用 Kerberos 认证，请指定<b>领域</b>和 <b>KDC 地址</b>。\n" +#~ "通过点击 <b>SSSD 脱机认证</b>来决定是否本地缓存用户机要资料。\n" +#~ "更多 SSSD 设置信息，请参考 <tt>sssd.conf</tt> 的 man 页面。</p>\n" -#. checkbox label -#: src/include/ldap/ui.rb:1269 -msgid "Enable user and group enumeration" -msgstr "启用用户和组枚举" +#~ msgid "" +#~ "<p><b>Password Change Protocol</b> refers to the pam_password attribute of the\n" +#~ "<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.</p>" +#~ msgstr "<p><b>密码修改协议</b>指的是 <tt>/etc/ldap.conf</tt> 文件的 pam_password 属性。请参考 <tt>man pam_ldap</tt> 了解其值的解释。</p>" -#. check box label -#: src/include/ldap/ui.rb:1281 -msgid "SSSD O&ffline Authentication" -msgstr "SSSD 脱机认证(&F)" +#~ msgid "" +#~ "<p>Set the type of LDAP groups to use.\n" +#~ "The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n" +#~ msgstr "" +#~ "<p>请设置要使用的 LDAP 组类型。\n" +#~ "<b>组成员属性</b>的默认值为 <i>%1</i>。</p>\n" -#. combobox label -#: src/include/ldap/ui.rb:1291 -msgid "Passwor&d Change Protocol" -msgstr "密码修改协议(&D)" +#~ msgid "" +#~ "<p>If secure connection requires certificate checking, specify where your\n" +#~ "certificate file is located. Enter either a directory containing certificates\n" +#~ "or the explicit path to one certificate file.</p>" +#~ msgstr "<p>若安全连接要求证书检查，请指定您证书文件的位置。请输入包含证书的文件夹或一个证书文件的明确路径。</p>" -#. combobox label -#: src/include/ldap/ui.rb:1298 -msgid "Group Member &Attribute" -msgstr "组成员属性(&A)" +#~ msgid "<p><b>Access to Server</b></p>" +#~ msgstr "<p><b>服务器访问</b></p>" -#. textentry label -#: src/include/ldap/ui.rb:1326 -msgid "Configuration &Base DN" -msgstr "配置基本判别名(&B)" +#~ msgid "" +#~ "<p>First, set <b>Configuration Base DN</b>.\n" +#~ "This is the base for storing your configuration data on the LDAP\n" +#~ "server.</p>\n" +#~ msgstr "" +#~ "<p>首先请设置<b>配置基本判别名</b>。\n" +#~ "它是 LDAP 服务器上存储您的配置数据的基础。</p>\n" -#. textentry label -#: src/include/ldap/ui.rb:1341 -msgid "Administrator &DN" -msgstr "管理员判别名(&D)" +#~ msgid "" +#~ "<p>To access the data stored on the server, enter the\n" +#~ "<b>Administrator DN</b>.\n" +#~ "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or \n" +#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n" +#~ msgstr "" +#~ "<p>要访问存储在服务器上的数据，请输入<b>管理员判别名</b>。\n" +#~ "您可以输入完整判别名 (例如 cn=Administrator,dc=mydomain,dc=com)，也可以只输入相对判别名 (例如 cn=Administrator)。\n" +#~ "若勾选了适当的选项则会自动追加 LDAP 基本判别名。</p>\n" -#. checkbox label -#: src/include/ldap/ui.rb:1347 -msgid "A&ppend Base DN" -msgstr "追加基本判别名(&P)" +#~ msgid "" +#~ "<p>To create the default configuration objects for LDAP users and groups,\n" +#~ "check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n" +#~ msgstr "" +#~ "<p>要为 LDAP 用户和组创建默认的配置对象，请勾选<b>创建默认配置对象</b>。\n" +#~ "只有在不存在时才会创建这些对象。</p>\n" -#. checkbox label -#: src/include/ldap/ui.rb:1355 -msgid "Crea&te Default Configuration Objects" -msgstr "创建默认配置对象(&T)" +#~ msgid "" +#~ "<p>Press <b>Configure</b> to configure settings stored on the\n" +#~ "LDAP server. You will be asked for the password if you are not connected yet or\n" +#~ "have changed your configuration.</p>\n" +#~ msgstr "" +#~ "<p>按<b>配置</b>配置存储在 LDAP 服务器上的设置。\n" +#~ "若您尚未连接或已修改了配置，系统将请求您输入密码。</p>\n" -#. pushbutton label -#: src/include/ldap/ui.rb:1364 -msgid "Configure User Management &Settings..." -msgstr "配置用户管理设置(&S)..." +#~ msgid "" +#~ "<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are\n" +#~ "set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>\n" +#~ msgstr "" +#~ "<p>若特定映射 (用户或组) 的搜索基址与基本判别名不同请指定用于特定映射的搜索基址。\n" +#~ "这些值将被设置到 /etc/sssd/sssd.conf 文件中的 ldap_user_search_base 和 ldap_group_search_base 和 ldap_autofs_search_base 属性。</p>\n" -#. dialog label -#: src/include/ldap/ui.rb:1384 -msgid "Advanced Configuration" -msgstr "高级配置" +#~ msgid "C&lient Settings" +#~ msgstr "客户端设置(&L)" -#. error popup label -#: src/include/ldap/ui.rb:1500 -msgid "Enter the DN used for binding to the LDAP server." -msgstr "输入用于绑定到 LDAP 服务器的判别名。" +#~ msgid "Ad&ministration Settings" +#~ msgstr "管理设置(&M)" -#. error popup label -#: src/include/ldap/ui.rb:1507 -msgid "Enter the configuration base DN." -msgstr "请输入配置基本判别名。" +#~ msgid "Naming Contexts" +#~ msgstr "命名环境" -#. yes/no popup -#: src/include/ldap/ui.rb:1592 -msgid "" -"If you reread settings from the server,\n" -"all changes will be lost. Really reread?\n" -msgstr "若您从服务器重新读取设置将丢失全部修改。真的重新读取吗？\n" +#~ msgid "&User Map" +#~ msgstr "用户映射(&U)" -#. help text 1/3 -#: src/include/ldap/ui.rb:1616 -msgid "" -"<p>Configure the template used for creating \n" -"new objects (like users or groups).</p>\n" -msgstr "<p>配置用于创建新对象 (如用户或组) 的模板。</p>\n" +#~ msgid "&Browse" +#~ msgstr "浏览(&B)" -#. help text 2/3 -#: src/include/ldap/ui.rb:1620 -msgid "" -"<p>Edit the template attribute values with <b>Edit</b>.\n" -"Changing the <b>cn</b> value renames the template.</p>\n" -msgstr "" -"<p>使用<b>编辑</b>编辑模板属性值。\n" -"修改 <b>CN</b> 值可重命名模板。</p>\n" +#~ msgid "&Group Map" +#~ msgstr "组映射(&G)" -#. help text 3/3 -#: src/include/ldap/ui.rb:1624 -msgid "" -"<p>The second table contains a list of <b>default values</b> used\n" -"for new objects. Modify the list by adding new values, editing or\n" -"removing current ones.</p>\n" -msgstr "<p>第二个表包含一个用于新对象的<b>默认值</b>列表。可以通过添加新值、编辑或删除当前值修改该列表。</p>\n" +#~ msgid "Bro&wse" +#~ msgstr "浏览(&W)" -#. table header 1/2 -#. table header 1/2 -#: src/include/ldap/ui.rb:1693 src/include/ldap/ui.rb:2033 -msgid "Attribute" -msgstr "属性" +#~ msgid "&Autofs Map" +#~ msgstr "&Autofs 映射" -#. table header 2/2 -#. table header 2/2 -#: src/include/ldap/ui.rb:1695 src/include/ldap/ui.rb:2035 -msgid "Value" -msgstr "值" +#~ msgid "&Use Kerberos" +#~ msgstr "使用 Kerberos(&U)" -#. label (table folows) -#: src/include/ldap/ui.rb:1701 -msgid "Default Values for New Objects" -msgstr "新对象默认值" +#~ msgid "Default Real&m" +#~ msgstr "默认领域(&M)" -#. table header 1/2 -#: src/include/ldap/ui.rb:1707 -msgid "Attribute of Object" -msgstr "对象属性" +#~ msgid "&KDC Server Address" +#~ msgstr "&KDC 服务器地址" -#. table header 2/2 -#: src/include/ldap/ui.rb:1709 -msgid "Default Value" -msgstr "默认值" +#~ msgid "LDAP Schema" +#~ msgstr "LDAP 方案" -#. button label (with non-default shortcut) -#: src/include/ldap/ui.rb:1715 -msgid "A&dd" -msgstr "添加(&D)" +#~ msgid "Enable user and group enumeration" +#~ msgstr "启用用户和组枚举" -#. button label -#: src/include/ldap/ui.rb:1717 -msgid "&Edit" -msgstr "编辑(&E)" +#~ msgid "SSSD O&ffline Authentication" +#~ msgstr "SSSD 脱机认证(&F)" -#. dialog label -#: src/include/ldap/ui.rb:1729 -msgid "Object Template Configuration" -msgstr "对象模板配置" +#~ msgid "Passwor&d Change Protocol" +#~ msgstr "密码修改协议(&D)" -#. yes/no popup, %1 is name -#: src/include/ldap/ui.rb:1832 -msgid "Really delete default attribute \"%1\"?" -msgstr "真的删除默认属性 \"%1\" 吗？" +#~ msgid "Group Member &Attribute" +#~ msgstr "组成员属性(&A)" -#. error popup, %1 is attribute name -#. error popup, %1 is attribute name -#: src/include/ldap/ui.rb:1865 src/include/ldap/ui.rb:2090 -msgid "" -"The \"%1\" attribute is mandatory.\n" -"Enter a value." -msgstr "" -"'%1' 属性是必需的。\n" -"请输入一个值。" +#~ msgid "Configuration &Base DN" +#~ msgstr "配置基本判别名(&B)" -#. helptext 1/4 -#: src/include/ldap/ui.rb:1886 -msgid "<p>Manage the configuration stored in the LDAP directory.</p>" -msgstr "<p>管理存储在 LDAP 文件夹中的配置。</p>" +#~ msgid "Administrator &DN" +#~ msgstr "管理员判别名(&D)" -#. helptext 2/4 -#: src/include/ldap/ui.rb:1890 -msgid "" -"<p>Each configuration set is called a \"configuration module.\" If there\n" -"is no configuration module in the provided location (base configuration),\n" -"create one with <b>New</b>. Delete the current module\n" -"using <b>Delete</b>.</p>\n" -msgstr "" -"<p>每个配置集都被称为一个 \"配置模块\"。\n" -"若给定位置中没有配置模块 (基本配置)，请使用<b>新建</b>创建一个。\n" -"使用<b>删除</b>删除当前模块。</p>\n" +#~ msgid "A&ppend Base DN" +#~ msgstr "追加基本判别名(&P)" -#. helptext 3/4 -#: src/include/ldap/ui.rb:1897 -msgid "" -"<p>Edit the values of attributes in the table with <b>Edit</b>.\n" -"Some values have special meanings, for example, changing the <b>cn</b> value renames the\n" -"current module.</p>\n" -msgstr "" -"<p>使用<b>编辑</b>编辑表中属性的值。\n" -"某些值具有特殊含义，例如修改 <b>cn</b> 值可以重命名当前模块。</p>\n" +#~ msgid "Crea&te Default Configuration Objects" +#~ msgstr "创建默认配置对象(&T)" -#. helptext 4/4 -#: src/include/ldap/ui.rb:1903 -msgid "" -"<p>To configure the default template of the current module,\n" -"click <b>Configure Template</b>.\n" -"</p>\n" -msgstr "" -"<p>要配置当前模块的默认模板，请点击<b>配置模板</b>。\n" -"</p>\n" +#~ msgid "Configure User Management &Settings..." +#~ msgstr "配置用户管理设置(&S)..." -#. combobox label -#: src/include/ldap/ui.rb:1983 -msgid "Configuration &Module" -msgstr "配置模块(&M)" +#~ msgid "Advanced Configuration" +#~ msgstr "高级配置" -#. button label -#: src/include/ldap/ui.rb:2007 -msgid "C&onfigure Template" -msgstr "配置模板(&O)" +#~ msgid "Enter the DN used for binding to the LDAP server." +#~ msgstr "输入用于绑定到 LDAP 服务器的判别名。" -#. dialog label -#: src/include/ldap/ui.rb:2051 -msgid "Module Configuration" -msgstr "模块配置" +#~ msgid "Enter the configuration base DN." +#~ msgstr "请输入配置基本判别名。" -#. yes/no popup, %1 is name -#: src/include/ldap/ui.rb:2118 -msgid "Really delete module \"%1\"?" -msgstr "真的删除模块 \"%1\" 吗？" +#~ msgid "Really delete module \"%1\"?" +#~ msgstr "真的删除模块 \"%1\" 吗？" -#. message -#: src/include/ldap/ui.rb:2154 -msgid "" -"You currently have a configuration module of each \n" -"type, therefore you cannot add a new one.\n" -msgstr "您当前已经有了每种类型的配置模块，因此您不能添加新模块。\n" +#~ msgid "" +#~ "You currently have a configuration module of each \n" +#~ "type, therefore you cannot add a new one.\n" +#~ msgstr "您当前已经有了每种类型的配置模块，因此您不能添加新模块。\n" -#. label (init dialog) -#: src/include/ldap/wizards.rb:92 -msgid "Initializing..." -msgstr "正在初始化..." +#~ msgid "Initializing..." +#~ msgstr "正在初始化..." #~ msgid "<p>Browse the LDAP tree in the left part of the dialog.</p>" #~ msgstr "<p>在对话框左侧浏览 LDAP 树。</p>" Modified: trunk/yast/zh_CN/po/ldap.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ldap.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ldap.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-04-17 10:22+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/live-installer.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/live-installer.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/live-installer.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-03 19:36+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/mail.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/mail.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/mail.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-30 17:33+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/multipath.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/multipath.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/multipath.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-03 00:21+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -82,8 +82,8 @@ msgid "alias" msgstr "别名" -#: src/include/multipath/complex.rb:197 src/include/multipath/complex.rb:2285 -#: src/include/multipath/complex.rb:2956 +#: src/include/multipath/complex.rb:197 src/include/multipath/complex.rb:2284 +#: src/include/multipath/complex.rb:2955 msgid "wwid" msgstr "万维标识符" @@ -120,90 +120,79 @@ #. check if user input is legal, and popup necessary information #. check if user input is legal, and popup necessary information -#: src/include/multipath/complex.rb:1063 src/include/multipath/complex.rb:3259 +#: src/include/multipath/complex.rb:1063 src/include/multipath/complex.rb:3258 msgid "Illegal parameters:\n" msgstr "非法的参数：\n" #. duplicated configuraton checking #. duplicated configuraton checking -#: src/include/multipath/complex.rb:1135 src/include/multipath/complex.rb:2002 -#: src/include/multipath/complex.rb:2670 src/include/multipath/complex.rb:3330 +#: src/include/multipath/complex.rb:1135 src/include/multipath/complex.rb:2001 +#: src/include/multipath/complex.rb:2669 src/include/multipath/complex.rb:3329 msgid "Duplicated configuration." msgstr "冗余配置。" #. used for store undecided input #. used for store undecided input #: src/include/multipath/complex.rb:1180 src/include/multipath/complex.rb:1226 -#: src/include/multipath/complex.rb:1244 src/include/multipath/complex.rb:3393 -#: src/include/multipath/complex.rb:3438 src/include/multipath/complex.rb:3456 +#: src/include/multipath/complex.rb:1244 src/include/multipath/complex.rb:3392 +#: src/include/multipath/complex.rb:3437 src/include/multipath/complex.rb:3455 msgid "Show Details" msgstr "显示细节" #. do not do with number id -#: src/include/multipath/complex.rb:1444 +#: src/include/multipath/complex.rb:1443 msgid "Illegal parameter:" msgstr "非法参数：" #. devices section #. if value is empty, do not write name into configuration file. -#: src/include/multipath/complex.rb:1894 src/include/multipath/complex.rb:2562 +#: src/include/multipath/complex.rb:1893 src/include/multipath/complex.rb:2561 msgid "Illegal parameters:" msgstr "非法参数：" #. do not handle, `ok will do with the value #. do not handle, `ok will do with the value -#: src/include/multipath/complex.rb:2028 src/include/multipath/complex.rb:2034 -#: src/include/multipath/complex.rb:2273 src/include/multipath/complex.rb:2696 -#: src/include/multipath/complex.rb:2702 src/include/multipath/complex.rb:2944 +#: src/include/multipath/complex.rb:2027 src/include/multipath/complex.rb:2033 +#: src/include/multipath/complex.rb:2272 src/include/multipath/complex.rb:2695 +#: src/include/multipath/complex.rb:2701 src/include/multipath/complex.rb:2943 msgid "item" msgstr "项" #. duplicated configuraton checking -#: src/include/multipath/complex.rb:3344 +#: src/include/multipath/complex.rb:3343 msgid "Duplicated configuration" msgstr "冗余配置" -#: src/include/multipath/complex.rb:3608 +#: src/include/multipath/complex.rb:3607 msgid "Can not find /sbin/multipath" msgstr "未找到 /sbin/multipath" #. "multipath -l" may returns "" to bash -#: src/include/multipath/complex.rb:3648 +#: src/include/multipath/complex.rb:3647 msgid "Use multipath failed:" msgstr "使用多路径失败：" -#: src/include/multipath/complex.rb:3654 -msgid "* Cannot enable boot.multipath." -msgstr "* 无法启用 boot.multipath。" - -#: src/include/multipath/complex.rb:3664 +#: src/include/multipath/complex.rb:3653 msgid "* Cannot enable multipathd." msgstr "* 无法启用多路径后台服务。" -#. do not check result for starting boot.multipath -#: src/include/multipath/complex.rb:3676 +#: src/include/multipath/complex.rb:3663 msgid "* Cannot start multipathd." msgstr "* 无法启动多路经后台服务。" -#. CallInsserv(true, "boot.multipath"); #. CallInsserv(true, "multipathd"); -#: src/include/multipath/complex.rb:3697 +#: src/include/multipath/complex.rb:3683 msgid "Do not use multipath failed:" msgstr "不使用多路径失败：" -#: src/include/multipath/complex.rb:3703 +#: src/include/multipath/complex.rb:3689 msgid "* Cannot stop multipath." msgstr "* 无法停止多路径。" -#. do not check result of stopping boot.multipath -#: src/include/multipath/complex.rb:3715 +#: src/include/multipath/complex.rb:3699 msgid "* Cannot disable multipathd." msgstr "* 无法禁用多路经后台服务。" -#: src/include/multipath/complex.rb:3725 -msgid "* Cannot disable boot.multipath." -msgstr "* 无法禁用 boot.multipath。" - #. Read dialog help 1/2 #: src/include/multipath/helps.rb:36 msgid "" @@ -342,35 +331,35 @@ #. if the value has quotes pair, do not touch it. #. if more than 1 quote at the head or end, only keep one. #. if there are quote inside the value, ignore. -#: src/include/multipath/options.rb:821 src/include/multipath/options.rb:1635 -#: src/include/multipath/options.rb:1699 src/include/multipath/options.rb:1912 +#: src/include/multipath/options.rb:832 src/include/multipath/options.rb:1662 +#: src/include/multipath/options.rb:1726 src/include/multipath/options.rb:1939 msgid "should be a decimal integer" msgstr "应为十进制整数" #. replacewidget_notify = true; -#: src/include/multipath/options.rb:829 src/include/multipath/options.rb:846 -#: src/include/multipath/options.rb:900 src/include/multipath/options.rb:975 -#: src/include/multipath/options.rb:1052 src/include/multipath/options.rb:1129 -#: src/include/multipath/options.rb:1244 src/include/multipath/options.rb:1348 -#: src/include/multipath/options.rb:1410 src/include/multipath/options.rb:1511 -#: src/include/multipath/options.rb:1641 src/include/multipath/options.rb:1654 -#: src/include/multipath/options.rb:1717 src/include/multipath/options.rb:1778 -#: src/include/multipath/options.rb:1917 src/include/multipath/options.rb:1923 -#: src/include/multipath/options.rb:1990 src/include/multipath/options.rb:2144 -#: src/include/multipath/options.rb:2308 src/include/multipath/options.rb:2369 +#: src/include/multipath/options.rb:840 src/include/multipath/options.rb:857 +#: src/include/multipath/options.rb:911 src/include/multipath/options.rb:994 +#: src/include/multipath/options.rb:1079 src/include/multipath/options.rb:1156 +#: src/include/multipath/options.rb:1271 src/include/multipath/options.rb:1375 +#: src/include/multipath/options.rb:1437 src/include/multipath/options.rb:1538 +#: src/include/multipath/options.rb:1668 src/include/multipath/options.rb:1681 +#: src/include/multipath/options.rb:1744 src/include/multipath/options.rb:1805 +#: src/include/multipath/options.rb:1944 src/include/multipath/options.rb:1950 +#: src/include/multipath/options.rb:2017 src/include/multipath/options.rb:2171 +#: src/include/multipath/options.rb:2335 src/include/multipath/options.rb:2396 msgid "illegal value" msgstr "非法值" -#: src/include/multipath/options.rb:836 src/include/multipath/options.rb:1647 +#: src/include/multipath/options.rb:847 src/include/multipath/options.rb:1674 msgid "should be greater than 0" msgstr "应大于 0" -#: src/include/multipath/options.rb:1710 +#: src/include/multipath/options.rb:1737 msgid "invalid decimal integer" msgstr "无效十进制整数" -#: src/include/multipath/options.rb:2036 src/include/multipath/options.rb:2091 -#: src/include/multipath/options.rb:2196 src/include/multipath/options.rb:2251 +#: src/include/multipath/options.rb:2063 src/include/multipath/options.rb:2118 +#: src/include/multipath/options.rb:2223 src/include/multipath/options.rb:2278 msgid "should not be empty" msgstr "不应为空" @@ -491,6 +480,12 @@ msgid "Ignore your modification?" msgstr "忽略您的修改吗？" +#~ msgid "* Cannot enable boot.multipath." +#~ msgstr "* 无法启用 boot.multipath。" + +#~ msgid "* Cannot disable boot.multipath." +#~ msgstr "* 无法禁用 boot.multipath。" + #, fuzzy #~ msgid "Cannot install required packages" #~ msgstr "无法安装所需的包。" Modified: trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-11 01:02+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -24,82 +24,82 @@ "X-Generator: Lokalize 1.5\n" #. headline of package versions popup -#: src/NCPackageSelector.cc:980 +#: src/NCPackageSelector.cc:990 msgid "Package Versions" msgstr "软件包版本" #. text above of list of all package versions -#: src/NCPackageSelector.cc:982 +#: src/NCPackageSelector.cc:992 msgid "List of all available package versions:" msgstr "列出全部可用软件包版本：" -#: src/NCPackageSelector.cc:1095 +#: src/NCPackageSelector.cc:1105 msgid "&Packages with Status" msgstr "具有状态的软件包(&P)" #. headline - packages with automatic status change #. headline of a popup with packages #. the headline of the popup containing a list with packages with status changes -#: src/NCPackageSelector.cc:1270 src/NCPkgMenuDeps.cc:247 -#: src/NCPkgStrings.cc:582 +#: src/NCPackageSelector.cc:1280 src/NCPkgMenuDeps.cc:192 +#: src/NCPkgMenuDeps.cc:289 src/NCPkgStrings.cc:589 msgid "Automatic Changes" msgstr "自动更改" #. text part1 of popup with automatic changes (it's a label; text continous) -#: src/NCPackageSelector.cc:1272 src/NCPkgStrings.cc:589 +#: src/NCPackageSelector.cc:1282 src/NCPkgStrings.cc:596 msgid "In addition to your manual selections, the following" msgstr "除了您手选的软件包，还更改了以下" #. text part2 of popup with automatic changes #. text part1 of popup with automatic changes continous -#: src/NCPackageSelector.cc:1274 src/NCPkgStrings.cc:596 +#: src/NCPackageSelector.cc:1284 src/NCPkgStrings.cc:603 msgid "packages have been changed to resolve dependencies:" msgstr "个软件包以解决依赖关系：" -#: src/NCPackageSelector.cc:1297 +#: src/NCPackageSelector.cc:1307 msgid "You can choose to install anyway, but you risk getting a corrupted system." msgstr "您可选择强行安装，但有可能损坏系统。" -#: src/NCPackageSelector.cc:1298 +#: src/NCPackageSelector.cc:1308 msgid "&Continue anyway" msgstr "强行继续(&C)" #. headline of a popup showing the package license -#: src/NCPackageSelector.cc:1492 +#: src/NCPackageSelector.cc:1502 msgid "End User License Agreement" msgstr "最终用户许可协议" #. label text - keep it short -#: src/NCPackageSelector.cc:1681 +#: src/NCPackageSelector.cc:1691 msgid "Filter: " msgstr "过滤器：" #. label text - keep it short (use abbreviation if necessary) -#: src/NCPackageSelector.cc:1688 +#: src/NCPackageSelector.cc:1698 msgid "Total Download Size: " msgstr "总下载大小：" #. Help button -#: src/NCPackageSelector.cc:1701 src/NCPackageSelector.cc:1818 +#: src/NCPackageSelector.cc:1711 src/NCPackageSelector.cc:1828 #: src/NCPkgStrings.cc:107 msgid "&Help" msgstr "帮助(&H)" #. add the Cancel button #. begin: the label of the Cancel button -#: src/NCPackageSelector.cc:1707 src/NCPackageSelector.cc:1826 -#: src/NCPkgStrings.cc:677 +#: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836 +#: src/NCPkgStrings.cc:684 msgid "&Cancel" msgstr "取消(&C)" #. add the OK button #. the label of an Accept button -#: src/NCPackageSelector.cc:1712 src/NCPackageSelector.cc:1831 -#: src/NCPkgStrings.cc:691 +#: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841 +#: src/NCPkgStrings.cc:698 msgid "&Accept" msgstr "接受(&A)" -#: src/NCPackageSelector.cc:1737 +#: src/NCPackageSelector.cc:1747 msgid "C&onfiguration" msgstr "配置(&C)" @@ -121,8 +121,8 @@ msgstr "不再需要" #: src/NCPkgFilterClassification.cc:203 -msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package. To get packages recommeded by already installed packages the option <b>Install Recommended Packages for Already Installed Packages</b> from <b>Dependencies</b> menu has to be set." -msgstr "这是一个有用软件包的列表。若新安装的软件包推荐了它们，则将附加安装它们。要获得已安装软件包推荐的软件包，需设置<b>依赖关系</b>菜单下的<b>安装已安装软件包的推荐软件包</b>选项。" +msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package." +msgstr "" #: src/NCPkgFilterClassification.cc:207 msgid "It's suggested to install these packages because they fit to already installed packages. The decision to install it is by the user." @@ -171,7 +171,7 @@ msgstr "<b>%s</b> 区域的翻译、词典和其它语言相关文件" #. the label of the selections -#: src/NCPkgFilterMain.cc:68 src/NCPkgStrings.cc:319 +#: src/NCPkgFilterMain.cc:68 src/NCPkgStrings.cc:326 msgid "Patterns" msgstr "软件集" @@ -372,40 +372,56 @@ msgstr "立即校验系统(&V)" #: src/NCPkgMenuDeps.cc:98 -msgid "&Install Recommended Packages for Already Installed Packages" +#, fuzzy +#| msgid "Recommended Packages" +msgid "Install &Recommended Packages" +msgstr "推荐的软件包" + +#: src/NCPkgMenuDeps.cc:102 +#, fuzzy +#| msgid "&Install Recommended Packages for Already Installed Packages" +msgid "&Install Recommended Packages for Already Installed Packages Now" msgstr "安装已安装软件包的推荐软件包(&I)" -#: src/NCPkgMenuDeps.cc:102 +#: src/NCPkgMenuDeps.cc:105 msgid "&Cleanup when Deleting Packages (Temporary Change)" msgstr "删除软件包时清理(&C) (临时修改)" -#: src/NCPkgMenuDeps.cc:106 +#: src/NCPkgMenuDeps.cc:109 msgid "&Allow Vendor Change (Temporary Change)" msgstr "允许变更厂商(&A) (临时修改)" -#: src/NCPkgMenuDeps.cc:110 +#: src/NCPkgMenuDeps.cc:113 msgid "&Generate Dependency Solver Testcase" msgstr "生成依赖关系解决器试例(&G)" -#: src/NCPkgMenuDeps.cc:143 +#: src/NCPkgMenuDeps.cc:169 msgid "All package dependencies are OK." msgstr "全部软件包依赖关系都满足。" -#: src/NCPkgMenuDeps.cc:180 +#. part 1 of a text explaining the list of packages which follow +#: src/NCPkgMenuDeps.cc:194 +#, fuzzy +#| msgid "To fulfill the dependencies of already installed packages following" +msgid "Being recommended by already installed packages, the following" +msgstr "为满足已安装软件包的依赖关系，" + +#. part 2 of the text +#: src/NCPkgMenuDeps.cc:196 src/NCPkgMenuDeps.cc:293 +msgid "packages have been automatically selected for installation:" +msgstr "个软件包已被自动选中并将被安装：" + +#: src/NCPkgMenuDeps.cc:226 msgid "Dependency resolver test case written to " msgstr "已将依赖关系解决器试例写入到" #. part 1 of a text explaining the list of packages which follow -#: src/NCPkgMenuDeps.cc:249 +#: src/NCPkgMenuDeps.cc:291 msgid "To fulfill the dependencies of already installed packages following" msgstr "为满足已安装软件包的依赖关系，" -#. part 2 of the text -#: src/NCPkgMenuDeps.cc:251 -msgid "packages have been automatically selected for installation:" -msgstr "个软件包已被自动选中并将被安装：" - -#: src/NCPkgMenuDeps.cc:265 +#. dependencies OK, no automatic changes/the user has accepted the changes +#: src/NCPkgMenuDeps.cc:305 msgid "System dependencies verify OK." msgstr "系统依赖关系校验成功。" @@ -554,7 +570,7 @@ #. column header package description (keep it short!) #: src/NCPkgPatchSearch.cc:126 src/NCPkgSearchSettings.cc:64 -#: src/NCPkgStrings.cc:380 +#: src/NCPkgStrings.cc:387 msgid "Summary" msgstr "摘要" @@ -750,292 +766,294 @@ msgid "<p>To disable dependency checking on every status change, toggle <i>Automatic Dependency Check</i> OFF. You can check dependencies manually by selecting <i>Check Dependencies Now</i>. The <i>Verify system</i> entry will check the dependencies of already installed packages and resolve conflicts non-interactively, marking missing packages for automatic installation if necessary. For debugging purposes, use <i>Generate Dependency Solver Testcase</i>. It will dump package dependencies data into the directory <tt>/var/log/YaST2/solverTestcase</tt>. This is usually what you need when asked for a \"solver testcase\" in Bugzilla.</p>" msgstr "<p>要禁用每次状态变化时的依赖关系检查，可切换<i>自动依赖关系检查</i>为关。您可选择<i>立即检查依赖关系</i>手动检查依赖关系。<i>校验系统</i>项将检查已安装软件包的依赖关系并无交互地解决冲突，有必要时会标记并自动安装缺失的软件包。调试请用<i>生成依赖关系解决器试例</i>。这将转储软件包依赖关系数据到 <tt>/var/log/YaST2/solverTestcase</tt> 文件夹。当您在 Bugzilla 上被要求提供 \"解决器试例\" 时，这通常就是您需要的。</p>" -#: src/NCPkgStrings.cc:266 -msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended for Already Installed Packages</i>: if ON, also recommended packages of already installed package will be installed, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>" +#: src/NCPkgStrings.cc:267 +#, fuzzy +#| msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended for Already Installed Packages</i>: if ON, also recommended packages of already installed package will be installed, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>" +msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended Packages</i>: if ON, weak dependencies will be honored, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>" msgstr "<p>依赖关系检查的可用选项有：<br><i>自动检查依赖关系</i> (见上)，<i>安装已安装软件包的推荐软件包</i>：若为开，也将安装已安装软件包的推荐软件包，<i>系统校验模式</i>：修复已安装软件包的依赖关系并立即解决。请注意：在使用<i>立即校验系统</i>检查完系统后，<i>系统校验模式</i>选项将是开着的 (若需要请反选该选项)。这些选项保存在 YaST 配置文件 <tt>/etc/sysconfig/yast2</tt> 中。</p>" -#: src/NCPkgStrings.cc:272 +#: src/NCPkgStrings.cc:279 msgid "<p>Advanced options:<br> <i>Cleanup when deleting packages</i>: remove dependent unused packages. <i>Allow vendor change</i>: package vendor may differ from vendor of installed package. These options will not be saved, they can only be set in the configuration file of the package library <tt>/etc/zypp/zypp.conf</tt>.</p>" msgstr "<p>高级选项：<br><i>删除软件包时清理</i>：移除无用的依赖软件包。<i>允许变更厂商</i>：软件包厂商可以和已安装软件包的厂商不同。这些选项将不会被保存，它们只可以在软件包库的配置文件 <tt>/etc/zypp/zypp.conf</tt> 中设置。</p>" -#: src/NCPkgStrings.cc:278 +#: src/NCPkgStrings.cc:285 msgid "<p><b>View:</b><br>Choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>" msgstr "<p><b>视图：</b><br>选择软件包表下方窗口将显示所选软件包的哪些信息。可用选项有：软件包描述、技术数据 (版本、大小、许可等)、软件包版本 (全部可用版本)、文件列表 (该软件包携带的全部文件) 和依赖关系 (提供、需要等)。</p>" -#: src/NCPkgStrings.cc:284 +#: src/NCPkgStrings.cc:291 msgid "<p><b>Configuration:</b><br>This menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>" msgstr "<p><b>配置：</b><br>该菜单整合了软件包选择器与余下的软件包管理工具。在此，您可<b>启动软件源管理器</b> 并编辑已配置的软件源或注册到更新源并配置定时下载可用更新 (<b>启动在线更新配置</b>)。您也可在<b>安装软件包后的动作</b>菜单中从三个可行的软件包选择器退出行为中挑选一个。</p>" -#: src/NCPkgStrings.cc:289 +#: src/NCPkgStrings.cc:296 msgid "<p><b>Extras:</b><br>Miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition.</p>" msgstr "<p><b>额外：</b><br>杂项功能放在这里。<i>导出软件包列表到文件</b>将转储已安装软件包、软件集和语言的数据到一个指定的 XML 文件。该文件稍后可被例如其它计算机上的<i>从文件导入软件包列表</b>选项读取。它将使得目标计算机的软件包序列与提供的 XML 文件中描述的状态相同。<i>显示可用磁盘空间</i>将显示一个弹出表格，表格显示了当前挂载分区的磁盘使用率和空闲磁盘空间。</p>" #. label of a frame with search settings -#: src/NCPkgStrings.cc:297 +#: src/NCPkgStrings.cc:304 msgid "&Search in " msgstr "搜索位置(&S)" #. begin: text/labels for search popups (use unique hotkeys until the end:) #. text for the package search popup -#: src/NCPkgStrings.cc:305 +#: src/NCPkgStrings.cc:312 msgid "Search &Phrase" msgstr "搜索短语(&P)" -#: src/NCPkgStrings.cc:325 +#: src/NCPkgStrings.cc:332 msgid "Code" msgstr "代码" -#: src/NCPkgStrings.cc:331 +#: src/NCPkgStrings.cc:338 msgid "Language" msgstr "语言" -#: src/NCPkgStrings.cc:337 +#: src/NCPkgStrings.cc:344 msgid "URL" msgstr "URL" #. column header package name (keep it short!) -#: src/NCPkgStrings.cc:345 +#: src/NCPkgStrings.cc:352 msgid "Name" msgstr "名称" #. column header installed package version (keep it short!) -#: src/NCPkgStrings.cc:352 +#: src/NCPkgStrings.cc:359 msgid "Version" msgstr "版本" #. column header - repository of the package (e.g. openSUSE 10.3) -#: src/NCPkgStrings.cc:359 +#: src/NCPkgStrings.cc:366 msgid "Repository" msgstr "软件源" #. column header available package version (keep it short - use abbreviation!) -#: src/NCPkgStrings.cc:366 +#: src/NCPkgStrings.cc:373 msgid "Avail. Vers." msgstr "可用版本" #. column header installed package version (keep it short - use abbreviation!) -#: src/NCPkgStrings.cc:373 +#: src/NCPkgStrings.cc:380 msgid "Inst. Vers." msgstr "已安装版本" #. column header package size (keep it short!) -#: src/NCPkgStrings.cc:388 +#: src/NCPkgStrings.cc:395 msgid "Size" msgstr "大小" #. column header package architecture (keep it short!) -#: src/NCPkgStrings.cc:395 +#: src/NCPkgStrings.cc:402 msgid "Architecture" msgstr "架构" #. column header patch kind (keep it short!) -#: src/NCPkgStrings.cc:402 +#: src/NCPkgStrings.cc:409 msgid "Kind" msgstr "类型" #. a text for a small popup which is shown during package dependency checking -#: src/NCPkgStrings.cc:409 +#: src/NCPkgStrings.cc:416 msgid "Solving..." msgstr "正在解决..." #. a text for a small popup which is shown during writing package selection to a file -#: src/NCPkgStrings.cc:415 +#: src/NCPkgStrings.cc:422 msgid "Saving..." msgstr "正在保存..." #. a text for a samll popup which is shown during loading package selections from a file -#: src/NCPkgStrings.cc:421 +#: src/NCPkgStrings.cc:428 msgid "Loading..." msgstr "正在加载..." #. the headline of the disk space popup -#: src/NCPkgStrings.cc:428 +#: src/NCPkgStrings.cc:435 msgid "Disk Usage Overview" msgstr "磁盘使用率概览" #. column header name of the partition (keep it short!) -#: src/NCPkgStrings.cc:435 +#: src/NCPkgStrings.cc:442 msgid "Partition" msgstr "分区" #. column header used disk space (keep it short!) -#: src/NCPkgStrings.cc:442 +#: src/NCPkgStrings.cc:449 msgid "Used" msgstr "已用空间" #. column header free disk space (keep it short!) -#: src/NCPkgStrings.cc:449 +#: src/NCPkgStrings.cc:456 msgid "Free" msgstr "空闲空间" #. column header total disk space (keep it short!) -#: src/NCPkgStrings.cc:456 +#: src/NCPkgStrings.cc:463 msgid "Total" msgstr "总空间" #. -#: src/NCPkgStrings.cc:463 +#: src/NCPkgStrings.cc:470 msgid "<i>Out of disk space!</i>" msgstr "<i>磁盘空间不足！</i>" #. -#: src/NCPkgStrings.cc:470 +#: src/NCPkgStrings.cc:477 msgid "<b>Disk space is running out!</b>" msgstr "<b>磁盘空间不足！</b>" #. part of a text -#: src/NCPkgStrings.cc:477 +#: src/NCPkgStrings.cc:484 msgid "needs" msgstr "需要" #. part of a text -#: src/NCPkgStrings.cc:484 +#: src/NCPkgStrings.cc:491 msgid "more disk space." msgstr "更多磁盘空间。" #. part of the package description -#: src/NCPkgStrings.cc:491 +#: src/NCPkgStrings.cc:498 msgid "<b>Version: </b>" msgstr "<b>版本：</b>" #. part of the package description -#: src/NCPkgStrings.cc:498 +#: src/NCPkgStrings.cc:505 msgid "<b>Size: </b>" msgstr "<b>大小：</b>" #. part of the package description -#: src/NCPkgStrings.cc:505 +#: src/NCPkgStrings.cc:512 msgid "<b>Installed: </b>" msgstr "<b>已安装：</b>" #. part of the package description -#: src/NCPkgStrings.cc:512 +#: src/NCPkgStrings.cc:519 msgid "<b>Authors: </b>" msgstr "<b>作者：</b>" #. part of the package description -#: src/NCPkgStrings.cc:519 +#: src/NCPkgStrings.cc:526 msgid "<b>License: </b>" msgstr "<b>许可：</b>" #. part of the package description -#: src/NCPkgStrings.cc:526 +#: src/NCPkgStrings.cc:533 msgid "<b>Media No.: </b>" msgstr "<b>介质编号：</b>" #. part of the package description -#: src/NCPkgStrings.cc:533 +#: src/NCPkgStrings.cc:540 msgid "<b>Package Group: </b>" msgstr "<b>软件包分组：</b>" #. part of the package description -#: src/NCPkgStrings.cc:540 +#: src/NCPkgStrings.cc:547 msgid "<b>Provides: </b>" msgstr "<b>提供：</b>" #. part of the package description -#: src/NCPkgStrings.cc:547 +#: src/NCPkgStrings.cc:554 msgid "<b>Requires: </b>" msgstr "<b>需要：</b>" #. part of the package description -#: src/NCPkgStrings.cc:554 +#: src/NCPkgStrings.cc:561 msgid "<b>Prerequires: </b>" msgstr "<b>前提条件：</b>" #. part of the package description -#: src/NCPkgStrings.cc:562 +#: src/NCPkgStrings.cc:569 msgid "<b>Conflicts with: </b>" msgstr "<b>冲突对象：</b>" #. headline for a list of installed files -#: src/NCPkgStrings.cc:569 +#: src/NCPkgStrings.cc:576 msgid "<i>List of Installed Files:</i><br>" msgstr "<i>已安装文件列表：</i><br>" -#: src/NCPkgStrings.cc:575 +#: src/NCPkgStrings.cc:582 msgid "Translations, dictionaries and other language-related files for " msgstr "翻译、词典和其它语言相关文件，用于：" #. the headline of the help popup -#: src/NCPkgStrings.cc:603 +#: src/NCPkgStrings.cc:610 msgid "Patch Status and Patch Installation" msgstr "补丁状态和安装" #. help text online udpate #. Do NOT translate 'recommended' and 'security'! because the patch kind is always shown as english text. -#: src/NCPkgStrings.cc:611 +#: src/NCPkgStrings.cc:618 msgid "<p>General information about patches:</p><p>The patches of kind <b>security</b> are solving security issues and we highly recommend to install it. You should also install <b>recommended</b> patches, they usually contain important bug-fixes. Install <b>feature</b> patches if you are interested in the feature.</p>" msgstr "<p>关于补丁的常规信息：</p><p><b>安全</b>类的补丁解决安装问题，我们强烈推荐安装之。您也应该安装<b>推荐</b>类补丁，它们通常包含重要的故障修复。若您对新功能感兴趣也可以安装<b>功能</b>类补丁。</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:618 +#: src/NCPkgStrings.cc:625 msgid "<p>Patches for \"libzypp\" (Package, Patch, Pattern and Product Management) will always get installed first. Other patches must be installed on a second run.</p>" msgstr "<p>总是会首先安装用于 \"libzypp\" (软件包、补丁、软件集和产品管理) 的补丁。其它补丁必须在第二轮才能安装。</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:625 +#: src/NCPkgStrings.cc:632 msgid "<p>Meaning of the status flags:</p><p><b>a+ </b>: Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'.</p><p><b> i </b>: All requirements of this patch are satisfied.</p><p><b> + </b>: You have selected this patch for installation.</p>" msgstr "<p>状态旗标含义：</p><p><b>a+</b>：与您的系统有关的补丁是预选的。它们将被下载并安装在您的系统上。若不想要某个特定补丁，可用 '-' 反选。</p><p><b>i</b>：已满足此补丁的全部需求。</p><p><b>+</b>：您已选择安装此补丁。</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:632 +#: src/NCPkgStrings.cc:639 msgid "<p>More details about the status:<br>If there are several patches for a package (or a set of packages) which aren't yet applied to the system all got preselected and have status <b>a+</b>. If one of these patches is deselected with '-' it might show the status <b>i</b> afterwards. This is because any of the other patches concerning the same package(s) is still selected. The newer version(s) of the package(s) will be installed and with it this patch is satisfied. Deselecting of all patches is required if the patches are not wanted.</p>" msgstr "<p>更多关于状态的细节：<br>若有好几个适用于某个软件包 (或一系列软件包) 但尚未应用到系统的补丁，它们全都会被预选并标记状态为 <b>a+</b>。若使用 '-' 反选了一个补丁，其之后可能会显示为 <b>i</b> 状态。这是由于仍然选择中着其它与相同软件包有关的补丁。仍会安装该软件包的新版本，这个补丁还是会被打上。若不想要补丁则需要反选全部补丁。</p>" #. help text online udpate continue -#: src/NCPkgStrings.cc:639 +#: src/NCPkgStrings.cc:646 msgid "<p>The menus:</p><p>The <b>Filter</b> menu allows to filter the patches, e.g. show the 'Installed' ones or list 'Security' patches. It also provides to search for patches.<br>Use the <b>Actions</b> menu to change the status of a patch.<br>The <b>View</b> menu offers the possibility to see which packages are concerned by the patch. Please note: If the filter is 'All Patches' the package list for some patches might be empty. This means no packages are concerned because none of the patch packages is installed on the system.<br>The <b>Dependencies</b> menu contains dependencies checks and the 'Generate Solver Testcase' entry.</p>" msgstr "<p>菜单：</p><p><b>过滤器</b>菜单允许过滤补丁，例如显示 '已安装' 的补丁或列出 '安全' 类补丁。它也提供了补丁搜索功能。<br>可使用<b>动作</b>菜单修改补丁状态。<br><b>视图</b>菜单可以查看补丁将补缀哪些软件包。请注意：若将过滤器调为 '全部补丁'，某些补丁的软件包列表可能为空。这意味着没有软件包会被补缀，因为需补缀的软件包都没装在系统上。<br><b>依赖关系</b>菜单收录了依赖关系检查和 '生成解决器试例' 项。</p>" #. label for a warning popup -#: src/NCPkgStrings.cc:648 +#: src/NCPkgStrings.cc:655 msgid "Warning" msgstr "警告" #. label for an error popup -#: src/NCPkgStrings.cc:655 +#: src/NCPkgStrings.cc:662 msgid "Error" msgstr "错误" #. label for a notify popup -#: src/NCPkgStrings.cc:662 +#: src/NCPkgStrings.cc:669 msgid "Notify" msgstr "通知" #. the label of an OK button -#: src/NCPkgStrings.cc:670 +#: src/NCPkgStrings.cc:677 msgid "&OK" msgstr "好(&O)" #. the label of the Yes button -#: src/NCPkgStrings.cc:684 +#: src/NCPkgStrings.cc:691 msgid "&Yes" msgstr "是(&Y)" #. the label of the No button -#: src/NCPkgStrings.cc:698 +#: src/NCPkgStrings.cc:705 msgid "&No" msgstr "否(&N)" #. the label of the Solve button - 'try again' implies that user #. has to make some action (#213602) -#: src/NCPkgStrings.cc:706 +#: src/NCPkgStrings.cc:713 msgid "&OK -- Try Again" msgstr "好 -- 重试(&O)" #. text for a Notify popup -#: src/NCPkgStrings.cc:714 +#: src/NCPkgStrings.cc:721 msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" msgstr "<p>将丢失软件包、补丁或软件集选集中的全部修改。<br>真的退出吗？</p>" #. the label of language table -#: src/NCPkgStrings.cc:722 +#: src/NCPkgStrings.cc:729 msgid "Available Languages" msgstr "可用语言" #. the label of language table -#: src/NCPkgStrings.cc:729 +#: src/NCPkgStrings.cc:736 msgid "Available Repositories" msgstr "可用软件源" @@ -1043,65 +1061,68 @@ #. (the list shows all patches which are needed) #. static const std::string value = _( "Installable Patches" ); #. static const std::string value = _( "Relevant Patches" ); -#: src/NCPkgStrings.cc:739 +#: src/NCPkgStrings.cc:746 msgid "Needed Patches" msgstr "需要的补丁" #. A label for a list of YOU Patches - keep it short - max. 25 chars! #. (the list shows all patches which are already installed) -#: src/NCPkgStrings.cc:747 +#: src/NCPkgStrings.cc:754 msgid "Installed Patches" msgstr "已安装补丁" #. A common label for a list of YOU Patches - keep it short - max. 25 chars! -#: src/NCPkgStrings.cc:755 +#: src/NCPkgStrings.cc:762 msgid "Online Update Patches" msgstr "在线更新补丁" #. the label Filter: Update Problem ( keep it short - max. 25 chars ) -#: src/NCPkgStrings.cc:762 +#: src/NCPkgStrings.cc:769 msgid "Update Problem -- see help" msgstr "更新问题 -- 参见帮助" #. the label for Filter: Search results -#: src/NCPkgStrings.cc:769 +#: src/NCPkgStrings.cc:776 msgid "Search Results" msgstr "搜索结果" #. the headline of the dependency popup -#: src/NCPkgStrings.cc:776 +#: src/NCPkgStrings.cc:783 msgid "Package Dependencies" msgstr "软件包依赖关系" #. help text package status -#: src/NCPkgStrings.cc:783 +#: src/NCPkgStrings.cc:790 msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>" msgstr "<b>更新问题列表</b><br><p>无法自动更新列表中的软件包。</p><p>可能原因：</p><p>其它软件包淘汰了它们。</p><p>在任何安装介质上都没有可更新的较新版本。</p><p>它们是第三方软件包。</p><p>请手动选择要对这些包执行的动作。最安全的做法是将它们删除。</p>" #. column header source RPM installation (keep it short!) -#: src/NCPkgStrings.cc:790 +#: src/NCPkgStrings.cc:797 msgid "Source" msgstr "源代码" #. menu entry Update List -#: src/NCPkgStrings.cc:798 +#: src/NCPkgStrings.cc:805 msgid "&Update List" msgstr "更新列表(&U)" #. part of the patch description -#: src/NCPkgStrings.cc:805 +#: src/NCPkgStrings.cc:812 msgid "<b>Patch: </b>" msgstr "<b>补丁：</b>" #. info line is shown if YOU patch list is empty -#: src/NCPkgStrings.cc:812 +#: src/NCPkgStrings.cc:819 msgid "No patches available" msgstr "无可用补丁" -#: src/NCPkgStrings.cc:818 +#: src/NCPkgStrings.cc:825 msgid "Script" msgstr "脚本" +#~ msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package. To get packages recommeded by already installed packages the option <b>Install Recommended Packages for Already Installed Packages</b> from <b>Dependencies</b> menu has to be set." +#~ msgstr "这是一个有用软件包的列表。若新安装的软件包推荐了它们，则将附加安装它们。要获得已安装软件包推荐的软件包，需设置<b>依赖关系</b>菜单下的<b>安装已安装软件包的推荐软件包</b>选项。" + #~ msgid "----- this patch is broken !!! -----" #~ msgstr "----- 此补丁已损坏！！！ -----" Modified: trunk/yast/zh_CN/po/ncurses.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ncurses.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ncurses.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-09-19 15:00+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/network.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/network.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/network.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-10-16 11:02+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -60,34 +60,34 @@ msgstr "第三个名称服务器的 IP 地址。" #. Command line output Headline -#: src/clients/dns.rb:163 +#: src/clients/dns.rb:161 msgid "DNS Configuration Summary:" msgstr "DNS 配置摘要：" #. validator: a reference to boolean( string) is expected #. setter: a reference to void( any) is expected #. fail message: a string is expected -#: src/clients/dns.rb:188 +#: src/clients/dns.rb:186 msgid "InvalidHostname. " msgstr "无效主机名。" -#: src/clients/dns.rb:194 src/clients/dns.rb:202 src/clients/dns.rb:210 +#: src/clients/dns.rb:192 src/clients/dns.rb:200 src/clients/dns.rb:208 msgid "Invalid IP. " msgstr "无效 IP。" -#: src/clients/dns.rb:225 +#: src/clients/dns.rb:223 msgid "Cannot set " msgstr "无法设置" -#: src/clients/dns.rb:226 +#: src/clients/dns.rb:224 msgid ". Network is managed by NetworkManager." msgstr "。网络正由 NetworkManager 管理。" -#: src/clients/dns.rb:245 +#: src/clients/dns.rb:243 msgid "Invalid option value." msgstr "无效选项值。" -#: src/clients/dns.rb:254 +#: src/clients/dns.rb:252 msgid "Internal error" msgstr "内部错误" @@ -97,35 +97,35 @@ msgstr "正在写入防火墙配置..." #. Proposal title -#: src/clients/firewall_stage1_proposal.rb:137 +#: src/clients/firewall_stage1_proposal.rb:141 msgid "Firewall and SSH" msgstr "防火墙和 SSH" #. Menu entry label -#: src/clients/firewall_stage1_proposal.rb:139 +#: src/clients/firewall_stage1_proposal.rb:143 msgid "&Firewall and SSH" msgstr "防火墙和 SSH(&F)" -#: src/clients/firewall_stage1_proposal.rb:152 +#: src/clients/firewall_stage1_proposal.rb:156 msgid "Basic Firewall and SSH Configuration" msgstr "基本防火墙和 SSH 配置" #. frame label -#: src/clients/firewall_stage1_proposal.rb:157 +#: src/clients/firewall_stage1_proposal.rb:161 msgid "Firewall and SSH service" msgstr "防火墙和 SSH 服务" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:168 +#: src/clients/firewall_stage1_proposal.rb:172 msgid "Enable Firewall" msgstr "启用防火墙" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:177 +#: src/clients/firewall_stage1_proposal.rb:181 msgid "Enable SSH Service" msgstr "启用 SSH 服务" -#: src/clients/firewall_stage1_proposal.rb:191 +#: src/clients/firewall_stage1_proposal.rb:195 msgid "" "<p><b><big>Firewall and SSH</big></b><br>\n" "Firewall is a defensive mechanism that protects your computer from network attacks.\n" @@ -136,13 +136,13 @@ "防火墙是保护您的计算机免受网络攻击的防御机制。\n" "SSH 是允许通过专用 SSH 客户端远程登入此计算机的服务。</p>" -#: src/clients/firewall_stage1_proposal.rb:197 +#: src/clients/firewall_stage1_proposal.rb:201 msgid "" "<p>Here you can choose whether the firewall will be enabled or disabled after\n" "the installation. It is recommended to keep it enabled.</p>" msgstr "<p>在此您可以选择在安装后启用或禁用防火墙。推荐保持启用。</p>" -#: src/clients/firewall_stage1_proposal.rb:200 +#: src/clients/firewall_stage1_proposal.rb:204 msgid "" "<p>With enabled firewall, you can decide whether to open firewall port for SSH\n" "service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n" @@ -152,7 +152,7 @@ "另外您也可以决定是否启用 SSH 服务(即，它将在计算机引导时启动)。</p>" #. TRANSLATORS: help text -#: src/clients/firewall_stage1_proposal.rb:207 +#: src/clients/firewall_stage1_proposal.rb:211 msgid "" "<p>You can also open VNC ports in firewall. It will not enable\n" "the remote administration service on a running system but it is\n" @@ -163,49 +163,49 @@ #. anything but enabling the firewall closes this dialog #. (VNC and SSH checkboxes do nothing) -#: src/clients/firewall_stage1_proposal.rb:278 +#: src/clients/firewall_stage1_proposal.rb:284 msgid "Firewall will be enabled (disable</a>)" msgstr "将启用防火墙 (禁用</a>)" -#: src/clients/firewall_stage1_proposal.rb:282 +#: src/clients/firewall_stage1_proposal.rb:288 msgid "Firewall will be disabled (enable</a>)" msgstr "将禁用防火墙 (启用</a>)" -#: src/clients/firewall_stage1_proposal.rb:287 +#: src/clients/firewall_stage1_proposal.rb:294 msgid "SSH service will be enabled (disable</a>)" msgstr "将启用 SSH 服务 (禁用</a>)" -#: src/clients/firewall_stage1_proposal.rb:291 +#: src/clients/firewall_stage1_proposal.rb:298 msgid "SSH service will be disabled (enable</a>)" msgstr "将禁用 SSH 服务 (启用</a>)" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:307 +#: src/clients/firewall_stage1_proposal.rb:315 msgid "Open SSH Port" msgstr "打开 SSH 端口" #. TRANSLATORS: check-box label -#: src/clients/firewall_stage1_proposal.rb:321 +#: src/clients/firewall_stage1_proposal.rb:329 msgid "Open &VNC Ports" msgstr "打开 &VNC 端口" #. Show VNC port only if installing over VNC -#: src/clients/firewall_stage1_proposal.rb:339 +#: src/clients/firewall_stage1_proposal.rb:347 msgid "VNC ports will be open (close</a>)" msgstr "将打开 VNC 端口 (关闭</a>)" -#: src/clients/firewall_stage1_proposal.rb:341 +#: src/clients/firewall_stage1_proposal.rb:349 msgid "VNC ports will be blocked (open</a>)" msgstr "将屏蔽 VNC 端口 (打开</a>)" #. Returns the SSH-port part of the firewall proposal description #. Returns nil if this part should be skipped #. @return [String] proposal html text -#: src/clients/firewall_stage1_proposal.rb:352 +#: src/clients/firewall_stage1_proposal.rb:361 msgid "SSH port will be open (block</a>)" msgstr "将打开 SSH 端口 (屏蔽</a>)" -#: src/clients/firewall_stage1_proposal.rb:354 +#: src/clients/firewall_stage1_proposal.rb:363 msgid "SSH port will be blocked (open</a>)" msgstr "将屏蔽 SSH 端口 (打开</a>)" @@ -218,108 +218,108 @@ #. Command line output Headline #. configuration of hosts -#: src/clients/host.rb:125 +#: src/clients/host.rb:123 msgid "Host Configuration Summary:" msgstr "主机配置摘要：" #. Progress step 1/3 -#: src/clients/inst_do_net_test.rb:110 +#: src/clients/inst_do_net_test.rb:107 msgid "Connecting to Internet..." msgstr "正在连接到互联网..." #. Progress step 2/3 -#: src/clients/inst_do_net_test.rb:112 +#: src/clients/inst_do_net_test.rb:109 msgid "Downloading the latest release notes..." msgstr "正在下载最新的版本资讯..." #. Progress step 3/3 -#: src/clients/inst_do_net_test.rb:114 +#: src/clients/inst_do_net_test.rb:111 msgid "Closing connection..." msgstr "正在关闭连接..." #. Test dialog caption -#: src/clients/inst_do_net_test.rb:245 +#: src/clients/inst_do_net_test.rb:239 msgid "Running Internet Connection Test" msgstr "正在运行互联网连接测试" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:248 +#: src/clients/inst_do_net_test.rb:242 msgid "" "<p>Here, view the progress of the\n" "Internet connection test.</p>\n" msgstr "<p>在此查看互联网连接测试的进度。</p>\n" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:252 +#: src/clients/inst_do_net_test.rb:246 msgid "" "<p>The test can be aborted by pressing\n" "<b>Abort Test</b>.</p>\n" msgstr "<p>可以按<b>中止测试</b>来中止测试。</p>\n" #. help for dialog "Running Internet Connection Test" -#: src/clients/inst_do_net_test.rb:260 +#: src/clients/inst_do_net_test.rb:254 msgid "" "<p>If the test fails, return to the network configuration\n" "and correct the settings.</p>\n" msgstr "<p>若测试失败，请返回网络配置并修正设置。</p>\n" #. Label for result of internet test -#: src/clients/inst_do_net_test.rb:296 +#: src/clients/inst_do_net_test.rb:288 msgid "Test Result:" msgstr "测试结果：" #. Push Button to abort internet test -#: src/clients/inst_do_net_test.rb:307 +#: src/clients/inst_do_net_test.rb:299 msgid "&Abort Test" msgstr "中止测试(&A)" #. Frame label: status of internet test -#: src/clients/inst_do_net_test.rb:312 +#: src/clients/inst_do_net_test.rb:304 msgid "Test Status" msgstr "测试状态" #. Push Button to see logs of internet test -#: src/clients/inst_do_net_test.rb:322 +#: src/clients/inst_do_net_test.rb:314 msgid "&View Logs..." msgstr "查看日志(&V)..." #. result of internet test -#: src/clients/inst_do_net_test.rb:361 +#: src/clients/inst_do_net_test.rb:351 msgid "Success" msgstr "成功" #. result of internet test -#: src/clients/inst_do_net_test.rb:365 +#: src/clients/inst_do_net_test.rb:355 msgid "Failure" msgstr "失败" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:380 +#: src/clients/inst_do_net_test.rb:365 msgid "Kernel Network Interfaces" msgstr "内核网络接口" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:402 +#: src/clients/inst_do_net_test.rb:386 msgid "Kernel Routing Table" msgstr "内核路由表" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:422 +#: src/clients/inst_do_net_test.rb:406 msgid "Hostname Lookup" msgstr "主机名查询" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:446 +#: src/clients/inst_do_net_test.rb:426 msgid "Kernel Messages" msgstr "内核消息" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:593 +#: src/clients/inst_do_net_test.rb:576 msgid "Download of Release Notes" msgstr "下载版本资讯" #. popup error message -#: src/clients/inst_do_net_test.rb:736 +#: src/clients/inst_do_net_test.rb:719 msgid "" "Cannot install downloaded release notes.\n" "RPM signature check failed." @@ -328,18 +328,18 @@ "RPM 签名检查失败。" #. popup error message -#: src/clients/inst_do_net_test.rb:763 +#: src/clients/inst_do_net_test.rb:746 msgid "Installation of downloaded release notes failed." msgstr "安装下载好的版本资讯失败。" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:800 +#: src/clients/inst_do_net_test.rb:782 msgid "Opening of Connection" msgstr "打开连接" #. popup to inform user about the failure #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:808 src/clients/inst_do_net_test.rb:834 +#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815 msgid "" "Connecting to the Internet failed. View\n" "the logs for details.\n" @@ -348,13 +348,13 @@ "细节请查看日志。\n" #. Fallback for situation that mustn't exist -#: src/clients/inst_do_net_test.rb:892 +#: src/clients/inst_do_net_test.rb:873 msgid "No URL for the release notes defined. Internet test cannot be performed." msgstr "未定义版本资讯的 URL。无法执行互联网测试。" #. popup informing user about the failure to retrieve release notes #. most likely due to server-side error -#: src/clients/inst_do_net_test.rb:905 +#: src/clients/inst_do_net_test.rb:886 msgid "" "Download of latest release notes failed due to server-side error. \n" "This does not necessarily imply a faulty network configuration.\n" @@ -371,7 +371,7 @@ "请点击 '取消'。\n" #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:917 +#: src/clients/inst_do_net_test.rb:898 msgid "" "Download of latest release notes failed. View\n" "the logs for details." @@ -380,12 +380,12 @@ "细节请查看日志。" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:965 +#: src/clients/inst_do_net_test.rb:945 msgid "Check for Patches" msgstr "检查补丁" #. popup to inform user about the failure -#: src/clients/inst_do_net_test.rb:974 +#: src/clients/inst_do_net_test.rb:954 msgid "" "Check for latest updates failed. View\n" "the logs for details.\n" @@ -394,7 +394,7 @@ "细节请查看日志。\n" #. label of combobox where the log is selected -#: src/clients/inst_do_net_test.rb:1001 +#: src/clients/inst_do_net_test.rb:980 msgid "Closing of Connection" msgstr "关闭连接" @@ -441,61 +441,50 @@ msgid "Config identifier" msgstr "配置标识符" -#: src/clients/lan.rb:136 +#. Commandline option help +#: src/clients/lan.rb:137 msgid "Use static or dynamic configuration" msgstr "使用静态或动态配置" -#: src/clients/lan.rb:140 +#: src/clients/lan.rb:141 msgid "Configuration Name" msgstr "配置名称" #. Commandline option help -#: src/clients/lan.rb:145 -msgid "Device boot protocol" -msgstr "设备引导协议" - -#. Commandline option help -#: src/clients/lan.rb:150 +#: src/clients/lan.rb:146 msgid "Device IP address" msgstr "设备 IP 地址" #. Commandline option help -#: src/clients/lan.rb:155 +#: src/clients/lan.rb:151 msgid "Network mask" msgstr "网络掩码" #. Commandline option help -#: src/clients/lan.rb:160 +#: src/clients/lan.rb:156 msgid "Prefix length" msgstr "前缀长度" #. Commandline option help -#: src/clients/lan.rb:165 +#: src/clients/lan.rb:161 msgid "Bond Slaves" msgstr "绑定从属" #. Commandline option help -#: src/clients/lan.rb:170 +#: src/clients/lan.rb:166 msgid "Ethernet Device for VLAN" msgstr "虚拟局域网以太设备" #. Commandline option help -#: src/clients/lan.rb:175 +#: src/clients/lan.rb:171 msgid "Interfaces for Bridging" msgstr "桥接用接口" -#. copy the keys/values that are not existing in the XML -#. so we merge the inst-sys settings with the XML while XML -#. has higher priority -#. -#. bnc#796580 The problem with this is that due to compatibility with -#. older profiles, a missing element may have a different meaning than -#. "use what the filesystem/kernel currently uses". -#. In particular, a missing write_hostname [1] means -#. "use the product default from DVD1/control.xml". -#. Other elements may have similar problems, -#. to be fixed post-PTF for maintenance. -#: src/clients/lan_auto.rb:171 +#. see bnc#498993 +#. in case keep_install_network is set to true (in AY) +#. we'll keep values from installation +#. and merge with XML data (bnc#712864) +#: src/clients/lan_auto.rb:136 msgid "Configuration Error: uninitialized interface." msgstr "配置错误：未初始化的接口。" @@ -515,28 +504,28 @@ "lan\t" #. Selection box item -#: src/clients/network.rb:67 src/clients/network.rb:110 +#: src/clients/network.rb:67 src/clients/network.rb:108 msgid "Network Card" msgstr "网卡" #. Network dialog caption -#: src/clients/network.rb:90 +#: src/clients/network.rb:88 msgid "Network Configuration" msgstr "网络配置" #. Network dialog help -#: src/clients/network.rb:93 +#: src/clients/network.rb:91 msgid "" "<p>Choose one of the available network modules to configure\n" " the corresponding devices and press <b>Launch</b>.</p>" msgstr "<p>选择一个可用网络模块配置相关设备并按<b>启动</b>。</p>" #. Selection box label -#: src/clients/network.rb:107 +#: src/clients/network.rb:105 msgid "&Available Network Modules:" msgstr "可用网络模块(&A)：" -#: src/clients/network.rb:125 +#: src/clients/network.rb:123 msgid "&Launch" msgstr "启动(&L)" @@ -556,12 +545,12 @@ msgstr "请设为 \"yes\" 允许远程管理或 \"no\" 不允许远程管理" #. Command line output Headline -#: src/clients/remote.rb:128 +#: src/clients/remote.rb:126 msgid "Remote Access Configuration Summary:" msgstr "远程访问配置摘要：" #. Command line error message -#: src/clients/remote.rb:148 +#: src/clients/remote.rb:146 msgid "" "Please set 'yes' to allow the remote administration\n" "or 'no' to disallow it." @@ -580,7 +569,7 @@ #. Commandline help title #. Main routing dialog #. @return dialog result -#: src/clients/routing.rb:57 src/include/network/services/routing.rb:479 +#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468 msgid "Routing Configuration" msgstr "路由配置" @@ -651,109 +640,109 @@ #. main ui function #. Frame label -#: src/clients/routing.rb:205 src/include/network/services/routing.rb:77 +#: src/clients/routing.rb:203 src/include/network/services/routing.rb:77 msgid "Routing Table" msgstr "路由表" #. Table header 1/4 -#: src/clients/routing.rb:208 src/include/network/services/routing.rb:85 +#: src/clients/routing.rb:206 src/include/network/services/routing.rb:85 msgid "Destination" msgstr "目的地" #. Table header 2/4 -#: src/clients/routing.rb:209 src/include/network/services/routing.rb:87 +#: src/clients/routing.rb:207 src/include/network/services/routing.rb:87 msgid "Gateway" msgstr "网关" #. Table header label -#: src/clients/routing.rb:210 src/include/network/lan/address.rb:100 +#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99 msgid "Netmask" msgstr "网络掩码" #. Table header 4/4 -#: src/clients/routing.rb:211 src/include/network/lan/complex.rb:75 +#: src/clients/routing.rb:209 src/include/network/lan/complex.rb:75 #: src/include/network/services/routing.rb:68 #: src/include/network/services/routing.rb:72 #: src/include/network/services/routing.rb:91 msgid "Device" msgstr "设备" -#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:417 +#: src/clients/routing.rb:210 src/include/network/lan/hardware.rb:399 msgid "Options" msgstr "选项" #. Handler for action "list" #. @param [Hash{String => String}] options action options -#: src/clients/routing.rb:242 src/clients/routing.rb:383 -#: src/clients/routing.rb:427 +#: src/clients/routing.rb:239 src/clients/routing.rb:377 +#: src/clients/routing.rb:423 msgid "No entry for destination '%1' in routing table" msgstr "路由表中无目的地 '%1' 项" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:265 +#: src/clients/routing.rb:261 msgid "%s forwarding is enabled" msgstr "已启用 %s 转发" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:268 +#: src/clients/routing.rb:264 msgid "%s forwarding is disabled" msgstr "已禁用 %s 转发" #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:272 +#: src/clients/routing.rb:268 msgid "Enabling %s forwarding..." msgstr "正在启用 %s 转发..." #. translators: %s is "IPv4" or "IPv6" -#: src/clients/routing.rb:276 +#: src/clients/routing.rb:272 msgid "Disabling %s forwarding..." msgstr "正在禁用 %s 转发..." -#: src/clients/routing.rb:282 +#: src/clients/routing.rb:278 msgid "IPv4 Forwarding:" msgstr "IPv4 转发：" -#: src/clients/routing.rb:292 +#: src/clients/routing.rb:288 msgid "IPv6 Forwarding:" msgstr "IPv6 转发：" -#: src/clients/routing.rb:302 +#: src/clients/routing.rb:298 msgid "IPv4 and IPv6 Forwarding:" msgstr "IPv4 和 IPv6 转发：" -#: src/clients/routing.rb:324 +#: src/clients/routing.rb:320 msgid "At least destination and gateway IP addresses must be specified." msgstr "必须至少指定目的地和网关 IP 地址。" -#: src/clients/routing.rb:333 +#: src/clients/routing.rb:329 msgid "Adding '%1' destination to routing table ..." msgstr "正在将目的地 '%1' 添加到路由表中..." -#: src/clients/routing.rb:349 +#: src/clients/routing.rb:343 msgid "Destination IP address must be specified." msgstr "必须指定目的地 IP 地址。" -#: src/clients/routing.rb:354 +#: src/clients/routing.rb:348 msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified" msgstr "必须指定至少一个以下参数 (网关、网络掩码、设备、选项)" -#: src/clients/routing.rb:376 +#: src/clients/routing.rb:370 msgid "Updating '%1' destination in routing table ..." msgstr "正在更新路由表中的目的地 '%1'..." -#: src/clients/routing.rb:419 +#: src/clients/routing.rb:415 msgid "Deleting '%1' destination from routing table ..." msgstr "正在从路由表中删除目的地 '%1'..." #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1356 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363 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:1358 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365 msgid "Change." msgstr "修改。" @@ -775,149 +764,149 @@ msgstr "未作任何配置" #. Device type label -#: src/include/network/complex.rb:204 +#: src/include/network/complex.rb:202 msgid "PCMCIA ISDN Card" msgstr "PCMCIA ISDN 卡" #. Device type label -#: src/include/network/complex.rb:206 +#: src/include/network/complex.rb:204 msgid "USB ISDN Card" msgstr "USB ISDN 卡" #. Device type label -#: src/include/network/complex.rb:208 +#: src/include/network/complex.rb:206 msgid "PCMCIA Ethernet Network Card" msgstr "PCMCIA Ethernet 网卡" #. Device type label -#: src/include/network/complex.rb:210 +#: src/include/network/complex.rb:208 msgid "USB Ethernet Network Card" msgstr "USB Ethernet 网卡" #. Device type label -#: src/include/network/complex.rb:212 +#: src/include/network/complex.rb:210 msgid "PCMCIA FDDI Network Card" msgstr "PCMCIA FDDI 网卡" #. Device type label -#: src/include/network/complex.rb:214 +#: src/include/network/complex.rb:212 msgid "USB FDDI Network Card" msgstr "USB FDDI 网卡" #. Device type label #. Device type label -#: src/include/network/complex.rb:216 src/include/network/complex.rb:220 +#: src/include/network/complex.rb:214 src/include/network/complex.rb:218 msgid "PCMCIA ISDN Connection" msgstr "PCMCIA ISDN 连接" #. Device type label #. Device type label -#: src/include/network/complex.rb:218 src/include/network/complex.rb:222 +#: src/include/network/complex.rb:216 src/include/network/complex.rb:220 msgid "USB ISDN Connection" msgstr "USB ISDN 连接" #. Device type label #. Device type label -#: src/include/network/complex.rb:224 src/include/network/complex.rb:228 +#: src/include/network/complex.rb:222 src/include/network/complex.rb:226 msgid "PCMCIA Modem" msgstr "PCMCIA 调制解调器" #. Device type label #. Device type label -#: src/include/network/complex.rb:226 src/include/network/complex.rb:230 +#: src/include/network/complex.rb:224 src/include/network/complex.rb:228 msgid "USB Modem" msgstr "USB 调制解调器" #. Device type label -#: src/include/network/complex.rb:232 +#: src/include/network/complex.rb:230 msgid "PCMCIA Token Ring Network Card" msgstr "PCMCIA 令牌环网卡" #. Device type label -#: src/include/network/complex.rb:236 +#: src/include/network/complex.rb:234 msgid "USB Token Ring Network Card" msgstr "USB 令牌环网卡" #. Device type label -#: src/include/network/complex.rb:238 +#: src/include/network/complex.rb:236 msgid "USB Network Device" msgstr "USB 网络设备" #. Device type label -#: src/include/network/complex.rb:240 +#: src/include/network/complex.rb:238 msgid "PCMCIA Wireless Network Card" msgstr "PCMCIA 无线网卡" #. Device type label -#: src/include/network/complex.rb:242 +#: src/include/network/complex.rb:240 msgid "USB Wireless Network Card" msgstr "USB 无线网卡" #. Device type label -#: src/include/network/complex.rb:259 +#: src/include/network/complex.rb:257 msgid "Unknown Network Device" msgstr "未知网络设备" #. Modem status (%1 is device) #. ISDN device status (%1 is device) #. Network card status (%1 is device) -#: src/include/network/complex.rb:313 src/include/network/complex.rb:325 -#: src/include/network/complex.rb:384 +#: src/include/network/complex.rb:312 src/include/network/complex.rb:324 +#: src/include/network/complex.rb:383 msgid "Configured as %1" msgstr "已配置为 %1" #. Modem status (%1 is device, %2 is provider) -#: src/include/network/complex.rb:317 +#: src/include/network/complex.rb:316 msgid "Configured as %1 with provider %2" msgstr "已配置为 %1，服务提供商 %2" #. ISDN status (%1 is device, %2 is provider, %3 protocol) -#: src/include/network/complex.rb:334 +#: src/include/network/complex.rb:333 msgid "Configured as %1 with provider %2 (protocol %3)" msgstr "已配置为%1，服务提供商 %2 (协议 %3)" -#: src/include/network/complex.rb:349 +#: src/include/network/complex.rb:348 msgid "Configured without address (NONE)" msgstr "已配置为不带地址 (NONE)" #. Network card status -#: src/include/network/complex.rb:352 +#: src/include/network/complex.rb:351 msgid "Configured without an address" msgstr "已配置为不带地址" #. Network card status (%1 is address) -#: src/include/network/complex.rb:356 +#: src/include/network/complex.rb:355 msgid "Configured with address %1" msgstr "已配置为地址 %1" #. Network card status (%1 is address, %2 is address) -#: src/include/network/complex.rb:362 +#: src/include/network/complex.rb:361 msgid "Configured with address %1 (remote %2)" msgstr "已配置为地址 %1 (远程 %2)" #. Network card status (%1 is protocol) -#: src/include/network/complex.rb:370 +#: src/include/network/complex.rb:369 msgid "Configured with %1" msgstr "已配置为 %1" #. Network card status (%1 is device, %2 is address) -#: src/include/network/complex.rb:388 +#: src/include/network/complex.rb:387 msgid "Configured as %1 with address %2" msgstr "已配置为 %1，地址 %2" #. Network card status (%1 is device, %2 is address, %3 is address) -#: src/include/network/complex.rb:395 +#: src/include/network/complex.rb:394 msgid "Configured as %1 with address %2 (remote %3)" msgstr "已配置为 %1，地址 %2 (远程 %3)" #. Network card status (%1 is device, %2 is protocol) -#: src/include/network/complex.rb:404 +#: src/include/network/complex.rb:403 msgid "Configured as %1 with %2" msgstr "已配置为 %1, %2" #. Abbreviation for "The interface is Managed by NetworkManager" #. ComboBox item -#: src/include/network/complex.rb:420 src/include/network/lan/wireless.rb:440 +#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438 msgid "Managed" msgstr "受管" @@ -989,73 +978,73 @@ msgstr "- 连接到互联网" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:202 +#: src/include/network/installation/dialogs.rb:201 msgid "- Download latest release notes" msgstr "- 下载最新的版本资讯" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:209 +#: src/include/network/installation/dialogs.rb:207 msgid "- Check for latest updates" msgstr "- 检查最新的更新" #. label text - one step of during network test -#: src/include/network/installation/dialogs.rb:214 +#: src/include/network/installation/dialogs.rb:212 msgid "- Close connection" msgstr "- 关闭连接" #. Heading text -#: src/include/network/installation/dialogs.rb:225 +#: src/include/network/installation/dialogs.rb:223 msgid "The following steps will be performed:" msgstr "将执行以下步骤：" #. Frame label -#: src/include/network/installation/dialogs.rb:233 +#: src/include/network/installation/dialogs.rb:231 msgid "Select:" msgstr "选择：" #. RadioButton label -#: src/include/network/installation/dialogs.rb:286 +#: src/include/network/installation/dialogs.rb:284 msgid "&Yes, Run Online Update Now" msgstr "是，立即运行在线更新(&Y)" #. RadioButton label -#: src/include/network/installation/dialogs.rb:288 +#: src/include/network/installation/dialogs.rb:286 msgid "N&o, Skip Update" msgstr "否，跳过更新(&O)" #. Heading text -#: src/include/network/installation/dialogs.rb:298 +#: src/include/network/installation/dialogs.rb:296 msgid "Online Updates Available" msgstr "在线更新可用" #. Label text -#: src/include/network/installation/dialogs.rb:301 +#: src/include/network/installation/dialogs.rb:299 msgid "Download and install them via the YaST Online Update?" msgstr "通过 YaST 在线更新下载并安装它们吗？" #. Heading -#: src/include/network/installation/dialogs.rb:347 +#: src/include/network/installation/dialogs.rb:344 msgid "Internet Connection Test Logs:" msgstr "互联网连接测试日志：" #. ComboBox label -#: src/include/network/installation/dialogs.rb:355 +#: src/include/network/installation/dialogs.rb:352 msgid "&Select Log:" msgstr "选择日志(&S)：" #. Frame label -#: src/include/network/lan/address.rb:84 +#: src/include/network/lan/address.rb:83 msgid "Additional Addresses" msgstr "附加地址" #. Table header label -#: src/include/network/lan/address.rb:96 +#: src/include/network/lan/address.rb:95 msgid "IPv4 Address Label" msgstr "IPv4 地址标签" #. Table header label #. Table header label -#: src/include/network/lan/address.rb:98 src/include/network/lan/complex.rb:75 +#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75 #: src/include/network/services/host.rb:128 msgid "IP Address" msgstr "IP 地址" @@ -1063,7 +1052,7 @@ #. PushButton label #. PushButton label #. PushButton label -#: src/include/network/lan/address.rb:107 +#: src/include/network/lan/address.rb:106 #: src/include/network/services/host.rb:139 #: src/include/network/services/routing.rb:100 msgid "Ad&d" @@ -1073,7 +1062,7 @@ #. PushButton label #. PushButton label #. Pushbutton label -#: src/include/network/lan/address.rb:109 +#: src/include/network/lan/address.rb:108 #: src/include/network/services/host.rb:141 #: src/include/network/services/routing.rb:102 #: src/include/network/summary.rb:69 @@ -1084,156 +1073,156 @@ #. PushButton label #. PushButton label #. Pushbutton label -#: src/include/network/lan/address.rb:111 +#: src/include/network/lan/address.rb:110 #: src/include/network/services/host.rb:143 #: src/include/network/services/routing.rb:104 #: src/include/network/summary.rb:71 msgid "De&lete" msgstr "删除(&L)" -#: src/include/network/lan/address.rb:132 +#: src/include/network/lan/address.rb:131 msgid "&Name of Interface" msgstr "接口名称(&N)" -#: src/include/network/lan/address.rb:134 +#: src/include/network/lan/address.rb:133 msgid "<p>TODO kind of vague!</p>" msgstr "<p>要执行的操作不明确！</p>" #. Combo Box label -#: src/include/network/lan/address.rb:139 +#: src/include/network/lan/address.rb:138 msgid "Assign Interface to Firewall &Zone" msgstr "将接口指派到防火墙区域(&Z)" #. check box label -#: src/include/network/lan/address.rb:147 +#: src/include/network/lan/address.rb:146 msgid "&Mandatory Interface" msgstr "必备接口(&M)" #. ComboBox label #. ComboBox label -#: src/include/network/lan/address.rb:155 -#: src/include/network/lan/hardware.rb:369 +#: src/include/network/lan/address.rb:154 +#: src/include/network/lan/hardware.rb:351 msgid "&Device Type" msgstr "设备类型(&D)" #. ComboBox label #. TextEntry label -#: src/include/network/lan/address.rb:174 -#: src/include/network/lan/hardware.rb:355 +#: src/include/network/lan/address.rb:172 +#: src/include/network/lan/hardware.rb:337 msgid "&Configuration Name" msgstr "配置名称(&C)" -#: src/include/network/lan/address.rb:183 +#: src/include/network/lan/address.rb:181 msgid "Tunnel owner" msgstr "隧道所有者" -#: src/include/network/lan/address.rb:184 +#: src/include/network/lan/address.rb:182 msgid "Tunnel group" msgstr "隧道组" -#: src/include/network/lan/address.rb:193 -#: src/include/network/lan/address.rb:1316 +#: src/include/network/lan/address.rb:191 +#: src/include/network/lan/address.rb:1297 msgid "Bridged Devices" msgstr "桥接设备" -#: src/include/network/lan/address.rb:213 +#: src/include/network/lan/address.rb:211 msgid "Real Interface for &VLAN" msgstr "虚拟局域网的真实接口(&V)" -#: src/include/network/lan/address.rb:216 +#: src/include/network/lan/address.rb:214 msgid "VLAN ID" msgstr "虚拟局域网 ID" -#: src/include/network/lan/address.rb:233 +#: src/include/network/lan/address.rb:231 msgid "Bond Slaves and Order" msgstr "绑定从属和顺序" -#: src/include/network/lan/address.rb:237 +#: src/include/network/lan/address.rb:235 msgid "Up" msgstr "向上" -#: src/include/network/lan/address.rb:238 +#: src/include/network/lan/address.rb:236 msgid "Down" msgstr "向下" -#: src/include/network/lan/address.rb:242 +#: src/include/network/lan/address.rb:240 msgid "Bond &Slaves" msgstr "绑定从属(&S)" #. ComboBox label -#: src/include/network/lan/address.rb:258 +#: src/include/network/lan/address.rb:256 msgid "&Bond Driver Options" msgstr "绑定驱动选项(&B)" -#: src/include/network/lan/address.rb:260 +#: src/include/network/lan/address.rb:258 msgid "<p>Select the bond driver options and edit them if necessary. </p>" msgstr "<p>选择绑定驱动选项并在需要时加以编辑。</p>" #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); #. else -#: src/include/network/lan/address.rb:285 -#: src/include/network/lan/address.rb:811 +#: src/include/network/lan/address.rb:283 +#: src/include/network/lan/address.rb:798 msgid "No Link and IP Setup (Bonding Slaves)" msgstr "无链接和 IP 设置 (绑定从属)" -#: src/include/network/lan/address.rb:288 +#: src/include/network/lan/address.rb:286 msgid "Use iBFT Values" msgstr "使用 iBFT 值" -#: src/include/network/lan/address.rb:294 +#: src/include/network/lan/address.rb:292 msgid "Dynamic Address" msgstr "动态地址" -#: src/include/network/lan/address.rb:310 +#: src/include/network/lan/address.rb:308 msgid "DHCP both version 4 and 6" msgstr "DHCP 版本 4 和 6" -#: src/include/network/lan/address.rb:311 +#: src/include/network/lan/address.rb:309 msgid "DHCP version 4 only" msgstr "仅 DHCP 版本 4" -#: src/include/network/lan/address.rb:312 +#: src/include/network/lan/address.rb:310 msgid "DHCP version 6 only" msgstr "仅 DHCP 版本 6" #. TODO : Stat ... Assigned -#: src/include/network/lan/address.rb:323 +#: src/include/network/lan/address.rb:321 msgid "Statically Assigned IP Address" msgstr "静态指派的 IP 地址" #. TextEntry label #. TextEntry label -#: src/include/network/lan/address.rb:327 -#: src/include/network/lan/virtual.rb:218 -#: src/include/network/services/host.rb:356 +#: src/include/network/lan/address.rb:325 +#: src/include/network/lan/virtual.rb:213 +#: src/include/network/services/host.rb:341 msgid "&IP Address" msgstr "&IP 地址" -#: src/include/network/lan/address.rb:329 +#: src/include/network/lan/address.rb:327 msgid "&Subnet Mask" msgstr "子网掩码(&S)" -#: src/include/network/lan/address.rb:331 +#: src/include/network/lan/address.rb:329 msgid "&Hostname" msgstr "主机名(&H)" #. Text entry label -#: src/include/network/lan/address.rb:364 +#: src/include/network/lan/address.rb:360 msgid "R&emote IP Address" msgstr "远程 IP 地址(&E)" #. validation error popup -#: src/include/network/lan/address.rb:373 +#: src/include/network/lan/address.rb:369 msgid "The remote IP address is invalid." msgstr "远程 IP 地址无效。" #. push button label -#: src/include/network/lan/address.rb:381 +#: src/include/network/lan/address.rb:377 msgid "&S/390" msgstr "&S/390" #. validate device type, misdetection -#: src/include/network/lan/address.rb:1037 +#: src/include/network/lan/address.rb:1018 msgid "" "You have changed the interface type from the one\n" "that has been detected. This only makes sense\n" @@ -1243,13 +1232,13 @@ "这只有在您知道检测有误时才有意义。" #. Popup text -#: src/include/network/lan/address.rb:1057 +#: src/include/network/lan/address.rb:1038 msgid "Configuration %1 already present." msgstr "配置 %1 已存在。" #. If firewall is active and interface in no zone, nothing #. gets through (#62309) so warn and redirect to details -#: src/include/network/lan/address.rb:1081 +#: src/include/network/lan/address.rb:1062 msgid "" "The firewall is active, but this interface is not\n" "in any zone. All its traffic would be blocked.\n" @@ -1263,20 +1252,20 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/lan/address.rb:1101 +#: src/include/network/lan/address.rb:1082 msgid "No valid IP address." msgstr "无效的 IP 地址。" -#: src/include/network/lan/address.rb:1108 +#: src/include/network/lan/address.rb:1089 msgid "No valid netmask or prefix length." msgstr "无效的网络掩码或前缀长度。" -#: src/include/network/lan/address.rb:1116 +#: src/include/network/lan/address.rb:1097 msgid "Invalid hostname." msgstr "无效的主机名。" #. There'll be no 127.0.0.2 -> remind user to define some hostname -#: src/include/network/lan/address.rb:1124 +#: src/include/network/lan/address.rb:1105 msgid "" "No hostname has been specified. We recommend to associate \n" "a hostname with a static IP, otherwise the machine name will \n" @@ -1290,7 +1279,7 @@ "真的要把主机名留空吗？\n" #. Popup text -#: src/include/network/lan/address.rb:1143 +#: src/include/network/lan/address.rb:1124 msgid "" "Duplicate IP address detected.\n" "Really continue?\n" @@ -1300,61 +1289,60 @@ #. @param [Array<String>] types network card types #. @return their descriptions for CWM -#: src/include/network/lan/address.rb:1197 +#: src/include/network/lan/address.rb:1177 msgid "&General" msgstr "常规(&G)" -#. TODO: -#. "MANDATORY", -#: src/include/network/lan/address.rb:1209 +#. TODO: "MANDATORY", +#: src/include/network/lan/address.rb:1188 msgid "Device Activation" msgstr "设备激活" -#: src/include/network/lan/address.rb:1213 +#: src/include/network/lan/address.rb:1192 msgid "Firewall Zone" msgstr "防火墙区域" -#: src/include/network/lan/address.rb:1218 +#: src/include/network/lan/address.rb:1197 msgid "Maximum Transfer Unit (MTU)" msgstr "最大传输单元 (MTU)" -#. FIXME we have helps per widget and for the whole +#. FIXME: we have helps per widget and for the whole #. tab set but not for one tab -#: src/include/network/lan/address.rb:1228 +#: src/include/network/lan/address.rb:1207 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:1293 +#: src/include/network/lan/address.rb:1274 msgid "&Address" msgstr "地址(&A)" #. Address tab help -#: src/include/network/lan/address.rb:1296 +#: src/include/network/lan/address.rb:1277 msgid "<p>Configure your IP address.</p>" msgstr "<p>配置您的 IP 地址。</p>" -#: src/include/network/lan/address.rb:1302 +#: src/include/network/lan/address.rb:1283 msgid "&Hardware" msgstr "硬件(&H)" -#: src/include/network/lan/address.rb:1309 +#: src/include/network/lan/address.rb:1290 msgid "&Bond Slaves" msgstr "绑定从属(&B)" -#: src/include/network/lan/address.rb:1323 +#: src/include/network/lan/address.rb:1304 msgid "&Wireless" msgstr "无线(&W)" #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/lan/address.rb:1408 +#: src/include/network/lan/address.rb:1388 msgid "Ifplugd Priority" msgstr "Ifplugd 优先级" #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/lan/address.rb:1414 +#: src/include/network/lan/address.rb:1394 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" @@ -1368,7 +1356,7 @@ "因此我们需要设置每个接口的优先级。</p>\n" #. Address dialog caption -#: src/include/network/lan/address.rb:1499 +#: src/include/network/lan/address.rb:1476 msgid "Network Card Setup" msgstr "网卡设置" @@ -1557,11 +1545,11 @@ msgstr "CI7000 适配器" #. list > overview = (list >)LanItems::Overview(); -#: src/include/network/lan/cmdline.rb:92 +#: src/include/network/lan/cmdline.rb:89 msgid "Use \"id\" option to determine device." msgstr "使用 \"id\" 选项确定设备。" -#: src/include/network/lan/cmdline.rb:101 +#: src/include/network/lan/cmdline.rb:98 msgid "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"." msgstr "\"id\" 的值超出范围。请使用 \"list\" 选项检查 \"id\" 的最大值。" @@ -1569,23 +1557,23 @@ #. @param [Hash{String => String}] options action options #. Handler for action "edit" #. @param [Hash{String => String}] options action options -#: src/include/network/lan/cmdline.rb:219 -#: src/include/network/lan/cmdline.rb:270 +#: src/include/network/lan/cmdline.rb:214 +#: src/include/network/lan/cmdline.rb:265 msgid "Impossible value for bootproto." msgstr "bootproto 的值非法。" -#: src/include/network/lan/cmdline.rb:228 -#: src/include/network/lan/cmdline.rb:294 +#: src/include/network/lan/cmdline.rb:223 +#: src/include/network/lan/cmdline.rb:289 msgid "Impossible value for startmode." msgstr "startmode 的值非法。" -#: src/include/network/lan/cmdline.rb:276 +#: src/include/network/lan/cmdline.rb:271 msgid "For static configuration, the \"ip\" option is needed." msgstr "静态配置需要 \"ip\" 选项。" #. Handler for action "delete" #. @param [Hash{String => String}] options action options -#: src/include/network/lan/cmdline.rb:322 +#: src/include/network/lan/cmdline.rb:316 msgid "The device was deleted." msgstr "该设备已删除。" @@ -1623,17 +1611,17 @@ msgid "Note" msgstr "注" -#: src/include/network/lan/complex.rb:116 +#: src/include/network/lan/complex.rb:115 msgid "Global Options" msgstr "全局选项" -#: src/include/network/lan/complex.rb:126 +#: src/include/network/lan/complex.rb:125 msgid "Overview" msgstr "概览" #. continue-cancel popup, #178848 #. %1 is a (long) path to a README file -#: src/include/network/lan/complex.rb:154 +#: src/include/network/lan/complex.rb:153 msgid "" "A Xen network bridge was detected.\n" "Due to the renaming of network interfaces by the bridge script,\n" @@ -1646,7 +1634,7 @@ #. Write settings dialog #. @return `abort if aborted and `next otherwise -#: src/include/network/lan/complex.rb:200 +#: src/include/network/lan/complex.rb:199 msgid "" "Firmware is needed. Install it from \n" "the add-on CD.\n" @@ -1656,7 +1644,7 @@ "需要固件。请从附加 CD 安装之。\n" "首先将附加 CD 添加到 YaST 软件源，然后返回此配置对话框。\n" -#: src/include/network/lan/complex.rb:214 +#: src/include/network/lan/complex.rb:213 msgid "" "The device needs a firmware to function properly. Usually, it can be\n" "downloaded from your driver vendor's Web page. \n" @@ -1672,20 +1660,20 @@ #. - kernel modules (InstallKernel): before loaded #. - wlan firmware: here, just because it is copied from modems #. #45960 -#: src/include/network/lan/complex.rb:233 +#: src/include/network/lan/complex.rb:232 msgid "Installing firmware" msgstr "正在安装固件" -#: src/include/network/lan/complex.rb:234 +#: src/include/network/lan/complex.rb:233 msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?" msgstr "为了顺利安装固件，需要执行 'install_bcm43xx_firmware' 脚本。现在执行它吗？" -#: src/include/network/lan/complex.rb:248 +#: src/include/network/lan/complex.rb:247 msgid "An error occurred during firmware installation." msgstr "固件安装时出错。" #. Continue-Cancel popup -#: src/include/network/lan/complex.rb:403 +#: src/include/network/lan/complex.rb:402 msgid "" "The interface is currently set to be managed\n" "by the NetworkManager applet.\n" @@ -1699,12 +1687,12 @@ "该接口将不再由 NetworkManager 管理。\n" #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867) -#: src/include/network/lan/complex.rb:457 +#: src/include/network/lan/complex.rb:456 msgid "Device you select has STARTMODE=nfsroot. Really delete?" msgstr "您选择的设备有 STARTMODE=nfsroot。真的删除吗？" #. Network setup method dialog caption -#: src/include/network/lan/complex.rb:493 src/include/network/widgets.rb:376 +#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363 msgid "Network Setup Method" msgstr "网络设置方法" @@ -1713,7 +1701,7 @@ #. it is basically useful if user aborts dialog and he has done some #. changes already. Calling this function may results in confirmation #. popup. -#: src/include/network/lan/complex.rb:526 +#: src/include/network/lan/complex.rb:519 msgid "Network Settings" msgstr "网络设置" @@ -1740,7 +1728,7 @@ msgstr "通过 DHCP 修改默认路由" #. Manual network card setup help 1/4 -#: src/include/network/lan/hardware.rb:83 +#: src/include/network/lan/hardware.rb:82 msgid "" "<p>Set up hardware-specific options for \n" "your network device here.</p>\n" @@ -1748,13 +1736,13 @@ #. Manual network card setup help 2/4 #. translators: do not translated udev, MAC, BusID -#: src/include/network/lan/hardware.rb:92 +#: src/include/network/lan/hardware.rb:91 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:100 +#: src/include/network/lan/hardware.rb:99 msgid "" "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n" "associating the MAC address or BusID of the network device with its name (for\n" @@ -1764,7 +1752,7 @@ "它允许把网络设备的 MAC 地址或者 BusID 与其名称(例如，eth1, wlan0 ) 相关联，\n" "并保证了重启后设备名称的一致。\n" -#: src/include/network/lan/hardware.rb:106 +#: src/include/network/lan/hardware.rb:105 msgid "" "<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n" "Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n" @@ -1775,7 +1763,7 @@ "</p>" #. Manual network card setup help 2/4 -#: src/include/network/lan/hardware.rb:119 +#: src/include/network/lan/hardware.rb:118 msgid "" "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n" "for your network device here. If the device is already configured, see if there is more than one driver available for\n" @@ -1786,7 +1774,7 @@ "若有必要，从列表中选择一个驱动，但通常默认值就可以。</p>\n" #. Manual networ card setup help 3/4 -#: src/include/network/lan/hardware.rb:126 +#: src/include/network/lan/hardware.rb:125 msgid "" "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n" "format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n" @@ -1796,12 +1784,12 @@ "使用此格式：<i>选项</i>=<i>值</i>。每项之间以空格分隔，例如 <i>io=0x300 irq=5</i>。\n" "<b>注意：</b>若用同一个模块名称配置了两块网卡，则保存时将合并这些选项。</p>\n" -#: src/include/network/lan/hardware.rb:132 +#: src/include/network/lan/hardware.rb:131 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n" msgstr "<p>若您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。</p>\n" #. Manual dialog help 4/4 -#: src/include/network/lan/hardware.rb:141 +#: src/include/network/lan/hardware.rb:140 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" @@ -1811,91 +1799,76 @@ #. overwrite help #. Manual dialog help 5/4 -#: src/include/network/lan/hardware.rb:150 +#: src/include/network/lan/hardware.rb:149 msgid "" "<p>Here, set up your networking device. The values will be\n" "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n" msgstr "<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/chandev.conf</i>。</p>\n" #. Manual dialog help 6/4 -#: src/include/network/lan/hardware.rb:154 +#: src/include/network/lan/hardware.rb:153 msgid "" "<p>Options for the module should be written in the format specified\n" "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>" msgstr "<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>" -#. Manual dialog caption -#: src/include/network/lan/hardware.rb:271 -msgid "Manual Network Card Configuration" -msgstr "手动网卡配置" - #. CheckBox label -#: src/include/network/lan/hardware.rb:284 +#: src/include/network/lan/hardware.rb:281 msgid "&PCMCIA" msgstr "&PCMCIA" #. CheckBox label -#: src/include/network/lan/hardware.rb:293 +#: src/include/network/lan/hardware.rb:290 msgid "&USB" msgstr "&USB" -#. ComboBox label -#: src/include/network/lan/hardware.rb:302 -msgid "&Hotplug Type" -msgstr "热插拔类型(&H)" - -#. CheckBox label -#: src/include/network/lan/hardware.rb:307 -msgid "P&CI" -msgstr "P&CI" - #. #116211 - allow user to change modules from list #. Frame label -#: src/include/network/lan/hardware.rb:319 +#: src/include/network/lan/hardware.rb:302 msgid "&Kernel Module" msgstr "内核模块(&K)" #. Text entry label -#: src/include/network/lan/hardware.rb:329 +#: src/include/network/lan/hardware.rb:312 msgid "&Module Name" msgstr "模块名称(&M)" -#: src/include/network/lan/hardware.rb:383 +#: src/include/network/lan/hardware.rb:365 msgid "Udev Rules" msgstr "Udev 规则" -#: src/include/network/lan/hardware.rb:385 +#: src/include/network/lan/hardware.rb:367 msgid "Device Name" msgstr "设备名称" -#: src/include/network/lan/hardware.rb:386 +#: src/include/network/lan/hardware.rb:368 msgid "Change" msgstr "修改" -#: src/include/network/lan/hardware.rb:397 +#: src/include/network/lan/hardware.rb:379 msgid "Show Visible Port Identification" msgstr "显示可见端口标识" #. translators: how many seconds will card be blinking -#: src/include/network/lan/hardware.rb:402 +#: src/include/network/lan/hardware.rb:384 msgid "Seconds" msgstr "秒" -#: src/include/network/lan/hardware.rb:407 +#: src/include/network/lan/hardware.rb:389 msgid "Blink" msgstr "闪烁" -#: src/include/network/lan/hardware.rb:412 +#: src/include/network/lan/hardware.rb:394 msgid "Ethtool Options" msgstr "Ethtool 选项" #. Manual selection caption -#: src/include/network/lan/hardware.rb:492 +#: src/include/network/lan/hardware.rb:472 msgid "Manual Network Card Selection" msgstr "手动网卡选择" #. Manual selection help -#: src/include/network/lan/hardware.rb:495 +#: src/include/network/lan/hardware.rb:475 msgid "" "<p>Select the network card to configure. Search\n" "for a particular network card by entering the name in the search entry.</p>" @@ -1903,18 +1876,18 @@ #. Selection box label #. Selection box title -#: src/include/network/lan/hardware.rb:505 -#: src/include/network/lan/hardware.rb:560 +#: src/include/network/lan/hardware.rb:485 +#: src/include/network/lan/hardware.rb:540 msgid "&Network Card" msgstr "网卡(&N)" #. Text entry field -#: src/include/network/lan/hardware.rb:509 +#: src/include/network/lan/hardware.rb:489 msgid "&Search" msgstr "搜索(&S)" #. bnc#767946 -#: src/include/network/lan/hardware.rb:819 +#: src/include/network/lan/hardware.rb:799 msgid "" "Configuration name %1 already exists.\n" "Choose a different one." @@ -1923,7 +1896,7 @@ "请选择一个不同的名称。" #. S/390 dialog caption -#: src/include/network/lan/hardware.rb:874 +#: src/include/network/lan/hardware.rb:854 msgid "S/390 Network Card Configuration" msgstr "S/390 网卡配置" @@ -1931,131 +1904,131 @@ #. Frame label #. Frame label #. Frame label -#: src/include/network/lan/hardware.rb:894 -#: src/include/network/lan/hardware.rb:996 -#: src/include/network/lan/hardware.rb:1063 -#: src/include/network/lan/hardware.rb:1100 +#: src/include/network/lan/hardware.rb:873 +#: src/include/network/lan/hardware.rb:975 +#: src/include/network/lan/hardware.rb:1042 +#: src/include/network/lan/hardware.rb:1079 msgid "S/390 Device Settings" msgstr "S/390 设备设置" #. TextEntry label -#: src/include/network/lan/hardware.rb:904 +#: src/include/network/lan/hardware.rb:883 msgid "&Port Name" msgstr "端口名称(&P)" -#: src/include/network/lan/hardware.rb:909 +#: src/include/network/lan/hardware.rb:888 msgid "Port Number" msgstr "端口号" #. CheckBox label -#: src/include/network/lan/hardware.rb:923 +#: src/include/network/lan/hardware.rb:902 msgid "&Enable IPA Takeover" msgstr "启用 IPA 接管(&E)" #. CheckBox label -#: src/include/network/lan/hardware.rb:930 +#: src/include/network/lan/hardware.rb:909 msgid "Enable &Layer 2 Support" msgstr "启用第 2 层支持(&L)" #. TextEntry label -#: src/include/network/lan/hardware.rb:937 +#: src/include/network/lan/hardware.rb:916 msgid "Layer2 &MAC Address" msgstr "第 2 层 MAC 地址(&M)" -#: src/include/network/lan/hardware.rb:945 -#: src/include/network/lan/hardware.rb:1021 -#: src/include/network/lan/hardware.rb:1075 +#: src/include/network/lan/hardware.rb:924 +#: src/include/network/lan/hardware.rb:1000 +#: src/include/network/lan/hardware.rb:1054 msgid "Read Channel" msgstr "读取通道" -#: src/include/network/lan/hardware.rb:951 -#: src/include/network/lan/hardware.rb:1027 -#: src/include/network/lan/hardware.rb:1081 +#: src/include/network/lan/hardware.rb:930 +#: src/include/network/lan/hardware.rb:1006 +#: src/include/network/lan/hardware.rb:1060 msgid "Write Channel" msgstr "写入通道" -#: src/include/network/lan/hardware.rb:957 +#: src/include/network/lan/hardware.rb:936 msgid "Control Channel" msgstr "控制通道" #. S/390 dialog help: QETH Port name -#: src/include/network/lan/hardware.rb:968 +#: src/include/network/lan/hardware.rb:947 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:972 +#: src/include/network/lan/hardware.rb:951 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:975 +#: src/include/network/lan/hardware.rb:954 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" msgstr "<p>若应为此接口启用 IP 地址接管，请选择<b>启用 IPA 接管</b>。</p>" -#: src/include/network/lan/hardware.rb:978 +#: src/include/network/lan/hardware.rb:957 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>若此卡已配置了第 2 层支持，请选择<b>启用第 2 层支持</b>。</p>" -#: src/include/network/lan/hardware.rb:981 +#: src/include/network/lan/hardware.rb:960 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>若此卡已配置了第 2 层支持，请输入<b>第 2 层 MAC 地址</b>。</p>" #. TextEntry label -#: src/include/network/lan/hardware.rb:1005 +#: src/include/network/lan/hardware.rb:984 msgid "&Port Number" msgstr "端口号(&P)" #. TextEntry label -#: src/include/network/lan/hardware.rb:1013 +#: src/include/network/lan/hardware.rb:992 msgid "&LANCMD Time-Out" msgstr "&LANCMD 超时" #. S/390 dialog help: LCS -#: src/include/network/lan/hardware.rb:1038 +#: src/include/network/lan/hardware.rb:1017 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>" msgstr "<p>选择此接口的<b>端口号</b>。</p>" -#: src/include/network/lan/hardware.rb:1039 +#: src/include/network/lan/hardware.rb:1018 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:1044 +#: src/include/network/lan/hardware.rb:1023 msgid "Compatibility Mode" msgstr "兼容模式" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1046 +#: src/include/network/lan/hardware.rb:1025 msgid "Extended Mode" msgstr "扩展模式" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1048 +#: src/include/network/lan/hardware.rb:1027 msgid "CTC-Based tty (Linux to Linux Connections)" msgstr "基于 CTC 的控制台 (Linux 到 Linux 连接)" #. ComboBox item: CTC device protocol -#: src/include/network/lan/hardware.rb:1050 +#: src/include/network/lan/hardware.rb:1029 msgid "Compatibility Mode with OS/390 and z/OS" msgstr "OS/390 和 z/OS 兼容模式" #. TextEntry label -#: src/include/network/lan/hardware.rb:1069 +#: src/include/network/lan/hardware.rb:1048 msgid "&Protocol" msgstr "协议(&P)" #. S/390 dialog help: CTC -#: src/include/network/lan/hardware.rb:1092 +#: src/include/network/lan/hardware.rb:1071 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:1109 +#: src/include/network/lan/hardware.rb:1088 msgid "&Peer Name" msgstr "对等点名称(&P)" #. S/390 dialog help: IUCV, #42789 -#: src/include/network/lan/hardware.rb:1120 +#: src/include/network/lan/hardware.rb:1099 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" @@ -2064,7 +2037,7 @@ "例如，要连接的 z/VM 用户名 (大小写敏感)。</p>\n" #. #176330, must be static -#: src/include/network/lan/hardware.rb:1244 +#: src/include/network/lan/hardware.rb:1220 msgid "" "An error occurred while creating device.\n" "See YaST log for details." @@ -2074,12 +2047,12 @@ #. Manual network card configuration dialog #. @return dialog result -#: src/include/network/lan/hardware.rb:1266 +#: src/include/network/lan/hardware.rb:1242 msgid "Hardware Dialog" msgstr "硬件对话框" #. Network cards read dialog help 1/2 -#: src/include/network/lan/help.rb:32 +#: src/include/network/lan/help.rb:31 msgid "" "<p><b><big>Initializing Network Card\n" "Configuration</big></b><br>Please wait...<br></p>\n" @@ -2088,7 +2061,7 @@ "请稍候...<br></p>\n" #. Network cards read dialog help 2/2 -#: src/include/network/lan/help.rb:36 +#: src/include/network/lan/help.rb:35 msgid "" "<p><b><big>Aborting the Initialization:</big></b><br>\n" "Safely abort the configuration utility by pressing <B>Abort</B> now.</p>\n" @@ -2097,7 +2070,7 @@ "现在按<B>中止</B>可安全地中止配置工具。</p>\n" #. Network cards write dialog help 1/2 -#: src/include/network/lan/help.rb:41 +#: src/include/network/lan/help.rb:39 msgid "" "<p><b><big>Saving Network Card\n" "Configuration</big></b><br>Please wait...<br></p>\n" @@ -2106,7 +2079,7 @@ "请稍候...<br></p>\n" #. Network cards write dialog help 2/2 -#: src/include/network/lan/help.rb:45 +#: src/include/network/lan/help.rb:43 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort saving by pressing <b>Abort</b>.</p>\n" @@ -2115,8 +2088,8 @@ "按<b>中止</b>可中止保存。</p>\n" #. Network setup method help -#. NetworkManager and ifup are programs -#: src/include/network/lan/help.rb:51 +#. NetworkManager and wicked are programs +#: src/include/network/lan/help.rb:48 msgid "" "<p><b><big>Network Setup Method</big></b></p>\n" "<p>Use the <b>NetworkManager</b> as a desktop applet\n" @@ -2127,9 +2100,7 @@ "<p>使用 <b>NetworkManager</b> 桌面挂件管理全部接口的连接。\n" "它很适合于要在有线和无线网络间切换的场景。</p>\n" -#. Network setup method help -#. NetworkManager and wicked are programs -#: src/include/network/lan/help.rb:59 +#: src/include/network/lan/help.rb:54 msgid "" "<p>Use <b>wicked</b> if you do not run a desktop environment\n" "or need to use multiple interfaces at the same time.</p>\n" @@ -2137,8 +2108,20 @@ "<p>若您未运行桌面环境或需要同时使用多个接口，\n" "请使用<b>怪兽方法</b>。</p>\n" -#: src/include/network/lan/help.rb:63 +#. For systems not including NetworkManager by default (bnc#892678) +#: src/include/network/lan/help.rb:59 msgid "" +"<p><b>NetworkManager</b> is not part of every base\n" +"installation repository. For example, to enable it on SUSE\n" +"Linux Enterprise Server add the Workstation Extension\n" +"repository and install the 'NetworkManager' package.</p>\n" +msgstr "" +"<p>不是每个基础安装源都有 <b>NetworkManager</b> 的。\n" +"例如，要在 SUSE Linux Enterprise Server 上启用 NetworkManager，\n" +"请添加 Workstation Extension 源并安装 'NetworkManager' 软件包。</p>\n" + +#: src/include/network/lan/help.rb:66 +msgid "" "<p><b><big>Network Card Overview</big></b><br>\n" "Obtain an overview of installed network cards. Additionally,\n" "edit their configuration.<br></p>\n" @@ -2147,7 +2130,7 @@ "获得已安装网卡的概览。\n" "此外，还可编辑其配置。<br></p>\n" -#: src/include/network/lan/help.rb:68 +#: src/include/network/lan/help.rb:71 msgid "" "<p><b><big>Adding a Network Card:</big></b><br>\n" "Press <b>Add</b> to configure a new network card manually.</p>\n" @@ -2155,7 +2138,7 @@ "<p><b><big>添加网卡：</big></b><br>\n" "按<b>添加</b>手动配置新网卡。</p>\n" -#: src/include/network/lan/help.rb:71 +#: src/include/network/lan/help.rb:74 msgid "" "<p><b><big>Configuring or Deleting:</big></b><br>\n" "Choose a network card to change or remove.\n" @@ -2166,7 +2149,7 @@ "然后分别按<b>编辑</b>或<b>删除</b>。</p>\n" #. IPv6 help -#: src/include/network/lan/help.rb:78 +#: src/include/network/lan/help.rb:81 msgid "" "<p><b><big>IPv6 Protocol Settings</big></b></p>\n" "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n" @@ -2181,12 +2164,12 @@ "要禁用 IPv6，请反选此选项。这将屏蔽 ipv6 内核模块。\n" "若您的网络未使用 ipv6 协议，这样做响应时间会更短。</p>\n" -#: src/include/network/lan/help.rb:86 +#: src/include/network/lan/help.rb:89 msgid "<p>All changes will be applied after reboot.</p>" msgstr "<p>全部修改都将在重启后应用。</p>" #. Routing dialog help 1/2 -#: src/include/network/lan/help.rb:89 +#: src/include/network/lan/help.rb:92 msgid "" "<p>The routing can be set up in this dialog.\n" "The <b>Default Gateway</b> matches every possible destination, but poorly. \n" @@ -2199,7 +2182,7 @@ "若存在任何其它匹配要求地址的项，则将使用该项而不使用默认路由。\n" "设计默认路由的目的只是为了提供一个 \"万一没有目的地时的目的地\"。</p>\n" -#: src/include/network/lan/help.rb:96 +#: src/include/network/lan/help.rb:99 msgid "" "<p>For each route, enter destination network IP address, gateway address,\n" "and netmask. To omit any of these values, use a dash sign \"-\". Select\n" @@ -2211,13 +2194,13 @@ "\"-\" 表示任何接口。</p>\n" #. Routing dialog help 2/2 -#: src/include/network/lan/help.rb:102 +#: src/include/network/lan/help.rb:105 msgid "" "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" msgstr "<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网络)。\n" -#: src/include/network/lan/help.rb:106 +#: src/include/network/lan/help.rb:109 msgid "" "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" @@ -2227,7 +2210,7 @@ "<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网络)。\n" "<b>警告：</b>IPv6 转发将禁用自动配置 IPv6 无状态地址(SLAAC)。" -#: src/include/network/lan/help.rb:112 +#: src/include/network/lan/help.rb:115 msgid "" "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n" "You should enable masquerading and/or set at least one redirect rule in the\n" @@ -2237,7 +2220,7 @@ "您应该启用伪装和/或在防火墙配置中设置至少一条重定向规则。\n" "请使用 YaST 防火墙模块。</p>\n" -#: src/include/network/lan/help.rb:117 +#: src/include/network/lan/help.rb:121 msgid "" "<p>If you are using DHCP to get an IP address, check whether you get\n" "also a hostname via DHCP. The hostname will be set automatically by the DHCP client.\n" @@ -2251,7 +2234,7 @@ "因此，若您要连接到指派了不同主机名的不同网络，请禁用此选项。\n" "</p>" -#: src/include/network/lan/help.rb:124 +#: src/include/network/lan/help.rb:129 msgid "" "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n" "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n" @@ -2263,7 +2246,7 @@ "若您想要在任何情况下都能解析主机名，即使在没有活动网络的情况下也能，那么这是一个有用的选项。\n" "在其它任何情况下，请谨慎使用之，尤其是当此计算机提供了一些网络服务时。</p>\n" -#: src/include/network/lan/help.rb:131 +#: src/include/network/lan/help.rb:137 msgid "" "<p>Enter the name servers and domain search list for resolving \n" "hostnames. Usually they can be obtained by DHCP.</p>\n" @@ -2272,7 +2255,7 @@ "通常它们可由 DHCP 获得。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:135 +#: src/include/network/lan/help.rb:141 msgid "" "<p>A name server is a computer that translates hostnames into\n" "IP addresses. This value must be entered as an <b>IP address</b>\n" @@ -2283,7 +2266,7 @@ "(例如 192.168.0.42)，而不是主机名。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:141 +#: src/include/network/lan/help.rb:147 msgid "" "<p>Search domain is the domain name where hostname searching starts.\n" "The primary search domain is usually the same as the domain name of\n" @@ -2294,7 +2277,7 @@ "主搜索域通常与您计算机的域名称 (例如 suse.de) 相同。\n" "还可能有额外的搜索域 (诸如 suse.com)。请用逗号或空格分隔这些域。</p>\n" -#: src/include/network/lan/help.rb:147 +#: src/include/network/lan/help.rb:154 msgid "" "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n" "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n" @@ -2304,7 +2287,7 @@ "<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 <i>marguerite.su</i>)。\n" "若此计算机是一个邮件服务器，那么域尤其关键。您可以使用 <i>hostname</i> 命令查看您计算机的主机名。</p>" -#: src/include/network/lan/help.rb:153 +#: src/include/network/lan/help.rb:161 msgid "" "<p>Select the way how the DNS configuration will be modified (name servers,\n" "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n" @@ -2317,7 +2300,7 @@ "通常由 <i>netconfig</i> 脚本处理，该脚本会合并静态定义的数据和动态获得的数据 (例如，从 DHCP 客户端、NetworkManager 等)。\n" "这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n" -#: src/include/network/lan/help.rb:161 +#: src/include/network/lan/help.rb:169 msgid "" "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n" "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n" @@ -2335,7 +2318,7 @@ #. Address dialog help 1-6/8: dynamic address preferred #. Address dialog help 1/8 -#: src/include/network/lan/help.rb:174 +#: src/include/network/lan/help.rb:181 msgid "" "<p><b><big>Address Setup</big></b></p>\n" "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n" @@ -2345,19 +2328,19 @@ "<p>若您不想为此设备指派一个 IP 地址，则请选择<b>无地址设置</b>。\n" "这在绑定以太网设备时特别有用。</p>\n" -#: src/include/network/lan/help.rb:179 +#: src/include/network/lan/help.rb:186 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n" msgstr "<p>若您想要保留在 BIOS 中配置的网络，请勾选 <b>iBFT</b>。</p>\n" #. Address dialog help 2/8 -#: src/include/network/lan/help.rb:183 +#: src/include/network/lan/help.rb:190 msgid "" "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n" "assigned by the system administrator or your Internet provider.</p>\n" msgstr "<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址，请选择<b>动态地址</b>。</p>\n" #. Address dialog help 3/8 -#: src/include/network/lan/help.rb:187 +#: src/include/network/lan/help.rb:194 msgid "" "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n" "if you have a DHCP server running on your local network. Network addresses \n" @@ -2368,7 +2351,7 @@ "之后将自动从服务器获得网络地址。</p>\n" #. Address dialog help 4/8 -#: src/include/network/lan/help.rb:193 +#: src/include/network/lan/help.rb:200 msgid "" "<p>To search for an IP address and assign it statically, select \n" "<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n" @@ -2379,7 +2362,7 @@ "否则，必须<b>静态</b>指派网络地址。</p>\n" #. Address dialog help 5/8 -#: src/include/network/lan/help.rb:199 +#: src/include/network/lan/help.rb:207 msgid "" "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n" " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n" @@ -2389,7 +2372,7 @@ "和对等点的<b>远程 IP 地址</b> (例如，<tt>192.168.100.254</tt>)。</p>\n" #. Address dialog help 6/8 -#: src/include/network/lan/help.rb:205 +#: src/include/network/lan/help.rb:214 msgid "" "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n" "the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n" @@ -2400,13 +2383,13 @@ "输入一个完全限定主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n" #. Address dialog help 8/8 -#: src/include/network/lan/help.rb:211 +#: src/include/network/lan/help.rb:220 msgid "" "<p>Contact your <b>network administrator</b> for more information about\n" "the network configuration.</p>" msgstr "<p>有关网络配置的更多信息，请垂询您的<b>网络管理员</b>。</p>" -#: src/include/network/lan/help.rb:214 +#: src/include/network/lan/help.rb:224 msgid "" "<p>DHCP configuration is not recommended for this product.\n" "Components of this product might not work with DHCP.</p>" @@ -2414,7 +2397,7 @@ "<p>此产品不推荐 DHCP 配置。\n" "此产品的组件可能无法与 DHCP 协作。</p>" -#: src/include/network/lan/help.rb:217 +#: src/include/network/lan/help.rb:228 msgid "" "<p><b><big>Firewall Zone</big></b></p>\n" "<p>Select the firewall zone to put the interface into. If you\n" @@ -2432,11 +2415,11 @@ "若您未选择区域且不存在其它位于此防火墙中的接口，\n" "则将禁用防火墙。</p>" -#: src/include/network/lan/help.rb:226 +#: src/include/network/lan/help.rb:238 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>" msgstr "<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>" -#: src/include/network/lan/help.rb:229 +#: src/include/network/lan/help.rb:242 msgid "" "<p><b><big>Maximum Transfer Unit</big></b></p>\n" "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n" @@ -2450,7 +2433,7 @@ "通常，您不需要设置 MTU，但使用较小的 MTU 或许会改善网络性能，尤其是在慢速拨号连接下。\n" "您可从推荐值中择一，或定义另一个值。</p>\n" -#: src/include/network/lan/help.rb:237 +#: src/include/network/lan/help.rb:251 msgid "" "<p>Select the slave devices for the bond device.\n" "Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>" @@ -2459,12 +2442,12 @@ "只有设备激活设为<b>从不</b>和设置了<b>无地址设置</b>的设备才可用。</p>" #. DHCP dialog help 1/7 -#: src/include/network/lan/help.rb:242 +#: src/include/network/lan/help.rb:255 msgid "<p><b><big>DHCP Client Options</big></b></p>" msgstr "<p><b><big>DHCP 客户端选项</big></b></p>" #. DHCP dialog help 2/7 -#: src/include/network/lan/help.rb:244 +#: src/include/network/lan/help.rb:257 msgid "" "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n" "the hardware address of the network interface. It must be different for each\n" @@ -2478,7 +2461,7 @@ "请在此指定一个唯一的格式自由的标识符。</p>" #. DHCP dialog help 3/7 -#: src/include/network/lan/help.rb:252 +#: src/include/network/lan/help.rb:265 msgid "" "<p>The <b>Hostname to Send</b> specifies a string used for the\n" "hostname option field when the DHCP client sends messages to the DHCP server. Some \n" @@ -2496,7 +2479,7 @@ "若您不想要发送主机名，请将该字段留空。</p>\n" #. Aliases dialog help 1/4 -#: src/include/network/lan/help.rb:264 +#: src/include/network/lan/help.rb:276 msgid "" "<p><b><big>Additional Addresses</big></b></p>\n" "<p>Configure additional addresses of an interface in this table.</p>\n" @@ -2505,31 +2488,38 @@ "<p>在此表中配置接口的附加地址。</p>\n" #. Aliases dialog help 2/4 -#: src/include/network/lan/help.rb:268 +#: src/include/network/lan/help.rb:280 msgid "" "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n" "the <b>Netmask</b>.</p>" msgstr "<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</p>" #. Aliases dialog help 3/4 -#: src/include/network/lan/help.rb:272 +#: src/include/network/lan/help.rb:284 +#, fuzzy +#| msgid "" +#| "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n" +#| " length of interface name (inclusive of the colon and label) is\n" +#| " limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters.</p>" msgid "" "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n" -" length of interface name (inclusive of the colon and label) is\n" -" limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters.</p>" +"length of interface name (inclusive of the colon and label) is\n" +"limited to 15 characters. The obsolete ifconfig utility truncates it after 9 characters.</p>" msgstr "" "<p><b>IPv4 地址标签</b>，之前叫做别名，是可选的，并且使用别名是很久以前的事了。\n" "接口名全长 (包括冒号和标签) 的限制为 15 个字符，并且过时的 ifconfig 工具会把它截断为 9 个字符。</p>" #. Aliases dialog help 3/4, #83766 -#: src/include/network/lan/help.rb:278 -msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" +#: src/include/network/lan/help.rb:290 +#, fuzzy +#| msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" +msgid "<p>Do not include the interface name in the label. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" msgstr "<p>不要在别名中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>" #. shared between WirelessDialog and WirelessKeyPopup #. this is suited to the button-switched key typing #. Translators: dialog help -#: src/include/network/lan/help.rb:284 +#: src/include/network/lan/help.rb:297 msgid "" "<p>Choose between three <b>Key Input Types</b> for your key.\n" "<br><b>Passphrase</b>: The key is generated from the phrase entered.\n" @@ -2556,14 +2546,13 @@ "</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:299 +#: src/include/network/lan/help.rb:312 msgid "" "<p>Here, set the most important settings\n" "for wireless networking.</p>" msgstr "<p>在此设置无线联网最重要的设置。</p>" -#. Wireless dialog help -#: src/include/network/lan/help.rb:303 +#: src/include/network/lan/help.rb:315 msgid "" "<p>The <b>Operating Mode</b> depends on the network topology. The mode\n" "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n" @@ -2576,8 +2565,7 @@ "<b>受管</b> (由访问点管理的网络，有时也称为<i>基础模式</i>)\n" "或<b>主控</b> (网卡作为访问点使用)。</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:311 +#: src/include/network/lan/help.rb:322 msgid "" "<p>Set the <b>Network Name (ESSID)</b> used to identify\n" "cells that are part of the same virtual network. All stations in a\n" @@ -2593,8 +2581,7 @@ "则可以留空此处，或将其设为<tt>任意</tt>。\n" "在此情况下，您的 WLAN 卡将关联到信号强度最好的访问点。</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:321 +#: src/include/network/lan/help.rb:331 msgid "" "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n" "It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n" @@ -2627,8 +2614,7 @@ "若您想要使用 WPA，请选择 <b>WPA-PSK</b> 或 <b>WPA-EAP</b> 作为认证模式。\n" "只有在运行模式为 <b>受管</b> 时才能这样做。</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:340 +#: src/include/network/lan/help.rb:349 msgid "" "<p>To use WEP, enter the\n" "WEP encryption key to use. It can have a key\n" @@ -2640,7 +2626,7 @@ "在这些密钥中，有 24 位是动态生成的，所以您只需输入 40 到 232 位。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:348 +#: src/include/network/lan/help.rb:357 msgid "" "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n" "enter the preshared key. This\n" @@ -2655,8 +2641,7 @@ "但仍可能受到字典攻击。\n" "请不要使用易猜出的词作为密码短语。</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:357 +#: src/include/network/lan/help.rb:365 msgid "" "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n" "enter some additional parameters in the next dialog.</p>\n" @@ -2664,8 +2649,7 @@ "<p>要使用 WPA-EAP (有时也叫做 WPA 企业版)，\n" "请在下一个对话框中输入一些额外参数。</p>\n" -#. Wireless dialog help -#: src/include/network/lan/help.rb:361 +#: src/include/network/lan/help.rb:368 msgid "" "<p>These values will be written to the interface configuration file\n" "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n" @@ -2677,29 +2661,29 @@ "全部可用选项请参考同名文件夹中的 'wireless' 文件。</p>" #. TextEntry label -#: src/include/network/lan/virtual.rb:214 +#: src/include/network/lan/virtual.rb:209 msgid "IPv4 &Address Label" msgstr "IPv4 地址标签(&A)" #. TextEntry label -#: src/include/network/lan/virtual.rb:222 +#: src/include/network/lan/virtual.rb:217 msgid "Net&mask" msgstr "网络掩码(&M)" #. Popup::Error text -#: src/include/network/lan/virtual.rb:254 +#: src/include/network/lan/virtual.rb:247 msgid "Label is too long." msgstr "标签太长。" #. Popup::Error text #. Popup::Error text -#: src/include/network/lan/virtual.rb:264 -#: src/include/network/services/host.rb:401 +#: src/include/network/lan/virtual.rb:257 +#: src/include/network/services/host.rb:386 msgid "The IP address is invalid." msgstr "IP 地址无效。" #. Popup::Error text -#: src/include/network/lan/virtual.rb:273 +#: src/include/network/lan/virtual.rb:266 msgid "The subnet mask is invalid." msgstr "子网掩码无效。" @@ -2726,26 +2710,26 @@ msgstr "十六进制(&H)" #. combo box label -#: src/include/network/lan/wireless.rb:76 +#: src/include/network/lan/wireless.rb:75 msgid "EAP &Mode" msgstr "EAP 模式(&M)" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:80 +#: src/include/network/lan/wireless.rb:79 msgid "TTLS" msgstr "TTLS" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:82 +#: src/include/network/lan/wireless.rb:81 msgid "PEAP" msgstr "PEAP" #. combo box item, one of WPA EAP modes -#: src/include/network/lan/wireless.rb:84 +#: src/include/network/lan/wireless.rb:83 msgid "TLS" msgstr "TLS" -#: src/include/network/lan/wireless.rb:86 +#: src/include/network/lan/wireless.rb:85 msgid "" "<p>WPA-EAP uses a RADIUS server to authenticate users. There\n" "are different methods in EAP to connect to the server and\n" @@ -2756,11 +2740,11 @@ "即 TLS，TTLS 和 PEAP。</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:99 +#: src/include/network/lan/wireless.rb:98 msgid "&Identity" msgstr "身份(&I)" -#: src/include/network/lan/wireless.rb:101 +#: src/include/network/lan/wireless.rb:100 msgid "" "<p>For TTLS and PEAP, enter your <b>Identity</b>\n" "and <b>Password</b> as configured on the server.\n" @@ -2772,22 +2756,22 @@ "这通常是不需要的。</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:111 +#: src/include/network/lan/wireless.rb:110 msgid "&Anonymous Identity" msgstr "匿名身份(&A)" #. or password? #. text entry label -#: src/include/network/lan/wireless.rb:119 +#: src/include/network/lan/wireless.rb:118 msgid "&Password" msgstr "密码(&P)" #. text entry label -#: src/include/network/lan/wireless.rb:126 +#: src/include/network/lan/wireless.rb:125 msgid "&Client Certificate" msgstr "客户证书(&C)" -#: src/include/network/lan/wireless.rb:128 +#: src/include/network/lan/wireless.rb:127 msgid "" "<p>TLS uses a <b>Client Certificate</b> instead of a username and\n" "password combination for authentication. It uses a public and private key pair\n" @@ -2801,23 +2785,23 @@ "的<b>客户密钥密码</b>。</p>\n" #. text entry label -#: src/include/network/lan/wireless.rb:144 +#: src/include/network/lan/wireless.rb:143 msgid "Client &Key" msgstr "客户密钥(&K)" #. or password? #. text entry label -#: src/include/network/lan/wireless.rb:157 +#: src/include/network/lan/wireless.rb:156 msgid "Client Key Pass&word" msgstr "客户密钥密码(&W)" #. text entry label #. aka certificate of the CA (certification authority) -#: src/include/network/lan/wireless.rb:167 +#: src/include/network/lan/wireless.rb:166 msgid "&Server Certificate" msgstr "服务器证书(&S)" -#: src/include/network/lan/wireless.rb:171 +#: src/include/network/lan/wireless.rb:170 msgid "" "<p>To increase security, it is recommended to configure\n" "a <b>Server Certificate</b>. It is used\n" @@ -2827,22 +2811,22 @@ "它用于验证服务器真伪。</p>\n" #. push button label -#: src/include/network/lan/wireless.rb:212 +#: src/include/network/lan/wireless.rb:211 msgid "&Details" msgstr "细节(&D)" -#: src/include/network/lan/wireless.rb:221 +#: src/include/network/lan/wireless.rb:220 msgid "" "If you do not know your ID and password or you do not have\n" "any certificate or key files, contact your system administrator.\n" msgstr "若您不知道您的 ID 和密码，或者没有证书或密钥文件，请垂询您的系统管理员。\n" #. combo box label -#: src/include/network/lan/wireless.rb:239 +#: src/include/network/lan/wireless.rb:238 msgid "&Authentication Method" msgstr "认证方法(&A)" -#: src/include/network/lan/wireless.rb:240 +#: src/include/network/lan/wireless.rb:239 msgid "" "<p>Here you can configure the inner authentication (also known as phase 2)\n" "method. By default, all methods are allowed. If you want to restrict the\n" @@ -2855,11 +2839,11 @@ "请在此选择您想要使用的内部认证方法。</p>\n" #. radio button group label -#: src/include/network/lan/wireless.rb:250 +#: src/include/network/lan/wireless.rb:249 msgid "&PEAP Version" msgstr "&PEAP 版本" -#: src/include/network/lan/wireless.rb:251 +#: src/include/network/lan/wireless.rb:250 msgid "" "<p>If you are using PEAP, you can also force the use of a specific PEAP\n" "implementation (version 0 or 1). Normally this should not be necessary.</p>\n" @@ -2868,133 +2852,133 @@ "正常情况下这不应该是必须的。</p>\n" #. radio button: any version of PEAP -#: src/include/network/lan/wireless.rb:256 +#: src/include/network/lan/wireless.rb:255 msgid "&Any" msgstr "任意(&A)" #. Wireless authentication modes: #. ComboBox item -#: src/include/network/lan/wireless.rb:359 +#: src/include/network/lan/wireless.rb:357 msgid "No Encryption" msgstr "无加密" #. ComboBox item -#: src/include/network/lan/wireless.rb:363 +#: src/include/network/lan/wireless.rb:361 msgid "WEP - Open" msgstr "WEP - 开放式" #. ComboBox item -#: src/include/network/lan/wireless.rb:365 +#: src/include/network/lan/wireless.rb:363 msgid "WEP - Shared Key" msgstr "WEP - 共享密钥" #. ComboBox item #. Ask me what it means, I don't know yet -#: src/include/network/lan/wireless.rb:368 +#: src/include/network/lan/wireless.rb:366 msgid "WPA-PSK (WPA version 1 or 2)" msgstr "WPA-PSK (WPA 版本 1 或 2)" #. ComboBox item -#: src/include/network/lan/wireless.rb:372 +#: src/include/network/lan/wireless.rb:370 msgid "WPA-EAP (WPA version 1 or 2)" msgstr "WPA-EAP (WPA 版本 1 或 2)" #. Wireless dialog caption -#: src/include/network/lan/wireless.rb:396 +#: src/include/network/lan/wireless.rb:394 msgid "Wireless Network Card Configuration" msgstr "无线网卡配置" #. Frame label -#: src/include/network/lan/wireless.rb:426 +#: src/include/network/lan/wireless.rb:424 msgid "Wireless Device Settings" msgstr "无线设备设置" #. ComboBox label -#: src/include/network/lan/wireless.rb:435 +#: src/include/network/lan/wireless.rb:433 msgid "O&perating Mode" msgstr "运行模式(&P)" #. ComboBox item -#: src/include/network/lan/wireless.rb:438 +#: src/include/network/lan/wireless.rb:436 msgid "Ad-Hoc" msgstr "点对点 (Ad-Hoc)" #. ComboBox item -#: src/include/network/lan/wireless.rb:442 +#: src/include/network/lan/wireless.rb:440 msgid "Master" msgstr "主控" #. Text entry label -#: src/include/network/lan/wireless.rb:451 +#: src/include/network/lan/wireless.rb:449 msgid "Ne&twork Name (ESSID)" msgstr "网络名称 (ESSID)(&T)" -#: src/include/network/lan/wireless.rb:454 +#: src/include/network/lan/wireless.rb:452 msgid "Scan Network" msgstr "扫描网络" #. ComboBox label -#: src/include/network/lan/wireless.rb:461 +#: src/include/network/lan/wireless.rb:459 msgid "&Authentication Mode" msgstr "认证模式(&A)" #. Text entry label -#: src/include/network/lan/wireless.rb:468 +#: src/include/network/lan/wireless.rb:466 msgid "&Encryption Key" msgstr "加密密钥(&E)" #. PushButton label -#: src/include/network/lan/wireless.rb:477 +#: src/include/network/lan/wireless.rb:475 msgid "E&xpert Settings" msgstr "专家设置(&X)" #. PushButton label, keys for WEP encryption -#: src/include/network/lan/wireless.rb:480 +#: src/include/network/lan/wireless.rb:478 msgid "&WEP Keys" msgstr "&WEP 密钥" #. Popup text -#: src/include/network/lan/wireless.rb:562 +#: src/include/network/lan/wireless.rb:560 msgid "WPA authentication mode is only possible in managed operating mode." msgstr "WPA 认证模式只能在受管运行模式下使用。" #. Popup text #. modes: combination of operation and authentication -#: src/include/network/lan/wireless.rb:573 +#: src/include/network/lan/wireless.rb:571 msgid "Specify the network name for this mode." msgstr "请指定此模式的网络名称。" #. Popup text -#: src/include/network/lan/wireless.rb:580 +#: src/include/network/lan/wireless.rb:578 msgid "The network name must be shorter than 32 characters." msgstr "网络名称必须短于 32 个字符。" #. Error popup -#: src/include/network/lan/wireless.rb:600 +#: src/include/network/lan/wireless.rb:598 msgid "The passphrase must have between 8 and 63 characters (inclusively)." msgstr "密码短语的长度必须在 8 到 63 (包括两者) 个字符之间。" #. Error popup -#: src/include/network/lan/wireless.rb:611 +#: src/include/network/lan/wireless.rb:609 msgid "The key must have %1 hexadecimal digits." msgstr "密钥必须有 %1 个十六进制数字。" #. Popup text #. Popup text -#: src/include/network/lan/wireless.rb:623 -#: src/include/network/lan/wireless.rb:963 +#: src/include/network/lan/wireless.rb:621 +#: src/include/network/lan/wireless.rb:939 msgid "The encryption key is invalid." msgstr "加密密钥无效。" #. error #. Popup text -#: src/include/network/lan/wireless.rb:631 +#: src/include/network/lan/wireless.rb:629 msgid "The encryption key must be specified for this authentication mode." msgstr "必须为此认证模式指定加密密钥。" #. warning only #. Popup text -#: src/include/network/lan/wireless.rb:638 +#: src/include/network/lan/wireless.rb:636 msgid "" "Using no encryption is a security risk.\n" "Really continue?\n" @@ -3004,20 +2988,20 @@ #. Wireless expert dialog caption #. Frame label -#: src/include/network/lan/wireless.rb:696 -#: src/include/network/lan/wireless.rb:799 +#: src/include/network/lan/wireless.rb:694 +#: src/include/network/lan/wireless.rb:775 msgid "Wireless Expert Settings" msgstr "无线专家设置" #. Wireless expert dialog help 1/5 -#: src/include/network/lan/wireless.rb:699 +#: src/include/network/lan/wireless.rb:697 msgid "" "<p>Here, set additional configuration parameters\n" "(rarely needed).</p>" msgstr "<p>在此设置额外配置参数 (极少需要)。</p>" #. Wireless expert dialog help 2/5 -#: src/include/network/lan/wireless.rb:703 +#: src/include/network/lan/wireless.rb:701 msgid "" "<p>To use your wireless LAN card in master or ad-hoc mode,\n" "set the <b>Channel</b> the card should use here. This is not needed\n" @@ -3028,7 +3012,7 @@ "受管模式下无需这样做 -- 该模式下该卡将在各通道间跳跃以搜索访问点。</p>\n" #. Wireless expert dialog help 3/5 -#: src/include/network/lan/wireless.rb:710 +#: src/include/network/lan/wireless.rb:708 msgid "" "<p>In some rare cases, you may want to set a transmission\n" "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>" @@ -3037,14 +3021,14 @@ "默认值为传输得越快越好。</p>" #. Wireless expert dialog help 4/5 -#: src/include/network/lan/wireless.rb:714 +#: src/include/network/lan/wireless.rb:712 msgid "" "<p>In an environment with multiple <b>Access Points</b>, you may want to\n" "define the one to which to connect by entering its MAC address.</p>" msgstr "<p>在有多个<b>访问点</b>的环境中，您可能想要通过输入访问点的 MAC 地址定义要连接的访问点。</p>" #. Wireless expert dialog help 5/5 -#: src/include/network/lan/wireless.rb:718 +#: src/include/network/lan/wireless.rb:716 msgid "" "<p><b>Use Power Management</b> enables power saving mechanisms.\n" "This is generally a good idea, especially if you are a laptop user and may\n" @@ -3053,73 +3037,59 @@ "<p><b>使用电源管理</b>可启用省电机制。\n" "这通常是一个好主意，尤其是当您正在使用便携式计算机且可能未连接交流电源供电时。</p>\n" -#. Wireless expert dialog help 2b/5 -#: src/include/network/lan/wireless.rb:726 -msgid "" -"<p>To specify the <b>Frequency</b> instead of\n" -"the channel, select the desired value.</p>\n" -msgstr "<p>要指定<b>频率</b>而不是通道，请选择期望的值。</p>\n" - -#. Combobox label -#: src/include/network/lan/wireless.rb:734 -msgid "&Frequency" -msgstr "频率(&F)" - #. Combobox item #. Combobox item -#. Combobox item -#: src/include/network/lan/wireless.rb:737 -#: src/include/network/lan/wireless.rb:768 -#: src/include/network/lan/wireless.rb:790 +#: src/include/network/lan/wireless.rb:744 +#: src/include/network/lan/wireless.rb:766 msgid "Automatic" msgstr "自动" #. Combobox label -#: src/include/network/lan/wireless.rb:805 +#: src/include/network/lan/wireless.rb:781 msgid "&Channel" msgstr "通道(&C)" #. Combobox label -#: src/include/network/lan/wireless.rb:808 +#: src/include/network/lan/wireless.rb:784 msgid "B&it Rate" msgstr "比特率(&I)" #. Text entry label -#: src/include/network/lan/wireless.rb:814 +#: src/include/network/lan/wireless.rb:790 msgid "&Access Point" msgstr "访问点(&A)" #. CheckBox label -#: src/include/network/lan/wireless.rb:822 +#: src/include/network/lan/wireless.rb:798 msgid "Use &Power Management" msgstr "使用电源管理(&P)" -#: src/include/network/lan/wireless.rb:831 +#: src/include/network/lan/wireless.rb:807 msgid "AP ScanMode" msgstr "访问点扫描模式" #. Translators: popup dialog heading -#: src/include/network/lan/wireless.rb:921 +#: src/include/network/lan/wireless.rb:897 msgid "Enter Encryption Key" msgstr "输入加密密钥" #. Translators: text entry label -#: src/include/network/lan/wireless.rb:925 +#: src/include/network/lan/wireless.rb:901 msgid "&Key" msgstr "密钥(&K)" #. Translators: popup title -#: src/include/network/lan/wireless.rb:949 +#: src/include/network/lan/wireless.rb:925 msgid "Help" msgstr "帮助" #. Wireless keys dialog caption -#: src/include/network/lan/wireless.rb:998 +#: src/include/network/lan/wireless.rb:974 msgid "Wireless Keys" msgstr "无线密钥" #. Wireless keys dialog help 1/3 -#: src/include/network/lan/wireless.rb:1001 +#: src/include/network/lan/wireless.rb:977 msgid "" "<p>In this dialog, define your WEP keys used\n" "to encrypt your data before it is transmitted. You can have up to four keys,\n" @@ -3132,7 +3102,7 @@ "其它密钥可用于解密数据。通常，您只需要一个密钥。</p>" #. Wireless keys dialog help 2/3 -#: src/include/network/lan/wireless.rb:1009 +#: src/include/network/lan/wireless.rb:985 msgid "" "<p><b>Key Length</b> defines the bit length of your WEP keys.\n" "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" @@ -3146,97 +3116,97 @@ "无法建立无线局域网连接，您或许需要将此值设为 64。</p>" #. Frame label -#: src/include/network/lan/wireless.rb:1034 +#: src/include/network/lan/wireless.rb:1010 msgid "WEP Keys" msgstr "WEP 密钥" #. ComboBox label -#: src/include/network/lan/wireless.rb:1040 +#: src/include/network/lan/wireless.rb:1016 msgid "&Key Length" msgstr "密钥长度(&K)" #. Table header label #. Abbreviation of Number -#: src/include/network/lan/wireless.rb:1048 +#: src/include/network/lan/wireless.rb:1024 msgid "No." msgstr "编号" #. Table header label -#: src/include/network/lan/wireless.rb:1050 +#: src/include/network/lan/wireless.rb:1026 msgid "Key" msgstr "密钥" #. Table header label -#: src/include/network/lan/wireless.rb:1052 +#: src/include/network/lan/wireless.rb:1028 msgid "Default" msgstr "默认" #. PushButton label -#: src/include/network/lan/wireless.rb:1062 +#: src/include/network/lan/wireless.rb:1038 msgid "&Set as Default" msgstr "设为默认(&S)" #. file browser dialog headline -#: src/include/network/lan/wireless.rb:1234 +#: src/include/network/lan/wireless.rb:1210 msgid "Choose a Certificate" msgstr "选择证书" #. validated in ValidateWpaEap -#: src/include/network/lan/wireless.rb:1281 +#: src/include/network/lan/wireless.rb:1255 msgid "" "Not using a Certificate Authority (CA) certificate can result in connections\n" "to insecure, rogue wireless networks. Continue without CA ?" msgstr "不使用数字证书认证机构 (CA) 证书可能导致连接到不安全、流氓的无线网络。不使用 CA 继续吗？" #. error popup text -#: src/include/network/lan/wireless.rb:1310 +#: src/include/network/lan/wireless.rb:1283 msgid "" "Enter either the identity and password\n" "or the client certificate." msgstr "请输入身份和密码或客户证书。" #. dialog caption -#: src/include/network/lan/wireless.rb:1357 +#: src/include/network/lan/wireless.rb:1329 msgid "WPA-EAP" msgstr "WPA-EAP" #. combo box item, any of EAP authentication methods -#: src/include/network/lan/wireless.rb:1380 +#: src/include/network/lan/wireless.rb:1351 msgid "Any" msgstr "任意" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1384 +#: src/include/network/lan/wireless.rb:1355 msgid "MD5" msgstr "MD5" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1386 +#: src/include/network/lan/wireless.rb:1357 msgid "GTC" msgstr "GTC" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1388 +#: src/include/network/lan/wireless.rb:1359 msgid "CHAP" msgstr "CHAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1390 +#: src/include/network/lan/wireless.rb:1361 msgid "PAP" msgstr "PAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1392 +#: src/include/network/lan/wireless.rb:1363 msgid "MSCHAPv1" msgstr "MSCHAPv1" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1396 +#: src/include/network/lan/wireless.rb:1367 msgid "MSCHAPv2" msgstr "MSCHAPv2" #. dialog caption -#: src/include/network/lan/wireless.rb:1420 +#: src/include/network/lan/wireless.rb:1390 msgid "WPA-EAP Details" msgstr "WPA-EAP 细节" @@ -3282,12 +3252,12 @@ msgstr "远程管理设置" #. Popup text -#: src/include/network/routines.rb:155 +#: src/include/network/routines.rb:144 msgid "These packages need to be installed:" msgstr "需要安装这些软件包：" #. Popup text -#: src/include/network/routines.rb:173 +#: src/include/network/routines.rb:162 msgid "" "The required packages are not installed.\n" "The configuration will be aborted.\n" @@ -3299,75 +3269,68 @@ "\n" "重试吗？\n" -#. Translators: Appended after a network card name to indicate that -#. there is no carrier, no link to the network, the cable is not -#. plugged in. Preferably a short string. -#: src/include/network/routines.rb:265 -msgid "unplugged" -msgstr "拔出" - #. Table field (Unknown device) -#: src/include/network/routines.rb:271 +#: src/include/network/routines.rb:255 msgid "Unknown" msgstr "未知" #. Popup headline -#: src/include/network/routines.rb:299 +#: src/include/network/routines.rb:279 msgid "Configuration Successfully Saved" msgstr "已成功保存配置" #. Popup headline -#: src/include/network/routines.rb:304 +#: src/include/network/routines.rb:284 msgid "DNS Configuration Successfully Saved" msgstr "已成功保存 DNS 配置" #. Popup headline -#: src/include/network/routines.rb:306 +#: src/include/network/routines.rb:286 msgid "DSL Configuration Successfully Saved" msgstr "已成功保存 DSL 配置" #. Popup headline -#: src/include/network/routines.rb:308 +#: src/include/network/routines.rb:288 msgid "Hosts Configuration Successfully Saved" msgstr "已成功保存主机配置" #. Popup headline -#: src/include/network/routines.rb:312 +#: src/include/network/routines.rb:292 msgid "ISDN Configuration Successfully Saved" msgstr "已成功保存 ISDN 配置" #. Popup headline -#: src/include/network/routines.rb:316 +#: src/include/network/routines.rb:296 msgid "Network Card Configuration Successfully Saved" msgstr "已成功保存网卡配置" #. Popup headline -#: src/include/network/routines.rb:320 +#: src/include/network/routines.rb:300 msgid "Modem Configuration Successfully Saved" msgstr "已成功保存调制解调器配置" #. Popup headline -#: src/include/network/routines.rb:324 +#: src/include/network/routines.rb:304 msgid "Proxy Configuration Successfully Saved" msgstr "已成功保存代理配置" #. Popup headline -#: src/include/network/routines.rb:328 +#: src/include/network/routines.rb:308 msgid "Provider Configuration Successfully Saved" msgstr "已成功保存服务提供商配置" #. Popup headline -#: src/include/network/routines.rb:332 +#: src/include/network/routines.rb:312 msgid "Routing Configuration Successfully Saved" msgstr "已成功保存路由配置" #. Popup text -#: src/include/network/routines.rb:341 +#: src/include/network/routines.rb:321 msgid "Configure mail now?" msgstr "现在配置邮件吗？" #. Popup text -#: src/include/network/routines.rb:346 +#: src/include/network/routines.rb:326 msgid "Run configuration of %1?" msgstr "运行 %1 的配置吗？" @@ -3377,7 +3340,7 @@ #. if listed any items, disable them, if show_popup, show warning popup #. #. returns true if items were disabled -#: src/include/network/routines.rb:1019 +#: src/include/network/routines.rb:1004 msgid "" "Network is currently handled by NetworkManager\n" "or completely disabled. YaST is unable to configure some options." @@ -3386,115 +3349,115 @@ "YaST 无法配置某些选项。" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1078 +#: src/include/network/routines.rb:1064 msgid "Network Cards" msgstr "网卡" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1082 +#: src/include/network/routines.rb:1068 msgid "Modems" msgstr "调制解调器" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1086 +#: src/include/network/routines.rb:1072 msgid "ISDN Cards" msgstr "ISDN 卡" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1090 +#: src/include/network/routines.rb:1076 msgid "DSL Devices" msgstr "DSL 设备" -#: src/include/network/routines.rb:1095 +#: src/include/network/routines.rb:1081 msgid "All Network Devices" msgstr "全部网络设备" #. validation error popup #. Popup::Error text -#: src/include/network/services/dns.rb:93 -#: src/include/network/services/host.rb:413 +#: src/include/network/services/dns.rb:92 +#: src/include/network/services/host.rb:398 msgid "The hostname is invalid." msgstr "主机名无效。" #. textentry label -#: src/include/network/services/dns.rb:112 +#: src/include/network/services/dns.rb:111 msgid "&Domain Name" msgstr "域名(&D)" #. validation error popup -#: src/include/network/services/dns.rb:128 +#: src/include/network/services/dns.rb:127 msgid "The domain name is invalid." msgstr "域名无效。" -#: src/include/network/services/dns.rb:135 +#: src/include/network/services/dns.rb:134 msgid "&Change Hostname via DHCP" msgstr "通过 DHCP 修改主机名(&C)" #. checkbox label -#: src/include/network/services/dns.rb:145 +#: src/include/network/services/dns.rb:144 msgid "&Assign Hostname to Loopback IP" msgstr "指定主机名到回路 IP(&A)" #. help -#: src/include/network/services/dns.rb:152 +#: src/include/network/services/dns.rb:151 msgid "&Modify DNS Configuration" msgstr "修改 DNS 配置(&M)" -#: src/include/network/services/dns.rb:155 +#: src/include/network/services/dns.rb:154 msgid "Only Manually" msgstr "仅手动" -#: src/include/network/services/dns.rb:156 +#: src/include/network/services/dns.rb:155 msgid "Use Default Policy" msgstr "使用默认策略" -#: src/include/network/services/dns.rb:157 +#: src/include/network/services/dns.rb:156 msgid "Use Custom Policy" msgstr "使用自定义策略" -#: src/include/network/services/dns.rb:168 +#: src/include/network/services/dns.rb:167 msgid "&Custom Policy Rule" msgstr "自定义策略规则(&C)" #. textentry label -#: src/include/network/services/dns.rb:178 +#: src/include/network/services/dns.rb:177 msgid "Name Server &1" msgstr "名称服务器 &1" #. validation error popup -#: src/include/network/services/dns.rb:194 +#: src/include/network/services/dns.rb:193 msgid "The IP address of the name server is invalid." msgstr "名称服务器的 IP 地址无效。" #. textentry label -#: src/include/network/services/dns.rb:202 +#: src/include/network/services/dns.rb:201 msgid "Do&main Search" msgstr "域搜索(&M)" #. text entry label -#: src/include/network/services/dns.rb:229 +#: src/include/network/services/dns.rb:228 msgid "Name Server &2" msgstr "名称服务器 &2" #. text entry label -#: src/include/network/services/dns.rb:231 +#: src/include/network/services/dns.rb:230 msgid "Name Server &3" msgstr "名称服务器 &3" #. Frame label #. dialog caption -#: src/include/network/services/dns.rb:235 -#: src/include/network/services/dns.rb:694 -#: src/include/network/services/dns.rb:708 +#: src/include/network/services/dns.rb:234 +#: src/include/network/services/dns.rb:684 +#: src/include/network/services/dns.rb:697 msgid "Hostname and Domain Name" msgstr "主机名和域名" #. Frame label -#: src/include/network/services/dns.rb:252 +#: src/include/network/services/dns.rb:251 msgid "Name Servers and Domain Search List" msgstr "名称服务器和域搜索列表" -#: src/include/network/services/dns.rb:269 +#: src/include/network/services/dns.rb:268 msgid "Hostname/DNS" msgstr "主机名/DNS" @@ -3503,7 +3466,7 @@ #. @param [String] key the widget receiving the event #. @param event the event being handled #. @return nil so that the dialog loops on -#: src/include/network/services/dns.rb:445 +#: src/include/network/services/dns.rb:442 msgid "No interface with dhcp" msgstr "没有使用 dhcp 的接口" @@ -3511,28 +3474,28 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/services/dns.rb:502 +#: src/include/network/services/dns.rb:496 msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?" msgstr "由于多播 DNS 的原因，不推荐使用 .local 作为域名。风险自担吗？" #. Popup::Error text -#: src/include/network/services/dns.rb:527 +#: src/include/network/services/dns.rb:520 msgid "The search list can have at most %1 domains." msgstr "搜索列表最多可有 %1 个域。" #. Popup::Error text -#: src/include/network/services/dns.rb:533 +#: src/include/network/services/dns.rb:526 msgid "The search list can have at most %1 characters." msgstr "搜索列表最多可有 %1 个字符。" #. Popup::Error text -#: src/include/network/services/dns.rb:542 +#: src/include/network/services/dns.rb:535 msgid "The search domain '%1' is invalid." msgstr "搜索域 '%1' 无效。" #. Standalone dialog only - embedded one is handled separately #. via CWMTab -#: src/include/network/services/dns.rb:737 +#: src/include/network/services/dns.rb:725 msgid "Hostname and Name Server Configuration" msgstr "主机名和名称服务器配置" @@ -3579,12 +3542,12 @@ msgstr "主机别名" #. TextEntry label -#: src/include/network/services/host.rb:366 +#: src/include/network/services/host.rb:351 msgid "Hos&t Aliases" msgstr "主机别名(&T)" #. Popup::Error text -#: src/include/network/services/host.rb:429 +#: src/include/network/services/host.rb:414 msgid "Alias name \"%1\" is invalid." msgstr "别名 \"%1\" 无效。" @@ -3653,7 +3616,7 @@ #. #178538 - disable routing dialog when NetworkManager is used #. but instead of default route (#299448) - NM reads it -#: src/include/network/services/routing.rb:420 +#: src/include/network/services/routing.rb:414 msgid "The default gateway is invalid." msgstr "默认网关无效。" @@ -3678,12 +3641,12 @@ msgstr "删除(&T)" #. TextEntry label -#: src/include/network/widgets.rb:55 +#: src/include/network/widgets.rb:54 msgid "&Dial Prefix Regular Expression" msgstr "拨号前缀正则表达式(&D)" #. dial prefix regex help -#: src/include/network/widgets.rb:58 +#: src/include/network/widgets.rb:57 msgid "" "<p>When <b>Dial Prefix Regular Expression</b> is set, users can\n" "change the dial prefix in KInternet provided that it matches the expression.\n" @@ -3697,55 +3660,55 @@ "若该表达式为空，则不允许用户修改拨号前缀。</p>\n" #. radio button group label,method of setup -#: src/include/network/widgets.rb:70 +#: src/include/network/widgets.rb:69 msgid "Setup Method" msgstr "设置方法" #. radio button label -#: src/include/network/widgets.rb:76 +#: src/include/network/widgets.rb:75 msgid "A&utomatic Address Setup (via DHCP)" msgstr "自动地址设置 (通过 DHCP)(&U)" #. radio button label -#: src/include/network/widgets.rb:78 +#: src/include/network/widgets.rb:77 msgid "S&tatic Address Setup" msgstr "静态地址设置(&T)" -#: src/include/network/widgets.rb:81 +#: src/include/network/widgets.rb:80 msgid "<p>H</p>" msgstr "<p>H</p>" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:96 +#: src/include/network/widgets.rb:95 msgid "At Boot Time" msgstr "在引导时" #. is a part of the static help text -#: src/include/network/widgets.rb:103 +#: src/include/network/widgets.rb:102 msgid "Never" msgstr "从不" #. Combo box option for Device Activation #. DO NOT TRANSLATE NetworkManager, it is a program name -#: src/include/network/widgets.rb:107 +#: src/include/network/widgets.rb:106 msgid "By NetworkManager" msgstr "由 NetworkManager" #. help text for Device Activation #. DO NOT TRANSLATE NetworkManager, it is a program name -#: src/include/network/widgets.rb:112 +#: src/include/network/widgets.rb:111 msgid "" "<b>By NetworkManager</b>: a desktop applet\n" "controls the interface. There is no need to set it up in YaST." msgstr "<b>由 NetworkManager</b>：由一个桌面小程序来控制接口。无需在 YaST 中设置它。" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:118 +#: src/include/network/widgets.rb:117 msgid "Manually" msgstr "手动" #. help text for Device Activation -#: src/include/network/widgets.rb:120 +#: src/include/network/widgets.rb:119 msgid "" "<p><b>Manually</b>: You control the interface manually\n" "via 'ifup' or 'qinternet' (see 'User Controlled' below).</p>\n" @@ -3754,12 +3717,12 @@ "(参考下面的 '用户控制的')。</p>\n" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:126 +#: src/include/network/widgets.rb:125 msgid "On Cable Connection" msgstr "在网线连接时" #. help text for Device Activation -#: src/include/network/widgets.rb:130 +#: src/include/network/widgets.rb:129 msgid "" "<b>On Cable Connection</b>:\n" "The interface is watched for whether there is a physical\n" @@ -3771,12 +3734,12 @@ "物理意味着要么连接了网线，要么无线接口可连接到一个访问点。\n" #. Combo box option for Device Activation -#: src/include/network/widgets.rb:139 +#: src/include/network/widgets.rb:138 msgid "On Hotplug" msgstr "在热插拔时" #. help text for Device Activation -#: src/include/network/widgets.rb:141 +#: src/include/network/widgets.rb:140 msgid "" "With <b>On Hotplug</b>,\n" "the interface is set up as soon as it is available. This is\n" @@ -3787,13 +3750,12 @@ "这几乎与 '在引导时' 相同，但若接口不存在，该选项不会导致引导时出错。\n" #. Combo box option for Device Activation -#. Combo box option for Device Activation -#: src/include/network/widgets.rb:150 src/include/network/widgets.rb:160 +#: src/include/network/widgets.rb:149 msgid "On NFSroot" msgstr "在 NFSroot 时" #. help text for Device Activation -#: src/include/network/widgets.rb:152 +#: src/include/network/widgets.rb:151 msgid "" "Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this startmode will never\n" "be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still available.\n" @@ -3804,26 +3766,14 @@ "<tt>ifdown <iface></tt> 仍然有效。\n" "若您有 NFS 或 iSCSI 根文件系统请使用此启动模式。\n" -#. help text for Device Activation -#: src/include/network/widgets.rb:162 -msgid "" -"Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" -"be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" -"Use this when you have a nfs or iscsi root filesystem.\n" -msgstr "" -"使用<b>在 NFSroot 时</b>与使用 '自动' 相似。\n" -"但使用此启动模式的接口将永远不能通过 'rcnetwork stop' 关闭。\n" -"'ifdown <iface>' 仍然有效。\n" -"当您有 nfs 或 iscsi 根文件系统时请使用此启动模式。\n" - #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/widgets.rb:195 +#: src/include/network/widgets.rb:184 msgid "Activate &Device" msgstr "激活设备(&D)" #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/widgets.rb:201 +#: src/include/network/widgets.rb:190 msgid "" "<p><b><big>Device Activation</big></b></p> \n" "<p>Choose when to bring up the network interface. <b>At Boot Time</b> activates it during system boot, \n" @@ -3836,69 +3786,69 @@ "<b>从不</b>将不启动设备。\n" "%1</p>\n" -#: src/include/network/widgets.rb:247 +#: src/include/network/widgets.rb:235 msgid "IPoIB Device Mode" msgstr "IPoIB 设备模式" -#: src/include/network/widgets.rb:258 +#: src/include/network/widgets.rb:246 msgid "Firewall is not installed." msgstr "防火墙尚未安装。" #. translators: MTU value description (size in bytes, desc) -#: src/include/network/widgets.rb:266 +#: src/include/network/widgets.rb:253 msgid "1500 (Ethernet, DSL broadband)" msgstr "1500 (以太网，DSL 宽带)" -#: src/include/network/widgets.rb:267 +#: src/include/network/widgets.rb:254 msgid "1492 (PPPoE broadband)" msgstr "1492 (PPPoE 宽带)" -#: src/include/network/widgets.rb:268 +#: src/include/network/widgets.rb:255 msgid "576 (dial-up)" msgstr "576 (拨号)" #. translators: MTU value description (size in bytes, desc) -#: src/include/network/widgets.rb:275 +#: src/include/network/widgets.rb:262 msgid "65520 (IPoIB in connected mode)" msgstr "65520 (连接模式下的 IPoIB)" -#: src/include/network/widgets.rb:276 +#: src/include/network/widgets.rb:263 msgid "2044 (IPoIB in datagram mode)" msgstr "2044 (数据报模式下的 IPoIB)" #. textentry label, Maximum Transfer Unit -#: src/include/network/widgets.rb:284 +#: src/include/network/widgets.rb:271 msgid "Set &MTU" msgstr "设置 &MTU" #. the user can control the network with the NetworkManager program -#: src/include/network/widgets.rb:300 +#: src/include/network/widgets.rb:287 msgid "NetworkManager Service" msgstr "NetworkManager 服务" #. ifup is a program name -#: src/include/network/widgets.rb:308 +#: src/include/network/widgets.rb:295 msgid "Traditional ifup" msgstr "传统的 ifup 方法" #. wicked is network configuration backend like netconfig -#: src/include/network/widgets.rb:316 +#: src/include/network/widgets.rb:303 msgid "Wicked Service" msgstr "怪兽 (Wicked) 服务" #. used when no network service is active or to disable network service -#: src/include/network/widgets.rb:324 +#: src/include/network/widgets.rb:311 msgid "Network Services Disabled" msgstr "禁用的网络服务" #. Store the NetworkManager widget #. @param [String] key id of the widget #. @param [Hash] event the event being handled -#: src/include/network/widgets.rb:355 +#: src/include/network/widgets.rb:342 msgid "Applet needed" msgstr "需要挂件" -#: src/include/network/widgets.rb:356 +#: src/include/network/widgets.rb:343 msgid "" "NetworkManager is controlled by desktop applet\n" "(KDE plasma widget and nm-applet for GNOME).\n" @@ -3907,35 +3857,35 @@ "NetworkManager 由桌面小挂件 (KDE 是 Plasma 挂件，GNOME 是 nm-applet) 控制。\n" "请确保该挂件正在运行，若未运行请手动启动之。" -#: src/include/network/widgets.rb:371 +#: src/include/network/widgets.rb:358 msgid "General Network Settings" msgstr "常规网络设置" -#: src/include/network/widgets.rb:417 +#: src/include/network/widgets.rb:402 msgid "IPv6 Protocol Settings" msgstr "IPn6 协议设置" #. enable ipv6 support -#: src/include/network/widgets.rb:418 src/modules/Lan.rb:820 +#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810 msgid "Enable IPv6" msgstr "启用 IPv6" #. TRANSLATORS: Informs that device name is not known -#: src/include/network/widgets.rb:435 +#: src/include/network/widgets.rb:420 msgid "Unknown device" msgstr "未知设备" #. TRANSLATORS: Part of label, device with IP address assigned by DHCP -#: src/include/network/widgets.rb:447 +#: src/include/network/widgets.rb:429 msgid "DHCP address" msgstr "DHCP 地址" #. TRANSLATORS: Informs that no IP has been assigned to the device -#: src/include/network/widgets.rb:452 +#: src/include/network/widgets.rb:436 msgid "No IP address assigned" msgstr "未指派 IP 地址" -#: src/include/network/widgets.rb:455 +#: src/include/network/widgets.rb:439 msgid "" "%1 \n" "%2 - %3" @@ -3944,115 +3894,126 @@ "%2 - %3" #. #186102 -#: src/include/network/widgets.rb:510 +#: src/include/network/widgets.rb:492 msgid "&Change Device" msgstr "修改设备(&C)" #. popup dialog title -#: src/include/network/widgets.rb:544 +#: src/include/network/widgets.rb:525 msgid "Network Device Select" msgstr "网络设备选择" +#. this conditions origin from bridge configuration +#. if enslaving a configured device then its configuration is rewritten +#. to "0.0.0.0/32" +#. +#. translators: a note that listed device is already configured +#: src/include/network/widgets.rb:571 +#, fuzzy +#| msgid "Unconfigured" +msgid "configured" +msgstr "未配置" + #. Shows a confirmation timed dialogue #. #. Returns :ok when user agreed, :cancel otherwise -#: src/lib/network/confirm_virt_proposal.rb:25 +#: src/lib/network/confirm_virt_proposal.rb:23 msgid "Confirm Network Restart" msgstr "确认重启网络" -#: src/lib/network/confirm_virt_proposal.rb:26 +#: src/lib/network/confirm_virt_proposal.rb:24 msgid "Because of the bridged network, YaST2 needs to restart the network to apply the settings." msgstr "由于是桥接网络，YaST2 需要重启网络以应用设置。" #. Opens dialog for editing NIC name -#: src/lib/network/edit_nic_name.rb:97 +#: src/lib/network/edit_nic_name.rb:93 msgid "Device Name:" msgstr "设备名称：" -#: src/lib/network/edit_nic_name.rb:103 +#: src/lib/network/edit_nic_name.rb:99 msgid "Base Udev Rule On" msgstr "将 udev 规则基于" #. make sure there is enough space (#367239) -#: src/lib/network/edit_nic_name.rb:112 +#: src/lib/network/edit_nic_name.rb:108 msgid "MAC address: %s" msgstr "MAC 地址：%s" -#: src/lib/network/edit_nic_name.rb:118 +#: src/lib/network/edit_nic_name.rb:114 msgid "BusID: %s" msgstr "BusID：%s" #. check if the name is assigned to another device already -#: src/lib/network/edit_nic_name.rb:155 +#: src/lib/network/edit_nic_name.rb:151 msgid "Configuration name already exists." msgstr "配置名称已存在。" -#: src/lib/network/edit_nic_name.rb:159 +#: src/lib/network/edit_nic_name.rb:155 msgid "Invalid configuration name." msgstr "无效配置文件名称。" #. Progress stage 1 -#: src/modules/DNS.rb:390 +#: src/modules/DNS.rb:377 msgid "Write hostname" msgstr "写入主机名" #. Progress stage 2 #. Progress stage 10 -#: src/modules/DNS.rb:392 src/modules/Lan.rb:535 +#: src/modules/DNS.rb:379 src/modules/Lan.rb:534 msgid "Update configuration" msgstr "更新配置" #. Progress stage 3 -#: src/modules/DNS.rb:394 +#: src/modules/DNS.rb:381 msgid "Update /etc/resolv.conf" msgstr "更新 /etc/resolv.conf" #. Write dialog caption -#: src/modules/DNS.rb:398 +#: src/modules/DNS.rb:385 msgid "Saving Hostname and DNS Configuration" msgstr "正在保存主机名和 DNS 配置..." #. Allow to set hostname even if it's modified by DHCP (#13427) #. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) { #. Progress step 1/3 -#: src/modules/DNS.rb:407 +#: src/modules/DNS.rb:394 msgid "Writing hostname..." msgstr "正在写入主机名..." #. Progress step 2/3 #. Progress step 10 -#: src/modules/DNS.rb:424 src/modules/Lan.rb:630 +#: src/modules/DNS.rb:411 src/modules/Lan.rb:622 msgid "Updating configuration..." msgstr "正在更新配置..." #. if(SCR::Read(.target.size, resolv_conf) < 0) #. SCR::Write(.target.string, resolv_conf, ""); #. Progress step 3/3 -#: src/modules/DNS.rb:435 +#: src/modules/DNS.rb:421 msgid "Updating /etc/resolv.conf ..." msgstr "正在更新 /etc/resolv.conf ..." #. Summary text -#: src/modules/DNS.rb:552 +#: src/modules/DNS.rb:538 msgid "Hostname: Set by DHCP" msgstr "主机名：由 DHCP 设置" #. Summary text -#: src/modules/DNS.rb:558 +#: src/modules/DNS.rb:544 msgid "Hostname: %1" msgstr "主机名：%1" -#: src/modules/DNS.rb:566 +#: src/modules/DNS.rb:552 msgid "Hostname will not be written to /etc/hosts" msgstr "主机名将不会写入 /etc/hosts" #. Summary text -#: src/modules/DNS.rb:588 +#: src/modules/DNS.rb:573 msgid "Name Servers: %1" msgstr "名称服务器：%1" #. Summary text -#: src/modules/DNS.rb:598 +#: src/modules/DNS.rb:583 msgid "Search List: %1" msgstr "搜索列表：%1" @@ -4186,7 +4147,7 @@ #. Final progress step #. Final progress step -#: src/modules/Lan.rb:412 src/modules/Lan.rb:651 +#: src/modules/Lan.rb:412 src/modules/Lan.rb:643 msgid "Finished" msgstr "已完成" @@ -4197,241 +4158,240 @@ msgstr "要应用此改动，需要重启。" #. Write dialog caption -#: src/modules/Lan.rb:507 +#: src/modules/Lan.rb:506 msgid "Saving Network Configuration" msgstr "正在保存网络配置" #. Progress stage 2 -#: src/modules/Lan.rb:514 +#: src/modules/Lan.rb:513 msgid "Write drivers information" msgstr "写入驱动信息" #. Progress stage 3 - multiple devices may be present,really plural -#: src/modules/Lan.rb:516 +#: src/modules/Lan.rb:515 msgid "Write device configuration" msgstr "写入设备配置" #. Progress stage 4 -#: src/modules/Lan.rb:518 +#: src/modules/Lan.rb:517 msgid "Write network configuration" msgstr "写入网络配置" #. Progress stage 5 -#: src/modules/Lan.rb:520 +#: src/modules/Lan.rb:519 msgid "Write routing configuration" msgstr "写入路由配置" #. Progress stage 6 -#: src/modules/Lan.rb:522 +#: src/modules/Lan.rb:521 msgid "Write hostname and DNS configuration" msgstr "写入主机名和 DNS 配置" #. Progress stage 7 -#: src/modules/Lan.rb:524 +#: src/modules/Lan.rb:523 msgid "Set up network services" msgstr "设置网络服务" #. Progress stage 8 #. Progress stage 1 -#: src/modules/Lan.rb:528 src/modules/Remote.rb:293 +#: src/modules/Lan.rb:527 src/modules/Remote.rb:293 msgid "Write firewall settings" msgstr "写入防火墙设置" #. Progress stage 9 -#: src/modules/Lan.rb:532 +#: src/modules/Lan.rb:531 msgid "Activate network services" msgstr "激活网络服务" #. Progress step 2 -#: src/modules/Lan.rb:549 +#: src/modules/Lan.rb:547 msgid "Writing /etc/modprobe.conf..." msgstr "正在写入 /etc/modprobe.conf..." #. Progress step 3 - multiple devices may be present, really plural -#: src/modules/Lan.rb:554 +#: src/modules/Lan.rb:552 msgid "Writing device configuration..." msgstr "正在写入设备配置..." #. Progress step 4 -#: src/modules/Lan.rb:560 +#: src/modules/Lan.rb:558 msgid "Writing network configuration..." msgstr "正在写入网络配置..." #. Progress step 5 -#: src/modules/Lan.rb:566 +#: src/modules/Lan.rb:564 msgid "Writing routing configuration..." msgstr "正在写入路由配置..." #. Progress step 6 -#: src/modules/Lan.rb:574 +#: src/modules/Lan.rb:572 msgid "Writing hostname and DNS configuration..." msgstr "正在写入主机名和 DNS 配置..." #. Progress step 7 -#: src/modules/Lan.rb:587 +#: src/modules/Lan.rb:585 msgid "Setting up network services..." msgstr "正在设置网络服务..." #. Progress step 8 -#: src/modules/Lan.rb:595 src/modules/Remote.rb:307 +#: src/modules/Lan.rb:593 src/modules/Remote.rb:307 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. Progress step 9 -#: src/modules/Lan.rb:605 +#: src/modules/Lan.rb:603 msgid "Activating network services..." msgstr "正在激活网络服务..." -#: src/modules/Lan.rb:647 +#: src/modules/Lan.rb:639 msgid "No network running" msgstr "无网络运行" #. Import data #. @param [Hash] settings settings to be imported #. @return true on success -#: src/modules/Lan.rb:706 +#: src/modules/Lan.rb:698 msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used." msgstr "AutoYaST 设置网络/受管：NetworkManager 不可用，将使用 Wicked。" #. Create a textual summary for the general network settings #. proposal (NetworkManager + ipv6) #. @return [rich text, links] -#: src/modules/Lan.rb:792 +#: src/modules/Lan.rb:782 msgid "Network Mode" msgstr "网络模式" #. network mode: the interfaces are controlled by the user -#: src/modules/Lan.rb:797 +#: src/modules/Lan.rb:787 msgid "Interfaces controlled by NetworkManager" msgstr "由 NetworkManager 控制的接口" #. disable NetworkManager applet -#: src/modules/Lan.rb:799 +#: src/modules/Lan.rb:789 msgid "Disable NetworkManager" msgstr "禁用 NetworkManager" #. network mode -#: src/modules/Lan.rb:803 +#: src/modules/Lan.rb:793 msgid "Traditional network setup with NetControl - ifup" msgstr "使用 NetControl 的传统网络设置 - ifup" #. enable NetworkManager applet #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager -#: src/modules/Lan.rb:806 +#: src/modules/Lan.rb:796 msgid "Enable NetworkManager" msgstr "启用 NetworkManager" #. ipv6 support is enabled -#: src/modules/Lan.rb:812 +#: src/modules/Lan.rb:802 msgid "Support for IPv6 protocol is enabled" msgstr "已启用 IPv6 协议支持" #. disable ipv6 support -#: src/modules/Lan.rb:814 +#: src/modules/Lan.rb:804 msgid "Disable IPv6" msgstr "禁用 IPv6" #. ipv6 support is disabled -#: src/modules/Lan.rb:818 +#: src/modules/Lan.rb:808 msgid "Support for IPv6 protocol is disabled" msgstr "禁用了对 IPv6 协议的支持" #. translators: a possible value for: IPoIB device mode -#: src/modules/LanItems.rb:194 +#: src/modules/LanItems.rb:193 msgid "connected" msgstr "已连接" -#: src/modules/LanItems.rb:195 +#: src/modules/LanItems.rb:194 msgid "datagram" msgstr "数据报" #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1246 src/modules/LanItems.rb:1250 -#: src/modules/LanItems.rb:1254 +#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264 +#: src/modules/LanItems.rb:1268 msgid "Started automatically at boot" msgstr "引导时自动启动" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1258 +#: src/modules/LanItems.rb:1272 msgid "Started automatically on cable connection" msgstr "连接网线时自动启动" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1262 +#: src/modules/LanItems.rb:1276 msgid "Managed by NetworkManager" msgstr "由 NetworkManager 管理" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1266 +#: src/modules/LanItems.rb:1280 msgid "Will not be started at all" msgstr "根本不会启动" -#: src/modules/LanItems.rb:1271 +#: src/modules/LanItems.rb:1286 msgid "Started manually" msgstr "手动启动" #. do nothing -#: src/modules/LanItems.rb:1283 +#: src/modules/LanItems.rb:1298 msgid "IP address assigned using" msgstr "IP 地址指派自" -#: src/modules/LanItems.rb:1287 +#: src/modules/LanItems.rb:1302 msgid "IP address: %s/%s" msgstr "IP 地址：%s/%s" -#: src/modules/LanItems.rb:1290 +#: src/modules/LanItems.rb:1305 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 +#. FIXME: side effect: sets @type. No reason for that. It should only build item #. overview. Check and remove. -#: src/modules/LanItems.rb:1321 +#: src/modules/LanItems.rb:1329 msgid "Not configured" msgstr "未配置" #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1344 src/modules/LanItems.rb:1410 +#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411 msgid "Device Name: %s" msgstr "设备名称：%s" -#: src/modules/LanItems.rb:1364 +#: src/modules/LanItems.rb:1372 msgid "Bonding slaves" msgstr "绑定从属" -#: src/modules/LanItems.rb:1378 +#: src/modules/LanItems.rb:1386 msgid "enslaved in %s" msgstr "从属于 %s" -#: src/modules/LanItems.rb:1379 +#: src/modules/LanItems.rb:1387 msgid "Bonding master" msgstr "绑定主体" -#: src/modules/LanItems.rb:1393 +#: src/modules/LanItems.rb:1401 msgid "Not connected" msgstr "未连接" -#: src/modules/LanItems.rb:1396 +#: src/modules/LanItems.rb:1402 msgid "No hwinfo" msgstr "无硬件信息" -#: src/modules/LanItems.rb:1416 +#: src/modules/LanItems.rb:1417 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:1422 +#: src/modules/LanItems.rb:1423 msgid "" "The device is not configured. Press <b>Edit</b>\n" "to configure.\n" msgstr "设备尚未配置。请按<b>编辑</b>配置。\n" -#: src/modules/LanItems.rb:1429 +#: src/modules/LanItems.rb:1430 msgid "Needed firmware" msgstr "所需固件" -#: src/modules/LanItems.rb:1429 +#: src/modules/LanItems.rb:1430 msgid "unknown" msgstr "未知" @@ -4469,12 +4429,12 @@ #. Enable xinetd #. Enable XDM -#: src/modules/Remote.rb:343 src/modules/Remote.rb:351 +#: src/modules/Remote.rb:342 src/modules/Remote.rb:350 msgid "Enabling service %{service} has failed" msgstr "启动服务 %{service} 失败" #. Do this only if package xinetd is installed (#256385) -#: src/modules/Remote.rb:378 +#: src/modules/Remote.rb:377 msgid "" "Your display manager must be restarted.\n" "To take the changes in remote administration into account, \n" @@ -4485,59 +4445,59 @@ "请手动重启显示管理器或重新登录。" #. description in proposal -#: src/modules/Remote.rb:409 +#: src/modules/Remote.rb:408 msgid "Remote administration is enabled." msgstr "已启用远程管理。" -#: src/modules/Remote.rb:409 +#: src/modules/Remote.rb:408 msgid "Remote administration is disabled." msgstr "已禁用远程管理。" #. Progress stage 1 -#: src/modules/Routing.rb:244 +#: src/modules/Routing.rb:261 msgid "Write IP forwarding settings" msgstr "写入 IP 转发设置" #. Progress stage 2 -#: src/modules/Routing.rb:246 +#: src/modules/Routing.rb:263 msgid "Write routing settings" msgstr "写入路由设置" -#: src/modules/Routing.rb:249 +#: src/modules/Routing.rb:266 msgid "Saving Routing Configuration" msgstr "正在保存路由配置" #. Progress stage 1/2 -#: src/modules/Routing.rb:254 +#: src/modules/Routing.rb:271 msgid "Writing IP forwarding settings..." msgstr "正在写入 IP 转发设置..." #. at first stop the running routes -#. FIXME SCR::Execute(.target.bash, "/etc/init.d/route stop"); +#. FIXME: SCR::Execute(.target.bash, "/etc/init.d/route stop"); #. sysconfig does not support restarting routes only, #. so we let our caller do it together with other things #. Progress stage 2/2 -#: src/modules/Routing.rb:264 +#: src/modules/Routing.rb:281 msgid "Writing routing settings..." msgstr "正在写入路由设置..." #. Summary text -#: src/modules/Routing.rb:413 +#: src/modules/Routing.rb:434 msgid "Gateway: %s" msgstr "网关：%s" #. Summary text -#: src/modules/Routing.rb:417 +#: src/modules/Routing.rb:438 msgid "IP Forwarding for IPv4: %s" msgstr "IPv4 转发：%s" #. Summary text -#: src/modules/Routing.rb:421 +#: src/modules/Routing.rb:442 msgid "IP Forwarding for IPv6: %s" msgstr "IPv6 转发：%s" #. item in combo box Firewall Zone -#: src/modules/SuSEFirewall4Network.rb:125 +#: src/modules/SuSEFirewall4Network.rb:124 msgid "Automatically Assigned Zone" msgstr "自动指派的区域" @@ -4551,15 +4511,38 @@ msgid "(Unprotected)" msgstr "(无保护的)" +#~ msgid "Device boot protocol" +#~ msgstr "设备引导协议" + +#~ msgid "Manual Network Card Configuration" +#~ msgstr "手动网卡配置" + +#~ msgid "&Hotplug Type" +#~ msgstr "热插拔类型(&H)" + +#~ msgid "P&CI" +#~ msgstr "P&CI" + #~ msgid "" -#~ "<p><b>NetworkManager</b> is not part of every base\n" -#~ "installation repository. For example, to enable it on SUSE\n" -#~ "Linux Enterprise Server add the Workstation Extension\n" -#~ "repository and install the 'NetworkManager' package.</p>\n" +#~ "<p>To specify the <b>Frequency</b> instead of\n" +#~ "the channel, select the desired value.</p>\n" +#~ msgstr "<p>要指定<b>频率</b>而不是通道，请选择期望的值。</p>\n" + +#~ msgid "&Frequency" +#~ msgstr "频率(&F)" + +#~ msgid "unplugged" +#~ msgstr "拔出" + +#~ msgid "" +#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never\n" +#~ "be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works.\n" +#~ "Use this when you have a nfs or iscsi root filesystem.\n" #~ msgstr "" -#~ "<p>不是每个基础安装源都有 <b>NetworkManager</b> 的。\n" -#~ "例如，要在 SUSE Linux Enterprise Server 上启用 NetworkManager，\n" -#~ "请添加 Workstation Extension 源并安装 'NetworkManager' 软件包。</p>\n" +#~ "使用<b>在 NFSroot 时</b>与使用 '自动' 相似。\n" +#~ "但使用此启动模式的接口将永远不能通过 'rcnetwork stop' 关闭。\n" +#~ "'ifdown <iface>' 仍然有效。\n" +#~ "当您有 nfs 或 iscsi 根文件系统时请使用此启动模式。\n" #~ msgid "" #~ "Network is currently controlled by NetworkManager and its settings \n" Modified: trunk/yast/zh_CN/po/nfs.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/nfs.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/nfs.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: nfs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-04-16 15:10+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -24,55 +24,55 @@ "X-Generator: Lokalize 1.5\n" #. Command line help text for the nfs module -#: src/clients/nfs.rb:42 +#: src/clients/nfs.rb:29 msgid "Configuration of NFS client" msgstr "网络文件系统客户端配置" #. command line action help -#: src/clients/nfs.rb:56 +#: src/clients/nfs.rb:43 msgid "List configured NFS mounts" msgstr "列出已配置的网络文件系统载具" #. command line action help -#: src/clients/nfs.rb:63 +#: src/clients/nfs.rb:50 msgid "Add an NFS mount" msgstr "添加网络文件系统载具" #. command line action help -#: src/clients/nfs.rb:68 +#: src/clients/nfs.rb:55 msgid "Edit an NFS mount" msgstr "编辑网络文件系统载具" #. command line action help -#: src/clients/nfs.rb:73 +#: src/clients/nfs.rb:60 msgid "Delete an NFS mount" msgstr "删除网络文件系统载具" #. host:path #. command line option help #. fstab(5): fs_spec -#: src/clients/nfs.rb:83 +#: src/clients/nfs.rb:70 msgid "Remote file system (in the form 'host:path')" msgstr "远程文件系统 (采用 'host:path' 形式)" #. path #. command line option help #. fstab(5): fs_file -#: src/clients/nfs.rb:92 +#: src/clients/nfs.rb:79 msgid "Local mount point" msgstr "本地挂载点" #. a list? #. command line option help #. fstab(5): fs_mntops -#: src/clients/nfs.rb:102 +#: src/clients/nfs.rb:89 msgid "Mount options" msgstr "挂载选项" #. nfs or nfs4 #. command line option help #. fstab(5): fs_type -#: src/clients/nfs.rb:111 +#: src/clients/nfs.rb:98 msgid "File system ID, supported nfs and nfs4. Default value is nfs." msgstr "文件系统 ID，支持网络文件系统和第四版网络文件系统。默认值是网络文件系统。" @@ -81,49 +81,49 @@ #. @param [Hash] options command options #. @return false so that Write is not called in non-interactive mode #. table header -#: src/clients/nfs.rb:173 src/include/nfs/ui.rb:495 +#: src/clients/nfs.rb:159 src/include/nfs/ui.rb:481 msgid "Server" msgstr "服务器" -#: src/clients/nfs.rb:174 +#: src/clients/nfs.rb:160 msgid "Remote File System" msgstr "远程文件系统" #. table header -#: src/clients/nfs.rb:175 src/include/nfs/ui.rb:498 +#: src/clients/nfs.rb:161 src/include/nfs/ui.rb:484 msgid "Mount Point" msgstr "挂载点" #. table header -#: src/clients/nfs.rb:176 src/include/nfs/ui.rb:502 +#: src/clients/nfs.rb:162 src/include/nfs/ui.rb:488 msgid "Options" msgstr "选项" #. CLI action handler. #. @param [Hash] options command options #. @return whether successful -#: src/clients/nfs.rb:219 src/clients/nfs.rb:250 +#: src/clients/nfs.rb:205 src/clients/nfs.rb:236 msgid "Unknown value for option \"type\"." msgstr "选项 \"type\" 的值未知。" #. error #. error -#: src/clients/nfs.rb:244 src/clients/nfs.rb:348 +#: src/clients/nfs.rb:230 src/clients/nfs.rb:334 msgid "No NFS mount specified." msgstr "未指定任何网络文件系统载具。" #. error message -#: src/clients/nfs.rb:267 +#: src/clients/nfs.rb:253 msgid "No NFS mount matching the criteria found." msgstr "未找到符合条件的网络文件系统载具。" #. error message -#: src/clients/nfs.rb:285 +#: src/clients/nfs.rb:271 msgid "Multiple NFS mounts match the criteria:" msgstr "多个网络文件系统载具符合条件：" #. error popup message -#: src/include/nfs/routines.rb:99 +#: src/include/nfs/routines.rb:83 msgid "" "The hostname entered is invalid. It must be\n" "shorter than 50 characters and only use\n" @@ -138,14 +138,14 @@ "有效的域名：%3" #. error popup message -#: src/include/nfs/routines.rb:132 +#: src/include/nfs/routines.rb:116 msgid "" "fstab already contains an entry\n" "with mount point '%1'." msgstr "fstab 已经包含一个带有挂载点 '%1' 的项。" #. error popup message (spaces are now allowed) -#: src/include/nfs/routines.rb:155 +#: src/include/nfs/routines.rb:139 msgid "" "The path entered is invalid.\n" "It must be shorter than 70 characters\n" @@ -155,14 +155,14 @@ "路径必须短于 70 个字符且必须以斜线 (/) 开头。" #. Help, part 1 of 3 -#: src/include/nfs/ui.rb:57 +#: src/include/nfs/ui.rb:41 msgid "" "<p>The table contains all directories \n" "exported from remote servers and mounted locally via NFS (NFS shares).</p>" msgstr "<p>该表格包含所有从远程服务器导出并通过网络文件系统本地挂载的目录 (网络文件系统共享盘)。</p>" #. Help, part 2 of 3 -#: src/include/nfs/ui.rb:61 +#: src/include/nfs/ui.rb:46 msgid "" "<p>Each NFS share is identified by remote NFS server address and\n" "exported directory, local directory where the remote directory is mounted, \n" @@ -173,14 +173,14 @@ "关于挂载网络文件系统和挂载选项的进一步信息，请参考 <tt>man nfs</tt>。</p>" #. Help, part 3 of 3 -#: src/include/nfs/ui.rb:68 +#: src/include/nfs/ui.rb:53 msgid "" "<p>To mount a new NFS share, click <B>Add</B>. To change the configuration of\n" "a currently mounted share, click <B>Edit</B>. Remove and unmount a selected\n" "share with <B>Delete</B>.</p>\n" msgstr "<p>要挂载一个新的网络文件系统共享盘，请点击<B>添加</B>。要修改当前挂载的共享盘的配置，请点击<B>编辑</B>。也可用<B>删除</B>来移除和卸载所选共享盘。</p>\n" -#: src/include/nfs/ui.rb:76 +#: src/include/nfs/ui.rb:60 msgid "" "<p>If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS\n" "protocol), check the <b>Enable NFSv4</b> option. In that case, you might need\n" @@ -193,29 +193,29 @@ #. selection box label #. changed from "Remote hosts" because now it shows #. NFS servers only -#: src/include/nfs/ui.rb:180 +#: src/include/nfs/ui.rb:164 msgid "&NFS Servers" msgstr "网络文件系统服务器(&N)" #. selection box label -#: src/include/nfs/ui.rb:192 +#: src/include/nfs/ui.rb:176 msgid "&Exported Directories" msgstr "导出目录(&E)" #. text entry label -#: src/include/nfs/ui.rb:264 +#: src/include/nfs/ui.rb:249 msgid "&NFS Server Hostname" msgstr "网络文件系统服务器主机名(&N)" #. pushbutton label #. choose a host from a list #. appears in help text too -#: src/include/nfs/ui.rb:270 +#: src/include/nfs/ui.rb:255 msgid "Choo&se" msgstr "选择(&S)" #. textentry label -#: src/include/nfs/ui.rb:278 +#: src/include/nfs/ui.rb:263 msgid "&Remote Directory" msgstr "远程目录(&R)" @@ -223,48 +223,48 @@ #. select from a list of remote filesystems #. make it short #. appears in help text too -#: src/include/nfs/ui.rb:285 +#: src/include/nfs/ui.rb:270 msgid "&Select" msgstr "选择(&S)" -#: src/include/nfs/ui.rb:290 +#: src/include/nfs/ui.rb:275 msgid "NFS&v4 Share" msgstr "网络文件系统 (第四版) 共享盘(&v)" #. parallel NFS, protocol version 4.1 -#: src/include/nfs/ui.rb:293 +#: src/include/nfs/ui.rb:278 msgid "pNFS (v4.1)" msgstr "pNFS (v4.1)" #. textentry label -#: src/include/nfs/ui.rb:302 +#: src/include/nfs/ui.rb:287 msgid "&Mount Point (local)" msgstr "挂载点 (本地) (&M)" #. button label #. browse directories to select a mount point #. appears in help text too -#: src/include/nfs/ui.rb:308 +#: src/include/nfs/ui.rb:293 msgid "&Browse" msgstr "浏览(&B)" #. textentry label -#: src/include/nfs/ui.rb:313 +#: src/include/nfs/ui.rb:298 msgid "O&ptions" msgstr "选项(&P)" #. label message -#: src/include/nfs/ui.rb:335 +#: src/include/nfs/ui.rb:319 msgid "Scanning for hosts on this LAN..." msgstr "正在扫描本局域网上的主机..." #. Translators: 1st part of error message -#: src/include/nfs/ui.rb:341 +#: src/include/nfs/ui.rb:325 msgid "No NFS server has been found on your network." msgstr "您的网络中未找到网络文件系统服务器。" #. Translators: 2nd part of error message (1st one is 'No nfs servers have been found ...) -#: src/include/nfs/ui.rb:347 +#: src/include/nfs/ui.rb:331 msgid "" "\n" "This could be caused by a running SuSEfirewall2,\n" @@ -274,18 +274,18 @@ "这可能是由运行中的 SuSEfirewall2 导致的，它可能阻断了网络扫描。" #. Popup dialog, %1 is a host name -#: src/include/nfs/ui.rb:372 +#: src/include/nfs/ui.rb:356 msgid "Getting directory list for \"%1\"..." msgstr "正在获取 \"%1\" 的目录列表..." #. heading for a directory selection dialog -#: src/include/nfs/ui.rb:387 +#: src/include/nfs/ui.rb:371 msgid "Select the Mount Point" msgstr "选择挂载点" #. help text 1/4 #. change: locally defined -> servers on LAN -#: src/include/nfs/ui.rb:436 +#: src/include/nfs/ui.rb:420 msgid "" "<p>Enter the <b>NFS Server Hostname</b>. With\n" "<b>Choose</b>, browse through a list of\n" @@ -296,7 +296,7 @@ #. help text 2/4 #. added "Select" button -#: src/include/nfs/ui.rb:445 +#: src/include/nfs/ui.rb:429 msgid "" "<p>In <b>Remote File System</b>,\n" "enter the path to the directory on the NFS server. Use\n" @@ -308,7 +308,7 @@ "</p>" #. help text 3/4 -#: src/include/nfs/ui.rb:455 +#: src/include/nfs/ui.rb:439 msgid "" "<p>\t\t\n" "For <b>Mount Point</b>, enter the path in the local file system where the directory should be mounted. With\n" @@ -320,7 +320,7 @@ "<b>浏览</b>可交互地选择挂载点。</p>" #. help text 4/4 -#: src/include/nfs/ui.rb:465 +#: src/include/nfs/ui.rb:450 msgid "" "<p>For a list of <b>Options</b>,\n" "read the man page mount(8).</p>" @@ -329,57 +329,57 @@ "请阅读 mount(8) 帮助手册。</p>" #. popup heading -#: src/include/nfs/ui.rb:470 +#: src/include/nfs/ui.rb:455 msgid "Help" msgstr "帮助" -#: src/include/nfs/ui.rb:496 +#: src/include/nfs/ui.rb:482 msgid "Remote Directory" msgstr "远程目录" #. table header -#: src/include/nfs/ui.rb:500 +#: src/include/nfs/ui.rb:486 msgid "NFS Type" msgstr "网络文件系统类型" -#. `VSpacing (1), -#: src/include/nfs/ui.rb:522 +#. #211570 +#: src/include/nfs/ui.rb:507 msgid "Enable NFSv4" msgstr "启用第四版网络文件系统" -#: src/include/nfs/ui.rb:523 +#: src/include/nfs/ui.rb:508 msgid "NFSv4 Domain Name" msgstr "网络文件系统 (第四版) 域名称" -#: src/include/nfs/ui.rb:528 +#: src/include/nfs/ui.rb:513 msgid "Enable &GSS Security" msgstr "启用 &GSS 安全" -#: src/include/nfs/ui.rb:542 +#: src/include/nfs/ui.rb:527 msgid "&NFS Shares" msgstr "网络文件系统共享盘(&N)" -#: src/include/nfs/ui.rb:543 +#: src/include/nfs/ui.rb:528 msgid "NFS &Settings" msgstr "网络文件系统设置(&S)" #. Default values -#: src/include/nfs/ui.rb:656 +#: src/include/nfs/ui.rb:640 msgid "Really delete %1?" msgstr "真的要删除 %1 吗？" #. dialog heading -#: src/include/nfs/ui.rb:695 +#: src/include/nfs/ui.rb:681 msgid "NFS Client Configuration" msgstr "网络文件系统客户端配置" #. error popup message -#: src/modules/Nfs.rb:432 +#: src/modules/Nfs.rb:387 msgid "Unable to create directory '%1'." msgstr "无法创建目录 '%1'。" #. error popup message -#: src/modules/Nfs.rb:449 +#: src/modules/Nfs.rb:405 msgid "" "Unable to write to /etc/fstab.\n" "No changes will be made to the\n" @@ -389,77 +389,79 @@ "将不会修改网络文件系统客户端配置。\n" #. dialog label -#: src/modules/Nfs.rb:494 +#: src/modules/Nfs.rb:447 msgid "Writing NFS Configuration" msgstr "正在写入网络文件系统配置" #. progress stage label -#: src/modules/Nfs.rb:499 +#: src/modules/Nfs.rb:452 msgid "Stop services" msgstr "停止服务" #. progress stage label -#: src/modules/Nfs.rb:501 +#: src/modules/Nfs.rb:454 msgid "Start services" msgstr "启动服务" #. progress step label -#: src/modules/Nfs.rb:505 +#: src/modules/Nfs.rb:458 msgid "Stopping services..." msgstr "正在停止服务..." #. progress step label -#: src/modules/Nfs.rb:507 +#: src/modules/Nfs.rb:460 msgid "Starting services..." msgstr "正在启动服务..." #. final progress step label -#: src/modules/Nfs.rb:509 +#: src/modules/Nfs.rb:462 msgid "Finished" msgstr "已完成" #. help text -#: src/modules/Nfs.rb:515 +#: src/modules/Nfs.rb:468 msgid "Writing NFS client settings. Please wait..." msgstr "正在写入网络文件系统客户端设置。请稍候..." #. error popup message -#: src/modules/Nfs.rb:535 +#: src/modules/Nfs.rb:488 msgid "Unable to mount the NFS entries from /etc/fstab." msgstr "无法在 /etc/fstab 中挂载网络文件系统项。" #. summary header -#: src/modules/Nfs.rb:557 +#: src/modules/Nfs.rb:510 msgid "NFS Entries" msgstr "网络文件系统项" #. summary item, %1 is a number -#: src/modules/Nfs.rb:561 +#: src/modules/Nfs.rb:514 msgid "%1 entries configured" msgstr "已配置 %1 项" #. To translators: error popup -#: src/modules/NfsOptions.rb:137 +#: src/modules/NfsOptions.rb:140 msgid "Empty option strings are not allowed." msgstr "选项字符串不能为空。" #. To translators: error popup -#: src/modules/NfsOptions.rb:149 -msgid "\"Unexpected value '#{value}' for option '#{key}'\"" +#: src/modules/NfsOptions.rb:151 +#, fuzzy +#| msgid "\"Unexpected value '#{value}' for option '#{key}'\"" +msgid "Unexpected value '%{value}' for option '%{key}'" msgstr "\"选项 '#{key}' 出现了非预期值 '#{value}'\"" #. To translators: error popup -#: src/modules/NfsOptions.rb:153 +#: src/modules/NfsOptions.rb:155 msgid "Unknown option: '%{key}'" msgstr "未知选项：'%{key}'" #. To translators: error popup -#: src/modules/NfsOptions.rb:157 +#: src/modules/NfsOptions.rb:159 msgid "Invalid option: '%{opt}'" msgstr "无效选项：'%{opt}'" #. To translators: error popup -#: src/modules/NfsOptions.rb:161 +#: src/modules/NfsOptions.rb:163 msgid "Empty value for option: '%{key}'" msgstr "空值选项：'%{key}'" Modified: trunk/yast/zh_CN/po/nfs_server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: nfs server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:38+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/nis.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/nis.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/nis.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Nis\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-04 15:48+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -137,7 +137,7 @@ msgid "&NIS Servers in Domain %1" msgstr "域 %1 中的 &NIS 服务器" -#. firewall openning help +#. firewall opening help #: src/include/nis/ui.rb:228 msgid "" "<p><b>Firewall Settings</b><br>\n" @@ -218,7 +218,7 @@ #. frame label #. frame label -#: src/include/nis/ui.rb:342 src/include/nis/ui.rb:1026 +#: src/include/nis/ui.rb:342 src/include/nis/ui.rb:1028 msgid "NIS client" msgstr "NIS 客户端" @@ -266,7 +266,7 @@ #. Shortcut must not conflict with Finish and Next (#29960) #. pushbutton label, find nis servers #. Shortcut must not conflict with Finish and Next (#29960) -#: src/include/nis/ui.rb:417 src/include/nis/ui.rb:862 +#: src/include/nis/ui.rb:417 src/include/nis/ui.rb:864 msgid "Fin&d" msgstr "查找(&D)" @@ -289,11 +289,6 @@ msgid "&Use NIS" msgstr "使用 NIS(&U)" -#. checkbox label -#: src/include/nis/ui.rb:482 -msgid "Start Auto&mounter" -msgstr "启动自动挂载器(&m)" - #. button label (short for Expert settings) #: src/include/nis/ui.rb:489 msgid "E&xpert..." @@ -304,9 +299,14 @@ msgid "NFS Configuration..." msgstr "网络文件系统配置..." +#. check box label +#: src/include/nis/ui.rb:499 +msgid "Start Auto&mounter" +msgstr "启动自动挂载器(&m)" + #. dialog title #. dialog title -#: src/include/nis/ui.rb:506 src/include/nis/ui.rb:1034 +#: src/include/nis/ui.rb:508 src/include/nis/ui.rb:1036 msgid "Configuration of NIS client" msgstr "NIS 客户端配置" @@ -314,12 +314,12 @@ #. but the domain is unknown. #. Message popup. The user wants to Find servers #. but the domain is unknown. -#: src/include/nis/ui.rb:573 src/include/nis/ui.rb:902 +#: src/include/nis/ui.rb:575 src/include/nis/ui.rb:904 msgid "Finding servers works only when the domain is known." msgstr "查找服务器仅在域名已知的情况下才能进行。" #. yes-no popup -#: src/include/nis/ui.rb:591 +#: src/include/nis/ui.rb:593 msgid "" "When you configure your machine as a NIS client,\n" "you cannot retrieve the user data from LDAP.\n" @@ -330,81 +330,81 @@ "您确定吗？" #. help text 1/4 -#: src/include/nis/ui.rb:674 +#: src/include/nis/ui.rb:676 msgid "<p>Normally, it is possible for any host to query which server a client is using. Disabling <b>Answer Remote Hosts</b> restricts this only to the local host.</p>" msgstr "<p>通常，任何主机都可查询客户端正在使用哪个服务器。禁用<b>应答远程主机</b>限制只有本地主机才能使用此功能。</p>" #. help text 2/4 #. Check, ie. turn on a check box -#: src/include/nis/ui.rb:682 +#: src/include/nis/ui.rb:684 msgid "<p>Check <b>Broken server</b> if answers from servers running on an unprivileged port should be accepted. It is a security risk and it is better to replace such a server.</p>" msgstr "<p>如果应接受运行在非特权端口上的服务器的回答，请选中<b>服务器容错</b>。这存在安全风险，最好替换这种服务器。</p>" #. help text 3/4 -#: src/include/nis/ui.rb:690 +#: src/include/nis/ui.rb:692 msgid "<p>See <b>man ypbind</b> for details on other options.</p>" msgstr "<p>其它选项细节请参见 <b>man ypbind</b>。</p>" #. frame label #. dialog title -#: src/include/nis/ui.rb:701 src/include/nis/ui.rb:729 +#: src/include/nis/ui.rb:703 src/include/nis/ui.rb:731 msgid "Expert settings" msgstr "专家设置" #. check box label -#: src/include/nis/ui.rb:706 +#: src/include/nis/ui.rb:708 msgid "Ans&wer Remote Hosts" msgstr "应答远程主机(&W)" #. check box label -#: src/include/nis/ui.rb:710 +#: src/include/nis/ui.rb:712 msgid "Br&oken server" msgstr "服务器容错(&O)" #. text entry label (do not translate 'ypbind') -#: src/include/nis/ui.rb:717 +#: src/include/nis/ui.rb:719 msgid "Other &ypbind options" msgstr "其它 &ypbind 选项" #. Translators: multilineedit label #. comma: "," -#: src/include/nis/ui.rb:844 +#: src/include/nis/ui.rb:846 msgid "&Servers (separated by spaces or commas)" msgstr "服务器(用空格或逗号分隔)(&S)" #. checkbox label -#: src/include/nis/ui.rb:851 +#: src/include/nis/ui.rb:853 msgid "&Broadcast" msgstr "广播(&B)" #. checkbox label -#: src/include/nis/ui.rb:857 +#: src/include/nis/ui.rb:859 msgid "&SLP" msgstr "&SLP" #. Translators: popup dialog heading -#: src/include/nis/ui.rb:872 +#: src/include/nis/ui.rb:874 msgid "Domain Settings" msgstr "域设置" #. Add a domain, Adding a domain? Edit... #. Translators: text entry label -#: src/include/nis/ui.rb:875 +#: src/include/nis/ui.rb:877 msgid "&Domain name" msgstr "域名(&D)" #. Translators: error message -#: src/include/nis/ui.rb:930 +#: src/include/nis/ui.rb:932 msgid "This domain is already defined." msgstr "已定义了此域。" #. Translators: error message -#: src/include/nis/ui.rb:935 +#: src/include/nis/ui.rb:937 msgid "The format of server address '%1' is not correct." msgstr "服务器地址 \"%1\" 的格式不正确。" #. error message, 'Broadcast' and 'SLP' are checkboxes -#: src/include/nis/ui.rb:944 +#: src/include/nis/ui.rb:946 msgid "" "Enabling both Broadcast and SLP options\n" "does not make any sense. Select just one option." @@ -413,56 +413,56 @@ "没有意义。请只选择一个选项。" #. help text -#: src/include/nis/ui.rb:977 +#: src/include/nis/ui.rb:979 msgid "<p>Specify the servers for additional domains.</p>" msgstr "<p>为附加域指定服务器。</p>" #. help text -#: src/include/nis/ui.rb:985 +#: src/include/nis/ui.rb:987 msgid "<p>The Service Location Protocol (<b>SLP</b>) can be used to find NIS server.</p>" msgstr "<p>服务定位协议 (<b>SLP</b>) 可用于查找 NIS 服务器。</p>" #. dialog label #. dialog subtitle -#: src/include/nis/ui.rb:997 src/include/nis/ui.rb:1036 +#: src/include/nis/ui.rb:999 src/include/nis/ui.rb:1038 msgid "Additional Domains" msgstr "附加域" #. table header #. summary item -#: src/include/nis/ui.rb:1003 src/modules/Nis.rb:889 +#: src/include/nis/ui.rb:1005 src/modules/Nis.rb:889 msgid "Domain" msgstr "域" #. table header #. summary header -#: src/include/nis/ui.rb:1005 src/modules/Nis.rb:842 +#: src/include/nis/ui.rb:1007 src/modules/Nis.rb:842 msgid "Broadcast" msgstr "广播" #. table header - Service Location Protocol -#: src/include/nis/ui.rb:1007 +#: src/include/nis/ui.rb:1009 msgid "SLP" msgstr "服务定位协议" #. table header #. summary item -#: src/include/nis/ui.rb:1009 src/modules/Nis.rb:887 +#: src/include/nis/ui.rb:1011 src/modules/Nis.rb:887 msgid "Servers" msgstr "服务器" #. button label -#: src/include/nis/ui.rb:1015 +#: src/include/nis/ui.rb:1017 msgid "A&dd" msgstr "添加(&D)" #. Translators: a yes-no popup -#: src/include/nis/ui.rb:1121 +#: src/include/nis/ui.rb:1123 msgid "Really delete this domain?" msgstr "真的删除此域吗？" #. popup text FIXME better... -#: src/include/nis/ui.rb:1251 +#: src/include/nis/ui.rb:1253 msgid "NIS is now enabled." msgstr "现在已启用了 NIS。" @@ -542,47 +542,47 @@ msgstr "已启用客户端" #. dialog label -#: src/modules/Nis.rb:1208 +#: src/modules/Nis.rb:1206 msgid "Writing NIS Configuration..." msgstr "正在写入 NIS 配置..." #. progress stage label -#: src/modules/Nis.rb:1213 +#: src/modules/Nis.rb:1211 msgid "Stop services" msgstr "停止服务" #. progress stage label -#: src/modules/Nis.rb:1215 +#: src/modules/Nis.rb:1213 msgid "Start services" msgstr "启动服务" #. progress step label -#: src/modules/Nis.rb:1219 +#: src/modules/Nis.rb:1217 msgid "Stopping services..." msgstr "正在停止服务..." #. progress step label -#: src/modules/Nis.rb:1221 +#: src/modules/Nis.rb:1219 msgid "Starting services..." msgstr "正在启动服务..." #. final progress step label -#: src/modules/Nis.rb:1223 +#: src/modules/Nis.rb:1221 msgid "Finished" msgstr "已完成" #. help text -#: src/modules/Nis.rb:1229 +#: src/modules/Nis.rb:1227 msgid "Writing NIS client settings" msgstr "正在写入 NIS 客户端设置" #. error popup message -#: src/modules/Nis.rb:1254 +#: src/modules/Nis.rb:1252 msgid "Error while running ypclient." msgstr "运行 ypclient 时出错。" #. error popup message -#: src/modules/Nis.rb:1262 +#: src/modules/Nis.rb:1260 msgid "NIS server not found." msgstr "未找到 NIS 服务器。" Modified: trunk/yast/zh_CN/po/nis_server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/nis_server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/nis_server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Nis Server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:37+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/ntp-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ntp-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/ntp-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Ntp Client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-03 16:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-09-04 14:05+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -79,25 +79,25 @@ msgstr "配置(&C)..." #. Otherwise, prompt user for confirming pkg installation -#: src/clients/ntp-client_proposal.rb:386 +#: src/clients/ntp-client_proposal.rb:380 msgid "" "Synchronization with NTP server is not possible\n" "without package %1 installed." msgstr "未安装软件包 %1，无法与 NTP 服务器同步。" #. Only if network is running try to synchronize the ntp server -#: src/clients/ntp-client_proposal.rb:398 +#: src/clients/ntp-client_proposal.rb:392 msgid "Synchronizing with NTP server..." msgstr "正在与 NTP 服务器同步..." #. update time widgets -#: src/clients/ntp-client_proposal.rb:443 +#: src/clients/ntp-client_proposal.rb:438 msgid "Connection to selected NTP server failed." msgstr "连接至所选 NTP 服务器失败。" #. Translators: yes-no popup, #. ntpdate is a command, %1 is the server address -#: src/clients/ntp-client_proposal.rb:474 +#: src/clients/ntp-client_proposal.rb:469 msgid "" "Test query to server '%1' failed.\n" "If server is not yet accessible or network is not configured\n" @@ -1293,27 +1293,27 @@ msgstr "正在初始化..." #. NtpClient read dialog caption -#: src/modules/NtpClient.rb:477 +#: src/modules/NtpClient.rb:486 msgid "Initializing NTP Client Configuration" msgstr "正在初始化 NTP 客户端配置" #. progress stage -#: src/modules/NtpClient.rb:492 +#: src/modules/NtpClient.rb:501 msgid "Read network configuration" msgstr "读取网络配置" #. progress stage -#: src/modules/NtpClient.rb:494 +#: src/modules/NtpClient.rb:503 msgid "Read NTP settings" msgstr "读取 NTP 设置" #. progress step -#: src/modules/NtpClient.rb:498 +#: src/modules/NtpClient.rb:507 msgid "Reading network configuration..." msgstr "正在读取网络配置..." #. progress step -#: src/modules/NtpClient.rb:500 +#: src/modules/NtpClient.rb:509 msgid "Reading NTP settings..." msgstr "正在读取 NTP 设置..." @@ -1323,115 +1323,115 @@ #. (This would be done if yast2-ntp-client will be called in the UI) #. In that case the error popup will not be shown. (bnc#889557) #. progress step -#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:597 -#: src/modules/NtpClient.rb:758 src/modules/NtpClient.rb:909 +#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606 +#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918 msgid "Finished" msgstr "已完成" #. boolean update_dhcp = original_config_dhcp != config_dhcp; #. NtpClient read dialog caption -#: src/modules/NtpClient.rb:731 +#: src/modules/NtpClient.rb:740 msgid "Saving NTP Client Configuration" msgstr "正在保存 NTP 客户端配置" #. progress stage -#: src/modules/NtpClient.rb:748 +#: src/modules/NtpClient.rb:757 msgid "Write NTP settings" msgstr "写入 NTP 设置" #. progress stage -#: src/modules/NtpClient.rb:750 +#: src/modules/NtpClient.rb:759 msgid "Restart NTP daemon" msgstr "重启 NTP 守护进程" #. progress step -#: src/modules/NtpClient.rb:754 +#: src/modules/NtpClient.rb:763 msgid "Writing the settings..." msgstr "正在写入设置..." #. progress step -#: src/modules/NtpClient.rb:756 +#: src/modules/NtpClient.rb:765 msgid "Restarting NTP daemon..." msgstr "正在重启 NTP 守护进程..." #. error message -#: src/modules/NtpClient.rb:841 +#: src/modules/NtpClient.rb:850 msgid "Cannot update the dynamic configuration policy." msgstr "无法更新动态配置策略。" #. error report -#: src/modules/NtpClient.rb:879 +#: src/modules/NtpClient.rb:888 msgid "Cannot restart the NTP daemon." msgstr "无法重启 NTP 守护进程。" #. summary string -#: src/modules/NtpClient.rb:973 +#: src/modules/NtpClient.rb:998 msgid "The NTP daemon starts when starting the system." msgstr "将在系统启动时启动 NTP 守护进程。" #. summary string -#: src/modules/NtpClient.rb:979 +#: src/modules/NtpClient.rb:1004 msgid "The NTP daemon does not start automatically." msgstr "不自动启动 NTP 守护进程。" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:985 +#: src/modules/NtpClient.rb:1010 msgid "Servers: %1" msgstr "服务器：%1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:989 +#: src/modules/NtpClient.rb:1014 msgid "Radio Clocks: %1" msgstr "无线电时钟：%1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:993 +#: src/modules/NtpClient.rb:1018 msgid "Peers: %1" msgstr "对等点：%1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:997 +#: src/modules/NtpClient.rb:1022 msgid "Broadcast time information to: %1" msgstr "广播时间信息到：%1" #. summary string, %1 is list of addresses -#: src/modules/NtpClient.rb:1001 +#: src/modules/NtpClient.rb:1026 msgid "Accept broadcasted time information from: %1" msgstr "接受广播的时间信息自：%1" #. summary string, FIXME -#: src/modules/NtpClient.rb:1017 +#: src/modules/NtpClient.rb:1042 msgid "Combine static and DHCP configuration." msgstr "混合静态和 DHCP 配置。" #. summary string, FIXME -#: src/modules/NtpClient.rb:1021 +#: src/modules/NtpClient.rb:1046 msgid "Static configuration only." msgstr "仅静态配置。" #. summary string, FIXME -#: src/modules/NtpClient.rb:1024 +#: src/modules/NtpClient.rb:1049 msgid "Custom configuration policy." msgstr "自定义配置策略。" #. An informative popup label diring the NTP server testings -#: src/modules/NtpClient.rb:1057 +#: src/modules/NtpClient.rb:1082 msgid "Testing the NTP server..." msgstr "正在测试 NTP 服务器..." #. message report - result of test of connection to NTP server -#: src/modules/NtpClient.rb:1087 +#: src/modules/NtpClient.rb:1103 msgid "Server is reachable and responds properly." msgstr "服务器可访问且响应正常。" #. error message - result of test of connection to NTP server #. report error instead of simple message (#306018) -#: src/modules/NtpClient.rb:1091 +#: src/modules/NtpClient.rb:1107 msgid "Server is unreachable or does not respond properly." msgstr "服务器不可访问，或响应不正常。" #. if package is not installed (in the inst-sys, it is: bnc#399659) -#: src/modules/NtpClient.rb:1109 +#: src/modules/NtpClient.rb:1125 msgid "" "Cannot search for NTP server in local network\n" "without package %1 installed.\n" Modified: trunk/yast/zh_CN/po/oneclickinstall.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/oneclickinstall.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/oneclickinstall.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-10 10:37+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Traditional \n" @@ -70,7 +70,7 @@ #. Remove any removals #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:139 -#: src/modules/OneClickInstallWorkerFunctions.rb:292 +#: src/modules/OneClickInstallWorkerFunctions.rb:291 msgid "Removing Packages..." msgstr "正在移除软件包..." @@ -81,7 +81,7 @@ #. if that was successful now try and install the patterns #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:152 -#: src/modules/OneClickInstallWorkerFunctions.rb:265 +#: src/modules/OneClickInstallWorkerFunctions.rb:264 msgid "Installing Patterns..." msgstr "正在安装软件集..." @@ -94,8 +94,8 @@ #. initialize slideshow data (package counters) #: src/clients/OneClickInstallCLI.rb:165 #: src/clients/OneClickInstallWorker.rb:71 -#: src/modules/OneClickInstallWorkerFunctions.rb:224 -#: src/modules/OneClickInstallWorkerFunctions.rb:232 +#: src/modules/OneClickInstallWorkerFunctions.rb:223 +#: src/modules/OneClickInstallWorkerFunctions.rb:231 msgid "Installing Packages..." msgstr "正在安装软件包..." @@ -361,36 +361,36 @@ msgid "Adding repository %1" msgstr "正在添加软件源 %1" -#: src/modules/OneClickInstallWorkerFunctions.rb:124 +#: src/modules/OneClickInstallWorkerFunctions.rb:123 msgid "An error occurred while initializing the software repository." msgstr "初始化软件源时出错。" -#: src/modules/OneClickInstallWorkerFunctions.rb:127 +#: src/modules/OneClickInstallWorkerFunctions.rb:126 msgid "Details:" msgstr "细节：" -#: src/modules/OneClickInstallWorkerFunctions.rb:132 +#: src/modules/OneClickInstallWorkerFunctions.rb:131 msgid "Try again?" msgstr "重试吗？" #. * Install all the specified packages #. * return true if all installations were successful, false otherwise -#: src/modules/OneClickInstallWorkerFunctions.rb:186 +#: src/modules/OneClickInstallWorkerFunctions.rb:185 msgid "Marking package %1 for installation" msgstr "正在标记安装软件包 %1" #. If we didn't find it in the repos specified in the YMP try any repo. -#: src/modules/OneClickInstallWorkerFunctions.rb:212 +#: src/modules/OneClickInstallWorkerFunctions.rb:211 msgid "Warning: package %1 could not be installed." msgstr "警告：无法安装软件包 %1。" -#: src/modules/OneClickInstallWorkerFunctions.rb:226 +#: src/modules/OneClickInstallWorkerFunctions.rb:225 msgid "Performing Installation..." msgstr "正在执行安装..." #. * Install all the specified patterns #. * return true if all installations were successful, false otherwise -#: src/modules/OneClickInstallWorkerFunctions.rb:253 +#: src/modules/OneClickInstallWorkerFunctions.rb:252 msgid "Warning: pattern %1 could not be installed." msgstr "警告：无法安装软件集 %1。" Modified: trunk/yast/zh_CN/po/online-update-configuration.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/online-update-configuration.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/online-update-configuration.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-04-16 14:58+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/online-update.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/online-update.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/online-update.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: online Update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:36+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -239,9 +239,13 @@ #. popup message #: src/modules/OnlineUpdate.rb:51 +#, fuzzy +#| msgid "" +#| "Packages for package management were updated.\n" +#| "Finishing and restarting now." msgid "" "Packages for package management were updated.\n" -"Finishing and restarting now." +"Finishing and restarting YaST now." msgstr "" "用于软件包管理的软件包已更新。\n" "现在将完成更新并重启软件管理器。" @@ -317,63 +321,48 @@ msgstr "好" #. Progress log. Leave the space at the end, some other text may follow -#: src/modules/OnlineUpdateCallbacks.rb:233 +#: src/modules/OnlineUpdateCallbacks.rb:230 msgid "Downloading delta RPM %1 " msgstr "正在下载增量 RPM %1 " #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:239 +#: src/modules/OnlineUpdateCallbacks.rb:236 msgid "Delta RPM Download Progress" msgstr "增量 RPM 下载进度" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:265 +#: src/modules/OnlineUpdateCallbacks.rb:262 msgid "Failed to download delta RPM: %1" msgstr "未能下载增量 RPM：%1" #. Progress log item (%1 is name of delta RPM). #. Leave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:280 +#: src/modules/OnlineUpdateCallbacks.rb:277 msgid "Applying delta RPM: %1 " msgstr "正在应用增量 RPM：%1 " #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:287 +#: src/modules/OnlineUpdateCallbacks.rb:284 msgid "Delta RPM Application Progress" msgstr "增量 RPM 应用进度" #. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:316 +#: src/modules/OnlineUpdateCallbacks.rb:313 msgid "Failed to apply delta RPM: %1" msgstr "未能应用增量 RPM：%1" -#. Progress log; lave the space at the end, some other text may follow. -#: src/modules/OnlineUpdateCallbacks.rb:331 -msgid "Downloading patch RPM %1 " -msgstr "正在下载补丁 RPM %1 " - #. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:337 -msgid "Patch RPM Download Progress" -msgstr "补丁 RPM 下载进度" - -#. progress log item (previous action failed(%1 is reason) -#: src/modules/OnlineUpdateCallbacks.rb:364 -msgid "Failed to download patch RPM: %1" -msgstr "未能下载补丁 RPM：%1" - -#. progress bar label -#: src/modules/OnlineUpdateCallbacks.rb:405 +#: src/modules/OnlineUpdateCallbacks.rb:354 msgid "Script Execution Progress" msgstr "脚本执行进度" #. log entry, %1 is name of the patch which contains the script -#: src/modules/OnlineUpdateCallbacks.rb:411 +#: src/modules/OnlineUpdateCallbacks.rb:360 msgid "Starting script %1" msgstr "正在启动脚本 %1" #. label, %1 is patch name with version and architecture -#: src/modules/OnlineUpdateCallbacks.rb:481 +#: src/modules/OnlineUpdateCallbacks.rb:430 msgid "" "Patch %1\n" "\n" @@ -382,7 +371,7 @@ "\n" #. error popoup (detailed info follows) -#: src/modules/OnlineUpdateCallbacks.rb:614 +#: src/modules/OnlineUpdateCallbacks.rb:549 msgid "There was an error in the repository initialization." msgstr "软件源初始化时出错。" @@ -547,6 +536,15 @@ "\n" "若您需要进一步援助请联系我们。" +#~ msgid "Downloading patch RPM %1 " +#~ msgstr "正在下载补丁 RPM %1 " + +#~ msgid "Patch RPM Download Progress" +#~ msgstr "补丁 RPM 下载进度" + +#~ msgid "Failed to download patch RPM: %1" +#~ msgstr "未能下载补丁 RPM：%1" + #~ msgid "" #~ "If you abort the installation now, SuSEconfig will\n" #~ "not be run. The patches have been installed\n" Modified: trunk/yast/zh_CN/po/opensuse_mirror.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/opensuse_mirror.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-08 11:02+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/packager.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/packager.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/packager.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-08-23 02:12+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -211,14 +211,14 @@ #. TRANSLATORS: popup header #. TRANSLATORS: popup header #: src/clients/inst_productsources.rb:268 -#: src/clients/inst_productsources.rb:1343 +#: src/clients/inst_productsources.rb:1346 msgid "Aborting Configuration of Online Repository" msgstr "中止在线软件源配置" #. TRANSLATORS: popup question #. TRANSLATORS: popup question #: src/clients/inst_productsources.rb:270 -#: src/clients/inst_productsources.rb:1345 +#: src/clients/inst_productsources.rb:1348 msgid "Are you sure you want to abort the configuration?" msgstr "您确定您想要中止配置吗？" @@ -239,63 +239,63 @@ "您想要配置网络吗？" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:643 +#: src/clients/inst_productsources.rb:646 msgid "Check network configuration" msgstr "检查网络配置" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:645 +#: src/clients/inst_productsources.rb:648 msgid "Download list of online repositories" msgstr "下载在线软件源列表" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:650 +#: src/clients/inst_productsources.rb:653 msgid "Checking network configuration..." msgstr "正在检查网络配置..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:652 +#: src/clients/inst_productsources.rb:655 msgid "Downloading list of online repositories..." msgstr "正在下载在线软件源列表..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:661 +#: src/clients/inst_productsources.rb:664 msgid "Initialize the repository manager" msgstr "初始化软件源管理器" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:666 +#: src/clients/inst_productsources.rb:669 msgid "Initializing the repository manager..." msgstr "正在初始化软件源管理器..." #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:676 +#: src/clients/inst_productsources.rb:679 msgid "Reading List of Online Repositories" msgstr "读取在线软件源列表" #. TRANSLATORS: dialog help -#: src/clients/inst_productsources.rb:682 +#: src/clients/inst_productsources.rb:685 msgid "" "<p>The packager is being initialized and \n" "the list of servers downloaded from the Web.</p>\n" msgstr "<p>正在初始化包管理器并从网络下载服务器列表。</p>\n" #. TRANSLATORS: error report -#: src/clients/inst_productsources.rb:714 +#: src/clients/inst_productsources.rb:717 msgid "" "Cannot download list of repositories,\n" "no network configured." msgstr "无法下载软件源列表，尚未配置网络。" #. TRANSLATORS: light-warning message -#: src/clients/inst_productsources.rb:792 +#: src/clients/inst_productsources.rb:795 msgid "" "No product URL defined from which to download\n" "list of repositories.\n" msgstr "未定义从其下载软件源列表的产品 URL。\n" #. TRANSLATORS: warning message -#: src/clients/inst_productsources.rb:806 +#: src/clients/inst_productsources.rb:809 msgid "" "Unable to download list of repositories\n" "or no repositories defined." @@ -304,12 +304,12 @@ #. TRANSLATORS: HTML-formatted summary text #. %1 is replaced with "Yes" (currently only "Yes") #. see *4 -#: src/clients/inst_productsources.rb:912 +#: src/clients/inst_productsources.rb:915 msgid "<b>Recommended:</b> %1<br>" msgstr "<b>推荐：</b>%1<br>" #. TRANSLATORS: used for "Recommended: Yes" (see *4) -#: src/clients/inst_productsources.rb:914 +#: src/clients/inst_productsources.rb:917 msgid "Yes" msgstr "是" @@ -320,7 +320,7 @@ #. %3 is replaced with a summary text for the selected repository #. %4 is replaced with a description text for the selected repository #. %5 is replaced with an emty string or "Recommended: Yes" (*4) -#: src/clients/inst_productsources.rb:926 +#: src/clients/inst_productsources.rb:929 msgid "" "<p>\n" "<b>URL:</b> %1<br>\n" @@ -339,28 +339,28 @@ "</p>" #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:1234 +#: src/clients/inst_productsources.rb:1237 msgid "List of Online Repositories" msgstr "在线软件源列表" #. TRANSLATORS: push button #. push button -#: src/clients/inst_productsources.rb:1241 src/modules/SourceManagerSLP.rb:111 +#: src/clients/inst_productsources.rb:1244 src/modules/SourceManagerSLP.rb:111 msgid "&Filter" msgstr "过滤器(&F)" #. TRANSLATORS: multi-selection box -#: src/clients/inst_productsources.rb:1251 +#: src/clients/inst_productsources.rb:1254 msgid "&List of Repositories" msgstr "软件源列表(&L)" #. TRANSLATORS: Rich-text widget (HTML) -#: src/clients/inst_productsources.rb:1257 +#: src/clients/inst_productsources.rb:1260 msgid "Repository Description" msgstr "软件源描述" #. TRANSLATORS: dialog help 1/3 -#: src/clients/inst_productsources.rb:1261 +#: src/clients/inst_productsources.rb:1264 msgid "" "<p>List of default online repositories.\n" "Click on a repository for details.</p>\n" @@ -369,28 +369,28 @@ "点击软件源可显示细节。</p>\n" #. TRANSLATORS: dialog help 2/3 (version for installation) -#: src/clients/inst_productsources.rb:1266 +#: src/clients/inst_productsources.rb:1269 msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n" msgstr "<p>选择您想要使用的在线软件源并点击<b>下一步</b>。</p>\n" #. TRANSLATORS: dialog help 2/3 (version for running system) -#: src/clients/inst_productsources.rb:1270 +#: src/clients/inst_productsources.rb:1273 msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n" msgstr "<p>选择您想要使用的在线软件源并点击<b>完成</b>。</p>\n" #. TRANSLATORS: dialog help 3/3 -#: src/clients/inst_productsources.rb:1275 +#: src/clients/inst_productsources.rb:1278 msgid "<p>To remove a used repository, simply deselect it.</p>" msgstr "<p>要移除一个用过的软件源，只需反选它。</p>" #. TRANSLATORS: dialog caption -#: src/clients/inst_productsources.rb:1371 +#: src/clients/inst_productsources.rb:1374 msgid "Writing List of Online Repositories" msgstr "写入在线软件源列表" #. TRANSLATORS: dialog help #. TRANSLATORS: dialog help -#: src/clients/inst_productsources.rb:1377 +#: src/clients/inst_productsources.rb:1380 #: src/include/packager/repositories_include.rb:91 msgid "<p>The repository manager is downloading repository details...</p>" msgstr "<p>软件源管理器正在下载软件源详情...</p>" @@ -401,46 +401,46 @@ #. %1 is replaced with a repository name or URL #. TRANSLATORS: pop-up error message #. %1 is replaced with a repository name or URL -#: src/clients/inst_productsources.rb:1469 -#: src/clients/inst_productsources.rb:1493 -#: src/clients/inst_productsources.rb:1511 +#: src/clients/inst_productsources.rb:1472 +#: src/clients/inst_productsources.rb:1496 +#: src/clients/inst_productsources.rb:1514 msgid "Adding repository %1 failed." msgstr "添加软件源 %1 失败。" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1588 +#: src/clients/inst_productsources.rb:1591 msgid "Delete deselected online repositories" msgstr "删除未选的在线软件源" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1590 +#: src/clients/inst_productsources.rb:1593 msgid "Deleting deselected online repositories..." msgstr "正在删除未选的在线软件源..." #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1598 +#: src/clients/inst_productsources.rb:1601 msgid "Add all selected online repositories" msgstr "添加全部所选在线软件源" #. TRANSLATORS: progress step -#: src/clients/inst_productsources.rb:1603 +#: src/clients/inst_productsources.rb:1606 msgid "Adding all selected online repositories..." msgstr "正在添加全部所选在线软件源..." #. TRANSLATORS: progress step #. %1 is replaced with repository name or URL -#: src/clients/inst_productsources.rb:1612 +#: src/clients/inst_productsources.rb:1615 msgid "Add repository: %1" msgstr "添加软件源: %1" #. TRANSLATORS: progress step, #. %1 is replaced with repository name or URL -#: src/clients/inst_productsources.rb:1621 +#: src/clients/inst_productsources.rb:1624 msgid "Adding repository: %1 ..." msgstr "正在添加软件源：%1..." #. less than LOW_MEMORY_MIB RAM -#: src/clients/inst_productsources.rb:1733 +#: src/clients/inst_productsources.rb:1736 msgid "" "Low memory detected.\n" "\n" @@ -468,7 +468,7 @@ #. re-initialize package information #. force reinitialization -#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744 +#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739 msgid "Installing Packages..." msgstr "正在安装软件包..." @@ -508,8 +508,8 @@ #. dialog caption #. dialog caption #. dialog caption -#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1809 -#: src/modules/AddOnProduct.rb:683 +#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810 +#: src/modules/AddOnProduct.rb:682 msgid "Initializing..." msgstr "正在初始化..." @@ -572,7 +572,7 @@ #. label to be used instead of URL if not found #: src/clients/repositories.rb:328 src/clients/repositories.rb:361 -#: src/modules/AddOnProduct.rb:1325 +#: src/modules/AddOnProduct.rb:1334 msgid "URL: %1" msgstr "URL：%1" @@ -814,7 +814,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323 +#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "细节：" @@ -822,7 +822,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331 +#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "重试吗？" @@ -842,7 +842,7 @@ "全部修改将不复存在。" #. refresh also the combobox widget -#: src/clients/repositories.rb:1328 +#: src/clients/repositories.rb:1329 msgid "" "There is no service at URL:\n" "%1" @@ -851,54 +851,54 @@ "%1" #. TODO: add help text -#: src/clients/repositories.rb:1439 +#: src/clients/repositories.rb:1440 msgid "Refreshing Repositories" msgstr "正在刷新软件源" -#: src/clients/repositories.rb:1440 +#: src/clients/repositories.rb:1441 msgid "Refreshing Services" msgstr "正在刷新服务" -#: src/clients/repositories.rb:1445 +#: src/clients/repositories.rb:1446 msgid "Refresh Repositories" msgstr "刷新软件源" -#: src/clients/repositories.rb:1446 +#: src/clients/repositories.rb:1447 msgid "Refresh Services" msgstr "刷新服务" #. progress bar label -#: src/clients/repositories.rb:1478 +#: src/clients/repositories.rb:1479 msgid "Refreshing Repository %1..." msgstr "正在刷新软件源 %1..." #. refreshing services #. progress bar label -#: src/clients/repositories.rb:1504 +#: src/clients/repositories.rb:1505 msgid "Refreshing Service %1..." msgstr "正在刷新服务 %1..." #. yes-no popup -#: src/clients/repositories.rb:1523 +#: src/clients/repositories.rb:1524 msgid "Delete the selected repository from the list?" msgstr "从列表中删除所选软件源吗？" #. yes-no popup -#: src/clients/repositories.rb:1537 +#: src/clients/repositories.rb:1538 msgid "" "Delete service %1\n" "and its repositories?" msgstr "删除服务 %1 及其软件源吗？" #. popup message -#: src/clients/repositories.rb:1605 +#: src/clients/repositories.rb:1606 msgid "" "For the selected repository, refresh\n" "cannot be set." msgstr "无法设置所选软件源的刷新状态。" #. popup question, %1 is repository URL -#: src/clients/repositories.rb:1767 +#: src/clients/repositories.rb:1768 msgid "" "Repository %1\n" "has been already added. Each repository should be added only once.\n" @@ -910,7 +910,7 @@ "真的再次添加该软件源吗？" #. Error popup -#: src/clients/repositories.rb:1835 +#: src/clients/repositories.rb:1836 msgid "<p>Errors occurred while restoring the repository configuration.</p>\n" msgstr "<p>恢复软件源配置时出错。</p>\n" @@ -1022,20 +1022,20 @@ "现在还安装它们吗？\n" #. start the repository manager -#: src/clients/sw_single.rb:619 +#: src/clients/sw_single.rb:614 msgid "" "Cannot configure online update repository \n" "without having package %1 installed" msgstr "未安装 %1 软件包无法配置在线更新软件源" -#: src/clients/sw_single.rb:645 +#: src/clients/sw_single.rb:640 msgid "" "Cannot search packages in online repositories\n" "without having package %1 installed" msgstr "未安装 %1 软件包无法在在线软件源中搜索软件包" #. error report, %1 is a list of packages -#: src/clients/sw_single.rb:673 +#: src/clients/sw_single.rb:668 msgid "" "The following packages have not been found on the medium:\n" "%1\n" @@ -1173,7 +1173,7 @@ msgid "&Start Check" msgstr "开始检查(&S)" -#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:684 +#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:685 msgid "&Eject" msgstr "弹出(&E)" @@ -1416,7 +1416,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:319 -#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306 msgid "" "Unable to create repository\n" "from URL '%1'." @@ -1450,38 +1450,48 @@ #. error report #. popup error #. popup error -#: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619 -#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725 +#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618 +#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730 msgid "An error occurred while preparing the installation system." msgstr "准备安装系统时出错。" #. error report -#: src/modules/AddOnProduct.rb:654 +#: src/modules/AddOnProduct.rb:653 msgid "Control file %1 not found on media." msgstr "在介质上未找到控制文件 %1。" +#. FATE #305578: Add-On Product Requiring Registration +#. or check the content file +#: src/modules/AddOnProduct.rb:894 +#, fuzzy +#| msgid "Package %1 was not installed. The service cannot be edited." +msgid "" +"Package '%s' is not installed.\n" +"The add-on product cannot be registered." +msgstr "未安装包 %1。无法编辑该服务。" + #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1252 src/modules/AddOnProduct.rb:1416 +#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425 msgid "Unable to use additional products." msgstr "无法使用附加产品。" #. fill up internal map (used later when item selected) -#: src/modules/AddOnProduct.rb:1303 src/modules/AddOnProduct.rb:1309 +#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318 msgid "%1, URL: %2" msgstr "%1，URL：%2" -#: src/modules/AddOnProduct.rb:1319 +#: src/modules/AddOnProduct.rb:1328 msgid "URL: %1, Path: %2" msgstr "URL：%1，路径：%2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1350 +#: src/modules/AddOnProduct.rb:1359 msgid "Additional Products" msgstr "附加产品" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1356 +#: src/modules/AddOnProduct.rb:1365 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" @@ -1489,34 +1499,34 @@ "安装软件源还包含了下面列出的额外软件源。\n" "请选择您想要使用的软件源。\n" -#: src/modules/AddOnProduct.rb:1367 +#: src/modules/AddOnProduct.rb:1376 msgid "Additional Products to Select" msgstr "供选择的附加产品" #. push button label -#: src/modules/AddOnProduct.rb:1374 +#: src/modules/AddOnProduct.rb:1383 msgid "Add Selected &Products" msgstr "添加所选产品(&P)" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1505 +#: src/modules/AddOnProduct.rb:1515 msgid "Insert the addon %1 medium" msgstr "请插入附加的 %1 介质" #. %1 is the product name, %2 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1510 +#: src/modules/AddOnProduct.rb:1520 msgid "Insert the %1 %2 medium" msgstr "请插入 %1 %2 介质" #. TRANSLATORS: error message, %1 is replaced with product URL -#: src/modules/AddOnProduct.rb:1562 +#: src/modules/AddOnProduct.rb:1572 msgid "Unable to add product %1." msgstr "无法添加产品 %1。" #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760 -#: src/modules/Packages.rb:469 +#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770 +#: src/modules/Packages.rb:471 msgid "Unknown Product" msgstr "未知产品" @@ -1602,7 +1612,7 @@ #. Add "Total" item - at the top so it is visible by default even if there are many items #. #. List column header for total remaining MB and time to install -#: src/modules/PackageSlideShow.rb:924 +#: src/modules/PackageSlideShow.rb:918 msgid "Total" msgstr "总计" @@ -1611,62 +1621,62 @@ #. #. message in the installatino log, %1 is package name, #. %2 is package size -#: src/modules/PackageSlideShow.rb:1051 src/modules/PackageSlideShow.rb:1303 -#: src/modules/PackageSlideShow.rb:1355 +#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297 +#: src/modules/PackageSlideShow.rb:1349 msgid "Downloading %1 (download size %2)" msgstr "正在下载 %1 (下载大小 %2)" -#: src/modules/PackageSlideShow.rb:1081 +#: src/modules/PackageSlideShow.rb:1075 msgid " (Remaining: %1%2 packages)" msgstr " (还剩：%1%2 个软件包)" #. display download progress in DownloadInAdvance mode #. translations: progress message (part1) -#: src/modules/PackageSlideShow.rb:1114 +#: src/modules/PackageSlideShow.rb:1108 msgid "Downloading Packages..." msgstr "正在下载软件包..." #. progress message (part2) -#: src/modules/PackageSlideShow.rb:1117 +#: src/modules/PackageSlideShow.rb:1111 msgid " (Downloaded %1 of %2 packages)" msgstr " (已下载 %1/%2 个软件包)" #. Heading for the progress bar for the current package #. while it is deleted. "%1" is the package name. -#: src/modules/PackageSlideShow.rb:1253 +#: src/modules/PackageSlideShow.rb:1247 msgid "Deleting %1" msgstr "正在删除 %1" #. package installation - summary text #. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB) -#: src/modules/PackageSlideShow.rb:1260 +#: src/modules/PackageSlideShow.rb:1254 msgid "Installing %1 (installed size %2)" msgstr "正在安装 %1 (安装后大小 %2)" #. message in the installatino log, %1 is package name, #. %2 is package size -#: src/modules/PackageSlideShow.rb:1338 +#: src/modules/PackageSlideShow.rb:1332 msgid "Applying delta RPM: %1" msgstr "正在应用增量 RPM：%1" #. warning text -#: src/modules/Packages.rb:309 +#: src/modules/Packages.rb:311 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution." msgstr "您的计算机是 64 位 x86-64 系统，但是您正试图安装 32 位发行版。" #. help text for software proposal -#: src/modules/Packages.rb:325 +#: src/modules/Packages.rb:327 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:337 +#: src/modules/Packages.rb:339 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>" msgstr "<P>该提案汇报了将安装到系统的文件总大小。然而，系统将包含一些其它文件 (缓存和工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 25% (或大约 300 MB) 的空闲空间。<P>" #. help text for software proposal -#: src/modules/Packages.rb:342 +#: src/modules/Packages.rb:344 msgid "" "<P>The total 'size to download' is the size of the packages which will be\n" "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n" @@ -1675,107 +1685,107 @@ "若网速慢或有数据流量限制，该数值至关重要。</P>\n" #. help text for software proposal - header -#: src/modules/Packages.rb:351 +#: src/modules/Packages.rb:353 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:368 +#: src/modules/Packages.rb:370 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:382 +#: src/modules/Packages.rb:384 msgid "System Type: %1" msgstr "系统类型：%1" -#: src/modules/Packages.rb:393 +#: src/modules/Packages.rb:395 msgid "Patterns:<br>" msgstr "软件集：<br>" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:403 +#: src/modules/Packages.rb:405 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:416 +#: src/modules/Packages.rb:418 msgid "Downloading from Remote Repositories: %1" msgstr "正在从远程软件源中下载：%1" -#: src/modules/Packages.rb:478 +#: src/modules/Packages.rb:480 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:502 +#: src/modules/Packages.rb:504 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:506 +#: src/modules/Packages.rb:508 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:547 +#: src/modules/Packages.rb:549 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:567 +#: src/modules/Packages.rb:569 msgid "Warning: Cannot check free space in directory %1 (device %2)." msgstr "警告：无法检查文件夹 %1 (设备 %2) 中的空闲空间。" #. summary warning -#: src/modules/Packages.rb:610 +#: src/modules/Packages.rb:612 msgid "Not enough disk space." msgstr "磁盘空间不足。" #. summary warning -#: src/modules/Packages.rb:612 +#: src/modules/Packages.rb:614 msgid "Not enough disk space. Remove some packages in the single selection." msgstr "磁盘空间不足。请从孤立软件包选集中移除一些软件包。" #. add a backslash if it's missing -#: src/modules/Packages.rb:633 +#: src/modules/Packages.rb:635 msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "分区 %3 上只有 %1 (%2%%) 的空闲空间。<BR>" #. newly installed products -#: src/modules/Packages.rb:702 +#: src/modules/Packages.rb:704 msgid "New product <b>%s</b> will be installed" msgstr "即将安装新产品 <b>%s</b>" #. product update: %s is a product name -#: src/modules/Packages.rb:712 +#: src/modules/Packages.rb:714 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:714 +#: src/modules/Packages.rb:716 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:721 +#: src/modules/Packages.rb:723 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:731 +#: src/modules/Packages.rb:733 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "<b>警告：</b>即将移除产品 <b>%s</b>。" -#: src/modules/Packages.rb:732 +#: src/modules/Packages.rb:734 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>" msgstr "<b>错误：</b>即将自动移除产品 <b>%s</b>。</font>" #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:758 +#: src/modules/Packages.rb:760 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" @@ -1791,12 +1801,12 @@ "</ul></li></ul>" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1339 +#: src/modules/Packages.rb:1345 msgid "No repository found at '%1'." msgstr "在 '%1' 下找不到软件源。" #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1612 +#: src/modules/Packages.rb:1618 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" @@ -1806,31 +1816,31 @@ "安装期间若互联网连接可用，您可从 SUSE Linux 网络服务器下载更新的版本资讯。</b></p>\n" #. popup - information label -#: src/modules/Packages.rb:1639 +#: src/modules/Packages.rb:1645 msgid "Integrating booted media..." msgstr "正在集成已引导的介质..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1661 +#: src/modules/Packages.rb:1667 msgid "Failed to integrate the service pack repository." msgstr "集成服务包软件源失败。" #. popup - information label -#: src/modules/Packages.rb:1694 +#: src/modules/Packages.rb:1700 msgid "Initializing repositories..." msgstr "正在初始化软件源..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1926 +#: src/modules/Packages.rb:1932 msgid "Insert %1 CD 1" msgstr "请插入 %1 CD 1" -#: src/modules/Packages.rb:1928 +#: src/modules/Packages.rb:1934 msgid "%1 CD 1 not found" msgstr "%1 未找到 CD 1" #. an error message -#: src/modules/Packages.rb:2038 +#: src/modules/Packages.rb:2044 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -1839,7 +1849,7 @@ "更多细节请检查日志文件 %1。" #. bnc #436925 -#: src/modules/Packages.rb:2299 +#: src/modules/Packages.rb:2305 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." @@ -1848,12 +1858,12 @@ "将再次调出软件提案。" #. popup label -#: src/modules/Packages.rb:2317 +#: src/modules/Packages.rb:2323 msgid "Evaluating package selection..." msgstr "正在评估软件包选集..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2615 +#: src/modules/Packages.rb:2621 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -1863,7 +1873,7 @@ #. Sets that the license (file) has been already accepted #. -#. @param string filename +#. @param [String] license_ident file name #: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157 msgid "Cannot read license file %1" msgstr "无法读取许可文件 %1" @@ -1903,18 +1913,21 @@ "这会是人生中怎样遗憾的事啊！为了避免您的人生有所缺憾，请选择是。这只是您电脑生涯中的一小步，却会是您精彩人生中的一大步！</p>\n" #. dialog title +#. #459391 +#. If a progress is running open another dialog #. dialog caption -#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211 +#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149 +#: src/modules/ProductLicense.rb:1227 msgid "License Agreement" msgstr "许可协议" #. popup question -#: src/modules/ProductLicense.rb:1016 +#: src/modules/ProductLicense.rb:1021 msgid "Really abort the add-on product installation?" msgstr "真的中止附加产品安装吗？" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1040 +#: src/modules/ProductLicense.rb:1045 msgid "" "Refusing the license agreement cancels the installation.\n" "Really refuse the agreement?" @@ -1923,7 +1936,7 @@ "真的拒绝协议吗？你一定会后悔的！" #. text asking whether to refuse a license (Yes-No popup) -#: src/modules/ProductLicense.rb:1043 +#: src/modules/ProductLicense.rb:1048 msgid "" "Refusing the license agreement cancels the add-on\n" "product installation. Really refuse the agreement?" @@ -1932,12 +1945,19 @@ "真的拒绝协议吗？" #. timed ok/cancel popup -#: src/modules/ProductLicense.rb:1053 +#: src/modules/ProductLicense.rb:1058 msgid "The system is shutting down..." msgstr "系统正在关机..." +#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" +#: src/modules/ProductLicense.rb:1153 +#, fuzzy +#| msgid " License Agreement" +msgid "%s License Agreement" +msgstr " 许可协议" + #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found -#: src/modules/ProductLicense.rb:1577 +#: src/modules/ProductLicense.rb:1593 msgid "" "If you want to print this EULA, you can download it from\n" "%{license_url}" @@ -1992,202 +2012,196 @@ msgid "Downloading delta RPM %1 (download size %2)" msgstr "正在下载增量 RPM %1 (下载大小 %2)" -#. remote -#: src/modules/SlideShowCallbacks.rb:461 -msgid "Downloading patch RPM %1 (download size %2)" -msgstr "正在下载补丁 RPM %1 (下载大小 %2)" - #. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:483 +#: src/modules/SlideShowCallbacks.rb:472 msgid "Failed to download delta RPM: %1" msgstr "下载增量 RPM 失败：%1" #. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:492 +#: src/modules/SlideShowCallbacks.rb:481 msgid "Failed to apply delta RPM: %1" msgstr "应用增量 RPM 失败：%1" -#. error in installation log, %1 is detail error description -#: src/modules/SlideShowCallbacks.rb:501 -msgid "Failed to download patch RPM: %1" -msgstr "下载补丁 RPM 失败：%1" - #. radio button -#: src/modules/SourceDialogs.rb:31 +#: src/modules/SourceDialogs.rb:33 msgid "&Scan Using SLP..." msgstr "使用 SLP 扫描(&S)..." #. radio button -#: src/modules/SourceDialogs.rb:33 +#: src/modules/SourceDialogs.rb:35 msgid "Commun&ity Repositories" msgstr "社区软件源(&I)" #. radio button -#: src/modules/SourceDialogs.rb:35 +#: src/modules/SourceDialogs.rb:37 msgid "&Extensions and Modules from Registration Server..." msgstr "来自注册服务器的扩展和模块(&E)..." #. radio button -#: src/modules/SourceDialogs.rb:37 +#: src/modules/SourceDialogs.rb:39 msgid "Specify &URL..." msgstr "指定 &URL..." #. radio button -#: src/modules/SourceDialogs.rb:39 +#: src/modules/SourceDialogs.rb:41 msgid "&FTP..." msgstr "&FTP..." #. radio button -#: src/modules/SourceDialogs.rb:41 +#: src/modules/SourceDialogs.rb:43 msgid "&HTTP..." msgstr "&HTTP..." #. radio button -#: src/modules/SourceDialogs.rb:43 +#: src/modules/SourceDialogs.rb:45 msgid "HTT&PS..." msgstr "HTT&PS..." #. radio button #. radio button -#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720 -msgid "&SMB/CIFS" +#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757 +#, fuzzy +#| msgid "&SMB/CIFS" +msgid "S&MB/CIFS" msgstr "&SMB/CIFS" #. radio button -#: src/modules/SourceDialogs.rb:47 -msgid "&NFS..." +#: src/modules/SourceDialogs.rb:49 +#, fuzzy +#| msgid "&NFS..." +msgid "NF&S..." msgstr "&NFS..." #. radio button -#: src/modules/SourceDialogs.rb:49 +#: src/modules/SourceDialogs.rb:51 msgid "&CD..." msgstr "&CD..." #. radio button -#: src/modules/SourceDialogs.rb:51 +#: src/modules/SourceDialogs.rb:53 msgid "&DVD..." msgstr "&DVD..." #. radio button -#: src/modules/SourceDialogs.rb:53 +#: src/modules/SourceDialogs.rb:55 msgid "&Hard Disk..." msgstr "硬盘(&H)..." #. radio button -#: src/modules/SourceDialogs.rb:55 +#: src/modules/SourceDialogs.rb:57 msgid "&USB Mass Storage (USB Stick, Disk)..." msgstr "&USB 大容量存储 (USB 记忆棒、磁盘)..." #. radio button -#: src/modules/SourceDialogs.rb:57 +#: src/modules/SourceDialogs.rb:59 msgid "&Local Directory..." msgstr "本地文件夹(&L)..." #. radio button -#: src/modules/SourceDialogs.rb:59 +#: src/modules/SourceDialogs.rb:61 msgid "&Local ISO Image..." msgstr "本地 ISO 映像(&L)..." #. check box -#: src/modules/SourceDialogs.rb:61 +#: src/modules/SourceDialogs.rb:63 msgid "&Download repository description files" msgstr "下载软件源描述文件(&D)" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:110 +#: src/modules/SourceDialogs.rb:116 msgid "" "<p>If the location is a file holding an ISO image\n" "of the media, set <b>ISO Image</b>.</p>" msgstr "<p>若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>" #. Help text suffix for some types of the media -#: src/modules/SourceDialogs.rb:115 +#: src/modules/SourceDialogs.rb:121 msgid "" "<p>If the repository is on multiple media,\n" "set the location of the first media of the set.</p>\n" msgstr "<p>若该软件源位于多个介质上，请设置该组介质的第一个介质的位置。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:129 +#: src/modules/SourceDialogs.rb:135 msgid "&Server Name" msgstr "服务器名称(&S)" #. text entry #. text entry -#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584 +#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621 msgid "&Path to Directory or ISO Image" msgstr "文件夹或 ISO 映像路径(&P)" #. checkbox label -#: src/modules/SourceDialogs.rb:145 +#: src/modules/SourceDialogs.rb:151 msgid "&ISO Image" msgstr "&ISO 映像" #. checkbox label -#: src/modules/SourceDialogs.rb:147 +#: src/modules/SourceDialogs.rb:153 msgid "N&FS v4 Protocol" msgstr "N&FS v4 协议" -#: src/modules/SourceDialogs.rb:153 +#: src/modules/SourceDialogs.rb:159 msgid "Mount Options" msgstr "挂载选项" #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp #. NFS mount option (users can change it to anything else, the field is editable) -#: src/modules/SourceDialogs.rb:157 +#: src/modules/SourceDialogs.rb:163 msgid "(default)" msgstr "(默认)" -#: src/modules/SourceDialogs.rb:168 +#: src/modules/SourceDialogs.rb:174 msgid "URL of the Repository" msgstr "软件源 URL" #. frame -#: src/modules/SourceDialogs.rb:177 +#: src/modules/SourceDialogs.rb:183 msgid "P&rotocol" msgstr "协议(&R)" #. input field label -#: src/modules/SourceDialogs.rb:187 +#: src/modules/SourceDialogs.rb:193 msgid "&URL of the Repository" msgstr "软件源 &URL" #. label / dialog caption #. bugzilla #219759 #. service label can be empty (not defined) -#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323 +#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323 msgid "Repository URL" msgstr "软件源 URL" #. label / dialog caption -#: src/modules/SourceDialogs.rb:204 +#: src/modules/SourceDialogs.rb:210 msgid "NFS Server" msgstr "NFS 服务器" #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208 +#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214 msgid "CD or DVD Media" msgstr "CD 或 DVD 介质" #. label / dialog caption -#: src/modules/SourceDialogs.rb:210 +#: src/modules/SourceDialogs.rb:216 msgid "Hard Disk" msgstr "硬盘" #. label / dialog caption -#: src/modules/SourceDialogs.rb:212 +#: src/modules/SourceDialogs.rb:218 msgid "USB Stick or Disk" msgstr "USB 记忆棒或磁盘" #. label / dialog caption #. dialog caption -#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889 +#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926 msgid "Local Directory" msgstr "本地文件夹" #. label / dialog caption -#: src/modules/SourceDialogs.rb:216 +#: src/modules/SourceDialogs.rb:222 msgid "Local ISO Image" msgstr "本地 ISO 映像" @@ -2196,24 +2210,24 @@ #. label / dialog caption #. label / dialog caption #. label / dialog caption -#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220 -#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224 -#: src/modules/SourceDialogs.rb:226 +#: src/modules/SourceDialogs.rb:224 src/modules/SourceDialogs.rb:226 +#: src/modules/SourceDialogs.rb:228 src/modules/SourceDialogs.rb:230 +#: src/modules/SourceDialogs.rb:232 msgid "Server and Directory" msgstr "服务器和文件夹" #. popup message -#: src/modules/SourceDialogs.rb:441 +#: src/modules/SourceDialogs.rb:468 msgid "The name of the repository cannot be empty." msgstr "软件源名称不能为空。" #. text entry -#: src/modules/SourceDialogs.rb:453 +#: src/modules/SourceDialogs.rb:480 msgid "&Repository Name" msgstr "软件源名称(&R)" #. help text -#: src/modules/SourceDialogs.rb:468 +#: src/modules/SourceDialogs.rb:495 msgid "" "<p><big><b>Repository Name</b></big><br>\n" "Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n" @@ -2222,12 +2236,12 @@ "使用<b>软件源名称</b>指定软件源名称。若留空，YaST 将使用产品名 (若有) 或 URL 作为其名称。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:482 +#: src/modules/SourceDialogs.rb:509 msgid "&Service Name" msgstr "服务名称(&S)" #. help text -#: src/modules/SourceDialogs.rb:490 +#: src/modules/SourceDialogs.rb:517 msgid "" "<p><big><b>Service Name</b></big><br>\n" "Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n" @@ -2236,17 +2250,17 @@ "使用<b>服务名称</b>指定服务名。若留空，YaST 将使用服务 URL 的一部分作为其名称。</p>\n" #. popup message -#: src/modules/SourceDialogs.rb:525 +#: src/modules/SourceDialogs.rb:552 msgid "URL cannot be empty." msgstr "URL 不能为空。" #. text entry -#: src/modules/SourceDialogs.rb:538 +#: src/modules/SourceDialogs.rb:566 msgid "&URL" msgstr "&URL" #. help text -#: src/modules/SourceDialogs.rb:552 +#: src/modules/SourceDialogs.rb:580 msgid "" "<p><big><b>Repository URL</b></big><br>\n" "Use <b>URL</b> to specify the URL of the repository.</p>" @@ -2258,16 +2272,16 @@ #. @return widget description map #. Get widget description map #. @return widget description map -#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852 +#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893 msgid "Edit Parts of the URL" msgstr "编辑部分 URL" -#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859 +#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900 msgid "Edit Complete URL" msgstr "编辑完整 URL" #. help text -#: src/modules/SourceDialogs.rb:744 +#: src/modules/SourceDialogs.rb:772 msgid "" "<p><big><b>NFS Server</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2277,7 +2291,7 @@ "使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>\n" "指定 NFS 服务器主机名和服务器上的路径。<p>" -#: src/modules/SourceDialogs.rb:751 +#: src/modules/SourceDialogs.rb:779 msgid "" "<p><big><b>Mount Options</b></big><br>\n" "You can specify extra options used for mounting the NFS volume.\n" @@ -2289,16 +2303,16 @@ "这是一个专家选项，推荐保持默认值。细节和支持选项列表请参考 <b>man 5 nfs</b>。" #. radio button -#: src/modules/SourceDialogs.rb:806 +#: src/modules/SourceDialogs.rb:834 msgid "&CD-ROM" msgstr "&CD-ROM" #. radio button -#: src/modules/SourceDialogs.rb:808 +#: src/modules/SourceDialogs.rb:836 msgid "&DVD-ROM" msgstr "&DVD-ROM" -#: src/modules/SourceDialogs.rb:813 +#: src/modules/SourceDialogs.rb:841 msgid "" "<p><big><b>CD or DVD Media</b></big><br>\n" "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>" @@ -2307,26 +2321,26 @@ "设置 <b>CD-ROM</b> 或 <b>DVD-ROM</b> 以指定介质类型。</p>" #. dialog caption -#: src/modules/SourceDialogs.rb:904 +#: src/modules/SourceDialogs.rb:941 msgid "ISO Image File" msgstr "ISO 映像文件" #. error popup - the entered path is not a directory -#: src/modules/SourceDialogs.rb:927 +#: src/modules/SourceDialogs.rb:964 msgid "" "The entered path is not a directory\n" "or the directory does not exist.\n" msgstr "输入路径不是一个文件夹或该文件夹不存在。\n" #. error popup - the entered path is not a regular file -#: src/modules/SourceDialogs.rb:957 +#: src/modules/SourceDialogs.rb:994 msgid "" "The entered path is not a file\n" "or the file does not exist.\n" msgstr "输入路径不是一个文件或该文件不存在。\n" #. continue/cancel popup, %1 is a file name -#: src/modules/SourceDialogs.rb:981 +#: src/modules/SourceDialogs.rb:1018 msgid "" "File '%1'\n" "does not seem to be an ISO image.\n" @@ -2337,17 +2351,17 @@ "仍然使用它吗？\n" #. text entry -#: src/modules/SourceDialogs.rb:1002 +#: src/modules/SourceDialogs.rb:1039 msgid "&Path to Directory" msgstr "文件夹路径(&P)" #. checkbox label -#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268 -#: src/modules/SourceDialogs.rb:1335 +#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305 +#: src/modules/SourceDialogs.rb:1372 msgid "&Plain RPM Directory" msgstr "纯 RPM 文件夹(&P)" -#: src/modules/SourceDialogs.rb:1025 +#: src/modules/SourceDialogs.rb:1062 msgid "" "<p><big><b>Local Directory</b></big><br>\n" "Use <b>Path to Directory</b> to specify the path to the\n" @@ -2362,20 +2376,20 @@ "<b>纯 RPM 文件夹</b>选项。</p>\n" #. `opt(`hstretch), -#: src/modules/SourceDialogs.rb:1261 +#: src/modules/SourceDialogs.rb:1298 msgid "&USB Mass Storage Device" msgstr "&USB 大容量存储设备" #. the spacing is added to make the widget wider -#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333 +#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370 msgid "&File System" msgstr "文件系统(&F)" -#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334 +#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371 msgid "Dire&ctory" msgstr "文件夹(&C)" -#: src/modules/SourceDialogs.rb:1272 +#: src/modules/SourceDialogs.rb:1309 msgid "" "<p><big><b>USB Stick or Disk</b></big><br>\n" "Select the USB device on which the repository is located.\n" @@ -2395,7 +2409,7 @@ #. 'auto' is a value in the combo box widget, do not translate it! #. 'auto' is a value in the combo box widget, do not translate it! -#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349 +#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386 msgid "" "<p>The file system used on the device will be detected automatically\n" "if you select file system 'auto'. If the detection fails or you\n" @@ -2405,11 +2419,11 @@ "若检测失败，或您想要使用特定文件系统，还可从列表中选择。</p>\n" #. combobox title -#: src/modules/SourceDialogs.rb:1332 +#: src/modules/SourceDialogs.rb:1369 msgid "&Disk Device" msgstr "磁盘设备(&D)" -#: src/modules/SourceDialogs.rb:1339 +#: src/modules/SourceDialogs.rb:1376 msgid "" "<p><big><b>Disk</b></big><br>\n" "Select the disk on which the repository is located.\n" @@ -2427,12 +2441,12 @@ "<b>纯 RPM 文件夹</b>选项。</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:1365 +#: src/modules/SourceDialogs.rb:1402 msgid "&Path to ISO Image" msgstr "ISO 映像路径(&P)" #. push button -#: src/modules/SourceDialogs.rb:1385 +#: src/modules/SourceDialogs.rb:1422 msgid "" "<p><big><b>Local ISO Image</b></big><br>\n" "Use <b>Path to ISO Image</b> to specify the path to the\n" @@ -2442,71 +2456,71 @@ "使用<b>ISO 映像路径</b>指定 ISO 映像文件的路径。</p>" #. text entry -#: src/modules/SourceDialogs.rb:1566 +#: src/modules/SourceDialogs.rb:1603 msgid "Server &Name" msgstr "服务器名称(&N)" -#: src/modules/SourceDialogs.rb:1570 +#: src/modules/SourceDialogs.rb:1607 msgid "&Port" msgstr "端口(&P)" #. text entry -#: src/modules/SourceDialogs.rb:1575 +#: src/modules/SourceDialogs.rb:1612 msgid "&Share" msgstr "共享(&S)" #. checkbox label -#: src/modules/SourceDialogs.rb:1588 +#: src/modules/SourceDialogs.rb:1625 msgid "ISO &Image" msgstr "&ISO 映像" #. text entry -#: src/modules/SourceDialogs.rb:1591 +#: src/modules/SourceDialogs.rb:1628 msgid "&Directory on Server" msgstr "服务器上的文件夹(&D)" #. frame -#: src/modules/SourceDialogs.rb:1596 +#: src/modules/SourceDialogs.rb:1633 msgid "Au&thentication" msgstr "认证(&T)" #. check box -#: src/modules/SourceDialogs.rb:1603 +#: src/modules/SourceDialogs.rb:1640 msgid "&Anonymous" msgstr "匿名(&A)" #. text entry -#: src/modules/SourceDialogs.rb:1612 +#: src/modules/SourceDialogs.rb:1649 msgid "&Workgroup or Domain" msgstr "工作组或域(&W)" #. text entry -#: src/modules/SourceDialogs.rb:1621 +#: src/modules/SourceDialogs.rb:1658 msgid "&User Name" msgstr "用户名(&U)" #. password entry -#: src/modules/SourceDialogs.rb:1628 +#: src/modules/SourceDialogs.rb:1665 msgid "&Password" msgstr "密码(&P)" #. radio button -#: src/modules/SourceDialogs.rb:1703 +#: src/modules/SourceDialogs.rb:1740 msgid "&FTP" msgstr "&FTP" #. radio button -#: src/modules/SourceDialogs.rb:1706 +#: src/modules/SourceDialogs.rb:1743 msgid "H&TTP" msgstr "H&TTP" #. radio button -#: src/modules/SourceDialogs.rb:1713 +#: src/modules/SourceDialogs.rb:1750 msgid "HTT&PS" msgstr "HTT&PS" #. help text - server dialog -#: src/modules/SourceDialogs.rb:1883 +#: src/modules/SourceDialogs.rb:1924 msgid "" "<p><big><b>Server and Directory</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2527,7 +2541,7 @@ "若该位置是保存介质 ISO 映像的文件，请设置 <b>ISO 映像</b>。</p>\n" #. help text - server dialog, there is a "Port" widget -#: src/modules/SourceDialogs.rb:1896 +#: src/modules/SourceDialogs.rb:1937 msgid "" "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n" "Leave it empty to use the default port.</p>\n" @@ -2538,12 +2552,12 @@ #. Returns whether Community Repositories are defined in the control file. #. #. @return [Boolean] whether defined -#: src/modules/SourceDialogs.rb:1958 +#: src/modules/SourceDialogs.rb:1999 msgid "I would like to install an additional Add On Product" msgstr "我想要安装一个额外的附加产品" #. help text -#: src/modules/SourceDialogs.rb:2085 +#: src/modules/SourceDialogs.rb:2126 msgid "" "<p><big><b>Media Type</b></big><br>\n" "The software repository can be located on CD, on a network server,\n" @@ -2553,7 +2567,7 @@ "软件源可位于 CD、网络服务器或硬盘上。</p>" #. help, continued -#: src/modules/SourceDialogs.rb:2094 +#: src/modules/SourceDialogs.rb:2135 msgid "" "<p>\n" "To add <b>CD</b> or <b>DVD</b>,\n" @@ -2564,7 +2578,7 @@ "请准备好产品 CD 集或 DVD。</p>" #. help, continued -#: src/modules/SourceDialogs.rb:2104 +#: src/modules/SourceDialogs.rb:2145 msgid "" "<p>\n" "The product CDs can be copied to the hard disk.\n" @@ -2578,7 +2592,7 @@ "若已将全部 CD 复制进了相同文件夹，则只需输入基本路径。</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2116 +#: src/modules/SourceDialogs.rb:2157 msgid "" "<p>\n" "Network installation requires a working network connection.\n" @@ -2590,25 +2604,25 @@ "请指定第一张 CD 中的软件包所在的文件夹，诸如 /data1/CD1。</p>\n" #. error popup -#: src/modules/SourceDialogs.rb:2131 +#: src/modules/SourceDialogs.rb:2172 msgid "Select the media type" msgstr "选择介质类型" -#: src/modules/SourceDialogs.rb:2137 +#: src/modules/SourceDialogs.rb:2178 msgid "Insert the add-on product CD" msgstr "请插入附加产品 CD" -#: src/modules/SourceDialogs.rb:2138 +#: src/modules/SourceDialogs.rb:2179 msgid "Insert the add-on product DVD" msgstr "请插入附加产品 DVD" #. ask for a medium -#: src/modules/SourceDialogs.rb:2156 +#: src/modules/SourceDialogs.rb:2197 msgid "No USB disk was detected." msgstr "未检测到 USB 磁盘。" -#. TODO: disable "download" option when CD or DVD source is selected -#: src/modules/SourceDialogs.rb:2359 +#. use three slashes as third slash means path +#: src/modules/SourceDialogs.rb:2403 msgid "" "<p><b>Download Files</b><br>\n" "Each repository has description files which describe the content of the\n" @@ -2622,15 +2636,24 @@ "若不选该选项，则 YaST 将在稍后需要这些文件时自动下载它们。</p>\n" #. dialog caption -#: src/modules/SourceDialogs.rb:2578 +#: src/modules/SourceDialogs.rb:2623 msgid "Media Type" msgstr "介质类型" #. dialog caption -#: src/modules/SourceDialogs.rb:2602 +#: src/modules/SourceDialogs.rb:2647 msgid "Add On Product" msgstr "附加产品" +#. Returns boolean whether user confirmed to abort the configuration +#. +#. @return [Boolean] whether to abort +#: src/modules/SourceDialogs.rb:2678 +#, fuzzy +#| msgid "URL entered is not valid" +msgid "URL scheme '%s' is not valid." +msgstr "输入的 URL 无效" + #. SourceManager read dialog caption #: src/modules/SourceManager.rb:100 msgid "Initializing Available Repositories" @@ -2724,7 +2747,7 @@ #. To adjust the width of the dialog, look for the more lengthy device label #. (and add some extra space for the frame) -#: src/modules/SourceManager.rb:670 +#: src/modules/SourceManager.rb:671 msgid "&Drive to eject" msgstr "要弹出的驱动器(&D)" @@ -2835,6 +2858,12 @@ msgid "Deselect some packages." msgstr "请反选一些软件包。" +#~ msgid "Downloading patch RPM %1 (download size %2)" +#~ msgstr "正在下载补丁 RPM %1 (下载大小 %2)" + +#~ msgid "Failed to download patch RPM: %1" +#~ msgstr "下载补丁 RPM 失败：%1" + #~ msgid "N&o, I Do not Agree" #~ msgstr "否，岁月很长就此别过(&O)" Modified: trunk/yast/zh_CN/po/pam.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/pam.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/pam.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pam\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-01 20:18+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pkg-bindings\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-01 21:40+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -46,18 +46,18 @@ msgstr "<P><BIG><B>正在刷新软件源</B></BIG></P><P>软件包管理器正在更新软件源内容...</P>" #. error message -#: src/Package.cc:651 +#: src/Package.cc:655 msgid "The package cannot be selected to install." msgstr "不能选择安装该软件包。" #. error message -#: src/Package.cc:657 +#: src/Package.cc:661 msgid "The package is not available." msgstr "软件包不可用。" #. still not initialized, throw an exception #. translators: this is an error message -#: src/PkgFunctions.cc:128 +#: src/PkgFunctions.cc:129 msgid "Cannot connect to the package manager" msgstr "无法连接软件包管理器" @@ -85,7 +85,7 @@ msgid "Download Descriptions" msgstr "下载描述" -#: src/Source_Create.cc:590 src/Source_Download.cc:402 src/Source_Load.cc:155 +#: src/Source_Create.cc:590 src/Source_Download.cc:407 src/Source_Load.cc:155 #: src/Source_Load.cc:479 msgid "Rebuild Cache" msgstr "重建缓存" @@ -99,17 +99,17 @@ msgid "Adding the Repository..." msgstr "正在添加软件源..." -#: src/Source_Download.cc:56 src/Source_Download.cc:320 +#: src/Source_Download.cc:56 src/Source_Download.cc:325 msgid "Downloading " msgstr "正在下载 " #. stages: "download", "build cache" -#: src/Source_Download.cc:401 +#: src/Source_Download.cc:406 msgid "Refresh Metadata" msgstr "刷新元数据" #. 3 steps per repository (download, cache rebuild, load resolvables) -#: src/Source_Download.cc:409 +#: src/Source_Download.cc:414 msgid "Refreshing Repository..." msgstr "正在刷新软件源..." Modified: trunk/yast/zh_CN/po/printer.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/printer.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/printer.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: printer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-01-31 23:09+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified \n" @@ -200,7 +200,7 @@ #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: -#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101 +#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098 #: src/include/printer/policies.rb:135 #: src/include/printer/printingvianetwork.rb:463 #: src/include/printer/sharing.rb:639 @@ -216,8 +216,8 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #. Remove the 'ServerName' entry in /etc/cups/client.conf: -#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220 -#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153 +#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217 +#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153 #: src/include/printer/printingvianetwork.rb:478 #: src/include/printer/sharing.rb:657 msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf" @@ -400,7 +400,7 @@ #. the currently used driver is then the very first entry in the SelectionBox. #: src/include/printer/basicadd.rb:187 src/include/printer/basicadd.rb:356 #: src/include/printer/basicadd.rb:588 src/include/printer/basicmodify.rb:1082 -#: src/modules/Printer.rb:1960 src/modules/Printer.rb:1986 +#: src/modules/Printer.rb:1954 src/modules/Printer.rb:1980 msgid "Select a driver." msgstr "选择一个驱动。" @@ -446,8 +446,8 @@ #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog #. does not preselect a connection so that the first connection in the list is preselected #. (via Table widget fallback) which is still better than an arbitrary preselected entry: -#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593 -#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153 +#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590 +#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150 msgid "Nothing Selected" msgstr "未选择任何项" @@ -625,8 +625,8 @@ #. Exit this dialog in any case: #. Return at least a list with only a fallback string so that the user is informed: #. Have the PageSize option topmost: -#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2211 -#: src/modules/Printer.rb:2341 +#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2205 +#: src/modules/Printer.rb:2335 msgid "No driver options available" msgstr "无可用的驱动选项" @@ -949,7 +949,11 @@ #. The user can also decide during the actual installation not to install it #. or the installation may have failed for whatever reason #. so that we test again whether or not it is now actually installed: +#. The user can also decide during the actual installation not to install it +#. or the installation may have failed for whatever reason +#. so that we test again whether or not it is now actually installed: #: src/include/printer/connectionwizard.rb:2002 +#: src/include/printer/connectionwizard.rb:2061 msgid "The RPM package cups-backends is not installed." msgstr "未安装 RPM 软件包 cups-backends。" @@ -958,130 +962,127 @@ msgid "Program (/path/to/command?option=value) [percent-encoded]" msgstr "程序 (/到/指令?选项=值/的/路径) [百分号编码]" +#: src/include/printer/connectionwizard.rb:2044 +#, fuzzy +#| msgid "<p>To configure Heartbeat, the <b>%1</b> package must be installed.</p>" +msgid "To use 'beh', the RPM package cups-backends must be installed." +msgstr "<p>要配置心跳，必须安装 <b>%1</b> 包。</p>" + #. TRANSLATORS: Text entry for device URI (Uniform Resource Identifier) -#: src/include/printer/connectionwizard.rb:2139 +#: src/include/printer/connectionwizard.rb:2163 msgid "Device URI (for which 'beh' should be applied) [percent-encoded]" msgstr "设备 URI ('beh'应被应用于它) [百分号编码]" #. TRANSLATORS: Check box -#: src/include/printer/connectionwizard.rb:2149 +#: src/include/printer/connectionwizard.rb:2173 msgid "Never Disable the Queue" msgstr "永不禁用队列" #. TRANSLATORS: Text entry -#: src/include/printer/connectionwizard.rb:2157 +#: src/include/printer/connectionwizard.rb:2181 msgid "Number of Retries ('0' means infinite retries)" msgstr "重试次数（0指无限）" #. TRANSLATORS: Text entry -#: src/include/printer/connectionwizard.rb:2165 +#: src/include/printer/connectionwizard.rb:2189 msgid "Delay in Seconds Between Two Retries" msgstr "两次重试时间间隔秒数" -#: src/include/printer/connectionwizard.rb:2172 -#: src/include/printer/connectionwizard.rb:2265 +#: src/include/printer/connectionwizard.rb:2197 +#: src/include/printer/connectionwizard.rb:2293 msgid "Select a specific connection type." msgstr "选择一个指定的连接类型。" #. TRANSLATORS: Label for tree widget description -#: src/include/printer/connectionwizard.rb:2190 +#: src/include/printer/connectionwizard.rb:2215 msgid "&Connection Type" msgstr "连接类型(&C)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2195 +#: src/include/printer/connectionwizard.rb:2220 msgid "Directly Connected Device" msgstr "直连设备" -#: src/include/printer/connectionwizard.rb:2198 -msgid "Parallel Port" -msgstr "并行端口" - +#. Disabled legacy "Parallel Port" so that it is no longer accessible in the dialog: +#. Item(Id(:parallel), _("Parallel Port")), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2200 +#: src/include/printer/connectionwizard.rb:2226 msgid "USB Port" msgstr "USB 端口" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2202 +#: src/include/printer/connectionwizard.rb:2228 msgid "HP Devices (HPLIP)" msgstr "惠普设备 (HPLIP)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2204 -msgid "Serial Port" -msgstr "串行端口" - +#. Disabled legacy "Serial Port" so that it is no longer accessible in the dialog: +#. Item(Id(:serial), _("Serial Port")), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2206 +#: src/include/printer/connectionwizard.rb:2233 msgid "Bluetooth" msgstr "蓝牙" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2212 +#: src/include/printer/connectionwizard.rb:2239 msgid "Access Network Printer or Printserver Box via" msgstr "连接网络打印机或打印服务器盒的方式" -#: src/include/printer/connectionwizard.rb:2215 +#: src/include/printer/connectionwizard.rb:2242 msgid "TCP Port (AppSocket/JetDirect)" msgstr "TCP 端口 (AppSocket/JetDirect)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2217 +#: src/include/printer/connectionwizard.rb:2244 msgid "Line Printer Daemon (LPD) Protocol" msgstr "行式打印机守护精灵(LPD)协议" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2219 +#: src/include/printer/connectionwizard.rb:2246 msgid "Internet Printing Protocol (IPP)" msgstr "网络打印协议(IPP)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2225 +#: src/include/printer/connectionwizard.rb:2252 msgid "Print via Print Server Machine" msgstr "通过打印服务器打印" -#: src/include/printer/connectionwizard.rb:2228 +#: src/include/printer/connectionwizard.rb:2255 msgid "Windows (R) or Samba (SMB/CIFS)" msgstr "Windows (R) 或 Samba (SMB/CIFS)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2230 +#: src/include/printer/connectionwizard.rb:2257 msgid "Traditional UNIX Server (LPR/LPD)" msgstr "传统 UNIX 服务器 (LPR/LPD)" #. `item( `id(`iprint), _("iPrint (Novell OES)") ), #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2233 +#: src/include/printer/connectionwizard.rb:2260 msgid "CUPS Server (IPP)" msgstr "通用 UNIX 打印系统服务器 (网络打印协议)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2235 -msgid "Novell Netware Print Server (IPX)" -msgstr "Novell Netware 打印服务器 (IPX)" - -#. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2241 +#: src/include/printer/connectionwizard.rb:2269 msgid "Special" msgstr "特殊" -#: src/include/printer/connectionwizard.rb:2244 +#: src/include/printer/connectionwizard.rb:2272 msgid "Specify Arbitrary Device URI" msgstr "指定专有设备 URI" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2248 +#: src/include/printer/connectionwizard.rb:2276 msgid "Send Print Data to Other Program (pipe)" msgstr "将打印数据发送到其他程序 (管道 pipe)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2251 +#: src/include/printer/connectionwizard.rb:2279 msgid "Daisy-chain Backend Error Handler (beh)" msgstr "Daisy-chain 后端错误处理 (beh)" #. TRANSLATORS: Tree widget item -#: src/include/printer/connectionwizard.rb:2262 +#: src/include/printer/connectionwizard.rb:2290 msgid "Connection Settings" msgstr "连接设置" @@ -1096,7 +1097,7 @@ #. and the button with the "back" functionality is named "Cancel". #. According to the YaST Style Guide (dated Thu, 06 Nov 2008) #. the "finish" button in a single (step) configuration dialog must now be named "OK". -#: src/include/printer/connectionwizard.rb:2285 +#: src/include/printer/connectionwizard.rb:2313 msgid "Connection Wizard" msgstr "连接向导" @@ -1105,12 +1106,12 @@ #. i.e. the scsi backend will be dropped. #. Therefore in yast2-printer SCSI printer support is also dropped. #. Because of the dropped scsi backend there must be a user notification: -#: src/include/printer/connectionwizard.rb:2338 +#: src/include/printer/connectionwizard.rb:2366 msgid "In CUPS version 1.5 SCSI printer support is dropped." msgstr "CUPS 1.5 版中移除了微机接口 SCSI 打印机支持。" #. Popup::ErrorDetails details (for experts only): -#: src/include/printer/connectionwizard.rb:2340 +#: src/include/printer/connectionwizard.rb:2368 msgid "" "An untested and insecure workaround might be\n" "to set 'FileDevice Yes' in cupsd.conf\n" @@ -1122,13 +1123,13 @@ #. while a Device URI to access a network printer via IPP #. does probably not contain "/printers/" so that this is used here #. as a best effort attempt to distinguish both cases: -#: src/include/printer/connectionwizard.rb:2415 +#: src/include/printer/connectionwizard.rb:2443 msgid "Select a connection" msgstr "选择一个连接" #. Body of a Popup::AnyMessage when no connection was selected #. because there is no connection available to be selected: -#: src/include/printer/connectionwizard.rb:2418 +#: src/include/printer/connectionwizard.rb:2446 msgid "" "If no connection is shown here, it is not possible\n" "to access the device via this type of connection.\n" @@ -1137,13 +1138,13 @@ "如果这里没有显示连接，就无法使用此类连接访问设备。\n" "打印机是一直连接并开机的吗？" -#: src/include/printer/connectionwizard.rb:2426 +#: src/include/printer/connectionwizard.rb:2454 msgid "Select a valid connection" msgstr "选择一个有效连接" #. Body of a Popup::AnyMessage when an invalid connection was selected #. because the current connection is no longer valid: -#: src/include/printer/connectionwizard.rb:2429 +#: src/include/printer/connectionwizard.rb:2457 msgid "" "When the current connection is no longer valid,\n" "it does no longer work to access the device via this connection.\n" @@ -1152,41 +1153,45 @@ "当当前连接不再有效时，就不再可以通过此连接访问设备。\n" "打印机依然连接并开着吗？" -#: src/include/printer/connectionwizard.rb:2469 +#: src/include/printer/connectionwizard.rb:2497 msgid "Serial device and baud rate could not be empty." msgstr "串口设备和 baud 比率不能为空。" -#: src/include/printer/connectionwizard.rb:2473 +#: src/include/printer/connectionwizard.rb:2501 msgid "The 'space' parity checking is only supported with 7 data bits." msgstr "'space' 奇偶校验只支持 7 个数据位。" -#: src/include/printer/connectionwizard.rb:2481 +#: src/include/printer/connectionwizard.rb:2509 msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit." msgstr "'mark' 奇偶校验只支持 7 个数据位和一个停止位。" -#: src/include/printer/connectionwizard.rb:2523 +#: src/include/printer/connectionwizard.rb:2551 msgid "Bluetooth device ID could not be empty." msgstr "蓝牙设备 ID 不能为空。" #. because special URI characters like ':' or '/' in connection_uri #. must stay as is and not be percent encoded because only the values #. of the URI parts must be percent encoded but not the whole URI. -#: src/include/printer/connectionwizard.rb:2536 +#: src/include/printer/connectionwizard.rb:2564 msgid "URI could not be empty." msgstr "URL 不能为空。" -#: src/include/printer/connectionwizard.rb:2546 +#: src/include/printer/connectionwizard.rb:2574 msgid "Servername and printer could not be empty." msgstr "服务器名和打印机不能为空。" -#: src/include/printer/connectionwizard.rb:2552 +#: src/include/printer/connectionwizard.rb:2580 msgid "Both user and password must be specified." msgstr "必须指定用户名和密码。" #. because special URI characters like '=' or '&' in tcp_uri_options #. must stay as is and not be percent encoded because tcp_uri_options #. contains all options like 'option1=value1&option2=value2'. -#: src/include/printer/connectionwizard.rb:2616 +#. Test whether or not a "client-only" server is accessible. +#. @param [String] server_name string of the "client-only" server name +#. +#. @return false if the "client-only" server is not accessible. +#: src/include/printer/connectionwizard.rb:2644 src/modules/Printer.rb:2348 msgid "Servername could not be empty." msgstr "服务器名不能为空。" @@ -1196,30 +1201,30 @@ #. because special URI characters like '=' or '&' in cups_uri_options #. must stay as is and not be percent encoded because cups_uri_options #. contains all options like 'option1=value1&option2=value2'. -#: src/include/printer/connectionwizard.rb:2654 -#: src/include/printer/connectionwizard.rb:2693 -#: src/include/printer/connectionwizard.rb:2720 +#: src/include/printer/connectionwizard.rb:2682 +#: src/include/printer/connectionwizard.rb:2721 +#: src/include/printer/connectionwizard.rb:2748 msgid "Servername and queue name could not be empty." msgstr "服务器名和队列名不能为空。" -#: src/include/printer/connectionwizard.rb:2747 +#: src/include/printer/connectionwizard.rb:2775 msgid "Device URI, number of retries, and delay could not be empty." msgstr "设备 URI，重试次数，和延迟不能为空。" #. because special URI characters like '/ ? = &' in pipe #. must stay as is and not be percent encoded because pipe #. contains all like 'path/to/command?option1=value1&option2=value2' -#: src/include/printer/connectionwizard.rb:2761 +#: src/include/printer/connectionwizard.rb:2789 msgid "Could not be empty." msgstr "不能为空。" #. Do not change or translate "raw", it is a technical term #. when no driver is used for a print queue. -#: src/include/printer/connectionwizard.rb:2784 +#: src/include/printer/connectionwizard.rb:2812 msgid "Select a manufacturer or 'raw queue'." msgstr "选择生产厂商或 '原始队列'。" -#: src/include/printer/connectionwizard.rb:2802 +#: src/include/printer/connectionwizard.rb:2830 msgid "Look up all hosts in the local network" msgstr "查询本地网络中的所有主机" @@ -1228,11 +1233,11 @@ #. Body of a Popup::ShowFeedback: #. Body of a Popup::ShowFeedback: #. Body of a Popup::ShowFeedback: -#: src/include/printer/connectionwizard.rb:2804 -#: src/include/printer/connectionwizard.rb:2831 -#: src/include/printer/connectionwizard.rb:2846 -#: src/include/printer/connectionwizard.rb:2861 -#: src/include/printer/connectionwizard.rb:2876 +#: src/include/printer/connectionwizard.rb:2832 +#: src/include/printer/connectionwizard.rb:2859 +#: src/include/printer/connectionwizard.rb:2874 +#: src/include/printer/connectionwizard.rb:2889 +#: src/include/printer/connectionwizard.rb:2904 msgid "" "Please wait...\n" "This could take more than a minute." @@ -1241,25 +1246,25 @@ "这可能会花一分多钟的时间。" #. where %1 will be replaced by the port number: -#: src/include/printer/connectionwizard.rb:2827 +#: src/include/printer/connectionwizard.rb:2855 msgid "Scan for hosts which are accessible via TCP port %1" msgstr "扫描可以通过 TCP 端口 %1 访问的主机" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2844 +#: src/include/printer/connectionwizard.rb:2872 msgid "Scan for hosts which are accessible via Samba (SMB)" msgstr "扫描可以通过 Samba (SMB) 访问的主机" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2859 +#: src/include/printer/connectionwizard.rb:2887 msgid "Scan for hosts which are accessible via port 515 (LPD/LPR)" msgstr "扫描可以通过端口 515 (LPD/LPR) 访问的主机" #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2874 +#: src/include/printer/connectionwizard.rb:2902 msgid "Scan for hosts which are accessible via port 631 (CUPS/IPP)" msgstr "扫描可以通过端口 631 (CUPS/IPP) 访问的主机" @@ -1269,7 +1274,7 @@ #. }); #. Sleep half a second to let the user notice the Popup::ShowFeedback in any case #. before it is removed even when the above SCR::Read finished immediately: -#: src/include/printer/connectionwizard.rb:2901 +#: src/include/printer/connectionwizard.rb:2929 msgid "" "Scanning in the network did not find any host.\n" "(Network issue or firewall active?)" @@ -1279,7 +1284,7 @@ #. where %1 will be replaced by the port number #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:2941 +#: src/include/printer/connectionwizard.rb:2969 msgid "Access test failed for port '%1' on host '%2'." msgstr "主机 '%2' 上的端口 '%1' 的访问测试失败。" @@ -1289,14 +1294,14 @@ #. and %2 will be replaced by the host name: #. where %1 will be replaced by the queue name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:2968 -#: src/include/printer/connectionwizard.rb:2994 -#: src/include/printer/connectionwizard.rb:3093 +#: src/include/printer/connectionwizard.rb:2996 +#: src/include/printer/connectionwizard.rb:3022 +#: src/include/printer/connectionwizard.rb:3121 msgid "Access test failed for queue '%1' on host '%2'." msgstr "主机 '%2' 上的队列 '%1' 的访问测试失败。" #. because there is authentication via Active Directory (R) required: -#: src/include/printer/connectionwizard.rb:3012 +#: src/include/printer/connectionwizard.rb:3040 msgid "" "This is only a generic test which may untruly report failures\n" "if authentication via Active Directory (R) is required.\n" @@ -1308,29 +1313,29 @@ #. where %1 will be replaced by the SMB share name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:3043 +#: src/include/printer/connectionwizard.rb:3071 msgid "The generic test reports failures for share '%1' on host '%2'." msgstr "通用测试报告了主机 '%2' 上的共享 '%1' 的错误。" #. where %1 will be replaced by the SMB share name #. and %2 will be replaced by the host name: -#: src/include/printer/connectionwizard.rb:3063 +#: src/include/printer/connectionwizard.rb:3091 msgid "Access test failed for share '%1' on host '%2'." msgstr "主机 ‘%2’ 上的共享 ‘%1’ 的访问测试失败。" #. Message of a Popup::ErrorDetails -#: src/include/printer/connectionwizard.rb:3105 +#: src/include/printer/connectionwizard.rb:3133 msgid "Test OK" msgstr "测试成功" #. Without a link name /usr/lib[64]/cups/backend/smb (which is provided by samba-client) #. the rest makes no sense (in particular the ln commands would create nonsense links in $PWD): -#: src/include/printer/connectionwizard.rb:3245 +#: src/include/printer/connectionwizard.rb:3273 msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed." msgstr "要访问活动目录 (R)，必须安装 RPM 软件包 samba-krb-printing。" #. Show a user notification before it gets disabled: -#: src/include/printer/connectionwizard.rb:3285 +#: src/include/printer/connectionwizard.rb:3313 msgid "Active Directory (R) support will be disabled for all SMB print queues." msgstr "所有 SMB 打印队列的活动目录 (R) 支持都将禁用。" @@ -1471,67 +1476,60 @@ msgid "SpliX Driver for SPL Printers without JBIG" msgstr "不带 JBIG 图像格式支持的 SPL 打印机的 SpliX 驱动" -#. CheckBox to select or un-select the printer driver package m2300w. -#. There is no need to have the package name "m2300w" in this text -#. because it is shown in a separated column to the left of this text. -#: src/include/printer/driveradd.rb:190 -msgid "Driver for Konica Minolta 2300W and 2400W (unmaintained)" -msgstr "Konica Minolta 2300W 和 2400W 的驱动(失去维护)" - #. CheckBox to select or un-select the printer driver package epson-inkjet-printer-escpr. #. There is no need to have the package name "epson-inkjet-printer-escpr" in this text #. because it is shown in a separated column to the left of this text. -#: src/include/printer/driveradd.rb:201 +#: src/include/printer/driveradd.rb:202 msgid "Epson ESC/P-R Inkjet Printer Driver" msgstr "爱普生 ESC/P-R 喷墨打印机驱动" #. Header for a dialog section where the user can #. make a printer description file (PPD file) available #. so that it can be used to set up a print queue with it: -#: src/include/printer/driveradd.rb:214 +#: src/include/printer/driveradd.rb:215 msgid "Make a Printer Description File Available" msgstr "使打印机描述文件可用" #. TextEntry to specify the full path of a PPD file: -#: src/include/printer/driveradd.rb:224 +#: src/include/printer/driveradd.rb:225 msgid "Printer description &file name with full path where it is located" msgstr "包含完整路径的打印机描述文件名(&f)" #. Label of a PushButton to open a file selection box #. to browse the file system to select a PPD file: -#: src/include/printer/driveradd.rb:234 +#: src/include/printer/driveradd.rb:235 msgid "&Browse" msgstr "浏览(&B)" #. Header for a AskForExistingFile popup dialog #. to browse the file system to select a PPD file: -#: src/include/printer/driveradd.rb:273 +#: src/include/printer/driveradd.rb:274 msgid "Select a printer description file" msgstr "选择打印机描述文件" #. where %1 will be replaced by the file name: -#: src/include/printer/driveradd.rb:660 +#: src/include/printer/driveradd.rb:666 msgid "Cannot access '%1'" msgstr "无法访问 '%1'" #. Simply exit this dialog because it does not make sense to proceed here #. and there is nothing else to be done after this: -#: src/include/printer/driveradd.rb:679 +#: src/include/printer/driveradd.rb:685 msgid "The printer description file is not in compliance with the specification." msgstr "打印机描述文件不符合规格。" #. when a PPD file is not in compliance: -#: src/include/printer/driveradd.rb:694 +#: src/include/printer/driveradd.rb:700 msgid "Use the printer description file regardless of its errors?" msgstr "忽略错误继续使用打印机描述文件？" #. Body of a Popup::ContinueCancelHeadline #. when PPD file is not in compliance: -#: src/include/printer/driveradd.rb:699 +#: src/include/printer/driveradd.rb:705 msgid "A non-compliant printer description file can lead to arbitrary failures." msgstr "一个不兼容的打印机描述文件可能导致任何错误。" -#: src/include/printer/driveradd.rb:716 +#: src/include/printer/driveradd.rb:722 msgid "Failed to make the printer description file available" msgstr "未能将打印机描述文件设为可用" @@ -2180,12 +2178,42 @@ #. ConnectionWizardDialog help 2/7: #: src/include/printer/helps.rb:450 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "<b><big>Printer Device URI</big></b><br>\n" +#| "A connection is specified as so called <b>device URI</b>.<br>\n" +#| "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n" +#| "for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n" +#| "After the scheme there are more or less additional components\n" +#| "which specify the details for this kind of data-transfer.<br>\n" +#| "Space characters are not allowed in an URI.\n" +#| "Therefore a space character in a value of an URI component\n" +#| "is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n" +#| "The components of an URI are separated by special reserved characters like\n" +#| "colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n" +#| "Finally there could be optional parameters (separated by a question mark '?')\n" +#| "of the form 'option1=value1&option2=value2&option3=value3' so that\n" +#| "a full device URI could be for example:<br>\n" +#| "ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n" +#| "Some examples:<br>\n" +#| "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n" +#| "with serial number 'A1B2C3' may have a device URI like:<br>\n" +#| "usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n" +#| "A network printer with IP 192.168.100.1 which is accessible\n" +#| "via port 9100 may have a device URI like:<br>\n" +#| "socket://192.168.100.1:9100<br>\n" +#| "A network printer with IP 192.168.100.2 which is accessible\n" +#| "via LPD protocol with a remote LPD queue name 'LPT1'\n" +#| "may have a device URI like:<br>\n" +#| "lpd://192.168.100.2/LPT1\n" +#| "</p>" msgid "" "<p>\n" "<b><big>Printer Device URI</big></b><br>\n" "A connection is specified as so called <b>device URI</b>.<br>\n" "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n" -"for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n" +"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n" "After the scheme there are more or less additional components\n" "which specify the details for this kind of data-transfer.<br>\n" "Space characters are not allowed in an URI.\n" @@ -2350,53 +2378,13 @@ msgid "" "<p>\n" "<b><big>Device URIs for Directly Connected Devices</big></b><br>\n" -"Devices which are connected via the parallel port or via USB\n" +"Devices which are connected via USB\n" "are autodetected and the appropriate device URI is autogenerated.\n" "For example:<br>\n" -"parallel:/dev/lp0<br>\n" -"usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n" -"hp:/usb/HP_LaserJet?serial=1234<br>\n" -"Usually only the autogenerated device URIs work.\n" -"When the device is not autodetected, there is usually no communication\n" -"with the device possible and no data can be sent to the device.<br>\n" -"To access a HP printer or all-in-one device via the backend 'hp',\n" -"the RPM package hplip must be installed.\n" -"The package provides HP's printing and scanning software HPLIP.<br>\n" -"In contrast devices which are connected via serial port or bluetooth\n" -"are not autodetected so that the device URI must be manually specified.\n" -"The serial device URI parameters must comply with\n" -"what the serial port in the printer requires,\n" -"see the manual of your serial printer.\n" -"Example device URIs:<br>\n" -"serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n" -"bluetooth://1A2B3C4D5E6F<br>\n" -"To access a device via bluetooth, the RPM package bluez-cups must be installed.\n" -"The package provides the CUPS backend 'bluetooth' which actually sends the data\n" -"to a bluetooth printer.\n" -"</p>" msgstr "" -"<p>\n" -"<b><big>直连设备的设备 URIhttp://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n" +#| "'Windows' and 'Active Directory' are registered trademarks\n" +#| "of Microsoft Corporation in the United States and/or other countries.<br>\n" +#| "<b>Traditional UNIX Server (LPR)</b><br>\n" +#| "A Line Printer Daemon (LPD) runs on a traditional UNIX server\n" +#| "and provides one or more LPD queues.\n" +#| "The IP address and a LPD queue name is needed to access it.\n" +#| "The matching device URI is:<br>\n" +#| "lpd://ip-address/queue<br>\n" +#| "<b>CUPS Server</b><br>\n" +#| "Usually you should not set up a local print queue to access\n" +#| "a remote queue on a CUPS server. Instead do the setup\n" +#| "in the <b>Print Via Network</b> dialog.\n" +#| "Only if you really know that you must set up a local print queue\n" +#| "to access a remote queue on a CUPS server proceed here.<br>\n" +#| "IPP is the native protocol for CUPS which runs on a server.\n" +#| "The official IANA port for IPP is 631.\n" +#| "The matching device URI is:<br>\n" +#| "ipp://ip-address:631/printers/queue<br>\n" +#| "<b>Novell Netware Print Server (IPX)</b><br>\n" +#| "To access print queues on a Novell Netware print server,\n" +#| "the RPM package ncpfs must be installed.\n" +#| "The package provides the CUPS backend 'novell' which runs\n" +#| "the <tt>nprint</tt> program which actually sends the data\n" +#| "to a Novell Netware print queue.\n" +#| "A server name and a printer queue name is needed to access it.\n" +#| "Furthermore a user name and a password may be required to get access.\n" +#| "The matching device URI is:<br>\n" +#| "novell://username:password@server/queue<br>\n" +#| "For <b>more information</b> have a look at <tt>man nprint</tt> and\n" +#| "the other documentation in the RPM package ncpfs.\n" +#| "</p>" msgid "" "<p>\n" "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n" @@ -2526,19 +2599,6 @@ "The official IANA port for IPP is 631.\n" "The matching device URI is:<br>\n" "ipp://ip-address:631/printers/queue<br>\n" -"<b>Novell Netware Print Server (IPX)</b><br>\n" -"To access print queues on a Novell Netware print server,\n" -"the RPM package ncpfs must be installed.\n" -"The package provides the CUPS backend 'novell' which runs\n" -"the <tt>nprint</tt> program which actually sends the data\n" -"to a Novell Netware print queue.\n" -"A server name and a printer queue name is needed to access it.\n" -"Furthermore a user name and a password may be required to get access.\n" -"The matching device URI is:<br>\n" -"novell://username:password@server/queue<br>\n" -"For <b>more information</b> have a look at <tt>man nprint</tt> and\n" -"the other documentation in the RPM package ncpfs.\n" -"</p>" msgstr "" "<p>\n" "<b><big>通过打印服务器打印的设备 URI</big></b><br>\n" @@ -2584,7 +2644,46 @@ "</p>" #. ConnectionWizardDialog help 7/7: -#: src/include/printer/helps.rb:711 +#: src/include/printer/helps.rb:714 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "<b><big>Special Device URIs</big></b><br>\n" +#| "<b>Specify an Arbitrary Device URI</b>\n" +#| "if you know the exact right device URI for your particular case\n" +#| "or to modify an existing device URI in a special way.<br>\n" +#| "<b>Send Print Data to Other Program (pipe)</b><br>\n" +#| "To do this, the RPM package cups-backends must be installed.\n" +#| "The package provides the CUPS backend 'pipe' which runs\n" +#| "the program that you specified here.\n" +#| "The matching device URI is:<br>\n" +#| "pipe:/path/to/targetcommand<br>\n" +#| "<b>Daisy-chain Backend Error Handler (beh)</b><br>\n" +#| "To do this, the RPM package foomatic-filters must be installed.\n" +#| "The package provides the CUPS backend 'beh'.<br>\n" +#| "The backend 'beh' is a wrapper for the usual backend,\n" +#| "which is then called by beh.\n" +#| "This way beh can, depending on its configuration,\n" +#| "repeat the call of the backend or simply hide the error status\n" +#| "of the backend from being seen by the CUPS daemon.\n" +#| "The matching device URI is:<br>\n" +#| "beh:/nodisable/attempts/delay/originalDeviceURI<br>\n" +#| "If nodisable is '1' beh always exits successfully\n" +#| "so that the queue gets never disabled but on the other hand\n" +#| "print jobs are lost if there is an error.<br>\n" +#| "Attempts is the number of attempts to recall the backend\n" +#| "in case of an error. '0' means infinite retries.<br>\n" +#| "Delay is the number of seconds between two attempts\n" +#| "to call the backend.<br>\n" +#| "The last parameter is the original URI, which the queue had before.<br>\n" +#| "Example:<br>\n" +#| "beh:/1/3/5/socket://ip-address:port-number<br>\n" +#| "The beh backend tries to access a network printer 3 times with 5 second delay\n" +#| "between the attempts. If access still fails, the queue is not disabled\n" +#| "and the print job is lost.<br>\n" +#| "For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n" +#| "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler\n" +#| "</p>" msgid "" "<p>\n" "<b><big>Special Device URIs</big></b><br>\n" @@ -2598,7 +2697,7 @@ "The matching device URI is:<br>\n" "pipe:/path/to/targetcommand<br>\n" "<b>Daisy-chain Backend Error Handler (beh)</b><br>\n" -"To do this, the RPM package foomatic-filters must be installed.\n" +"To do this, the RPM package cups-backends must be installed.\n" "The package provides the CUPS backend 'beh'.<br>\n" "The backend 'beh' is a wrapper for the usual backend,\n" "which is then called by beh.\n" @@ -2651,7 +2750,7 @@ "</p>" #. PrintingViaNetworkDialog help 1/4: -#: src/include/printer/helps.rb:752 +#: src/include/printer/helps.rb:755 msgid "" "<p>\n" "<b><big>Printing Via Network</big></b><br>\n" @@ -2706,7 +2805,7 @@ "</p>" #. PrintingViaNetworkDialog help 2/4: -#: src/include/printer/helps.rb:789 +#: src/include/printer/helps.rb:792 msgid "" "<p>\n" "If you can access remote CUPS servers for printing\n" @@ -2730,7 +2829,7 @@ "</p>" #. PrintingViaNetworkDialog help 3/4: -#: src/include/printer/helps.rb:804 +#: src/include/printer/helps.rb:807 msgid "" "<p>\n" "If you print only via network and if you use only one single CUPS server,\n" @@ -2751,7 +2850,7 @@ "</p>" #. PrintingViaNetworkDialog help 4/4: -#: src/include/printer/helps.rb:818 +#: src/include/printer/helps.rb:821 msgid "" "<p>\n" "You have to set up an appropriate print queue on your host\n" @@ -2770,7 +2869,7 @@ "</p>" #. SharingDialog help 1/4: -#: src/include/printer/helps.rb:832 +#: src/include/printer/helps.rb:835 msgid "" "<p>\n" "<b><big>Sharing Print Queues and Publish Them Via Network</big></b><br>\n" @@ -2790,7 +2889,7 @@ "</p>" #. SharingDialog help 2/4: -#: src/include/printer/helps.rb:844 +#: src/include/printer/helps.rb:847 msgid "" "<p>\n" "First of all CUPS client systems must be allowed to access the CUPS server.\n" @@ -2814,7 +2913,7 @@ "</p>" #. SharingDialog help 3/4: -#: src/include/printer/helps.rb:858 +#: src/include/printer/helps.rb:861 msgid "" "<p>\n" "There are various ways which can coexist how to specify\n" @@ -2841,7 +2940,7 @@ "</p>" #. SharingDialog help 4/4: -#: src/include/printer/helps.rb:876 +#: src/include/printer/helps.rb:879 msgid "" "<p>\n" "Regarding firewall:<br>\n" @@ -2889,7 +2988,7 @@ "</p>" #. Policies help 1/2: -#: src/include/printer/helps.rb:911 +#: src/include/printer/helps.rb:914 msgid "" "<p>\n" "<b><big>CUPS Operation Policy</big></b><br>\n" @@ -2905,14 +3004,37 @@ "</p>" #. Policies help 2/2: -#: src/include/printer/helps.rb:921 +#: src/include/printer/helps.rb:924 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "<b><big>CUPS Error Policy</big></b><br>\n" +#| "The error policy defines the default policy that is used when\n" +#| "CUPS fails to send a print job to the printer device.<br>\n" +#| "Depending on the particular way how the printer is connected\n" +#| "(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n" +#| "and depending on the actual kind of failure,\n" +#| "the CUPS backend which actually sends the data to the printer\n" +#| "can overwrite the default error policy\n" +#| "and enforce another error policy (see <tt>man backend</tt>).\n" +#| "For example it can stop any further printing attempt\n" +#| "even when the default error policy is to retry the job.\n" +#| "This could happen when any attempt to establish\n" +#| "the communication with the printer is useless\n" +#| "so that it does no make sense to retry the job.\n" +#| "<br>\n" +#| "The following error policies exist:<br>\n" +#| "Stop the printer and keep the job for future printing.<br>\n" +#| "Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n" +#| "Abort and delete the job and proceed with the next job.\n" +#| "</p>" msgid "" "<p>\n" "<b><big>CUPS Error Policy</big></b><br>\n" "The error policy defines the default policy that is used when\n" "CUPS fails to send a print job to the printer device.<br>\n" "Depending on the particular way how the printer is connected\n" -"(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n" +"(for example 'usb', 'socket', 'lpd', or 'ipp'),\n" "and depending on the actual kind of failure,\n" "the CUPS backend which actually sends the data to the printer\n" "can overwrite the default error policy\n" @@ -2941,7 +3063,7 @@ "</p>" #. Autoconfig help 1/2: -#: src/include/printer/helps.rb:946 +#: src/include/printer/helps.rb:949 msgid "" "<p>\n" "<b><big>Automatic Configuration for Local Connected Printers</big></b><br>\n" @@ -2966,7 +3088,7 @@ "</p>" #. Autoconfig help 2/2: -#: src/include/printer/helps.rb:963 +#: src/include/printer/helps.rb:966 msgid "" "<p>\n" "<b><big>Automatic Configuration for USB Printers</big></b><br>\n" @@ -3123,67 +3245,67 @@ "(这可能花费一些时间)" #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:204 +#: src/include/printer/overview.rb:201 msgid "Do no longer use the inaccessible CUPS server '%1'?" msgstr "不再使用无法访问的 CUPS 服务器 '%1'？" #. Popup::YesNoHeadline body recommendation how to answer the headline question #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:210 +#: src/include/printer/overview.rb:207 msgid "To proceed, you should agree that '%1' will be no longer used." msgstr "您应该同意不再使用 '%1' 才能继续进行。" #. The 'ServerName' entry in /etc/cups/client.conf was removed #. so that it is now no longer a real client-only config and #. therefore the Printerlib::client_* values must be determined anew: -#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237 +#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234 msgid "A non-accessible server leads to an endless sequence of delays and failures." msgstr "无法访问的服务器会导致将来无尽的错误。" #. where %1 will be replaced by the CUPS server name. -#: src/include/printer/overview.rb:256 +#: src/include/printer/overview.rb:253 msgid "CUPS Server %1" msgstr "CUPS 服务器 %1" #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/include/printer/overview.rb:280 +#: src/include/printer/overview.rb:277 msgid "Testing if CUPS server is accessible..." msgstr "正在检测打印服务器是否可访问..." #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: -#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681 -#: src/include/printer/overview.rb:1155 +#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678 +#: src/include/printer/overview.rb:1152 msgid "Select an entry." msgstr "请选择一项。" -#: src/include/printer/overview.rb:608 +#: src/include/printer/overview.rb:605 msgid "Cannot Delete" msgstr "无法删除" #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted: -#: src/include/printer/overview.rb:610 +#: src/include/printer/overview.rb:607 msgid "This is a remote configuration. Only local configurations can be deleted." msgstr "这是远程配置。仅本地配置可以被删除。" -#: src/include/printer/overview.rb:617 +#: src/include/printer/overview.rb:614 msgid "Confirm Deletion" msgstr "确认删除" #. Body of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:619 +#: src/include/printer/overview.rb:616 msgid "The selected configuration would be deleted immediately and cannot be restored." msgstr "选定配置会被立即删除且无法恢复。" #. 'Yes' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:623 +#: src/include/printer/overview.rb:620 msgid "Delete configuration %1" msgstr "删除配置 %1" #. 'No' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:625 +#: src/include/printer/overview.rb:622 msgid "Do not delete it" msgstr "不删除" @@ -3194,33 +3316,33 @@ #. Nevertheless it is possible to delete a class with the YaST printer module #. so that the user can get rid of a class which may have been created by accident #. with whatever other setup tool: -#: src/include/printer/overview.rb:640 +#: src/include/printer/overview.rb:637 msgid "Confirm Deletion of a Class" msgstr "确认删除一个类" #. Body of a confirmation popup before a class will be deleted: -#: src/include/printer/overview.rb:642 +#: src/include/printer/overview.rb:639 msgid "A deleted class cannot be re-created with this tool." msgstr "此工具不能重新创建一个已被删除的类。" -#: src/include/printer/overview.rb:688 +#: src/include/printer/overview.rb:685 msgid "Rejecting Print Jobs" msgstr "拒绝打印任务" #. Body of a Popup::AnyMessage when the queue rejects print jobs: -#: src/include/printer/overview.rb:690 +#: src/include/printer/overview.rb:687 msgid "The testpage cannot be printed because print jobs are rejected." msgstr "无法打印测试页，打印机任务被拒绝。" #. Do a refresh of the overview content to be on the safe side. #. Perhaps the actual current queue state is no longer "rejecting". #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:700 +#: src/include/printer/overview.rb:697 msgid "Printout Disabled" msgstr "打印输出已禁用" #. Body of a Popup::AnyMessage when printing is disabled for the queue: -#: src/include/printer/overview.rb:702 +#: src/include/printer/overview.rb:699 msgid "The testpage cannot be printed because printout is disabled." msgstr "无法打印测试页，因为打印输出被禁用。" @@ -3229,25 +3351,25 @@ #. the test above makes sure that the queue has printing enabled. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:731 +#: src/include/printer/overview.rb:728 msgid "There are pending print jobs which might be deleted before the testpage is printed." msgstr "有可能在打印测试页前被删除的等待中的任务。" #. where %1 will be replaced by the queue name. #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920 +#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917 msgid "Delete Pending Print Jobs For %1" msgstr "为 %1 删除等待中的打印任务" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:759 +#: src/include/printer/overview.rb:756 msgid "Delete them before printing testpage" msgstr "在打印测试页前删除它们" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:762 +#: src/include/printer/overview.rb:759 msgid "Print testpage after the other jobs" msgstr "在其它任务完成后打印测试页" @@ -3255,7 +3377,7 @@ #. Only a simple message because this error does not happen on a normal system. #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944 +#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941 msgid "Failed to delete all pending jobs for %1." msgstr "删除 %1 所有等待中的任务失败。" @@ -3274,28 +3396,28 @@ #. + (Printed with CUPS) show #. make it obvious that it is not a YaST testpage but a CUPS testpage #. and it is now independent of the CUPS version. -#: src/include/printer/overview.rb:802 +#: src/include/printer/overview.rb:799 msgid "Test printout" msgstr "测试打印" #. Popup::AnyQuestion message: -#: src/include/printer/overview.rb:804 +#: src/include/printer/overview.rb:801 msgid "Print one or two pages e.g. to test duplex printing" msgstr "打印一到两页来测试全双工打印" #. Popup::AnyQuestion so called 'yes' (default) button label: -#: src/include/printer/overview.rb:806 +#: src/include/printer/overview.rb:803 msgid "Single test page" msgstr "单一测试页" #. Popup::AnyQuestion so called 'no' button label: -#: src/include/printer/overview.rb:808 +#: src/include/printer/overview.rb:805 msgid "Two test pages" msgstr "两张测试页" #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:838 +#: src/include/printer/overview.rb:835 msgid "Failed to print testpage for %1." msgstr "为 %1 打印测试页失败。" @@ -3303,25 +3425,25 @@ #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime) #. so that a refresh of the overview content is needed to be on the safe side. #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:855 +#: src/include/printer/overview.rb:852 msgid "Wait Until Testpage Printing Finished" msgstr "等待打印测试页完成" #. Popup::AnyQuestion message regarding testpage printout result #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:859 +#: src/include/printer/overview.rb:856 msgid "Sent testpage to %1. Printing should start soon." msgstr "发送测试页到 %1。应该很快开始打印。" #. Popup::AnyQuestion 'Yes' button label #. regarding a positive testpage printout result: -#: src/include/printer/overview.rb:864 +#: src/include/printer/overview.rb:861 msgid "Testpage printout was successful" msgstr "测试页打印成功" #. Popup::AnyQuestion 'No' button label #. regarding a negative testpage printout result: -#: src/include/printer/overview.rb:867 +#: src/include/printer/overview.rb:864 msgid "Testpage printing failed" msgstr "测试打印失败" @@ -3341,53 +3463,53 @@ #. spit out zillions of sheets with nonsense characters. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:900 +#: src/include/printer/overview.rb:897 msgid "There are pending print jobs which might be deleted now." msgstr "有可能立即被删除的等待中的打印任务。" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:928 +#: src/include/printer/overview.rb:925 msgid "Delete all pending jobs" msgstr "删除所有等待中的任务" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:931 +#: src/include/printer/overview.rb:928 msgid "Do not delete them" msgstr "不删除" #. Ignore an effectively empty test_print_cups_error_log: -#: src/include/printer/overview.rb:1046 +#: src/include/printer/overview.rb:1043 msgid "For the full log, see the /var/log/cups/error_log file." msgstr "完整日志请见 /var/log/cups/error_log 文件。" -#: src/include/printer/overview.rb:1051 +#: src/include/printer/overview.rb:1048 msgid "CUPS log information while processing the testpage for %1 (English only)" msgstr "处理 %1 的测试页的 CUPS 日志信息 (仅英文)" #. but the test_print_cups_error_log was effectively empty, #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1068 +#: src/include/printer/overview.rb:1065 msgid "For CUPS log information, see the /var/log/cups/error_log file." msgstr "CUPS 日志信息见 /var/log/cups/error_log 文件。" #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1078 +#: src/include/printer/overview.rb:1075 msgid "When printing via a remote system fails, you may ask an admin of the remote system." msgstr "当通过远程系统打印失败时，您或许可以询问远程系统管理员。" #. PopupYesNoHeadline body: -#: src/include/printer/overview.rb:1105 +#: src/include/printer/overview.rb:1102 msgid "A remote CUPS server setting conflicts with adding a configuration." msgstr "添加一项配置与远程 CUPS 服务器设定相冲突。" -#: src/include/printer/overview.rb:1162 +#: src/include/printer/overview.rb:1159 msgid "Cannot Modify" msgstr "无法修改" #. Body of a Popup::AnyMessage when a remote queue was selected to be modified: -#: src/include/printer/overview.rb:1164 +#: src/include/printer/overview.rb:1161 msgid "This is a remote configuration. Only local configurations can be modified." msgstr "这是远程配置。仅可以修改本地配置。" @@ -4088,125 +4210,54 @@ msgstr "正在确定匹配的驱动程序..." #. show a meaningful text as fallback entry ('Find More' is a button label). -#: src/modules/Printer.rb:1594 +#: src/modules/Printer.rb:1588 msgid "No matching driver found. Change the search string or try 'Find More'." msgstr "未找到匹配的驱动。请更换搜索关键词或尝试 '查找更多'。" #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/modules/Printer.rb:1619 +#: src/modules/Printer.rb:1613 msgid "Processing many printer drivers. Please wait..." msgstr "正在处理多个驱动。请稍候..." #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). -#: src/modules/Printer.rb:2065 +#: src/modules/Printer.rb:2059 msgid "Failed to add queue %1." msgstr "添加队列 %1 失败。" #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). -#: src/modules/Printer.rb:2185 +#: src/modules/Printer.rb:2179 msgid "Failed to delete configuration %1." msgstr "删除配置 %1 失败。" #. Only a simple message because this is only a fallback case #. which should not happen at all: -#: src/modules/Printer.rb:2208 +#: src/modules/Printer.rb:2202 msgid "Failed to determine the driver options." msgstr "确定驱动程序参数失败。" #. Info for a currently selected item which is to be set as new value in the system: -#: src/modules/Printer.rb:2215 +#: src/modules/Printer.rb:2209 msgid "new value" msgstr "新值" #. Info for a current setting which is the currently still saved value in the system: -#: src/modules/Printer.rb:2217 +#: src/modules/Printer.rb:2211 msgid "saved value" msgstr "保存值" -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2366 -msgid "The server '%1' is not accessible via port 631 (IPP/CUPS)." -msgstr "服务器 '%1' 无法通过端口 631 (网络打印协议 IPP/通用 UNIX 打印系统 CUPS) 访问。" +#: src/modules/Printer.rb:2358 +#, fuzzy +#| msgid "&Test Server" +msgid "The server '" +msgstr "测试服务器(&T)" -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2371 -msgid "The server '%1' responds to a 'ping' in the network." -msgstr "服务器 '%1' 回应网络中的 'ping'。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2376 -msgid "The server '%1' does not respond to a 'ping' in the network." -msgstr "服务器 '%1' 不对网络中的 'ping' 做出响应。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2381 -msgid "The server name '%1' is known in the network." -msgstr "服务器名称“%1”在网络中已知。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2386 -msgid "The server name '%1' is not known in the network." -msgstr "服务器名称“%1”在网络中未知。" - -#. but in most cases TestClientOnlyServer is called -#. indirectly without a button click by the user -#. so that even the netcat test is silently skipped -#. and no negative feedback is shown when netcat is not executable: -#: src/modules/Printer.rb:2404 -msgid "Cannot execute the program 'netcat'." -msgstr "无法执行程序 'netcat'。" - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2409 -msgid "The RPM package 'netcat' is required for a meaningful test." -msgstr "需要 'netcat' RPM 软件包执行一次有意义的测试。" - -#. but it the less meaningful test is not really important -#. so that the less meaningful test is silently skipped -#. and no negative feedback is shown when ping is not executable: -#: src/modules/Printer.rb:2445 -msgid "Cannot execute the program 'ping'." -msgstr "无法执行程序 'ping'。" - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2454 -msgid "The RPM package 'iputils' is required for a meaningful test." -msgstr "需要 'iputils' RPM 软件包执行一次有意义的测试。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2483 -msgid "The server '%1' is not accessible." -msgstr "服务器 %1 不可访问。" - -#. but it the last test is not really important -#. so that the last test is silently skipped -#. and no negative feedback is shown when host is not executable: -#: src/modules/Printer.rb:2546 -msgid "Cannot execute the program 'host'." -msgstr "无法执行程序 'host'。" - -#. Popup::ErrorDetails details: -#: src/modules/Printer.rb:2555 -msgid "The RPM package 'bind-utils' is required for a meaningful test." -msgstr "需要 'bind-utils' RPM 软件包执行一次有意义的测试。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2582 -msgid "The server '%1' does not respond in the network." -msgstr "服务器 %1 在网络中没有响应。" - -#. where %1 will be replaced by the server name. -#: src/modules/Printer.rb:2644 -msgid "The server '%1' is unknown." -msgstr "服务器“%1”未知。" - #. Message of a Popup::Error when hp-setup should be run. #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "DISPLAY", it is an environment variable name. -#: src/modules/Printer.rb:2673 +#: src/modules/Printer.rb:2371 msgid "" "Cannot run hp-setup because no graphical display can be opened.\n" "This happens in particular when YaST runs in text-only mode,\n" @@ -4222,7 +4273,7 @@ #. Message of a Popup::Error when hp-setup should be run. #. Do not change or translate "hp-setup", it is a program name: -#: src/modules/Printer.rb:2683 +#: src/modules/Printer.rb:2381 msgid "" "Cannot run hp-setup because\n" "/usr/bin/hp-setup is not executable\n" @@ -4234,7 +4285,7 @@ #. Body of a Popup::ShowFeedback. #. Do not change or translate "hp-setup", it is a program name: -#: src/modules/Printer.rb:2691 +#: src/modules/Printer.rb:2389 msgid "" "Launched hp-setup.\n" "You must finish hp-setup before you can proceed with the printer configuration.\n" @@ -4246,7 +4297,7 @@ #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "hplip", it is a package name. #. Translate 'Driver Packages' the same as the PushButton name to go to the "Add Driver" dialog: -#: src/modules/Printer.rb:2725 +#: src/modules/Printer.rb:2423 msgid "" "To run hp-setup, the RPM package hplip must be installed.\n" "Use 'Driver Packages' to install it." @@ -4396,6 +4447,108 @@ msgid "&Skip waiting" msgstr "跳过等待(&S)" +#~ msgid "Parallel Port" +#~ msgstr "并行端口" + +#~ msgid "Serial Port" +#~ msgstr "串行端口" + +#~ msgid "Novell Netware Print Server (IPX)" +#~ msgstr "Novell Netware 打印服务器 (IPX)" + +#~ msgid "Driver for Konica Minolta 2300W and 2400W (unmaintained)" +#~ msgstr "Konica Minolta 2300W 和 2400W 的驱动(失去维护)" + +#~ msgid "" +#~ "<p>\n" +#~ "<b><big>Device URIs for Directly Connected Devices</big></b><br>\n" +#~ "Devices which are connected via the parallel port or via USB\n" +#~ "are autodetected and the appropriate device URI is autogenerated.\n" +#~ "For example:<br>\n" +#~ "parallel:/dev/lp0<br>\n" +#~ "usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n" +#~ "hp:/usb/HP_LaserJet?serial=1234<br>\n" +#~ "Usually only the autogenerated device URIs work.\n" +#~ "When the device is not autodetected, there is usually no communication\n" +#~ "with the device possible and no data can be sent to the device.<br>\n" +#~ "To access a HP printer or all-in-one device via the backend 'hp',\n" +#~ "the RPM package hplip must be installed.\n" +#~ "The package provides HP's printing and scanning software HPLIP.<br>\n" +#~ "In contrast devices which are connected via serial port or bluetooth\n" +#~ "are not autodetected so that the device URI must be manually specified.\n" +#~ "The serial device URI parameters must comply with\n" +#~ "what the serial port in the printer requires,\n" +#~ "see the manual of your serial printer.\n" +#~ "Example device URIs:<br>\n" +#~ "serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n" +#~ "bluetooth://1A2B3C4D5E6F<br>\n" +#~ "To access a device via bluetooth, the RPM package bluez-cups must be installed.\n" +#~ "The package provides the CUPS backend 'bluetooth' which actually sends the data\n" +#~ "to a bluetooth printer.\n" +#~ "</p>" +#~ msgstr "" +#~ "<p>\n" +#~ "<b><big>直连设备的设备 URI\n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/proxy.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/proxy.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/proxy.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-06 04:31+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -19,100 +19,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#. Commandline help title -#. Proxy dialog caption -#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399 -msgid "Proxy Configuration" -msgstr "代理配置" - -#. command-line help -#: src/clients/proxy.rb:40 -msgid "Enable proxy settings" -msgstr "启用代理设置" - -#. command-line help -#: src/clients/proxy.rb:48 -msgid "Disable proxy settings" -msgstr "禁用代理设置" - -#. command-line help -#: src/clients/proxy.rb:56 -msgid "Change the current proxy settings" -msgstr "修改当前代理设置" - -#. command-line help -#: src/clients/proxy.rb:66 -msgid "Set the authentication for proxy" -msgstr "设置代理认证" - -#. command-line help -#: src/clients/proxy.rb:76 -msgid "Show the summary of the current settings" -msgstr "显示当前设置的摘要" - -#. command-line option help -#: src/clients/proxy.rb:88 -msgid "Set HTTP proxy" -msgstr "设置 HTTP 代理" - -#. command-line option help -#: src/clients/proxy.rb:93 -msgid "Set HTTPS proxy" -msgstr "设置 HTTPS 代理" - -#. command-line option help -#: src/clients/proxy.rb:98 -msgid "Set FTP proxy" -msgstr "设置 FTP 代理" - -#. command-line option help -#: src/clients/proxy.rb:103 -msgid "Clear all options listed" -msgstr "清空所有列出的选项" - -#. command-line option help -#: src/clients/proxy.rb:107 -msgid "Set domains for not using the proxy settings" -msgstr "设置不使用代理设置的域" - -#. command-line option help -#: src/clients/proxy.rb:114 -msgid "The username to be used for proxy authentication" -msgstr "将用于代理认证的用户名" - -#. command-line option help -#: src/clients/proxy.rb:121 -msgid "The password to be used for proxy authentication" -msgstr "将用于代理认证的密码" - -#. ask the user -#. translators: command line prompt for entering a password -#: src/clients/proxy.rb:238 -msgid "Password:" -msgstr "密码：" - -#. Return a modification status -#. @return true if data was modified -#: src/clients/proxy_auto.rb:109 -msgid "Status of Proxy Configuration" -msgstr "代理配置状态" - -#: src/clients/proxy_auto.rb:110 -msgid "Enabled" -msgstr "已启用" - -#: src/clients/proxy_auto.rb:112 -msgid "HTTP" -msgstr "HTTP" - -#: src/clients/proxy_auto.rb:116 -msgid "HTTPS" -msgstr "HTTPS" - -#: src/clients/proxy_auto.rb:120 -msgid "FTP" -msgstr "FTP" - #. Informative label #: src/include/proxy/dialogs.rb:101 msgid "No details available." @@ -181,6 +87,12 @@ msgid "Proxy settings work correctly." msgstr "代理设置运行正确。" +#. Proxy dialog caption +#. Commandline help title +#: src/include/proxy/dialogs.rb:399 src/lib/proxy/client.rb:27 +msgid "Proxy Configuration" +msgstr "代理配置" + #. Proxy dialog help 1/8 #: src/include/proxy/dialogs.rb:405 msgid "" @@ -322,7 +234,7 @@ msgstr "测试代理设置(&O)" #. Popup error text - http, https and ftp proxy URLs are blank -#: src/include/proxy/dialogs.rb:619 +#: src/include/proxy/dialogs.rb:615 msgid "" "Proxy is enabled, but no proxy URL has been specified.\n" "Really use these settings?" @@ -330,7 +242,7 @@ "已启用代理，但未指定代理 URL。\n" "真的使用这些设置吗？" -#: src/include/proxy/dialogs.rb:632 +#: src/include/proxy/dialogs.rb:628 msgid "" "Security warning:\n" "Username and password will be stored unencrypted\n" @@ -342,42 +254,42 @@ "真的使用这些设置吗？" #. Popup::Error text -#: src/include/proxy/dialogs.rb:647 +#: src/include/proxy/dialogs.rb:643 msgid "You cannot enter a password and leave the user name empty." msgstr "不能只输入密码而留空用户名。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:655 +#: src/include/proxy/dialogs.rb:651 msgid "HTTP proxy URL is invalid." msgstr "HTTP 代理 URL 无效。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:663 +#: src/include/proxy/dialogs.rb:659 msgid "HTTP proxy URL must contain a scheme specification (http)." msgstr "HTTP 代理 URL 必须包含前缀 (http)。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:672 +#: src/include/proxy/dialogs.rb:668 msgid "The HTTPS proxy URL is invalid." msgstr "HTTPS 代理 URL 无效。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:680 +#: src/include/proxy/dialogs.rb:676 msgid "The HTTPS proxy URL must contain a scheme specification (http)." msgstr "HTTPS 代理 URL 必须包含前缀 (https)。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:691 +#: src/include/proxy/dialogs.rb:687 msgid "FTP proxy URL is invalid." msgstr "FTP 代理 URL 无效。" #. Popup::Error text -#: src/include/proxy/dialogs.rb:699 +#: src/include/proxy/dialogs.rb:695 msgid "FTP proxy URL must contain a scheme specification (http)." msgstr "FTP 代理 URL 必须包含前缀 (ftp)。" #. Translators: no proxy domain is a domain that can be accessed without proxy -#: src/include/proxy/dialogs.rb:709 +#: src/include/proxy/dialogs.rb:705 msgid "" "One or more no proxy domains are invalid. \n" "Check if all domains match one of the following:\n" @@ -393,53 +305,141 @@ "* 完全限定主机名\n" "* 以 '.' 开头的域名" +#. Return a modification status +#. @return true if data was modified +#: src/lib/proxy/auto_client.rb:104 +msgid "Status of Proxy Configuration" +msgstr "代理配置状态" + +#: src/lib/proxy/auto_client.rb:105 +msgid "Enabled" +msgstr "已启用" + +#: src/lib/proxy/auto_client.rb:107 +msgid "HTTP" +msgstr "HTTP" + +#: src/lib/proxy/auto_client.rb:111 +msgid "HTTPS" +msgstr "HTTPS" + +#: src/lib/proxy/auto_client.rb:115 +msgid "FTP" +msgstr "FTP" + +#. command-line help +#: src/lib/proxy/client.rb:35 +msgid "Enable proxy settings" +msgstr "启用代理设置" + +#. command-line help +#: src/lib/proxy/client.rb:43 +msgid "Disable proxy settings" +msgstr "禁用代理设置" + +#. command-line help +#: src/lib/proxy/client.rb:51 +msgid "Change the current proxy settings" +msgstr "修改当前代理设置" + +#. command-line help +#: src/lib/proxy/client.rb:61 +msgid "Set the authentication for proxy" +msgstr "设置代理认证" + +#. command-line help +#: src/lib/proxy/client.rb:71 +msgid "Show the summary of the current settings" +msgstr "显示当前设置的摘要" + +#. command-line option help +#: src/lib/proxy/client.rb:83 +msgid "Set HTTP proxy" +msgstr "设置 HTTP 代理" + +#. command-line option help +#: src/lib/proxy/client.rb:88 +msgid "Set HTTPS proxy" +msgstr "设置 HTTPS 代理" + +#. command-line option help +#: src/lib/proxy/client.rb:93 +msgid "Set FTP proxy" +msgstr "设置 FTP 代理" + +#. command-line option help +#: src/lib/proxy/client.rb:98 +msgid "Clear all options listed" +msgstr "清空所有列出的选项" + +#. command-line option help +#: src/lib/proxy/client.rb:102 +msgid "Set domains for not using the proxy settings" +msgstr "设置不使用代理设置的域" + +#. command-line option help +#: src/lib/proxy/client.rb:109 +msgid "The username to be used for proxy authentication" +msgstr "将用于代理认证的用户名" + +#. command-line option help +#: src/lib/proxy/client.rb:116 +msgid "The password to be used for proxy authentication" +msgstr "将用于代理认证的密码" + +#. ask the user +#. translators: command line prompt for entering a password +#: src/lib/proxy/client.rb:233 +msgid "Password:" +msgstr "密码：" + #. Popup headline -#: src/modules/Proxy.rb:45 +#: src/modules/Proxy.rb:38 msgid "Proxy Configuration Successfully Saved" msgstr "已成功保存代理配置" -#: src/modules/Proxy.rb:46 +#: src/modules/Proxy.rb:39 msgid "It is recommended to relogin to make new proxy settings effective." msgstr "建议重新登录以使新代理设置生效。" -#. Write routing settings and apply changes +#. Write proxy settings and apply changes #. @return true if success -#: src/modules/Proxy.rb:131 +#: src/modules/Proxy.rb:174 msgid "Update proxy configuration" msgstr "更新代理配置" -#: src/modules/Proxy.rb:133 +#: src/modules/Proxy.rb:176 msgid "Saving Proxy Configuration" msgstr "正在保存代理配置" #. sleep for longer time, so that progress does not disappear right afterwards #. but only when Progress is visible -#: src/modules/Proxy.rb:141 +#: src/modules/Proxy.rb:184 msgid "Updating proxy configuration..." msgstr "正在更新代理配置..." #. Summary text -#: src/modules/Proxy.rb:437 +#: src/modules/Proxy.rb:418 msgid "Proxy is disabled." msgstr "已禁用代理。" #. Summary text -#: src/modules/Proxy.rb:442 +#: src/modules/Proxy.rb:423 msgid "Proxy is enabled." msgstr "已启用代理。" #. Summary text -#: src/modules/Proxy.rb:451 +#: src/modules/Proxy.rb:432 msgid "HTTP Proxy: %1" msgstr "HTTP 代理：%1" #. Summary text -#: src/modules/Proxy.rb:459 +#: src/modules/Proxy.rb:440 msgid "HTTPS Proxy: %1" msgstr "HTTPS 代理：%1" #. Summary text -#: src/modules/Proxy.rb:466 +#: src/modules/Proxy.rb:447 msgid "FTP Proxy: %1" msgstr "FTP 代理：%1" Modified: trunk/yast/zh_CN/po/qt-pkg.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/qt-pkg.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/qt-pkg.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packages-qt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-10 10:31+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -23,249 +23,258 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: src/YQPackageSelector.cc:315 +#: src/YQPackageSelector.cc:318 msgid "&Update Problems" msgstr "更新问题(&U)" -#: src/YQPackageSelector.cc:342 +#: src/YQPackageSelector.cc:345 msgid "Patter&ns" msgstr "软件集(&N)" -#: src/YQPackageSelector.cc:364 +#: src/YQPackageSelector.cc:367 msgid "Package &Groups" msgstr "软件包分组(&G)" -#: src/YQPackageSelector.cc:376 +#: src/YQPackageSelector.cc:379 msgid "&RPM Groups" msgstr "&RPM 组" -#: src/YQPackageSelector.cc:389 +#: src/YQPackageSelector.cc:392 msgid "&Languages" msgstr "语言(&L)" -#: src/YQPackageSelector.cc:405 +#: src/YQPackageSelector.cc:408 msgid "&Repositories" msgstr "软件源(&R)" -#: src/YQPackageSelector.cc:419 +#: src/YQPackageSelector.cc:422 msgid "S&earch" msgstr "搜索(&E)" #. DEBUG -#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 msgid "&Keywords" msgstr "关键字(&K)" -#: src/YQPackageSelector.cc:435 +#: src/YQPackageSelector.cc:438 msgid "&Installation Summary" msgstr "安装摘要(&I)" -#: src/YQPackageSelector.cc:520 +#: src/YQPackageSelector.cc:526 msgid "D&escription" msgstr "描述(&E)" -#: src/YQPackageSelector.cc:533 +#: src/YQPackageSelector.cc:539 msgid "&Technical Data" msgstr "技术数据(&T)" -#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115 +#: src/YQPackageSelector.cc:552 src/YQPkgProductDialog.cc:115 msgid "Dependencies" msgstr "依赖关系" -#: src/YQPackageSelector.cc:562 +#: src/YQPackageSelector.cc:567 msgid "&Versions" msgstr "版本(&V)" -#: src/YQPackageSelector.cc:580 +#: src/YQPackageSelector.cc:585 msgid "File List" msgstr "文件列表" -#: src/YQPackageSelector.cc:597 +#: src/YQPackageSelector.cc:602 msgid "Change Log" msgstr "修订历史" #. "Cancel" button #. button #0 #. text -#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194 +#. button #0 +#: src/YQPackageSelector.cc:629 src/YQPackageSelectorBase.cc:194 #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398 #: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258 -#: src/YQSimplePatchSelector.cc:219 +#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219 msgid "&Cancel" msgstr "取消(&C)" #. Translators: "Accept" here refers to licenses or similar -#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268 +#: src/YQPackageSelector.cc:639 src/YQPatternSelector.cc:268 #: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228 msgid "&Accept" msgstr "接受(&A)" -#: src/YQPackageSelector.cc:677 +#: src/YQPackageSelector.cc:682 msgid "&File" msgstr "文件(&F)" -#: src/YQPackageSelector.cc:679 +#: src/YQPackageSelector.cc:684 msgid "&Import..." msgstr "导入(&I)..." -#: src/YQPackageSelector.cc:680 +#: src/YQPackageSelector.cc:685 msgid "&Export..." msgstr "导出(&E)..." -#: src/YQPackageSelector.cc:684 +#: src/YQPackageSelector.cc:689 msgid "E&xit -- Discard Changes" msgstr "退出 -- 丢弃修改(&X)" -#: src/YQPackageSelector.cc:685 +#: src/YQPackageSelector.cc:690 msgid "&Quit -- Save Changes" msgstr "退出 -- 保存修改(&Q)" -#: src/YQPackageSelector.cc:697 +#: src/YQPackageSelector.cc:702 msgid "&Package" msgstr "软件包(&P)" -#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92 +#: src/YQPackageSelector.cc:742 src/YQPkgPackageKitGroupsFilterView.cc:92 #: src/YQPkgRepoFilterView.cc:149 msgid "All Packages" msgstr "全部软件包" -#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430 +#: src/YQPackageSelector.cc:744 src/YQPkgObjList.cc:430 msgid "Update if newer version available" msgstr "若有较新版本则更新" -#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415 +#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415 #: src/YQPkgObjList.cc:436 msgid "Update unconditionally" msgstr "无条件更新" -#: src/YQPackageSelector.cc:756 +#: src/YQPackageSelector.cc:761 msgid "&Patch" msgstr "补丁(&P)" -#: src/YQPackageSelector.cc:783 +#: src/YQPackageSelector.cc:788 msgid "Confi&guration" msgstr "配置(&G)" -#: src/YQPackageSelector.cc:784 +#: src/YQPackageSelector.cc:789 msgid "&Repositories..." msgstr "软件源(&R)..." -#: src/YQPackageSelector.cc:785 +#: src/YQPackageSelector.cc:790 msgid "&Online Update..." msgstr "在线更新(&O)..." -#: src/YQPackageSelector.cc:795 +#: src/YQPackageSelector.cc:800 msgid "&Dependencies" msgstr "依赖关系(&D)" -#: src/YQPackageSelector.cc:797 +#: src/YQPackageSelector.cc:802 msgid "&Check Now" msgstr "立即检查(&C)" -#: src/YQPackageSelector.cc:798 +#: src/YQPackageSelector.cc:804 msgid "&Autocheck" msgstr "自动检查(&A)" +#: src/YQPackageSelector.cc:809 +#, fuzzy +#| msgid "Recommended Packages" +msgid "Install &Recommended Packages" +msgstr "推荐软件包" + #. Translators: Menu for view options (Use a noun, not a verb!) -#: src/YQPackageSelector.cc:811 +#: src/YQPackageSelector.cc:822 msgid "&Options" msgstr "选项(&O)" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:814 +#: src/YQPackageSelector.cc:825 msgid "Show -de&vel Packages" msgstr "显示 -de&vel 开发包" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:823 +#: src/YQPackageSelector.cc:834 msgid "Show -&debuginfo/-debugsource Packages" msgstr "显示 -&debuginfo/-debugsource 调试包" -#: src/YQPackageSelector.cc:831 +#: src/YQPackageSelector.cc:842 msgid "&System Verification Mode" msgstr "系统校验模式(&S)" -#: src/YQPackageSelector.cc:836 -msgid "&Ignore Recommended Packages for Already Installed Packages" -msgstr "忽略已安装软件包的推荐软件包(&I)" - -#: src/YQPackageSelector.cc:842 +#: src/YQPackageSelector.cc:847 msgid "&Cleanup when deleting packages" msgstr "删除软件包时清理(&C)" -#: src/YQPackageSelector.cc:846 +#: src/YQPackageSelector.cc:851 msgid "&Allow vendor change" msgstr "允许厂商变化(&A)" -#: src/YQPackageSelector.cc:859 +#: src/YQPackageSelector.cc:864 msgid "E&xtras" msgstr "额外(&X)" -#: src/YQPackageSelector.cc:861 +#: src/YQPackageSelector.cc:866 msgid "Show &Products" msgstr "显示产品(&P)" -#: src/YQPackageSelector.cc:862 +#: src/YQPackageSelector.cc:867 msgid "Show P&ackage Changes" msgstr "显示软件包变动(&A)" -#: src/YQPackageSelector.cc:863 +#: src/YQPackageSelector.cc:868 msgid "Show &History" msgstr "显示历史(&H)" #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"! -#: src/YQPackageSelector.cc:871 +#: src/YQPackageSelector.cc:876 msgid "Install All Matching -&devel Packages" msgstr "安装全部匹配的 -&devel 开发包" #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! -#: src/YQPackageSelector.cc:875 +#: src/YQPackageSelector.cc:880 msgid "Install All Matching -de&buginfo Packages" msgstr "安装全部匹配的 -de&buginfo 调试包" #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"! -#: src/YQPackageSelector.cc:878 +#: src/YQPackageSelector.cc:883 msgid "Install All Matching -debug&source Packages" msgstr "安装全部匹配的 -debug&source 调试包" -#: src/YQPackageSelector.cc:883 +#: src/YQPackageSelector.cc:885 +#, fuzzy +#| msgid "Install All Matching -&devel Packages" +msgid "Install All Matching &Recommended Packages" +msgstr "安装全部匹配的 -&devel 开发包" + +#: src/YQPackageSelector.cc:891 msgid "Generate Dependency Resolver &Test Case" msgstr "生成依赖关系解决器试例(&T)" -#: src/YQPackageSelector.cc:903 +#: src/YQPackageSelector.cc:911 msgid "&Help" msgstr "帮助(&H)" #. Note: The help functions and their texts are moved out #. to a separate source file YQPackageSelectorHelp.cc #. Menu entry for help overview -#: src/YQPackageSelector.cc:909 +#: src/YQPackageSelector.cc:917 msgid "&Overview" msgstr "概览(&O)" #. Menu entry for help about used symbols ( icons ) -#: src/YQPackageSelector.cc:912 +#: src/YQPackageSelector.cc:920 msgid "&Symbols" msgstr "符号(&S)" #. Menu entry for keyboard help -#: src/YQPackageSelector.cc:915 +#: src/YQPackageSelector.cc:923 msgid "&Keys" msgstr "按键(&K)" -#: src/YQPackageSelector.cc:1101 +#: src/YQPackageSelector.cc:1109 msgid "All package dependencies are OK." msgstr "全部软件包依赖关系均已满足。" -#: src/YQPackageSelector.cc:1117 +#: src/YQPackageSelector.cc:1125 msgid "P&atches" msgstr "补丁(&A)" #. startsWith #. filter -#: src/YQPackageSelector.cc:1179 +#: src/YQPackageSelector.cc:1187 msgid "Save Package List" msgstr "保存软件包列表" @@ -273,59 +282,59 @@ #. parent #. Post error popup. #. parent -#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312 +#: src/YQPackageSelector.cc:1226 src/YQPackageSelector.cc:1320 #: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201 #: src/YQPkgList.cc:605 msgid "Error" msgstr "错误" #. caption -#: src/YQPackageSelector.cc:1219 +#: src/YQPackageSelector.cc:1227 msgid "Error exporting package list to %1" msgstr "将软件包列表导出到 %1 时出错" -#: src/YQPackageSelector.cc:1231 +#: src/YQPackageSelector.cc:1239 msgid "Load Package List" msgstr "加载软件包列表" #. caption -#: src/YQPackageSelector.cc:1313 +#: src/YQPackageSelector.cc:1321 msgid "Error loading package list from %1" msgstr "从 %1 加载软件包列表时出错" #. caption #. Translators: %1 is the number of affected packages -#: src/YQPackageSelector.cc:1415 +#: src/YQPackageSelector.cc:1423 msgid "%1 packages will be updated" msgstr "将更新 %1 个软件包" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "&Continue" msgstr "继续(&C)" -#: src/YQPackageSelector.cc:1416 +#: src/YQPackageSelector.cc:1424 msgid "C&ancel" msgstr "取消(&A)" -#: src/YQPackageSelector.cc:1455 +#: src/YQPackageSelector.cc:1463 msgid "<p><small>Cancel switching</a> system packages to versions in repository %2</small></p>" msgstr "<p><small>取消切换</a>系统软件包到软件源 %2 中的版本</small></p>" -#: src/YQPackageSelector.cc:1474 +#: src/YQPackageSelector.cc:1482 msgid "<p>Switch system packages</a> to the versions in this repository (%2)</p>" msgstr "<p>切换系统软件包</a>到该软件源 (%2) 中的版本</p>" -#: src/YQPackageSelector.cc:1697 +#: src/YQPackageSelector.cc:1571 src/YQPackageSelector.cc:1726 msgid "Added Subpackages:" msgstr "添加的子软件包：" #. "OK" button #. addHStretch( hbox ); #. "OK" button -#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214 -#: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156 -#: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135 -#: src/YQPkgTextDialog.cc:71 +#: src/YQPackageSelector.cc:1572 src/YQPackageSelector.cc:1728 +#: src/YQPackageSelectorBase.cc:214 src/YQPkgDescriptionDialog.cc:120 +#: src/YQPkgDiskUsageList.cc:156 src/YQPkgDiskUsageList.cc:165 +#: src/YQPkgProductDialog.cc:135 src/YQPkgTextDialog.cc:71 msgid "&OK" msgstr "好(&O)" @@ -372,7 +381,7 @@ msgstr "除了您手选的软件包，还变动了以下软件包以解决依赖关系：" #: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326 -#: src/YQPkgConflictDialog.cc:397 +#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428 msgid "C&ontinue" msgstr "继续(&O)" @@ -1521,10 +1530,43 @@ "最安全的做法是将它们删除。\n" "</p>" -#: src/YQPkgVersionsView.cc:211 +#: src/YQPkgVersionsView.cc:207 msgid "%1-%2 from vendor %3 (installed)" msgstr "%1-%2 来自厂商 %3 (已安装)" +#. Translators: Popup dialog text. Try to keep the lines about the same length. +#: src/YQPkgVersionsView.cc:398 +msgid "" +"You are trying to install multiversion-capable\n" +"and non-multiversion-capable versions of this\n" +"package at the same time." +msgstr "" + +#: src/YQPkgVersionsView.cc:406 +msgid "" +"This version is multiversion-capable.\n" +"\n" +"Press \"Continue\" to install this version\n" +"and unselect the non-multiversion-capable version,\n" +"\"Cancel\" to unselect this version and keep the other one." +msgstr "" + +#: src/YQPkgVersionsView.cc:415 +msgid "" +"This version is not multiversion-capable.\n" +"\n" +"Press \"Continue\" to install only this version\n" +"and unselect all other versions,\n" +"\"Cancel\" to unselect this version and keep the other ones." +msgstr "" + +#. Dialog heading +#: src/YQPkgVersionsView.cc:423 +#, fuzzy +#| msgid "Package Versions" +msgid "Incompatible Package Versions" +msgstr "软件包版本" + #. Translators: %1 is a package version, %2 the package architecture, #. %3 describes the repository where it comes from, #. %4 is the repository's priority @@ -1532,13 +1574,13 @@ #. Examples: #. 2.5.23-i568 from Packman with priority 100 and vendor openSUSE #. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE -#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ -#. %1 %2 %3 %4 %5 -#: src/YQPkgVersionsView.cc:365 src/YQPkgVersionsView.cc:402 +#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ +#. %1 %2 %3 %4 %5 +#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586 msgid "%1-%2 from %3 with priority %4 and vendor %5" msgstr "%1-%2 来自 %3 软件源，优先级 %4，厂商 %5" -#: src/YQPkgVersionsView.cc:386 +#: src/YQPkgVersionsView.cc:570 msgid "This version is installed in your system." msgstr "系统上已安装了此版本。" @@ -1550,6 +1592,9 @@ msgid "Package libqdialogsolver is required for this feature." msgstr "此功能需要 libqdialogsolver 软件包。" +#~ msgid "&Ignore Recommended Packages for Already Installed Packages" +#~ msgstr "忽略已安装软件包的推荐软件包(&I)" + #~ msgid "Close the current page" #~ msgstr "关闭当前页面" Modified: trunk/yast/zh_CN/po/qt.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/qt.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/qt.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-10 10:31+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -47,18 +47,21 @@ msgstr "已用 %1" #. Window title for help wizard window -#. Help button - intentionally without keyboard shortcut -#. "Help" button - intentionally without keyboard shortcut -#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112 src/YQWizard.cc:853 -#: src/YQWizard.cc:1320 +#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112 msgid "Help" msgstr "帮助" #. Close button for wizard help window #: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113 +#: src/QY2RelNotesDialog.cc:86 src/QY2RelNotesDialog.cc:132 msgid "&Close" msgstr "关闭(&C)" +#. Window title for help wizard window +#: src/QY2RelNotesDialog.cc:83 src/QY2RelNotesDialog.cc:131 +msgid "Release Notes" +msgstr "版本资讯" + #: src/QY2StyleEditor.cc:46 msgid "Stylesheet Editor" msgstr "样式表编辑器" @@ -77,12 +80,12 @@ msgstr "意外的点击" #. parent -#: src/YQDialog.cc:623 +#: src/YQDialog.cc:629 msgid "Color switching" msgstr "颜色切换" #. caption -#: src/YQDialog.cc:624 +#: src/YQDialog.cc:630 msgid "" "Switching to color palette for vision impaired users -\n" "press Shift-F4 again to switch back to normal colors." @@ -115,22 +118,41 @@ msgid "Configure YaST Logging:" msgstr "配置 YaST 日志：" +#. Help button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#. "Help" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:857 src/YQWizard.cc:1340 +msgid "&Help" +msgstr "帮助(&H)" + #. #. "Release Notes" button #. -#. Help button - intentionally without keyboard shortcut -#: src/YQWizard.cc:869 -msgid "Release Notes" +#. Release Notes button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#. "Release Notes" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:874 src/YQWizard.cc:1355 +#, fuzzy +#| msgid "Release Notes" +msgid "&Release Notes" msgstr "版本资讯" -#. "Steps" button - intentionally without keyboard shortcut -#: src/YQWizard.cc:1324 -msgid "Steps" +#. "Steps" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:1345 +#, fuzzy +#| msgid "Steps" +msgid "&Steps" msgstr "步骤" -#. "Tree" button - intentionally without keyboard shortcut -#: src/YQWizard.cc:1328 -msgid "Tree" +#. "Tree" button +#. QT handles duplicate shortcuts, it can be kept (bnc#880983) +#: src/YQWizard.cc:1350 +#, fuzzy +#| msgid "Tree" +msgid "&Tree" msgstr "树" #~ msgid "%1 exists! Really overwrite?" Modified: trunk/yast/zh_CN/po/rdp.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/rdp.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/rdp.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-04 15:54+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/rear.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/rear.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/rear.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-09-18 14:55+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -232,13 +232,13 @@ msgstr "正在读取 Rear 配置" #: src/include/rear/ui.rb:698 +msgid "Analyzing system" +msgstr "正在分析系统" + +#: src/include/rear/ui.rb:698 msgid "Reading rear settings" msgstr "正在读取 rear 设置" -#: src/include/rear/ui.rb:698 -msgid "Analyzing system" -msgstr "正在分析系统" - #: src/include/rear/ui.rb:699 msgid "Analyzing system..." msgstr "正在分析系统..." Modified: trunk/yast/zh_CN/po/registration.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/registration.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/registration.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-27 10:52+0200\n" "PO-Revision-Date: 2014-10-30 17:15+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Traditional \n" @@ -23,11 +23,11 @@ "X-Generator: Lokalize 1.5\n" #. popup heading (in bold) -#: src/clients/discover_registration_services.rb:40 +#: src/clients/discover_registration_services.rb:42 msgid "Local Registration Servers" msgstr "本地注册服务器" -#: src/clients/discover_registration_services.rb:42 +#: src/clients/discover_registration_services.rb:44 msgid "" "Select a detected registration server from the list\n" "or the default SUSE registration server." @@ -36,228 +36,78 @@ "或使用默认的 SUSE 注册服务器。" #. error popup -#: src/clients/discover_registration_services.rb:66 +#: src/clients/discover_registration_services.rb:68 msgid "No registration server selected." msgstr "未选择注册服务器。" #. %s is the default SCC URL -#: src/clients/discover_registration_services.rb:112 +#: src/clients/discover_registration_services.rb:114 msgid "SUSE Customer Center (%s)" msgstr "SUSE 客服中心(&s)" #. popup message #. popup message #. popup message -#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49 -#: src/lib/registration/registration_ui.rb:39 +#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49 +#: src/lib/registration/registration_ui.rb:40 msgid "Contacting the Registration Server" msgstr "正在连接注册服务器" -#. display the registration update dialog +#. check the base product at start to avoid problems later +#. Translators: Text for UI Label - capitalized #. dialog title +#. just set an empty Wizard dialog to replace the current one after +#. pressing "Next" #. dialog title -#. Translators: Text for UI Label - capitalized -#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310 -#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515 -#: src/lib/registration/ui/autoyast_config_dialog.rb:92 +#. display and run a dialog for updating the current registration +#. @return [Symbol] user input +#: src/clients/inst_scc.rb:186 +#: src/lib/registration/ui/autoyast_config_dialog.rb:104 +#: src/lib/registration/ui/base_system_registration_dialog.rb:48 +#: src/lib/registration/ui/migration_repos_workflow.rb:270 +#: src/lib/registration/ui/registered_system_dialog.rb:37 +#: src/lib/registration/ui/registration_update_dialog.rb:41 msgid "Registration" msgstr "注册" -#: src/clients/inst_scc.rb:216 -msgid "Registration is being updated..." -msgstr "正在更新注册..." - -#: src/clients/inst_scc.rb:217 -msgid "The previous registration is being updated." -msgstr "正在更新之前的注册。" - -#. automatic registration refresh during system upgrade failed, register from scratch -#: src/clients/inst_scc.rb:233 -msgid "" -"Automatic registration upgrade failed.\n" -"You can manually register the system from scratch." -msgstr "" -"自动注册升级失败。\n" -"您可以从头开始手动注册该系统。" - -#. label text describing the registration (1/2) -#. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:247 -msgid "" -"Please enter a registration or evaluation code for this product and your\n" -"User Name/E-mail address from the SUSE Customer Center in the fields below.\n" -"Access to security and general software updates is only possible on\n" -"a registered system." -msgstr "" -"请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件地址。\n" -"只有注册了产品才能够获得安全和常规软件更新。" - -#. label text describing the registration (2/2), -#. not displayed in installed system -#. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/clients/inst_scc.rb:259 -msgid "" -"If you skip product registration now, remember to register after\n" -"installation has completed." -msgstr "若您现在跳过了注册，请记得在安装完成后注册呀。" - -#: src/clients/inst_scc.rb:267 -msgid "Network Configuration..." -msgstr "网络配置..." - -#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452 -msgid "The system is already registered." -msgstr "系统已注册。" - -#: src/clients/inst_scc.rb:283 -#: src/lib/registration/ui/autoyast_config_dialog.rb:94 -msgid "&E-mail Address" -msgstr "电子邮件地址(&E)" - -#. handle nil specifically, it cannot be stored in XML profile -#: src/clients/inst_scc.rb:285 -#: src/lib/registration/ui/autoyast_addon_dialog.rb:167 -#: src/lib/registration/ui/autoyast_config_dialog.rb:96 -msgid "Registration &Code" -msgstr "注册码(&C)" - -#. button label -#: src/clients/inst_scc.rb:290 -msgid "&Local Registration Server..." -msgstr "本地注册服务器(&L)..." - -#. button label -#: src/clients/inst_scc.rb:293 -msgid "&Skip Registration" -msgstr "跳过注册(&S)" - -#. help text -#: src/clients/inst_scc.rb:301 -msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." -msgstr "在此输入 SUSE 客服中心账户信息来注册系统以获得更新和扩展。" - -#. not set yet? -#: src/clients/inst_scc.rb:334 -msgid "" -"Registration added some update repositories.\n" -"\n" -"Do you want to install the latest available\n" -"on-line updates during installation?" -msgstr "" -"注册程序添加了一些更新源。\n" -"\n" -"您想要在安装期间安装最新可用的在线更新吗？" - -#. %s is name of given product -#. %s is name of given product -#. then register the product(s) -#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284 -#: src/lib/registration/registration_ui.rb:71 -msgid "Registering %s ..." -msgstr "正在注册 %s ..." - -#. dialog title -#: src/clients/inst_scc.rb:419 -msgid "Register Extensions and Modules" -msgstr "注册扩展和模块" - -#. help text -#: src/clients/inst_scc.rb:423 -msgid "<p>Extensions and Modules are being registered.</p>" -msgstr "<p>正在注册扩展和模块。</p>" - -#. Popup question: confirm skipping the registration -#: src/clients/inst_scc.rb:441 -msgid "" -"If you do not register your system we will not be able\n" -"to grant you access to the update repositories.\n" -"\n" -"You can register after the installation or visit our\n" -"Customer Center for online registration.\n" -"\n" -"Really skip the registration now?" -msgstr "" -"若您未注册您的系统，我们将无法保证您能够访问更新软件源。\n" -"\n" -"您可以安装后再注册或访问我们的客服中心在线注册。\n" -"\n" -"现在真的要跳过注册吗？" - -#. button label -#: src/clients/inst_scc.rb:455 -msgid "Register Again" -msgstr "再次注册" - -#. button label -#: src/clients/inst_scc.rb:458 -msgid "Select Extensions" -msgstr "选择扩展" - -#. help text -#: src/clients/inst_scc.rb:470 -msgid "<p>The system is already registered.</p>" -msgstr "<p>系统已注册。</p>" - -#: src/clients/inst_scc.rb:471 -msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>" -msgstr "<p>您可以再次注册或注册额外扩展或模块以增强系统功能。</p>" - -#: src/clients/inst_scc.rb:473 -msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>" -msgstr "<p>若您想要反注册您的系统，您需要登入 SUSE 客服中心并在那里手动移除该系统。</p>" - -#. error message -#: src/clients/inst_scc.rb:497 -msgid "" -"The base product was not found,\n" -"check your system." -msgstr "未找到基础产品，请检查您的系统。" - -#. TRANSLATORS: %s = bugzilla URL -#: src/clients/inst_scc.rb:501 -msgid "" -"The installation medium or the installer itself is seriously broken.\n" -"Report a bug at %s." -msgstr "" -"安装介质或安装器自身严重损坏。\n" -"请于 %s 汇报故障。" - -#: src/clients/inst_scc.rb:504 -msgid "" -"Make sure a product is installed and /etc/products.d/baseproduct\n" -"is a symlink pointing to the base product .prod file." -msgstr "请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文件的符号链接。" - #. Command line help text for the repository module, %1 is "SUSEconnect" -#: src/clients/scc.rb:44 +#. Command line help text for the repository module, %1 is "SUSEconnect" +#: src/clients/registration.rb:43 src/clients/scc.rb:43 msgid "Use '%s' instead of this YaST module." msgstr "使用 '%s' 而不是这个 YaST 模块。" #. popup message: registration finished properly -#: src/clients/scc_auto.rb:184 +#: src/clients/scc_auto.rb:201 msgid "Registration was successfull." msgstr "注册成功。" #. remove possible duplicates -#: src/clients/scc_auto.rb:212 +#: src/clients/scc_auto.rb:229 msgid "SLP discovery failed, no server found" msgstr "SLP 探索失败，未找到服务器" -#. more than one server found: let the user select, we cannot automatically -#. decide which one to use, asking user in AutoYast mode is not nice -#. but better than aborting the installation... -#: src/clients/scc_auto.rb:228 +#. download and install the specified SSL certificate to the system +#. @param url [String] URL of the certificate +#: src/clients/scc_auto.rb:247 msgid "Downloading SSL Certificate" msgstr "正在下载 SSL 证书" -#: src/clients/scc_auto.rb:232 +#: src/clients/scc_auto.rb:251 msgid "Importing SSL Certificate" msgstr "正在导入 SSL 证书" +#. %s is name of given product +#. then register the product(s) +#. %s is name of given product +#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247 +#: src/lib/registration/registration_ui.rb:277 +msgid "Registering %s ..." +msgstr "正在注册 %s ..." + #. display the extension selection dialog and wait for a button click #. @return [Symbol] user input (:import, :cancel) #: src/data/registration/autoyast_summary.erb:5 -#: src/lib/registration/ui/autoyast_config_dialog.rb:49 +#: src/lib/registration/ui/autoyast_config_dialog.rb:55 msgid "Product Registration" msgstr "产品注册" @@ -323,33 +173,33 @@ msgstr "失败证书细节" #: src/data/registration/certificate_summary.erb:4 -#: src/lib/registration/ssl_certificate_details.rb:35 +#: src/lib/registration/ssl_certificate_details.rb:34 msgid "Issued To" msgstr "签发给" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:7 #: src/data/registration/certificate_summary.erb:16 -#: src/lib/registration/ssl_certificate_details.rb:61 +#: src/lib/registration/ssl_certificate_details.rb:60 msgid "Common Name (CN): " msgstr "通用名 (CN)：" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:8 #: src/data/registration/certificate_summary.erb:17 -#: src/lib/registration/ssl_certificate_details.rb:63 +#: src/lib/registration/ssl_certificate_details.rb:62 msgid "Organization (O): " msgstr "组织 (O)：" #. label followed by the SSL certificate identification #: src/data/registration/certificate_summary.erb:9 #: src/data/registration/certificate_summary.erb:18 -#: src/lib/registration/ssl_certificate_details.rb:65 +#: src/lib/registration/ssl_certificate_details.rb:64 msgid "Organization Unit (OU): " msgstr "组织单位 (OU)：" #: src/data/registration/certificate_summary.erb:13 -#: src/lib/registration/ssl_certificate_details.rb:36 +#: src/lib/registration/ssl_certificate_details.rb:35 msgid "Issued By" msgstr "签发人" @@ -378,17 +228,17 @@ msgstr "序列号：" #: src/data/registration/certificate_summary.erb:44 -#: src/lib/registration/ssl_certificate_details.rb:36 +#: src/lib/registration/ssl_certificate_details.rb:35 msgid "SHA1 Fingerprint: " msgstr "SHA1 指纹: " #: src/data/registration/certificate_summary.erb:46 -#: src/lib/registration/ssl_certificate_details.rb:38 +#: src/lib/registration/ssl_certificate_details.rb:37 msgid "SHA256 Fingerprint: " msgstr "SHA256 指纹: " #. Error popup -#: src/lib/registration/connect_helpers.rb:72 +#: src/lib/registration/connect_helpers.rb:74 msgid "" "Network is not configured, the registration server cannot be reached.\n" "Do you want to configure the network now?" @@ -396,22 +246,22 @@ "未配置网络，无法访问注册服务器。\n" "您想要现在配置网络吗？" -#: src/lib/registration/connect_helpers.rb:78 +#: src/lib/registration/connect_helpers.rb:80 msgid "Network error, check the network configuration." msgstr "网络错误，请检查网络配置。" #. Error popup -#: src/lib/registration/connect_helpers.rb:83 +#: src/lib/registration/connect_helpers.rb:85 msgid "Connection time out." msgstr "连接超时。" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:91 +#: src/lib/registration/connect_helpers.rb:93 msgid "Check that this system is known to the registration server." msgstr "检查本系统是否已在注册服务器上注册。" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:97 +#: src/lib/registration/connect_helpers.rb:99 msgid "" "If you are upgrading from SLE11 make sure the SCC server\n" "knows the old NCC registration. Synchronization from NCC to SCC\n" @@ -432,20 +282,20 @@ #. update the message when an old SMT server is found #. Error popup #. update the message when an old SMT server is found -#: src/lib/registration/connect_helpers.rb:111 -#: src/lib/registration/connect_helpers.rb:116 -#: src/lib/registration/connect_helpers.rb:119 -#: src/lib/registration/connect_helpers.rb:125 -#: src/lib/registration/connect_helpers.rb:175 -#: src/lib/registration/connect_helpers.rb:178 +#: src/lib/registration/connect_helpers.rb:113 +#: src/lib/registration/connect_helpers.rb:118 +#: src/lib/registration/connect_helpers.rb:121 +#: src/lib/registration/connect_helpers.rb:128 +#: src/lib/registration/connect_helpers.rb:179 +#: src/lib/registration/connect_helpers.rb:182 msgid "Registration failed." msgstr "注册失败。" -#: src/lib/registration/connect_helpers.rb:121 +#: src/lib/registration/connect_helpers.rb:123 msgid "Registration client error." msgstr "注册客户端错误。" -#: src/lib/registration/connect_helpers.rb:123 +#: src/lib/registration/connect_helpers.rb:125 msgid "" "Registration server error.\n" "Retry registration later." @@ -454,33 +304,33 @@ "请稍候重新注册。" #. error message -#: src/lib/registration/connect_helpers.rb:164 +#: src/lib/registration/connect_helpers.rb:167 msgid "Received SSL Certificate does not match the expected certificate." msgstr "收到的 SSL 证书不匹配期望的证书。" #. %s are error details -#: src/lib/registration/connect_helpers.rb:195 +#: src/lib/registration/connect_helpers.rb:197 msgid "Details: %s" msgstr "细节：%s" #. progress label -#: src/lib/registration/connect_helpers.rb:220 +#: src/lib/registration/connect_helpers.rb:222 msgid "Importing the SSL certificate" msgstr "导入 SSL 证书" -#: src/lib/registration/connect_helpers.rb:221 +#: src/lib/registration/connect_helpers.rb:223 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:241 +#: src/lib/registration/connect_helpers.rb:244 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:260 +#: src/lib/registration/connect_helpers.rb:263 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -496,21 +346,39 @@ msgid "Storing Registration Configuration..." msgstr "正在存储注册配置..." -#. register the system and the base product -#. @return [Array] array with two -#. items: boolean (true on success), remote service (or nil) -#. TODO FIXME: split to two separate parts -#. TODO FIXME: reused an existing message due to text freeze +#. error message +#: src/lib/registration/helpers.rb:231 +msgid "" +"The base product was not found,\n" +"check your system." +msgstr "未找到基础产品，请检查您的系统。" + +#. TRANSLATORS: %s = bugzilla URL +#: src/lib/registration/helpers.rb:235 +msgid "" +"The installation medium or the installer itself is seriously broken.\n" +"Report a bug at %s." +msgstr "" +"安装介质或安装器自身严重损坏。\n" +"请于 %s 汇报故障。" + +#: src/lib/registration/helpers.rb:238 +msgid "" +"Make sure a product is installed and /etc/products.d/baseproduct\n" +"is a symlink pointing to the base product .prod file." +msgstr "请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文件的符号链接。" + +#. FIXME: reused an existing message due to text freeze #. (later use a better text, it's system update actually...) -#: src/lib/registration/registration_ui.rb:62 -#: src/lib/registration/registration_ui.rb:95 +#: src/lib/registration/registration_ui.rb:80 +#: src/lib/registration/registration_ui.rb:233 msgid "Registering the System..." msgstr "正在注册系统..." #. updating base product registration, %s is a new base product name #. updating registered addon/extension, %s is an extension name -#: src/lib/registration/registration_ui.rb:121 -#: src/lib/registration/registration_ui.rb:146 +#: src/lib/registration/registration_ui.rb:106 +#: src/lib/registration/registration_ui.rb:312 msgid "Updating to %s ..." msgstr "正在更新到 %s ..." @@ -518,68 +386,129 @@ #. the result is cached to avoid reloading when going back and forth in the #. installation workflow #. @return [ArrayRegistration::Addon] available addons -#. create a new dialog for accepting and importing a SSL certificate and run it -#: src/lib/registration/registration_ui.rb:174 -#: src/lib/registration/ui/autoyast_config_workflow.rb:101 +#. download the addons from SCC, let the user select addons to install +#. @return [Symbol] the user input +#: src/lib/registration/registration_ui.rb:143 +#: src/lib/registration/ui/autoyast_config_workflow.rb:109 msgid "Loading Available Extensions and Modules..." msgstr "正在加载可用扩展和模块..." +#: src/lib/registration/registration_ui.rb:157 +#, fuzzy +#| msgid "Loading configuration %1..." +msgid "Loading Migration Products..." +msgstr "正在加载配置 %1..." + +#. dialog title +#: src/lib/registration/registration_ui.rb:174 +msgid "Register Extensions and Modules" +msgstr "注册扩展和模块" + +#. help text +#: src/lib/registration/registration_ui.rb:178 +msgid "<p>Extensions and Modules are being registered.</p>" +msgstr "<p>正在注册扩展和模块。</p>" + +#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:203 +#, fuzzy +#| msgid "No registration server selected." +msgid "" +"The registration server offers update repositories.\n" +"\n" +msgstr "未选择注册服务器。" + +#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:207 +#, fuzzy +#| msgid "" +#| "Would you like to use these mount points\n" +#| "for your new installation?" +msgid "Would you like to enable these repositories during installation\n" +msgstr "" +"是否要在安装新系统的过程中使用\n" +"这些挂载点？" + +#. Yast::Mode.update +#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line +#: src/lib/registration/registration_ui.rb:211 +#, fuzzy +#| msgid "Would you like to open this profile in editing mode?" +msgid "Would you like to enable these repositories during upgrade\n" +msgstr "是否要以编辑方式打开此设置存档？" + #. indent size used in summary text -#: src/lib/registration/ssl_certificate_details.rb:35 +#: src/lib/registration/ssl_certificate_details.rb:34 msgid "Certificate:" msgstr "证书：" #. create UI label for a base product -#. @param [Hash] Product (hash from pkg-bindings) +#. @param base_product [Hash] Product (hash from pkg-bindings) #. @return [String] UI Label -#: src/lib/registration/sw_mgmt.rb:120 +#: src/lib/registration/sw_mgmt.rb:147 msgid "Unknown product" msgstr "未知产品" #. error message -#: src/lib/registration/sw_mgmt.rb:153 +#. error message +#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248 msgid "Saving repository configuration failed." msgstr "保存软件源配置失败。" #. # error message #. error message -#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202 +#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223 msgid "Updating service '%s' failed." msgstr "更新服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:197 +#: src/lib/registration/sw_mgmt.rb:218 msgid "Adding service '%s' failed." msgstr "添加服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:209 +#: src/lib/registration/sw_mgmt.rb:230 msgid "Saving service '%s' failed." msgstr "保存服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:214 +#: src/lib/registration/sw_mgmt.rb:235 msgid "Refreshing service '%s' failed." msgstr "刷新服务 '%s' 失败。" +#. TRANSLATORS: %s is a product name +#: src/lib/registration/sw_mgmt.rb:438 +#, fuzzy +#| msgid "No products found to be registered." +msgid "" +"Cannot find remote product %s.\n" +"The product cannot be registered." +msgstr "未找到要注册的产品。" + +#. Use .AnyQuestion instead of .YesNo or .ReallyAbort to have full control +#. on :focus_no and be consistent with the .ConfirmAbort behavior +#: src/lib/registration/ui/abort_confirmation.rb:35 +msgid "Really abort?" +msgstr "是否确实要中止？" + #. dialog title -#: src/lib/registration/ui/addon_eula_dialog.rb:40 +#: src/lib/registration/ui/addon_eula_dialog.rb:43 msgid "License Agreement" msgstr "许可协议" -#: src/lib/registration/ui/addon_eula_dialog.rb:41 +#: src/lib/registration/ui/addon_eula_dialog.rb:44 msgid "Downloading Licenses..." msgstr "正在下载许可证..." #. download the addon EULAs to a temp dir -#. @param [SUSE::Connect::Product] addon the addon +#. @param [Addon] addon the addon #. @param [String] tmpdir target where to download the files -#: src/lib/registration/ui/addon_eula_dialog.rb:72 +#: src/lib/registration/ui/addon_eula_dialog.rb:75 msgid "Downloading License Agreement..." msgstr "正在下载许可协议..." #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/lib/registration/ui/addon_eula_dialog.rb:85 +#: src/lib/registration/ui/addon_eula_dialog.rb:88 msgid "" "Downloading the license for\n" "%s\n" @@ -590,17 +519,17 @@ "的许可证失败。" #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit" -#: src/lib/registration/ui/addon_eula_dialog.rb:100 +#: src/lib/registration/ui/addon_eula_dialog.rb:102 msgid "%s License Agreement" msgstr "%s 许可协议" #. dialog title -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:37 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:46 msgid "Extension and Module Registration Codes" msgstr "扩展和模块注册码" #. help text -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:41 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:50 msgid "" "<p>Enter registration codes for the requested extensions or modules.</p>\n" "<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>" @@ -608,118 +537,154 @@ "<p>请输入所请求扩展或模块的注册码。</p>\n" "<p>注册码为成功注册所必需。若您无法提供注册码则请返回并反选相应扩展或模块。</p>" -#. round the half up (more items in the first column for odd number of items) -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:87 +#. part of the UI - labels in the dialog +#. @return [ArrayYast::Term] UI definition +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:102 msgid "The extension you selected needs a separate registration code." msgid_plural "The extensions you selected need separate registration codes." msgstr[0] "您所选的扩展需要单独的注册码。" -#: src/lib/registration/ui/addon_reg_codes_dialog.rb:92 +#: src/lib/registration/ui/addon_reg_codes_dialog.rb:111 msgid "Enter the registration code into the field below." msgid_plural "Enter the registration codes into the fields below." msgstr[0] "请将注册码输入到下面字段。" -#. dialog title -#: src/lib/registration/ui/addon_selection_dialog.rb:44 -msgid "Extension and Module Selection" -msgstr "扩展和模块选择" +#. create the main dialog definition +#. @return [Yast::Term] the main UI dialog term +#: src/lib/registration/ui/addon_selection_base_dialog.rb:77 +msgid "Details" +msgstr "细节" -#. help text (1/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:47 -msgid "<p>Here you can select available extensions and modules for yoursystem.</p>" -msgstr "<p>在此您可为您的系统选择可用扩展和模块。</p>" +#. addon description widget +#. @return [Yast::Term] the addon details widget +#: src/lib/registration/ui/addon_selection_base_dialog.rb:88 +msgid "Select an extension or a module to show details here" +msgstr "选择一个扩展或模块并在此显示其细节" +#. checkbox label for an unavailable extension +#. (%s is an extension name) +#: src/lib/registration/ui/addon_selection_base_dialog.rb:164 +msgid "%s (not available)" +msgstr "%s (不可用)" + +#. check if the count of addons requiring a reg. code fits two columns +#: src/lib/registration/ui/addon_selection_base_dialog.rb:246 +msgid "YaST allows to select at most %s extensions or modules." +msgstr "YaST 允许选择最多 %s 个扩展或模块。" + #. help text (2/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:50 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:257 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>" msgstr "<p>请注意，某些扩展或模块可能需要指定的注册码。</p>" #. help text (3/3) -#: src/lib/registration/ui/addon_selection_dialog.rb:53 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:260 msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>" msgstr "<p>若您想要移除扩展或模块，您需要登入 SUSE 客服中心并在那里手动移除它们。</p>" -#. always enable Back/Next, the dialog cannot be the first in workflow -#: src/lib/registration/ui/addon_selection_dialog.rb:72 +#. dialog title +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:31 +msgid "Extension and Module Selection" +msgstr "扩展和模块选择" + +#. help text (1/3) +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:34 +msgid "<p>Here you can select available extensions and modules for yoursystem.</p>" +msgstr "<p>在此您可为您的系统选择可用扩展和模块。</p>" + +#. @return [String] the main dialog label +#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52 msgid "Available Extensions and Modules" msgstr "可用扩展和模块" -#: src/lib/registration/ui/addon_selection_dialog.rb:74 -msgid "Details" -msgstr "细节" +#. dialog title +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37 +#, fuzzy +#| msgid "Extension and Module Registration Codes" +msgid "Extension and Module Re-registration" +msgstr "扩展和模块注册码" -#: src/lib/registration/ui/addon_selection_dialog.rb:77 -msgid "Select an extension or a module to show details here" -msgstr "选择一个扩展或模块并在此显示其细节" +#. help text (1/3) +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40 +#, fuzzy +#| msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" +msgid "<p>Here you can select extensions and modules which will be registered again.</p>" +msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>" -#. checkbox label for an unavailable extension -#. (%s is an extension name) -#: src/lib/registration/ui/addon_selection_dialog.rb:136 -msgid "%s (not available)" -msgstr "%s (不可用)" +#. @return [String] the main dialog label +#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54 +#, fuzzy +#| msgid "Register Extensions and Modules" +msgid "Registered Extensions and Modules" +msgstr "注册扩展和模块" -#. check the addons requiring a reg. code -#: src/lib/registration/ui/addon_selection_dialog.rb:217 -msgid "YaST allows to select at most %s extensions or modules." -msgstr "YaST 允许选择最多 %s 个扩展或模块。" - #. help text -#: src/lib/registration/ui/autoyast_addon_dialog.rb:33 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:38 msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:36 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:41 msgid "Register Optional Extensions or Modules" msgstr "注册可选扩展或模块" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:50 +#. create the main dialog content +#. @return [Yast::Term] UI definition +#: src/lib/registration/ui/autoyast_addon_dialog.rb:57 msgid "Identifier" msgstr "标识符" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:51 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:58 msgid "Version" msgstr "版本" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:52 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:59 msgid "Architecture" msgstr "架构" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:53 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:60 msgid "Release Type" msgstr "发行类型" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:54 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:61 msgid "Registration Code" msgstr "注册码" #. button label -#: src/lib/registration/ui/autoyast_addon_dialog.rb:65 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:72 msgid "Download Available Extensions..." msgstr "下载可用扩展..." -#. disable download on a non-registered system -#: src/lib/registration/ui/autoyast_addon_dialog.rb:119 +#. remove the selected addon after user confirms the removal +#: src/lib/registration/ui/autoyast_addon_dialog.rb:137 msgid "Really delete '%s'?" msgstr "真的删除 '%s' 吗？" -#. replace the content -#: src/lib/registration/ui/autoyast_addon_dialog.rb:161 +#. dialog definition for adding/editing an addon +#. @return [Yast::Term] popup definition +#: src/lib/registration/ui/autoyast_addon_dialog.rb:185 msgid "Extension or Module &Identifier" msgstr "扩展或模块标识符(&I)" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:162 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:186 msgid "&Version" msgstr "版本(&V)" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:163 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:187 msgid "&Architecture" msgstr "架构(&A)" -#: src/lib/registration/ui/autoyast_addon_dialog.rb:164 +#: src/lib/registration/ui/autoyast_addon_dialog.rb:188 msgid "&Release Type" msgstr "发行类型(&R)" -#: src/lib/registration/ui/autoyast_config_dialog.rb:51 +#. handle nil specifically, it cannot be stored in XML profile +#: src/lib/registration/ui/autoyast_addon_dialog.rb:191 +#: src/lib/registration/ui/autoyast_config_dialog.rb:108 +#: src/lib/registration/ui/base_system_registration_dialog.rb:133 +msgid "Registration &Code" +msgstr "注册码(&C)" + +#: src/lib/registration/ui/autoyast_config_dialog.rb:57 msgid "" "<p>Product registration includes your product in SUSE Customer Center database,\n" "enabling you to get online updates and technical support.\n" @@ -729,7 +694,7 @@ "使您能够获得在线更新和技术支持。\n" "要在自动安装期间注册，请选择<b>运行产品注册</b>。</p>" -#: src/lib/registration/ui/autoyast_config_dialog.rb:56 +#: src/lib/registration/ui/autoyast_config_dialog.rb:63 msgid "" "<p>If your network deploys a custom registration server, set the correct URL of the server\n" "and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n" @@ -738,116 +703,443 @@ "<p>若您的网络部署了一个自定义注册服务器，请设置正确的服务器 URL\n" "以及在<b>SMT 服务器设置</b>中设置 SMT 证书的位置。进一步协助请参考您的 SMT 手册。</p>" -#. FIXME the dialog should be created by external code before calling this -#: src/lib/registration/ui/autoyast_config_dialog.rb:83 +#. the UI defition for the global registration status +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:93 msgid "Register the Product" msgstr "注册产品" -#: src/lib/registration/ui/autoyast_config_dialog.rb:100 +#. part of the main dialog definition - the input fields +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:106 +#: src/lib/registration/ui/base_system_registration_dialog.rb:131 +msgid "&E-mail Address" +msgstr "电子邮件地址(&E)" + +#: src/lib/registration/ui/autoyast_config_dialog.rb:112 msgid "Install Available Updates from Update Repositories" msgstr "安装来自更新软件源的可用更新" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:114 +#: src/lib/registration/ui/autoyast_config_dialog.rb:128 msgid "Server Settings" msgstr "服务器设置" -#: src/lib/registration/ui/autoyast_config_dialog.rb:118 +#: src/lib/registration/ui/autoyast_config_dialog.rb:132 msgid "Find Registration Server Using SLP Discovery" msgstr "使用 SLP 探索查找注册服务器" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:123 +#: src/lib/registration/ui/autoyast_config_dialog.rb:137 msgid "Use Specific Server URL Instead of the Default" msgstr "使用特定服务器 URL 而非默认" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:130 +#: src/lib/registration/ui/autoyast_config_dialog.rb:144 msgid "Optional SSL Server Certificate URL" msgstr "可选 SSL 服务器证书 URL" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:139 +#: src/lib/registration/ui/autoyast_config_dialog.rb:153 msgid "Optional SSL Server Certificate Fingerprint" msgstr "可选 SSL 服务器证书指纹" -#: src/lib/registration/ui/autoyast_config_dialog.rb:141 +#: src/lib/registration/ui/autoyast_config_dialog.rb:155 msgid "none" msgstr "无" #. Translators: Text for UI Label - capitalized -#: src/lib/registration/ui/autoyast_config_dialog.rb:152 +#: src/lib/registration/ui/autoyast_config_dialog.rb:166 msgid "SSL Certificate Fingerprint" msgstr "SSL 证书指纹" -#: src/lib/registration/ui/autoyast_config_dialog.rb:173 +#. the UI defition for the main dialog +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/autoyast_config_dialog.rb:189 msgid "Register Extensions or Modules..." msgstr "注册扩展或模块..." +#. button label +#: src/lib/registration/ui/base_system_registration_dialog.rb:84 +msgid "&Local Registration Server..." +msgstr "本地注册服务器(&L)..." + +#. button label +#: src/lib/registration/ui/base_system_registration_dialog.rb:97 +msgid "&Skip Registration" +msgstr "跳过注册(&S)" + +#. display the addon re-registration button only in registered installed system +#: src/lib/registration/ui/base_system_registration_dialog.rb:106 +#, fuzzy +#| msgid "Register Extensions or Modules..." +msgid "&Register Extensions or Modules Again" +msgstr "注册扩展或模块..." + +#. part of the main dialog definition - the base product details +#. @return [Yast::Term] UI term +#. the main dialog content +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/base_system_registration_dialog.rb:118 +#: src/lib/registration/ui/registered_system_dialog.rb:67 +msgid "The system is already registered." +msgstr "系统已注册。" + +#. help text +#: src/lib/registration/ui/base_system_registration_dialog.rb:142 +msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." +msgstr "在此输入 SUSE 客服中心账户信息来注册系统以获得更新和扩展。" + +#. Popup question: confirm skipping the registration +#: src/lib/registration/ui/base_system_registration_dialog.rb:177 +msgid "" +"If you do not register your system we will not be able\n" +"to grant you access to the update repositories.\n" +"\n" +"You can register after the installation or visit our\n" +"Customer Center for online registration.\n" +"\n" +"Really skip the registration now?" +msgstr "" +"若您未注册您的系统，我们将无法保证您能够访问更新软件源。\n" +"\n" +"您可以安装后再注册或访问我们的客服中心在线注册。\n" +"\n" +"现在真的要跳过注册吗？" + +#. label text describing the registration (1/2) +#. use \n to split to more lines if needed (use max. 76 chars/line) +#: src/lib/registration/ui/base_system_registration_dialog.rb:194 +msgid "" +"Please enter a registration or evaluation code for this product and your\n" +"User Name/E-mail address from the SUSE Customer Center in the fields below.\n" +"Access to security and general software updates is only possible on\n" +"a registered system." +msgstr "" +"请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件地址。\n" +"只有注册了产品才能够获得安全和常规软件更新。" + +#. label text describing the registration (2/2), +#. not displayed in installed system +#. use \n to split to more lines if needed (use max. 76 chars/line) +#: src/lib/registration/ui/base_system_registration_dialog.rb:206 +msgid "" +"If you skip product registration now, remember to register after\n" +"installation has completed." +msgstr "若您现在跳过了注册，请记得在安装完成后注册呀。" + +#. UI term for the network configuration button (or empty if not needed) +#. @return [Yast::Term] UI term +#: src/lib/registration/ui/base_system_registration_dialog.rb:218 +msgid "Network Configuration..." +msgstr "网络配置..." + #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:25 +#: src/lib/registration/ui/import_certificate_dialog.rb:23 msgid "Certificate has expired" msgstr "证书已过期" #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:27 +#: src/lib/registration/ui/import_certificate_dialog.rb:25 msgid "Self signed certificate" msgstr "自签名证书" #. SSL error message -#: src/lib/registration/ui/import_certificate_dialog.rb:29 +#: src/lib/registration/ui/import_certificate_dialog.rb:27 msgid "Self signed certificate in certificate chain" msgstr "证书链中自签名的证书" #. push button -#: src/lib/registration/ui/import_certificate_dialog.rb:73 +#: src/lib/registration/ui/import_certificate_dialog.rb:74 msgid "&Trust and Import" msgstr "信任和导入(&T)" #. help text (RichText) for importing a SSL certificate (1/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:119 +#: src/lib/registration/ui/import_certificate_dialog.rb:122 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>" msgstr "<p>安全连接 (HTTPS) 使用 SSL 证书来校验服务器的权威性和加密所传输的数据。</p>" #. help text (RichText) for importing a SSL certificate (2/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:123 +#: src/lib/registration/ui/import_certificate_dialog.rb:126 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>" msgstr "<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中，这意味着您信任该未知证书的主体和签发人。</p>" #. help text (RichText) for importing a SSL certificate (3/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:128 +#: src/lib/registration/ui/import_certificate_dialog.rb:131 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>" msgstr "<p>导入证书将允许使用例如自签名的证书。</p>" #. help text (RichText) for importing a SSL certificate (4/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:132 +#: src/lib/registration/ui/import_certificate_dialog.rb:135 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>" msgstr "<p><b>重要：</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证书。</p>" #. help text (RichText) for importing a SSL certificate (5/5) -#: src/lib/registration/ui/import_certificate_dialog.rb:137 +#: src/lib/registration/ui/import_certificate_dialog.rb:140 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>" msgstr "<p><b>未校验即导入一个未知证书是一个巨大的安全风险。</b></p>" #. error message, the entered URL is not valid -#: src/lib/registration/ui/local_server_dialog.rb:60 +#: src/lib/registration/ui/local_server_dialog.rb:67 msgid "Invalid URL." msgstr "无效 URL。" #. input field label -#: src/lib/registration/ui/local_server_dialog.rb:97 +#: src/lib/registration/ui/local_server_dialog.rb:106 msgid "&Local Registration Server URL" msgstr "本地注册服务器 URL(&L)" +#. register the base system if not already registered +#: src/lib/registration/ui/media_addon_workflow.rb:130 +msgid "" +"The base system has to be registered in order to register the '%s' add-on.\n" +"Skip the base system and the add-on registration?" +msgstr "" + +#. TRANSLATORS: dialog title +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47 +#, fuzzy +#| msgid "Additional Repositories" +msgid "Migration Repositories" +msgstr "附加源" + +#. TRANSLATORS: help text +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50 +msgid "<p>In this dialog you can manually select which repositories willbe used for online migration. The packages will be upgraded to thehighest version found in the selected repositories.</p>" +msgstr "" + +#. TRANSLATORS: Multiselection widget label +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85 +#, fuzzy +#| msgid "Di&rectory to Contain Repositories:" +msgid "Select the Migration Repositories" +msgstr "包含源的目录(&R):" + +#. TRANSLATORS: Push button label, starts the repository management module +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89 +#, fuzzy +#| msgid "Saving Repositories..." +msgid "Manage Repositories..." +msgstr "正在保存安装源..." + +#. TRANSLATORS: summary text, %s is a repository URL +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114 +#, fuzzy +#| msgid "URL: %1" +msgid "URL: %s" +msgstr "URL：%1" + +#. TRANSLATORS: summary text, %s is a repository priority (1-99) +#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116 +#, fuzzy +#| msgid "Priority" +msgid "Priority: %s" +msgstr "优先级" + +#. a dummy message which will be used later, just make sure we have it +#. before the translation deadline... +#. TRANSLATORS: popup question, confirm installing the available +#. updates now +#: src/lib/registration/ui/migration_repos_workflow.rb:50 +msgid "" +"Online updates are available for installation.\n" +"It is recommended to install all updates before proceeding.\n" +"\n" +"Would you like to install the updates now?" +msgstr "" + +#. TRANSLATORS: error message, %s are details +#: src/lib/registration/ui/migration_repos_workflow.rb:86 +#, fuzzy +#| msgid "Internal error" +msgid "Internal error: %s" +msgstr "内部错误" + +#. TRANSLATORS: Error message +#: src/lib/registration/ui/migration_repos_workflow.rb:170 +msgid "No installed product found." +msgstr "" + +#. TRANSLATORS: Error message +#: src/lib/registration/ui/migration_repos_workflow.rb:199 +msgid "No migration product found." +msgstr "" + +#. TRANSLATORS: Progress label +#: src/lib/registration/ui/migration_repos_workflow.rb:246 +#, fuzzy +#| msgid "Registering Product..." +#| msgid_plural "Registering Products..." +msgid "Registering Migration Products..." +msgstr "正在注册产品..." + +#. TRANSLATORS: progress message +#: src/lib/registration/ui/migration_repos_workflow.rb:272 +#, fuzzy +#| msgid "Saving Repositories..." +msgid "Preparing Migration Repositories..." +msgstr "正在保存安装源..." + +#. TRANSLATORS: dialog title +#: src/lib/registration/ui/migration_selection_dialog.rb:61 +#, fuzzy +#| msgid "Select the Mount Point" +msgid "Select the Migration Target" +msgstr "选择挂载点" + +#. TRANSLATORS: help text (1/3) +#: src/lib/registration/ui/migration_selection_dialog.rb:64 +#, fuzzy +#| msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" +msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>" +msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>" + +#. TRANSLATORS: help text (2/3) +#: src/lib/registration/ui/migration_selection_dialog.rb:67 +msgid "<p>Only one migration target from the list can be selected.</p>" +msgstr "" + +#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label +#: src/lib/registration/ui/migration_selection_dialog.rb:69 +msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>" +msgstr "" + +#. TRANSLATORS: check button label +#: src/lib/registration/ui/migration_selection_dialog.rb:70 +#: src/lib/registration/ui/migration_selection_dialog.rb:139 +#, fuzzy +#| msgid "Add all selected online repositories" +msgid "Manually Select Migration Repositories" +msgstr "添加所有选中的在线安装源" + +#. TRANSLATORS: error popup, no target migration is selected +#: src/lib/registration/ui/migration_selection_dialog.rb:96 +#, fuzzy +#| msgid "Reset the target system to %1" +msgid "Select the target migration." +msgstr "重置目标系统到 %1" + +#. TRANSLATORS: selection box label +#: src/lib/registration/ui/migration_selection_dialog.rb:151 +#, fuzzy +#| msgid "Possible &Solutions" +msgid "Possible Migration Targets" +msgstr "可能的解决方法(&S)" + +#. TRANSLATORS: RichText header (details for the selected item) +#: src/lib/registration/ui/migration_selection_dialog.rb:189 +#, fuzzy +#| msgid "Configuration Summary" +msgid "Migration Summary" +msgstr "配置摘要" + +#. TRANSLATORS: An error message displayed in the migration details. +#. The product has not been mirrored to the SMT server and cannot be used +#. for migration. The SMT admin has to mirror the product to allow +#. using the selected migration. +#. %{url} is the URL of the registration server (SMT) +#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12" +#: src/lib/registration/ui/migration_selection_dialog.rb:212 +msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration." +msgstr "" + +#. this is rather a theoretical case, but anyway.... +#. TRANSLATORS: Summary message, rich text format +#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" +#: src/lib/registration/ui/migration_selection_dialog.rb:223 +#, fuzzy +#| msgid "Package %1 will be installed." +msgid "%s <b>will be installed.</b>" +msgstr "将安装软件包 %1。" + +#. TRANSLATORS: Summary message, rich text format +#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12" +#: src/lib/registration/ui/migration_selection_dialog.rb:240 +msgid "%s <b>stays unchanged.</b>" +msgstr "" + +#. TRANSLATORS: Summary message, rich text format +#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12" +#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" +#: src/lib/registration/ui/migration_selection_dialog.rb:250 +msgid "%{old_product} <b>will be upgraded to</b> %{new_product}." +msgstr "" + +#. TRANSLATORS: Summary message, rich text format +#. %{old_product} and %{new_product} are product names +#: src/lib/registration/ui/migration_selection_dialog.rb:255 +msgid "%{old_product} <b>will be downgraded to</b> %{new_product}." +msgstr "" + +#. TRANSLATORS: an error popup message +#: src/lib/registration/ui/migration_selection_dialog.rb:285 +msgid "" +"The selected migration contains a product\n" +"which is not available at the registration server.\n" +"\n" +"Select a different migration target or make the missing products\n" +"available at the registration server." +msgstr "" + +#. help text +#: src/lib/registration/ui/registered_system_dialog.rb:40 +msgid "<p>The system is already registered.</p>" +msgstr "<p>系统已注册。</p>" + +#: src/lib/registration/ui/registered_system_dialog.rb:41 +msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>" +msgstr "<p>您可以再次注册或注册额外扩展或模块以增强系统功能。</p>" + +#: src/lib/registration/ui/registered_system_dialog.rb:43 +msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>" +msgstr "<p>若您想要反注册您的系统，您需要登入 SUSE 客服中心并在那里手动移除该系统。</p>" + +#. button label +#: src/lib/registration/ui/registered_system_dialog.rb:70 +msgid "Select Extensions" +msgstr "选择扩展" + +#. button label +#: src/lib/registration/ui/registered_system_dialog.rb:73 +msgid "Register Again" +msgstr "再次注册" + +#: src/lib/registration/ui/registration_update_dialog.rb:42 +msgid "Registration is being updated..." +msgstr "正在更新注册..." + +#: src/lib/registration/ui/registration_update_dialog.rb:43 +msgid "The previous registration is being updated." +msgstr "正在更新之前的注册。" + +#. automatic registration refresh during system upgrade failed, register from scratch +#: src/lib/registration/ui/registration_update_dialog.rb:65 +msgid "" +"Automatic registration upgrade failed.\n" +"You can manually register the system from scratch." +msgstr "" +"自动注册升级失败。\n" +"您可以从头开始手动注册该系统。" + #. ignore SUSE manager registration servers (bnc#894470) -#: src/lib/registration/url_helpers.rb:213 +#: src/lib/registration/url_helpers.rb:203 msgid "Searching..." msgstr "搜索中..." -#: src/lib/registration/url_helpers.rb:213 +#: src/lib/registration/url_helpers.rb:203 msgid "Looking up local registration servers..." msgstr "正在查找本地注册服务器..." +#~ msgid "" +#~ "Registration added some update repositories.\n" +#~ "\n" +#~ "Do you want to install the latest available\n" +#~ "on-line updates during installation?" +#~ msgstr "" +#~ "注册程序添加了一些更新源。\n" +#~ "\n" +#~ "您想要在安装期间安装最新可用的在线更新吗？" + #~ msgid "SSL Certificate" #~ msgstr "SSL 证书" @@ -857,10 +1149,6 @@ #~ msgid "Contacting the SUSE Customer Center server" #~ msgstr "正在联络 SUSE 客服中心服务器" -#~ msgid "Registering Product..." -#~ msgid_plural "Registering Products..." -#~ msgstr[0] "正在注册产品..." - #~ msgid "" #~ "The e-mail address is not known or\n" #~ "the registration code is not valid." @@ -1339,9 +1627,6 @@ #~ msgid "Registration failed partially." #~ msgstr "注册部分失败。" -#~ msgid "No products found to be registered." -#~ msgstr "未找到要注册的产品。" - #~ msgid "unknown status" #~ msgstr "未知状态" Modified: trunk/yast/zh_CN/po/reipl.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/reipl.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/reipl.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 11:57+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/relocation-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/relocation-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/relocation-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 11:47+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -272,120 +272,120 @@ msgstr "迁移服务器配置" #. RelocationServer read dialog caption -#: src/modules/RelocationServer.rb:303 +#: src/modules/RelocationServer.rb:307 msgid "Initializing relocation-server Configuration" msgstr "正在初始化迁移服务器配置" #. Progress stage 1/3 -#: src/modules/RelocationServer.rb:313 +#: src/modules/RelocationServer.rb:317 msgid "Read the current xend configuration" msgstr "读取当前 xend 配置" #. Progress stage 2/3 -#: src/modules/RelocationServer.rb:315 +#: src/modules/RelocationServer.rb:319 msgid "Read the current xend state" msgstr "读取当前 xend 状态" #. Progress stage 3/3 #. Progress stage 1/2 -#: src/modules/RelocationServer.rb:317 src/modules/RelocationServer.rb:333 +#: src/modules/RelocationServer.rb:321 src/modules/RelocationServer.rb:337 msgid "Read firewall settings" msgstr "读取防火墙设置" #. Progress step 1/3 -#: src/modules/RelocationServer.rb:322 +#: src/modules/RelocationServer.rb:326 msgid "Reading the current xend configuration..." msgstr "正在读取当前 xend 配置..." #. Progress step 2/3 -#: src/modules/RelocationServer.rb:324 +#: src/modules/RelocationServer.rb:328 msgid "Reading the current xend state..." msgstr "正在读取当前 xend 状态..." #. Progress step 3/3 #. Progress step 1/2 -#: src/modules/RelocationServer.rb:326 src/modules/RelocationServer.rb:340 +#: src/modules/RelocationServer.rb:330 src/modules/RelocationServer.rb:344 msgid "Reading firewall settings..." msgstr "正在读取防火墙设置..." #. Progress stage 2/2 -#: src/modules/RelocationServer.rb:335 +#: src/modules/RelocationServer.rb:339 msgid "Read the current libvirtd/sshd state" msgstr "读取当前 libvirtd/sshd 状态" #. Progress stage 2/2 -#: src/modules/RelocationServer.rb:342 +#: src/modules/RelocationServer.rb:346 msgid "Reading the current libvirtd/sshd state..." msgstr "正在读取当前 libvirtd/sshd 状态..." #. Error message -#: src/modules/RelocationServer.rb:364 +#: src/modules/RelocationServer.rb:368 msgid "Cannot read the current Xend state." msgstr "无法读取当前 Xend 状态。" #. Error message -#: src/modules/RelocationServer.rb:373 +#: src/modules/RelocationServer.rb:377 msgid "Cannot read firewall settings." msgstr "无法读取防火墙设置。" #. Error message -#: src/modules/RelocationServer.rb:382 +#: src/modules/RelocationServer.rb:386 msgid "Cannot read the current libvirtd/sshd state." msgstr "无法读取当前 libvirtd/sshd 状态。" #. RelocationServer read dialog caption -#: src/modules/RelocationServer.rb:401 +#: src/modules/RelocationServer.rb:407 msgid "Saving relocation-server Configuration" msgstr "正在保存迁移服务器配置" #. Progress stage 1 -#: src/modules/RelocationServer.rb:411 +#: src/modules/RelocationServer.rb:417 msgid "Write the Xend settings" msgstr "写入 Xend 设置" #. Progress stage 2 -#: src/modules/RelocationServer.rb:413 +#: src/modules/RelocationServer.rb:419 msgid "Adjust the Xend service" msgstr "调整 Xend 服务" #. Progress stage 3 #. Progress stage 2 -#: src/modules/RelocationServer.rb:415 src/modules/RelocationServer.rb:432 +#: src/modules/RelocationServer.rb:421 src/modules/RelocationServer.rb:438 msgid "Write firewall settings" msgstr "写入防火墙设置" #. Progress step 1 -#: src/modules/RelocationServer.rb:420 +#: src/modules/RelocationServer.rb:426 msgid "Writing the Xend settings..." msgstr "正在写入 Xend 设置..." #. Progress step 2 -#: src/modules/RelocationServer.rb:422 +#: src/modules/RelocationServer.rb:428 msgid "Adjusting the Xend service..." msgstr "正在调整 Xend 服务..." #. Progress step 3 #. Progress stage 2 -#: src/modules/RelocationServer.rb:424 src/modules/RelocationServer.rb:439 +#: src/modules/RelocationServer.rb:430 src/modules/RelocationServer.rb:445 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. Progress stage 1 -#: src/modules/RelocationServer.rb:430 +#: src/modules/RelocationServer.rb:436 msgid "Adjust the libvirtd/sshd service" msgstr "调整 libvirtd/sshd 服务" #. Progress step 1 -#: src/modules/RelocationServer.rb:437 +#: src/modules/RelocationServer.rb:443 msgid "Adjusting the libvirtd/sshd service" msgstr "正在调整 libvirtd/sshd 服务..." #. Error message -#: src/modules/RelocationServer.rb:454 +#: src/modules/RelocationServer.rb:460 msgid "Cannot write the xend settings." msgstr "无法写入 xend 设置。" #. Error message -#: src/modules/RelocationServer.rb:475 +#: src/modules/RelocationServer.rb:481 msgid "Cannot write firewall settings." msgstr "无法写入防火墙设置。" Modified: trunk/yast/zh_CN/po/samba-client.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/samba-client.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/samba-client.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Samba Client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-18 19:42+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -24,7 +24,7 @@ "X-Generator: Lokalize 1.5\n" #. translators: command line help text for Samba client module -#: src/clients/samba-client.rb:61 +#: src/clients/samba-client.rb:62 msgid "" "Samba client configuration module.\n" "See Samba documentation for details." @@ -33,59 +33,59 @@ "细节请参考 Samba 文档。" #. translators: command line help text for winbind action -#: src/clients/samba-client.rb:74 +#: src/clients/samba-client.rb:75 msgid "Enable or disable the Winbind services (winbindd)" msgstr "启用或禁用 Winbind 服务 (winbindd)" #. translators: command line help text for isdomainmember action -#: src/clients/samba-client.rb:84 +#: src/clients/samba-client.rb:85 msgid "Check if this machine is a member of a domain" msgstr "检查此计算机是否是一个域成员" #. translators: command line help text for joindomain action -#: src/clients/samba-client.rb:94 +#: src/clients/samba-client.rb:95 msgid "Join this machine to a domain" msgstr "将此计算机加入一个域" #. translators: command line help text for configure action -#: src/clients/samba-client.rb:104 +#: src/clients/samba-client.rb:105 msgid "Change the global settings of Samba" msgstr "修改 Samba 全局设置" #. translators: command line help text for winbind enable option -#: src/clients/samba-client.rb:112 +#: src/clients/samba-client.rb:113 msgid "Enable the service" msgstr "启用服务" #. translators: command line help text for winbind disable option -#: src/clients/samba-client.rb:118 +#: src/clients/samba-client.rb:119 msgid "Disable the service" msgstr "禁用服务" #. translators: command line help text for domain to be checked/joined -#: src/clients/samba-client.rb:124 +#: src/clients/samba-client.rb:125 msgid "The name of a domain to join" msgstr "要加入的域名称" #. translators: command line help text for joindomain user option -#: src/clients/samba-client.rb:131 +#: src/clients/samba-client.rb:132 msgid "" "The user used for joining the domain. If omitted, YaST will\n" "try to join the domain without specifying user and password.\n" msgstr "加入域时所用的用户名。若省略，YaST 将尝试不指定用户名和密码加入该域。\n" #. translators: command line help text for joindomain password option -#: src/clients/samba-client.rb:138 +#: src/clients/samba-client.rb:139 msgid "The password used for the user when joining the domain" msgstr "加入域时用户所用的密码" #. command line help text for machine optioa -#: src/clients/samba-client.rb:145 +#: src/clients/samba-client.rb:146 msgid "The machine account" msgstr "机器帐户" #. translators: command line help text for the workgroup name option -#: src/clients/samba-client.rb:152 +#: src/clients/samba-client.rb:153 msgid "The name of a workgroup" msgstr "工作组名称" @@ -114,7 +114,7 @@ #. translators: result message for joindomain command line action #. Translators: Information popup, %1 is the name of the domain -#: src/clients/samba-client.rb:275 src/include/samba-client/routines.rb:274 +#: src/clients/samba-client.rb:278 src/include/samba-client/routines.rb:280 msgid "Domain %1 joined successfully." msgstr "成功加入域 %1。" @@ -297,7 +297,7 @@ #. text entry label #. text entry label #: src/include/samba-client/dialogs.rb:516 -#: src/include/samba-client/routines.rb:88 +#: src/include/samba-client/routines.rb:90 msgid "&Username" msgstr "用户名(&U)" @@ -574,172 +574,172 @@ "</p>\n" #. default value of Machine Account -#: src/include/samba-client/routines.rb:60 +#: src/include/samba-client/routines.rb:62 msgid "(default)" msgstr "(默认)" #. combo box label -#: src/include/samba-client/routines.rb:71 +#: src/include/samba-client/routines.rb:73 msgid "&Machine Account OU" msgstr "机器帐户 OU(&M)" -#: src/include/samba-client/routines.rb:76 +#: src/include/samba-client/routines.rb:78 msgid "O&btain list" msgstr "获取列表(&B)" #. error popup -#: src/include/samba-client/routines.rb:119 +#: src/include/samba-client/routines.rb:121 msgid "" "User name and password are required\n" "for listing the machine accounts." msgstr "列出机器帐户需要用户名和密码。" -#: src/include/samba-client/routines.rb:137 +#: src/include/samba-client/routines.rb:139 msgid "&Machine Account" msgstr "机器帐户(&M)" #. translators: text for busy pop-up -#: src/include/samba-client/routines.rb:175 +#: src/include/samba-client/routines.rb:177 msgid "Verifying workgroup membership..." msgstr "正在校验工作组成员资格..." #. popup to fill in the domain leaving info; %1 is the domain name -#: src/include/samba-client/routines.rb:201 +#: src/include/samba-client/routines.rb:203 msgid "Enter the username and the password for leaving the domain %1." msgstr "请输入用户名和密码以离开域 %1。" #. additional information for cluster environment -#: src/include/samba-client/routines.rb:229 +#: src/include/samba-client/routines.rb:231 msgid "The configuration will be propagated across cluster nodes." msgstr "配置将被传播到集群节点中。" #. popup to fill in the domain joining info; %1 is the domain name -#: src/include/samba-client/routines.rb:240 +#: src/include/samba-client/routines.rb:242 msgid "Enter the username and the password for joining the domain %1." msgstr "请输入用户名和密码以加入域 %1。" -#: src/include/samba-client/routines.rb:247 +#: src/include/samba-client/routines.rb:249 msgid "To join the domain anonymously, leave the text entries empty.\n" msgstr "要匿名加入域，请将文本项留空。\n" #. popup question, the domain status cannot be found out, ask user what to do -#: src/include/samba-client/routines.rb:298 +#: src/include/samba-client/routines.rb:304 msgid "" "Cannot automatically determine if this host\n" "is a member of the domain %1." msgstr "无法自动确定此主机是否为域 %1 的成员。" #. popup question, first part -#: src/include/samba-client/routines.rb:302 +#: src/include/samba-client/routines.rb:308 msgid "" "This host is not a member\n" "of the domain %1." msgstr "此主机不是域 %1 的成员。" #. last part of popup question -#: src/include/samba-client/routines.rb:306 +#: src/include/samba-client/routines.rb:312 msgid "Join the domain %1?" msgstr "加入域 %1 吗？" -#: src/include/samba-client/routines.rb:310 +#: src/include/samba-client/routines.rb:316 msgid "" "Cannot automatically determine if this cluster\n" "is a member of the domain %1." msgstr "无法自动确定此集群是否为 %1 域的成员。" -#: src/include/samba-client/routines.rb:313 +#: src/include/samba-client/routines.rb:319 msgid "" "This cluster is not a member\n" "of the domain %1." msgstr "此集群不是 %1 域的成员。" #. popup question -#: src/include/samba-client/routines.rb:355 +#: src/include/samba-client/routines.rb:361 msgid "User shares already exist. Keep or delete these shares?" msgstr "用户共享已存在。保留还是删除这些共享呢？" #. button label -#: src/include/samba-client/routines.rb:357 +#: src/include/samba-client/routines.rb:363 msgid "&Keep" msgstr "保留(&K)" #. button label -#: src/include/samba-client/routines.rb:359 +#: src/include/samba-client/routines.rb:365 msgid "&Delete" msgstr "删除(&D)" #. yes/no popup -#: src/include/samba-client/routines.rb:375 +#: src/include/samba-client/routines.rb:381 msgid "Other Windows sharing services are available. Stop them as well?" msgstr "其它 Windows 共享服务也在运行。也停止它们吗？" #. check box label -#: src/include/samba-client/routines.rb:386 +#: src/include/samba-client/routines.rb:392 msgid "&Use WINS for Hostname Resolution" msgstr "使用 WINS 解析主机名(&U)" #. help text for "Use WINS for Hostname Resolution" check box label -#: src/include/samba-client/routines.rb:395 +#: src/include/samba-client/routines.rb:401 msgid "<p>If you want to use Microsoft Windows Internet Name Service (WINS) for name resolution, check <b>Use WINS for Hostname Resolution</b>.</p>" msgstr "<p>若您想要使用 Microsoft Windows 互联网名称服务(WINS)做名称解析，请勾选<b>使用 WINS 解析主机名</b>。</p>" #. check box label -#: src/include/samba-client/routines.rb:405 +#: src/include/samba-client/routines.rb:411 msgid "Retrieve WINS server via &DHCP" msgstr "通过 DHCP 检索 WINS 服务器" #. help text ("Retrieve WINS server via DHCP" is a checkbox label) -#: src/include/samba-client/routines.rb:412 +#: src/include/samba-client/routines.rb:418 msgid "<p>Check <b>Retrieve WINS server via DHCP</b> to use a WINS server provided by DHCP.</p>" msgstr "<p>勾选<b>通过 DHCP 检索 WINS 服务器</b>使用 DHCP 提供的 WINS 服务器。</p>" #. frame label -#: src/include/samba-client/routines.rb:432 +#: src/include/samba-client/routines.rb:438 msgid "Sharing by Users" msgstr "用户共享" #. frame label -#: src/include/samba-client/routines.rb:434 +#: src/include/samba-client/routines.rb:440 msgid "Sharing" msgstr "共享" #. checkbox label -#: src/include/samba-client/routines.rb:447 +#: src/include/samba-client/routines.rb:453 msgid "&Allow Users to Share Their Directories" msgstr "允许用户共享其文件夹(&A)" #. checkbox label -#: src/include/samba-client/routines.rb:457 +#: src/include/samba-client/routines.rb:463 msgid "Allow &Guest Access" msgstr "允许来宾访问(&G)" #. texty entry label -#: src/include/samba-client/routines.rb:469 +#: src/include/samba-client/routines.rb:475 msgid "&Permitted Group" msgstr "允许的组(&P)" #. infield label -#: src/include/samba-client/routines.rb:475 +#: src/include/samba-client/routines.rb:481 msgid "&Maximum Number of Shares" msgstr "最大共享数(&M)" #. membership dialog help (common part 3/4), %1 is separator (e.g. '\') -#: src/include/samba-client/routines.rb:505 +#: src/include/samba-client/routines.rb:511 msgid "<p><b>Allow Users to Share Their Directories</b> enables members of the group in <b>Permitted Group</b> to share directories they own with other users. For example, <tt>users</tt> for a local scope or <tt>DOMAIN%1Users</tt> for a domain scope. The user also must make sure that the file system permissions allow access.</p>" msgstr "<p><b>允许用户共享其文件夹</b>使<b>允许的组</b>中的组成员能够与其它用户共享其所有的文件夹。例如， <tt>users</tt>(对于本地范围)或 <tt>DOMAIN%1Users</tt>(对于域范围)。该用户也必须确保其文件系统权限允许访问。</p>" #. membership dialog help (common part 3/4) -#: src/include/samba-client/routines.rb:511 +#: src/include/samba-client/routines.rb:517 msgid "<p>With <b>Maximum Number of Shares</b>, limit the total amount of shares that may be created.</p>" msgstr "<p>使用<b>最大共享数</b>限制可创建的共享总数。</p>" #. membership dialog help common part -#: src/include/samba-client/routines.rb:516 +#: src/include/samba-client/routines.rb:522 msgid "<p>To permit access to user shares without authentication, enable <b>Allow Guest Access</b>.</p>" msgstr "<p>要允许无认证访问用户共享，请启用<b>允许来宾访问</b>。</p>" #. help text for PAM Mount table -#: src/include/samba-client/routines.rb:525 +#: src/include/samba-client/routines.rb:531 msgid "" "<p>In the table <b>Mount Server Directories</b>, you can specify server\n" "directories (such as home directory) which should be locally mounted when the\n" @@ -751,12 +751,12 @@ "更多信息，请参考 pam_mount.conf 手册页。</p>" #. help text for PAM Mount table: example -#: src/include/samba-client/routines.rb:532 +#: src/include/samba-client/routines.rb:538 msgid "<p>For example, you may use <tt>/home/%(DOMAIN_USER)</tt> value for <b>Remote Path</b>, <tt>~/</tt> value for <b>Local Mount Point</b> to mount the home directory, together with a value <tt>user=%(DOMAIN_USER)</tt> as a part of <b>Options</b>.</p>" msgstr "<p>例如，您可以使用 <tt>/home/%(DOMAIN_USER)</tt> 值作为<b>远程路径</b>，使用 <tt>~/</tt> 值作为<b>本地挂载点</b>，连同 <tt>user=%(DOMAIN_USER)</tt> 作为<b>选项</b>的一部分，来挂载主文件夹。" #. help text for kerberos method option -#: src/include/samba-client/routines.rb:540 +#: src/include/samba-client/routines.rb:546 msgid "<p>The value of <b>Kerberos Method</b> defines how kerberos tickets are verified. When <b>Single Sing-on for SSH</b> is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details.</p>" msgstr "<p><b>Kerberos 方法</b>的值定义了校验 kerberos 票据的方法。当使用 <b>SSH 单点登录</b> 时，YaST 设置的默认 Kerberos 方法是 <tt>机密和 Keytab</tt>。细节请参考 smb.conf 手册页。</p>" @@ -808,8 +808,8 @@ #. final progress step label #. translators: progress finished #. translators: write progress finished -#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:642 -#: src/modules/Samba.rb:761 +#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:643 +#: src/modules/Samba.rb:765 msgid "Finished" msgstr "已完成" @@ -880,13 +880,13 @@ #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1104 +#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112 msgid "Yes" msgstr "是" #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1106 +#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114 msgid "No" msgstr "否" @@ -914,143 +914,143 @@ "请重试。" #. Samba-client read dialog caption -#: src/modules/Samba.rb:621 +#: src/modules/Samba.rb:622 msgid "Initializing Samba Client Configuration" msgstr "正在初始化 Samba 客户机配置" #. translators: progress stage 1/2 -#: src/modules/Samba.rb:632 +#: src/modules/Samba.rb:633 msgid "Read the global Samba settings" msgstr "读取全局 Samba 设置" #. translators: progress stage 2/2 -#: src/modules/Samba.rb:634 +#: src/modules/Samba.rb:635 msgid "Read the winbind status" msgstr "读取 winbind 状态" #. translators: progress step 1/2 -#: src/modules/Samba.rb:638 +#: src/modules/Samba.rb:639 msgid "Reading the global Samba settings..." msgstr "正在读取全局 Samba 设置..." #. translators: progress step 2/2 -#: src/modules/Samba.rb:640 +#: src/modules/Samba.rb:641 msgid "Reading the winbind status..." msgstr "正在读取 winbind 状态..." #. Samba-client read dialog caption -#: src/modules/Samba.rb:741 +#: src/modules/Samba.rb:745 msgid "Saving Samba Client Configuration" msgstr "正在保存 Samba 客户机配置" #. translators: write progress stage -#: src/modules/Samba.rb:745 +#: src/modules/Samba.rb:749 msgid "Write the settings" msgstr "写入设置" #. translators: write progress stage -#: src/modules/Samba.rb:748 +#: src/modules/Samba.rb:752 msgid "Disable Samba services" msgstr "禁用 Samba 服务" #. translators: write progress stage -#: src/modules/Samba.rb:750 +#: src/modules/Samba.rb:754 msgid "Enable Samba services" msgstr "启用 Samba 服务" #. translators: write progress step -#: src/modules/Samba.rb:754 +#: src/modules/Samba.rb:758 msgid "Writing the settings..." msgstr "正在写入设置..." #. translators: write progress step -#: src/modules/Samba.rb:757 +#: src/modules/Samba.rb:761 msgid "Disabling Samba services..." msgstr "正在禁用 Samba 服务..." #. translators: write progress step -#: src/modules/Samba.rb:759 +#: src/modules/Samba.rb:763 msgid "Enabling Samba services..." msgstr "正在启用 Samba 服务..." #. write progress stage -#: src/modules/Samba.rb:769 +#: src/modules/Samba.rb:773 msgid "Write Kerberos configuration" msgstr "写入 Kerberos 配置" #. write progress step -#: src/modules/Samba.rb:771 +#: src/modules/Samba.rb:775 msgid "Writing Kerberos configuration..." msgstr "正在写入 Kerberos 配置..." #. translators: error message, %1 is filename #. translators: error message, %1 is filename #. translators: error message, %1 is filename -#: src/modules/Samba.rb:825 src/modules/Samba.rb:862 src/modules/Samba.rb:879 +#: src/modules/Samba.rb:833 src/modules/Samba.rb:870 src/modules/Samba.rb:887 msgid "Cannot write settings to %1." msgstr "无法将设置写入 %1。" #. translators: error message, do not change winbind -#: src/modules/Samba.rb:838 +#: src/modules/Samba.rb:846 msgid "Cannot start winbind service." msgstr "无法启动 winbind 服务。" #. translators: error message, do not change winbind -#: src/modules/Samba.rb:843 +#: src/modules/Samba.rb:851 msgid "Cannot start winbind daemon." msgstr "不能启动 winbind 守护精灵。" #. translators: error message, do not change winbind -#: src/modules/Samba.rb:849 +#: src/modules/Samba.rb:857 msgid "Cannot stop winbind service." msgstr "无法停止 winbind 服务。" #. translators: error message, do not change winbind -#: src/modules/Samba.rb:854 +#: src/modules/Samba.rb:862 msgid "Cannot stop winbind daemon." msgstr "不能停止 winbind 守护精灵。" #. translators: error message -#: src/modules/Samba.rb:870 +#: src/modules/Samba.rb:878 msgid "Cannot write PAM settings." msgstr "无法写 PAM 设置。" #. summary header -#: src/modules/Samba.rb:1044 +#: src/modules/Samba.rb:1052 msgid "Global Configuration" msgstr "全局配置" #. autoyast summary item: configured workgroup -#: src/modules/Samba.rb:1051 +#: src/modules/Samba.rb:1059 msgid "Workgroup or Domain: %1" msgstr "工作组或域：%1" #. autoyast summary item -#: src/modules/Samba.rb:1060 +#: src/modules/Samba.rb:1068 msgid "Create Home Directory on Login" msgstr "在登录时创建主目录" #. autoyast summary item -#: src/modules/Samba.rb:1067 +#: src/modules/Samba.rb:1075 msgid "Offline Authentication Enabled" msgstr "启用了脱机验证" #. autoyast summary item -#: src/modules/Samba.rb:1075 +#: src/modules/Samba.rb:1083 msgid "Maximum Number of Shares: %1" msgstr "最大共享数：%1" #. summary item: configured workgroup -#: src/modules/Samba.rb:1096 +#: src/modules/Samba.rb:1104 msgid "<p><b>Workgroup or Domain</b>: %1</p>" msgstr "<p><b>工作组或域</b>：%1</p>" #. summary item: authentication using winbind -#: src/modules/Samba.rb:1101 +#: src/modules/Samba.rb:1109 msgid "<p><b>Authentication with SMB</b>: %1</p>" msgstr "<p><b>使用 SMB 身份验证</b>：%1</p>" -#: src/modules/SambaNetJoin.pm:328 +#: src/modules/SambaNetJoin.pm:322 msgid "Unable to proceed with join: Inconsistent cluster state" msgstr "无法继续加入：不一致的 cluster 状态" Modified: trunk/yast/zh_CN/po/samba-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/samba-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/samba-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Samba Server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-18 19:43+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -211,7 +211,7 @@ #. translators: error message for "add share" command line action, %1 is share name #. translators: popup error message for "add share", %1 is share name -#: src/clients/samba-server.rb:400 src/include/samba-server/dialogs.rb:1070 +#: src/clients/samba-server.rb:400 src/include/samba-server/dialogs.rb:1071 msgid "Share %1 already exists." msgstr "共享 %1 已存在。" @@ -233,7 +233,7 @@ #. translators: share status #. translators: share status #: src/clients/samba-server.rb:463 src/clients/samba-server.rb:481 -#: src/include/samba-server/dialogs.rb:145 +#: src/include/samba-server/dialogs.rb:146 msgid "Disabled" msgstr "已禁用" @@ -241,7 +241,7 @@ #. translators: share status #. check if given path has a corresponding snapper configuration #: src/clients/samba-server.rb:465 src/clients/samba-server.rb:483 -#: src/include/samba-server/dialogs.rb:145 +#: src/include/samba-server/dialogs.rb:146 msgid "Enabled" msgstr "已启用" @@ -387,23 +387,23 @@ #. Lukas Ocilka #. #. $Id$ -#: src/include/samba-server/dialogs.rb:68 +#: src/include/samba-server/dialogs.rb:69 msgid "&Primary Domain Controller (PDC)" msgstr "主域控制器 (PDC)(&P)" -#: src/include/samba-server/dialogs.rb:69 +#: src/include/samba-server/dialogs.rb:70 msgid "B&ackup Domain Controller (BDC)" msgstr "备份域控制器 (BDC)(&A)" -#: src/include/samba-server/dialogs.rb:70 +#: src/include/samba-server/dialogs.rb:71 msgid "Not a Domain &Controller" msgstr "非域控制器(&C)" #. Samba LDAP Settings Misc Widget #. ///////////////////////////////////////////////////////////////////////// #. translators: combo box value -#: src/include/samba-server/dialogs.rb:152 -#: src/include/samba-server/dialogs.rb:155 +#: src/include/samba-server/dialogs.rb:153 +#: src/include/samba-server/dialogs.rb:156 #: src/include/samba-server/ldap-widget.rb:76 msgid "Yes" msgstr "是" @@ -412,19 +412,19 @@ #. ///////////////////////////////////////////////////////////////////////// #. translators: combo box value #. translators: combo box value -#: src/include/samba-server/dialogs.rb:152 -#: src/include/samba-server/dialogs.rb:155 +#: src/include/samba-server/dialogs.rb:153 +#: src/include/samba-server/dialogs.rb:156 #: src/include/samba-server/ldap-widget.rb:65 #: src/include/samba-server/ldap-widget.rb:78 msgid "No" msgstr "否" -#: src/include/samba-server/dialogs.rb:170 -#: src/include/samba-server/dialogs.rb:235 +#: src/include/samba-server/dialogs.rb:171 +#: src/include/samba-server/dialogs.rb:236 msgid "Samba Installation" msgstr "Samba 安装" -#: src/include/samba-server/dialogs.rb:170 +#: src/include/samba-server/dialogs.rb:171 msgid "Step 1 of 2" msgstr "步骤 1 (共 2 步)" @@ -432,46 +432,46 @@ #. TRANSLATORS: text entry #. `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"), #. SambaNmbLookup::GetAvailableNeighbours(nil)), -#: src/include/samba-server/dialogs.rb:190 -#: src/include/samba-server/dialogs.rb:1187 +#: src/include/samba-server/dialogs.rb:191 +#: src/include/samba-server/dialogs.rb:1188 msgid "&Workgroup or Domain Name" msgstr "工作组或域名称(&W)" -#: src/include/samba-server/dialogs.rb:235 +#: src/include/samba-server/dialogs.rb:236 msgid "Step 2 of 2" msgstr "步骤 2 (共 2 步)" #. header of status-like information. followed by domain name -#: src/include/samba-server/dialogs.rb:244 +#: src/include/samba-server/dialogs.rb:245 msgid "Current Domain Name:" msgstr "当前域名称：" -#: src/include/samba-server/dialogs.rb:249 +#: src/include/samba-server/dialogs.rb:250 msgid "Samba Server Type" msgstr "Samba 服务器类型" #. appears on new line after Primary Domain Controller radio button -#: src/include/samba-server/dialogs.rb:262 +#: src/include/samba-server/dialogs.rb:263 msgid "Not available because a PDC is present." msgstr "由于已存在主域控制器所以不可用。" #. TRANSLATORS: dialog caption -#: src/include/samba-server/dialogs.rb:583 +#: src/include/samba-server/dialogs.rb:584 msgid "Rename Share" msgstr "重命名共享" #. TRANSLATORS: text entry -#: src/include/samba-server/dialogs.rb:592 +#: src/include/samba-server/dialogs.rb:593 msgid "New Share &Name" msgstr "新共享名(&N)" #. TRANSLATORS: popup error message -#: src/include/samba-server/dialogs.rb:621 +#: src/include/samba-server/dialogs.rb:622 msgid "Enter a new share name." msgstr "请输入新共享名。" #. TRANSLATORS: popup error message, %1 is a variable share name -#: src/include/samba-server/dialogs.rb:630 +#: src/include/samba-server/dialogs.rb:631 msgid "" "Share '%1' already exists.\n" "Choose another share name.\n" @@ -480,7 +480,7 @@ "请输入其它共享名称。\n" #. confirmation dialog before deleting a share -#: src/include/samba-server/dialogs.rb:726 +#: src/include/samba-server/dialogs.rb:727 msgid "" "If you delete share %1,\n" "all its settings will be lost.\n" @@ -490,26 +490,26 @@ "真的删除它吗？" #. rwalter I couldn't make this one show up. Please make sure my deletions didn't make it too confusing. -#: src/include/samba-server/dialogs.rb:756 +#: src/include/samba-server/dialogs.rb:757 msgid "Trusted &Domain" msgstr "可信域(&D)" #. text entry label -#: src/include/samba-server/dialogs.rb:757 -#: src/include/samba-server/dialogs.rb:1721 +#: src/include/samba-server/dialogs.rb:758 +#: src/include/samba-server/dialogs.rb:1722 msgid "&Password" msgstr "密码(&P)" -#: src/include/samba-server/dialogs.rb:778 +#: src/include/samba-server/dialogs.rb:779 msgid "Domain name cannot be empty." msgstr "域名称不能为空。" -#: src/include/samba-server/dialogs.rb:784 +#: src/include/samba-server/dialogs.rb:785 msgid "Cannot establish trusted domain relationship." msgstr "无法建立可信域关系。" #. issue a warning, if not already done so -#: src/include/samba-server/dialogs.rb:800 +#: src/include/samba-server/dialogs.rb:801 msgid "" "The password for trusted domains\n" "is stored in the autoinstallation control file. The password\n" @@ -520,246 +520,246 @@ "该密码以明文形式存储。因此可视为一个安全隐患。" #. SambaTrustDom::List() might return 'nil' -#: src/include/samba-server/dialogs.rb:822 -#: src/include/samba-server/dialogs.rb:1219 -#: src/include/samba-server/dialogs.rb:1335 +#: src/include/samba-server/dialogs.rb:823 +#: src/include/samba-server/dialogs.rb:1220 +#: src/include/samba-server/dialogs.rb:1336 msgid "&Trusted Domains" msgstr "可信域(&T)" #. confirmation -#: src/include/samba-server/dialogs.rb:843 +#: src/include/samba-server/dialogs.rb:844 msgid "" "Really abandon trust relationship\n" "to trusted domain %1?" msgstr "真的放弃与可信域 %1 的信任关系吗？" #. dialog caption -#: src/include/samba-server/dialogs.rb:863 +#: src/include/samba-server/dialogs.rb:864 msgid "Share %1" msgstr "共享 %1" #. dialog caption -#: src/include/samba-server/dialogs.rb:887 +#: src/include/samba-server/dialogs.rb:888 msgid "Expert Global Settings Configuration" msgstr "专家全局设置配置" #. frame label -#: src/include/samba-server/dialogs.rb:919 +#: src/include/samba-server/dialogs.rb:920 msgid "Identification" msgstr "标识" #. text entry label -#: src/include/samba-server/dialogs.rb:921 +#: src/include/samba-server/dialogs.rb:922 msgid "Share &Name" msgstr "共享名称(&N)" #. text entry label -#: src/include/samba-server/dialogs.rb:923 +#: src/include/samba-server/dialogs.rb:924 msgid "Share &Description" msgstr "共享描述(&D)" #. frame label -#: src/include/samba-server/dialogs.rb:927 +#: src/include/samba-server/dialogs.rb:928 msgid "Share Type" msgstr "共享类型" #. radio button label -#: src/include/samba-server/dialogs.rb:932 +#: src/include/samba-server/dialogs.rb:933 msgid "&Printer" msgstr "打印机(&P)" #. radio button label -#: src/include/samba-server/dialogs.rb:934 +#: src/include/samba-server/dialogs.rb:935 msgid "&Directory" msgstr "文件夹(&D)" #. translators: text entry label -#: src/include/samba-server/dialogs.rb:938 +#: src/include/samba-server/dialogs.rb:939 msgid "Share &Path" msgstr "共享路径(&P)" #. translators: checkbox label, setting for share -#: src/include/samba-server/dialogs.rb:945 +#: src/include/samba-server/dialogs.rb:946 msgid "&Read-Only" msgstr "只读(&R)" #. checkbox label -#: src/include/samba-server/dialogs.rb:947 +#: src/include/samba-server/dialogs.rb:948 msgid "&Inherit ACLs" msgstr "继承访问控制列表(&I)" #. checkbox label -#: src/include/samba-server/dialogs.rb:949 +#: src/include/samba-server/dialogs.rb:950 msgid "Expose Snapshots" msgstr "暴露快照" #. checkbox label -#: src/include/samba-server/dialogs.rb:951 +#: src/include/samba-server/dialogs.rb:952 msgid "Utilize Btrfs Features" msgstr "利用 Btrfs 特性" #. translators: dialog caption -#: src/include/samba-server/dialogs.rb:960 +#: src/include/samba-server/dialogs.rb:961 msgid "New Share" msgstr "新建共享" #. translators: file selection dialog title -#: src/include/samba-server/dialogs.rb:1006 +#: src/include/samba-server/dialogs.rb:1007 msgid "Path for a Share" msgstr "共享路径" #. translators: error message -#: src/include/samba-server/dialogs.rb:1030 +#: src/include/samba-server/dialogs.rb:1031 msgid "Share name cannot be empty." msgstr "共享名称不能为空。" #. translators: error message -#: src/include/samba-server/dialogs.rb:1035 +#: src/include/samba-server/dialogs.rb:1036 msgid "Share path cannot be empty." msgstr "共享路径不能为空。" -#: src/include/samba-server/dialogs.rb:1088 +#: src/include/samba-server/dialogs.rb:1089 msgid "Available Shares" msgstr "可用共享" -#: src/include/samba-server/dialogs.rb:1092 +#: src/include/samba-server/dialogs.rb:1093 msgid "&Filter" msgstr "过滤器(&F)" -#: src/include/samba-server/dialogs.rb:1094 +#: src/include/samba-server/dialogs.rb:1095 msgid "Show &All Shares" msgstr "显示全部共享(&A)" -#: src/include/samba-server/dialogs.rb:1097 +#: src/include/samba-server/dialogs.rb:1098 msgid "Do Not Show &System Shares" msgstr "不显示系统共享(&S)" #. translators: table header texts -#: src/include/samba-server/dialogs.rb:1108 +#: src/include/samba-server/dialogs.rb:1109 msgid "Status" msgstr "状态" -#: src/include/samba-server/dialogs.rb:1109 +#: src/include/samba-server/dialogs.rb:1110 msgid "Read-Only" msgstr "只读" -#: src/include/samba-server/dialogs.rb:1110 +#: src/include/samba-server/dialogs.rb:1111 msgid "Name" msgstr "名称" -#: src/include/samba-server/dialogs.rb:1111 +#: src/include/samba-server/dialogs.rb:1112 msgid "Path" msgstr "路径" -#: src/include/samba-server/dialogs.rb:1112 -#: src/include/samba-server/dialogs.rb:1123 +#: src/include/samba-server/dialogs.rb:1113 +#: src/include/samba-server/dialogs.rb:1124 msgid "Guest Access" msgstr "Guest 访问" -#: src/include/samba-server/dialogs.rb:1113 +#: src/include/samba-server/dialogs.rb:1114 msgid "Comment" msgstr "注释" -#: src/include/samba-server/dialogs.rb:1122 +#: src/include/samba-server/dialogs.rb:1123 msgid "&Rename..." msgstr "重命名(&R)..." -#: src/include/samba-server/dialogs.rb:1124 +#: src/include/samba-server/dialogs.rb:1125 msgid "&Toggle Status" msgstr "切换状态(&T)" -#: src/include/samba-server/dialogs.rb:1142 +#: src/include/samba-server/dialogs.rb:1143 msgid "WINS Server Support" msgstr "WINS 服务器支持" -#: src/include/samba-server/dialogs.rb:1149 +#: src/include/samba-server/dialogs.rb:1150 msgid "Remote WINS Server" msgstr "远程 WINS 服务器" -#: src/include/samba-server/dialogs.rb:1154 +#: src/include/samba-server/dialogs.rb:1155 msgid "Na&me" msgstr "名称(&M)" #. TRANSLATORS: check box -#: src/include/samba-server/dialogs.rb:1164 +#: src/include/samba-server/dialogs.rb:1165 msgid "Use WINS for Hostname Resolution" msgstr "使用 WINS 解析主机名" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1169 +#: src/include/samba-server/dialogs.rb:1170 msgid "Not a DC" msgstr "非域控制器" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1171 +#: src/include/samba-server/dialogs.rb:1172 msgid "Primary (PDC)" msgstr "主域控制器 (PDC)" #. translators: combobox item -#: src/include/samba-server/dialogs.rb:1175 +#: src/include/samba-server/dialogs.rb:1176 msgid "Backup (BDC)" msgstr "备份域控制器 (BDC)" -#: src/include/samba-server/dialogs.rb:1178 +#: src/include/samba-server/dialogs.rb:1179 msgid "Base Settings" msgstr "基本设置" #. translators: combobox label -#: src/include/samba-server/dialogs.rb:1193 +#: src/include/samba-server/dialogs.rb:1194 msgid "Domain &Controller" msgstr "域控制器(&C)" -#: src/include/samba-server/dialogs.rb:1203 +#: src/include/samba-server/dialogs.rb:1204 msgid "Advanced Settings..." msgstr "高级设置..." -#: src/include/samba-server/dialogs.rb:1205 +#: src/include/samba-server/dialogs.rb:1206 msgid "&Expert Global Settings" msgstr "专家全局设置(&E)" -#: src/include/samba-server/dialogs.rb:1206 +#: src/include/samba-server/dialogs.rb:1207 msgid "&User Authentication Sources" msgstr "用户认证来源(&U)" -#: src/include/samba-server/dialogs.rb:1236 +#: src/include/samba-server/dialogs.rb:1237 msgid "Samba Configuration" msgstr "Samba 配置" #. tab label -#: src/include/samba-server/dialogs.rb:1241 +#: src/include/samba-server/dialogs.rb:1242 msgid "Start-&Up" msgstr "启动(&U)" -#: src/include/samba-server/dialogs.rb:1259 +#: src/include/samba-server/dialogs.rb:1260 msgid "&Shares" msgstr "共享(&S)" #. BNC #579993, Allow guest access -#: src/include/samba-server/dialogs.rb:1282 +#: src/include/samba-server/dialogs.rb:1283 msgid "I&dentity" msgstr "身份(&D)" -#: src/include/samba-server/dialogs.rb:1297 +#: src/include/samba-server/dialogs.rb:1298 msgid "WINS" msgstr "WINS" -#: src/include/samba-server/dialogs.rb:1340 +#: src/include/samba-server/dialogs.rb:1341 msgid "&LDAP Settings" msgstr "&LDAP 设置" #. BNC #247344, BNC #541958 (comment #18) -#: src/include/samba-server/dialogs.rb:1463 +#: src/include/samba-server/dialogs.rb:1464 msgid "NetBIOS &Hostname" msgstr "NetBIOS 主机名(&H)" #. dialog caption -#: src/include/samba-server/dialogs.rb:1564 +#: src/include/samba-server/dialogs.rb:1565 msgid "User Information Sources" msgstr "用户信息来源" #. try to create it #. first, ask for password -#: src/include/samba-server/dialogs.rb:1618 +#: src/include/samba-server/dialogs.rb:1619 msgid "" "For a proper function, Samba server needs an\n" "administrative account (root).\n" @@ -768,51 +768,51 @@ "为了正常服务，Samba 服务器需要一个管理账户 (root)。\n" "现在将创建它。" -#: src/include/samba-server/dialogs.rb:1624 +#: src/include/samba-server/dialogs.rb:1625 msgid "Samba root &Password" msgstr "Samba 根密码(&P)" -#: src/include/samba-server/dialogs.rb:1625 +#: src/include/samba-server/dialogs.rb:1626 msgid "&Verify Password" msgstr "校验密码(&V)" #. TRANSLATORS: popup error message -#: src/include/samba-server/dialogs.rb:1645 +#: src/include/samba-server/dialogs.rb:1646 msgid "" "The first and the second version\n" "of the password do not match." msgstr "两次输入的密码不匹配。" #. TRANSLATORS: popup error message, %1 is a username -#: src/include/samba-server/dialogs.rb:1662 +#: src/include/samba-server/dialogs.rb:1663 msgid "Cannot create account for user %1." msgstr "无法为用户 %1 创建帐户。" #. translators: popup to fill in the domain joining info; %1 is the domain name -#: src/include/samba-server/dialogs.rb:1704 +#: src/include/samba-server/dialogs.rb:1705 msgid "" "Enter the username and the password\n" "for joining the domain %1." msgstr "请输入用户名和密码加入域 %1。" -#: src/include/samba-server/dialogs.rb:1711 +#: src/include/samba-server/dialogs.rb:1712 msgid "" "To join the domain anonymously, leave the\n" "text entries empty." msgstr "要匿名加入域，请将文本项留空。" #. text entry label -#: src/include/samba-server/dialogs.rb:1719 +#: src/include/samba-server/dialogs.rb:1720 msgid "&Username" msgstr "用户名(&U)" #. translators: button label to skip joining to domain -#: src/include/samba-server/dialogs.rb:1724 +#: src/include/samba-server/dialogs.rb:1725 msgid "Do &Not Join" msgstr "不加入(&N)" #. Translators: Information popup, %1 is the name of the domain -#: src/include/samba-server/dialogs.rb:1756 +#: src/include/samba-server/dialogs.rb:1761 msgid "Domain %1 joined successfully." msgstr "成功加入域 %1。" Modified: trunk/yast/zh_CN/po/samba-users.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/samba-users.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/samba-users.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-10-15 15:54+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/scanner.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/scanner.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/scanner.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-01-31 22:48+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified \n" @@ -164,7 +164,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/include/scanner/dialogs.rb:438 src/include/scanner/dialogs.rb:971 -#: src/modules/Scanner.rb:2267 +#: src/modules/Scanner.rb:2261 msgid "Failed to deactivate %1." msgstr "未能取消激活 %1。" @@ -1046,7 +1046,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/modules/Scanner.rb:533 src/modules/Scanner.rb:591 -#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2506 +#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2500 msgid "File %1 does not exist." msgstr "文件 %1 不存在。" @@ -1059,7 +1059,7 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #: src/modules/Scanner.rb:553 src/modules/Scanner.rb:611 -#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2526 +#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2520 msgid "Failed to read %1." msgstr "未能读取 %1。" @@ -1102,7 +1102,7 @@ #. 3. progress stage name of a Progress::New: #. 5. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1994 +#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1988 msgid "Determine active scanners" msgstr "确定活动扫描仪" @@ -1128,7 +1128,7 @@ #. 3. progress step progress bar title of a Progress::New: #. 5. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2007 +#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2001 msgid "Determining active scanners..." msgstr "正在确定活动扫描仪..." @@ -1151,7 +1151,7 @@ #. Last progress step progress bar title of a Progress::New: #. Last progress step progress bar title of a Progress::New: #: src/modules/Scanner.rb:791 src/modules/Scanner.rb:1030 -#: src/modules/Scanner.rb:2009 +#: src/modules/Scanner.rb:2003 msgid "Finished" msgstr "已完成" @@ -1261,19 +1261,19 @@ #. Fallback device name if the real device name is missing: #. Fallback device name if the real device name is missing: -#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2248 +#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2242 msgid "Unknown device" msgstr "未知设备" #. Fallback manufacturer name if the real manufacturer name is missing: #. Fallback manufacturer name if the real manufacturer name is missing: -#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2236 +#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2230 msgid "Unknown manufacturer" msgstr "未知制造商" #. Fallback model name if the real model name is missing: #. Fallback model name if the real model name is missing: -#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2242 +#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2236 msgid "Unknown model" msgstr "未知型号" @@ -1284,7 +1284,7 @@ #. %1 will be replaced by the manufacturer name #. %2 will be replaced by the model name #. %3 will be replaced by the device name where the scanner is connected to: -#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2231 +#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2225 msgid "%1 %2 at %3" msgstr "%1 %2 的 %3" @@ -1395,7 +1395,7 @@ #. stored on the manufacturer's CD but often it is buried in a weird Windows-only #. driver archive format. The text must indicate this. #. Do not change or translate "SANE", it is a project name. -#: src/modules/Scanner.rb:1892 +#: src/modules/Scanner.rb:1886 msgid "" "A firmware file contains software that must be uploaded to the scanner's memory.\n" "Without firmware, the scanner cannot work.\n" @@ -1428,7 +1428,7 @@ #. Message of a Popup::ContinueCancel for scanners which should be set up with the hpaio driver. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "HPLIP", it is a subsystem name. -#: src/modules/Scanner.rb:1911 +#: src/modules/Scanner.rb:1905 msgid "" "There is at least one printer configuration that uses the ptal service.\n" "It is possible to proceed but then the ptal service would be stopped\n" @@ -1445,7 +1445,7 @@ #. Do not change or translate "PTAL", it is a subsystem name. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "hplip", it is a service name. -#: src/modules/Scanner.rb:1923 +#: src/modules/Scanner.rb:1917 msgid "" "The hpoj driver requires the PTAL system to be set up and running.\n" "In particular, the ptal service must be up and running.\n" @@ -1485,7 +1485,7 @@ #. Do not change or translate "hplip", it is a service name. #. Do not change or translate "hpaio", it is a driver name. #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:1946 +#: src/modules/Scanner.rb:1940 msgid "" "There is at least one printer configuration that uses the hplip service.\n" "It is possible to proceed but then the hplip service would be stopped\n" @@ -1502,51 +1502,51 @@ "或者，继续执行操作并将打印机配置改为使用 ptal 服务。\n" #. %1 will be replaced by the backend name -#: src/modules/Scanner.rb:1982 +#: src/modules/Scanner.rb:1976 msgid "Setting Up Driver %1" msgstr "正在设置驱动程序 %1" -#: src/modules/Scanner.rb:1986 +#: src/modules/Scanner.rb:1980 msgid "Check whether additional packages must be installed" msgstr "检查是否必须安装额外软件包" #. 2. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1988 +#: src/modules/Scanner.rb:1982 msgid "Check whether firmware upload is required" msgstr "检查是否需要上传固件" #. 3. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1990 +#: src/modules/Scanner.rb:1984 msgid "Test and set up special requirements for particular drivers" msgstr "测试并设置特定驱动程序的特殊需求" #. 4. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1992 +#: src/modules/Scanner.rb:1986 msgid "Activate the driver" msgstr "激活驱动程序" #. 1. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1997 +#: src/modules/Scanner.rb:1991 msgid "Checking whether additional packages must be installed..." msgstr "正在检查是否必须安装额外软件包..." #. 2. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:1999 +#: src/modules/Scanner.rb:1993 msgid "Checking whether firmware upload is required..." msgstr "正在检查是否需要上传固件..." #. 3. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:2001 +#: src/modules/Scanner.rb:1995 msgid "Testing and setting up special requirements for particular drivers..." msgstr "正在测试并设置特定驱动程序的特殊需求..." #. 4. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:2005 +#: src/modules/Scanner.rb:1999 msgid "Activating the driver..." msgstr "正在激活驱动程序..." #. the third-party Image Scan driver software from Epson/Avasys: -#: src/modules/Scanner.rb:2026 +#: src/modules/Scanner.rb:2020 msgid "Required Package Not Installed" msgstr "未安装必需的包" @@ -1556,7 +1556,7 @@ #. Only a simple message because before there was a dialog #. which let the user install the package so that this message is shown #. if the user has explicitly rejected to install it. -#: src/modules/Scanner.rb:2034 +#: src/modules/Scanner.rb:2028 msgid "The driver %1 requires the package %2." msgstr "驱动程序 %1 需要包 %2。" @@ -1564,9 +1564,9 @@ #. It may happen that the conflicting service hplip is in use by the printing system. #. The hplip service is associated with the hpaoi backend. #. Activate the backend via bash script: -#: src/modules/Scanner.rb:2040 src/modules/Scanner.rb:2081 -#: src/modules/Scanner.rb:2125 src/modules/Scanner.rb:2139 -#: src/modules/Scanner.rb:2149 +#: src/modules/Scanner.rb:2034 src/modules/Scanner.rb:2075 +#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133 +#: src/modules/Scanner.rb:2143 msgid "Aborted" msgstr "已中止" @@ -1578,7 +1578,7 @@ #. because which scanner requires firmware upload is stored in the database #. and additionally user confirmation must be requested. #. Otherwise skip this section. -#: src/modules/Scanner.rb:2060 +#: src/modules/Scanner.rb:2054 msgid "Firmware Upload Required" msgstr "需要固件上传" @@ -1587,19 +1587,19 @@ #. which asked the user whether he wants to let YaST activate the ptal service #. so that this message is shown if the user has explicitly rejected to do it. #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2115 +#: src/modules/Scanner.rb:2109 msgid "If the ptal service is not running, the scanner cannot work." msgstr "如果 ptal 服务没有运行，则扫描仪无法工作。" #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "PTAL", it is a subsystem name. -#: src/modules/Scanner.rb:2136 +#: src/modules/Scanner.rb:2130 msgid "Failed to set up the PTAL system." msgstr "设置 PTAL 系统失败。" #. Header message for a list of scanners which will be deactivated: -#: src/modules/Scanner.rb:2223 +#: src/modules/Scanner.rb:2217 msgid "" "The following scanners use the same driver.\n" "Therefore all those scanners will be deactivated:" @@ -1614,49 +1614,49 @@ #. Do not change or translate "hpoj", it is a driver name. #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "CUPS", it is a subsystem name. -#: src/modules/Scanner.rb:2291 +#: src/modules/Scanner.rb:2285 msgid "The driver hpoj is deactivated but the associated service ptal is not deactivated because it is needed by the CUPS printing system." msgstr "驱动程序 hpoj 已被取消激活，但关联的 ptal 服务并未被取消激活，因为 CUPS 打印系统需要该服务。" #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2306 +#: src/modules/Scanner.rb:2300 msgid "Failed to stop the ptal service." msgstr "未能停止 ptal 服务。" #. (i.e. a system which is not totally broken or totally messed up). #. Do not change or translate "ptal", it is a service name. -#: src/modules/Scanner.rb:2317 +#: src/modules/Scanner.rb:2311 msgid "Failed to disable the ptal service." msgstr "未能禁用 ptal 服务。" #. If there is no active scanner for the backend #. then show a message but exit successfully because #. it is no error when there is no active scanner for the backend: -#: src/modules/Scanner.rb:2376 +#: src/modules/Scanner.rb:2370 msgid "No Scanner for %1" msgstr "%1 没有扫描仪" #. Header of a Popup::AnyMessage where %1 will be replaced by the driver name: #. Body of a Popup::AnyMessage: -#: src/modules/Scanner.rb:2378 +#: src/modules/Scanner.rb:2372 msgid "It is not possible to test without a matching active scanner." msgstr "不能在没有匹配的活动扫描仪的情况下执行测试。" #. Header of a SelectionBox with a list of scanners: -#: src/modules/Scanner.rb:2393 +#: src/modules/Scanner.rb:2387 msgid "&Scanner to Test" msgstr "要测试的扫描仪(&S)" #. Test the device: -#: src/modules/Scanner.rb:2415 +#: src/modules/Scanner.rb:2409 msgid "Testing %1" msgstr "测试 %1" #. Header of a Popup::ShowFeedback where %1 will be replaced by the driver name: #. Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device identifier. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2418 +#: src/modules/Scanner.rb:2412 msgid "Testing with 'scanimage -d %1 -v'..." msgstr "使用 'scanimage -d %1 -v' 进行测试..." @@ -1664,7 +1664,7 @@ #. %2 will be replaced by the actual test results #. which are usually only available in English. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2430 +#: src/modules/Scanner.rb:2424 msgid "" "Test with 'scanimage -d %1 -v' failed.\n" "The results are:\n" @@ -1678,7 +1678,7 @@ #. Fallback message if the real results are missing: #. Fallback message if the real results are missing: -#: src/modules/Scanner.rb:2441 src/modules/Scanner.rb:2473 +#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467 msgid "(no results available)" msgstr "(无可用的结果)" @@ -1688,7 +1688,7 @@ #. the scanner had fallen into coma or the USB or SCSI system had crashed #. and then the scanner would be no longer an active scanner nor could it be autodetected. #. To simulate such an event, simply unplug an USB scanner while it is being tested. -#: src/modules/Scanner.rb:2456 +#: src/modules/Scanner.rb:2450 msgid "Successfully Tested %1" msgstr "已成功测试 %1" @@ -1696,7 +1696,7 @@ #. %2 will be replaced by the actual test results #. which are usually only available in English. #. Do not change or translate "scanimage -d %1 -v", it is a fixed command. -#: src/modules/Scanner.rb:2462 +#: src/modules/Scanner.rb:2456 msgid "" "Test with 'scanimage -d %1 -v' succeeded.\n" "The results are:\n" @@ -1712,7 +1712,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no scanning via network was configured. #. The latter results no error. -#: src/modules/Scanner.rb:2492 +#: src/modules/Scanner.rb:2486 msgid "Failed to determine the configuration for scanning via network." msgstr "未能确定通过网络进行扫描的配置。" @@ -1720,7 +1720,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no scanning via network is to be set up. #. The latter results no error. -#: src/modules/Scanner.rb:2568 +#: src/modules/Scanner.rb:2562 msgid "Failed to set up scanning via network." msgstr "未能设置通过网络进行扫描。" @@ -1735,12 +1735,12 @@ #. If any kind of firewall seems to be active, show a popup message #. regarding scanning via network and firewall. #. @return true if any kind of firewall seems to be active -#: src/modules/Scanner.rb:2596 +#: src/modules/Scanner.rb:2590 msgid "Check that your firewall allows scanning via network." msgstr "检查您的防火墙是否允许通过网络扫描。" #. Popup::MessageDetails information regarding details: -#: src/modules/Scanner.rb:2598 +#: src/modules/Scanner.rb:2592 msgid "For details regarding firewall see the help text of this dialog." msgstr "防火墙详情请参考此对话框的帮助文本。" Modified: trunk/yast/zh_CN/po/security.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/security.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/security.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-01 00:31+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified \n" @@ -22,7 +22,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#. translators: command line help text for Securoty module +#. translators: command line help text for Security module #: src/clients/security.rb:59 msgid "Security configuration module" msgstr "安全配置模块" @@ -42,15 +42,17 @@ msgid "Set the value of the specific option" msgstr "设置特定选项的值" -#. command line help text for 'level home' option +#. command line help text for 'level workstation' option #: src/clients/security.rb:94 -msgid "Home Workstation security level (without network)" -msgstr "家庭工作站安全级别 (未联网)" +#, fuzzy +#| msgid "Networked Workstation security level" +msgid "Workstation security level" +msgstr "联网工作站安全级别" -#. command line help text for 'level network' option +#. command line help text for 'level roaming' option #: src/clients/security.rb:100 -msgid "Networked Workstation security level" -msgstr "联网工作站安全级别" +msgid "Roaming Device (e.g. laptop or tablet) security level" +msgstr "" #. command line help text for 'level server' option #: src/clients/security.rb:106 @@ -122,213 +124,211 @@ #. Authors: Michal Svec #. #. $Id$ -#: src/include/security/dialogs.rb:63 +#: src/include/security/dialogs.rb:62 msgid "Unknown" msgstr "未知" -#: src/include/security/dialogs.rb:66 +#: src/include/security/dialogs.rb:65 msgid "Use magic SysRq keys" msgstr "使用 Magic SysRq 键" -#: src/include/security/dialogs.rb:67 +#: src/include/security/dialogs.rb:66 msgid "Use secure file permissions" msgstr "使用安全文件权限" -#: src/include/security/dialogs.rb:70 +#: src/include/security/dialogs.rb:69 msgid "Remote access to the display manager" msgstr "对显示管理器的远程访问" -#: src/include/security/dialogs.rb:73 +#: src/include/security/dialogs.rb:72 msgid "Write back system time to the hardware clock" msgstr "将系统时间写回硬件时钟" -#: src/include/security/dialogs.rb:76 +#: src/include/security/dialogs.rb:75 msgid "Always generate syslog message for cron scripts" msgstr "总是为 cron 脚本生成系统日志消息" -#: src/include/security/dialogs.rb:79 +#: src/include/security/dialogs.rb:78 msgid "Run the DHCP daemon in a chroot" msgstr "在 chroot 中运行 DHCP 守护精灵" -#: src/include/security/dialogs.rb:82 +#: src/include/security/dialogs.rb:81 msgid "Run the DHCP daemon as dhcp user" msgstr "以 dhcp 用户运行 DHCP 守护精灵" -#: src/include/security/dialogs.rb:85 +#: src/include/security/dialogs.rb:84 msgid "Remote root login in the display manager" msgstr "显示管理器中的远程 root 登录" -#: src/include/security/dialogs.rb:88 +#: src/include/security/dialogs.rb:87 msgid "Remote access to the X server" msgstr "对 X 服务器的远程访问" -#: src/include/security/dialogs.rb:91 +#: src/include/security/dialogs.rb:90 msgid "Remote access to the email delivery subsystem" msgstr "对电邮投递子系统的远程访问" -#: src/include/security/dialogs.rb:94 +#: src/include/security/dialogs.rb:93 msgid "Restart services on update" msgstr "更新时重启服务" -#: src/include/security/dialogs.rb:97 +#: src/include/security/dialogs.rb:96 msgid "Stop services on removal" msgstr "移除时停止服务" -#: src/include/security/dialogs.rb:100 +#: src/include/security/dialogs.rb:99 msgid "Enable TCP syncookies" msgstr "启用 TCP syncookies" -#: src/include/security/dialogs.rb:103 +#: src/include/security/dialogs.rb:102 msgid "IPv4 forwarding" msgstr "IPv4 转发" -#: src/include/security/dialogs.rb:104 +#: src/include/security/dialogs.rb:103 msgid "IPv6 forwarding" msgstr "IPv6 转发" -#: src/include/security/dialogs.rb:105 -msgid "" -"Enable basic system services in runlevel 3\n" -" (multiuser with network)" -msgstr "" -"在运行级别 3 (带网络的多用户模式) 中\n" -"启用基础系统服务" +#: src/include/security/dialogs.rb:104 +#, fuzzy +#| msgid "Enable the service" +msgid "Enable basic system services" +msgstr "启用服务" -#: src/include/security/dialogs.rb:108 -msgid "" -"Enable basic system services in runlevel 5\n" -" (multiuser with network and graphical login)" -msgstr "" -"在运行级别 5 (带网络和图形登录的多用户模式) 中\n" -"启用基础系统服务" +#: src/include/security/dialogs.rb:107 +#, fuzzy +#| msgid "Disable the service" +msgid "Disable extra services" +msgstr "禁用服务" -#: src/include/security/dialogs.rb:111 -msgid "Enable extra services in runlevel 3" -msgstr "在运行级别 3 中启用额外的服务" - -#: src/include/security/dialogs.rb:114 -msgid "Enable extra services in runlevel 5" -msgstr "在运行级别 5 中启用额外的服务" - #. handle the special cases at first -#: src/include/security/dialogs.rb:156 +#: src/include/security/dialogs.rb:150 msgid "Configure" msgstr "配置" -#: src/include/security/dialogs.rb:158 +#: src/include/security/dialogs.rb:152 msgid "Enabled" msgstr "已启用" -#: src/include/security/dialogs.rb:160 +#: src/include/security/dialogs.rb:154 msgid "Disabled" msgstr "已禁用" #. table header #. table header -#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:470 +#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409 msgid "Security Setting" msgstr "安全设置" -#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:471 +#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410 msgid "Status" msgstr "状态" -#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:472 +#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411 msgid "Security Status" msgstr "安全状态" #. add one line for each security setting -#: src/include/security/dialogs.rb:348 +#: src/include/security/dialogs.rb:318 msgid "Help" msgstr "帮助" #. this is a separator between service names #. e.g.: "postfix" + " or " + "sendmail" -#: src/include/security/dialogs.rb:395 +#: src/include/security/dialogs.rb:361 msgid " or " msgstr " 或 " #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services -#: src/include/security/dialogs.rb:404 -msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>" +#: src/include/security/dialogs.rb:368 +#, fuzzy +#| msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>" +msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>" msgstr "<P>这些基础系统服务没有在运行级别 %1 中启用：<BR><B>%2</B></P>" -#: src/include/security/dialogs.rb:412 +#: src/include/security/dialogs.rb:370 msgid "<P>All basic services are enabled.</P>" msgstr "<P>所有基础服务都已经启用。</P>" -#. TODO: runlevel is not longer needed (read above) -#: src/include/security/dialogs.rb:425 -msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>" +#: src/include/security/dialogs.rb:378 +#, fuzzy +#| msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>" +msgid "<P>These extra services are enabled:<BR><B>%s</B></P>" msgstr "<P>在运行级别 %1 中启用了这些额外的服务：<BR><B>%2</B></P>" -#: src/include/security/dialogs.rb:434 +#: src/include/security/dialogs.rb:379 msgid "<P>Check the list of services and disable all unused services.</P>" msgstr "<P>检查服务列表并禁用所有没有使用的服务。</P>" -#: src/include/security/dialogs.rb:441 +#: src/include/security/dialogs.rb:381 msgid "<P>Only basic system services are enabled.</P>" msgstr "<P>仅启用了基础系统服务。</P>" -#: src/include/security/dialogs.rb:448 +#: src/include/security/dialogs.rb:387 msgid "Description" msgstr "描述" #. Overview dialog caption #. params: input tree, parent, label, id -#: src/include/security/dialogs.rb:460 src/include/security/wizards.rb:49 +#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49 msgid "Security Overview" msgstr "安全概览" #. push button label -#: src/include/security/dialogs.rb:485 +#: src/include/security/dialogs.rb:424 msgid "Change &Status" msgstr "变更状态 (&S)" #. push button label -#: src/include/security/dialogs.rb:488 +#: src/include/security/dialogs.rb:427 msgid "&Description" msgstr "描述 (&D)" +#. update the current value +#: src/include/security/dialogs.rb:521 +#, fuzzy +#| msgid "Analyzing the system..." +msgid "Analyzing system" +msgstr "正在分析系统..." + #. Boot dialog caption -#: src/include/security/dialogs.rb:634 src/include/security/wizards.rb:57 +#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57 msgid "Boot Settings" msgstr "引导设置" #. Frame label -#: src/include/security/dialogs.rb:646 +#: src/include/security/dialogs.rb:587 msgid "Boot Permissions" msgstr "引导权限" #. Misc dialog caption -#: src/include/security/dialogs.rb:723 src/include/security/wizards.rb:60 +#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60 msgid "Miscellaneous Settings" msgstr "杂项设置" #. Password dialog caption -#: src/include/security/dialogs.rb:803 src/include/security/wizards.rb:56 +#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56 msgid "Password Settings" msgstr "密码设置" #. Frame label -#: src/include/security/dialogs.rb:812 +#: src/include/security/dialogs.rb:753 msgid "Checks" msgstr "检查" #. Frame label -#: src/include/security/dialogs.rb:827 +#: src/include/security/dialogs.rb:768 msgid "Password Age" msgstr "密码有效期" #. Popup text -#: src/include/security/dialogs.rb:905 +#: src/include/security/dialogs.rb:846 msgid "" "The minimum number of days cannot be larger\n" "than the maximum." msgstr "最小天数不能大于最大天数。" #. Popup text, %1 is number -#: src/include/security/dialogs.rb:922 +#: src/include/security/dialogs.rb:863 msgid "" "The minimum password length cannot be larger than the maximum.\n" "The maximum password length for the selected encryption method is %1." @@ -337,12 +337,12 @@ "所选加密方法的最大密码长度是 %1。" #. Login dialog caption -#: src/include/security/dialogs.rb:954 src/include/security/wizards.rb:58 +#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58 msgid "Login Settings" msgstr "登录设置" #. Frame label -#: src/include/security/dialogs.rb:963 +#: src/include/security/dialogs.rb:904 msgid "Login" msgstr "登录" @@ -445,21 +445,23 @@ #. Main dialog help 5/8 #: src/include/security/helps.rb:86 +#, fuzzy +#| msgid "" +#| "<p><b>Networked Workstation</b>: For a computer connected\n" +#| "to any type of network including the Internet.</p>" msgid "" -"<p><b>Home Workstation</b>: For a home computer not connected to\n" -"any type of a network.</p>" +"<p><b>Workstation</b>: For a computer connected\n" +"to any type of network including the Internet.</p>" msgstr "" -"<p><b>家庭工作站</b>：适用于未连接到\n" -"任何类型的网络的家庭计算机。</p>" +"<p><b>联网工作站</b>：适用于连接到任意类型的网络 (包括因特网)\n" +"的计算机。</p>" #. Main dialog help 6/8 #: src/include/security/helps.rb:90 msgid "" -"<p><b>Networked Workstation</b>: For a computer connected\n" -"to any type of network including the Internet.</p>" +"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n" +"that connects to different networks.</p>" msgstr "" -"<p><b>联网工作站</b>：适用于连接到任意类型的网络 (包括因特网)\n" -"的计算机。</p>" #. Main dialog help 7/8 #: src/include/security/helps.rb:94 @@ -885,41 +887,49 @@ msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>" msgstr "<P>/etc/permissions.*files 中预定义了文件权限。最严格的文件权限定义在 'secure' 或 'paranoid' 文件中。</P>" -#: src/include/security/helps.rb:349 src/include/security/helps.rb:352 +#: src/include/security/helps.rb:349 msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>" msgstr "<P>必须启用基础系统服务以提供系统一致性和运行安全相关服务。</P>" -#: src/include/security/helps.rb:355 src/include/security/helps.rb:358 +#: src/include/security/helps.rb:352 msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>" msgstr "<P>每个运行状态的服务都是安全攻击的潜在目标。因此建议关闭所有系统未使用的服务。</P>" #. level name -#: src/include/security/levels.rb:51 -msgid "Home Workstation" +#: src/include/security/levels.rb:54 +#, fuzzy +#| msgid "Home Workstation" +msgid "Workstation" msgstr "家庭工作站" #. level name -#: src/include/security/levels.rb:53 -msgid "Networked Workstation" -msgstr "联网工作站" +#: src/include/security/levels.rb:56 +#, fuzzy +#| msgid "Raid Device" +msgid "Roaming Device" +msgstr "Raid 设备" #. level name -#: src/include/security/levels.rb:55 +#: src/include/security/levels.rb:58 msgid "Network Server" msgstr "网络服务器" #. RadioButton label -#: src/include/security/levels.rb:60 -msgid "&Home Workstation" +#: src/include/security/levels.rb:63 +#, fuzzy +#| msgid "&Home Workstation" +msgid "&Workstation" msgstr "家庭工作站 (&H)" #. RadioButton label -#: src/include/security/levels.rb:62 -msgid "N&etworked Workstation" -msgstr "联网工作站 (&E)" +#: src/include/security/levels.rb:65 +#, fuzzy +#| msgid "Raid Device" +msgid "&Roaming Device" +msgstr "Raid 设备" #. RadioButton label -#: src/include/security/levels.rb:64 +#: src/include/security/levels.rb:67 msgid "Network &Server" msgstr "网络服务器 (&S)" @@ -997,13 +1007,13 @@ #. IntField label #. IntField label -#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:209 +#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205 msgid "Maxim&um" msgstr "最大值 (&U)" #. IntField label #. IntField label -#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:222 +#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218 msgid "M&inimum" msgstr "最小值 (&I)" @@ -1027,90 +1037,83 @@ msgid "Nobody" msgstr "没有人" -#. ComboBox value -#. ["local",_("Local Users")], -#. ComboBox value -#: src/include/security/widgets.rb:167 -msgid "Automatic" -msgstr "自动" - #. ComboBox label -#: src/include/security/widgets.rb:174 +#: src/include/security/widgets.rb:170 msgid "System Hybernation" msgstr "系统休眠" #. ComboBox value -#: src/include/security/widgets.rb:177 +#: src/include/security/widgets.rb:173 msgid "User on the active console" msgstr "活动控制台的用户" #. ComboBox value -#: src/include/security/widgets.rb:179 +#: src/include/security/widgets.rb:175 msgid "Anyone can hibernate" msgstr "任何人都可以休眠" #. ComboBox value -#: src/include/security/widgets.rb:181 +#: src/include/security/widgets.rb:177 msgid "Authentication always required" msgstr "总是需要认证" #. ComboBox label -#: src/include/security/widgets.rb:188 +#: src/include/security/widgets.rb:184 msgid "P&assword Encryption Method" msgstr "密码加密方法 (&A)" #. CheckBox label -#: src/include/security/widgets.rb:202 +#: src/include/security/widgets.rb:198 msgid "&Check New Passwords" msgstr "检查新密码 (&C)" #. IntField label -#: src/include/security/widgets.rb:215 +#: src/include/security/widgets.rb:211 msgid "Numb&er of Passwords to Remember" msgstr "要记忆的密码的数目 (&E)" #. IntField label -#: src/include/security/widgets.rb:228 +#: src/include/security/widgets.rb:224 msgid "&Minimum Acceptable Password Length" msgstr "最小可接受密码长度 (&M)" #. IntField label -#: src/include/security/widgets.rb:236 +#: src/include/security/widgets.rb:232 msgid "&Days before Password Expires Warning" msgstr "提前发出密码失效警告的天数 (&D)" #. ComboBox label -#: src/include/security/widgets.rb:244 +#: src/include/security/widgets.rb:240 msgid "&File Permissions" msgstr "文件权限 (&F)" #. ComboBox value -#: src/include/security/widgets.rb:247 +#: src/include/security/widgets.rb:243 msgid "Easy" msgstr "简单" #. ComboBox value -#: src/include/security/widgets.rb:249 +#: src/include/security/widgets.rb:245 msgid "Secure" msgstr "安全" #. ComboBox value -#: src/include/security/widgets.rb:251 +#: src/include/security/widgets.rb:247 msgid "Paranoid" msgstr "极致" #. ComboBox label -#: src/include/security/widgets.rb:258 +#: src/include/security/widgets.rb:254 msgid "&User Launching updatedb" msgstr "启动 updatedb 的用户 (&U)" #. IntField label -#: src/include/security/widgets.rb:265 +#: src/include/security/widgets.rb:261 msgid "Ma&ximum" msgstr "最大值 (&X)" #. IntField label -#: src/include/security/widgets.rb:271 +#: src/include/security/widgets.rb:267 msgid "&Minimum" msgstr "最小值 (&M)" @@ -1129,65 +1132,104 @@ msgstr "正在初始化..." #. Security read dialog caption -#: src/modules/Security.rb:608 +#: src/modules/Security.rb:654 msgid "Saving Security Configuration" msgstr "正在保存安全配置" #. Progress stage 1/4 -#: src/modules/Security.rb:617 +#: src/modules/Security.rb:663 msgid "Write security settings" msgstr "写入安全设置" #. Progress stage 2/4 -#: src/modules/Security.rb:619 +#: src/modules/Security.rb:665 msgid "Write inittab settings" msgstr "写入 inittab 设置" #. Progress stage 3/4 -#: src/modules/Security.rb:621 +#: src/modules/Security.rb:667 msgid "Write PAM settings" msgstr "写入 PAM 设置" #. Progress stage 4/4 -#: src/modules/Security.rb:623 +#: src/modules/Security.rb:669 msgid "Update system settings" msgstr "更新系统设置" #. Progress step 1/5 -#: src/modules/Security.rb:627 +#: src/modules/Security.rb:673 msgid "Writing security settings..." msgstr "正在写入安全设置..." #. Progress step 2/5 -#: src/modules/Security.rb:629 +#: src/modules/Security.rb:675 msgid "Writing inittab settings..." msgstr "正在写入 inittab 设置..." #. Progress step 3/5 -#: src/modules/Security.rb:631 +#: src/modules/Security.rb:677 msgid "Writing PAM settings..." msgstr "正在写入 PAM 设置..." #. Progress step 4/5 -#: src/modules/Security.rb:633 +#: src/modules/Security.rb:679 msgid "Updating system settings..." msgstr "正在更新系统设置..." #. Progress step 5/5 -#: src/modules/Security.rb:635 +#: src/modules/Security.rb:681 msgid "Finished" msgstr "已完成" #. Summary text -#: src/modules/Security.rb:869 +#: src/modules/Security.rb:791 msgid "Current Security Level: Custom settings" msgstr "当前安全级别：自定义设置" #. Summary text -#: src/modules/Security.rb:873 +#: src/modules/Security.rb:795 msgid "Current Security Level: %1" msgstr "当前安全级别：%1" +#~ msgid "Home Workstation security level (without network)" +#~ msgstr "家庭工作站安全级别 (未联网)" + +#~ msgid "" +#~ "Enable basic system services in runlevel 3\n" +#~ " (multiuser with network)" +#~ msgstr "" +#~ "在运行级别 3 (带网络的多用户模式) 中\n" +#~ "启用基础系统服务" + +#~ msgid "" +#~ "Enable basic system services in runlevel 5\n" +#~ " (multiuser with network and graphical login)" +#~ msgstr "" +#~ "在运行级别 5 (带网络和图形登录的多用户模式) 中\n" +#~ "启用基础系统服务" + +#~ msgid "Enable extra services in runlevel 3" +#~ msgstr "在运行级别 3 中启用额外的服务" + +#~ msgid "Enable extra services in runlevel 5" +#~ msgstr "在运行级别 5 中启用额外的服务" + +#~ msgid "" +#~ "<p><b>Home Workstation</b>: For a home computer not connected to\n" +#~ "any type of a network.</p>" +#~ msgstr "" +#~ "<p><b>家庭工作站</b>：适用于未连接到\n" +#~ "任何类型的网络的家庭计算机。</p>" + +#~ msgid "Networked Workstation" +#~ msgstr "联网工作站" + +#~ msgid "N&etworked Workstation" +#~ msgstr "联网工作站 (&E)" + +#~ msgid "Automatic" +#~ msgstr "自动" + #~ msgid "&Current Directory in root's Path" #~ msgstr "root 用户路径中的当前目录 (&C)" Modified: trunk/yast/zh_CN/po/services-manager.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/services-manager.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/services-manager.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-08-23 02:16+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -14,7 +14,194 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" +#: src/clients/default_target_finish.rb:30 +msgid "Saving default systemd target..." +msgstr "正在保存默认 systemd 对象..." + +#: src/clients/default_target_proposal.rb:26 +msgid "VNC needs graphical system to be available" +msgstr "VNC 需要可用的图形系统" + #. TODO implement behaviour if force_reset parameter provided +#: src/clients/default_target_proposal.rb:51 +msgid "&Default systemd target" +msgstr "默认 systemd 对象(&D)" + +#: src/clients/default_target_proposal.rb:52 +msgid "Default systemd target" +msgstr "默认 systemd 对象" + +#. create the proposal dialog and get the sequence symbol from block +#: src/clients/default_target_proposal.rb:116 +msgid "Set Default Systemd Target" +msgstr "设置默认 Systemd 对象" + +#: src/clients/default_target_proposal.rb:134 +msgid "Selecting the Default Systemd Target" +msgstr "选择默认 Systemd 对象" + +#: src/clients/default_target_proposal.rb:136 +msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units." +msgstr "Systemd 是一个 Linux 的系统和服务管理器。它由单元 (unit) 组成，单元的任务是激活服务和其它单元。" + +#: src/clients/default_target_proposal.rb:139 +msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page." +msgstr "默认对象单元在引导时是默认激活的。通常它是一个位于 path/etc/systemd/system/default.target 的系统链接。更多请参考 systemd 手册页。" + +#: src/clients/default_target_proposal.rb:143 +msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)." +msgstr "多用户对象用于设置非图形多用户系统和适合服务器的网络 (与运行级别 3 相似)。" + +#: src/clients/default_target_proposal.rb:146 +msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)." +msgstr "图形对象用于设置图形登录屏幕和工作站典型网络 (与运行级别 5 相似)。" + +#: src/clients/default_target_proposal.rb:149 +msgid "When you are not sure what would be the best option for you then go with graphical target." +msgstr "当您不确定何种选项于您最佳时请使用图形对象。" + +#: src/clients/default_target_proposal.rb:160 +msgid "Available Targets" +msgstr "可用对象" + +#. Check if the user forced a particular target before; if he did and the +#. autodetection recommends a different one now, warn the user about this +#. and keep the default target unchanged. +#: src/clients/default_target_proposal.rb:220 +msgid "The installer is recommending you the default target '%s' " +msgstr "安装器为您推荐了默认对象 '%s'" + +#: src/clients/default_target_proposal.rb:232 +msgid "X11 packages have been selected for installation" +msgstr "已选择安装 X11 软件包" + +#: src/clients/default_target_proposal.rb:235 +msgid "Live Installation is typically used for full GUI in target system" +msgstr "Live 安装典型地用于在目标系统上全图形界面安装" + +#: src/clients/default_target_proposal.rb:238 +msgid "Serial connection does typically not support GUI" +msgstr "串口连接典型地不支持图形界面" + +#: src/clients/default_target_proposal.rb:242 +msgid "Text mode installation assumes no GUI on the target system" +msgstr "文本模式安装假设目标系统上没有图形界面" + +#: src/clients/default_target_proposal.rb:245 +#: src/clients/default_target_proposal.rb:249 +msgid "Using VNC assumes a GUI on the target system" +msgstr "使用 VNC 就假设了目标系统上有图形界面" + +#: src/clients/default_target_proposal.rb:252 +msgid "SSH installation mode assumes no GUI on the target system" +msgstr "SSH 安装模式假设目标系统上没有图形界面" + +#: src/clients/default_target_proposal.rb:255 +msgid "X11 packages have not been selected for installation" +msgstr "未选择安装 X11 软件包" + +#: src/clients/default_target_proposal.rb:258 +msgid "This recommendation is based on the analysis of other installation settings" +msgstr "此推荐设置基于对其它安装设置的分析" + +#. translators: command line help text for services-manager module +#. translators: command line help text for services-manager module +#: src/clients/services-manager.rb:29 src/clients/services.rb:29 +msgid "" +"Systemd target and services configuration module.\n" +"Use systemctl for commandline services configuration." +msgstr "" + +#. Default for double-click in the table +#. Default for double-click in the table +#: src/clients/services-manager.rb:89 src/clients/services.rb:89 +msgid "Writing configuration..." +msgstr "正在写入配置..." + +#: src/clients/services-manager.rb:94 src/clients/services.rb:94 +msgid "Writing the configuration failed:\n" +msgstr "写入配置失败：\n" + +#. Additional space for UI features +#. Additional space for UI features +#: src/clients/services-manager.rb:131 src/clients/services.rb:131 +msgid "Default System &Target" +msgstr "默认系统对象(&T)" + +#: src/clients/services-manager.rb:142 src/clients/services.rb:142 +msgid "Service" +msgstr "服务" + +#: src/clients/services-manager.rb:143 src/clients/services-manager.rb:172 +#: src/clients/services-manager.rb:188 src/clients/services.rb:143 +#: src/clients/services.rb:172 src/clients/services.rb:188 +#: src/data/services-manager/autoyast_summary.erb:16 +msgid "Enabled" +msgstr "已启用" + +#. The current state matches the futural state +#. The current state matches the futural state +#: src/clients/services-manager.rb:144 src/clients/services-manager.rb:173 +#: src/clients/services-manager.rb:198 src/clients/services.rb:144 +#: src/clients/services.rb:173 src/clients/services.rb:198 +msgid "Active" +msgstr "活动" + +#: src/clients/services-manager.rb:145 src/clients/services.rb:145 +msgid "Description" +msgstr "描述" + +#: src/clients/services-manager.rb:150 src/clients/services.rb:150 +msgid "&Start/Stop" +msgstr "启动/停止(&S)" + +#: src/clients/services-manager.rb:152 src/clients/services.rb:152 +msgid "&Enable/Disable" +msgstr "启用/禁用(&E)" + +#: src/clients/services-manager.rb:154 src/clients/services.rb:154 +msgid "Show &Details" +msgstr "显示细节(&D)" + +#: src/clients/services-manager.rb:157 src/clients/services.rb:157 +#: src/data/services-manager/autoyast_summary.erb:5 +msgid "Services Manager" +msgstr "服务管理器" + +#. Redraws the services dialog +#. Redraws the services dialog +#: src/clients/services-manager.rb:168 src/clients/services.rb:168 +msgid "Reading services status..." +msgstr "正在读取服务状态..." + +#: src/clients/services-manager.rb:172 src/clients/services-manager.rb:188 +#: src/clients/services.rb:172 src/clients/services.rb:188 +#: src/data/services-manager/autoyast_summary.erb:23 +msgid "Disabled" +msgstr "已禁用" + +#: src/clients/services-manager.rb:173 src/clients/services-manager.rb:198 +#: src/clients/services.rb:173 src/clients/services.rb:198 +msgid "Inactive" +msgstr "非活动" + +#. The current state differs the the futural state +#. The current state differs the the futural state +#: src/clients/services-manager.rb:205 src/clients/services.rb:205 +msgid "Active (will start)" +msgstr "活动 (将启动之)" + +#: src/clients/services-manager.rb:205 src/clients/services.rb:205 +msgid "Inactive (will stop)" +msgstr "非活动 (将停止之)" + +#. Opens up a popup with details about the currently selected service +#. Opens up a popup with details about the currently selected service +#: src/clients/services-manager.rb:226 src/clients/services.rb:226 +msgid "Service %{service} Full Info" +msgstr "服务 %{service} 完整信息" + +#. TODO implement behaviour if force_reset parameter provided #: src/clients/services_proposal.rb:52 msgid "&Services" msgstr "服务(&S)" @@ -68,165 +255,65 @@ msgid "Cannot enable service %1" msgstr "无法启用服务 %1" -#: src/data/services-manager/autoyast_summary.erb:5 -msgid "Services Manager" -msgstr "服务管理器" - #: src/data/services-manager/autoyast_summary.erb:6 msgid "Default Target" msgstr "默认对象" -#: src/data/services-manager/autoyast_summary.erb:16 -msgid "Enabled" -msgstr "已启用" - -#: src/data/services-manager/autoyast_summary.erb:23 -msgid "Disabled" -msgstr "已禁用" - #. Name of the systemd default target unit. Suffix '.target' is optional. #. @return [String] if the target has been specified in the profile. Can be nil. -#: src/lib/services-manager/services_manager_profile.rb:104 +#: src/lib/services-manager/services_manager_profile.rb:103 msgid "Unknown autoyast services profile schema for 'services-manager'" msgstr "未知的用于 'services-manager' 的 autoyast 服务方案样板" -#~ msgid "Saving default systemd target..." -#~ msgstr "正在保存默认 systemd 对象..." +#. AutoYast summary +#: src/modules/services_manager.rb:29 +msgid "Not configured yet." +msgstr "尚未配置。" -#~ msgid "VNC needs graphical system to be available" -#~ msgstr "VNC 需要可用的图形系统" +#. Do not start or stop services that are already in the desired state. +#. They might be coming from AutoYast import and thus marked as :modified. +#: src/modules/services_manager_service.rb:407 +msgid "Could not %{change} %{service} which is currently %{status}. " +msgstr "无法 %{change} %{service}，其当前处于 %{status} 状态。" -#~ msgid "&Default systemd target" -#~ msgstr "默认 systemd 对象(&D)" +#: src/modules/services_manager_service.rb:426 +msgid "Could not %{change} %{service}. " +msgstr "无法 %{change} %{service}。" -#~ msgid "Default systemd target" -#~ msgstr "默认 systemd 对象" +#. Default systemd target (previously: runlevel 5) option #1 +#: src/modules/services_manager_target.rb:20 +msgid "Graphical mode" +msgstr "图形模式" -#~ msgid "Set Default Systemd Target" -#~ msgstr "设置默认 Systemd 对象" +#. Default systemd target (previously: runlevel 3) option #2 +#: src/modules/services_manager_target.rb:22 +msgid "Text mode" +msgstr "文本模式" -#~ msgid "Selecting the Default Systemd Target" -#~ msgstr "选择默认 Systemd 对象" +#. Systemd targets, bnc#892366 +#: src/modules/services_manager_target.rb:25 +msgid "Emergency Mode" +msgstr "紧急模式" -#~ msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units." -#~ msgstr "Systemd 是一个 Linux 的系统和服务管理器。它由单元 (unit) 组成，单元的任务是激活服务和其它单元。" +#: src/modules/services_manager_target.rb:26 +msgid "Graphical Interface" +msgstr "图形界面" -#~ msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page." -#~ msgstr "默认对象单元在引导时是默认激活的。通常它是一个位于 path/etc/systemd/system/default.target 的系统链接。更多请参考 systemd 手册页。" +#: src/modules/services_manager_target.rb:27 +msgid "Initrd Default Target" +msgstr "Initrd 默认对象" -#~ msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)." -#~ msgstr "多用户对象用于设置非图形多用户系统和适合服务器的网络 (与运行级别 3 相似)。" +#: src/modules/services_manager_target.rb:28 +msgid "Switch Root" +msgstr "切换 Root" -#~ msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)." -#~ msgstr "图形对象用于设置图形登录屏幕和工作站典型网络 (与运行级别 5 相似)。" +#: src/modules/services_manager_target.rb:29 +msgid "Multi-User System" +msgstr "多用户系统" -#~ msgid "When you are not sure what would be the best option for you then go with graphical target." -#~ msgstr "当您不确定何种选项于您最佳时请使用图形对象。" +#: src/modules/services_manager_target.rb:30 +msgid "Rescue Mode" +msgstr "救援模式" -#~ msgid "Available Targets" -#~ msgstr "可用对象" - -#~ msgid "The installer is recommending you the default target '%s' " -#~ msgstr "安装器为您推荐了默认对象 '%s'" - -#~ msgid "X11 packages have been selected for installation" -#~ msgstr "已选择安装 X11 软件包" - -#~ msgid "Live Installation is typically used for full GUI in target system" -#~ msgstr "Live 安装典型地用于在目标系统上全图形界面安装" - -#~ msgid "Serial connection does typically not support GUI" -#~ msgstr "串口连接典型地不支持图形界面" - -#~ msgid "Text mode installation assumes no GUI on the target system" -#~ msgstr "文本模式安装假设目标系统上没有图形界面" - -#~ msgid "Using VNC assumes a GUI on the target system" -#~ msgstr "使用 VNC 就假设了目标系统上有图形界面" - -#~ msgid "SSH installation mode assumes no GUI on the target system" -#~ msgstr "SSH 安装模式假设目标系统上没有图形界面" - -#~ msgid "X11 packages have not been selected for installation" -#~ msgstr "未选择安装 X11 软件包" - -#~ msgid "This recommendation is based on the analysis of other installation settings" -#~ msgstr "此推荐设置基于对其它安装设置的分析" - -#~ msgid "Writing configuration..." -#~ msgstr "正在写入配置..." - -#~ msgid "Writing the configuration failed:\n" -#~ msgstr "写入配置失败：\n" - -#~ msgid "Default System &Target" -#~ msgstr "默认系统对象(&T)" - -#~ msgid "Service" -#~ msgstr "服务" - -#~ msgid "Active" -#~ msgstr "活动" - -#~ msgid "Description" -#~ msgstr "描述" - -#~ msgid "&Start/Stop" -#~ msgstr "启动/停止(&S)" - -#~ msgid "&Enable/Disable" -#~ msgstr "启用/禁用(&E)" - -#~ msgid "Show &Details" -#~ msgstr "显示细节(&D)" - -#~ msgid "Reading services status..." -#~ msgstr "正在读取服务状态..." - -#~ msgid "Inactive" -#~ msgstr "非活动" - -#~ msgid "Active (will start)" -#~ msgstr "活动 (将启动之)" - -#~ msgid "Inactive (will stop)" -#~ msgstr "非活动 (将停止之)" - -#~ msgid "Service %{service} Full Info" -#~ msgstr "服务 %{service} 完整信息" - -#~ msgid "Not configured yet." -#~ msgstr "尚未配置。" - -#~ msgid "Could not %{change} %{service} which is currently %{status}. " -#~ msgstr "无法 %{change} %{service}，其当前处于 %{status} 状态。" - -#~ msgid "Could not %{change} %{service}. " -#~ msgstr "无法 %{change} %{service}。" - -#~ msgid "Graphical mode" -#~ msgstr "图形模式" - -#~ msgid "Text mode" -#~ msgstr "文本模式" - -#~ msgid "Graphical Interface" -#~ msgstr "图形界面" - -#~ msgid "Emergency Mode" -#~ msgstr "紧急模式" - -#~ msgid "Switch Root" -#~ msgstr "切换 Root" - -#~ msgid "Initrd Default Target" -#~ msgstr "Initrd 默认对象" - -#~ msgid "Multi-User System" -#~ msgstr "多用户系统" - -#~ msgid "Rescue Mode" -#~ msgstr "救援模式" - #~ msgid "Enabled Services" #~ msgstr "已启用服务" Modified: trunk/yast/zh_CN/po/slp-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/slp-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/slp-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-03 16:27+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/snapper.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/snapper.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/snapper.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 11:39+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -20,134 +20,175 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.5\n" -#. The main () -#: src/clients/snapper.rb:53 +#. encoding: utf-8 +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#. File: clients/snapper.ycp +#. Package: Configuration of snapper +#. Summary: Main file +#. Authors: Jiri Suchomel +#. +#. Main file for snapper configuration. Uses all other files. +#: src/clients/snapper.rb:49 msgid "Configuration of system snapshots" msgstr "系统快照配置" #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251 -#: src/include/snapper/dialogs.rb:490 +#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244 +#: src/include/snapper/dialogs.rb:496 msgid "Description" msgstr "描述" #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297 +#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290 msgid "User data" msgstr "用户数据" #. combo box label #. text entry label -#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302 +#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295 msgid "Cleanup algorithm" msgstr "清理算法" -#. popup label, %1 is number -#: src/include/snapper/dialogs.rb:158 -msgid "Modify Snapshot %1" +#. popup label, %{num} is number +#: src/include/snapper/dialogs.rb:153 +#, fuzzy +#| msgid "Modify Snapshot %1" +msgid "Modify Snapshot %{num}" msgstr "修订快照 %1" -#. popup label, %1, %2 are numbers (range) -#: src/include/snapper/dialogs.rb:166 -msgid "Modify Snapshots %1 - %2" +#. popup label, %{pre} and %{post} are numbers +#: src/include/snapper/dialogs.rb:159 +#, fuzzy +#| msgid "Modify Snapshots %1 - %2" +msgid "Modify Snapshot %{pre} and %{post}" msgstr "修订快照 %1 - %2" #. label -#: src/include/snapper/dialogs.rb:169 -msgid "Pre (%1)" +#: src/include/snapper/dialogs.rb:161 +#, fuzzy +#| msgid "Pre (%1)" +msgid "Pre (%{pre})" msgstr "前期快照 (%1)" #. label -#: src/include/snapper/dialogs.rb:173 -msgid "Post (%1)" +#: src/include/snapper/dialogs.rb:165 +#, fuzzy +#| msgid "Post (%1)" +msgid "Post (%{post})" msgstr "后期快照 (%1)" #. popup label -#: src/include/snapper/dialogs.rb:249 +#: src/include/snapper/dialogs.rb:242 msgid "Create New Snapshot" msgstr "创建新快照" #. radio button label -#: src/include/snapper/dialogs.rb:262 +#: src/include/snapper/dialogs.rb:255 msgid "Single snapshot" msgstr "单一快照" #. radio button label #. 0 means there's no post -#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435 +#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442 msgid "Pre" msgstr "前期快照" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:281 +#: src/include/snapper/dialogs.rb:274 msgid "Post, paired with:" msgstr "后期快照，配对为：" #. yes/no popup question -#: src/include/snapper/dialogs.rb:352 -msgid "Really delete snapshot '%1'?" +#: src/include/snapper/dialogs.rb:350 +#, fuzzy +#| msgid "Really delete snapshot '%1'?" +msgid "Really delete snapshot %{num}?" msgstr "真的删除快照 '%1' 吗？" +#. yes/no popup question +#: src/include/snapper/dialogs.rb:357 +#, fuzzy +#| msgid "Really delete snapshot '%1'?" +msgid "Really delete snapshots %{pre} and %{post}?" +msgstr "真的删除快照 '%1' 吗？" + #. summary dialog caption -#: src/include/snapper/dialogs.rb:365 +#: src/include/snapper/dialogs.rb:372 msgid "Snapshots" msgstr "快照" #. generate list of snapshot table items -#: src/include/snapper/dialogs.rb:394 +#: src/include/snapper/dialogs.rb:401 msgid "Single" msgstr "单一快照" #. pre canot be 0 -#: src/include/snapper/dialogs.rb:419 +#: src/include/snapper/dialogs.rb:426 msgid "Pre & Post" msgstr "前后快照" #. busy popup message -#: src/include/snapper/dialogs.rb:454 +#: src/include/snapper/dialogs.rb:461 msgid "Reading list of snapshots..." msgstr "正在读取快照列表..." #. combo box label -#: src/include/snapper/dialogs.rb:475 +#: src/include/snapper/dialogs.rb:481 msgid "Current Configuration" msgstr "当前配置" #. table header -#: src/include/snapper/dialogs.rb:486 +#: src/include/snapper/dialogs.rb:492 msgid "ID" msgstr "ID" -#: src/include/snapper/dialogs.rb:487 +#: src/include/snapper/dialogs.rb:493 msgid "Type" msgstr "类型" -#: src/include/snapper/dialogs.rb:488 +#: src/include/snapper/dialogs.rb:494 msgid "Start Date" msgstr "开始日期" -#: src/include/snapper/dialogs.rb:489 +#: src/include/snapper/dialogs.rb:495 msgid "End Date" msgstr "结束日期" -#: src/include/snapper/dialogs.rb:491 +#: src/include/snapper/dialogs.rb:497 msgid "User Data" msgstr "用户数据" #. button label -#: src/include/snapper/dialogs.rb:497 +#: src/include/snapper/dialogs.rb:503 msgid "Show Changes" msgstr "显示修改" #. button label -#: src/include/snapper/dialogs.rb:500 +#: src/include/snapper/dialogs.rb:506 msgid "Modify" msgstr "修订" #. popup message -#: src/include/snapper/dialogs.rb:542 +#: src/include/snapper/dialogs.rb:549 msgid "" "This 'Pre' snapshot is not paired with any 'Post' one yet.\n" "Showing differences is not possible." @@ -156,131 +197,131 @@ "无法显示差异。" #. dialog caption -#: src/include/snapper/dialogs.rb:588 +#: src/include/snapper/dialogs.rb:634 msgid "Selected Snapshot Overview" msgstr "所选快照概览" #. '%1: %2' means 'ID: description', adapt the order if necessary -#: src/include/snapper/dialogs.rb:626 +#: src/include/snapper/dialogs.rb:666 msgid "%1: %2" msgstr "%1：%2" #. busy popup message -#: src/include/snapper/dialogs.rb:645 +#: src/include/snapper/dialogs.rb:685 msgid "Calculating changed files..." msgstr "正在计算有变化的文件..." #. busy popup message -#: src/include/snapper/dialogs.rb:742 +#: src/include/snapper/dialogs.rb:695 msgid "Calculating file modifications..." msgstr "正在计算文件修改..." #. label -#: src/include/snapper/dialogs.rb:750 +#: src/include/snapper/dialogs.rb:703 msgid "New file was created." msgstr "已创建新文件。" #. label -#: src/include/snapper/dialogs.rb:754 +#: src/include/snapper/dialogs.rb:707 msgid "File was removed." msgstr "已移除文件。" #. label -#: src/include/snapper/dialogs.rb:759 +#: src/include/snapper/dialogs.rb:712 msgid "File content was not changed." msgstr "未变动文件内容。" #. label -#: src/include/snapper/dialogs.rb:765 +#: src/include/snapper/dialogs.rb:718 msgid "File does not exist in either snapshot." msgstr "文件在任何快照中都不存在。" #. label -#: src/include/snapper/dialogs.rb:771 +#: src/include/snapper/dialogs.rb:724 msgid "File content was modified." msgstr "已修订文件内容。" #. text label, %1, %2 are file modes (like '-rw-r--r--') -#: src/include/snapper/dialogs.rb:781 +#: src/include/snapper/dialogs.rb:734 msgid "File mode was changed from '%1' to '%2'." msgstr "文件模式已从 '%1' 变为 '%2'。" #. text label, %1, %2 are user names -#: src/include/snapper/dialogs.rb:796 +#: src/include/snapper/dialogs.rb:749 msgid "File user ownership was changed from '%1' to '%2'." msgstr "文件用户所有权已从 '%1' 变为 '%2'。" #. text label, %1, %2 are group names -#: src/include/snapper/dialogs.rb:812 +#: src/include/snapper/dialogs.rb:765 msgid "File group ownership was changed from '%1' to '%2'." msgstr "文件组所有权已经从 '%1' 变为 '%2'。" #. button label -#: src/include/snapper/dialogs.rb:847 +#: src/include/snapper/dialogs.rb:782 msgid "R&estore from First" msgstr "从第一个快照恢复(&E)" #. button label -#: src/include/snapper/dialogs.rb:849 +#: src/include/snapper/dialogs.rb:784 msgid "Restore" msgstr "恢复" -#: src/include/snapper/dialogs.rb:872 +#: src/include/snapper/dialogs.rb:807 msgid "Res&tore from Second" msgstr "从第二个快照恢复(&T)" #. radio button label -#: src/include/snapper/dialogs.rb:909 +#: src/include/snapper/dialogs.rb:844 msgid "Show the difference between snapshot and current system" msgstr "显示快照和当前系统间的差异" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:921 +#: src/include/snapper/dialogs.rb:856 msgid "Show the difference between current and selected snapshot:" msgstr "显示当前系统和所选快照间的差异：" #. radio button label -#: src/include/snapper/dialogs.rb:968 +#: src/include/snapper/dialogs.rb:903 msgid "Show the difference between first and second snapshot" msgstr "显示第一个和第二个快照间的差异" #. radio button label -#: src/include/snapper/dialogs.rb:979 +#: src/include/snapper/dialogs.rb:914 msgid "Show the difference between first snapshot and current system" msgstr "显示第一个快照和当前系统间的差异" #. radio button label -#: src/include/snapper/dialogs.rb:990 +#: src/include/snapper/dialogs.rb:925 msgid "Show the difference between second snapshot and current system" msgstr "显示第二个快照和当前系统间的差异" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1031 +#: src/include/snapper/dialogs.rb:954 +msgid "Time of taking the snapshot:" +msgstr "快照耗时：" + +#. label, date string will follow at the end of line +#: src/include/snapper/dialogs.rb:962 msgid "Time of taking the first snapshot:" msgstr "第一个快照耗时：" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1036 +#: src/include/snapper/dialogs.rb:967 msgid "Time of taking the second snapshot:" msgstr "第二个快照耗时：" -#. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:1044 -msgid "Time of taking the snapshot:" -msgstr "快照耗时：" - #. button label -#: src/include/snapper/dialogs.rb:1066 +#: src/include/snapper/dialogs.rb:990 msgid "&Open" msgstr "打开(&O)" #. button label -#: src/include/snapper/dialogs.rb:1112 +#: src/include/snapper/dialogs.rb:1036 msgid "Restore Selected" msgstr "恢复所选内容" #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1186 +#: src/include/snapper/dialogs.rb:1121 msgid "" "Do you want to delete the file\n" "\n" @@ -296,7 +337,7 @@ #. yes/no question, %1 is file name, %2 is number #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224 +#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161 msgid "" "Do you want to copy the file\n" "\n" @@ -311,17 +352,19 @@ "到当前系统吗？" #. popup message -#: src/include/snapper/dialogs.rb:1259 -msgid "No file was selected for restoring" +#: src/include/snapper/dialogs.rb:1187 +#, fuzzy +#| msgid "No file was selected for restoring" +msgid "No file was selected for restoring." msgstr "未选择要恢复的文件" #. popup headline -#: src/include/snapper/dialogs.rb:1264 +#: src/include/snapper/dialogs.rb:1197 msgid "Restoring files" msgstr "正在恢复文件" #. popup message, %1 is snapshot number, %2 list of files -#: src/include/snapper/dialogs.rb:1267 +#: src/include/snapper/dialogs.rb:1200 msgid "" "<p>These files will be restored from snapshot '%1':</p>\n" "<p>\n" @@ -338,7 +381,7 @@ "<p>快照中不存在的文件将被删除。</p>您确定吗？" #. Read dialog help -#: src/include/snapper/helps.rb:36 +#: src/include/snapper/helps.rb:35 msgid "" "<p><b><big>Reading the list of snapshots</big></b><br>\n" "</p>\n" @@ -347,13 +390,21 @@ "</p>\n" #. Summary dialog help: -#: src/include/snapper/helps.rb:40 +#: src/include/snapper/helps.rb:39 +#, fuzzy +#| msgid "" +#| "<p><b><big>Snapshots Configuration</big></b><p>\n" +#| "<p>The table shows a list of root filesystem snapshots. There are three types\n" +#| "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n" +#| "used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n" +#| "<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n" +#| "new file system changes in the specified snapshot.</p>\n" msgid "" "<p><b><big>Snapshots Configuration</big></b><p>\n" "<p>The table shows a list of root filesystem snapshots. There are three types\n" "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n" -"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n" -"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n" +"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>\n" +"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n" "new file system changes in the specified snapshot.</p>\n" msgstr "" "<p><b><big>快照配置</big></b></p>\n" @@ -365,14 +416,23 @@ "<p>选择一个快照或快照对，点击<b>显示修改</b>来查看指定快照中新的文件系统修改。</p>\n" #. Show snapshot dialog help -#: src/include/snapper/helps.rb:49 +#: src/include/snapper/helps.rb:48 +#, fuzzy +#| msgid "" +#| "<p><b><big>Snapshot Overview</big></b><p>\n" +#| "<p>\n" +#| "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" +#| "</p>\n" +#| "<p>\n" +#| "When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n" +#| "</p>\n" msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" "</p>\n" "<p>\n" -"When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n" +"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n" "</p>\n" msgstr "" "<p><b><big>快照概览</big></b></p>\n" @@ -380,7 +440,7 @@ "<p>当选中该树形结构中的某个文件时，您可以看到其修改。默认显示了所选快照对之间的差异，但也可以比较该文件的不同版本。</p>\n" #. Show snapshot dialog help, alternative for single snapshots -#: src/include/snapper/helps.rb:59 +#: src/include/snapper/helps.rb:58 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" @@ -394,106 +454,106 @@ "<p>该树形结构显示了所选快照中与当前系统有所不同的全部文件。在右侧，您可以看到快照描述和其创建时间。</p>\n" "<p>当选中该树形结构中的某个文件时，您可以看到快照版本和当前系统的不同之处。</p>\n" -#. popup error -#: src/modules/Snapper.rb:91 -msgid "Snapshot '%1' was not found." -msgstr "未找到快照 '%1'。" +#. Return Tree of files modified between given snapshots +#. Map is recursively describing the filesystem structure; helps to build Tree widget contents +#: src/modules/Snapper.rb:108 +#, fuzzy +#| msgid "Failed to save ipsec.conf:" +msgid "Failed to get config:\n" +msgstr "未能保存 ipsec.conf：" -#. Initialize snapper agent -#. Return true on success -#. Delete existing snapshot -#. Return true on success -#. Modify existing snapshot -#. Return true on success -#. Create new snapshot -#. Return true on success -#: src/modules/Snapper.rb:236 src/modules/Snapper.rb:264 -#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303 -msgid "Reason not known." -msgstr "原因未知。" - -#: src/modules/Snapper.rb:238 -msgid "Configuration not found." -msgstr "未找到配置。" - -#: src/modules/Snapper.rb:240 -msgid "Configuration is not valid." -msgstr "配置无效。" - -#. error popup -#: src/modules/Snapper.rb:247 -msgid "" -"Failed to initialize snapper library:\n" -"%1" +#. Return the path to given snapshot +#: src/modules/Snapper.rb:129 +#, fuzzy +#| msgid "" +#| "Failed to delete snapshot:\n" +#| "%1" +msgid "Failed to get snapshot mount point:\n" msgstr "" -"初始化 Snapper 库失败：\n" +"删除快照失败：\n" "%1" -#: src/modules/Snapper.rb:266 -msgid "Snapshot was not found." -msgstr "未找到快照。" - -#. error popup -#: src/modules/Snapper.rb:271 -msgid "" -"Failed to delete snapshot:\n" -"%1" +#. Create new snapshot +#. Return true on success +#: src/modules/Snapper.rb:276 +#, fuzzy +#| msgid "" +#| "Failed to create new snapshot:\n" +#| "%1" +msgid "Failed to create new snapshot:\n" msgstr "" -"删除快照失败：\n" +"创建新快照失败：\n" "%1" -#. error popup -#: src/modules/Snapper.rb:289 -msgid "" -"Failed to modify snapshot:\n" -"%1" +#. Modify existing snapshot +#. Return true on success +#: src/modules/Snapper.rb:291 +#, fuzzy +#| msgid "" +#| "Failed to modify snapshot:\n" +#| "%1" +msgid "Failed to modify snapshot:\n" msgstr "" "修订快照失败：\n" "%1" +#. Delete existing snapshot +#. Return true on success #: src/modules/Snapper.rb:306 -msgid "Wrong snapshot type given." -msgstr "给定了错误的快照类型。" - -#: src/modules/Snapper.rb:308 -msgid "'Pre' snapshot was not given." -msgstr "未给定前期快照。" - -#: src/modules/Snapper.rb:310 -msgid "Given 'Pre' snapshot was not found." -msgstr "未找到给定的前期快照。" - -#. error popup -#: src/modules/Snapper.rb:316 -msgid "" -"Failed to create new snapshot:\n" -"%1" +#, fuzzy +#| msgid "" +#| "Failed to delete snapshot:\n" +#| "%1" +msgid "Failed to delete snapshot:\n" msgstr "" -"创建新快照失败：\n" +"删除快照失败：\n" "%1" #. Snapper read dialog caption -#: src/modules/Snapper.rb:326 +#: src/modules/Snapper.rb:319 msgid "Initializing Snapper" msgstr "正在初始化 Snapper" -#. Progress stage 1/3 -#: src/modules/Snapper.rb:337 -msgid "Read the list of snapshots" +#. Progress stage 1/2 +#: src/modules/Snapper.rb:324 +#, fuzzy +#| msgid "Read the configuration" +msgid "Read list of configurations" +msgstr "读取配置" + +#. Progress stage 2/2 +#: src/modules/Snapper.rb:326 +#, fuzzy +#| msgid "Read the list of snapshots" +msgid "Read list of snapshots" msgstr "读取快照列表" -#. Progress step 1/3 -#: src/modules/Snapper.rb:341 -msgid "Reading the database..." -msgstr "正在读取数据库..." +#. Progress step 1/2 +#: src/modules/Snapper.rb:330 +#, fuzzy +#| msgid "Reading the Configuration" +msgid "Reading list of configurations" +msgstr "正在读取配置" +#. Progress step 2/2 +#: src/modules/Snapper.rb:332 +#, fuzzy +#| msgid "Reading list of snapshots..." +msgid "Reading list of snapshots" +msgstr "正在读取快照列表..." + #. Progress finished -#: src/modules/Snapper.rb:343 +#: src/modules/Snapper.rb:334 msgid "Finished" msgstr "已完成" -#. error popup -#: src/modules/Snapper.rb:352 +#: src/modules/Snapper.rb:344 +#, fuzzy +#| msgid "Boot loader configuration failed." +msgid "Querying snapper configurations failed:" +msgstr "Boot Loader 配置失败。" + +#: src/modules/Snapper.rb:349 msgid "" "No snapper configurations exist. You have to create one or more\n" "configurations to use yast2-snapper. The snapper command line\n" @@ -503,20 +563,58 @@ "才能使用 yast2-snapper。可使用 snapper 命令\n" "行工具来创建配置。" +#: src/modules/Snapper.rb:359 +msgid "Querying snapper snapshots failed:" +msgstr "" + #. label for log window -#: src/modules/Snapper.rb:395 +#: src/modules/Snapper.rb:399 msgid "Restoring Files..." msgstr "正在恢复文件..." #. log entry (%1 is file name) -#: src/modules/Snapper.rb:424 +#: src/modules/Snapper.rb:428 msgid "Deleted %1\n" msgstr "已删除 %1\n" #. log entry (%1 is file name) -#: src/modules/Snapper.rb:477 +#: src/modules/Snapper.rb:481 msgid "%1 skipped\n" msgstr "已跳过 %1\n" +#~ msgid "Snapshot '%1' was not found." +#~ msgstr "未找到快照 '%1'。" + +#~ msgid "Reason not known." +#~ msgstr "原因未知。" + +#~ msgid "Configuration not found." +#~ msgstr "未找到配置。" + +#~ msgid "Configuration is not valid." +#~ msgstr "配置无效。" + +#~ msgid "" +#~ "Failed to initialize snapper library:\n" +#~ "%1" +#~ msgstr "" +#~ "初始化 Snapper 库失败：\n" +#~ "%1" + +#~ msgid "Snapshot was not found." +#~ msgstr "未找到快照。" + +#~ msgid "Wrong snapshot type given." +#~ msgstr "给定了错误的快照类型。" + +#~ msgid "'Pre' snapshot was not given." +#~ msgstr "未给定前期快照。" + +#~ msgid "Given 'Pre' snapshot was not found." +#~ msgstr "未找到给定的前期快照。" + +#~ msgid "Reading the database..." +#~ msgstr "正在读取数据库..." + #~ msgid "File /etc/sysconfig/snapper is not available." #~ msgstr "文件 /etc/sysconfig/snapper 不可用。" Modified: trunk/yast/zh_CN/po/sound.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/sound.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/sound.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2012-11-20 23:51+0800\n" "Last-Translator: \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/squid.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/squid.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/squid.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 11:37+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -150,7 +150,7 @@ msgid "When Booting" msgstr "引导时" -#: src/include/squid/complex.rb:69 src/modules/Squid.rb:1591 +#: src/include/squid/complex.rb:69 src/modules/Squid.rb:1590 msgid "Manually" msgstr "手动" @@ -321,7 +321,7 @@ msgid "Logging and Timeouts" msgstr "日志和超时" -#: src/include/squid/complex.rb:339 src/include/squid/dialogs.rb:370 +#: src/include/squid/complex.rb:339 src/include/squid/dialogs.rb:369 msgid "Miscellaneous Setting" msgstr "杂项设置" @@ -437,31 +437,27 @@ msgid "Cache &Store Log" msgstr "缓存存储日志(&S)" -#: src/include/squid/dialogs.rb:339 -msgid "&Emulate httpd Log?" -msgstr "模拟 httpd 日志？(&E)" - -#: src/include/squid/dialogs.rb:346 +#: src/include/squid/dialogs.rb:345 msgid "Timeouts" msgstr "超时" -#: src/include/squid/dialogs.rb:351 +#: src/include/squid/dialogs.rb:350 msgid "Connection &Timeout" msgstr "连接超时(&T)" -#: src/include/squid/dialogs.rb:359 +#: src/include/squid/dialogs.rb:358 msgid "Client &Lifetime" msgstr "客户端生命期(&L)" -#: src/include/squid/dialogs.rb:372 +#: src/include/squid/dialogs.rb:371 msgid "&Language of error messages" msgstr "错误信息语言(&L)" -#: src/include/squid/dialogs.rb:374 +#: src/include/squid/dialogs.rb:373 msgid "&Administrator's email" msgstr "管理员的电子邮件(&A)" -#: src/include/squid/dialogs.rb:376 +#: src/include/squid/dialogs.rb:375 msgid "&Use FTP Passive Mode" msgstr "使用 FTP 被动模式(&U)" @@ -957,28 +953,28 @@ #. ************* ACL END ************************ #. ******* LOGGING AND TIMEOUTS DIALOG ********** -#: src/include/squid/store_del.rb:581 +#: src/include/squid/store_del.rb:578 msgid "Access Log must not be empty." msgstr "访问日志不能为空。" -#: src/include/squid/store_del.rb:591 +#: src/include/squid/store_del.rb:588 msgid "Cache Log must not be empty." msgstr "缓存日志不能为空。" -#: src/include/squid/store_del.rb:602 +#: src/include/squid/store_del.rb:599 msgid "Incorrect pathname in Access Log field." msgstr "错误的访问日志路径名" -#: src/include/squid/store_del.rb:613 +#: src/include/squid/store_del.rb:610 msgid "Incorrect pathname in Cache Log field." msgstr "错误的缓存日志路径名。" -#: src/include/squid/store_del.rb:624 +#: src/include/squid/store_del.rb:621 msgid "Incorrect pathname in Cache Store Log field." msgstr "错误的缓存存储日志路径名。" #. ******* LOGGING AND TIMEOUTS DIALOG END ****** -#: src/include/squid/store_del.rb:691 +#: src/include/squid/store_del.rb:684 msgid "Administrator's email must not contain any white spaces." msgstr "管理员电子邮件地址不能包含任何空格。" @@ -994,149 +990,149 @@ #. Read all squid settings #. @return true on success -#: src/modules/Squid.rb:1089 +#: src/modules/Squid.rb:1088 msgid "Initializing Squid Configuration" msgstr "正在初始化 squid 配置" -#: src/modules/Squid.rb:1093 +#: src/modules/Squid.rb:1092 msgid "Read HTTP Ports from Config File." msgstr "从配置文件中读取 HTTP 端口。" -#: src/modules/Squid.rb:1094 +#: src/modules/Squid.rb:1093 msgid "Read Refresh Patterns from Config File." msgstr "从配置文件中读取刷新模式。" -#: src/modules/Squid.rb:1095 +#: src/modules/Squid.rb:1094 msgid "Read ACL Groups from Config File." msgstr "从配置文件中读取访问控制列表组。" -#: src/modules/Squid.rb:1096 +#: src/modules/Squid.rb:1095 msgid "Read Access Control Table from Config File." msgstr "从配置文件中读取访问控制表。" -#: src/modules/Squid.rb:1097 +#: src/modules/Squid.rb:1096 msgid "Read Other Settings." msgstr "读取其他设置。" -#: src/modules/Squid.rb:1098 +#: src/modules/Squid.rb:1097 msgid "Read Service Status." msgstr "读取服务状态。" -#: src/modules/Squid.rb:1099 +#: src/modules/Squid.rb:1098 msgid "Read Firewall Settings." msgstr "读取防火墙设置。" -#: src/modules/Squid.rb:1102 +#: src/modules/Squid.rb:1101 msgid "Reading HTTP Ports ..." msgstr "正在读取 HTTP 端口..." -#: src/modules/Squid.rb:1103 +#: src/modules/Squid.rb:1102 msgid "Reading Refresh Patterns ..." msgstr "正在读取刷新模式..." -#: src/modules/Squid.rb:1104 +#: src/modules/Squid.rb:1103 msgid "Reading ACL Groups ..." msgstr "正在读取访问控制列表组..." -#: src/modules/Squid.rb:1105 +#: src/modules/Squid.rb:1104 msgid "Reading Access Control Table ..." msgstr "正在读取访问控制表..." -#: src/modules/Squid.rb:1106 +#: src/modules/Squid.rb:1105 msgid "Reading Other Settings ..." msgstr "正在读取其他设置..." -#: src/modules/Squid.rb:1107 +#: src/modules/Squid.rb:1106 msgid "Reading Service Status ..." msgstr "正在读取服务状态..." -#: src/modules/Squid.rb:1108 +#: src/modules/Squid.rb:1107 msgid "Reading Firewall Settings ..." msgstr "正在读取防火墙设置..." -#: src/modules/Squid.rb:1118 +#: src/modules/Squid.rb:1117 msgid "Cannot read configuration file." msgstr "无法读取配置文件。" -#: src/modules/Squid.rb:1123 +#: src/modules/Squid.rb:1122 msgid "Cannot read service status." msgstr "无法读取服务状态。" #. We do not set help text here, because it was set outside -#: src/modules/Squid.rb:1466 +#: src/modules/Squid.rb:1465 msgid "Saving Squid Configuration" msgstr "正在保存 Squid 配置" #. Progress stage 1/2 -#: src/modules/Squid.rb:1471 +#: src/modules/Squid.rb:1470 msgid "Write the settings" msgstr "写入设置" #. Progress stage 1/2 -#: src/modules/Squid.rb:1473 +#: src/modules/Squid.rb:1472 msgid "Write firewall settings" msgstr "写入防火墙设置" #. Progress stage 2/2 -#: src/modules/Squid.rb:1475 +#: src/modules/Squid.rb:1474 msgid "Start Service" msgstr "启动服务" #. Progress step 1/2 -#: src/modules/Squid.rb:1479 +#: src/modules/Squid.rb:1478 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 1/2 -#: src/modules/Squid.rb:1481 +#: src/modules/Squid.rb:1480 msgid "Writing firewall settings..." msgstr "正在写入防火墙设置..." #. Progress step 2/2 -#: src/modules/Squid.rb:1483 +#: src/modules/Squid.rb:1482 msgid "Starting Service..." msgstr "正在启动服务..." #. Progress finished -#: src/modules/Squid.rb:1485 +#: src/modules/Squid.rb:1484 msgid "Finished" msgstr "已完成" #. write settings -#: src/modules/Squid.rb:1495 +#: src/modules/Squid.rb:1494 msgid "Cannot write settings." msgstr "无法写入设置。" #. firewall -#: src/modules/Squid.rb:1501 +#: src/modules/Squid.rb:1500 msgid "Cannot write firewall settings." msgstr "无法写入防火墙设置。" #. Header -#: src/modules/Squid.rb:1585 +#: src/modules/Squid.rb:1584 msgid "Squid Cache Proxy" msgstr "Squid 缓存代理" #. Start daemon -#: src/modules/Squid.rb:1590 +#: src/modules/Squid.rb:1589 msgid "Start daemon: " msgstr "启动守护精灵：" -#: src/modules/Squid.rb:1591 +#: src/modules/Squid.rb:1590 msgid "When booting" msgstr "引导时" #. Http Ports -#: src/modules/Squid.rb:1595 +#: src/modules/Squid.rb:1594 msgid "Configured ports:" msgstr "已配置的端口：" -#: src/modules/Squid.rb:1612 +#: src/modules/Squid.rb:1611 msgid " (transparent)" msgstr " (透明)" #. Cache directory -#: src/modules/Squid.rb:1626 +#: src/modules/Squid.rb:1625 msgid "Cache directory: " msgstr "缓存目录：" @@ -1571,6 +1567,9 @@ msgid "Traditional Chinese" msgstr "繁体中文" +#~ msgid "&Emulate httpd Log?" +#~ msgstr "模拟 httpd 日志？(&E)" + #~ msgid "Russian-koi8-r" #~ msgstr "俄语-koi8-r" Modified: trunk/yast/zh_CN/po/sshd.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/sshd.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/sshd.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-04-16 09:52+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/storage.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/storage.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:21+0100\n" +"POT-Creation-Date: 2015-08-27 10:53+0200\n" "PO-Revision-Date: 2014-10-30 17:20+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -45,7 +45,7 @@ #. dialog heading #. dialog caption -#: src/clients/disk.rb:67 src/include/partitioning/ep-main.rb:67 +#: src/clients/disk.rb:67 src/include/partitioning/ep-main.rb:68 msgid "Expert Partitioner" msgstr "专家分区程序" @@ -936,7 +936,7 @@ #. Label text #. TRANSLATORS: checkbox text #: src/include/partitioning/auto_part_ui.rb:341 -#: src/modules/StorageProposal.rb:6230 +#: src/modules/StorageProposal.rb:6245 msgid "Propose Separate &Home Partition" msgstr "创建使用独立主分区的提案(&H)" @@ -1046,10 +1046,17 @@ #. /////////////////////////// NO BOOT /////////////////////////// #: src/include/partitioning/custom_part_check_generated.rb:338 +#, fuzzy +#| msgid "" +#| "Warning: There is no partition of type bios_grub present.\n" +#| "To boot from a GPT disk using grub2 such a partition is needed.\n" +#| "\n" +#| "Really use this setup?\n" msgid "" "Warning: There is no partition of type bios_grub present.\n" -"To boot from a GPT disk using grub2 such a partition is needed.\n" -"\n" +"Such a partition is recommended (required with Btrfs) when Grub2 is\n" +"installed in the MBR of a GPT disk. It must be unformatted and\n" +"approximately 1MB large.\n" "Really use this setup?\n" msgstr "" "警告：目前没有分区类型 bios_grub。\n" @@ -1060,7 +1067,7 @@ #. 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:358 +#: src/include/partitioning/custom_part_check_generated.rb:360 msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" @@ -1078,7 +1085,7 @@ "真的使用没有 /boot 分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:378 +#: src/include/partitioning/custom_part_check_generated.rb:380 msgid "" "Warning: According to your setup, you intend to\n" "boot your machine from the root partition (/), which, unfortunately,\n" @@ -1096,7 +1103,7 @@ "\n" "真的使用此设置吗？\n" -#: src/include/partitioning/custom_part_check_generated.rb:398 +#: src/include/partitioning/custom_part_check_generated.rb:400 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1108,7 +1115,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:415 +#: src/include/partitioning/custom_part_check_generated.rb:417 msgid "" "Warning: With your current setup, your %1\n" "installation might not be directly bootable, because\n" @@ -1124,7 +1131,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 %2 installation\n" "will encounter problems when booting, because you have no\n" @@ -1147,7 +1154,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:455 +#: src/include/partitioning/custom_part_check_generated.rb:457 msgid "" "Warning: With your current setup, your %2 installation will\n" "encounter problems when booting, because you have no \n" @@ -1170,12 +1177,12 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:478 +#: src/include/partitioning/custom_part_check_generated.rb:480 msgid "Really use this setup?" msgstr "真的使用此设置吗？" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:486 +#: src/include/partitioning/custom_part_check_generated.rb:488 msgid "" "\n" "You have not assigned a swap partition. In most cases, we highly recommend \n" @@ -1195,7 +1202,7 @@ "真的使用没有交换分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:502 +#: src/include/partitioning/custom_part_check_generated.rb:504 msgid "" "\n" "You chose to install onto an existing partition that will not be\n" @@ -1208,7 +1215,7 @@ "尤其是在下列情景下：\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:509 +#: src/include/partitioning/custom_part_check_generated.rb:511 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1220,7 +1227,7 @@ "- 若这个分区尚未包含一个文件系统\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:516 +#: src/include/partitioning/custom_part_check_generated.rb:518 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" @@ -1230,7 +1237,7 @@ "一个像 /, /boot, /opt 或 /var 这样的标准挂载点时。\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:522 +#: src/include/partitioning/custom_part_check_generated.rb:524 msgid "" "If you decide to format the partition, all data on it will be lost.\n" "\n" @@ -1241,7 +1248,7 @@ "真的不格式化分区吗？\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:577 +#: src/include/partitioning/custom_part_check_generated.rb:579 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1250,7 +1257,7 @@ "编辑该设备前请先从该 RAID 将其移除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:588 +#: src/include/partitioning/custom_part_check_generated.rb:590 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1259,7 +1266,7 @@ "编辑该设备前请先从该卷组将其移除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:598 +#: src/include/partitioning/custom_part_check_generated.rb:600 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1268,7 +1275,7 @@ "编辑前请先移除该卷。\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:631 +#: src/include/partitioning/custom_part_check_generated.rb:633 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1277,7 +1284,7 @@ "删除该设备前请先从该 RAID 将其移除。\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:642 +#: src/include/partitioning/custom_part_check_generated.rb:644 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1285,19 +1292,19 @@ "设备 (%2) 正被 %1 使用。\n" "删除该设备前请先移除 %1。\n" -#: src/include/partitioning/custom_part_check_generated.rb:654 +#: src/include/partitioning/custom_part_check_generated.rb:656 msgid "It cannot be deleted while mounted." msgstr "无法在挂载时删除分区。" #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:690 +#: src/include/partitioning/custom_part_check_generated.rb:692 msgid "" "The device (%1) cannot be removed since it is a logical partition and \n" "another logical partition with a higher number is in use.\n" msgstr "无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使用中。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:766 +#: src/include/partitioning/custom_part_check_generated.rb:768 msgid "" "The selected extended partition contains partitions which are currently mounted:\n" "%1\n" @@ -1310,7 +1317,7 @@ "除非您完全明白您在做什么，否则请选择\"取消\"。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:784 +#: src/include/partitioning/custom_part_check_generated.rb:786 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1323,7 +1330,7 @@ "删除该扩展分区前请先从相关卷组中移除全部位于它上面的分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:795 +#: src/include/partitioning/custom_part_check_generated.rb:797 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1336,7 +1343,7 @@ "删除该扩展分区前请先从相关 RAID 系统中取消指派位于它上面的分区。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:806 +#: src/include/partitioning/custom_part_check_generated.rb:808 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1355,7 +1362,7 @@ #. label text #: src/include/partitioning/custom_part_dialogs.rb:75 #: src/include/partitioning/ep-dialogs.rb:768 -#: src/modules/StorageProposal.rb:6357 +#: src/modules/StorageProposal.rb:6372 msgid "Do not forget what you enter here!" msgstr "求别忘您在这儿输入的东东！" @@ -1398,7 +1405,7 @@ #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters #: src/include/partitioning/custom_part_dialogs.rb:148 -#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:3998 +#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001 msgid "Reenter the Password for &Verification:" msgstr "劳驾再输一遍密码以便确认(&V)：" @@ -1420,7 +1427,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:197 -#: src/modules/Storage.rb:3954 +#: src/modules/Storage.rb:3957 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1431,7 +1438,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:204 -#: src/modules/Storage.rb:3962 +#: src/modules/Storage.rb:3965 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -1783,7 +1790,7 @@ #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text #: src/include/partitioning/custom_part_dialogs.rb:1596 -#: src/modules/StorageProposal.rb:6211 +#: src/modules/StorageProposal.rb:6226 msgid "Enable Snapshots" msgstr "启用快照" @@ -2918,7 +2925,7 @@ msgstr "设备映射器设备：%1" #. encoding: utf-8 -#. Copyright (c) 2012 Novell, Inc. +#. Copyright (c) [2012-2015] Novell, Inc. #. #. All Rights Reserved. #. @@ -2936,16 +2943,16 @@ #. #. To contact Novell about this file by physical or electronic mail, you may #. find current contact information at www.novell.com. -#. File: ep-main.ycp +#. File: ep-graph.rb #. Package: yast2-storage #. Summary: Expert Partitioner #. Authors: Arvin Schnell -#: src/include/partitioning/ep-graph.rb:38 +#: src/include/partitioning/ep-graph.rb:39 msgid "Add RAID" msgstr "添加 RAID" #. dialog title -#: src/include/partitioning/ep-graph.rb:43 +#: src/include/partitioning/ep-graph.rb:44 #: src/include/partitioning/ep-lvm-dialogs.rb:475 msgid "Add Volume Group" msgstr "添加卷组" @@ -2953,43 +2960,43 @@ #. dialog heading, graph is the mathematic term for #. a set of notes connected with edges #. tree node label -#: src/include/partitioning/ep-graph.rb:69 -#: src/include/partitioning/ep-main.rb:457 +#: src/include/partitioning/ep-graph.rb:70 +#: src/include/partitioning/ep-main.rb:453 msgid "Device Graph" msgstr "设备图表" #. button text -#: src/include/partitioning/ep-graph.rb:79 +#: src/include/partitioning/ep-graph.rb:74 msgid "Save Device Graph..." msgstr "保存设备图表..." #. helptext -#: src/include/partitioning/ep-graph.rb:89 +#: src/include/partitioning/ep-graph.rb:84 msgid "<p>This view shows a graph of devices.</p>" msgstr "<p>该视图显示了设备图表。</p>" #. error popup #. error popup -#: src/include/partitioning/ep-graph.rb:145 -#: src/include/partitioning/ep-graph.rb:225 +#: src/include/partitioning/ep-graph.rb:140 +#: src/include/partitioning/ep-graph.rb:214 msgid "Saving graph file failed." msgstr "保存图表文件失败。" #. dialog heading, graph is the mathematic term for #. a set of notes connected with edges #. tree node label -#: src/include/partitioning/ep-graph.rb:164 -#: src/include/partitioning/ep-main.rb:467 +#: src/include/partitioning/ep-graph.rb:159 +#: src/include/partitioning/ep-main.rb:459 msgid "Mount Graph" msgstr "挂载点图表" #. button text -#: src/include/partitioning/ep-graph.rb:174 +#: src/include/partitioning/ep-graph.rb:163 msgid "Save Mount Graph..." msgstr "保存挂载点图表..." #. helptext -#: src/include/partitioning/ep-graph.rb:184 +#: src/include/partitioning/ep-graph.rb:173 msgid "<p>This view shows a graph of mount points.</p>" msgstr "<p>该视图显示了挂载点图表。</p>" @@ -3109,7 +3116,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5165 +#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211 msgid "The disk is in use and cannot be modified." msgstr "磁盘使用中，无法修改。" @@ -3337,7 +3344,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-hd.rb:210 -#: src/include/partitioning/ep-main.rb:382 +#: src/include/partitioning/ep-main.rb:380 msgid "Hard Disks" msgstr "硬盘" @@ -3586,7 +3593,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-log.rb:43 -#: src/include/partitioning/ep-main.rb:503 +#: src/include/partitioning/ep-main.rb:493 msgid "Log" msgstr "日志" @@ -3747,7 +3754,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-loop.rb:103 -#: src/include/partitioning/ep-main.rb:406 +#: src/include/partitioning/ep-main.rb:404 msgid "Crypt Files" msgstr "加密文件" @@ -4116,7 +4123,7 @@ #. heading #. tree node label #: src/include/partitioning/ep-lvm.rb:204 -#: src/include/partitioning/ep-main.rb:398 +#: src/include/partitioning/ep-main.rb:396 msgid "Volume Management" msgstr "卷管理" @@ -4177,54 +4184,54 @@ #. tree node label #. heading -#: src/include/partitioning/ep-main.rb:390 +#: src/include/partitioning/ep-main.rb:388 #: src/include/partitioning/ep-raid.rb:123 msgid "RAID" msgstr "独立磁盘冗余阵列 (RAID)" #. tree node label -#: src/include/partitioning/ep-main.rb:414 +#: src/include/partitioning/ep-main.rb:412 msgid "Device Mapper" msgstr "设备映射器" #. tree node label -#: src/include/partitioning/ep-main.rb:422 +#: src/include/partitioning/ep-main.rb:420 msgid "NFS" msgstr "网络文件系统 (NFS)" #. tree node label -#: src/include/partitioning/ep-main.rb:429 +#: src/include/partitioning/ep-main.rb:427 msgid "Btrfs" msgstr "Btrfs" #. tree node label -#: src/include/partitioning/ep-main.rb:436 +#: src/include/partitioning/ep-main.rb:434 msgid "tmpfs" msgstr "缓存文件系统" #. tree node label #. heading -#: src/include/partitioning/ep-main.rb:443 +#: src/include/partitioning/ep-main.rb:441 #: src/include/partitioning/ep-unused.rb:87 msgid "Unused Devices" msgstr "未使用的设备" #. tree node label #. dialog heading -#: src/include/partitioning/ep-main.rb:480 +#: src/include/partitioning/ep-main.rb:470 #: src/include/partitioning/ep-summary.rb:41 msgid "Installation Summary" msgstr "安装摘要" #. tree node label #. dialog heading -#: src/include/partitioning/ep-main.rb:491 +#: src/include/partitioning/ep-main.rb:481 #: src/include/partitioning/ep-settings.rb:130 msgid "Settings" msgstr "设置" #. popup text, %1 will be replaces with button text -#: src/include/partitioning/ep-main.rb:576 +#: src/include/partitioning/ep-main.rb:566 msgid "" "You have changed the partitioning or storage settings. These changes\n" "will be lost if you exit the partitioner with %1.\n" @@ -4235,17 +4242,17 @@ "真的退出吗？" #. helptext -#: src/include/partitioning/ep-main.rb:590 +#: src/include/partitioning/ep-main.rb:580 msgid "<p>Here you can see the partitioning summary.</p>" msgstr "<p>这里您可以看到分区摘要。</p>" #. Fullscreen summary of changes -#: src/include/partitioning/ep-main.rb:602 +#: src/include/partitioning/ep-main.rb:592 msgid ": Summary" msgstr "：概要" #. tree node label -#: src/include/partitioning/ep-main.rb:677 +#: src/include/partitioning/ep-main.rb:667 msgid "System View" msgstr "系统视图" @@ -5643,7 +5650,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:976 +#: src/modules/Storage.rb:991 msgid "Resize Not Possible:" msgstr "无法调整尺寸：" @@ -5656,7 +5663,7 @@ #. mark swap-partitions with pseudo Mountpoint swap in targetMap #. @param [Hash{String => map}] target Disk map #. @return [Hash{String => map}] modified target -#: src/modules/Storage.rb:2706 src/modules/Storage.rb:3911 +#: src/modules/Storage.rb:2691 src/modules/Storage.rb:3914 msgid "" "Could not set encryption.\n" "System error code is %1.\n" @@ -5669,7 +5676,7 @@ "提供的加密密码可能有误。\n" #. popup text -#: src/modules/Storage.rb:3942 +#: src/modules/Storage.rb:3945 msgid "" "The first and the second version\n" "of the password do not match.\n" @@ -5680,7 +5687,7 @@ "请重试。" #. popup text -#: src/modules/Storage.rb:3973 +#: src/modules/Storage.rb:3976 msgid "" "The password may only contain the following characters:\n" "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n" @@ -5692,24 +5699,24 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4027 +#: src/modules/Storage.rb:4030 msgid "&Enter Encryption Password:" msgstr "输入加密密码 (&E)：" #. Clear password fields on every round. -#: src/modules/Storage.rb:4086 +#: src/modules/Storage.rb:4089 msgid "Provide Password" msgstr "输入密码" -#: src/modules/Storage.rb:4105 +#: src/modules/Storage.rb:4108 msgid "The following encrypted volumes are already available." msgstr "如下加密卷已可用。" -#: src/modules/Storage.rb:4120 +#: src/modules/Storage.rb:4123 msgid "Encrypted Volume Activation" msgstr "激活加密卷" -#: src/modules/Storage.rb:4124 +#: src/modules/Storage.rb:4127 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -5720,12 +5727,12 @@ "如果更新时需要这些卷或卷中包含加密的 LVM 物理卷，\n" "那您必须提供这些密码。" -#: src/modules/Storage.rb:4136 +#: src/modules/Storage.rb:4139 msgid "Do you want to provide encryption passwords?" msgstr "您想要提供加密密码吗？" #. text in help field -#: src/modules/Storage.rb:4193 +#: src/modules/Storage.rb:4196 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -5735,58 +5742,58 @@ "密码将在所有设备上尝试。" #. header text -#: src/modules/Storage.rb:4199 +#: src/modules/Storage.rb:4202 msgid "Enter Encryption Password" msgstr "输入加密密码" -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4205 msgid "There are no encrypted volume to unlock." msgstr "没有加密卷可供解锁。" #. label text, multiple device names follow -#: src/modules/Storage.rb:4215 +#: src/modules/Storage.rb:4218 msgid "Provide password for any of the following devices:" msgstr "如果任一如下设备的密码：" #. label text, one device name follows -#: src/modules/Storage.rb:4218 +#: src/modules/Storage.rb:4221 msgid "Provide password for the following device:" msgstr "提供如下设备的密码：" -#: src/modules/Storage.rb:4231 +#: src/modules/Storage.rb:4234 msgid "Trying to unlock encrypted volumes..." msgstr "尝试解锁加密卷..." -#: src/modules/Storage.rb:4255 +#: src/modules/Storage.rb:4258 msgid "Password did not unlock any volume." msgstr "密码没能解锁任何卷。" -#: src/modules/Storage.rb:4341 +#: src/modules/Storage.rb:4344 msgid "IDE Disk" msgstr "集成驱动电子设备 (IDE) 磁盘" -#: src/modules/Storage.rb:4347 +#: src/modules/Storage.rb:4350 msgid "SCSI Disk" msgstr "小型计算机系统接口 (SCSI) 磁盘" -#: src/modules/Storage.rb:4353 +#: src/modules/Storage.rb:4356 msgid "Disk" msgstr "磁盘" -#: src/modules/Storage.rb:4381 +#: src/modules/Storage.rb:4384 msgid "DM RAID" msgstr "设备映射器独立磁盘冗余阵列 (DM RAID)" -#: src/modules/Storage.rb:4394 +#: src/modules/Storage.rb:4397 msgid "MD RAID" msgstr "多设备独立磁盘冗余阵列 (MD RAID)" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5177 +#: src/modules/Storage.rb:5223 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区因为磁盘上的其它分区正在使用中。" -#: src/modules/Storage.rb:5203 +#: src/modules/Storage.rb:5249 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -5795,7 +5802,7 @@ "\n" "无法修改设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5217 +#: src/modules/Storage.rb:5263 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -5804,7 +5811,7 @@ "\n" "无法修改设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5246 +#: src/modules/Storage.rb:5292 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -5813,7 +5820,7 @@ "\n" "无法移除设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5255 +#: src/modules/Storage.rb:5301 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -5822,7 +5829,7 @@ "\n" "无法移除设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5284 +#: src/modules/Storage.rb:5330 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5832,7 +5839,7 @@ "\n" "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5295 +#: src/modules/Storage.rb:5341 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5842,7 +5849,7 @@ "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有执行安装所需的数据。\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5317 +#: src/modules/Storage.rb:5363 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -5852,18 +5859,18 @@ "无法移除分区 %1 因为磁盘 %2 上的其它分区已经被用掉了。\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5406 +#: src/modules/Storage.rb:5452 msgid "Nothing assigned as root filesystem!" msgstr "未指派根文件系统！" -#: src/modules/Storage.rb:5407 +#: src/modules/Storage.rb:5453 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:6009 +#: src/modules/Storage.rb:6003 msgid "Adding the following resolvables failed: %1" msgstr "添加以下解析项失败：%1" @@ -6469,41 +6476,41 @@ #. enable snapshots for root volume if desired #. penalty for not having separate /home -#: src/modules/StorageProposal.rb:4552 src/modules/StorageProposal.rb:5675 +#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows." msgstr "由于文件系统不一致，无法调整尺寸。请试试在 Windows 下检查文件系统。" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6164 +#: src/modules/StorageProposal.rb:6179 msgid "Create &LVM-based Proposal" msgstr "创建基于 &LVM 的提案" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6179 +#: src/modules/StorageProposal.rb:6194 msgid "Encr&ypt Volume Group" msgstr "加密卷组 (&y)" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6197 +#: src/modules/StorageProposal.rb:6212 msgid "File System for Root Partition" msgstr "根分区文件系统" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6244 +#: src/modules/StorageProposal.rb:6259 msgid "File System for Home Partition" msgstr "主分区文件系统" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6262 +#: src/modules/StorageProposal.rb:6277 msgid "Enlarge &Swap for Suspend" msgstr "增大 &Swap 用于挂起" -#: src/modules/StorageProposal.rb:6272 +#: src/modules/StorageProposal.rb:6287 msgid "Proposal Settings" msgstr "提案设置" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6287 +#: src/modules/StorageProposal.rb:6302 msgid "" "<p>To create an LVM-based proposal, choose the corresponding button. The\n" "LVM-based proposal can be encrypted.</p>\n" @@ -6512,7 +6519,7 @@ "基于 LVM 的提案可应用加密。</p>\n" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6294 +#: src/modules/StorageProposal.rb:6309 msgid "" "<p>The filesystem for the root partition can be selected with the\n" "corresponding combo box. With the filesystem BtrFS the proposal can\n" @@ -6524,32 +6531,32 @@ "这也将增加根分区的大小。</p>" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6303 +#: src/modules/StorageProposal.rb:6318 msgid "" "<p>The proposal can create a separate home partition. The filesystem for\n" "the home partition can be selected with the corresponding combo box.</p>" msgstr "<p>该提案可创建一个独立 home 分区。可使用相应复选框选择 home 分区的文件系统。</p>" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6310 +#: src/modules/StorageProposal.rb:6325 msgid "" "<p>The swap partition can be made large enough to be used to suspend\n" "the system to disk in most cases.</p>" msgstr "<p>多数时候 swap 分区可分大一些以用于将系统挂起到硬盘。</p>" -#: src/modules/StorageProposal.rb:6335 +#: src/modules/StorageProposal.rb:6350 msgid "Enter your password for the proposal encryption." msgstr "请输入您的密码以在提案中应用加密。" #. Label: get password for user root #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6342 +#: src/modules/StorageProposal.rb:6357 msgid "Password:" msgstr "密码：" #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6353 +#: src/modules/StorageProposal.rb:6368 msgid "Reenter the password for verification:" msgstr "请再次确认密码：" Modified: trunk/yast/zh_CN/po/sudo.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/sudo.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/sudo.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: sudo\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-04 16:40+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/support.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/support.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/support.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 11:00+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -30,52 +30,52 @@ msgstr "支持(&S)" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:46 +#: src/include/support/dialogs.rb:50 msgid "Supportconfig Overview Dialog" msgstr "Supportconfig 概览对话框" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:53 +#: src/include/support/dialogs.rb:57 msgid "Open SUSE Support Center" msgstr "打开 SUSE 支持中心" -#: src/include/support/dialogs.rb:58 +#: src/include/support/dialogs.rb:62 msgid "This will start a browser connecting to the SUSE Support Center Portal." msgstr "这将启动浏览器并连接至 SUSE 支持中心门户。" -#: src/include/support/dialogs.rb:68 +#: src/include/support/dialogs.rb:72 msgid "Open" msgstr "打开" -#: src/include/support/dialogs.rb:79 +#: src/include/support/dialogs.rb:83 msgid "Collect Data" msgstr "搜集数据" -#: src/include/support/dialogs.rb:84 +#: src/include/support/dialogs.rb:88 msgid "This will create a tarball containing the collected log files." msgstr "这将创建一个囊括了所搜集的日志文件的压缩包。" -#: src/include/support/dialogs.rb:96 +#: src/include/support/dialogs.rb:100 msgid "Create report tarball" msgstr "创建报告压缩包" -#: src/include/support/dialogs.rb:108 +#: src/include/support/dialogs.rb:112 msgid "Upload Data" msgstr "上传数据" -#: src/include/support/dialogs.rb:112 +#: src/include/support/dialogs.rb:116 msgid "This will upload the collected logs to the specified URL." msgstr "这将上传所搜集的日志到指定 URL。" -#: src/include/support/dialogs.rb:119 +#: src/include/support/dialogs.rb:123 msgid "Upload" msgstr "上传" -#: src/include/support/dialogs.rb:149 +#: src/include/support/dialogs.rb:153 msgid "Could not find any installed browser." msgstr "无法找到任何已安装的浏览器。" -#: src/include/support/dialogs.rb:159 +#: src/include/support/dialogs.rb:163 msgid "" "YaST will run a Web browser as superuser. Consider\n" "running it as a non-provileged user and entering the URL\n" @@ -87,183 +87,184 @@ "%1。\n" "启动网页浏览器吗？\n" -#: src/include/support/dialogs.rb:201 +#: src/include/support/dialogs.rb:205 msgid "Supportconfig Upload Dialog" msgstr "Supportconfig 上传对话框" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:226 +#: src/include/support/dialogs.rb:230 msgid "Save as" msgstr "另存为" -#: src/include/support/dialogs.rb:229 +#: src/include/support/dialogs.rb:233 msgid "Directory to Save" msgstr "要保存到的文件夹" -#: src/include/support/dialogs.rb:239 +#: src/include/support/dialogs.rb:243 msgid "Package with log files" msgstr "日志文件压缩包" -#: src/include/support/dialogs.rb:253 +#: src/include/support/dialogs.rb:257 msgid "Upload log files tarball to URL" msgstr "上传日志文件压缩包到 URL" -#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756 +#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760 msgid "Upload Target" msgstr "上传目的地" #. } -#: src/include/support/dialogs.rb:327 +#: src/include/support/dialogs.rb:331 msgid "Cannot write settings" msgstr "无法写入设置" -#: src/include/support/dialogs.rb:343 +#: src/include/support/dialogs.rb:347 msgid "Cannot write settings." msgstr "无法写入设置。" -#: src/include/support/dialogs.rb:389 +#: src/include/support/dialogs.rb:393 msgid "Choose Directory Where to Save Tarball" msgstr "请选择要保存压缩包的文件夹" #. Support::log_files["tmp_dir"]=save_dir; -#: src/include/support/dialogs.rb:401 +#: src/include/support/dialogs.rb:405 msgid "Choose Log Files Tarball File" msgstr "请选择日志文件压缩包文件" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:421 +#: src/include/support/dialogs.rb:425 msgid "Supportconfig Parameters Configuration" msgstr "Supportconfig 参数配置" -#: src/include/support/dialogs.rb:426 +#: src/include/support/dialogs.rb:430 msgid "Create a full file listing from '/'" msgstr "创建一个从 '/' 开始的完整文件列表" -#: src/include/support/dialogs.rb:431 +#: src/include/support/dialogs.rb:435 msgid "Exclude detailed disk info and scans" msgstr "排除详细磁盘信息和扫描" -#: src/include/support/dialogs.rb:436 +#: src/include/support/dialogs.rb:440 msgid "Search root filesystem for eDirectory instances" msgstr "在根文件系统中搜索 eDirectory 实例" -#: src/include/support/dialogs.rb:441 +#: src/include/support/dialogs.rb:445 msgid "Include full SLP service lists" msgstr "包含完整的 SLP 服务列表" -#: src/include/support/dialogs.rb:446 +#: src/include/support/dialogs.rb:450 msgid "Performs an rpm -V for each installed rpm" msgstr "为每个已安装的 rpm 执行一次 rpm -V" -#: src/include/support/dialogs.rb:451 +#: src/include/support/dialogs.rb:455 msgid "Include all log file lines, gather additional rotated logs" msgstr "包含全部日志文件行，搜集额外的拆分开的日志" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:465 +#: src/include/support/dialogs.rb:469 msgid "Use Defaults (ignore /etc/supportconfig.conf)" msgstr "使用默认 (忽略 /etc/supportconfig.conf)" -#: src/include/support/dialogs.rb:472 +#: src/include/support/dialogs.rb:476 msgid "Activates all support functions" msgstr "激活全部支持功能" -#: src/include/support/dialogs.rb:479 +#: src/include/support/dialogs.rb:483 msgid "Only gather a minimum amount of info" msgstr "仅搜集最少量信息" -#: src/include/support/dialogs.rb:487 +#: src/include/support/dialogs.rb:491 msgid "Use Custom (Expert) Settings" msgstr "使用自定义 (专家) 设置" -#: src/include/support/dialogs.rb:489 +#: src/include/support/dialogs.rb:493 msgid "Expert Settings" msgstr "专家设置" -#: src/include/support/dialogs.rb:495 +#: src/include/support/dialogs.rb:499 msgid "Options" msgstr "选项" #. Support overview dialog caption -#: src/include/support/dialogs.rb:584 +#: src/include/support/dialogs.rb:588 msgid "Supportconfig Expert Configuration" msgstr "Supportconfig 专家配置" #. FIXME table header -#: src/include/support/dialogs.rb:614 +#: src/include/support/dialogs.rb:618 msgid "Default Options" msgstr "默认选项" #. Support configure2 dialog caption -#: src/include/support/dialogs.rb:680 +#: src/include/support/dialogs.rb:684 msgid "Supportconfig Contact Configuration" msgstr "Supportconfig 联系人配置" #. Support configure2 dialog contents -#: src/include/support/dialogs.rb:685 +#: src/include/support/dialogs.rb:689 msgid "Contact Information" msgstr "联系人信息" -#: src/include/support/dialogs.rb:690 +#: src/include/support/dialogs.rb:694 msgid "Company" msgstr "公司" -#: src/include/support/dialogs.rb:701 +#: src/include/support/dialogs.rb:705 msgid "Email Address" msgstr "电子邮件" -#: src/include/support/dialogs.rb:708 +#: src/include/support/dialogs.rb:712 msgid "Name" msgstr "姓名" -#: src/include/support/dialogs.rb:715 +#: src/include/support/dialogs.rb:719 msgid "Phone Number" msgstr "电话号码" -#: src/include/support/dialogs.rb:722 +#: src/include/support/dialogs.rb:726 msgid "Store ID" msgstr "商店 ID" -#: src/include/support/dialogs.rb:733 +#: src/include/support/dialogs.rb:737 msgid "Terminal ID" msgstr "终端 ID" -#: src/include/support/dialogs.rb:744 +#: src/include/support/dialogs.rb:748 msgid "GPG UID" msgstr "GPG UID" -#: src/include/support/dialogs.rb:751 +#: src/include/support/dialogs.rb:755 msgid "Upload Information" msgstr "上传信息" -#: src/include/support/dialogs.rb:770 +#: src/include/support/dialogs.rb:774 msgid "11-digit service request number" msgstr "11 位服务请求编号" #. abort? -#: src/include/support/dialogs.rb:847 +#: src/include/support/dialogs.rb:851 msgid "The SR number must be 11 digits" msgstr "服务请求编号必须是 11 位" -#: src/include/support/dialogs.rb:865 +#: src/include/support/dialogs.rb:869 msgid "Collecting Data" msgstr "正在搜集数据" -#: src/include/support/dialogs.rb:866 +#: src/include/support/dialogs.rb:870 msgid "Progress" msgstr "进度" -#: src/include/support/dialogs.rb:931 +#. Remove ANSI escape codes for cursor movement (bnc#921233) +#: src/include/support/dialogs.rb:939 msgid "Collected Data Review" msgstr "复核所搜集数据" #. FIXME use list of generated files, as well as directory prefix #. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents")) -#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026 +#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034 msgid "File Name" msgstr "文件名" -#: src/include/support/dialogs.rb:984 +#: src/include/support/dialogs.rb:992 msgid "Remove from Data" msgstr "从数据中移除" Modified: trunk/yast/zh_CN/po/sysconfig.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/sysconfig.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/sysconfig.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sysconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2013-02-06 04:29+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -491,101 +491,125 @@ "\n" #. Translation: Progress bar label -#: src/modules/Sysconfig.rb:159 +#: src/modules/Sysconfig.rb:162 msgid "Searching..." msgstr "正在搜索..." -#. Display confirmation dialog -#. @param [String] message Confirmation message -#. @param [String] command Command to confirm -#. @return [Symbol] `cont - start command, `skip - skip this command, `abort - skip all remaining commands -#: src/modules/Sysconfig.rb:883 -msgid "Command: " -msgstr "命令：" - #. button label -#: src/modules/Sysconfig.rb:889 +#: src/modules/Sysconfig.rb:881 msgid "S&kip" msgstr "跳过(&K)" -#. get activation map for variable -#. start generic commands -#: src/modules/Sysconfig.rb:967 src/modules/Sysconfig.rb:1171 -msgid "A command will be executed" -msgstr "将执行命令" - -#: src/modules/Sysconfig.rb:968 src/modules/Sysconfig.rb:1172 -msgid "Starting command: %1..." -msgstr "正在启动命令：%1..." - -#: src/modules/Sysconfig.rb:969 src/modules/Sysconfig.rb:1173 -msgid "Command %1 failed" -msgstr "命令 %1 失败" - #. write dialog caption -#: src/modules/Sysconfig.rb:1009 +#: src/modules/Sysconfig.rb:909 msgid "Saving sysconfig Configuration" msgstr "正在保存 sysconfig 配置" #. progress bar item -#: src/modules/Sysconfig.rb:1036 +#: src/modules/Sysconfig.rb:923 msgid "Write the new settings" msgstr "写入新设置" -#: src/modules/Sysconfig.rb:1037 +#: src/modules/Sysconfig.rb:924 msgid "Activate the changes" msgstr "激活修改" -#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager) -#: src/modules/Sysconfig.rb:1060 -msgid "Saving variable %1 to the file %2 failed." -msgstr "将变量 %1 保存到文件 %2 失败。" - -#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER) -#: src/modules/Sysconfig.rb:1068 -msgid "Saving variable %1..." -msgstr "正在保存变量 %1..." - -#: src/modules/Sysconfig.rb:1073 +#: src/modules/Sysconfig.rb:934 msgid "Saving changes to the files..." msgstr "正在将修改保存到文件..." -#. service is running, reload it -#: src/modules/Sysconfig.rb:1100 -msgid "Service %1 will be reloaded" -msgstr "将重载服务 %1" +#. start generic commands +#: src/modules/Sysconfig.rb:965 +msgid "Finished" +msgstr "已完成" -#: src/modules/Sysconfig.rb:1103 -msgid "Reloading service %1..." +#. configuration summary headline +#: src/modules/Sysconfig.rb:1048 +msgid "Configuration Summary" +msgstr "配置摘要" + +#. Executes a bash command using #exec_action +#. @see #exec_action +#. @param cmd [String] command to execute +#. @return [Symbol] result returned by #exec_action +#: src/modules/Sysconfig.rb:1132 +msgid "Starting command: %1..." +msgstr "正在启动命令：%1..." + +#: src/modules/Sysconfig.rb:1133 +msgid "Command %1 failed" +msgstr "命令 %1 失败" + +#: src/modules/Sysconfig.rb:1134 +msgid "A command will be executed" +msgstr "将执行命令" + +#: src/modules/Sysconfig.rb:1134 +msgid "Command: " +msgstr "命令：" + +#. Restarts or reloads a service using #exec_action +#. @see #exec_action +#. @param name [String] service name +#. @param action [Symbol] :reload or :restart +#. @return [Symbol] result returned by #exec_action +#: src/modules/Sysconfig.rb:1156 +#, fuzzy +#| msgid "Reloading service %1..." +msgid "Reloading service %s..." msgstr "正在重载服务 %1..." -#: src/modules/Sysconfig.rb:1105 -msgid "Reload of the service %1 failed" +#: src/modules/Sysconfig.rb:1157 +#, fuzzy +#| msgid "Reload of the service %1 failed" +msgid "Reload of the service %s failed" msgstr "重载服务 %1 失败" -#. service is running, restart it -#: src/modules/Sysconfig.rb:1143 -msgid "Service %1 will be restarted" -msgstr "将重启服务 %1" +#: src/modules/Sysconfig.rb:1158 +#, fuzzy +#| msgid "Service %1 will be reloaded" +msgid "Service %s will be reloaded" +msgstr "将重载服务 %1" -#: src/modules/Sysconfig.rb:1146 -msgid "Restarting service %1..." +#: src/modules/Sysconfig.rb:1160 +#, fuzzy +#| msgid "Restarting service %1..." +msgid "Restarting service %s..." msgstr "正在重启服务 %1..." -#: src/modules/Sysconfig.rb:1148 -msgid "Restart of the service %1 failed" +#: src/modules/Sysconfig.rb:1161 +#, fuzzy +#| msgid "Restart of the service %1 failed" +msgid "Restart of the service %s failed" msgstr "重启服务 %1 失败" -#. set 100% in progress bar -#: src/modules/Sysconfig.rb:1186 -msgid "Finished" -msgstr "已完成" +#: src/modules/Sysconfig.rb:1162 +#, fuzzy +#| msgid "Service %1 will be restarted" +msgid "Service %s will be restarted" +msgstr "将重启服务 %1" -#. configuration summary headline -#: src/modules/Sysconfig.rb:1269 -msgid "Configuration Summary" -msgstr "配置摘要" +#. Returns whether given service is active (info from systemd) +#. If service is not found, reports error in UI and returns nil +#. +#. @param service name +#. @return [Boolean] active? +#: src/modules/Sysconfig.rb:1187 +#, fuzzy +#| msgid "Cannot delete the service. It is not installed." +msgid "Cannot determine service state, systemd service does not exist:" +msgstr "无法删除服务。没有安装该服务。" +#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER) +#: src/modules/Sysconfig.rb:1266 +msgid "Saving variable %1..." +msgstr "正在保存变量 %1..." + +#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager) +#: src/modules/Sysconfig.rb:1273 +msgid "Saving variable %1 to the file %2 failed." +msgstr "将变量 %1 保存到文件 %2 失败。" + #~ msgid "" #~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n" #~ " you have manually changed any of them. If you have changed a configuration file manually,\n" Modified: trunk/yast/zh_CN/po/tftp-server.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/tftp-server.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/tftp-server.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:52+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/timezone_db.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/timezone_db.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/timezone_db.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: timezone\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2012-07-07 00:22+0800\n" "Last-Translator: Marguerite Su\n" "Language-Team: Chinese Simplified \n" @@ -1407,8 +1407,8 @@ #. time zone #: timezone/src/data/timezone_raw.ycp:587 -msgid "Saigon" -msgstr "西贡" +msgid "Ho Chi Minh City" +msgstr "" #. time zone #: timezone/src/data/timezone_raw.ycp:591 @@ -2502,6 +2502,9 @@ msgid "GMT-9" msgstr "GMT-9" +#~ msgid "Saigon" +#~ msgstr "西贡" + #~ msgid "Calcutta" #~ msgstr "加尔各答" Modified: trunk/yast/zh_CN/po/tune.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/tune.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/tune.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: tune\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-04 16:02+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-08-06 15:37+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/update.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/update.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/update.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:52+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -145,7 +145,7 @@ #. screen title for update options #. this is a heading -#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:278 +#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:284 msgid "Update Options" msgstr "更新选项" @@ -174,9 +174,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:155 -#: src/modules/RootPart.rb:1434 src/modules/RootPart.rb:1440 -#: src/modules/RootPart.rb:1981 +#: 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 msgid "Unknown" msgstr "未知" @@ -292,28 +292,30 @@ msgstr "检测到一个可能存在的不完整安装。" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:115 +#: src/clients/packages_proposal.rb:119 msgid "Packages to Update: %1" msgstr "要更新的包：%1" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:123 +#: src/clients/packages_proposal.rb:127 msgid "New Packages to Install: %1" msgstr "要安装的新包：%1" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.rb:131 +#: src/clients/packages_proposal.rb:135 msgid "Packages to Remove: %1" msgstr "要删除的包：%1" #. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.rb:139 +#: src/clients/packages_proposal.rb:143 msgid "Total Size of Packages to Update: %1" msgstr "要更新的包的总大小：%1" -#. warning text -#: src/clients/packages_proposal.rb:149 -msgid "Cannot solve all conflicts. Manual intervention is required." +#. TRANSLATORS: warning text, keep the HTML tags (<a href...>) untouched +#: src/clients/packages_proposal.rb:154 +#, fuzzy +#| msgid "Cannot solve all conflicts. Manual intervention is required." +msgid "Cannot solve all conflicts. Manual intervention is required.</a>" msgstr "无法解决所有冲突。需手动干预。" #. this is a heading @@ -358,27 +360,29 @@ #. error message in proposal #. part of error popup message -#: src/clients/update_proposal.rb:85 src/clients/update_proposal.rb:384 +#: src/clients/update_proposal.rb:87 src/clients/update_proposal.rb:390 msgid "Cannot read the current RPM Database." msgstr "无法读取当前的 RPM 数据库。" -#. error message in proposal -#: src/clients/update_proposal.rb:101 -msgid "The installed product is not compatible with the product on the installation media." -msgstr "已安装产品与安装介质上的产品不兼容。" - #. TRANSLATORS: unknown product (label) #. TRANSLATORS: unknown product (label) #. TRANSLATORS: unknown product name #. TRANSLATORS: unknown product name -#: src/clients/update_proposal.rb:110 src/clients/update_proposal.rb:128 -#: src/clients/update_proposal.rb:171 src/clients/update_proposal.rb:177 +#: src/clients/update_proposal.rb:101 src/clients/update_proposal.rb:119 +#: src/clients/update_proposal.rb:174 src/clients/update_proposal.rb:180 msgid "Unknown product" msgstr "未知产品" +#. error message in proposal +#: src/clients/update_proposal.rb:129 +#, fuzzy +#| msgid "The installed product is not compatible with the product on the installation media." +msgid "The installed product (%{update_from}) is not compatible with the product on the installation media (%{update_to})." +msgstr "已安装产品与安装介质上的产品不兼容。" + #. TRANSLATORS: proposal error, %1 is the version of installed system #. %2 is the version being installed -#: src/clients/update_proposal.rb:143 +#: src/clients/update_proposal.rb:146 msgid "" "Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n" "Boot from the installation media and use a normal upgrade\n" @@ -389,22 +393,22 @@ "或者禁用不同版本产品的软件源。\n" #. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names -#: src/clients/update_proposal.rb:164 +#: src/clients/update_proposal.rb:167 msgid "Warning: Updating from '%1' to '%2', products do not exactly match." msgstr "警告：从 '%1' 更新到 '%2'。产品不完全匹配。" #. Proposal for backup during update -#: src/clients/update_proposal.rb:191 +#: src/clients/update_proposal.rb:194 msgid "Only update installed packages" msgstr "仅更新已安装的包" #. proposal string -#: src/clients/update_proposal.rb:206 +#: src/clients/update_proposal.rb:209 msgid "Update based on patterns" msgstr "基于模式更新" #. TRANSLATORS: proposal dialog help -#: src/clients/update_proposal.rb:232 +#: src/clients/update_proposal.rb:238 msgid "" "<p><b><big>Update Options</big></b> Select how your system will be updated.\n" "Choose if only installed packages should be updated or new ones should be\n" @@ -417,17 +421,17 @@ "以及是否删除失去维护的软件包。</p>\n" #. this is a menu entry -#: src/clients/update_proposal.rb:280 +#: src/clients/update_proposal.rb:286 msgid "&Update Options" msgstr "更新选项(&U)" #. part of error popup message, %1 stands for newline-separated list of files -#: src/clients/update_proposal.rb:387 +#: src/clients/update_proposal.rb:393 msgid "None of these files exist:%1" msgstr "这些文件均不存在：%1" #. continue-cancel popup -#: src/clients/update_proposal.rb:517 +#: src/clients/update_proposal.rb:529 msgid "" "The installed product is not compatible with the product\n" "on the installation media. If you try to update using the\n" @@ -590,7 +594,7 @@ msgstr "好的，继续(&Y)" #. Link to SDB article concerning renaming of devices. -#: src/modules/RootPart.rb:108 +#: src/modules/RootPart.rb:109 msgid "" "See the SDB article at %1 for details\n" "about how to solve this problem." @@ -599,17 +603,17 @@ "位于 %1 的支持数据库文章。" #. label - name of sustem to update -#: src/modules/RootPart.rb:146 +#: src/modules/RootPart.rb:147 msgid "Unknown Linux System" msgstr "未知的 Linux 系统" #. label - name of sustem to update -#: src/modules/RootPart.rb:151 +#: src/modules/RootPart.rb:152 msgid "Non-Linux System" msgstr "非 Linux 系统" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.rb:307 +#: src/modules/RootPart.rb:308 msgid "" "Cannot unmount partition %1.\n" "\n" @@ -624,7 +628,7 @@ "或重启计算机。\n" #. label, %1 is partition -#: src/modules/RootPart.rb:378 +#: src/modules/RootPart.rb:379 msgid "Checking partition %1" msgstr "检查分区 %1" @@ -633,23 +637,23 @@ #. @param string button (true) #. @param string button (false) #. @param [String] details (hidden under [Details] button; optional; to disable, use "") -#: src/modules/RootPart.rb:415 +#: src/modules/RootPart.rb:416 msgid "Show &Details" msgstr "显示细节(&D)" #. #176292, run fsck before jfs is mounted -#: src/modules/RootPart.rb:497 +#: src/modules/RootPart.rb:498 msgid "Checking file system on %1..." msgstr "正在检查 %1 上的文件系统..." #. popup headline -#: src/modules/RootPart.rb:529 +#: src/modules/RootPart.rb:530 msgid "File System Check Failed" msgstr "文件系统检查失败" #. popup question (continue/cancel dialog) #. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.rb:533 +#: src/modules/RootPart.rb:534 msgid "" "The file system check of device %1 has failed.\n" "\n" @@ -660,24 +664,24 @@ "是否要继续挂载该设备？\n" #. button -#: src/modules/RootPart.rb:542 +#: src/modules/RootPart.rb:543 msgid "&Skip Mounting" msgstr "跳过挂载(&S)" #. yes-no popup -#: src/modules/RootPart.rb:1058 +#: src/modules/RootPart.rb:1065 msgid "Incorrect password. Try again?" msgstr "密码不正确。重试吗？" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.rb:1161 +#: src/modules/RootPart.rb:1168 msgid "Warning" msgstr "警告" #. TRANSLATORS: error message, #. %1 is replaced with the current /boot partition size #. %2 with the recommended size -#: src/modules/RootPart.rb:1166 +#: src/modules/RootPart.rb:1173 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" @@ -694,7 +698,7 @@ "您要继续更新当前系统么？\n" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.rb:1258 +#: src/modules/RootPart.rb:1265 msgid "" "The partition %1 could not be mounted.\n" "\n" @@ -715,27 +719,27 @@ "要中止更新，请单击\"取消\"。\n" #. push button -#: src/modules/RootPart.rb:1276 +#: src/modules/RootPart.rb:1283 msgid "&Specify Mount Options" msgstr "指定挂载选项(&S)" #. popup heading -#: src/modules/RootPart.rb:1292 +#: src/modules/RootPart.rb:1299 msgid "Mount Options" msgstr "挂载选项" #. text entry label -#: src/modules/RootPart.rb:1295 +#: src/modules/RootPart.rb:1302 msgid "&Mount Point" msgstr "挂载点(&M)" #. tex entry label -#: src/modules/RootPart.rb:1298 +#: src/modules/RootPart.rb:1305 msgid "&Device" msgstr "设备(&D)" #. text entry label -#: src/modules/RootPart.rb:1303 +#: src/modules/RootPart.rb:1310 msgid "" "&File System\n" "(empty for autodetection)" @@ -744,12 +748,12 @@ "(对于自动检测为空)" #. error message -#: src/modules/RootPart.rb:1380 +#: src/modules/RootPart.rb:1387 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:1421 +#: src/modules/RootPart.rb:1428 msgid "" "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" @@ -761,17 +765,17 @@ "<b>udev ID：</b> %5，<br>\n" "<b>udev 路径：</b> %6" -#: src/modules/RootPart.rb:1435 +#: src/modules/RootPart.rb:1442 msgid "None" msgstr "无" #. a popup caption -#: src/modules/RootPart.rb:1458 +#: src/modules/RootPart.rb:1465 msgid "Unable to find the /var partition automatically" msgstr "无法自动找到 /var 分区" #. a popup message -#: src/modules/RootPart.rb:1463 +#: src/modules/RootPart.rb:1470 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" @@ -781,22 +785,22 @@ "手动选择 /var 分区以继续升级进程。" #. a combo-box label -#: src/modules/RootPart.rb:1476 +#: src/modules/RootPart.rb:1483 msgid "&Select /var Partition Device" msgstr "选择 /var 分区设备(&S)" #. an informational rich-text widget label -#: src/modules/RootPart.rb:1482 +#: src/modules/RootPart.rb:1489 msgid "Device Info" msgstr "设备信息" #. error message -#: src/modules/RootPart.rb:1623 +#: src/modules/RootPart.rb:1630 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:1654 +#: src/modules/RootPart.rb:1661 msgid "" "Partitions could not be mounted.\n" "\n" @@ -809,7 +813,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:1698 +#: src/modules/RootPart.rb:1705 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" @@ -821,32 +825,32 @@ "强烈建议启动旧系统并改变所有分区的挂载方式到其他方式。" #. error message -#: src/modules/RootPart.rb:1716 +#: src/modules/RootPart.rb:1723 msgid "No fstab found." msgstr "未找到 fstab。" #. message part 1 -#: src/modules/RootPart.rb:1741 +#: src/modules/RootPart.rb:1748 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "/etc/fstab 中的根分区包含无效的根设备。\n" #. message part 2 -#: src/modules/RootPart.rb:1746 +#: src/modules/RootPart.rb:1753 msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "它当前被作为 %1 装入，但作为 %2 列出。\n" #. prepare progress-bar -#: src/modules/RootPart.rb:2102 +#: src/modules/RootPart.rb:2115 msgid "Evaluating root partition. One moment please..." msgstr "正在评估根分区。请稍候..." #. intermediate popup while mounting partitions -#: src/modules/RootPart.rb:2184 +#: src/modules/RootPart.rb:2197 msgid "Mounting partitions. One moment please..." msgstr "正在挂载分区。请稍候..." #. TRANSLATORS: dialog caption -#: src/modules/RootPart.rb:2199 +#: src/modules/RootPart.rb:2212 msgid "Searching for Available Systems" msgstr "正在搜索可用系统" Modified: trunk/yast/zh_CN/po/users.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/users.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/users.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:53+0200\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 10:48+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -153,7 +153,7 @@ #. helptext 2/3 #. help text for dialog "User Authentication Method" 2/2 -#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:162 +#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164 msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>" msgstr "<p>选择 <b>本地</b> 以仅通过使用本地文件 <i>/etc/passwd</i> 和 <i>/etc/shadow</i> 来身份验证用户。</p>" @@ -185,7 +185,7 @@ #. radiobutton to select local user auth. #. radiobutton label -#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:83 +#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85 msgid "L&ocal (/etc/passwd)" msgstr "本地 (/etc/passwd)(&O)" @@ -242,18 +242,18 @@ #. check box label #. check box label -#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:100 +#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102 msgid "&Read User Data from a Previous Installation" msgstr "从先前安装读取用户数据(&R)" #. button label #. button label -#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:105 +#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107 msgid "&Choose" msgstr "选择(&C)" #. frame title for authentication methods -#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:134 +#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136 msgid "Authentication Method" msgstr "认证方法" @@ -264,13 +264,13 @@ #. selection box label #. selection box label -#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:498 +#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507 msgid "&Select Users to Read" msgstr "选择要读取的用户(&S)" #. check box label #. check box label -#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:506 +#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515 msgid "Select or Deselect &All" msgstr "全选或全部取消选择(&A)" @@ -399,8 +399,8 @@ #. The two group password information do not match #. error popup #: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185 -#: src/clients/inst_user_first.rb:679 src/include/users/dialogs.rb:146 -#: src/include/users/dialogs.rb:1246 src/include/users/dialogs.rb:2363 +#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146 +#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364 msgid "" "The passwords do not match.\n" "Try again." @@ -436,8 +436,8 @@ #. last part of message popup #. last part of message popup #: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239 -#: src/clients/inst_user_first.rb:705 src/include/users/dialogs.rb:1268 -#: src/include/users/dialogs.rb:2390 +#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269 +#: src/include/users/dialogs.rb:2391 msgid "Really use this password?" msgstr "确实要使用此密码吗？" @@ -473,7 +473,7 @@ #. encryption type #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:87 src/clients/users_proposal.rb:53 +#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53 #: src/include/users/helps.rb:52 src/include/users/helps.rb:54 msgid "DES" msgstr "DES" @@ -481,99 +481,99 @@ #. encryption type #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:55 +#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55 #: src/include/users/helps.rb:56 msgid "MD5" msgstr "MD5" #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:57 +#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57 msgid "SHA-256" msgstr "SHA-256" #. encryption type #. encryption type -#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:59 +#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59 msgid "SHA-512" msgstr "SHA-512" #. frame label -#: src/clients/inst_user_first.rb:141 +#: src/clients/inst_user_first.rb:143 msgid "Password Encryption Type" msgstr "密码加密类型" #. Radio button label: password encryption type #. Radio buttons for password encryption: DES-crypt -#: src/clients/inst_user_first.rb:147 src/include/users/widgets.rb:513 +#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513 msgid "&DES" msgstr "&DES" #. Radio button label: password encryption type #. Radio buttons for password encryption: MD5-crypt -#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:515 +#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515 msgid "&MD5" msgstr "MD5(&M)" #. Radio button label: password encryption type #. Radio buttons for password encryption: sha256 crypt -#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:520 +#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520 msgid "SHA-&256" msgstr "SHA-&256" #. Radio button label: password encryption type #. Radio buttons for password encryption: sha512 crypt -#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:528 +#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528 msgid "SHA-&512" msgstr "SHA-&512" #. help text for dialog "User Authentication Method" 1/2 -#: src/clients/inst_user_first.rb:160 +#: src/clients/inst_user_first.rb:162 msgid "<p><b>Authentication</b><br></p>" msgstr "<p><b>认证</b><br></p>" #. Help text for password expert dialog -#: src/clients/inst_user_first.rb:166 +#: src/clients/inst_user_first.rb:168 msgid "<p>Choose a password encryption method for local and system users.</p>" msgstr "<p>请为本地和系统用户选择一种密码加密方法。</p>" #. Help text for password expert dialog #. Help text for password expert dialog 4/5 -#: src/clients/inst_user_first.rb:168 src/include/users/widgets.rb:491 +#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491 msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>" msgstr "<p><b>SHA-512</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其他算法。</p>" #. text entry #. text entry -#: src/clients/inst_user_first.rb:221 src/include/users/dialogs.rb:403 +#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403 msgid "User's &Full Name" msgstr "用户的完整名称(&F)" #. input field for login name #. input field for login name -#: src/clients/inst_user_first.rb:228 src/include/users/dialogs.rb:433 +#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433 msgid "&Username" msgstr "用户名(&U)" #. checkbox label #. checkbox label -#: src/clients/inst_user_first.rb:250 src/include/users/dialogs.rb:470 +#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470 msgid "U&se this password for system administrator" msgstr "系统管理员使用此密码(&S)" #. checkbox label #. checkbox label -#: src/clients/inst_user_first.rb:256 src/include/users/dialogs.rb:446 +#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446 msgid "Receive S&ystem Mail" msgstr "接收系统邮件(&Y)" #. checkbox label -#: src/clients/inst_user_first.rb:259 +#: src/clients/inst_user_first.rb:261 msgid "&Automatic Login" msgstr "自动登录(&A)" #. dialog caption -#: src/clients/inst_user_first.rb:281 +#: src/clients/inst_user_first.rb:283 msgid "Create New User" msgstr "创建新用户" @@ -581,13 +581,13 @@ #. The user login field is empty, this is allowed if the #. system is part of a network with (e.g.) NIS user management. #. yes-no popup headline -#: src/clients/inst_user_first.rb:350 src/include/users/dialogs.rb:1112 +#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112 msgid "Empty User Login" msgstr "空用户登录" #. yes-no popup contents #. yes-no popup contents -#: src/clients/inst_user_first.rb:352 src/include/users/dialogs.rb:1114 +#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114 msgid "" "Leaving the user name empty only makes sense\n" "in a network environment with an authentication server.\n" @@ -599,7 +599,7 @@ #. help text for main add user dialog #. alternative help text 1/7 -#: src/clients/inst_user_first.rb:441 src/include/users/helps.rb:212 +#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212 msgid "" "<p>\n" "Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" @@ -611,7 +611,7 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:444 +#: src/clients/inst_user_first.rb:453 msgid "" "<p>\n" "When entering a password, distinguish between uppercase and\n" @@ -625,7 +625,7 @@ #. help text %1 is encryption type, %2,%3 numbers #. help text 2/4 %1 is encryption type, %2,%3 numbers -#: src/clients/inst_user_first.rb:448 src/include/users/helps.rb:73 +#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73 msgid "" "<p>\n" "With the current password encryption (%1), the password length should be between\n" @@ -638,7 +638,7 @@ "</p>" #. additional help text about password -#: src/clients/inst_user_first.rb:458 +#: src/clients/inst_user_first.rb:467 msgid "" "<p>If you intend to use this password for creating certificates,\n" "it has to be at least %s characters long.</p>" @@ -646,7 +646,7 @@ #. help text for main add user dialog #. help text 4/4 -#: src/clients/inst_user_first.rb:463 src/include/users/helps.rb:90 +#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90 msgid "" "<p>\n" "To ensure that the password was entered correctly,\n" @@ -659,7 +659,7 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:467 +#: src/clients/inst_user_first.rb:476 msgid "" "<p>\n" "For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" @@ -676,14 +676,14 @@ "</p>\n" #. help text for main add user dialog -#: src/clients/inst_user_first.rb:473 +#: src/clients/inst_user_first.rb:482 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>" #. help text for main add user dialog #. these are used only during installation time #. help text 4/7 (only during installation) -#: src/clients/inst_user_first.rb:476 src/include/users/helps.rb:259 +#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259 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" @@ -693,7 +693,7 @@ #. help text for main add user dialog #. help text 5/7 (only during installation) -#: src/clients/inst_user_first.rb:480 src/include/users/helps.rb:264 +#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264 msgid "" "<p>\n" "Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" @@ -704,39 +704,39 @@ #. Dialog for expert user settings: authentication method as well #. as password encryption (see fate 302980) #. @return true if user accepted expert settings -#: src/clients/inst_user_first.rb:564 +#: src/clients/inst_user_first.rb:573 msgid "Expert Settings" msgstr "专家设置" #. summary label -#: src/clients/inst_user_first.rb:616 +#: src/clients/inst_user_first.rb:625 msgid "The authentication method is local /etc/passwd." msgstr "身份验证方法是本地 /etc/passwd。" #. summary label -#: src/clients/inst_user_first.rb:619 +#: src/clients/inst_user_first.rb:628 msgid "The password encryption method is %s." msgstr "密码加密方法是 %s。" #. summary label, %s is a single user name or multiple usernames (comma separated) -#: src/clients/inst_user_first.rb:626 +#: src/clients/inst_user_first.rb:635 msgid "User %s will be imported." msgid_plural "Users %s will be imported." msgstr[0] "将导入用户 %s。" msgstr[1] "将导入用户 %s。" #. pushbutton label -#: src/clients/inst_user_first.rb:641 +#: src/clients/inst_user_first.rb:650 msgid "&Change..." msgstr "更改(&C)..." #. frame label -#: src/clients/inst_user_first.rb:648 +#: src/clients/inst_user_first.rb:657 msgid "Summary" msgstr "摘要" #. yes/no popup question, %s is a number -#: src/clients/inst_user_first.rb:700 +#: src/clients/inst_user_first.rb:709 msgid "" "If you intend to create certificates,\n" "the password should have at least %s characters." @@ -864,7 +864,7 @@ msgstr "用户的新 UID" #. progress step title -#: src/clients/users_finish.rb:66 +#: src/clients/users_finish.rb:63 msgid "Writing Users Configuration..." msgstr "正在写入用户配置..." @@ -1011,7 +1011,7 @@ #. popup label - don't reorder the letters YYYY-MM-DD #. The date must stay in this format #: src/clients/users_plugin_ldap_shadowaccount.rb:235 -#: src/include/users/dialogs.rb:1675 src/include/users/widgets.rb:1665 +#: src/include/users/dialogs.rb:1676 src/include/users/widgets.rb:1665 msgid "The expiration date must be in the format YYYY-MM-DD." msgstr "失效日期必须采用格式 YYYY-MM-DD。" @@ -1515,19 +1515,19 @@ #. table header #. table header -#: src/include/users/dialogs.rb:935 src/include/users/dialogs.rb:2216 +#: src/include/users/dialogs.rb:935 src/include/users/dialogs.rb:2217 msgid "Plug-In Description" msgstr "插件描述" #. pushbutton label #. pushbutton label -#: src/include/users/dialogs.rb:944 src/include/users/dialogs.rb:2225 +#: src/include/users/dialogs.rb:944 src/include/users/dialogs.rb:2226 msgid "Add &or Remove Plug-In" msgstr "添加或删除插件(&O)" #. pushbutton label #. pushbutton label -#: src/include/users/dialogs.rb:947 src/include/users/dialogs.rb:2228 +#: src/include/users/dialogs.rb:947 src/include/users/dialogs.rb:2229 msgid "&Launch" msgstr "起动(&L)" @@ -1583,17 +1583,17 @@ #. tab label #. tab label -#: src/include/users/dialogs.rb:1019 src/include/users/dialogs.rb:2272 +#: src/include/users/dialogs.rb:1019 src/include/users/dialogs.rb:2273 msgid "Plu&g-Ins" msgstr "插件(&G)" #. popup question -#: src/include/users/dialogs.rb:1307 +#: src/include/users/dialogs.rb:1308 msgid "Change home directory to %1?" msgstr "将主目录更改为 %1？" #. error popup -#: src/include/users/dialogs.rb:1429 +#: src/include/users/dialogs.rb:1430 msgid "" "The home directory for this user cannot be decrypted,\n" "because the user is currently logged in.\n" @@ -1604,12 +1604,12 @@ "请先将该用户注销。" #. error popup -#: src/include/users/dialogs.rb:1576 +#: src/include/users/dialogs.rb:1577 msgid "Enter the size for the home directory." msgstr "请输入用户主目录的大小。" #. error popup -#: src/include/users/dialogs.rb:1582 +#: src/include/users/dialogs.rb:1583 msgid "" "\n" "Directory cannot be encrypted." @@ -1619,64 +1619,64 @@ #. popup message #. popup message -#: src/include/users/dialogs.rb:1749 src/include/users/dialogs.rb:2484 +#: src/include/users/dialogs.rb:1750 src/include/users/dialogs.rb:2485 msgid "This plug-in cannot be removed." msgstr "无法删除此插件。" #. popup text -#: src/include/users/dialogs.rb:2004 +#: src/include/users/dialogs.rb:2005 msgid "Now you have added a new user." msgstr "现在您已添加了一位新用户。" #. dialog caption: -#: src/include/users/dialogs.rb:2070 +#: src/include/users/dialogs.rb:2071 msgid "New Local Group" msgstr "新的本地组" #. dialog caption: -#: src/include/users/dialogs.rb:2072 +#: src/include/users/dialogs.rb:2073 msgid "New System Group" msgstr "新的系统组" #. dialog caption: -#: src/include/users/dialogs.rb:2074 +#: src/include/users/dialogs.rb:2075 msgid "New LDAP Group" msgstr "新的 LDAP 组" #. dialog caption: -#: src/include/users/dialogs.rb:2078 +#: src/include/users/dialogs.rb:2079 msgid "Existing Local Group" msgstr "现有的本地组" #. dialog caption: -#: src/include/users/dialogs.rb:2080 +#: src/include/users/dialogs.rb:2081 msgid "Existing System Group" msgstr "现有的系统组" #. dialog caption: -#: src/include/users/dialogs.rb:2082 +#: src/include/users/dialogs.rb:2083 msgid "Existing LDAP Group" msgstr "现有的 LDAP 组" #. textentry label -#: src/include/users/dialogs.rb:2144 +#: src/include/users/dialogs.rb:2145 msgid "Group &Name" msgstr "组名称(&N)" #. textentry label -#: src/include/users/dialogs.rb:2153 +#: src/include/users/dialogs.rb:2154 msgid "Group &ID (gid)" msgstr "组 ID (gid)(&I)" #. selection box label #. add items later (when there is a huge amount of them, it takes #. long time to display, so display at least the rest of the dialog) -#: src/include/users/dialogs.rb:2173 src/include/users/dialogs.rb:2592 +#: src/include/users/dialogs.rb:2174 src/include/users/dialogs.rb:2593 msgid "Group &Members" msgstr "组成员(&M)" #. tab label -#: src/include/users/dialogs.rb:2270 +#: src/include/users/dialogs.rb:2271 msgid "Group &Data" msgstr "组数据(&D)" @@ -3514,13 +3514,13 @@ #. init dialog caption #. dialog caption -#: src/include/users/wizards.rb:263 src/include/users/wizards.rb:286 +#: src/include/users/wizards.rb:261 src/include/users/wizards.rb:284 msgid "User and Group Configuration" msgstr "用户和组配置" #. label (during init dialog) #. label (during init dialog) -#: src/include/users/wizards.rb:265 src/include/users/wizards.rb:289 +#: src/include/users/wizards.rb:263 src/include/users/wizards.rb:287 msgid "Initializing..." msgstr "正在初始化..." @@ -4479,13 +4479,13 @@ "组名之间存在冲突。\n" "请尝试使用其它名称。" -#: src/modules/Users.pm:5529 +#: src/modules/Users.pm:5531 #, perl-format msgid "User %s does not exist." msgstr "用户 %s 不存在。" #. error message: group cannot be deleted -#: src/modules/Users.pm:5583 +#: src/modules/Users.pm:5585 msgid "" "You cannot delete this group because\n" "there are users that use this group\n" @@ -4496,7 +4496,7 @@ "其默认组。" #. error message: group cannot be deleted -#: src/modules/Users.pm:5590 +#: src/modules/Users.pm:5592 msgid "" "You cannot delete this group because\n" "there are users in the group.\n" @@ -4507,22 +4507,22 @@ "请先删除组中的这些用户。" #. summary label -#: src/modules/Users.pm:6601 +#: src/modules/Users.pm:6603 msgid "<h3>Users</h3>" msgstr "<h3>用户</h3>" #. summary label -#: src/modules/Users.pm:6611 +#: src/modules/Users.pm:6613 msgid "<h3>Groups</h3>" msgstr "<h3>组</h3>" #. summary label -#: src/modules/Users.pm:6622 +#: src/modules/Users.pm:6624 msgid "<h3>Login Settings</h3>" msgstr "<h3>登录设置</h3>" #. summary item, %1 is user name -#: src/modules/Users.pm:6624 +#: src/modules/Users.pm:6626 msgid "User %1 configured for automatic login" msgstr "用户 %1 已设为自动登录" Modified: trunk/yast/zh_CN/po/vm.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/vm.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/vm.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:22+0100\n" +"POT-Creation-Date: 2015-08-25 18:37+0200\n" "PO-Revision-Date: 2014-06-10 12:17+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Added: trunk/yast/zh_CN/po/vpn.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/vpn.zh_CN.po (rev 0) +++ trunk/yast/zh_CN/po/vpn.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -0,0 +1,647 @@ +# 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: 2015-08-25 18:37+0200\n" +"PO-Revision-Date: 2004-04-02 10:52+0200\n" +"Last-Translator: 裴寒牧 \n" +"Language-Team: 中华 \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" + +#. 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 +#, fuzzy +#| msgid "Gateway" +msgid "Gateway IP" +msgstr "网关" + +#: src/lib/vpn/edit_client_secrets.rb:57 +#, fuzzy +#| msgid "WEP - Shared Key" +msgid "Pre-shared key" +msgstr "WEP - 共享密钥" + +#: src/lib/vpn/edit_client_secrets.rb:59 src/lib/vpn/edit_client_secrets.rb:63 +#, fuzzy +#| msgid "&Set" +msgid "Set" +msgstr "设置(&S)" + +#: src/lib/vpn/edit_client_secrets.rb:60 src/lib/vpn/edit_gw_secrets.rb:188 +#, fuzzy +#| msgid "Show &Next" +msgid "Show key" +msgstr "显示下一个(&N)" + +#: src/lib/vpn/edit_client_secrets.rb:61 +#, fuzzy +#| msgid "Certificate key file does not exist." +msgid "Certificate/key pair for gateways" +msgstr "证书密钥文件不存在。" + +#: src/lib/vpn/edit_client_secrets.rb:62 +msgid "Certificate" +msgstr "证书" + +#: 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 +msgid "" +"Shared keys for the following gateways are still missing:\n" +"%s" +msgstr "" + +#: src/lib/vpn/edit_client_secrets.rb:127 +msgid "" +"Certificates for the following gateways are still missing:\n" +"%s" +msgstr "" + +#. 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 +#, fuzzy +#| msgid "Please select a card to delete first." +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 +msgid "A pre-shared key is mandatory. Please enter a pre-shared key." +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:166 +#, fuzzy +#| msgid "Parsing the certificate file failed." +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 +#, fuzzy +#| msgid "Cannot read certificate file." +msgid "Pick a PEM encoded certificate file" +msgstr "无法读取证书文件。" + +#: src/lib/vpn/edit_gw_secrets.rb:180 src/lib/vpn/set_client_cert_dialog.rb:69 +#, fuzzy +#| msgid "Cannot read certificate file." +msgid "Pick a PEM encoded certificate key file" +msgstr "无法读取证书文件。" + +#: src/lib/vpn/edit_gw_secrets.rb:186 +msgid "Gateway pre-shared key" +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:192 +#, fuzzy +#| msgid "Read certificates" +msgid "Gateway certificate" +msgstr "读取证书" + +#: src/lib/vpn/edit_gw_secrets.rb:194 +#, fuzzy +#| msgid "Path to certificate file required." +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 +msgid "Pick.." +msgstr "" + +#: src/lib/vpn/edit_gw_secrets.rb:197 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate key file" +msgstr "需要证书文件的路径。" + +#: src/lib/vpn/edit_gw_secrets.rb:202 +msgid "User credentials for Android, iOS, MacOS X clients" +msgstr "" + +#: 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 +msgid "Password" +msgstr "密码" + +#: 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 +msgid "Delete" +msgstr "删除" + +#: src/lib/vpn/edit_gw_secrets.rb:207 src/lib/vpn/edit_gw_secrets.rb:216 +#, fuzzy +#| msgid "No Password" +msgid "Show Password" +msgstr "无口令" + +#: src/lib/vpn/edit_gw_secrets.rb:211 +msgid "User credentials for Windows 7, Windows 8 clients" +msgstr "" + +#. Return a user-friendly brief description of the connection. +#: src/lib/vpn/ipsec.rb:199 +#, fuzzy +#| msgid "Gateway" +msgid "Gateway - PSK" +msgstr "网关" + +#: src/lib/vpn/ipsec.rb:201 +#, fuzzy +#| msgid "&Path of Certificate" +msgid "Gateway - Certificate" +msgstr "证书的路径(&P)" + +#: src/lib/vpn/ipsec.rb:203 +#, fuzzy +#| msgid "enable LPD clients" +msgid "Gateway - Mobile clients" +msgstr "启用 LPD 客户机" + +#: src/lib/vpn/ipsec.rb:205 +#, fuzzy +#| msgid "Samba or Windows Printer" +msgid "Gateway - Windows clients" +msgstr "Samba 或 Windows 打印机" + +#: src/lib/vpn/ipsec.rb:207 +#, fuzzy +#| msgid "Client &Key" +msgid "Client - PSK" +msgstr "客户密钥(&K)" + +#: src/lib/vpn/ipsec.rb:209 +#, fuzzy +#| msgid "&Client Certificate" +msgid "Client - Certificate" +msgstr "客户身份验证(&C)" + +#. Create a new connection, by default it is a site-to-site client. Return true if successful. +#: src/lib/vpn/ipsec.rb:303 +#, fuzzy +#| msgid "The server name is already in configured." +msgid "The connection name is already used." +msgstr "服务器名已经在配置中." + +#. Find an unused gateway scenario +#: src/lib/vpn/ipsec.rb:320 +msgid "" +"You may only have one gateway connection per scenario.\n" +"All of gateway scenarios are already used." +msgstr "" + +#. Warn against duplicated configuration +#: src/lib/vpn/ipsec.rb:337 +msgid "" +"The scenario is already configured with another gateway.\n" +"You may not have two gateways operating under one scenario." +msgstr "" + +#. Create the user (:xauth or :eap). Return true if successful. +#: src/lib/vpn/ipsec.rb:432 +#, fuzzy +#| msgid "The server name is already in configured." +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:496 +msgid "Cannot find a matching client connection." +msgstr "" + +#. Render global options, connection list, and connection configuration frames. +#: src/lib/vpn/main_dialog.rb:60 +msgid "VPN Gateway and Client" +msgstr "" + +#. Left side: global config & connection management +#: src/lib/vpn/main_dialog.rb:66 +msgid "Global Configuration" +msgstr "全局配置" + +#: src/lib/vpn/main_dialog.rb:68 +#, fuzzy +#| msgid "Enable the NTP daemon" +msgid "Enable VPN daemon" +msgstr "启用 NTP 守护程序" + +#: src/lib/vpn/main_dialog.rb:70 +msgid "Reduce TCP MSS" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:73 +#, fuzzy +#| msgid "All Patches" +msgid "All VPNs" +msgstr "所有补丁" + +#: src/lib/vpn/main_dialog.rb:76 +msgid "New VPN" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:77 +#, fuzzy +#| msgid "Delete " +msgid "Delete VPN" +msgstr "删除" + +#: src/lib/vpn/main_dialog.rb:79 +#, fuzzy +#| msgid "Connection Settings" +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 +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%." +msgstr "" + +#. Delete the chosen VPN connection. +#: src/lib/vpn/main_dialog.rb:124 +#, fuzzy +#| msgid "Select a connection." +msgid "Delete connection" +msgstr "选择一个连接。" + +#: src/lib/vpn/main_dialog.rb:125 +#, fuzzy +#| msgid "Are you sure you want to delete: " +msgid "Are you sure to delete connection " +msgstr "是否确定要删除：" + +#. Check for incomplete configuration +#: src/lib/vpn/main_dialog.rb:144 +#, fuzzy +#| msgid "Configuration failed for the following operations: " +msgid "Please complete configuration for the following connections:\n" +msgstr "以下操作配置失败：" + +#. 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?" +msgstr "" + +#. Ask user whether he wants to view daemon log +#: src/lib/vpn/main_dialog.rb:172 +#, fuzzy +#| msgid "Configuration has been successfully saved." +msgid "Settings have been successfully applied." +msgstr "配置已被成功存入." + +#: src/lib/vpn/main_dialog.rb:174 +#, fuzzy +#| msgid "Failed to start the CUPS daemon" +msgid "Failed to configure IPSec daemon." +msgstr "启动 CUPS 守护程序失败" + +#: src/lib/vpn/main_dialog.rb:177 +#, fuzzy +#| msgid "Would you like to change the CD and retry ?" +msgid "Would you like to view daemon log and connection status?" +msgstr "是更换 CD 还是重试？" + +#. Open dialog to edit VPN client passwords/certificates. +#: src/lib/vpn/main_dialog.rb:285 +msgid "Please enter gateway IP before editing credentials." +msgstr "" + +#. Render a table of configured gateway and client connections. +#: src/lib/vpn/main_dialog.rb:361 +msgid "Name" +msgstr "名称" + +#: src/lib/vpn/main_dialog.rb:361 +msgid "Description" +msgstr "描述" + +#. Render configuration controls for the chosen connection. +#: src/lib/vpn/main_dialog.rb:376 +msgid "Click 'New VPN' to create a gateway or client." +msgstr "" + +#. Make widgets for connection configuration +#: src/lib/vpn/main_dialog.rb:386 +msgid "All IPv4 networks (0.0.0.0/0)" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:387 +#, fuzzy +#| msgid "All networks" +msgid "All IPv6 networks (::/0)" +msgstr "所有网络" + +#: src/lib/vpn/main_dialog.rb:389 +msgid "Limited CIDRs, comma separated:" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:395 +#, fuzzy +#| msgid "Connection Management" +msgid "Connection name: " +msgstr "连接管理" + +#: src/lib/vpn/main_dialog.rb:396 +msgid "Type" +msgstr "类型" + +#: src/lib/vpn/main_dialog.rb:398 +#, fuzzy +#| msgid "Master Server" +msgid "Gateway (Server)" +msgstr "主服务器" + +#: src/lib/vpn/main_dialog.rb:399 +#, fuzzy +#| msgid "Clients" +msgid "Client" +msgstr "客户机" + +#: src/lib/vpn/main_dialog.rb:406 +#, fuzzy +#| msgid "Choose Scenario" +msgid "The scenario is" +msgstr "选择方案" + +#: src/lib/vpn/main_dialog.rb:408 +msgid "Secure communication with a pre-shared key" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:409 +#, fuzzy +#| msgid "You must select a certificate." +msgid "Secure communication with a certificate" +msgstr "必须选择证书。" + +#: src/lib/vpn/main_dialog.rb:410 +msgid "Provide access to Android, iOS, MacOS X clients" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:411 +msgid "Provide access to Windows 7, Windows 8 clients" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427 +#, fuzzy +#| msgid "&Edit Crypt File" +msgid "Edit Credentials" +msgstr "编辑加密文件(&E)" + +#: src/lib/vpn/main_dialog.rb:416 +msgid "Provide VPN clients access to" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:417 +msgid "Clients' address pool (e.g. 192.168.100.0/24)" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:421 +#, fuzzy +#| msgid "Server Requires Authentication" +msgid "The gateway requires authentication" +msgstr "服务器要求身份验证" + +#: src/lib/vpn/main_dialog.rb:423 +msgid "By a pre-shared key" +msgstr "" + +#: src/lib/vpn/main_dialog.rb:424 +#, fuzzy +#| msgid "Read certificates" +msgid "By a certificate" +msgstr "读取证书" + +#: src/lib/vpn/main_dialog.rb:426 +#, fuzzy +#| msgid "Default &Gateway IP" +msgid "VPN gateway IP" +msgstr "默认网关 IP (&G)" + +#: src/lib/vpn/main_dialog.rb:430 +msgid "Use the VPN tunnel to access" +msgstr "" + +#. They are however allowed in password +#: src/lib/vpn/new_user_dialog.rb:64 +#, fuzzy +#| msgid "Enter the user password." +msgid "Please enter both username and password." +msgstr "输入用户密码。" + +#: 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" +msgstr "" + +#. Create a new VPN connection - by default it is a site-to-site gateway. +#: src/lib/vpn/new_vpn_dialog.rb:46 +#, fuzzy +#| msgid "Enter a name for the new profile." +msgid "Please enter a name for the new VPN connection" +msgstr "输入新配置文件的名称。" + +#. Return :ok if new VPN connection is created, otherwise :cancel. +#: src/lib/vpn/new_vpn_dialog.rb:58 +#, fuzzy +#| msgid "Enter the connection name." +msgid "Please enter a VPN connection name." +msgstr "请输入连接名称。" + +#: 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" +"Name has to begin with a letter." +msgstr "" + +#. Ask for a new certificate/key combination for a VPN client +#: src/lib/vpn/set_client_cert_dialog.rb:49 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate file:" +msgstr "需要证书文件的路径。" + +#: src/lib/vpn/set_client_cert_dialog.rb:52 +#, fuzzy +#| msgid "Path to certificate file required." +msgid "Path to certificate key file:" +msgstr "需要证书文件的路径。" + +#: src/lib/vpn/set_client_cert_dialog.rb:54 +#, fuzzy +#| msgid "Parsing the certificate file failed." +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 +#, fuzzy +#| msgid "Parsing the certificate file failed." +msgid "Please enter both certificate file and key file." +msgstr "对证书文件的语法分析失败。" + +#. Return password string. +#: src/lib/vpn/set_client_psk_dialog.rb:59 +#, fuzzy +#| msgid "Please enter keywords:" +msgid "Please enter a password." +msgstr "请输入关键字：" + +#. 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 "" + +#: src/lib/vpn/view_log_dialog.rb:51 +#, fuzzy +#| msgid "Restart NTP Daemon" +msgid "Restart VPN Daemon" +msgstr "重启动 NTP 守护程序" + +#. Restart IPSec daemon service. +#: src/lib/vpn/view_log_dialog.rb:76 +#, fuzzy +#| msgid "Confirm Network Restart" +msgid "Confirm daemon restart" +msgstr "确认网络重启" + +#: src/lib/vpn/view_log_dialog.rb:77 +#, fuzzy +#| msgid "" +#| "Existing file %1\n" +#| "can be part of new volume set and it can be rewritten.\n" +#| "Do you wish to continue?" +msgid "" +"Existing connections will be interrupted.\n" +"Do you still wish to continue?" +msgstr "" +"现有文件 %1\n" +"可能是新卷集的一部分，可能被重写。\n" +"是否要继续？" + +#: src/lib/vpn/view_log_dialog.rb:81 +#, fuzzy +#| msgid "Failed to restart the CUPS daemon" +msgid "Failed to restart IPSec daemon" +msgstr "重启 CUPS 守护程序失败" + +#. Read daemon status and refresh the content of log views. +#: src/lib/vpn/view_log_dialog.rb:100 +#, fuzzy +#| msgid "Smart is not available for this disk." +msgid "Status not available: is the daemon running?" +msgstr "Smart 对此磁盘不可用。" + +#. Install packages +#: src/modules/IPSecConf.rb:172 +#, fuzzy +#| msgid "Failed to install required packages." +msgid "Failed to install IPSec packages." +msgstr "不能够安装所有必需的软件包" + +#. Enable/disable daemon +#: src/modules/IPSecConf.rb:180 +#, fuzzy +#| msgid "Failed to start the CUPS daemon" +msgid "Failed to start IPSec daemon." +msgstr "启动 CUPS 守护程序失败" + +#. Configure IP forwarding +#: src/modules/IPSecConf.rb:210 +#, fuzzy +#| msgid "Failed to apply the settings to the system." +msgid "Failed to apply IP forwarding settings using sysctl:" +msgstr "应用设置到系统失败。" + +#. Configure/deconfigure firewall +#: src/modules/IPSecConf.rb:225 +msgid "" +"SuSE firewall is enabled but not activated.\n" +"In order for VPN to function properly, SuSE firewall will now be activated." +msgstr "" + +#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234 +#, fuzzy +#| msgid "Failed to create the new map." +msgid "Failed to restart SuSE firewall." +msgstr "创建新映射失败。" + +#: src/modules/IPSecConf.rb:240 +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" +"The script is located at %s" +msgstr "" + +#. AutoYaST: Return a rich text summary of the current configuration. +#: src/modules/IPSecConf.rb:279 +#, fuzzy +#| msgid "Global Settings" +msgid "VPN Global Settings" +msgstr "全局设置" + +#: src/modules/IPSecConf.rb:280 +#, fuzzy +#| msgid "Enable VPN Services" +msgid "Enable VPN (IPSec) daemon: %s" +msgstr "启用 VPN 服务" + +#: src/modules/IPSecConf.rb:281 +msgid "Reduce TCP MSS to 1024: %s" +msgstr "" + +#: src/modules/IPSecConf.rb:282 +#, fuzzy +#| msgid "Create Client Connection" +msgid "Gateway and Connections" +msgstr "创建客户机连接" + +#. Gateway summary +#: src/modules/IPSecConf.rb:288 +msgid "A gateway serving clients in " +msgstr "" + +#. Client summary +#: src/modules/IPSecConf.rb:292 +#, fuzzy +#| msgid "Read current connection setup" +msgid "A client connecting to " +msgstr "读取当前连接设置" Modified: trunk/yast/zh_CN/po/wol.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/wol.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/wol.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:52+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2013-02-01 20:27+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" Modified: trunk/yast/zh_CN/po/yast2-apparmor.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2015-09-09 08:11:35 UTC (rev 92587) +++ trunk/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2015-09-09 08:11:51 UTC (rev 92588) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-04 15:51+0200\n" +"POT-Creation-Date: 2015-08-25 18:36+0200\n" "PO-Revision-Date: 2014-06-18 19:51+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n"