[opensuse-translation-commit] r97365 - branches/SLE12-SP3/yast/zh_CN/po

Author: keichwa Date: 2017-05-23 07:12:57 +0000 (Tue, 23 May 2017) New Revision: 97365 Modified: branches/SLE12-SP3/yast/zh_CN/po/add-on.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/auth-client.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/autoinst.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/bootloader.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/cio.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/cluster.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/control.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/country.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/firewall.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/firstboot.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/installation.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/iscsi-lio-server.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/kdump.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/network.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/packager.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/registration.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/reipl.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/rpm-groups.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/s390.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/samba-server.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/scanner.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/smt.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/storage.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/update.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/vm.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/xpram.zh_CN.po branches/SLE12-SP3/yast/zh_CN/po/yast2-apparmor.zh_CN.po Log: merged Modified: branches/SLE12-SP3/yast/zh_CN/po/add-on.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/add-on.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/add-on.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-20 17:12+0200\n" +"POT-Creation-Date: 2017-05-17 17:45+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -81,13 +81,14 @@ msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" msgstr "<li>媒体：%1，路径：%2，产品：%3</li>\n" -#. set addon specific sig-handling -#: src/clients/add-on_auto.rb:186 +#. revert back to the unexpanded URL to have the original URL +#. in the saved /etc/zypp/repos.d file +#: src/clients/add-on_auto.rb:191 msgid "Make the add-on \"%1\" available via \"%2\"." msgstr "让外接式附件“%1”可通过“%2”使用。" #. just report error -#: src/clients/add-on_auto.rb:193 +#: src/clients/add-on_auto.rb:198 msgid "Failed to add add-on product." msgstr "未能添加外接式附件。" @@ -475,6 +476,5 @@ "\n" "要跳过使用外接式附件吗？" -#: control/installation.glade.translations.glade:4 -msgid "Language Installation" -msgstr "语言安装" +#~ msgid "Language Installation" +#~ msgstr "语言安装" Modified: branches/SLE12-SP3/yast/zh_CN/po/auth-client.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/auth-client.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/auth-client.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -1,6 +1,6 @@ # Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the package. -# +# msgid "" msgstr "" "Project-Id-Version: auth-client\n" Modified: branches/SLE12-SP3/yast/zh_CN/po/autoinst.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/autoinst.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/autoinst.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-09 02:27+0000\n" +"POT-Creation-Date: 2017-04-19 02:27+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -53,7 +53,7 @@ #. 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:184 src/clients/inst_autosetup.rb:463 +#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:476 #: src/clients/inst_autosetup_upgrade.rb:485 #: src/modules/AutoInstallRules.rb:997 msgid "" @@ -596,7 +596,7 @@ #. Adding selections (defined in PackageAI) to libzypp and solving #. package dependencies. -#: src/clients/inst_autosetup.rb:361 +#: src/clients/inst_autosetup.rb:374 msgid "" "Error while configuring software selections.\n" "Try again.\n" Modified: branches/SLE12-SP3/yast/zh_CN/po/bootloader.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/bootloader.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/bootloader.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-25 02:27+0000\n" +"POT-Creation-Date: 2017-04-19 02:27+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -159,74 +159,76 @@ #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:76 +#: src/lib/bootloader/grub2.rb:99 src/lib/bootloader/grub2efi.rb:76 msgid "Boot Loader Type: %1" msgstr "引导加载程序类型：%1" -#: src/lib/bootloader/grub2.rb:110 +#: src/lib/bootloader/grub2.rb:103 src/lib/bootloader/grub2efi.rb:84 msgid "Enable Trusted Boot: %1" msgstr "启用可信引导：%1" -#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81 +#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81 +#: src/lib/bootloader/grub2efi.rb:85 msgid "yes" msgstr "是" -#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81 +#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81 +#: src/lib/bootloader/grub2efi.rb:85 msgid "no" msgstr "否" -#: src/lib/bootloader/grub2.rb:117 +#: src/lib/bootloader/grub2.rb:110 msgid "Status Location: %1" msgstr "状态位置：%1" #. part of summary, %1 is a list of hard disks device names -#: src/lib/bootloader/grub2.rb:181 +#: src/lib/bootloader/grub2.rb:174 msgid "Order of Hard Disks: %1" msgstr "硬盘的顺序：%1" #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/lib/bootloader/grub2.rb:193 +#: src/lib/bootloader/grub2.rb:186 msgid " (extended)" msgstr "（扩展分区）" #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific #. is used in your language, then keep it as it is. -#: src/lib/bootloader/grub2.rb:198 +#: src/lib/bootloader/grub2.rb:191 msgid " (MBR)" msgstr " (MBR)" -#: src/lib/bootloader/grub2.rb:219 +#: src/lib/bootloader/grub2.rb:212 msgid "Install bootcode into MBR (do not install</a>)" msgstr "将引导代码装入 MBR（不安装</a>）" -#: src/lib/bootloader/grub2.rb:223 +#: src/lib/bootloader/grub2.rb:216 msgid "Do not install bootcode into MBR (install</a>)" msgstr "不将引导代码装入 MBR（安装</a>）" #. check for separated boot partition, use root otherwise -#: src/lib/bootloader/grub2.rb:233 +#: src/lib/bootloader/grub2.rb:226 msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "将引导代码装入 /boot 分区（不安装</a>）" -#: src/lib/bootloader/grub2.rb:238 +#: src/lib/bootloader/grub2.rb:231 msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "不将引导代码装入 /boot 分区（安装</a>）" -#: src/lib/bootloader/grub2.rb:244 +#: src/lib/bootloader/grub2.rb:237 msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "将引导代码装入“/”分区（不安装</a>）" -#: src/lib/bootloader/grub2.rb:249 +#: src/lib/bootloader/grub2.rb:242 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/lib/bootloader/grub2.rb:274 +#: src/lib/bootloader/grub2.rb:267 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/lib/bootloader/grub2.rb:282 +#: src/lib/bootloader/grub2.rb:275 msgid "Change Location: %s" msgstr "更改位置：%s" @@ -343,14 +345,21 @@ #. TRANSLATORS: TrustedGRUB2 is a name, don't translate it #: src/lib/bootloader/grub2_widgets.rb:301 +#, fuzzy +#| msgid "" +#| "<p><b>Trusted Boot</b> will install TrustedGRUB2\n" +#| "instead of regular GRUB2.</p>\n" +#| "<p>It means measuring the integrity of the boot process,\n" +#| "with the help from the hardware (a TPM, Trusted Platform Module,\n" +#| "chip).</p>\n" +#| "<p>First you need to make sure Trusted Boot is enabled in the BIOS\n" +#| "setup (the setting may be named Security Chip, for example).</p>\n" msgid "" "<p><b>Trusted Boot</b> will install TrustedGRUB2\n" "instead of regular GRUB2.</p>\n" "<p>It means measuring the integrity of the boot process,\n" "with the help from the hardware (a TPM, Trusted Platform Module,\n" "chip).</p>\n" -"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n" -"setup (the setting may be named Security Chip, for example).</p>\n" msgstr "" "<p><b>可信引导</b>将安装 TrustedGRUB2\n" "而非普通的 GRUB2。</p>\n" @@ -360,10 +369,16 @@ "<p>您需要先确保 BIOS 设置中启用了\n" "可信引导（例如，该设置可能名为“安全芯片）。</p>\n" +#: src/lib/bootloader/grub2_widgets.rb:307 +msgid "" +"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n" +"setup (the setting may be named Security Chip, for example).</p>\n" +msgstr "" + #. check for file size does not work, since FS reports it 4096 #. even if the file is in fact empty and a single byte cannot #. be read, therefore testing real reading (details: bsc#994556) -#: src/lib/bootloader/grub2_widgets.rb:327 +#: src/lib/bootloader/grub2_widgets.rb:331 msgid "" "Trusted Platform Module not found.\n" "Make sure it is enabled in BIOS.\n" @@ -374,30 +389,30 @@ "否则，系统将不会引导。" #. Represents grub password protection widget -#: src/lib/bootloader/grub2_widgets.rb:347 +#: src/lib/bootloader/grub2_widgets.rb:351 msgid "Prot&ect Boot Loader with Password" msgstr "使用口令保护引导加载程序(&E)" #. TRANSLATORS: checkbox entry -#: src/lib/bootloader/grub2_widgets.rb:353 +#: src/lib/bootloader/grub2_widgets.rb:357 msgid "P&rotect Entry Modification Only" msgstr "仅实施项修改防护(&R)" #. TRANSLATORS: text entry, please keep it short -#: src/lib/bootloader/grub2_widgets.rb:359 +#: src/lib/bootloader/grub2_widgets.rb:363 msgid "&Password for GRUB2 User 'root'" msgstr "GRUB2 用户 root 的口令(&P)" #. text entry -#: src/lib/bootloader/grub2_widgets.rb:362 +#: src/lib/bootloader/grub2_widgets.rb:366 msgid "Re&type Password" msgstr "再次键入口令(&T)" -#: src/lib/bootloader/grub2_widgets.rb:373 +#: src/lib/bootloader/grub2_widgets.rb:377 msgid "The password must not be empty." msgstr "口令不能为空。" -#: src/lib/bootloader/grub2_widgets.rb:380 +#: src/lib/bootloader/grub2_widgets.rb:384 msgid "" "'Password' and 'Retype password'\n" "do not match. Retype the password." @@ -406,7 +421,7 @@ "不匹配。请重键入口令。" #. special value as we do not know password, so it mean user do not change it -#: src/lib/bootloader/grub2_widgets.rb:433 +#: src/lib/bootloader/grub2_widgets.rb:437 msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" "At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved). As side-effect of this option, rd.shell=0 is added to kernel parameters, to prevent an unauthorized access to the initrd shell.<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>" @@ -415,7 +430,7 @@ "在引导时，修改甚至引导任何项都需要提供密码。若勾选<b>仅防止修改引导项</b>则引导任何项都不受限制，但修改项需要提供密码 (这是 GRUB 1 的行为方式)。此选项的副作用是向内核参数里添加了 rd.shell-0，阻止了对 initrd 壳层的非授权访问。<br>仅当您在<b>重新输入密码</b>中重复输入了密码后，YaST 才会接受该密码。该密码适用于 GRUB2 用户 'root'，其与 Linux 用户 'root' 不同。YaST 目前不支持其他 GRUB2 用户。若您需要用到它们，请使用一个单独的 GRUB2 脚本。</p>" #. Translators: do not translate the quoted parts like "unit" -#: src/lib/bootloader/grub2_widgets.rb:466 +#: src/lib/bootloader/grub2_widgets.rb:470 msgid "" "<p>When a graphical console is used it allows to use various display resolutions. The <tt>auto</tt> option tries to find the best one when booting starts.</p>\n" "<p>When a serial console is used the boot output will be printed to a serial device like <tt>ttyS0</tt>. At least the <tt>--unit</tt> option has to be specified, and the complete syntax is <tt>%s</tt>. Other parts are optional and if not set, a default is used. <tt>NUM</tt> in commands stands for a positive number like 8. Example parameters are <tt>serial --speed=38400 --unit=0</tt>.</p>" @@ -424,12 +439,12 @@ "<p>使用串行控制台时，引导输出会打印到类似 <tt>ttyS0</tt> 的串行设备上。完整语法为 <tt>%s</tt>。除 <tt>--unit</tt> 选项必须指定外，其他部分均为可选项（如果不设置，将会使用默认值）。命令中的 <tt>NUM</tt> 表示某个正数，如 8。参数示例：<tt>serial --speed=38400 --unit=0</tt>。</p>" #. there's mode specified, use it -#: src/lib/bootloader/grub2_widgets.rb:503 +#: src/lib/bootloader/grub2_widgets.rb:507 msgid "To enable serial console you must provide the corresponding arguments." msgstr "要启用串行控制台，您必须提供相应的参数。" #. Translators: do not translate "unit" -#: src/lib/bootloader/grub2_widgets.rb:510 +#: src/lib/bootloader/grub2_widgets.rb:514 msgid "" "To enable the serial console you must provide the corresponding arguments.\n" "The \"unit\" argument is required, the complete syntax is:\n" @@ -439,7 +454,7 @@ "需要指定“unit”自变量，完整的语法为：\n" "%s" -#: src/lib/bootloader/grub2_widgets.rb:551 +#: src/lib/bootloader/grub2_widgets.rb:555 msgid "Choose new graphical theme file" msgstr "选择新图形主题文件" @@ -447,40 +462,40 @@ #. to be substituted in a command like #. "serial --unit=NUM --speed=NUM --parity={odd|even|no} --word=NUM --stop=NUM" #. so do not use punctuation -#: src/lib/bootloader/grub2_widgets.rb:567 +#: src/lib/bootloader/grub2_widgets.rb:571 msgid "NUM" msgstr "NUM" -#: src/lib/bootloader/grub2_widgets.rb:574 +#: src/lib/bootloader/grub2_widgets.rb:578 msgid "Use &graphical console" msgstr "使用图形控制台(&G)" -#: src/lib/bootloader/grub2_widgets.rb:579 +#: src/lib/bootloader/grub2_widgets.rb:583 msgid "&Console resolution" msgstr "控制台分辨率(&C)" -#: src/lib/bootloader/grub2_widgets.rb:584 +#: src/lib/bootloader/grub2_widgets.rb:588 msgid "&Console theme" msgstr "控制台主题(&C)" -#: src/lib/bootloader/grub2_widgets.rb:615 +#: src/lib/bootloader/grub2_widgets.rb:619 msgid "Autodetect by grub2" msgstr "由 grub2 自动检测" -#: src/lib/bootloader/grub2_widgets.rb:623 +#: src/lib/bootloader/grub2_widgets.rb:627 msgid "Use &serial console" msgstr "使用串行控制台(&S)" -#: src/lib/bootloader/grub2_widgets.rb:630 +#: src/lib/bootloader/grub2_widgets.rb:634 msgid "&Console arguments" msgstr "控制台参数(&C)" #. represent choosing default section to boot -#: src/lib/bootloader/grub2_widgets.rb:647 +#: src/lib/bootloader/grub2_widgets.rb:651 msgid "&Default Boot Section" msgstr "默认引导部分(&D)" -#: src/lib/bootloader/grub2_widgets.rb:651 +#: src/lib/bootloader/grub2_widgets.rb:655 msgid "" "<p> By pressing <b>Set as Default</b> you mark the selected section as\n" "the default. When booting, the boot loader will provide a boot menu and\n" @@ -497,40 +512,40 @@ "菜单中各部分的顺序。</p>\n" #. Represents stage1 location for bootloader -#: src/lib/bootloader/grub2_widgets.rb:686 +#: src/lib/bootloader/grub2_widgets.rb:690 msgid "Boot Loader Location" msgstr "引导加载程序位置" -#: src/lib/bootloader/grub2_widgets.rb:740 +#: src/lib/bootloader/grub2_widgets.rb:744 msgid "Custom boot device have to be specied if checked" msgstr "如果选中，则必须指定自定义引导设备" -#: src/lib/bootloader/grub2_widgets.rb:768 +#: src/lib/bootloader/grub2_widgets.rb:772 msgid "Boo&t from Boot Partition" msgstr "从引导分区引导(&T)" -#: src/lib/bootloader/grub2_widgets.rb:769 +#: src/lib/bootloader/grub2_widgets.rb:773 msgid "Boo&t from Root Partition" msgstr "从根分区引导(&T)" -#: src/lib/bootloader/grub2_widgets.rb:770 +#: src/lib/bootloader/grub2_widgets.rb:774 msgid "Boot from &Master Boot Record" msgstr "从主引导记录引导(&M)" -#: src/lib/bootloader/grub2_widgets.rb:771 +#: src/lib/bootloader/grub2_widgets.rb:775 msgid "Boot from &Extended Partition" msgstr "从扩展分区引导(&E)" -#: src/lib/bootloader/grub2_widgets.rb:782 +#: src/lib/bootloader/grub2_widgets.rb:786 msgid "C&ustom Boot Partition" msgstr "自定义引导分区(&U)" #. Represents button that open Device Map edit dialog -#: src/lib/bootloader/grub2_widgets.rb:795 +#: src/lib/bootloader/grub2_widgets.rb:799 msgid "&Edit Disk Boot Order" msgstr "编辑磁盘引导顺序(&E)" -#: src/lib/bootloader/grub2_widgets.rb:801 +#: src/lib/bootloader/grub2_widgets.rb:805 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" @@ -545,17 +560,17 @@ "要去除磁盘，请按<b>去除</b>。</p>" #. represents Tab with kernel related configuration -#: src/lib/bootloader/grub2_widgets.rb:822 +#: src/lib/bootloader/grub2_widgets.rb:826 msgid "&Kernel Parameters" msgstr "内核参数(&K)" #. Represent tab with options related to stage1 location and bootloader type -#: src/lib/bootloader/grub2_widgets.rb:847 +#: src/lib/bootloader/grub2_widgets.rb:851 msgid "Boot Co&de Options" msgstr "引导代码选项(&D)" #. Represents bootloader specific options like its timeout, default section or password protection -#: src/lib/bootloader/grub2_widgets.rb:913 +#: src/lib/bootloader/grub2_widgets.rb:921 msgid "Boot&loader Options" msgstr "引导加载程序选项(&L)" Modified: branches/SLE12-SP3/yast/zh_CN/po/cio.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/cio.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/cio.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: cio\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-21 00:29+0000\n" +"POT-Creation-Date: 2017-05-17 17:45+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -40,13 +40,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: branches/SLE12-SP3/yast/zh_CN/po/cluster.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/cluster.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/cluster.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: cluster\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 18:26+0200\n" +"POT-Creation-Date: 2017-04-06 02:28+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -92,7 +92,7 @@ msgid "Redundant IP Address" msgstr "冗余 IP 地址" -#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501 +#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:504 msgid "Node ID" msgstr "节点 ID" @@ -124,7 +124,7 @@ msgstr "当配置了多路广播传输时，必须填写预期投票数" #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256 -#: src/include/cluster/dialogs.rb:1429 +#: src/include/cluster/dialogs.rb:1432 msgid "The Multicast Address has to be fulfilled" msgstr "必须填写多路广播地址" @@ -137,61 +137,61 @@ msgstr "仅当使用多个接口时，才可以选择被动或主动。请设置为被动。" #. BNC#871970, change member address struct to memberaddr -#: src/include/cluster/dialogs.rb:441 +#: src/include/cluster/dialogs.rb:444 msgid "Transport:" msgstr "传输：" -#: src/include/cluster/dialogs.rb:449 +#: src/include/cluster/dialogs.rb:452 msgid "Channel" msgstr "通道" -#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475 +#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:478 msgid "Bind Network Address:" msgstr "绑定网络地址：" -#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478 -#: src/include/cluster/dialogs.rb:1365 +#: src/include/cluster/dialogs.rb:463 src/include/cluster/dialogs.rb:481 +#: src/include/cluster/dialogs.rb:1368 msgid "Multicast Address:" msgstr "多路广播地址：" -#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479 -msgid "Multicast Port:" -msgstr "多路广播端口：" +#: src/include/cluster/dialogs.rb:465 src/include/cluster/dialogs.rb:482 +msgid "Port:" +msgstr "端口：" -#: src/include/cluster/dialogs.rb:469 +#: src/include/cluster/dialogs.rb:472 msgid "Redundant Channel" msgstr "冗余通道" -#: src/include/cluster/dialogs.rb:485 +#: src/include/cluster/dialogs.rb:488 msgid "Cluster Name:" msgstr "群集名称：" -#: src/include/cluster/dialogs.rb:486 +#: src/include/cluster/dialogs.rb:489 msgid "Expected Votes:" msgstr "预期投票数：" -#: src/include/cluster/dialogs.rb:490 +#: src/include/cluster/dialogs.rb:493 msgid "rrp mode:" msgstr "rrp 模式：" -#: src/include/cluster/dialogs.rb:495 +#: src/include/cluster/dialogs.rb:498 msgid "Auto Generate Node ID" msgstr "自动生成节点 ID" -#: src/include/cluster/dialogs.rb:500 +#: src/include/cluster/dialogs.rb:503 msgid "Member Address:" msgstr "成员地址：" -#: src/include/cluster/dialogs.rb:501 +#: src/include/cluster/dialogs.rb:504 msgid "IP" msgstr "IP" -#: src/include/cluster/dialogs.rb:501 +#: src/include/cluster/dialogs.rb:504 msgid "Redundant IP" msgstr "冗余 IP" #. BNC#879596, check the corosync.conf format -#: src/include/cluster/dialogs.rb:541 +#: src/include/cluster/dialogs.rb:544 msgid "" " NOTICE: Detected old corosync configuration.\n" " Please reconfigure the member list and confirm all other settings." @@ -200,123 +200,123 @@ "请重配置成员列表并确认所有其他设置。" #. Notice, current could be "nil" if the list is empty. -#: src/include/cluster/dialogs.rb:717 +#: src/include/cluster/dialogs.rb:720 msgid "Enable Security Auth" msgstr "启用安全身份验证" -#: src/include/cluster/dialogs.rb:721 +#: src/include/cluster/dialogs.rb:724 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." msgstr "对新建的群集按下面的按钮可生成 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:726 +#: src/include/cluster/dialogs.rb:729 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." msgstr "要加入一个已有群集，请从其他节点手动复制 /etc/corosync/authkey。" -#: src/include/cluster/dialogs.rb:752 +#: src/include/cluster/dialogs.rb:755 msgid "Failed to create /etc/corosync/authkey" msgstr "无法创建 /etc/corosync/authkey" -#: src/include/cluster/dialogs.rb:754 +#: src/include/cluster/dialogs.rb:757 msgid "Create /etc/corosync/authkey succeeded" msgstr "创建 /etc/corosync/authkey 成功" -#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885 +#: src/include/cluster/dialogs.rb:818 src/include/cluster/dialogs.rb:888 msgid "Running" msgstr "正在运行" -#: src/include/cluster/dialogs.rb:817 +#: src/include/cluster/dialogs.rb:820 msgid "Not running" msgstr "未运行" #. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster -#: src/include/cluster/dialogs.rb:853 +#: src/include/cluster/dialogs.rb:856 msgid "Booting" msgstr "正在引导" -#: src/include/cluster/dialogs.rb:863 +#: src/include/cluster/dialogs.rb:866 msgid "On -- Start pacemaker during boot" msgstr "开 -- 引导期间启动 Pacemaker" -#: src/include/cluster/dialogs.rb:870 +#: src/include/cluster/dialogs.rb:873 msgid "Off -- Start pacemaker manually" msgstr "关 -- 手动启动 Pacemaker" -#: src/include/cluster/dialogs.rb:879 +#: src/include/cluster/dialogs.rb:882 msgid "Switch On and Off" msgstr "打开和关闭" -#: src/include/cluster/dialogs.rb:884 +#: src/include/cluster/dialogs.rb:887 msgid "Current Status: " msgstr "当前状态：" -#: src/include/cluster/dialogs.rb:893 +#: src/include/cluster/dialogs.rb:896 msgid "Start pacemaker Now" msgstr "立即启动 pacemaker" -#: src/include/cluster/dialogs.rb:894 +#: src/include/cluster/dialogs.rb:897 msgid "Stop pacemaker Now" msgstr "立即停止 pacemaker" #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed -#: src/include/cluster/dialogs.rb:992 +#: src/include/cluster/dialogs.rb:995 msgid "Sync Host" msgstr "同步主机" -#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008 +#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011 msgid "Add" msgstr "添加" -#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009 +#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012 msgid "Del" msgstr "删除" -#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010 +#: src/include/cluster/dialogs.rb:1001 src/include/cluster/dialogs.rb:1013 msgid "Edit" msgstr "编辑" -#: src/include/cluster/dialogs.rb:1004 +#: src/include/cluster/dialogs.rb:1007 msgid "Sync File" msgstr "同步文件" -#: src/include/cluster/dialogs.rb:1011 +#: src/include/cluster/dialogs.rb:1014 msgid "Add Suggested Files" msgstr "添加建议的文件" -#: src/include/cluster/dialogs.rb:1020 +#: src/include/cluster/dialogs.rb:1023 msgid "Generate Pre-Shared-Keys" msgstr "生成预共享密钥" #. remove duplicated elements -#: src/include/cluster/dialogs.rb:1145 +#: src/include/cluster/dialogs.rb:1148 msgid "Csync2 Status Unknown" msgstr "Csync2 状态未知" -#: src/include/cluster/dialogs.rb:1148 +#: src/include/cluster/dialogs.rb:1151 msgid "Turn csync2 ON" msgstr "开启 csync2" -#: src/include/cluster/dialogs.rb:1151 +#: src/include/cluster/dialogs.rb:1154 msgid "Turn csync2 OFF" msgstr "关闭 csync2" -#: src/include/cluster/dialogs.rb:1181 +#: src/include/cluster/dialogs.rb:1184 msgid "Enter a hostname" msgstr "请输入一个主机名" -#: src/include/cluster/dialogs.rb:1195 +#: src/include/cluster/dialogs.rb:1198 msgid "Edit the hostname" msgstr "编辑主机名" -#: src/include/cluster/dialogs.rb:1209 +#: src/include/cluster/dialogs.rb:1212 msgid "Enter a filename to synchronize" msgstr "请输入要同步的文件名" -#: src/include/cluster/dialogs.rb:1224 +#: src/include/cluster/dialogs.rb:1227 msgid "Edit the filename" msgstr "编辑文件名" #. key file exist -#: src/include/cluster/dialogs.rb:1256 +#: src/include/cluster/dialogs.rb:1259 msgid "" "Key file %1 already exist.\n" "Do you want to overwrite it?" @@ -325,12 +325,12 @@ "您想要覆盖它吗？" #. remove exist key file -#: src/include/cluster/dialogs.rb:1266 +#: src/include/cluster/dialogs.rb:1269 msgid "Delete key file %1 failed." msgstr "未能删除密钥文件 %1。" #. generate key file -#: src/include/cluster/dialogs.rb:1280 +#: src/include/cluster/dialogs.rb:1283 msgid "" "Key file %1 is generated.\n" "Clicking \"Add Suggested Files\" button adds it to sync list." @@ -338,12 +338,12 @@ "已生成密钥文件 %1。\n" "单击“添加建议的文件”按钮将它添加到同步列表。" -#: src/include/cluster/dialogs.rb:1287 +#: src/include/cluster/dialogs.rb:1290 msgid "Key generation failed." msgstr "未能生成密钥。" #. SaveCsync2(); -#: src/include/cluster/dialogs.rb:1349 +#: src/include/cluster/dialogs.rb:1352 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" @@ -353,23 +353,23 @@ "YaST 可以帮助配置 conntrackd 的某些基本设置。\n" "您需要使用 ocf:heartbeat:conntrackd 将它启动。" -#: src/include/cluster/dialogs.rb:1360 +#: src/include/cluster/dialogs.rb:1363 msgid "Dedicated Interface:" msgstr "专用接口：" -#: src/include/cluster/dialogs.rb:1363 +#: src/include/cluster/dialogs.rb:1366 msgid "IP:" msgstr "IP：" -#: src/include/cluster/dialogs.rb:1366 +#: src/include/cluster/dialogs.rb:1369 msgid "Group Number:" msgstr "组编号：" -#: src/include/cluster/dialogs.rb:1370 +#: src/include/cluster/dialogs.rb:1373 msgid "Generate /etc/conntrackd/conntrackd.conf" msgstr "生成 /etc/conntrackd/conntrackd.conf" -#: src/include/cluster/dialogs.rb:1437 +#: src/include/cluster/dialogs.rb:1440 msgid "The Group Number must be a positive integer" msgstr "组编号必须是正整数" @@ -588,3 +588,6 @@ #: src/modules/Cluster.rb:536 msgid "Cannot write settings." msgstr "无法写入设置。" + +#~ msgid "Multicast Port:" +#~ msgstr "多路广播端口：" Modified: branches/SLE12-SP3/yast/zh_CN/po/control.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/control.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/control.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-20 17:12+0200\n" +"POT-Creation-Date: 2017-05-16 19:52+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -58,10 +58,16 @@ #. TRANSLATORS: dialog help #: control/control.SLES.glade.translations.glade:21 +#, fuzzy +#| msgid "" +#| "<p>The system roles adjustments are in the range from package selection up \n" +#| "to disk partitioning. By choosing a system role, the system is \n" +#| "configured accordingly to match the use case of the role. The settings \n" +#| "defined by a role can be overridden in the next steps if necessary.</p>" msgid "" -"<p>The system roles adjustments are in the range from package selection up \n" -"to disk partitioning. By choosing a system role, the system is \n" -"configured accordingly to match the use case of the role. The settings \n" +"<p>The system roles adjustments are in the range from package selection up\n" +"to disk partitioning. By choosing a system role, the system is\n" +"configured accordingly to match the use case of the role. The settings\n" "defined by a role can be overridden in the next steps if necessary.</p>" msgstr "" "<p>系统角色的调整范围从包选择到磁盘分区。\n" @@ -111,10 +117,8 @@ #: control/control.SLES.glade.translations.glade:37 #: control/control.SLES.glade.translations.glade:38 #: control/control.SLES.glade.translations.glade:39 +#: control/control.SLES.glade.translations.glade:43 #: control/control.SLES.glade.translations.glade:44 -#: control/control.SLES.glade.translations.glade:45 -#: control/control.SLES.glade.translations.glade:82 -#: control/control.SLES.glade.translations.glade:83 msgid "Installation Settings" msgstr "安装设置" @@ -127,183 +131,167 @@ msgstr "专家" #: control/control.SLES.glade.translations.glade:42 -msgid "Live Installation Settings" -msgstr "在线安装设置" - -#: control/control.SLES.glade.translations.glade:43 msgid "Update Settings" msgstr "更新设置" +#: control/control.SLES.glade.translations.glade:45 #: control/control.SLES.glade.translations.glade:46 -#: control/control.SLES.glade.translations.glade:47 msgid "Network Configuration" msgstr "网络配置" -#: control/control.SLES.glade.translations.glade:48 +#: control/control.SLES.glade.translations.glade:47 msgid "Network Services Configuration" msgstr "网络服务配置" +#: control/control.SLES.glade.translations.glade:48 #: control/control.SLES.glade.translations.glade:49 #: control/control.SLES.glade.translations.glade:50 -#: control/control.SLES.glade.translations.glade:51 msgid "Hardware Configuration" msgstr "硬件配置" -#: control/control.SLES.glade.translations.glade:52 -#: control/control.SLES.glade.translations.glade:89 -#: control/control.SLES.glade.translations.glade:119 +#: control/control.SLES.glade.translations.glade:51 +#: control/control.SLES.glade.translations.glade:74 +#: control/control.SLES.glade.translations.glade:104 msgid "Preparation" msgstr "准备" -#: control/control.SLES.glade.translations.glade:53 -#: control/control.SLES.glade.translations.glade:76 -#: control/control.SLES.glade.translations.glade:90 +#: control/control.SLES.glade.translations.glade:52 +#: control/control.SLES.glade.translations.glade:75 msgid "Load Linuxrc Network Configuration" msgstr "装载 Linuxrc 网络配置" -#: control/control.SLES.glade.translations.glade:54 -#: control/control.SLES.glade.translations.glade:77 -#: control/control.SLES.glade.translations.glade:91 +#: control/control.SLES.glade.translations.glade:53 +#: control/control.SLES.glade.translations.glade:76 msgid "Network Autosetup" msgstr "网络自动设置" -#: control/control.SLES.glade.translations.glade:55 -#: control/control.SLES.glade.translations.glade:92 -#: control/control.SLES.glade.translations.glade:108 -#: control/control.SLES.glade.translations.glade:120 +#: control/control.SLES.glade.translations.glade:54 +#: control/control.SLES.glade.translations.glade:77 +#: control/control.SLES.glade.translations.glade:93 +#: control/control.SLES.glade.translations.glade:105 msgid "Installer Update" msgstr "安装程序更新" -#: control/control.SLES.glade.translations.glade:56 +#: control/control.SLES.glade.translations.glade:55 #: control/control.SLES.glade.translations.glade:78 -#: control/control.SLES.glade.translations.glade:93 msgid "Welcome" msgstr "欢迎" -#: control/control.SLES.glade.translations.glade:57 +#: control/control.SLES.glade.translations.glade:56 #: control/control.SLES.glade.translations.glade:79 -#: control/control.SLES.glade.translations.glade:94 msgid "Network Activation" msgstr "网络激活" -#: control/control.SLES.glade.translations.glade:58 -#: control/control.SLES.glade.translations.glade:95 +#: control/control.SLES.glade.translations.glade:57 +#: control/control.SLES.glade.translations.glade:80 msgid "Disk Activation" msgstr "磁盘激活" +#: control/control.SLES.glade.translations.glade:58 #: control/control.SLES.glade.translations.glade:59 -#: control/control.SLES.glade.translations.glade:60 -#: control/control.SLES.glade.translations.glade:96 -#: control/control.SLES.glade.translations.glade:121 +#: control/control.SLES.glade.translations.glade:81 +#: control/control.SLES.glade.translations.glade:106 msgid "System Analysis" msgstr "系统分析" -#: control/control.SLES.glade.translations.glade:61 -#: control/control.SLES.glade.translations.glade:98 +#: control/control.SLES.glade.translations.glade:60 +#: control/control.SLES.glade.translations.glade:83 msgid "Add-On Products" msgstr "外接式附件" -#: control/control.SLES.glade.translations.glade:62 -#: control/control.SLES.glade.translations.glade:80 +#: control/control.SLES.glade.translations.glade:61 msgid "Disk" msgstr "磁盘" -#: control/control.SLES.glade.translations.glade:63 -#: control/control.SLES.glade.translations.glade:81 +#: control/control.SLES.glade.translations.glade:62 msgid "Time Zone" msgstr "时区" -#: control/control.SLES.glade.translations.glade:64 -#: control/control.SLES.glade.translations.glade:75 +#: control/control.SLES.glade.translations.glade:63 msgid "Installation" msgstr "安装" -#: control/control.SLES.glade.translations.glade:65 +#: control/control.SLES.glade.translations.glade:64 msgid "Installation Summary" msgstr "安装摘要" +#: control/control.SLES.glade.translations.glade:65 #: control/control.SLES.glade.translations.glade:66 -#: control/control.SLES.glade.translations.glade:67 +#: control/control.SLES.glade.translations.glade:68 #: control/control.SLES.glade.translations.glade:69 #: control/control.SLES.glade.translations.glade:70 #: control/control.SLES.glade.translations.glade:71 #: control/control.SLES.glade.translations.glade:72 #: control/control.SLES.glade.translations.glade:73 -#: control/control.SLES.glade.translations.glade:74 -#: control/control.SLES.glade.translations.glade:84 -#: control/control.SLES.glade.translations.glade:85 -#: control/control.SLES.glade.translations.glade:86 -#: control/control.SLES.glade.translations.glade:87 -#: control/control.SLES.glade.translations.glade:88 -#: control/control.SLES.glade.translations.glade:112 -#: control/control.SLES.glade.translations.glade:113 -#: control/control.SLES.glade.translations.glade:115 -#: control/control.SLES.glade.translations.glade:116 -#: control/control.SLES.glade.translations.glade:117 -#: control/control.SLES.glade.translations.glade:118 -#: control/control.SLES.glade.translations.glade:135 -#: control/control.SLES.glade.translations.glade:136 +#: control/control.SLES.glade.translations.glade:97 +#: control/control.SLES.glade.translations.glade:98 +#: control/control.SLES.glade.translations.glade:100 +#: control/control.SLES.glade.translations.glade:101 +#: control/control.SLES.glade.translations.glade:102 +#: control/control.SLES.glade.translations.glade:103 +#: control/control.SLES.glade.translations.glade:120 +#: control/control.SLES.glade.translations.glade:121 msgid "Perform Installation" msgstr "执行安装" -#: control/control.SLES.glade.translations.glade:68 -#: control/control.SLES.glade.translations.glade:103 -#: control/control.SLES.glade.translations.glade:114 -#: control/control.SLES.glade.translations.glade:130 +#: control/control.SLES.glade.translations.glade:67 +#: control/control.SLES.glade.translations.glade:88 +#: control/control.SLES.glade.translations.glade:99 +#: control/control.SLES.glade.translations.glade:115 msgid "Installer Cleanup" msgstr "安装程序清理" -#: control/control.SLES.glade.translations.glade:97 -#: control/control.SLES.glade.translations.glade:122 +#: control/control.SLES.glade.translations.glade:82 +#: control/control.SLES.glade.translations.glade:107 msgid "System for Update" msgstr "更新系统" -#: control/control.SLES.glade.translations.glade:99 -#: control/control.SLES.glade.translations.glade:125 +#: control/control.SLES.glade.translations.glade:84 +#: control/control.SLES.glade.translations.glade:110 msgid "Update" msgstr "更新" -#: control/control.SLES.glade.translations.glade:100 +#: control/control.SLES.glade.translations.glade:85 msgid "Update Summary" msgstr "更新摘要" -#: control/control.SLES.glade.translations.glade:101 -#: control/control.SLES.glade.translations.glade:102 -#: control/control.SLES.glade.translations.glade:104 -#: control/control.SLES.glade.translations.glade:105 -#: control/control.SLES.glade.translations.glade:106 -#: control/control.SLES.glade.translations.glade:127 -#: control/control.SLES.glade.translations.glade:128 -#: control/control.SLES.glade.translations.glade:129 -#: control/control.SLES.glade.translations.glade:131 -#: control/control.SLES.glade.translations.glade:132 -#: control/control.SLES.glade.translations.glade:133 -#: control/control.SLES.glade.translations.glade:134 -#: control/control.SLES.glade.translations.glade:139 -#: control/control.SLES.glade.translations.glade:140 +#: control/control.SLES.glade.translations.glade:86 +#: control/control.SLES.glade.translations.glade:87 +#: control/control.SLES.glade.translations.glade:89 +#: control/control.SLES.glade.translations.glade:90 +#: control/control.SLES.glade.translations.glade:91 +#: control/control.SLES.glade.translations.glade:112 +#: control/control.SLES.glade.translations.glade:113 +#: control/control.SLES.glade.translations.glade:114 +#: control/control.SLES.glade.translations.glade:116 +#: control/control.SLES.glade.translations.glade:117 +#: control/control.SLES.glade.translations.glade:118 +#: control/control.SLES.glade.translations.glade:119 +#: control/control.SLES.glade.translations.glade:124 +#: control/control.SLES.glade.translations.glade:125 msgid "Perform Update" msgstr "执行更新" -#: control/control.SLES.glade.translations.glade:107 +#: control/control.SLES.glade.translations.glade:92 msgid "Base Installation" msgstr "基本安装" +#: control/control.SLES.glade.translations.glade:94 +#: control/control.SLES.glade.translations.glade:95 +#: control/control.SLES.glade.translations.glade:96 +#: control/control.SLES.glade.translations.glade:108 #: control/control.SLES.glade.translations.glade:109 -#: control/control.SLES.glade.translations.glade:110 #: control/control.SLES.glade.translations.glade:111 -#: control/control.SLES.glade.translations.glade:123 -#: control/control.SLES.glade.translations.glade:124 -#: control/control.SLES.glade.translations.glade:126 msgid "AutoYaST Settings" msgstr "AutoYaST 设置" -#: control/control.SLES.glade.translations.glade:137 -#: control/control.SLES.glade.translations.glade:141 +#: control/control.SLES.glade.translations.glade:122 +#: control/control.SLES.glade.translations.glade:126 msgid "Configuration" msgstr "配置" -#: control/control.SLES.glade.translations.glade:138 -#: control/control.SLES.glade.translations.glade:142 +#: control/control.SLES.glade.translations.glade:123 +#: control/control.SLES.glade.translations.glade:127 msgid "System Configuration" msgstr "系统配置" @@ -331,18 +319,17 @@ "</p>\n" " " -#: control/control.SLED.glade.translations.glade:26 -#: control/control.SLED.glade.translations.glade:52 -#: control/control.SLED.glade.translations.glade:66 +#: control/control.SLED.glade.translations.glade:25 +#: control/control.SLED.glade.translations.glade:51 msgid "Load linuxrc Network Configuration" msgstr "装载 linuxrc 网络配置" +#: control/control.SLED.glade.translations.glade:36 #: control/control.SLED.glade.translations.glade:37 -#: control/control.SLED.glade.translations.glade:38 msgid "User Settings" msgstr "用户设置" -#: control/control.SLED.glade.translations.glade:39 +#: control/control.SLED.glade.translations.glade:38 msgid "Installation Overview" msgstr "安装概述" @@ -406,7 +393,9 @@ msgid "KDE Plasma Desktop" msgstr "KDE Plasma 桌面" +#. TRANSLATORS: a label for a system role #: control/control.openSUSE.glade.translations.glade:23 +#: control/control.openSUSE.glade.translations.glade:49 msgid "Server (Text Mode)" msgstr "服务器（文本模式）" @@ -426,11 +415,111 @@ msgid "Enlightenment Desktop" msgstr "Enlightenment 桌面" +#. TRANSLATORS: dialog caption +#: control/control.openSUSE.glade.translations.glade:29 +#: control/control.openSUSE.glade.translations.glade:72 +#, fuzzy +#| msgid "Computer" +msgid "Computer Role" +msgstr "计算机" + +#. TRANSLATORS: label in a dialog +#: control/control.openSUSE.glade.translations.glade:31 +#, fuzzy +#| msgid "" +#| "System Roles are predefined use cases which tailor the system\n" +#| "for the selected scenario." +msgid "" +"Computer Role is a predefined use case which tailor the system\n" +"for the selected scenario." +msgstr "" +"系统角色是预定义的用例，这些用例会调整系统以便适用于\n" +"选定的方案。" + +#. TRANSLATORS: dialog help +#: control/control.openSUSE.glade.translations.glade:34 +#, fuzzy +#| msgid "" +#| "<p>The system roles adjustments are in the range from package selection up \n" +#| "to disk partitioning. By choosing a system role, the system is \n" +#| "configured accordingly to match the use case of the role. The settings \n" +#| "defined by a role can be overridden in the next steps if necessary.</p>" +msgid "" +"<p>The computer role adjustments are in the range from package selection up\n" +"to running additional services. By choosing a computer role, the system is\n" +"configured accordingly to match the use case of the role. For the <em>Custom</em> role\n" +"an additional dialog is displayed which allows manual software pattern selection. </p>" +msgstr "" +"<p>系统角色的调整范围从包选择到磁盘分区。\n" +"通过选择某个系统角色，系统会进行相应地配置以符合该角色的用例。\n" +"如果需要，可在后续步骤中覆盖角色所定义的设置。\n" +"</p>" + +#. TRANSLATORS: a label for a system role +#: control/control.openSUSE.glade.translations.glade:39 +msgid "Workstation with KDE Plasma" +msgstr "" + +#: control/control.openSUSE.glade.translations.glade:40 +#, fuzzy +#| msgid "" +#| "KDE is a powerful and intuitive desktop\n" +#| "environment that uses Kontact as mailer,\n" +#| "Dolphin as file manager, and offers\n" +#| "both Firefox and Konqueror as Web browsers.\n" +msgid "" +"KDE is a powerful and intuitive desktop environment that uses Kontact as mailer,\n" +"Dolphin as file manager, and offers both Firefox and Konqueror as Web browsers.\n" +" " +msgstr "" +"KDE 是一个强大而直观的桌面环境，\n" +"它使用 Kontact 作为邮件程序，Dolphin 作为文件管理器，\n" +"并同时提供 Firefox 和 Konqueror 作为 Web 浏览器。\n" + +#. TRANSLATORS: a label for a system role +#: control/control.openSUSE.glade.translations.glade:44 +msgid "Workstation with GNOME" +msgstr "" + #: control/control.openSUSE.glade.translations.glade:45 -#: control/control.openSUSE.glade.translations.glade:71 +#, fuzzy +#| msgid "" +#| "GNOME is a powerful and intuitive desktop\n" +#| "environment that uses Evolution as mailer,\n" +#| "Firefox as browser, and Nautilus as file manager.\n" +msgid "" +"GNOME is a powerful and intuitive desktop environment that uses Evolution as mailer,\n" +"Firefox as browser, and Nautilus as file manager.\n" +" " +msgstr "" +"GNOME 是一个强大而直观的桌面环境，\n" +"它使用 Evolution 作为邮件程序，Firefox 作为浏览器，Nautilus 作为文件管理器。\n" + +#: control/control.openSUSE.glade.translations.glade:50 +msgid "Server is usefull when computer should not have interaction with user and have only command line." +msgstr "" + +#. TRANSLATORS: a label for a system role +#: control/control.openSUSE.glade.translations.glade:52 +msgid "Custom" +msgstr "自定义" + +#: control/control.openSUSE.glade.translations.glade:53 +msgid "Custom role runs additional dialog where user can select software that fits his requirements." +msgstr "" + +#: control/control.openSUSE.glade.translations.glade:74 +#, fuzzy +#| msgid "Server Pattern Selection" +msgid "Custom Pattern Selection" +msgstr "服务器模式选择" + +#: control/control.openSUSE.glade.translations.glade:98 msgid "Online Repositories" msgstr "联机储存库" -#: control/control.openSUSE.glade.translations.glade:47 -msgid "Desktop Selection" -msgstr "桌面选择" +#~ msgid "Live Installation Settings" +#~ msgstr "在线安装设置" + +#~ msgid "Desktop Selection" +#~ msgstr "桌面选择" Modified: branches/SLE12-SP3/yast/zh_CN/po/country.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/country.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/country.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-25 02:28+0000\n" +"POT-Creation-Date: 2017-05-17 19:06+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -41,7 +41,7 @@ #. summary label #. summary label -#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1388 +#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402 msgid "Current Keyboard Layout: %1" msgstr "当前键盘布局：%1" @@ -57,11 +57,9 @@ #. menue label text #. title for selection box 'keyboard layout' -#. widget label #. menu button label #: keyboard/src/clients/keyboard_proposal.rb:93 #: keyboard/src/include/keyboard/dialogs.rb:187 -#: keyboard/src/lib/y2country/widgets.rb:40 #: language/src/clients/country_simple_proposal.rb:78 msgid "&Keyboard Layout" msgstr "键盘布局(&K)" @@ -204,24 +202,12 @@ msgid "System Keyboard Configuration" msgstr "系统键盘配置" -#. help text for keyboard selection widget -#: keyboard/src/lib/y2country/widgets.rb:80 -msgid "" -"<p>\n" -"Choose the <b>Keyboard layout</b> to be used during\n" -"installation and on the installed system.\n" -"</p>\n" -msgstr "" -"<p>\n" -"选择要在安装过程中和安装好的系统上使用的<b>键盘布局</b>。\n" -"</p>\n" - #. label text: user can choose the keyboard from the updated system #. or continue with the one defined by his language. #. 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:1299 +#: 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" @@ -233,7 +219,7 @@ #. Executes the command to set the keyboard in X11, reporting #. any error to the user -#: keyboard/src/modules/Keyboard.rb:1498 +#: keyboard/src/modules/Keyboard.rb:1513 msgid "Failed to set X11 keyboard to '%s'" msgstr "无法将 X11 键盘设置为“%s”" @@ -341,8 +327,8 @@ #. summary label #. summary label -#: language/src/clients/language.rb:266 language/src/modules/Language.rb:851 -#: language/src/modules/Language.rb:885 +#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850 +#: language/src/modules/Language.rb:884 msgid "Additional Languages: %1" msgstr "其它语言：%1" @@ -602,7 +588,7 @@ #. TRANSLATORS: Error message. Strings marked %{...} will be replaced #. with variable content - do not translate them, please. -#: language/src/modules/Language.rb:407 +#: language/src/modules/Language.rb:406 msgid "" "Language '%{language}' was not found within the list of supported languages\n" "available at %{directory}.\n" @@ -616,19 +602,19 @@ #. summary label #. summary label -#: language/src/modules/Language.rb:795 language/src/modules/Language.rb:867 +#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866 msgid "Primary Language: %1" msgstr "主要语言：%1" #. work-around for following in order not to depend on yast2-packager #. PackageSlideShow::InitPkgData (false); #. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes -#: language/src/modules/Language.rb:1040 +#: language/src/modules/Language.rb:1039 msgid "Installing Packages..." msgstr "正在安装包..." #. continue/cancel message -#: language/src/modules/Language.rb:1131 +#: language/src/modules/Language.rb:1130 msgid "" "Translation of the primary language is not complete.\n" "Some texts may be displayed in English.\n" @@ -637,17 +623,18 @@ "某些文本可能显示为英文。\n" #. popup message -#: language/src/modules/Language.rb:1345 +#: language/src/modules/Language.rb:1344 msgid "" "Only minimal support for the selected language is included on this media.\n" -"Enable online repositories later in order to get the appropriate support\n" +"Add the Language add-on CD as an additional repository in order to get the appropriate support\n" "for this language.\n" msgstr "" -"此介质上仅包含对选定语言的最小支持。\n" -"稍后请启用在线软件源以获得对此语言的更好支持。\n" +"该媒体上仅包含对所选语言的最少支持。\n" +"请将语言附加 CD 添加为另一个储存库，\n" +"以获得对此语言的相应支持。\n" #. popup message (user selected CJK language in text mode) -#: language/src/modules/Language.rb:1374 +#: language/src/modules/Language.rb:1373 msgid "" "The selected language cannot be used in text mode. English is used for\n" "installation, but the selected language will be used for the new system." @@ -699,8 +686,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:749 -#: timezone/src/modules/Timezone.rb:985 +#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733 +#: timezone/src/modules/Timezone.rb:969 msgid "UTC" msgstr "UTC" @@ -956,315 +943,285 @@ #. label text, Clock setting: local time (not UTC) #. label text, Clock setting: local time (not UTC) -#: timezone/src/modules/Timezone.rb:753 timezone/src/modules/Timezone.rb:989 +#: 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:757 timezone/src/modules/Timezone.rb:993 +#: 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:771 +#: timezone/src/modules/Timezone.rb:755 msgid "NTP configured" msgstr "NTP 已配置" #. summary label -#: timezone/src/modules/Timezone.rb:997 +#: timezone/src/modules/Timezone.rb:981 msgid "Current Time Zone: %1" msgstr "当前时区：%1" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:46 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:46 +#: keyboard/src/data/keyboard_raw.ycp:35 msgid "English (US)" msgstr "英语(美国)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:58 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:58 +#: keyboard/src/data/keyboard_raw.ycp:47 msgid "English (UK)" msgstr "英语(英国)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:70 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:70 +#: keyboard/src/data/keyboard_raw.ycp:59 msgid "German" msgstr "德语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:82 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:82 +#: keyboard/src/data/keyboard_raw.ycp:71 msgid "German (with deadkeys)" msgstr "德语(带 deadkey)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:94 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:94 +#: keyboard/src/data/keyboard_raw.ycp:83 msgid "German (Switzerland)" msgstr "德语（瑞士）" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:106 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:106 +#: keyboard/src/data/keyboard_raw.ycp:95 msgid "French" msgstr "法语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:118 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:118 +#: keyboard/src/data/keyboard_raw.ycp:107 msgid "French (Switzerland)" msgstr "法语(瑞士)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:130 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:130 +#: keyboard/src/data/keyboard_raw.ycp:119 msgid "French (Canada)" msgstr "法语（加拿大）" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:143 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:143 +#: keyboard/src/data/keyboard_raw.ycp:132 msgid "Canadian (Multilingual)" msgstr "加拿大语（多语）" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:157 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:156 +#: keyboard/src/data/keyboard_raw.ycp:145 msgid "Spanish" msgstr "西班牙语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:169 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:168 +#: keyboard/src/data/keyboard_raw.ycp:157 msgid "Spanish (Latin America)" msgstr "西班牙语(拉丁美洲)" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:181 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:180 +#: keyboard/src/data/keyboard_raw.ycp:169 msgid "Spanish (CP 850)" msgstr "西班牙语 (CP 850)" #. keyboard layout +#: keyboard/src/data/keyboard_raw.ycp:181 +msgid "Spanish (Asturian variant)" +msgstr "西班牙语(阿斯图里亚变体)" + +#. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:193 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:204 msgid "Italian" msgstr "意大利语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:205 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:216 msgid "Portuguese" msgstr "葡萄牙语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:217 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:228 msgid "Portuguese (Brazil)" msgstr "葡萄牙语(巴西)" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:229 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:240 msgid "Portuguese (Brazil -- US accents)" msgstr "葡萄牙语(巴西 -- 美国口音)" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:241 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:252 msgid "Greek" msgstr "希腊语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:253 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:264 msgid "Dutch" msgstr "荷兰语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:265 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:276 msgid "Danish" msgstr "丹麦语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:277 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:288 msgid "Norwegian" msgstr "挪威语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:289 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:300 msgid "Swedish" msgstr "瑞典语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:301 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:312 msgid "Finnish" msgstr "芬兰语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:313 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:324 msgid "Czech" msgstr "捷克语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:328 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:336 msgid "Czech (qwerty)" msgstr "捷克语 (qwerty)" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:343 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:348 msgid "Slovak" msgstr "斯洛伐克语" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:358 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:360 msgid "Slovak (qwerty)" msgstr "斯洛伐克语 (qwerty)" #. keyboard layout #: keyboard/src/data/keyboard_raw.ycp:373 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:372 msgid "Slovene" msgstr "斯洛文尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:388 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:384 +#: keyboard/src/data/keyboard_raw.ycp:387 msgid "Hungarian" msgstr "匈牙利语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:403 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:396 +#: keyboard/src/data/keyboard_raw.ycp:401 msgid "Polish" msgstr "波兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:418 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:408 +#: keyboard/src/data/keyboard_raw.ycp:415 msgid "Russian" msgstr "俄语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:432 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:420 +#: keyboard/src/data/keyboard_raw.ycp:429 msgid "Serbian" msgstr "塞尔维亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:444 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:432 +#: keyboard/src/data/keyboard_raw.ycp:441 msgid "Estonian" msgstr "爱沙尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:456 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:444 +#: keyboard/src/data/keyboard_raw.ycp:453 msgid "Lithuanian" msgstr "立陶宛语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:468 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:456 +#: keyboard/src/data/keyboard_raw.ycp:465 msgid "Turkish" msgstr "土耳其语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:479 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:467 +#: keyboard/src/data/keyboard_raw.ycp:476 msgid "Croatian" msgstr "克罗地亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:502 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:479 +#: keyboard/src/data/keyboard_raw.ycp:498 msgid "Japanese" msgstr "日语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:514 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:491 +#: keyboard/src/data/keyboard_raw.ycp:510 msgid "Belgian" msgstr "比利时语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:526 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:503 +#: keyboard/src/data/keyboard_raw.ycp:522 msgid "Dvorak" msgstr "Dvorak" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:538 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:515 +#: keyboard/src/data/keyboard_raw.ycp:534 msgid "Icelandic" msgstr "冰岛语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:550 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:527 +#: keyboard/src/data/keyboard_raw.ycp:546 msgid "Ukrainian" msgstr "乌克兰语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:572 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:539 +#: keyboard/src/data/keyboard_raw.ycp:568 msgid "Khmer" msgstr "高棉语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:594 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:551 +#: keyboard/src/data/keyboard_raw.ycp:590 msgid "Korean" msgstr "韩语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:616 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:563 +#: keyboard/src/data/keyboard_raw.ycp:612 msgid "Arabic" msgstr "阿拉伯语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:637 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:574 +#: keyboard/src/data/keyboard_raw.ycp:633 msgid "Tajik" msgstr "塔吉克语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:651 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:586 +#: keyboard/src/data/keyboard_raw.ycp:647 msgid "Traditional Chinese" msgstr "繁体中文" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:673 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:598 +#: keyboard/src/data/keyboard_raw.ycp:669 msgid "Simplified Chinese" msgstr "简体中文" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:695 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:610 +#: keyboard/src/data/keyboard_raw.ycp:691 msgid "Romanian" msgstr "罗马尼亚语" #. keyboard layout -#: keyboard/src/data/keyboard_raw.ycp:716 -#: keyboard/src/data/keyboard_raw_opensuse.ycp:621 +#: keyboard/src/data/keyboard_raw.ycp:712 msgid "US International" msgstr "美国国际" -#. keyboard layout -#: keyboard/src/data/keyboard_raw_opensuse.ycp:192 -msgid "Spanish (Asturian variant)" -msgstr "西班牙语(阿斯图里亚变体)" +#~ msgid "" +#~ "<p>\n" +#~ "Choose the <b>Keyboard layout</b> to be used during\n" +#~ "installation and on the installed system.\n" +#~ "</p>\n" +#~ msgstr "" +#~ "<p>\n" +#~ "选择要在安装过程中和安装好的系统上使用的<b>键盘布局</b>。\n" +#~ "</p>\n" + +#~ msgid "" +#~ "Only minimal support for the selected language is included on this media.\n" +#~ "Enable online repositories later in order to get the appropriate support\n" +#~ "for this language.\n" +#~ msgstr "" +#~ "此介质上仅包含对选定语言的最小支持。\n" +#~ "稍后请启用在线软件源以获得对此语言的更好支持。\n" Modified: branches/SLE12-SP3/yast/zh_CN/po/firewall.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/firewall.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/firewall.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 18:27+0200\n" +"POT-Creation-Date: 2017-04-11 02:28+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -665,7 +665,7 @@ #. TRANSLATORS: combo box #. TRANSLATORS: select box #: src/include/firewall/subdialogs.rb:280 -#: src/include/firewall/uifunctions.rb:865 +#: src/include/firewall/uifunctions.rb:886 msgid "&Service to Allow" msgstr "要允许的服务(&S)" @@ -814,7 +814,7 @@ #. TRANSLATORS: select box #: src/include/firewall/subdialogs.rb:573 #: src/include/firewall/subdialogs.rb:1092 -#: src/include/firewall/uifunctions.rb:1980 +#: src/include/firewall/uifunctions.rb:2001 msgid "&Protocol" msgstr "协议(&P)" @@ -1193,55 +1193,78 @@ #. Function stops Firewall services and sets firewall #. to be stopped after exiting YaST -#: src/include/firewall/uifunctions.rb:147 +#: src/include/firewall/uifunctions.rb:148 msgid "Stopping firewall..." msgstr "正在关闭防火墙..." +#. TRANSLATORS: action which failed, used later +#: src/include/firewall/uifunctions.rb:161 +#, fuzzy +#| msgid "Device could not be opened." +msgid "The firewall could not be stopped." +msgstr "无法打开设备。" + +#. TRANSLATORS: action which failed, used later +#: src/include/firewall/uifunctions.rb:164 +#, fuzzy +#| msgid "Firewall not running or would not be started." +msgid "The firewall could not be started." +msgstr "防火墙不在运行或无法启动。" + +#. TRANSLATORS: %s is action that failed +#: src/include/firewall/uifunctions.rb:169 +#, fuzzy +#| msgid "Please install yast2-registration and try again." +msgid "" +"%s\n" +"Please verify your system and try again." +msgstr "请安装 yast2-registration 并重试。" + #. TRANSLATORS: table item, connected with firewall zone of interface -#: src/include/firewall/uifunctions.rb:184 +#: src/include/firewall/uifunctions.rb:205 msgid "No zone assigned" msgstr "未指派任何区域" #. TRANSLATORS: table item, "User defined string" instead of Device_name -#: src/include/firewall/uifunctions.rb:224 +#: src/include/firewall/uifunctions.rb:245 msgid "Custom string" msgstr "自定义字符串" #. interface could be unassigned #. TRANSLATORAS: selection box item, connected with firewall zone of interface -#: src/include/firewall/uifunctions.rb:288 +#: src/include/firewall/uifunctions.rb:309 msgid "No Zone Assigned" msgstr "未指派任何区域" #. TRANSLATORS: error message, %1 stands for the port number -#: src/include/firewall/uifunctions.rb:487 +#: src/include/firewall/uifunctions.rb:508 msgid "Port number %1 is invalid." msgstr "端口号 %1 无效。" #. TRANSLATORS: error message, %1 stands for the port number, #. %2 stands for, e.g., port range, where the wrong port definition %1 was found -#: src/include/firewall/uifunctions.rb:492 +#: src/include/firewall/uifunctions.rb:513 msgid "Port number %1 in definition %2 is invalid." msgstr "定义 %2 中的端口号 %1 无效。" #. TRANSLATORS: popup headline -#: src/include/firewall/uifunctions.rb:500 +#: src/include/firewall/uifunctions.rb:521 msgid "Invalid Port Definition" msgstr "端口定义无效" #. TRANSLATORS: popup message, %1 stands for the maximal port number #. that is possible to use in port-range -#: src/include/firewall/uifunctions.rb:506 +#: src/include/firewall/uifunctions.rb:527 msgid "The port number must be in the interval from 1 to %1 (inclusive)." msgstr "该端口号必须在从 1 到 %1（含）的间隔之间。" #. TRANSLATORS: popup headline -#: src/include/firewall/uifunctions.rb:584 +#: src/include/firewall/uifunctions.rb:605 msgid "Invalid Port Range Definition" msgstr "无效的端口范围定义" #. TRANSLATORS: popup message, %1 is a port-range defined by user -#: src/include/firewall/uifunctions.rb:587 +#: src/include/firewall/uifunctions.rb:608 msgid "" "Port range %1 is invalid.\n" "It must be defined as the min_port_number:max_port_number and\n" @@ -1252,12 +1275,12 @@ "且最大端口号必须大于最小端口号。" #. TRANSLATORS: popup headline -#: src/include/firewall/uifunctions.rb:604 +#: src/include/firewall/uifunctions.rb:625 msgid "Unknown Port Name" msgstr "未知端口名" #. TRANSLATORS: popup message, %1 is a port-name -#: src/include/firewall/uifunctions.rb:607 +#: src/include/firewall/uifunctions.rb:628 msgid "" "Port name %1 is unknown in your current system.\n" "It probably would not work.\n" @@ -1268,12 +1291,12 @@ "确实要使用该端口吗？\n" #. TRANSLATORS: popup headline -#: src/include/firewall/uifunctions.rb:636 +#: src/include/firewall/uifunctions.rb:657 msgid "Invalid Additional Service Definition" msgstr "附加服务定义无效" #. TRANSLATORS: popup message, %1 stands for the wrong settings (might be quite long) -#: src/include/firewall/uifunctions.rb:639 +#: src/include/firewall/uifunctions.rb:660 msgid "" "It appears that the additional service settings\n" "%1\n" @@ -1292,22 +1315,22 @@ #. ) #. (!IsThisExpertConfiguration() ? #. TRANSLATORS: informative label -#: src/include/firewall/uifunctions.rb:1035 +#: src/include/firewall/uifunctions.rb:1056 msgid "Masquerading needs at least one external interface and one other interface." msgstr "掩蔽至少需要一个外部接口和另一个接口。" #. TRANSLATORS: popup message -#: src/include/firewall/uifunctions.rb:1056 +#: src/include/firewall/uifunctions.rb:1077 msgid "This entry must be completed." msgstr "必须完成此项。" #. TRANSLATORS: popup message, right port definition is two lines below this message -#: src/include/firewall/uifunctions.rb:1080 +#: src/include/firewall/uifunctions.rb:1101 msgid "Wrong port definition." msgstr "端口定义错误。" #. TRANSLATORS: popup error message -#: src/include/firewall/uifunctions.rb:1107 +#: src/include/firewall/uifunctions.rb:1128 msgid "" "Wrong port definition.\n" "No port number found for this port name.\n" @@ -1318,17 +1341,17 @@ "请使用端口号而不是端口名。\n" #. TRANSLATORS: popup message, right definition is two lines below this message -#: src/include/firewall/uifunctions.rb:1136 +#: src/include/firewall/uifunctions.rb:1157 msgid "Invalid IP definition." msgstr "无效的 IP 定义。" #. TRANSLATORS: check box -#: src/include/firewall/uifunctions.rb:1463 +#: src/include/firewall/uifunctions.rb:1484 msgid "&Log Not Accepted Broadcast Packets" msgstr "记录未接受的广播包(&L)" #. TRANSLATORS: popup question -#: src/include/firewall/uifunctions.rb:1524 +#: src/include/firewall/uifunctions.rb:1545 msgid "" "Firewall automatic starting has been disabled\n" "but firewall is currently running.\n" @@ -1341,71 +1364,71 @@ "在写入新配置后停止防火墙吗？\n" #. network is mandatory -#: src/include/firewall/uifunctions.rb:1703 -#: src/include/firewall/uifunctions.rb:1910 +#: src/include/firewall/uifunctions.rb:1724 +#: src/include/firewall/uifunctions.rb:1931 msgid "Invalid network definition '%1'" msgstr "网络定义“%1”无效" #. destination port is optional #. source port is optional -#: src/include/firewall/uifunctions.rb:1721 -#: src/include/firewall/uifunctions.rb:1752 +#: src/include/firewall/uifunctions.rb:1742 +#: src/include/firewall/uifunctions.rb:1773 msgid "Invalid port range '%1'" msgstr "端口范围“%1”无效" -#: src/include/firewall/uifunctions.rb:1733 -#: src/include/firewall/uifunctions.rb:1764 -#: src/include/firewall/uifunctions.rb:1924 +#: src/include/firewall/uifunctions.rb:1754 +#: src/include/firewall/uifunctions.rb:1785 +#: src/include/firewall/uifunctions.rb:1945 msgid "Invalid port name or number '%1'" msgstr "端口名称或端口号“%1”无效" -#: src/include/firewall/uifunctions.rb:1827 +#: src/include/firewall/uifunctions.rb:1848 msgid "All services using UDP" msgstr "使用 UDP 的所有服务" -#: src/include/firewall/uifunctions.rb:1829 +#: src/include/firewall/uifunctions.rb:1850 msgid "All services using TCP" msgstr "使用 TCP 的所有服务" -#: src/include/firewall/uifunctions.rb:1831 +#: src/include/firewall/uifunctions.rb:1852 msgid "Samba browsing" msgstr "Samba 浏览" -#: src/include/firewall/uifunctions.rb:1833 +#: src/include/firewall/uifunctions.rb:1854 msgid "SLP browsing" msgstr "SLP 浏览" -#: src/include/firewall/uifunctions.rb:1845 +#: src/include/firewall/uifunctions.rb:1866 msgid "All networks" msgstr "所有网络" -#: src/include/firewall/uifunctions.rb:1847 +#: src/include/firewall/uifunctions.rb:1868 msgid "Subnet: %1" msgstr "子网：%1" #. hard-coded default -#: src/include/firewall/uifunctions.rb:1952 +#: src/include/firewall/uifunctions.rb:1973 msgid "&Zone" msgstr "区域(&Z)" -#: src/include/firewall/uifunctions.rb:1956 +#: src/include/firewall/uifunctions.rb:1977 msgid "&Network" msgstr "网络(&N)" -#: src/include/firewall/uifunctions.rb:1963 +#: src/include/firewall/uifunctions.rb:1984 msgid "&Service" msgstr "服务(&S)" -#: src/include/firewall/uifunctions.rb:1969 +#: src/include/firewall/uifunctions.rb:1990 msgid "User-defined service" msgstr "用户定义的服务" -#: src/include/firewall/uifunctions.rb:1994 +#: src/include/firewall/uifunctions.rb:2015 msgid "Po&rt" msgstr "端口(&R)" #. redraw table -#: src/include/firewall/uifunctions.rb:2089 +#: src/include/firewall/uifunctions.rb:2110 msgid "Select an item to delete." msgstr "选择要删除的项目。" Modified: branches/SLE12-SP3/yast/zh_CN/po/firstboot.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/firstboot.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/firstboot.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-21 00:29+0000\n" +"POT-Creation-Date: 2017-05-17 17:46+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -113,13 +113,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 "" Modified: branches/SLE12-SP3/yast/zh_CN/po/installation.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/installation.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/installation.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-26 01:30+0000\n" +"POT-Creation-Date: 2017-05-17 17:46+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -14,6 +14,22 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: src/lib/services-manager/clients/services-manager_finish.rb:11 +#, fuzzy +#| msgid "Adapting system services ..." +msgid "Setting default target and system services ..." +msgstr "正在调整系统服务..." + +#. Proposal client for Network configuration +#: src/lib/network/clients/network_proposal.rb:19 +#: src/lib/network/clients/network_proposal.rb:20 +msgid "Network Configuration" +msgstr "网络配置" + +#: src/lib/network/clients/network_proposal.rb:25 +msgid "preformatted_proposal" +msgstr "" + #. help for the dialog - busy message #: src/include/installation/inst_inc_all.rb:52 msgid "<p>Initializing the installation...</p>" @@ -503,7 +519,7 @@ #. download release notes now #. push button #: src/lib/installation/clients/inst_complex_welcome.rb:178 -#: src/lib/installation/clients/inst_download_release_notes.rb:137 +#: src/lib/installation/clients/inst_download_release_notes.rb:206 #: src/lib/installation/clients/inst_system_analysis.rb:294 msgid "Re&lease Notes..." msgstr "发行说明(&L)..." @@ -840,14 +856,14 @@ #. FIXME: use a better title (reused existing texts because of text freeze) #. TRANSLATORS: dialog caption #. bug #302384 -#: src/lib/installation/clients/inst_download_release_notes.rb:145 +#: src/lib/installation/clients/inst_download_release_notes.rb:214 #: src/lib/installation/clients/inst_initialization.rb:56 #: src/lib/installation/clients/inst_installation_options.rb:149 msgid "Initializing" msgstr "正在初始化" #. TRANSLATORS: dialog progress message -#: src/lib/installation/clients/inst_download_release_notes.rb:145 +#: src/lib/installation/clients/inst_download_release_notes.rb:214 #: src/lib/installation/clients/inst_initialization.rb:44 msgid "Initializing the installation..." msgstr "正在初始化安装程序..." @@ -901,37 +917,37 @@ msgstr "已完成" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:457 +#: src/lib/installation/clients/inst_finish.rb:460 msgid "Copy files to installed system" msgstr "将文件复制到已安装的系统" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:464 +#: src/lib/installation/clients/inst_finish.rb:467 msgid "Save configuration" msgstr "保存配置" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:471 +#: src/lib/installation/clients/inst_finish.rb:474 msgid "Save installation settings" msgstr "保存安装设置" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:480 +#: src/lib/installation/clients/inst_finish.rb:483 msgid "Install boot manager" msgstr "安装引导管理器" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:487 +#: src/lib/installation/clients/inst_finish.rb:490 msgid "Prepare system for initial boot" msgstr "为初次引导准备系统" #. some steps are called in live installer only -#: src/lib/installation/clients/inst_finish.rb:550 +#: src/lib/installation/clients/inst_finish.rb:553 msgid "Client %1 returned invalid data." msgstr "客户端 %1 返回的数据无效。" #. FIXME: looks like product specific finish steps are not used at all -#: src/lib/installation/clients/inst_finish.rb:582 +#: src/lib/installation/clients/inst_finish.rb:585 msgid "Checking stage: %1..." msgstr "正在检查阶段：%1..." @@ -955,6 +971,19 @@ msgid "Preparing the initial system configuration..." msgstr "正在准备初始化系统配置..." +#. Shows a dialog allowing the user to modify the invalid URL, modifying the +#. /etc/install.inf file with the new value. In case of cancelled or empty, +#. the URL will be completely removed. +#. +#. @param regurl [String] +#: src/lib/installation/clients/inst_install_inf.rb:52 +msgid "" +"If you decide to cancel, the custom URL\n" +"will be completelly ignored.\n" +"\n" +"Really cancel URL modification?" +msgstr "" + #. dialog caption #: src/lib/installation/clients/inst_installation_options.rb:80 msgid "Installation Options" @@ -1075,49 +1104,6 @@ "网络配置已失败。\n" "详情请查看日志文件 %1。" -#. TRANSLATORS: help text, part 1 -#: src/lib/installation/clients/inst_new_desktop.rb:57 -msgid "" -"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n" -"of different desktop environments. Below you see a list of the 2 major ones \n" -"<b>GNOME</b> and <b>KDE</b>.</p>" -msgstr "" -"<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环境。\n" -"下面您可以看到两种主流的桌面：\n" -"<b>GNOME</b> 和 <b>KDE</b>。</p>" - -#. TRANSLATORS: help text, part 3 -#: src/lib/installation/clients/inst_new_desktop.rb:63 -msgid "" -"<p>You may select alternative desktop environments (or one of minimal installation patterns)\n" -"that could fit your needs better using the <b>Other</b> option . Later in the software \n" -"selection or after installation, you can change your selection or add additional desktop \n" -"environments. This screen allows you to set the default.</p>" -msgstr "" -"<p>您也可以使用<b>其他</b>选项选择更满足您需要的\n" -"其他桌面环境（或者选择一个极简安装模式）。\n" -"稍后在软件选择中或安装后，您仍可以更改您的选择或添加额外桌面环境。\n" -"此屏幕允许您设置默认桌面环境。</p>" - -#. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_new_desktop.rb:121 -msgid "Desktop Selection" -msgstr "桌面选择" - -#. UI wait loop -#: src/lib/installation/clients/inst_new_desktop.rb:190 -msgid "" -"No desktop type was selected.\n" -"Select the desired desktop environment." -msgstr "" -"未选择桌面类型。\n" -"请选择所需的桌面环境。" - -#. BNC #449818 -#: 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/lib/installation/clients/inst_prepareprogress.rb:56 msgid "Cannot find base product. Release notes will not be shown." @@ -1319,36 +1305,22 @@ "未能初始化软件储存库。\n" "正在中止安装。" -#. TRANSLATORS: error message -#: src/lib/installation/clients/inst_update_installer.rb:232 -msgid "" -"<p>Cannot obtain the installer update repository URL\n" -"from the registration server.</p>" -msgstr "" -"<p>无法从注册服务器获取\n" -"安装程序更新储存库 URL。</p>" - -#. TRANSLATORS: part of an error message, %s is the default repository -#. URL from control.xml -#: src/lib/installation/clients/inst_update_installer.rb:238 -msgid "<p>The default URL %s will be used.<p>" -msgstr "<p>将使用默认 URL %s。<p>" - -#. Ask the user to chose a registration server +#. Return the self-update URLs #. -#. @param services [ArraySlpServiceClass::Service] Array of registration servers -#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected; -#. :cancel if the dialog was dismissed. -#: src/lib/installation/clients/inst_update_installer.rb:315 +#. @return [Array<URI>] self-update URLs +#. +#. @see #default_self_update_url +#. @see #custom_self_update_url +#: src/lib/installation/clients/inst_update_installer.rb:181 +#, fuzzy +#| msgid "The registration module is not available." msgid "" -"Select a detected registration server from the list\n" -"to search for installer updates." -msgstr "" -"从列表中选择检测到的一个注册服务器\n" -"来搜索安装程序更新。" +"The registration URL provided is not valid.\n" +"Skipping installer update.\n" +msgstr "注册模块不可用。" #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:396 +#: src/lib/installation/clients/inst_update_installer.rb:233 msgid "" "A valid update could not be found at\n" "%s.\n" @@ -1359,7 +1331,7 @@ "\n" #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:402 +#: src/lib/installation/clients/inst_update_installer.rb:240 msgid "" "Could not fetch update from\n" "%s.\n" @@ -1377,7 +1349,7 @@ #. @param reason [String] reason why user want to check his network configuration #. @return [Boolean] true if the network configuration client was launched; #. false if the network is not configured. -#: src/lib/installation/clients/inst_update_installer.rb:432 +#: src/lib/installation/clients/inst_update_installer.rb:264 msgid "" "\n" "Would you like to check your network configuration\n" @@ -1390,7 +1362,7 @@ #. Note: the proxy cannot be configured in the YaST installer yet, #. it needs to be set via the "proxy" boot option. #. TRANSLATORS: %s is an URL -#: src/lib/installation/clients/inst_update_installer.rb:477 +#: src/lib/installation/clients/inst_update_installer.rb:302 msgid "" "Downloading the optional installer updates from \n" "%s\n" @@ -1413,26 +1385,26 @@ "请使用“proxy”引导参数。\n" #. TRANSLATORS: progress label -#: src/lib/installation/clients/inst_update_installer.rb:586 +#: src/lib/installation/clients/inst_update_installer.rb:388 msgid "Add Update Repository" msgstr "添加更新储存库" -#: src/lib/installation/clients/inst_update_installer.rb:587 +#: src/lib/installation/clients/inst_update_installer.rb:389 msgid "Download the Packages" msgstr "下载包" -#: src/lib/installation/clients/inst_update_installer.rb:588 +#: src/lib/installation/clients/inst_update_installer.rb:390 msgid "Apply the Packages" msgstr "应用包" -#: src/lib/installation/clients/inst_update_installer.rb:589 +#: src/lib/installation/clients/inst_update_installer.rb:391 msgid "Restart" msgstr "重启动" #. TRANSLATORS: dialog title #. TRANSLATORS: progress title -#: src/lib/installation/clients/inst_update_installer.rb:600 -#: src/lib/installation/clients/inst_update_installer.rb:602 +#: src/lib/installation/clients/inst_update_installer.rb:402 +#: src/lib/installation/clients/inst_update_installer.rb:404 msgid "Updating the Installer..." msgstr "正在更新安装程序..." @@ -1441,7 +1413,7 @@ #. @return [Hash, nil] current profile if fetched or exists; nil otherwise #. #. @see Yast::Profile.current -#: src/lib/installation/clients/inst_update_installer.rb:673 +#: src/lib/installation/clients/inst_update_installer.rb:475 msgid "" "Error while parsing the control file.\n" "\n" @@ -1750,6 +1722,17 @@ msgid "Saving proxy configuration..." msgstr "正在保存代理配置..." +#. This is a step of base installation finish and is responsible of write the +#. specific configuration for the current system role. +#. +#. It has been added for CaaSP Roles (FATE#321754) and currently only +#. the 'worker_role' has an special behavior. +#: src/lib/installation/clients/roles_finish.rb:35 +#, fuzzy +#| msgid "Writing device configuration..." +msgid "Writing specific role configuration ..." +msgstr "正在写入设备配置..." + #. progress step title #: src/lib/installation/clients/save_config_finish.rb:134 msgid "Saving time zone..." @@ -1880,6 +1863,14 @@ msgid "Copying log files to installed system..." msgstr "正在将日志文件复制到已安装的系统..." +#. We do not need to create a wizard dialog in installation, but it's +#. helpful when testing all manually on a running system +#: src/lib/installation/dialogs/desktop_roles.rb:25 +#, fuzzy +#| msgid "Computer" +msgid "Computer Role" +msgstr "计算机" + #. Event callback for the 'ok' button #: src/lib/installation/dialogs/ssh_import.rb:65 msgid "I would like to import SSH keys from a previous installation" @@ -1904,20 +1895,6 @@ msgid "Import SSH Configuration" msgstr "导入 SSH 配置" -#. TODO: Add the registration process -#: src/lib/installation/dialogs/worker_role.rb:45 -msgid "Dashboard U&RL" -msgstr "控制台 U&RL" - -#: src/lib/installation/dialogs/worker_role.rb:52 -msgid "Worker Registration" -msgstr "作业机注册" - -#. FIXME: This client is a POC and still under definition -#: src/lib/installation/dialogs/worker_role.rb:58 -msgid "Enter the url of the admin dashboard to register as a worker" -msgstr "输入管理控制台的 URL 来注册为作业机" - #. progress step title #: src/lib/installation/prep_shrink.rb:34 msgid "Shrinking PREP partition..." @@ -2159,7 +2136,7 @@ msgstr "正在启用远程管理..." #. A Continue-Cancel popup -#: src/lib/installation/select_system_role.rb:97 +#: src/lib/installation/select_system_role.rb:92 msgid "Changing the system role may undo adjustments you may have done." msgstr "更改系统角色可能会撤消您所做的调整。" @@ -2213,6 +2190,26 @@ msgid "SSH host keys will be copied from %s" msgstr "将从 %s 复制 SSH 主机密钥" +#. Ask the user to chose a registration server +#. +#. @param services [ArraySlpServiceClass::Service] Array of registration servers +#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected; +#. :cancel if the dialog was dismissed. +#: src/lib/installation/update_repositories_finder.rb:250 +msgid "" +"Select a detected registration server from the list\n" +"to search for installer updates." +msgstr "" +"从列表中选择检测到的一个注册服务器\n" +"来搜索安装程序更新。" + +#. sets flag if online repositories dialog should be shown +#: src/lib/installation/widgets/online_repos.rb:13 +#, fuzzy +#| msgid "Configured Repositories" +msgid "Configure On-line Repositories" +msgstr "已配置储存库" + #. autoyast tried to read a file but had no success. #: src/lib/transfer/file_from_url.rb:156 msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2." @@ -2309,3 +2306,55 @@ msgstr "" "安装无法自动解决包的依赖性。\n" "系统将为您打开软件管理器，以便手动解决依赖性。" + +#~ 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>.</p>" +#~ msgstr "" +#~ "<p>对于 Linux，<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环境。\n" +#~ "下面您可以看到两种主流的桌面：\n" +#~ "<b>GNOME</b> 和 <b>KDE</b>。</p>" + +#~ 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" +#~ "environments. This screen allows you to set the default.</p>" +#~ msgstr "" +#~ "<p>您也可以使用<b>其他</b>选项选择更满足您需要的\n" +#~ "其他桌面环境（或者选择一个极简安装模式）。\n" +#~ "稍后在软件选择中或安装后，您仍可以更改您的选择或添加额外桌面环境。\n" +#~ "此屏幕允许您设置默认桌面环境。</p>" + +#~ msgid "Desktop Selection" +#~ msgstr "桌面选择" + +#~ msgid "" +#~ "No desktop type was selected.\n" +#~ "Select the desired desktop environment." +#~ msgstr "" +#~ "未选择桌面类型。\n" +#~ "请选择所需的桌面环境。" + +#~ msgid "Other" +#~ msgstr "其他" + +#~ msgid "" +#~ "<p>Cannot obtain the installer update repository URL\n" +#~ "from the registration server.</p>" +#~ msgstr "" +#~ "<p>无法从注册服务器获取\n" +#~ "安装程序更新储存库 URL。</p>" + +#~ msgid "<p>The default URL %s will be used.<p>" +#~ msgstr "<p>将使用默认 URL %s。<p>" + +#~ msgid "Dashboard U&RL" +#~ msgstr "控制台 U&RL" + +#~ msgid "Worker Registration" +#~ msgstr "作业机注册" + +#~ msgid "Enter the url of the admin dashboard to register as a worker" +#~ msgstr "输入管理控制台的 URL 来注册为作业机" Modified: branches/SLE12-SP3/yast/zh_CN/po/iscsi-lio-server.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: iscsi-lio-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-01 02:28+0000\n" +"POT-Creation-Date: 2017-05-16 19:52+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -90,6 +90,7 @@ msgstr "名称" #: src/include/iscsi-lio-server/dialogs.rb:149 +#: src/include/iscsi-lio-server/widgets.rb:336 msgid "Path" msgstr "路径" @@ -546,14 +547,14 @@ msgid "Selected Path is already in use!" msgstr "选定的路径已在使用！" -#: src/include/iscsi-lio-server/widgets.rb:336 -msgid "Path:" -msgstr "路径：" - #: src/include/iscsi-lio-server/widgets.rb:339 msgid "Browse" msgstr "浏览" +#: src/include/iscsi-lio-server/widgets.rb:344 +msgid "Name (autogenerated when empty)" +msgstr "" + #: src/include/iscsi-lio-server/widgets.rb:359 msgid "Select file or device" msgstr "选择文件或设备" @@ -567,8 +568,8 @@ msgstr "目标 LUN" #: src/include/iscsi-lio-server/widgets.rb:470 -msgid "Change:" -msgstr "更改：" +msgid "Change" +msgstr "更改" #: src/include/iscsi-lio-server/widgets.rb:563 msgid "Target LUN %1 used more than once!" @@ -579,7 +580,9 @@ msgstr "需要至少启用一项身份验证！" #: src/include/iscsi-lio-server/widgets.rb:645 -msgid "Initiator name:" +#, fuzzy +#| msgid "Initiator name:" +msgid "Initiator name" msgstr "发起端名称：" #: src/include/iscsi-lio-server/widgets.rb:648 @@ -602,7 +605,9 @@ #. Copy exisiting LUN, i.e. give additional initiator access to the LUN #. (which is allowed, makes sense e.g. with multipath) #: src/include/iscsi-lio-server/widgets.rb:704 -msgid "New initiator name:" +#, fuzzy +#| msgid "New initiator name:" +msgid "New initiator name" msgstr "新发起端名称：" #: src/include/iscsi-lio-server/widgets.rb:750 @@ -828,3 +833,9 @@ #: src/modules/IscsiLioServer.rb:425 msgid "Configuration summary..." msgstr "配置摘要..." + +#~ msgid "Path:" +#~ msgstr "路径：" + +#~ msgid "Change:" +#~ msgstr "更改：" Modified: branches/SLE12-SP3/yast/zh_CN/po/kdump.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/kdump.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/kdump.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdump\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-16 02:29+0000\n" +"POT-Creation-Date: 2017-03-31 02:28+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -362,7 +362,7 @@ #. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text #. delete crashkernel parameter from bootloader -#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:513 +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:535 msgid "To apply changes a reboot is necessary." msgstr "要应用更改，需要重引导。" @@ -1222,7 +1222,7 @@ #. @param update_command [String] a command for .target.bash #. @return [Boolean] whether successful -#: src/modules/Kdump.rb:414 +#: src/modules/Kdump.rb:427 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." @@ -1231,129 +1231,129 @@ "有关细节，请参见 %{log}。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:523 +#: src/modules/Kdump.rb:545 msgid "Initializing kdump Configuration" msgstr "正在初始化 Kdump 配置" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:532 src/modules/Kdump.rb:540 +#: src/modules/Kdump.rb:554 src/modules/Kdump.rb:562 msgid "Reading the config file..." msgstr "正在读取配置文件..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:534 +#: src/modules/Kdump.rb:556 msgid "Reading kernel boot options..." msgstr "正在读取内核引导选项..." #. Progress stage 4/4 -#: src/modules/Kdump.rb:536 +#: src/modules/Kdump.rb:558 msgid "Calculating memory limits..." msgstr "正在计算内存限制..." #. Progress step 2/4 -#: src/modules/Kdump.rb:542 +#: src/modules/Kdump.rb:564 msgid "Reading partitions of disks..." msgstr "正在读取磁盘分区..." #. Progress finished 3/4 -#: src/modules/Kdump.rb:544 +#: src/modules/Kdump.rb:566 msgid "Reading available memory and calibrating usage..." msgstr "正在读取可用内存以及校准用量..." #. Error message -#: src/modules/Kdump.rb:556 +#: src/modules/Kdump.rb:578 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "无法读取配置文件 /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:564 +#: src/modules/Kdump.rb:586 msgid "Cannot read kernel boot options." msgstr "无法读取内核引导选项。" #. Error message -#: src/modules/Kdump.rb:572 +#: src/modules/Kdump.rb:594 msgid "Cannot read available memory." msgstr "无法读取可用内存。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:598 +#: src/modules/Kdump.rb:620 msgid "Saving kdump Configuration" msgstr "正在保存 Kdump 配置" #. Progress stage 1/2 -#: src/modules/Kdump.rb:627 +#: src/modules/Kdump.rb:649 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Kdump.rb:629 +#: src/modules/Kdump.rb:651 msgid "Update boot options" msgstr "更新引导选项" #. Progress step 1/2 -#: src/modules/Kdump.rb:633 +#: src/modules/Kdump.rb:655 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Kdump.rb:635 +#: src/modules/Kdump.rb:657 msgid "Updating boot options..." msgstr "正在更新引导选项..." #. Progress finished -#: src/modules/Kdump.rb:637 +#: src/modules/Kdump.rb:659 msgid "Finished" msgstr "已完成" #. Error message -#: src/modules/Kdump.rb:647 +#: src/modules/Kdump.rb:669 msgid "Cannot write settings." msgstr "无法写入设置。" #. Error message -#: src/modules/Kdump.rb:656 +#: src/modules/Kdump.rb:678 msgid "Adding crashkernel parameter to bootloader fault." msgstr "正在将 crashkernel 参数添加到引导加载程序默认值中。" #. Create a textual summary #. @return summary of the current configuration -#: src/modules/Kdump.rb:774 +#: src/modules/Kdump.rb:796 msgid "Kdump status: %1" msgstr "Kdump 状态：%1" -#: src/modules/Kdump.rb:775 +#: src/modules/Kdump.rb:797 msgid "enabled" msgstr "已启用" -#: src/modules/Kdump.rb:775 +#: src/modules/Kdump.rb:797 msgid "disabled" msgstr "已禁用" -#: src/modules/Kdump.rb:782 +#: src/modules/Kdump.rb:804 msgid "Value(s) of crashkernel option: %1" msgstr "crashkernel 选项的值：%1" -#: src/modules/Kdump.rb:789 +#: src/modules/Kdump.rb:811 msgid "Dump format: %1" msgstr "转储格式：%1" -#: src/modules/Kdump.rb:796 +#: src/modules/Kdump.rb:818 msgid "Target of dumps: %1" msgstr "转储的目标：%1" -#: src/modules/Kdump.rb:803 +#: src/modules/Kdump.rb:825 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:895 +#: src/modules/Kdump.rb:917 msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available." msgstr "警告！可用的空间可能不足。需要 %{required}，但可用空间只有 %{available}。" #. Trying to use fadump on unsupported hardware -#: src/modules/Kdump.rb:992 +#: src/modules/Kdump.rb:1025 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." Modified: branches/SLE12-SP3/yast/zh_CN/po/network.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/network.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/network.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-01 02:29+0000\n" +"POT-Creation-Date: 2017-04-08 02:28+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -572,7 +572,7 @@ #. Commandline help title #. Main routing dialog #. @return dialog result -#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473 +#: src/clients/routing.rb:57 src/include/network/services/routing.rb:510 msgid "Routing Configuration" msgstr "路由选择配置" @@ -658,7 +658,9 @@ msgstr "网关" #. Table header label +#. Table header 3/4 #: src/clients/routing.rb:208 src/include/network/lan/address.rb:101 +#: src/include/network/services/routing.rb:89 msgid "Netmask" msgstr "网络掩码" @@ -739,13 +741,13 @@ #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1458 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1456 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:1460 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1458 msgid "Change." msgstr "更改。" @@ -2248,10 +2250,19 @@ "为了提供一个\"默认情况下的目标\"。</p>\n" #: src/include/network/lan/help.rb:99 +#, fuzzy +#| msgid "" +#| "<p>For each route, enter destination network IP address, gateway address,\n" +#| "and netmask. To omit any of these values, use a dash sign \"-\". Select\n" +#| "the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n" msgid "" "<p>For each route, enter destination network IP address, gateway address,\n" -"and netmask. To omit any of these values, use a dash sign \"-\". Select\n" -"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n" +"and netmask. You can use either IPv4 netmask or prefix length when defining\n" +"network part of route. Prefix length has to be prefixed using '/'.\n" +"To omit any of these values, use a dash sign \"-\". Select\n" +"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.\n" +"Please note that in case of IPv6 networks only prefix length is accepted\n" +"for netmask definition.</p>\n" msgstr "" "<p>请为每条路由输入目的地网络的 IP 地址、网关地址和网络掩码。\n" "要忽略这些值中的任何一个，请使用破折号“-”。\n" @@ -2259,7 +2270,7 @@ "“-”为任何接口的别名。</p>\n" #. Routing dialog help 2/2 -#: src/include/network/lan/help.rb:105 +#: src/include/network/lan/help.rb:109 msgid "" "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" @@ -2267,7 +2278,7 @@ "<p>如果此系统是路由器，则启用 <b>IPv4 转发</b>（将包从外部网络转发到\n" "内部网络）。\n" -#: src/include/network/lan/help.rb:109 +#: src/include/network/lan/help.rb:113 msgid "" "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n" "to the internal one) if this system is a router.\n" @@ -2279,7 +2290,7 @@ "<b>警告：</b>IPv6 转发会禁用 IPv6 无状态地址\n" "自动配置 (SLAAC)。" -#: src/include/network/lan/help.rb:115 +#: src/include/network/lan/help.rb:119 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" @@ -2289,7 +2300,7 @@ "应该启用掩蔽，并且/或者在防火墙配置中至少\n" "设置一个重定向规则。请使用 YaST 防火墙模块。</p>\n" -#: src/include/network/lan/help.rb:121 +#: src/include/network/lan/help.rb:125 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" @@ -2307,7 +2318,7 @@ "然而当您的系统是多用户的且连接到了多个 DNCP 网络时，此选项可能会导致诡异的行为。\n" "</p>\n" -#: src/include/network/lan/help.rb:131 +#: src/include/network/lan/help.rb:135 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" @@ -2320,7 +2331,7 @@ "都能解析主机名，那么这是一个有用的选项。\n" "在其他任何情况下，请谨慎使用，尤其是当此计算机提供了一些网络服务时。</p>\n" -#: src/include/network/lan/help.rb:139 +#: src/include/network/lan/help.rb:143 msgid "" "<p>Enter the name servers and domain search list for resolving \n" "hostnames. Usually they can be obtained by DHCP.</p>\n" @@ -2329,7 +2340,7 @@ "通常它们可由 DHCP 获取。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:143 +#: src/include/network/lan/help.rb:147 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" @@ -2340,7 +2351,7 @@ "(例如 192.168.0.42)，而不是主机名。</p>\n" #. resolver dialog help -#: src/include/network/lan/help.rb:149 +#: src/include/network/lan/help.rb:153 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" @@ -2352,7 +2363,7 @@ "(例如 suse.de)相同。还可能有附加的搜索域\n" "(如 suse.com)。请用逗号或空格来分隔域。</p>\n" -#: src/include/network/lan/help.rb:156 +#: src/include/network/lan/help.rb:160 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" @@ -2364,7 +2375,7 @@ "则该域尤为重要。可以使用 <i>hostname</i> 命令来查看计算机\n" "的主机名。</p>" -#: src/include/network/lan/help.rb:163 +#: src/include/network/lan/help.rb:167 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" @@ -2377,7 +2388,7 @@ "通常由 <i>netconfig</i> 脚本负责处理，该脚本会合并静态定义的数据和动态获得的数据（例如，来自 DHCP 客户端、NetworkManager 等的数据）。\n" "这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n" -#: src/include/network/lan/help.rb:171 +#: src/include/network/lan/help.rb:175 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" @@ -2399,7 +2410,7 @@ #. Address dialog help 1-6/8: dynamic address preferred #. Address dialog help 1/8 -#: src/include/network/lan/help.rb:183 +#: src/include/network/lan/help.rb:187 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" @@ -2409,12 +2420,12 @@ "<p>如果您不想为此设备指派一个 IP 地址，则请选择<b>无地址设置</b>。\n" "这在绑定以太网设备时特别有用。</p>\n" -#: src/include/network/lan/help.rb:188 +#: src/include/network/lan/help.rb:192 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:192 +#: src/include/network/lan/help.rb:196 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" @@ -2423,7 +2434,7 @@ "指派的静态 IP 地址，请选择<b>动态地址</b>。</p>\n" #. Address dialog help 3/8 -#: src/include/network/lan/help.rb:196 +#: src/include/network/lan/help.rb:200 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" @@ -2434,7 +2445,7 @@ "之后将自动从该服务器获得网络地址。</p>\n" #. Address dialog help 4/8 -#: src/include/network/lan/help.rb:202 +#: src/include/network/lan/help.rb:206 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" @@ -2445,7 +2456,7 @@ "否则，网络地址必须<b>静态</b>指派。</p>\n" #. Address dialog help 5/8 -#: src/include/network/lan/help.rb:209 +#: src/include/network/lan/help.rb:213 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" @@ -2456,7 +2467,7 @@ "（例如，<tt>192.168.100.254</tt>）。</p>\n" #. Address dialog help 6/8 -#: src/include/network/lan/help.rb:216 +#: src/include/network/lan/help.rb:220 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" @@ -2467,7 +2478,7 @@ "输入一个完全限定的主机名。主机名将写入<tt>/etc/hosts</tt> 中。</p>\n" #. Address dialog help 8/8 -#: src/include/network/lan/help.rb:222 +#: src/include/network/lan/help.rb:226 msgid "" "<p>Contact your <b>network administrator</b> for more information about\n" "the network configuration.</p>" @@ -2475,7 +2486,7 @@ "<p>有关网络配置的更多信息，请联系\n" "您的<b>网络管理员</b>。</p>" -#: src/include/network/lan/help.rb:226 +#: src/include/network/lan/help.rb:230 msgid "" "<p>DHCP configuration is not recommended for this product.\n" "Components of this product might not work with DHCP.</p>" @@ -2483,7 +2494,7 @@ "<p>不建议对此产品执行 DHCP 配置。\n" "此产品的组件不能使用 DHCP。</p>" -#: src/include/network/lan/help.rb:230 +#: src/include/network/lan/help.rb:234 msgid "" "<p><b><big>Firewall Zone</big></b></p>\n" "<p>Select the firewall zone to put the interface into. If you\n" @@ -2501,11 +2512,11 @@ "如果不选择区域且不存在任何其他受此防火墙保护的接口，\n" "那么此防火墙将被禁用。</p>" -#: src/include/network/lan/help.rb:240 +#: src/include/network/lan/help.rb:244 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:244 +#: src/include/network/lan/help.rb:248 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" @@ -2520,7 +2531,7 @@ "改善网络性能，尤其是在慢速拨号连接下。\n" "您可从推荐值中选择一个，或定义另一个值。</p>\n" -#: src/include/network/lan/help.rb:253 +#: src/include/network/lan/help.rb:257 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>" @@ -2529,12 +2540,12 @@ "只有“设备激活”设置为“从不”和设置为“无地址设置”的设备才可用。</p>" #. DHCP dialog help 1/7 -#: src/include/network/lan/help.rb:257 +#: src/include/network/lan/help.rb:261 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:259 +#: src/include/network/lan/help.rb:263 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" @@ -2549,7 +2560,7 @@ "请在此指定唯一的自由格式标识符。</p>" #. DHCP dialog help 3/7 -#: src/include/network/lan/help.rb:267 +#: src/include/network/lan/help.rb:271 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" @@ -2570,7 +2581,7 @@ "如果您不想发送主机名，请将该字段留空。</p>\n" #. Aliases dialog help 1/4 -#: src/include/network/lan/help.rb:278 +#: src/include/network/lan/help.rb:282 msgid "" "<p><b><big>Additional Addresses</big></b></p>\n" "<p>Configure additional addresses of an interface in this table.</p>\n" @@ -2579,7 +2590,7 @@ "<p>在此表格中配置接口的附加地址。</p>\n" #. Aliases dialog help 2/4 -#: src/include/network/lan/help.rb:282 +#: src/include/network/lan/help.rb:286 msgid "" "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n" "the <b>Netmask</b>.</p>" @@ -2588,7 +2599,7 @@ "<b>IP 地址</b>和<b>网络掩码</b>。</p>" #. Aliases dialog help 3/4 -#: src/include/network/lan/help.rb:286 +#: src/include/network/lan/help.rb:290 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" @@ -2599,14 +2610,14 @@ "限制为 15 个字符。过时的 ifconfig 实用程序会截掉第 9 个字符后面的部分。</p>" #. Aliases dialog help 3/4, #83766 -#: src/include/network/lan/help.rb:292 +#: src/include/network/lan/help.rb:296 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:299 +#: src/include/network/lan/help.rb:303 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" @@ -2635,7 +2646,7 @@ "</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:314 +#: src/include/network/lan/help.rb:318 msgid "" "<p>Here, set the most important settings\n" "for wireless networking.</p>" @@ -2643,7 +2654,7 @@ "<p>在此可设置用于无线联网的\n" "最重要的设置。</p>" -#: src/include/network/lan/help.rb:317 +#: src/include/network/lan/help.rb:321 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" @@ -2657,7 +2668,7 @@ "称为<i>基础结构模式</i>)或<b>主控</b>(网卡\n" "作为接入点)。</p>\n" -#: src/include/network/lan/help.rb:324 +#: src/include/network/lan/help.rb:328 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" @@ -2674,7 +2685,7 @@ "您的 WLAN 卡就与\n" "信号强度最好的接入点相关联。</p>\n" -#: src/include/network/lan/help.rb:333 +#: src/include/network/lan/help.rb:337 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" @@ -2710,7 +2721,7 @@ "身份验证模式。只有在操作模式为<b>受管</b>时\n" "才可行。</p>\n" -#: src/include/network/lan/help.rb:351 +#: src/include/network/lan/help.rb:355 msgid "" "<p>To use WEP, enter the\n" "WEP encryption key to use. It can have a key\n" @@ -2725,7 +2736,7 @@ "所以只需输入 40 到 232 位。</p>\n" #. Wireless dialog help -#: src/include/network/lan/help.rb:359 +#: src/include/network/lan/help.rb:363 msgid "" "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n" "enter the preshared key. This\n" @@ -2741,7 +2752,7 @@ "仍可能受到字典攻击。请不要使用易猜出的词\n" "作为通行口令。</p>\n" -#: src/include/network/lan/help.rb:367 +#: src/include/network/lan/help.rb:371 msgid "" "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n" "enter some additional parameters in the next dialog.</p>\n" @@ -2749,7 +2760,7 @@ "<p>要使用 WPA-EAP(通常是指 WPA 企业)，\n" "请在下一对话框中输入一些其它参数。</p>\n" -#: src/include/network/lan/help.rb:370 +#: src/include/network/lan/help.rb:374 msgid "" "<p>These values will be written to the interface configuration file\n" "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n" @@ -3663,11 +3674,6 @@ msgid "Default IPv6 &Gateway" msgstr "默认 IPv6 网关(&G)" -#. Table header 3/4 -#: src/include/network/services/routing.rb:89 -msgid "Genmask" -msgstr "子网掩码" - #. CheckBox label #: src/include/network/services/routing.rb:110 msgid "Enable &IPv4 Forwarding" @@ -3686,40 +3692,40 @@ #. @param [Yast::Term] entry edited entry #. @param [Array] devs available devices #. @return route or nil, if canceled -#: src/include/network/services/routing.rb:163 +#: src/include/network/services/routing.rb:181 msgid "&Destination" msgstr "目标(&D)" -#: src/include/network/services/routing.rb:171 -msgid "Ge&nmask" -msgstr "子网掩码(&N)" +#: src/include/network/services/routing.rb:189 +msgid "&Netmask" +msgstr "网络掩码(&N)" -#: src/include/network/services/routing.rb:180 +#: src/include/network/services/routing.rb:198 msgid "&Gateway" msgstr "网关(&G)" -#: src/include/network/services/routing.rb:188 +#: src/include/network/services/routing.rb:206 msgid "De&vice" msgstr "设备(&V)" #. Popup::Error text -#: src/include/network/services/routing.rb:247 +#: src/include/network/services/routing.rb:261 msgid "Destination is invalid." msgstr "目标无效。" #. Popup::Error text -#: src/include/network/services/routing.rb:255 +#: src/include/network/services/routing.rb:269 msgid "Gateway IP address is invalid." msgstr "网关 IP 地址无效。" #. Popup::Error text -#: src/include/network/services/routing.rb:263 +#: src/include/network/services/routing.rb:277 msgid "Subnetmask is invalid." msgstr "子网掩码无效。" #. #178538 - disable routing dialog when NetworkManager is used #. but instead of default route (#299448) - NM reads it -#: src/include/network/services/routing.rb:422 +#: src/include/network/services/routing.rb:436 msgid "The default gateway is invalid." msgstr "默认网关无效。" @@ -4389,27 +4395,27 @@ #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1339 src/modules/LanItems.rb:1343 -#: src/modules/LanItems.rb:1347 +#: src/modules/LanItems.rb:1337 src/modules/LanItems.rb:1341 +#: src/modules/LanItems.rb:1345 msgid "Started automatically at boot" msgstr "引导时自动启动" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1351 +#: src/modules/LanItems.rb:1349 msgid "Started automatically on cable connection" msgstr "连接电缆时自动启动" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1355 +#: src/modules/LanItems.rb:1353 msgid "Managed by NetworkManager" msgstr "由 NetworkManager 管理" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1359 +#: src/modules/LanItems.rb:1357 msgid "Will not be started at all" msgstr "不会启动" -#: src/modules/LanItems.rb:1365 +#: src/modules/LanItems.rb:1363 msgid "Started manually" msgstr "手动启动" @@ -4421,50 +4427,50 @@ #. #. @param [Hash] dev_map a device's sysconfig map (in form "option" => "value") #. @return [Array] list of strings, one string is intended for one "bullet" -#: src/modules/LanItems.rb:1395 +#: src/modules/LanItems.rb:1393 msgid "IP address assigned using" msgstr "使用以下方式指派 IP 地址" -#: src/modules/LanItems.rb:1399 +#: src/modules/LanItems.rb:1397 msgid "IP address: %s/%s" msgstr "IP 地址：%s/%s" -#: src/modules/LanItems.rb:1402 +#: src/modules/LanItems.rb:1400 msgid "IP address: %s, subnet mask %s" msgstr "IP 地址：%s，子网掩码：%s" #. FIXME: side effect: sets @type. No reason for that. It should only build item #. overview. Check and remove. #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1446 src/modules/LanItems.rb:1502 +#: src/modules/LanItems.rb:1444 src/modules/LanItems.rb:1500 msgid "Device Name: %s" msgstr "设备名：%s" -#: src/modules/LanItems.rb:1471 +#: src/modules/LanItems.rb:1469 msgid "Bonding master" msgstr "绑定主体" -#: src/modules/LanItems.rb:1474 +#: src/modules/LanItems.rb:1472 msgid "Bridge" msgstr "网桥" -#: src/modules/LanItems.rb:1476 +#: src/modules/LanItems.rb:1474 msgid "enslaved in %s" msgstr "从属于 %s" -#: src/modules/LanItems.rb:1490 +#: src/modules/LanItems.rb:1488 msgid "Not connected" msgstr "未连接" -#: src/modules/LanItems.rb:1491 +#: src/modules/LanItems.rb:1489 msgid "No hwinfo" msgstr "无 hwinfo" -#: src/modules/LanItems.rb:1508 +#: src/modules/LanItems.rb:1506 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:1514 +#: src/modules/LanItems.rb:1512 msgid "" "The device is not configured. Press <b>Edit</b>\n" "to configure.\n" @@ -4472,11 +4478,11 @@ "未配置该设备。请按<b>编辑</b>\n" "进行配置。\n" -#: src/modules/LanItems.rb:1521 +#: src/modules/LanItems.rb:1519 msgid "Needed firmware" msgstr "需要的固件" -#: src/modules/LanItems.rb:1521 +#: src/modules/LanItems.rb:1519 msgid "unknown" msgstr "未知" @@ -4486,11 +4492,11 @@ #. @param [String] ifcfg_type #. @param [String] ifcfg_name #. @return [String] formated string with the interface type and the interfaces enslaved -#: src/modules/LanItems.rb:2547 +#: src/modules/LanItems.rb:2545 msgid "Bonding slaves" msgstr "绑定从属" -#: src/modules/LanItems.rb:2550 +#: src/modules/LanItems.rb:2548 msgid "Bridge Ports" msgstr "桥接端口" @@ -4556,21 +4562,21 @@ msgstr "已禁用远程管理。" #. Progress stage 1 -#: src/modules/Routing.rb:264 +#: src/modules/Routing.rb:312 msgid "Write IP forwarding settings" msgstr "写入 IP 转发设置" #. Progress stage 2 -#: src/modules/Routing.rb:266 +#: src/modules/Routing.rb:314 msgid "Write routing settings" msgstr "写入路由选择设置" -#: src/modules/Routing.rb:269 +#: src/modules/Routing.rb:317 msgid "Saving Routing Configuration" msgstr "正在保存路由选择配置" #. Progress stage 1/2 -#: src/modules/Routing.rb:274 +#: src/modules/Routing.rb:322 msgid "Writing IP forwarding settings..." msgstr "正在写入 IP 转发设置..." @@ -4579,22 +4585,22 @@ #. sysconfig does not support restarting routes only, #. so we let our caller do it together with other things #. Progress stage 2/2 -#: src/modules/Routing.rb:284 +#: src/modules/Routing.rb:332 msgid "Writing routing settings..." msgstr "正在写入路由设置..." #. Summary text -#: src/modules/Routing.rb:454 +#: src/modules/Routing.rb:502 msgid "Gateway: %s" msgstr "网关：%s" #. Summary text -#: src/modules/Routing.rb:458 +#: src/modules/Routing.rb:506 msgid "IP Forwarding for IPv4: %s" msgstr "IPv4 的 IP 转发：%s" #. Summary text -#: src/modules/Routing.rb:462 +#: src/modules/Routing.rb:510 msgid "IP Forwarding for IPv6: %s" msgstr "Ipv6 的 IP 转发：%s" @@ -4612,3 +4618,9 @@ #: src/modules/SuSEFirewall4Network.rb:139 msgid "(Unprotected)" msgstr "(无保护的)" + +#~ msgid "Genmask" +#~ msgstr "子网掩码" + +#~ msgid "Ge&nmask" +#~ msgstr "子网掩码(&N)" Modified: branches/SLE12-SP3/yast/zh_CN/po/packager.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/packager.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/packager.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: packager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-29 02:28+0000\n" +"POT-Creation-Date: 2017-04-29 02:28+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -942,7 +942,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys #: src/include/packager/repositories_include.rb:287 -#: src/modules/Packages.rb:1206 src/modules/SourceManager.rb:306 +#: src/modules/Packages.rb:1209 src/modules/SourceManager.rb:306 msgid "" "Unable to create repository\n" "from URL '%1'." @@ -1284,7 +1284,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1211 +#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1214 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "细节：" @@ -1292,7 +1292,7 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1219 +#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1222 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "重试吗？" @@ -1450,7 +1450,7 @@ #. adding the product to the list of products (BNC #269625) #. no such products #: src/modules/AddOnProduct.rb:1154 src/modules/AddOnProduct.rb:1748 -#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:461 +#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:464 msgid "Unknown Product" msgstr "未知产品" @@ -1642,23 +1642,23 @@ msgstr "正在应用增量 RPM：%1" #. warning text -#: src/modules/Packages.rb:301 +#: src/modules/Packages.rb:304 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:317 +#: src/modules/Packages.rb:320 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:329 +#: src/modules/Packages.rb:332 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:334 +#: src/modules/Packages.rb:337 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" @@ -1667,112 +1667,112 @@ "如果网速慢或有数据流量限制，该数值非常重要。</P>\n" #. help text for software proposal - header -#: src/modules/Packages.rb:343 +#: src/modules/Packages.rb:346 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:360 +#: src/modules/Packages.rb:363 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:374 +#: src/modules/Packages.rb:377 msgid "System Type: %1" msgstr "系统类型：%1" -#: src/modules/Packages.rb:385 +#: src/modules/Packages.rb:388 msgid "Patterns:<br>" msgstr "模式：<br>" #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB) -#: src/modules/Packages.rb:395 +#: src/modules/Packages.rb:398 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:408 +#: src/modules/Packages.rb:411 msgid "Downloading from Remote Repositories: %1" msgstr "正从远程储存库中下载：%1" -#: src/modules/Packages.rb:470 +#: src/modules/Packages.rb:473 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:494 +#: src/modules/Packages.rb:497 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:498 +#: src/modules/Packages.rb:501 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:539 +#: src/modules/Packages.rb:542 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:559 +#: src/modules/Packages.rb:562 msgid "Warning: Cannot check free space in directory %1 (device %2)." msgstr "警告：无法检查目录 %1（设备 %2）中的可用空间。" #. summary warning -#: src/modules/Packages.rb:602 +#: src/modules/Packages.rb:605 msgid "Not enough disk space." msgstr "磁盘空间不够。" #. summary warning -#: src/modules/Packages.rb:604 +#: src/modules/Packages.rb:607 msgid "Not enough disk space. Remove some packages in the single selection." msgstr "磁盘空间不足。请去除单一选择内容中的某些包。" #. add a backslash if it's missing -#: src/modules/Packages.rb:625 +#: src/modules/Packages.rb:628 msgid "Only %1 (%2%%) free space available on partition %3.<BR>" msgstr "分区 %3 上只有 %1 (%2%%) 的可用空间。<BR>" #. Check the YaST required packages. -#: src/modules/Packages.rb:645 +#: src/modules/Packages.rb:648 msgid "Please manually select the needed items to install." msgstr "请手动选择所需项来安装。" #. newly installed products -#: src/modules/Packages.rb:707 +#: src/modules/Packages.rb:710 msgid "New product <b>%s</b> will be installed" msgstr "将安装新产品 <b>%s</b>" #. product update: %s is a product name -#: src/modules/Packages.rb:717 +#: src/modules/Packages.rb:720 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:719 +#: src/modules/Packages.rb:722 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:726 +#: src/modules/Packages.rb:729 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:736 +#: src/modules/Packages.rb:739 msgid "<b>Warning:</b> Product <b>%s</b> will be removed." msgstr "<b>警告：</b>将去除产品 <b>%s</b>。" -#: src/modules/Packages.rb:737 +#: src/modules/Packages.rb:740 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed." msgstr "<b>错误：</b>将自动去除产品 <b>%s</b>。" #. TRANSLATORS: update proposal warning, do NOT translate "-release", #. it is part of a package name (like "sles-release") -#: src/modules/Packages.rb:763 +#: src/modules/Packages.rb:766 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" @@ -1789,12 +1789,12 @@ "</li></ul></li></ul>" #. error in proposal, %1 is URL -#: src/modules/Packages.rb:1227 +#: src/modules/Packages.rb:1230 msgid "No repository found at '%1'." msgstr "在“%1”找不到储存库。" #. TRANSLATORS: beginning of the rich text with the release notes -#: src/modules/Packages.rb:1500 +#: src/modules/Packages.rb:1503 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" @@ -1805,31 +1805,31 @@ "下载更新的发行说明。</b></p>\n" #. popup - information label -#: src/modules/Packages.rb:1527 +#: src/modules/Packages.rb:1530 msgid "Integrating booted media..." msgstr "正在集成引导的媒体..." #. close the popup in order to be able to ask about the license -#: src/modules/Packages.rb:1549 +#: src/modules/Packages.rb:1552 msgid "Failed to integrate the service pack repository." msgstr "未能集成服务包储存库。" #. popup - information label -#: src/modules/Packages.rb:1582 +#: src/modules/Packages.rb:1585 msgid "Initializing repositories..." msgstr "正在初始化储存库..." #. message popup, %1 is product name -#: src/modules/Packages.rb:1814 +#: src/modules/Packages.rb:1825 msgid "Insert %1 CD 1" msgstr "插入 %1 CD 1" -#: src/modules/Packages.rb:1816 +#: src/modules/Packages.rb:1827 msgid "%1 CD 1 not found" msgstr "%1 CD 1 没找到" #. an error message -#: src/modules/Packages.rb:1926 +#: src/modules/Packages.rb:1937 msgid "" "Error while initializing package descriptions.\n" "Check the log file %1 for more details." @@ -1838,7 +1838,7 @@ "有关细节，请查看日志文件 %1。" #. bnc #436925 -#: src/modules/Packages.rb:2198 +#: src/modules/Packages.rb:2209 msgid "" "The software selection has been changed externally.\n" "Software proposal will be called again." @@ -1847,12 +1847,12 @@ "将会再次调用软件建议。" #. popup label -#: src/modules/Packages.rb:2216 +#: src/modules/Packages.rb:2227 msgid "Evaluating package selection..." msgstr "正在评估包选择..." #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime -#: src/modules/Packages.rb:2559 +#: src/modules/Packages.rb:2570 msgid "" "Failed to select default product pattern %{pattern_name}.\n" "Pattern has not been found." @@ -1861,18 +1861,18 @@ "找不到该模式。" #. TRANSLATORS: %s is a package list -#: src/modules/Packages.rb:2732 +#: src/modules/Packages.rb:2743 msgid "These packages need to be selected to install: %s" msgstr "需要选择安装这些软件包: %s" #. TRANSLATORS: %s is a pattern list -#: src/modules/Packages.rb:2735 +#: src/modules/Packages.rb:2746 msgid "These patterns need to be selected to install: %s" msgstr "需要选择安装这些软件包组合: %s" #. TRANSLATORS: %{type} is a resolvable type, %{list} is a list of names #. This is a fallback message for unknown types, normally it should not be displayed -#: src/modules/Packages.rb:2739 +#: src/modules/Packages.rb:2750 msgid "These items (%{type}) need to be selected to install: %{list}" msgstr "需要选择安装这些项目 (%{type}): %{list}" Modified: branches/SLE12-SP3/yast/zh_CN/po/registration.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/registration.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/registration.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-20 17:12+0200\n" +"POT-Creation-Date: 2017-05-17 17:46+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -18,7 +18,7 @@ #. popup message #. popup message #. popup message -#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49 +#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49 #: src/lib/registration/registration_ui.rb:40 msgid "Contacting the Registration Server" msgstr "正在连接注册服务器" @@ -31,10 +31,10 @@ #. dialog title #. display and run a dialog for updating the current registration #. @return [Symbol] user input -#: src/clients/inst_scc.rb:189 +#: src/clients/inst_scc.rb:183 #: src/lib/registration/ui/autoyast_config_dialog.rb:104 #: src/lib/registration/ui/base_system_registration_dialog.rb:61 -#: src/lib/registration/ui/migration_repos_workflow.rb:287 +#: src/lib/registration/ui/migration_repos_workflow.rb:317 #: src/lib/registration/ui/registered_system_dialog.rb:37 #: src/lib/registration/ui/registration_update_dialog.rb:41 msgid "Registration" @@ -75,8 +75,8 @@ #. %s is name of given product #. then register the product(s) #. %s is name of given product -#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286 -#: src/lib/registration/registration_ui.rb:319 +#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:317 +#: src/lib/registration/registration_ui.rb:350 msgid "Registering %s ..." msgstr "正在注册 %s..." @@ -336,7 +336,7 @@ #. FIXME: use a better message, this one has been reused after the text freeze #. error message, the entered URL is not valid. #: src/lib/registration/connect_helpers.rb:295 -#: src/lib/registration/ui/base_system_registration_dialog.rb:544 +#: src/lib/registration/ui/base_system_registration_dialog.rb:537 msgid "Invalid URL." msgstr "URL 无效。" @@ -387,7 +387,7 @@ #. FIXME: reused an existing message due to text freeze #. (later use a better text, it's system update actually...) #: src/lib/registration/registration_ui.rb:80 -#: src/lib/registration/registration_ui.rb:272 +#: src/lib/registration/registration_ui.rb:303 msgid "Registering the System..." msgstr "正在注册系统..." @@ -397,8 +397,8 @@ #. TRANSLATORS: Progress label #: src/lib/registration/registration_ui.rb:106 #: src/lib/registration/registration_ui.rb:149 -#: src/lib/registration/registration_ui.rb:357 -#: src/lib/registration/ui/migration_repos_workflow.rb:304 +#: src/lib/registration/registration_ui.rb:388 +#: src/lib/registration/ui/migration_repos_workflow.rb:334 msgid "Updating to %s ..." msgstr "正在更新为 %s..." @@ -460,6 +460,20 @@ "是否要在升级期间启用这些储存库\n" "以接收最新更新？" +#. TRANSLATORS: Popup question, add registered but not installed addons to +#. the list of products that will be downgraded. +#. %s are all the product names splited by '\n' e.g +#. "SUSE Linux Enterprise Server 12\nSUSE Enterprise Storage 1 x86_64" +#: src/lib/registration/registration_ui.rb:284 +msgid "" +"The addons listed below are registered but not installed: \n" +"\n" +"%s\n" +"\n" +"Would you like to downgrade also them in the registration server? \n" +"If not they will be deactivated. " +msgstr "" + #. indent size used in summary text #: src/lib/registration/ssl_certificate_details.rb:34 msgid "Certificate:" @@ -588,38 +602,40 @@ #. create the main dialog definition #. @return [Yast::Term] the main UI dialog term -#: src/lib/registration/ui/addon_selection_base_dialog.rb:97 -msgid "&Filter Out Beta Versions" +#: src/lib/registration/ui/addon_selection_base_dialog.rb:105 +#, fuzzy +#| msgid "&Filter Out Beta Versions" +msgid "&Hide Beta Versions" msgstr "滤除 Beta 版本(&F)" -#: src/lib/registration/ui/addon_selection_base_dialog.rb:99 -msgid "Details" -msgstr "细节" +#: src/lib/registration/ui/addon_selection_base_dialog.rb:108 +msgid "Details (English only)" +msgstr "" #. addon description widget #. @return [Yast::Term] the addon details widget -#: src/lib/registration/ui/addon_selection_base_dialog.rb:109 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:117 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:122 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:130 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:261 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:269 msgid "YaST allows to select at most %s extensions or modules." msgstr "YaST 最多允许选择 %s 个扩展或模块。" #. help text (2/3) -#: src/lib/registration/ui/addon_selection_base_dialog.rb:272 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:280 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>" msgstr "<p>请注意，有些扩展或模块可能需要特定注册代码。</p>" #. help text (3/3) -#: src/lib/registration/ui/addon_selection_base_dialog.rb:275 +#: src/lib/registration/ui/addon_selection_base_dialog.rb:283 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 Customer Center，在那里手动去除它们。</p>" @@ -638,21 +654,6 @@ msgid "Available Extensions and Modules" msgstr "可用的扩展和模块" -#. dialog title -#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37 -msgid "Extension and Module Re-registration" -msgstr "扩展和模块重新注册" - -#. help text (1/3) -#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40 -msgid "<p>Here you can select extensions and modules which will be registered again.</p>" -msgstr "<p>您可以在此处选择要重新注册的扩展和模块。</p>" - -#. @return [String] the main dialog label -#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54 -msgid "Registered Extensions and Modules" -msgstr "已注册扩展和模块" - #. help text #: src/lib/registration/ui/autoyast_addon_dialog.rb:38 msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" @@ -715,7 +716,7 @@ #. handle nil specifically, it cannot be stored in XML profile #: src/lib/registration/ui/autoyast_addon_dialog.rb:190 #: src/lib/registration/ui/autoyast_config_dialog.rb:108 -#: src/lib/registration/ui/base_system_registration_dialog.rb:266 +#: src/lib/registration/ui/base_system_registration_dialog.rb:269 msgid "Registration &Code" msgstr "注册代码(&C)" @@ -746,7 +747,7 @@ msgstr "注册产品" #: src/lib/registration/ui/autoyast_config_dialog.rb:106 -#: src/lib/registration/ui/base_system_registration_dialog.rb:263 +#: src/lib/registration/ui/base_system_registration_dialog.rb:266 msgid "&E-mail Address" msgstr "电子邮件地址(&E)" @@ -793,49 +794,54 @@ msgid "Register Extensions or Modules..." msgstr "注册扩展或模块..." +#. TRANSLATORS: Wrong url for registration provided, %s is an URL. +#: src/lib/registration/ui/base_system_registration_dialog.rb:232 +msgid "" +"The registration URL provided by the command line is not valid.\n" +"\n" +"URL: %s\n" +"\n" +"The default one will be used instead." +msgstr "" + #. TRANSLATORS: radio button; %s is a host name. -#: src/lib/registration/ui/base_system_registration_dialog.rb:254 +#: src/lib/registration/ui/base_system_registration_dialog.rb:257 msgid "Register System via %s" msgstr "通过 %s 注册系统" #. TRANSLATORS: radio button -#: src/lib/registration/ui/base_system_registration_dialog.rb:297 +#: src/lib/registration/ui/base_system_registration_dialog.rb:300 msgid "Register System via local SMT Server" msgstr "通过本地 SMT 服务器注册系统" -#: src/lib/registration/ui/base_system_registration_dialog.rb:308 +#: src/lib/registration/ui/base_system_registration_dialog.rb:311 msgid "&Local Registration Server URL" msgstr "本地注册服务器 URL(&L)" -#: src/lib/registration/ui/base_system_registration_dialog.rb:322 +#: src/lib/registration/ui/base_system_registration_dialog.rb:325 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:334 -msgid "&Register Extensions or Modules Again" -msgstr "重新注册扩展或模块(&R)" - #. 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:342 +#: src/lib/registration/ui/base_system_registration_dialog.rb:335 #: src/lib/registration/ui/registered_system_dialog.rb:67 msgid "The system is already registered." msgstr "系统已经注册。" -#: src/lib/registration/ui/base_system_registration_dialog.rb:344 +#: src/lib/registration/ui/base_system_registration_dialog.rb:337 msgid "Please select your preferred method of registration." msgstr "请选择您首选的注册方法。" #. help text -#: src/lib/registration/ui/base_system_registration_dialog.rb:360 +#: src/lib/registration/ui/base_system_registration_dialog.rb:353 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." msgstr "在此处输入 SUSE Customer Center 身份凭证注册系统，以便获取更新和扩展。" #. Popup question: confirm skipping the registration -#: src/lib/registration/ui/base_system_registration_dialog.rb:369 +#: src/lib/registration/ui/base_system_registration_dialog.rb:362 msgid "" "If you do not register your system we will not be able\n" "to grant you access to the update repositories.\n" @@ -851,7 +857,7 @@ #. 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:381 +#: src/lib/registration/ui/base_system_registration_dialog.rb:374 msgid "Net&work Configuration..." msgstr "网络配置(&W)..." @@ -949,7 +955,7 @@ #. TRANSLATORS: a popup message with [Continue] [Cancel] buttons, #. pressing [Continue] starts the registration module, [Cancel] aborts #. the online migration -#: src/lib/registration/ui/migration_repos_workflow.rb:145 +#: src/lib/registration/ui/migration_repos_workflow.rb:154 msgid "" "The system is not registered,\n" "to run the online migration you need\n" @@ -960,17 +966,28 @@ "先注册该系统。" #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:183 +#: src/lib/registration/ui/migration_repos_workflow.rb:198 msgid "No installed product found." msgstr "找不到安装的产品。" +#. TRANSLATORS: Popup question, merge this addon that are registered but not +#. installed to the current migration products list. +#. %s is an addon friendly name, e.g 'SUSE Enterprise Storage 2 x86_64' +#: src/lib/registration/ui/migration_repos_workflow.rb:219 +msgid "" +"The '%s' extension is registered but not installed.\n" +"If you accept it will be added for be installed, in other case it will be unregistered at the end of the migration.\n" +"\n" +"Do you want to add it?" +msgstr "" + #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:212 +#: src/lib/registration/ui/migration_repos_workflow.rb:242 msgid "No migration product found." msgstr "找不到迁移产品。" #. TRANSLATORS: progress message -#: src/lib/registration/ui/migration_repos_workflow.rb:289 +#: src/lib/registration/ui/migration_repos_workflow.rb:319 msgid "Preparing Migration Repositories..." msgstr "正在准备迁移储存库…" @@ -1014,48 +1031,54 @@ msgstr "可能的迁移目标" #. TRANSLATORS: RichText header (details for the selected item) -#: src/lib/registration/ui/migration_selection_dialog.rb:189 +#: src/lib/registration/ui/migration_selection_dialog.rb:199 msgid "Migration Summary" msgstr "迁移摘要" +#. TRANSLATORS: Summary message in 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:211 +msgid "The registration server does not offer migrations for Product <b>%s</b> so it will <b>stay unchanged</b>. We recommend you to check if it's correct and to configure the repositories manually in case of needed." +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 +#: src/lib/registration/ui/migration_selection_dialog.rb:234 msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration." msgstr "错误：注册服务器 (%{url}) 上没有产品 <b>%{product}</b>。请提供该产品以允许使用此迁移。" #. 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:224 +#: src/lib/registration/ui/migration_selection_dialog.rb:246 msgid "%s <b>will be installed.</b>" msgstr "%s <b>将会安装。</b>" #. 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:241 +#: src/lib/registration/ui/migration_selection_dialog.rb:263 msgid "%s <b>stays unchanged.</b>" msgstr "%s <b>将保持不变。</b>" #. TRANSLATORS: Summary message, rich text format #. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12" #. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" -#: src/lib/registration/ui/migration_selection_dialog.rb:251 +#: src/lib/registration/ui/migration_selection_dialog.rb:273 msgid "%{old_product} <b>will be upgraded to</b> %{new_product}." msgstr "%{old_product} <b>将升级到</b> %{new_product}。" #. TRANSLATORS: Summary message, rich text format #. %{old_product} and %{new_product} are product names -#: src/lib/registration/ui/migration_selection_dialog.rb:256 +#: src/lib/registration/ui/migration_selection_dialog.rb:278 msgid "%{old_product} <b>will be downgraded to</b> %{new_product}." msgstr "%{old_product} <b>将降级到</b> %{new_product}。" #. TRANSLATORS: an error popup message -#: src/lib/registration/ui/migration_selection_dialog.rb:289 +#: src/lib/registration/ui/migration_selection_dialog.rb:311 msgid "" "The selected migration contains a product\n" "which is not available at the registration server.\n" @@ -1069,6 +1092,57 @@ "请选择其他迁移目标或在\n" "注册服务器上提供缺少的产品。" +#. this class displays and runs the dialog which check all the installed +#. but not registered products warning the user about it and allowing him +#. to take some actions over them. +#: src/lib/registration/ui/not_installed_products_dialog.rb:45 +#, fuzzy +#| msgid "Checking status..." +msgid "Checking registration status" +msgstr "正在检查状态..." + +#. FIXME: Maybe we could remove this option and just warn the user +#: src/lib/registration/ui/not_installed_products_dialog.rb:85 +#, fuzzy +#| msgid "Installed Add-on Products" +msgid "Ins&tall products" +msgstr "已安装的附加产品" + +#: src/lib/registration/ui/not_installed_products_dialog.rb:86 +msgid "&Deactivate" +msgstr "关闭(&D)" + +#: src/lib/registration/ui/not_installed_products_dialog.rb:87 +msgid "Continue" +msgstr "继续" + +#. TRANSLATORS: Popup error showing all the addons that weren't +#. installed, %s is the addons identifiers. +#: src/lib/registration/ui/not_installed_products_dialog.rb:102 +#, fuzzy +#| msgid "" +#| "These sources were not found:\n" +#| "%1" +msgid "" +"These addons were not installed:\n" +"\n" +"%s" +msgstr "" +"找不到这些源：\n" +"%1" + +#. TRANSLATORS: A RichText warning about all the products registered but +#. not installed. (1/2) +#: src/lib/registration/ui/not_installed_products_dialog.rb:153 +msgid "<p>The addons listed below are registered but not installed: </p>" +msgstr "" + +#. TRANSLATORS: A RichText warning about all the products registered but +#. not installed. (2/2) +#: src/lib/registration/ui/not_installed_products_dialog.rb:159 +msgid "<p>It's preferable to <b>deactivate</b> your products at your registration server if you don't plan to use them anymore.</p>" +msgstr "" + #. help text #: src/lib/registration/ui/registered_system_dialog.rb:40 msgid "<p>The system is already registered.</p>" @@ -1148,25 +1222,66 @@ msgid "Looking up local registration servers..." msgstr "正在查找本地注册服务器..." -#. Constructor +#. encoding: utf-8 +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2017 SUSE LLC #. -#. @param services [ArraySlpServiceClass::Service] list of services to show -#. @param heading [String] Dialog's heading. If nil (or not specified), a default -#. heading will be used). -#. @param description [String] Dialog's description (to be shown on top of the list). -#. If nil (or not specified) a default description will be used. -#. @param no_selected_msg [String] Message to be shown when no service was selected -#. If nil (or not specified) a default description will be used. -#. @param initial [SlpServiceClass::Service] initially selected service. If nil -#. (or not specified) the first service will be used. -#: src/lib/slp/dialogs/service_selection.rb:78 -msgid "Service selection" -msgstr "服务选择" +#. +#. 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 SUSE. +#. +#. To contact SUSE about this file by physical or electronic mail, you may find +#. current contact information at www.suse.com. +#. ------------------------------------------------------------------------------ +#: src/lib/registration/widgets/registration_code.rb:38 +#, fuzzy +#| msgid "&Local Registration Server URL" +msgid "Registration Code or SMT Server URL" +msgstr "本地注册服务器 URL(&L)" -#: src/lib/slp/dialogs/service_selection.rb:79 -msgid "Select a detected service from the list." -msgstr "从列表中选择检测到的服务。" +#. Error reports and logs about the registration are mostly handled +#. by ConnectHelpers.catch_registration_errors and used by instances +#. of RegistrationUI. +#: src/lib/registration/widgets/registration_code.rb:92 +#, fuzzy +#| msgid "Not a valid umask." +msgid "Not valid url." +msgstr "umask 无效。" -#: src/lib/slp/dialogs/service_selection.rb:80 -msgid "No service was selected." -msgstr "未选择服务。" +#: src/lib/registration/widgets/registration_code.rb:96 +msgid "" +"<p>\n" +"The SMT Server URL must use http or https protocol, other schemes are not supported.</p>\n" +msgstr "" + +#~ msgid "Details" +#~ msgstr "细节" + +#~ msgid "Extension and Module Re-registration" +#~ msgstr "扩展和模块重新注册" + +#~ msgid "<p>Here you can select extensions and modules which will be registered again.</p>" +#~ msgstr "<p>您可以在此处选择要重新注册的扩展和模块。</p>" + +#~ msgid "Registered Extensions and Modules" +#~ msgstr "已注册扩展和模块" + +#~ msgid "&Register Extensions or Modules Again" +#~ msgstr "重新注册扩展或模块(&R)" + +#~ msgid "Service selection" +#~ msgstr "服务选择" + +#~ msgid "Select a detected service from the list." +#~ msgstr "从列表中选择检测到的服务。" + +#~ msgid "No service was selected." +#~ msgstr "未选择服务。" Modified: branches/SLE12-SP3/yast/zh_CN/po/reipl.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/reipl.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/reipl.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: reipl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-07 01:29+0000\n" +"POT-Creation-Date: 2017-04-11 02:29+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -15,61 +15,10 @@ "Content-Transfer-Encoding: 8bit\n" #. Command line help text for the Xreipl module -#: src/clients/reipl.rb:53 +#: src/clients/reipl.rb:52 msgid "Configuration of reipl" msgstr "reipl 的配置" -#. TRANSLATORS: part of a shutdown message -#. %1 is replaced with a device name -#. Newline at the end is required -#: src/clients/reipl_bootloader_finish.rb:69 -msgid "" -"\n" -"After shutdown, reload the system\n" -"with an IPL from device '%1'.\n" -msgstr "" -"\n" -"关闭后，请从设备“%1”执行 IPL\n" -"重新装载系统。\n" - -#. TRANSLATORS: part of a shutdown message -#. %1 is replaced with a FCP name -#. %2 is replaced with a WWPN name -#. %3 is replaced with a LUN name -#. Newline at the end is required -#: src/clients/reipl_bootloader_finish.rb:88 -msgid "" -"\n" -"After shutdown, reload the system\n" -"with an IPL from FCP '%1'\n" -"with WWPN '%2'\n" -"and LUN '%3'.\n" -msgstr "" -"\n" -"关闭后，请使用 FCP“%1”\n" -"（带有 WWPN“%2”和 LUN“%3”）的 IPL\n" -"重新装载系统。\n" - -#: src/clients/reipl_bootloader_finish.rb:102 -msgid "" -"\n" -"After shutdown, reload the system \n" -"with an IPL from the device \n" -"that contains /boot" -msgstr "" -"\n" -"关闭后，使用包含 /boot 的设备中的 IPL 重新装载系统" - -#. Rich text title for Reipl in proposals -#: src/clients/reipl_proposal.rb:81 -msgid "Reipl" -msgstr "Reipl" - -#. Menu title for Reipl in proposals -#: src/clients/reipl_proposal.rb:85 -msgid "&Reipl" -msgstr "Reipl(&R)" - #. Reipl configure dialog caption #. Initialization dialog caption #: src/include/reipl/dialogs.rb:59 src/include/reipl/wizards.rb:100 @@ -277,32 +226,59 @@ msgid "Initializing..." msgstr "正在初始化..." -#. Create a textual summary and a list of unconfigured cards -#. @return summary of the current configuration -#: src/modules/Reipl.rb:323 -msgid "Configured reipl methods" -msgstr "已配置的 reipl 方法" +#~ msgid "" +#~ "\n" +#~ "After shutdown, reload the system\n" +#~ "with an IPL from device '%1'.\n" +#~ msgstr "" +#~ "\n" +#~ "关闭后，请从设备“%1”执行 IPL\n" +#~ "重新装载系统。\n" -#: src/modules/Reipl.rb:330 -msgid "The method ccw is configured and being used." -msgstr "方法 ccw 已配置且正在使用。" +#~ msgid "" +#~ "\n" +#~ "After shutdown, reload the system\n" +#~ "with an IPL from FCP '%1'\n" +#~ "with WWPN '%2'\n" +#~ "and LUN '%3'.\n" +#~ msgstr "" +#~ "\n" +#~ "关闭后，请使用 FCP“%1”\n" +#~ "（带有 WWPN“%2”和 LUN“%3”）的 IPL\n" +#~ "重新装载系统。\n" -#: src/modules/Reipl.rb:332 -msgid "The method ccw is configured." -msgstr "方法 ccw 已配置。" +#~ msgid "" +#~ "\n" +#~ "After shutdown, reload the system \n" +#~ "with an IPL from the device \n" +#~ "that contains /boot" +#~ msgstr "" +#~ "\n" +#~ "关闭后，使用包含 /boot 的设备中的 IPL 重新装载系统" -#: src/modules/Reipl.rb:335 -msgid "The method ccw is not supported." -msgstr "不支持方法 ccw。" +#~ msgid "Reipl" +#~ msgstr "Reipl" -#: src/modules/Reipl.rb:343 -msgid "The method fcp is configured and being used." -msgstr "方法 fcp 已配置且正在使用。" +#~ msgid "&Reipl" +#~ msgstr "Reipl(&R)" -#: src/modules/Reipl.rb:345 -msgid "The method fcp is configured." -msgstr "方法 fcp 已配置。" +#~ msgid "Configured reipl methods" +#~ msgstr "已配置的 reipl 方法" -#: src/modules/Reipl.rb:348 -msgid "The method fcp is not supported." -msgstr "不支持方法 fcp。" +#~ msgid "The method ccw is configured and being used." +#~ msgstr "方法 ccw 已配置且正在使用。" + +#~ msgid "The method ccw is configured." +#~ msgstr "方法 ccw 已配置。" + +#~ msgid "The method ccw is not supported." +#~ msgstr "不支持方法 ccw。" + +#~ msgid "The method fcp is configured and being used." +#~ msgstr "方法 fcp 已配置且正在使用。" + +#~ msgid "The method fcp is configured." +#~ msgstr "方法 fcp 已配置。" + +#~ msgid "The method fcp is not supported." +#~ msgstr "不支持方法 fcp。" Modified: branches/SLE12-SP3/yast/zh_CN/po/rpm-groups.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/rpm-groups.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/rpm-groups.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: rpm-groups\n" "Report-Msgid-Bugs-To: bugzilla.opensuse.org\n" -"POT-Creation-Date: 2016-10-09 12:27+0300\n" +"POT-Creation-Date: 2017-05-15 17:26+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -71,6 +71,9 @@ msgid "Building" msgstr "构建" +msgid "C++" +msgstr "" + msgid "CAD" msgstr "CAD" @@ -116,9 +119,6 @@ msgid "Convertors" msgstr "转换器" -msgid "Daemon" -msgstr "守护程序" - msgid "Daemons" msgstr "守护程序" @@ -320,9 +320,6 @@ msgid "LXDE" msgstr "LXDE" -msgid "LXDE-Qt" -msgstr "LXDE-Qt" - msgid "LXQt" msgstr "LXQt" @@ -356,6 +353,11 @@ msgid "Modem" msgstr "调制解调器" +#, fuzzy +#| msgid "Monitoring" +msgid "monitoring" +msgstr "监视" + msgid "Monitoring" msgstr "监视" @@ -569,9 +571,6 @@ msgid "Terminals" msgstr "终端" -msgid "Tests" -msgstr "测试" - msgid "TeX" msgstr "TeX" @@ -655,3 +654,12 @@ msgid "YaST" msgstr "YaST" + +#~ msgid "Daemon" +#~ msgstr "守护程序" + +#~ msgid "LXDE-Qt" +#~ msgstr "LXDE-Qt" + +#~ msgid "Tests" +#~ msgstr "测试" Modified: branches/SLE12-SP3/yast/zh_CN/po/s390.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/s390.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/s390.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: s390\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 17:53+0200\n" +"POT-Creation-Date: 2017-05-16 19:52+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -30,7 +30,7 @@ msgstr "DASD" #. section name in proposal - menu item -#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:110 +#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:111 msgid "&DASD" msgstr "DASD(&D)" @@ -60,24 +60,24 @@ msgstr "正在检测可用的控制器" #. Initialization dialog caption -#: src/clients/s390-disk-controller.rb:72 +#: src/clients/s390-disk-controller.rb:71 msgid "S/390 Disk Controller Configuration" msgstr "S/390 磁盘控制器配置" #. push button -#: src/clients/s390-disk-controller.rb:84 +#: src/clients/s390-disk-controller.rb:83 msgid "Configure &DASD Disks" msgstr "配置 DASD 磁盘(&D)" #. push button -#: src/clients/s390-disk-controller.rb:94 +#: src/clients/s390-disk-controller.rb:93 msgid "Configure &ZFCP Disks" msgstr "配置 ZFCP 磁盘(&Z)" #. Initialization dialog contents #. Initialization dialog contents -#: src/clients/s390-disk-controller.rb:103 -#: src/include/s390/dasd/wizards.rb:102 src/include/s390/zfcp/wizards.rb:98 +#: src/clients/s390-disk-controller.rb:101 src/include/s390/dasd/wizards.rb:97 +#: src/include/s390/zfcp/wizards.rb:96 msgid "Initializing..." msgstr "正在初始化..." @@ -102,82 +102,82 @@ msgstr "zFCP(&Z)" #. menu button id -#: src/include/s390/dasd/dialogs.rb:170 +#: src/include/s390/dasd/dialogs.rb:165 msgid "&Activate" msgstr "激活(&A)" #. menu button id -#: src/include/s390/dasd/dialogs.rb:172 +#: src/include/s390/dasd/dialogs.rb:167 msgid "&Deactivate" msgstr "关闭(&D)" #. menu button id #. menu button id -#: src/include/s390/dasd/dialogs.rb:174 src/include/s390/dasd/dialogs.rb:183 +#: src/include/s390/dasd/dialogs.rb:169 src/include/s390/dasd/dialogs.rb:178 msgid "Set DIAG O&n" msgstr "打开 DIAG(&N)" #. menu button id #. menu button id -#: src/include/s390/dasd/dialogs.rb:176 src/include/s390/dasd/dialogs.rb:185 +#: src/include/s390/dasd/dialogs.rb:171 src/include/s390/dasd/dialogs.rb:180 msgid "Set DIAG O&ff" msgstr "关闭 DIAG(&F)" #. menu button id -#: src/include/s390/dasd/dialogs.rb:178 +#: src/include/s390/dasd/dialogs.rb:173 msgid "&Format" msgstr "格式化(&F)" #. menu button id -#: src/include/s390/dasd/dialogs.rb:187 +#: src/include/s390/dasd/dialogs.rb:182 msgid "Set Format On" msgstr "开启格式化" #. menu button id -#: src/include/s390/dasd/dialogs.rb:189 +#: src/include/s390/dasd/dialogs.rb:184 msgid "Set Format Off" msgstr "关闭格式化" #. integer field (count of disks formatted parallel) -#: src/include/s390/dasd/dialogs.rb:201 +#: src/include/s390/dasd/dialogs.rb:194 msgid "&Parallel Formatted Disks" msgstr "并行格式的磁盘(&P)" #. error popup message #. error popup message #. error popup message -#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687 -#: src/include/s390/zfcp/dialogs.rb:477 +#: src/include/s390/dasd/dialogs.rb:216 src/include/s390/dasd/dialogs.rb:673 +#: src/include/s390/zfcp/dialogs.rb:465 msgid "No disk selected." msgstr "没有选择磁盘。" #. 8 means disk is not formatted #. unformtted disk, manual (not AutoYaST) -#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:160 +#: src/include/s390/dasd/dialogs.rb:243 src/modules/DASDController.rb:149 msgid "Device %1 is not formatted. Format device now?" msgstr "未格式化设备 %1。是否立即格式化设备？" -#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:162 +#: src/include/s390/dasd/dialogs.rb:246 src/modules/DASDController.rb:152 msgid "There are %1 unformatted devices. Format them now?" msgstr "有 %1 个设备未格式化。是否立即格式化？" #. for autoinst, format unformatted disks later -#: src/include/s390/dasd/dialogs.rb:267 +#: src/include/s390/dasd/dialogs.rb:258 msgid "Couldn't find device for channel %1." msgstr "找不到通道 %1 的设备。" #. error report, %1 is device identification -#: src/include/s390/dasd/dialogs.rb:321 +#: src/include/s390/dasd/dialogs.rb:312 msgid "Disk %1 is not active." msgstr "磁盘 %1 没有激活。" #. error report, %1 is device identification -#: src/include/s390/dasd/dialogs.rb:327 +#: src/include/s390/dasd/dialogs.rb:318 msgid "Disk %1 is not accessible for writing." msgstr "磁盘 %1 不可写入。" #. popup question -#: src/include/s390/dasd/dialogs.rb:353 +#: src/include/s390/dasd/dialogs.rb:342 msgid "" "Formatting these disks destroys all data on them.<br>\n" "Really format the following disks?<br>\n" @@ -188,7 +188,7 @@ " %1" #. Dialog caption -#: src/include/s390/dasd/dialogs.rb:416 +#: src/include/s390/dasd/dialogs.rb:404 msgid "DASD Disk Management" msgstr "DASD 磁盘管理" @@ -196,111 +196,111 @@ #. table header #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432 -#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129 +#: src/include/s390/dasd/dialogs.rb:411 src/include/s390/dasd/dialogs.rb:420 +#: src/include/s390/zfcp/dialogs.rb:116 src/include/s390/zfcp/dialogs.rb:125 msgid "Channel ID" msgstr "通道 ID" #. table header -#: src/include/s390/dasd/dialogs.rb:425 +#: src/include/s390/dasd/dialogs.rb:413 msgid "Format" msgstr "格式化" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440 +#: src/include/s390/dasd/dialogs.rb:415 src/include/s390/dasd/dialogs.rb:428 msgid "Use DIAG" msgstr "使用 DIAG" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135 +#: src/include/s390/dasd/dialogs.rb:422 src/include/s390/zfcp/dialogs.rb:131 msgid "Device" msgstr "设备" #. table header #. table header -#: src/include/s390/dasd/dialogs.rb:436 +#: src/include/s390/dasd/dialogs.rb:424 #: src/include/s390/iucvterminal-server/ui.rb:242 msgid "Type" msgstr "类型" #. table header -#: src/include/s390/dasd/dialogs.rb:438 +#: src/include/s390/dasd/dialogs.rb:426 msgid "Access Type" msgstr "存取类型" #. table header -#: src/include/s390/dasd/dialogs.rb:442 +#: src/include/s390/dasd/dialogs.rb:430 msgid "Formatted" msgstr "已格式化" #. table header -#: src/include/s390/dasd/dialogs.rb:444 +#: src/include/s390/dasd/dialogs.rb:432 msgid "Partition Information" msgstr "分区信息" #. text entry #. text entry -#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146 +#: src/include/s390/dasd/dialogs.rb:443 src/include/s390/zfcp/dialogs.rb:142 msgid "Mi&nimum Channel ID" msgstr "最小通道 ID(&N)" #. text entry #. text entry -#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153 +#: src/include/s390/dasd/dialogs.rb:450 src/include/s390/zfcp/dialogs.rb:149 msgid "Ma&ximum Channel ID" msgstr "最大通道 ID(&X)" #. push button #. push button -#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159 +#: src/include/s390/dasd/dialogs.rb:456 src/include/s390/zfcp/dialogs.rb:155 msgid "&Filter" msgstr "过滤器(&F)" #. menu button #. menu button -#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485 +#: src/include/s390/dasd/dialogs.rb:466 src/include/s390/dasd/dialogs.rb:474 msgid "Perform &Action" msgstr "执行动作(&A)" -#: src/include/s390/dasd/dialogs.rb:481 +#: src/include/s390/dasd/dialogs.rb:470 msgid "&Select All" msgstr "全选(&S)" -#: src/include/s390/dasd/dialogs.rb:482 +#: src/include/s390/dasd/dialogs.rb:471 msgid "&Deselect All" msgstr "全部不选(&D)" #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221 +#: src/include/s390/dasd/dialogs.rb:541 src/include/s390/zfcp/dialogs.rb:215 msgid "Invalid filter channel IDs." msgstr "过滤器通道 ID 无效。" #. Dialog caption -#: src/include/s390/dasd/dialogs.rb:597 +#: src/include/s390/dasd/dialogs.rb:584 msgid "Add New DASD Disk" msgstr "增加新 DASD 磁盘" #. text entry #. combo box -#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301 +#: src/include/s390/dasd/dialogs.rb:595 src/include/s390/zfcp/dialogs.rb:294 msgid "&Channel ID" msgstr "通道 ID(&C)" #. check box -#: src/include/s390/dasd/dialogs.rb:612 +#: src/include/s390/dasd/dialogs.rb:599 msgid "Format the Disk" msgstr "格式化磁盘" #. check box -#: src/include/s390/dasd/dialogs.rb:615 +#: src/include/s390/dasd/dialogs.rb:602 msgid "Use &DIAG" msgstr "使用 DIAG(&D)" #. yes-no popup -#: src/include/s390/dasd/dialogs.rb:637 +#: src/include/s390/dasd/dialogs.rb:624 msgid "" "Really leave the DASD disk configuration without saving?\n" "All changes will be lost." @@ -312,14 +312,14 @@ #. error popup #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:351 -#: src/include/s390/zfcp/dialogs.rb:368 src/include/s390/zfcp/dialogs.rb:404 +#: src/include/s390/dasd/dialogs.rb:635 src/include/s390/zfcp/dialogs.rb:340 +#: src/include/s390/zfcp/dialogs.rb:357 src/include/s390/zfcp/dialogs.rb:393 msgid "Not a valid channel ID." msgstr "不是一个有效的通道 ID。" #. error popup #. error popup -#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:434 +#: src/include/s390/dasd/dialogs.rb:645 src/include/s390/zfcp/dialogs.rb:423 msgid "Device already exists." msgstr "设备已存在。" @@ -343,7 +343,7 @@ "可以按<b>中止</b>立即安全地中止配置实用程序。</p>" #. Write dialog help 1/2 -#: src/include/s390/dasd/helps.rb:44 +#: src/include/s390/dasd/helps.rb:45 msgid "" "<p><b><big>Saving Controller Configuration</big></b><br>\n" "</p>\n" @@ -353,7 +353,7 @@ #. Write dialog help 2/2 #. Write dialog help 2/2 -#: src/include/s390/dasd/helps.rb:48 src/include/s390/zfcp/helps.rb:48 +#: src/include/s390/dasd/helps.rb:49 src/include/s390/zfcp/helps.rb:49 msgid "" "<p><b><big>Aborting Saving:</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.\n" @@ -365,7 +365,7 @@ #. Disk selection dialog help 1/4 #. Disk selection dialog help 1/4 -#: src/include/s390/dasd/helps.rb:54 src/include/s390/dasd/helps.rb:68 +#: src/include/s390/dasd/helps.rb:55 src/include/s390/dasd/helps.rb:71 msgid "" "<p><b><big>Configured DASD Disks</big></b><br>\n" "In this dialog, manage DASD disks on your system.</p>" @@ -375,7 +375,7 @@ #. Disk selection dialog help 2/4 #. Disk selection dialog help 2/4 -#: src/include/s390/dasd/helps.rb:58 src/include/s390/dasd/helps.rb:72 +#: src/include/s390/dasd/helps.rb:60 src/include/s390/dasd/helps.rb:76 msgid "" "<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and \n" "the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>\n" @@ -384,12 +384,12 @@ "和<b>最大通道 ID</b>，然后单击<b>过滤</b>。</p>\n" #. Disk selection dialog help 4/4 -#: src/include/s390/dasd/helps.rb:62 +#: src/include/s390/dasd/helps.rb:65 msgid "<p>To configure a new DASD disk, click <b>Add</b>.</p>" msgstr "<p>要配置一个新的 DASD 磁盘, 请点击<b>增加</b>.</p>" #. Disk selection dialog help 4/4 -#: src/include/s390/dasd/helps.rb:64 +#: src/include/s390/dasd/helps.rb:67 msgid "" "<p>To remove a configured DASD disk, select it and click\n" "<b>Delete</b>.</p>" @@ -398,7 +398,7 @@ "<b>删除</b>.</p>" #. Disk selection dialog help 3/4 -#: src/include/s390/dasd/helps.rb:76 +#: src/include/s390/dasd/helps.rb:81 msgid "" "<p>To perform actions on multiple disks at once, mark these disks. To select all displayed disk (possibly after applying a filter), click\n" "<b>Select All</b> or <b>Deselect All</b>.</p>\n" @@ -407,7 +407,7 @@ "<b>全选</b>或<b>全部不选</b>。</p>\n" #. Disk selection dialog help 4/4 -#: src/include/s390/dasd/helps.rb:80 +#: src/include/s390/dasd/helps.rb:87 msgid "" "<p>To perform an action on the selected disks, use <b>Perform Action</b>.\n" "The action will be performed immediately!</p>" @@ -416,7 +416,7 @@ "动作将被立即执行!</p>" #. Disk add help 1/3 -#: src/include/s390/dasd/helps.rb:84 +#: src/include/s390/dasd/helps.rb:92 msgid "" "<p><b><big>Add New DASD Disk</big></b><br>\n" "To add a disk, enter the <b>Channel ID</b> of the DASD disk as\n" @@ -427,7 +427,7 @@ "<b>通道 ID</b> 作为标识符。</p>" #. Disk add help 1/3 -#: src/include/s390/dasd/helps.rb:90 +#: src/include/s390/dasd/helps.rb:98 msgid "" "<p>If the disk should be formatted,\n" "use <b>Format the Disk</b>.</p>\n" @@ -436,13 +436,13 @@ "请使用<b>格式化磁盘</b>。</p>\n" #. Disk add help 3/3 -#: src/include/s390/dasd/helps.rb:94 +#: src/include/s390/dasd/helps.rb:102 msgid "<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n" msgstr "<p>要使用 DIAG 模式，请选择<b>使用 DIAG</b>。</p>\n" #. Initialization dialog caption #. Initialization dialog caption -#: src/include/s390/dasd/wizards.rb:100 src/include/s390/zfcp/wizards.rb:96 +#: src/include/s390/dasd/wizards.rb:95 src/include/s390/zfcp/wizards.rb:94 msgid "Controller Configuration" msgstr "控制器配置" @@ -471,17 +471,17 @@ msgstr "只可以使用整个磁盘，没有分区。如果设备使用不兼容的格式格式化或分区过，请激活复选框<b>强制重写磁盘</b>。</p>" #. Dump dialog help 4/8 -#: src/include/s390/dump/ui.rb:62 +#: src/include/s390/dump/ui.rb:63 msgid "<p>To use DASD and ZFCP devices activate them in the respective YaST DASD or ZFCP dialog.<br>" msgstr "<p>要使用 DASD 和 ZFCP 设备，请在相应的 YaST DASD 或 zFCP 对话框中激活它们。<br>" #. Dump dialog help 5/8 -#: src/include/s390/dump/ui.rb:66 +#: src/include/s390/dump/ui.rb:67 msgid "Devices which are in use or have mounted partitions will not be shown.</p>" msgstr "将不显示正在使用或装入了分区的设备。</p>" #. Dump dialog help 6/8 -#: src/include/s390/dump/ui.rb:70 +#: src/include/s390/dump/ui.rb:71 msgid "" "<p><b>dumpdevice</b> after a disk indicates that it is a usable dump\n" "device. Multi-volume dump devices are indicated by a list of DASD IDs.</p>" @@ -490,31 +490,31 @@ "多卷转储设备用 DASD ID 列表指出。</p>" #. Dump dialog help 7/8 -#: src/include/s390/dump/ui.rb:74 +#: src/include/s390/dump/ui.rb:76 msgid "<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>" msgstr "<p>ZFCP 列：设备、大小、ID、WWPN、LUN、转储<br>" #. Dump dialog help 8/8 -#: src/include/s390/dump/ui.rb:76 +#: src/include/s390/dump/ui.rb:78 msgid "DASD columns: Device, Size, ID, Dump</p>" msgstr "DASD 列：设备、大小、ID、转储</p>" #. Dialog content -#: src/include/s390/dump/ui.rb:95 +#: src/include/s390/dump/ui.rb:96 msgid "&ZFCP" msgstr "ZFCP(&Z)" -#: src/include/s390/dump/ui.rb:121 +#: src/include/s390/dump/ui.rb:122 msgid "&Force overwrite of disk" msgstr "强制重写磁盘(&F)" #. prevent leading space -#: src/include/s390/dump/ui.rb:185 +#: src/include/s390/dump/ui.rb:186 msgid "You haven't selected any device." msgstr "未选择任何设备。" #. warn only in case of force -#: src/include/s390/dump/ui.rb:193 +#: src/include/s390/dump/ui.rb:191 msgid "The disk %1 will be formatted as a dump device. All data on this device will be lost! Continue?" msgstr "磁盘 %1 将格式化为转储设备。此设备上的所有数据都将丢失！是否继续？" @@ -537,21 +537,21 @@ "<br>它们由换行符分隔。</p>\n" #. TS-Shell dialog help 1/5 -#: src/include/s390/iucvterminal-server/helps.rb:43 +#: src/include/s390/iucvterminal-server/helps.rb:44 msgid "<p><b><big>TS-Shell</big></b></p>" msgstr "<p><b><big>TS-Shell</big></b></p>" -#: src/include/s390/iucvterminal-server/helps.rb:46 +#: src/include/s390/iucvterminal-server/helps.rb:47 msgid "<p>TS-Shell allows to specify <b>Authorization</b> for every TS-Shell user and group. The rights of a group are inherited by its members.</p>" msgstr "<p>TS-Shell 允许为每个 TS-Shell 用户和组指定<b>身份验证</b>。用户组的权限会由其成员继承。</p>" #. TS-Shell dialog help 2/5 -#: src/include/s390/iucvterminal-server/helps.rb:50 +#: src/include/s390/iucvterminal-server/helps.rb:52 msgid "<p>Each allowed z/VM ID can be selected manually under <b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which contains all allowed z/VM IDs separated by line breaks.</p>" msgstr "<p>每个允许的 z/VM ID 都可在<b>选择</b>下手动选择，由<b>正则表达式</b>定义，或从包含允许的 z/VM ID（以换行符分隔）的<b>文件</b>中装载。</p>" #. TS-Shell dialog help 3/5 -#: src/include/s390/iucvterminal-server/helps.rb:54 +#: src/include/s390/iucvterminal-server/helps.rb:58 msgid "" "<p>Click on <b>New User</b> to create new TS-Shell users or <b>Delete\n" "User</b> to remove users.</p>" @@ -560,7 +560,7 @@ "单击<b>删除用户</b>可去除用户。</p>" #. TS-Shell dialog help 4/5 -#: src/include/s390/iucvterminal-server/helps.rb:58 +#: src/include/s390/iucvterminal-server/helps.rb:63 msgid "" "<p>To add or remove groups from the TS-Shell authorization table or to change\n" "the membership of users, go to <b>Manage Groups</b>.</p>" @@ -569,16 +569,16 @@ "或更改用户的成员资格，请转至<b>管理组</b>。</p>" #. TS-Shell dialog help 5/5 -#: src/include/s390/iucvterminal-server/helps.rb:62 +#: src/include/s390/iucvterminal-server/helps.rb:68 msgid "<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts should be gathered.</p>" msgstr "<p>使用<b>审计的 ID</b>指定应从中收集副本的 z/VM ID。</p>" #. TS-Shell User creation dialog help 1/3 -#: src/include/s390/iucvterminal-server/helps.rb:66 +#: src/include/s390/iucvterminal-server/helps.rb:72 msgid "<p><b><big>New TS-Shell User</big></b></p>" msgstr "<p><b><big>新建 TS-Shell 用户</big></b></p>" -#: src/include/s390/iucvterminal-server/helps.rb:69 +#: src/include/s390/iucvterminal-server/helps.rb:75 msgid "" "<p>To create new TS-Shell user the <b>Username</b>, <b>Home Directory</b> and <b>Password</b> has to be provided.\n" "\t<br>It is also possible to specify <b>Additional Groups</b> by selecting them on the right.</p>" @@ -587,12 +587,12 @@ "\t<br>还可通过在右侧进行选择来指定<b>附加的组</b>。</p>" #. TS-Shell User creation dialog help 2/3 -#: src/include/s390/iucvterminal-server/helps.rb:73 +#: src/include/s390/iucvterminal-server/helps.rb:81 msgid "<p>To ensure that the user changes his password after the first login, activate <b>Force Password Change</b>.</p>" msgstr "<p>要确保用户在首次登录后更改其口令，请激活<b>强制更改口令</b>。</p>" #. TS-Shell User creation dialog help 3/3 -#: src/include/s390/iucvterminal-server/helps.rb:77 +#: src/include/s390/iucvterminal-server/helps.rb:86 msgid "" "<p>You can specify the same home directory for every TS-Shell user since no\n" "data will be stored there.</p>" @@ -601,11 +601,11 @@ "因为没有数据会储存到那里。</p>" #. TS-Shell Managing Groups dialog help 1/5 -#: src/include/s390/iucvterminal-server/helps.rb:81 +#: src/include/s390/iucvterminal-server/helps.rb:91 msgid "<p><b><big>Manage Groups for TS-Authorization</big></b></p>" msgstr "<p><b><big>管理 TS-Authorization 的组</big></b></p>" -#: src/include/s390/iucvterminal-server/helps.rb:84 +#: src/include/s390/iucvterminal-server/helps.rb:94 msgid "" "<p>Define TS-Shell authorizations per group if you want every TS-Shell \n" "member of this groups to inherit the same rights.</p>" @@ -614,7 +614,7 @@ "请为每个组定义 TS-Shell 身份认证。</p>" #. TS-Shell Managing Groups dialog help 2/5 -#: src/include/s390/iucvterminal-server/helps.rb:88 +#: src/include/s390/iucvterminal-server/helps.rb:99 msgid "" "<p>Existing groups can be added to or removed from the TS-Shell\n" "authorization. Select the groups in the table and click on <b>Select or Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>" @@ -623,7 +623,7 @@ "请选择表中的组并单击<b>选择或全部取消选择</b>。当前状态显示在 <b>TS-Auth</b> 列中。</p>" #. TS-Shell Managing Groups dialog help 3/5 -#: src/include/s390/iucvterminal-server/helps.rb:92 +#: src/include/s390/iucvterminal-server/helps.rb:105 msgid "" "<p>Change TS-Shell members of a selected group in the <b>TS-Members</b>\n" "selection.</p>" @@ -632,7 +632,7 @@ "更改所选组的 TS-Shell 成员。</p>" #. TS-Shell Managing Groups dialog help 4/5 -#: src/include/s390/iucvterminal-server/helps.rb:96 +#: src/include/s390/iucvterminal-server/helps.rb:109 msgid "" "<p>New groups could be created by entering the name in the <b>New Group</b> input field and confirming with <b>Create</b>.\n" "\t<br>To delete previously created groups the <b>YaST users</b> dialog has to be used.</p>" @@ -641,21 +641,21 @@ "\t<br>要删除以前创建的组，必须使用 <b>YaST 用户</b>对话框。</p>" #. TS-Shell Managing Groups dialog help 5/5 -#: src/include/s390/iucvterminal-server/helps.rb:100 +#: src/include/s390/iucvterminal-server/helps.rb:115 msgid "<p>Undo changes in this dialog by clicking the <b>Back</b> button.</p>" msgstr "<p>单击<b>后退</b>按钮可撤销此对话框中的更改。</p>" #. IUCVConn on Login dialog help 1/2 -#: src/include/s390/iucvterminal-server/helps.rb:104 +#: src/include/s390/iucvterminal-server/helps.rb:119 msgid "<p><b><big>IUCVConn on Login</big></b></p>" msgstr "<p><b><big>登录时启用 IUCVConn</big></b></p>" -#: src/include/s390/iucvterminal-server/helps.rb:107 +#: src/include/s390/iucvterminal-server/helps.rb:122 msgid "<p>IUCVConn on Login needs one user for every z/VM ID. To create these users a <b>password</b> and <b>home directory</b> has to be provided." msgstr "<p>“登录时 IUCVConn”对每个 z/VM ID 都需要一个用户。要创建这些用户，必须提供<b>口令</b>和<b>用户主目录</b>。" #. IUCVConn on Login dialog help 2/2 -#: src/include/s390/iucvterminal-server/helps.rb:111 +#: src/include/s390/iucvterminal-server/helps.rb:127 msgid "<p>It is possible to sync the users manually by clicking on <b>Sync</b> or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is enabled. </p>" msgstr "<p>可以通过单击<b>同步</b>或仅在启用<b>登录时 IUCVConn</b> 时单击<b>确定</b>确认更改，执行手动用户同步。</p>" @@ -844,87 +844,87 @@ msgstr "TS-Members(&M)" #. draw active tab -#: src/include/s390/iucvterminal-server/ui.rb:595 +#: src/include/s390/iucvterminal-server/ui.rb:594 msgid "&z/VM IDs" msgstr "z/VM ID(&Z)" -#: src/include/s390/iucvterminal-server/ui.rb:596 +#: src/include/s390/iucvterminal-server/ui.rb:595 msgid "&TS-Shell" msgstr "TS-Shell(&T)" -#: src/include/s390/iucvterminal-server/ui.rb:597 +#: src/include/s390/iucvterminal-server/ui.rb:596 msgid "&IUCVConn" msgstr "IUCVConn(&I)" #. check and commit password -#: src/include/s390/iucvterminal-server/ui.rb:711 +#: src/include/s390/iucvterminal-server/ui.rb:708 msgid "The passwords do not match or are invalid." msgstr "口令不匹配或无效。" #. check if the user specifcation is valid and if the name does already exist -#: src/include/s390/iucvterminal-server/ui.rb:717 +#: src/include/s390/iucvterminal-server/ui.rb:714 msgid "The username is not valid!" msgstr "用户名无效！" -#: src/include/s390/iucvterminal-server/ui.rb:721 +#: src/include/s390/iucvterminal-server/ui.rb:718 msgid "A home directory has to be specified!" msgstr "必须指定用户主目录！" -#: src/include/s390/iucvterminal-server/ui.rb:757 +#: src/include/s390/iucvterminal-server/ui.rb:751 msgid "Adding the user has failed." msgstr "添加用户失败。" #. delete group entry if disabled -#: src/include/s390/iucvterminal-server/ui.rb:861 +#: src/include/s390/iucvterminal-server/ui.rb:843 msgid "Configure IUCV Terminal Server Settings" msgstr "配置 IUCV 终端服务器设置" #. update screen -#: src/include/s390/iucvterminal-server/ui.rb:881 +#: src/include/s390/iucvterminal-server/ui.rb:863 msgid "New TS-Shell User" msgstr "新建 TS-Shell 用户" -#: src/include/s390/iucvterminal-server/ui.rb:894 +#: src/include/s390/iucvterminal-server/ui.rb:876 msgid "Manage Groups for TS-Authorization" msgstr "管理 TS-Authorization 的组" #. since alnum allows umlauts too the id is checked against the user name specification -#: src/include/s390/iucvterminal-server/ui.rb:1020 +#: src/include/s390/iucvterminal-server/ui.rb:1000 msgid "Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed." msgstr "第 %2 行的 z/VM ID“%1”错误，仅允许使用字母和数字。" -#: src/include/s390/iucvterminal-server/ui.rb:1032 +#: src/include/s390/iucvterminal-server/ui.rb:1012 msgid "Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed." msgstr "第 %2 行的 z/VM ID“%1”错误，不允许在开头使用数字。" -#: src/include/s390/iucvterminal-server/ui.rb:1044 +#: src/include/s390/iucvterminal-server/ui.rb:1024 msgid "Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed." msgstr "第 %2 行的 z/VM ID“%1”错误，长度不允许超过八个字符。" #. only the last entry is allowed to be empty -#: src/include/s390/iucvterminal-server/ui.rb:1057 +#: src/include/s390/iucvterminal-server/ui.rb:1037 msgid "Wrong z/VM ID \"%1\" in line %2, at least one letter is required." msgstr "第 %2 行的 z/VM ID“%1”错误，至少必须有一个字母。" #. check password -#: src/include/s390/iucvterminal-server/ui.rb:1081 +#: src/include/s390/iucvterminal-server/ui.rb:1061 msgid "A correctly entered password to sync IUCVConn users is required." msgstr "必须正确输入口令才能同步 IUCVConn 用户。" #. check home directory -#: src/include/s390/iucvterminal-server/ui.rb:1087 +#: src/include/s390/iucvterminal-server/ui.rb:1067 msgid "The specified IUCVConn home directory is invalid." msgstr "指定的 IUCVConn 用户主目录无效。" #. update ts member selection -#: src/include/s390/iucvterminal-server/ui.rb:1437 +#: src/include/s390/iucvterminal-server/ui.rb:1415 msgid "The group name is not valid!" msgstr "该组名无效！" #. change tab selection back #. check for z/VM ID entries -#: src/include/s390/iucvterminal-server/ui.rb:1497 -#: src/include/s390/iucvterminal-server/ui.rb:1598 +#: src/include/s390/iucvterminal-server/ui.rb:1474 +#: src/include/s390/iucvterminal-server/ui.rb:1575 msgid "Cannot configure the terminal server without valid z/VM IDs." msgstr "没有有效的 z/VM ID，无法配置终端服务器。" @@ -967,32 +967,32 @@ msgstr "<p>可运行多个 <b>IUCVtty 实例</b>来提供多个终端设备。各实例通过终端 ID 来区分，终端 ID 是<b>终端 ID 前缀</b>和实例编号的组合。<br>" #. IUCVTerminal dialog help 4/11 -#: src/include/s390/iucvterminal/ui.rb:129 +#: src/include/s390/iucvterminal/ui.rb:131 msgid "For example, if you define ten instances with the prefix "<i>lxterm</i>", the terminal IDs from <i>lxterm0</i> to <i>lxterm9</i> are available.</p>" msgstr "例如，若您使用前缀 <i>lxterm</i> 定义了十个实例，则可用终端 ID 为从 <i>lxterm1</i> 到 <i>lxterm9</i>。</p>" #. IUCVTerminal dialog help 5/11 -#: src/include/s390/iucvterminal/ui.rb:133 +#: src/include/s390/iucvterminal/ui.rb:136 msgid "<p><b>HVC</b></p>" msgstr "<p><b>HVC</b></p>" #. IUCVTerminal dialog help 6/11 -#: src/include/s390/iucvterminal/ui.rb:135 +#: src/include/s390/iucvterminal/ui.rb:138 msgid "<p>The z/VM IUCV HVC device driver is a kernel module and uses device nodes to enable up to eight HVC terminal devices to communicate with getty and login programs.</p>" msgstr "<p>z/VM IUCV HVC 设备驱动程序是一个内核模块，使用设备节点来启用最多八个 HVC 终端设备来与 getty 和登录程序通讯。</p>" #. IUCVTerminal dialog help 7/11 -#: src/include/s390/iucvterminal/ui.rb:139 +#: src/include/s390/iucvterminal/ui.rb:143 msgid "<p>With <b>restrict access</b>, allow only connections from certain <b>terminal servers</b>.</p>" msgstr "<p>使用<b>限制访问</b>，只允许来自特定<b>终端服务器</b>的连接。</p>" #. IUCVTerminal dialog help 8/11 -#: src/include/s390/iucvterminal/ui.rb:143 +#: src/include/s390/iucvterminal/ui.rb:147 msgid "<p>Define the emulation for all instances at once or for each one separately.</p>" msgstr "<p>一次为全部实例定义模拟或分别为每个实例定义模拟。</p>" #. IUCVTerminal dialog help 9/11 -#: src/include/s390/iucvterminal/ui.rb:147 +#: src/include/s390/iucvterminal/ui.rb:151 msgid "" "<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages to\n" "the hvc0 device instead of ttyS0.<br>" @@ -1001,85 +1001,85 @@ "路由到 hvc0 设备而不是 ttyS0。<br>" #. IUCVTerminal dialog help 10/11 -#: src/include/s390/iucvterminal/ui.rb:151 +#: src/include/s390/iucvterminal/ui.rb:156 msgid "Should kernel messages still be shown on ttyS0, manually add <b>console=ttyS0</b> to the current boot selection kernel parameter in the <b>YaST bootloader module</b>.</p>" msgstr "如果内核讯息仍应显示在 ttyS0，请在 <b>YaST 引导加载程序模块</b>中将 <b>console=ttyS0</b> 手动添加到当前引导选区的内核参数中。</p>" #. IUCVTerminal dialog help 11/11 -#: src/include/s390/iucvterminal/ui.rb:155 +#: src/include/s390/iucvterminal/ui.rb:161 msgid "<h3>Warning: HVC Terminals stay logged on without a manual logout through the shortcut: ctrl _ d</h3>" msgstr "<h3>警告：HVC 终端仍保持登录状态，没有通过快捷方式 ctrl _ d 手动注销</h3>" #. Dialog content -#: src/include/s390/iucvterminal/ui.rb:168 +#: src/include/s390/iucvterminal/ui.rb:174 msgid "&IUCVtty" msgstr "IUCVtty(&I)" -#: src/include/s390/iucvterminal/ui.rb:176 +#: src/include/s390/iucvterminal/ui.rb:182 msgid "Terminal ID &Prefix" msgstr "终端 ID 前缀(&P)" -#: src/include/s390/iucvterminal/ui.rb:182 +#: src/include/s390/iucvterminal/ui.rb:188 msgid "I&UCVtty instances" msgstr "IUCVtty 实例(&U)" -#: src/include/s390/iucvterminal/ui.rb:196 +#: src/include/s390/iucvterminal/ui.rb:202 msgid "HVC" msgstr "HVC" -#: src/include/s390/iucvterminal/ui.rb:206 +#: src/include/s390/iucvterminal/ui.rb:212 msgid "H&VC instances" msgstr "HVC 实例(&V)" -#: src/include/s390/iucvterminal/ui.rb:217 +#: src/include/s390/iucvterminal/ui.rb:223 msgid "Restrict &access to" msgstr "限制访问(&A)" -#: src/include/s390/iucvterminal/ui.rb:223 +#: src/include/s390/iucvterminal/ui.rb:229 msgid "Allowed Terminal &Servers" msgstr "允许的终端服务器(&S)" -#: src/include/s390/iucvterminal/ui.rb:231 +#: src/include/s390/iucvterminal/ui.rb:237 msgid "route &kernel messages to hvc0" msgstr "将内核消息路由到 hvc0(&K)" #. if settings were changed don't exit without asking -#: src/include/s390/iucvterminal/ui.rb:324 +#: src/include/s390/iucvterminal/ui.rb:330 msgid "Really leave without saving?" msgstr "确实要不保存并退出吗？" #. check iucv id -#: src/include/s390/iucvterminal/ui.rb:333 +#: src/include/s390/iucvterminal/ui.rb:339 msgid "The IUCV ID is not valid." msgstr "该 IUCV ID 无效。" #. check restrict_hvc_to_srvs and make sure they doesn't end with a comma -#: src/include/s390/iucvterminal/ui.rb:343 +#: src/include/s390/iucvterminal/ui.rb:349 msgid "The Terminal Servers are not valid." msgstr "终端服务器无效。" #. check if the bootloader settings need to be adjusted -#: src/include/s390/iucvterminal/ui.rb:366 +#: src/include/s390/iucvterminal/ui.rb:380 msgid "The system has to be rebooted for some changes to take effect." msgstr "必须重引导系统以使某些更改生效。" #. only five lines are allowed, remove every additional line -#: src/include/s390/onpanic/ui.rb:63 +#: src/include/s390/onpanic/ui.rb:62 msgid "Only %1 lines are allowed for VMCMD." msgstr "VMCMD 只允许 %1 行。" #. For translators: Caption of the dialog -#: src/include/s390/onpanic/ui.rb:109 +#: src/include/s390/onpanic/ui.rb:108 msgid "On Panic Configuration" msgstr "OnPanic 配置" #. OnPanic dialog help 1/11 -#: src/include/s390/onpanic/ui.rb:112 +#: src/include/s390/onpanic/ui.rb:111 msgid "<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>" msgstr "<p><b>配置发生内核恐慌时采取的操作</b></p>" #. OnPanic dialog help 2/11 -#: src/include/s390/onpanic/ui.rb:116 +#: src/include/s390/onpanic/ui.rb:115 msgid "<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior during kernel panics.</p>" msgstr "<p>需要启用 <b>Dumpconf</b> 守护程序才能影响发生内核恐慌期间的行为。</p>" @@ -1113,83 +1113,83 @@ "的 LPAR 计算机及其后续型号和 z/VMversion 5.3 及其后续型号上可用。<br>" #. OnPanic dialog help 8/11 -#: src/include/s390/onpanic/ui.rb:132 +#: src/include/s390/onpanic/ui.rb:133 msgid "<b>vmcmd</b> Execute specified CP commands and stop system.</p>" msgstr "<b>vmcmd</b> 执行指定的 CP 命令并停止系统。</p>" #. OnPanic dialog help 9/11 -#: src/include/s390/onpanic/ui.rb:134 +#: src/include/s390/onpanic/ui.rb:135 msgid "<p>The time defined in <b>Delay Minutes</b> defers activating the specified panic action for a newly started system to prevent loops. If the system crashes before the time has elapsed the default action (stop) is performed.</p>" msgstr "<p><b>延时分钟数</b>中指定的时间会延迟对新启动的系统激活指定的恐慌操作，以防止循环。如果系统在该时间结束前崩溃，将执行默认操作（停止）。</p>" #. OnPanic dialog help 10/11 -#: src/include/s390/onpanic/ui.rb:138 +#: src/include/s390/onpanic/ui.rb:141 msgid "<p>The device for dumping the memory can be set with <b>Dump Device</b>. If no device is shown you have to create one with the <b>YaST Dump Devices</b> dialog.</p>" msgstr "<p>用于转储内存的设备可通过<b>转储设备</b>设置。如果未显示任何设备，则必须用 <b>YaST 转储设备</b>对话框创建一个。</p>" #. OnPanic dialog help 11/11 -#: src/include/s390/onpanic/ui.rb:143 +#: src/include/s390/onpanic/ui.rb:147 msgid "<p>With <b>VMCMD</b> specify CP commands to be executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>" msgstr "<p>使用 <b>VMCMD</b> 指定要在 Linux 系统停止前执行的 CP 命令。只允许 %1 行和总计 %2 个字符。</p>" #. radio button label -#: src/include/s390/onpanic/ui.rb:166 +#: src/include/s390/onpanic/ui.rb:171 msgid "Do No&t Start Dumpconf" msgstr "不启动 Dumpconf(&T)" #. radio button label -#: src/include/s390/onpanic/ui.rb:175 +#: src/include/s390/onpanic/ui.rb:180 msgid "&Start Dumpconf" msgstr "启动 Dumpconf(&S)" #. combobox label -#: src/include/s390/onpanic/ui.rb:189 +#: src/include/s390/onpanic/ui.rb:194 msgid "&Panic Action" msgstr "恐慌操作(&P)" -#: src/include/s390/onpanic/ui.rb:192 +#: src/include/s390/onpanic/ui.rb:197 msgid "Delay &Minutes" msgstr "延时分钟数(&M)" #. combobox label -#: src/include/s390/onpanic/ui.rb:202 +#: src/include/s390/onpanic/ui.rb:207 msgid "&Dump Device" msgstr "转储设备(&D)" -#: src/include/s390/onpanic/ui.rb:206 +#: src/include/s390/onpanic/ui.rb:211 msgid "&VMCMD" msgstr "VMCMD(&V)" #. don't allow dumps if no device is available -#: src/include/s390/onpanic/ui.rb:267 +#: src/include/s390/onpanic/ui.rb:271 msgid "It is not possible to enable the dump process without a dump device." msgstr "没有转储设备，无法启用转储过程。" #. don't allow vmcmd without at least one command -#: src/include/s390/onpanic/ui.rb:281 +#: src/include/s390/onpanic/ui.rb:285 msgid "It is not possible to use vmcmd without defining at least one command." msgstr "未定义至少一个命令，无法使用 vmcmd。" #. Dialog caption -#: src/include/s390/zfcp/dialogs.rb:113 +#: src/include/s390/zfcp/dialogs.rb:109 msgid "Configured ZFCP Devices" msgstr "已配置的 ZFCP 设备" #. table header #. table header -#: src/include/s390/zfcp/dialogs.rb:122 src/include/s390/zfcp/dialogs.rb:131 +#: src/include/s390/zfcp/dialogs.rb:118 src/include/s390/zfcp/dialogs.rb:127 msgid "WWPN" msgstr "WWPN" #. table header #. table header -#: src/include/s390/zfcp/dialogs.rb:124 src/include/s390/zfcp/dialogs.rb:133 +#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129 msgid "LUN" msgstr "LUN" #. yes-no popup #. yes-no popup -#: src/include/s390/zfcp/dialogs.rb:238 src/include/s390/zfcp/dialogs.rb:391 +#: src/include/s390/zfcp/dialogs.rb:232 src/include/s390/zfcp/dialogs.rb:380 msgid "" "Really leave the ZFCP device configuration without saving?\n" "All changes will be lost." @@ -1198,42 +1198,42 @@ "所有更改都将丢失。" #. dialog caption -#: src/include/s390/zfcp/dialogs.rb:259 +#: src/include/s390/zfcp/dialogs.rb:252 msgid "Add New ZFCP Device" msgstr "添加新的 ZFCP 设备" #. push button -#: src/include/s390/zfcp/dialogs.rb:309 +#: src/include/s390/zfcp/dialogs.rb:300 msgid "Get WWPNs" msgstr "获取 WWPN" #. combo box -#: src/include/s390/zfcp/dialogs.rb:312 +#: src/include/s390/zfcp/dialogs.rb:303 msgid "&WWPN" msgstr "WWPN(&W)" #. push button -#: src/include/s390/zfcp/dialogs.rb:319 +#: src/include/s390/zfcp/dialogs.rb:308 msgid "Get LUNs" msgstr "获取 LUN" #. combobox -#: src/include/s390/zfcp/dialogs.rb:322 +#: src/include/s390/zfcp/dialogs.rb:311 msgid "&LUN" msgstr "LUN(&L)" -#: src/include/s390/zfcp/dialogs.rb:325 +#: src/include/s390/zfcp/dialogs.rb:314 msgid "If no WWPN and no LUN have been defined the system is trying to use allow_lun_scan." msgstr "如果尚未定义 WWPN 和 LUN，系统将尝试使用 allow_lun_scan。" #. error popup #. error popup -#: src/include/s390/zfcp/dialogs.rb:376 src/include/s390/zfcp/dialogs.rb:413 +#: src/include/s390/zfcp/dialogs.rb:365 src/include/s390/zfcp/dialogs.rb:402 msgid "The entered WWPN is invalid." msgstr "输入的 WWPN 无效。" #. error popup -#: src/include/s390/zfcp/dialogs.rb:421 +#: src/include/s390/zfcp/dialogs.rb:410 msgid "The entered LUN is invalid." msgstr "输入的 LUN 无效。" @@ -1247,7 +1247,7 @@ "</p>\n" #. Write dialog help 1/2 -#: src/include/s390/zfcp/helps.rb:44 +#: src/include/s390/zfcp/helps.rb:45 msgid "" "<p><b><big>Saving ZFCP Device Configuration</big></b><br>\n" "</p>\n" @@ -1256,7 +1256,7 @@ "</p>\n" #. Disk selection dialog help 1/3 -#: src/include/s390/zfcp/helps.rb:54 +#: src/include/s390/zfcp/helps.rb:55 msgid "" "<p><b><big>Configured ZFCP Devices</big></b><br>\n" "Manage ZFCP devices on your system.</p>\n" @@ -1265,12 +1265,12 @@ "管理您系统上的 ZFCP 设备。</P>\n" #. Disk selection dialog help 2/3 -#: src/include/s390/zfcp/helps.rb:58 +#: src/include/s390/zfcp/helps.rb:59 msgid "<p>To configure a new ZFCP device, click <b>Add</b>.</p>" msgstr "<p>要配置一个新的 ZFCP 设备, 请单击<b>添加</b>。</p>" #. Disk selection dialog help 3/3 -#: src/include/s390/zfcp/helps.rb:60 +#: src/include/s390/zfcp/helps.rb:61 msgid "" "<p>To remove a configured ZFCP device, select it and click\n" "<b>Delete</b>.</p>" @@ -1280,11 +1280,11 @@ #. Disk selection dialog Warning #. Disk selection dialog Warning -#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:88 +#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:90 msgid "<h1>Warning</h1>" msgstr "<h1>警告</h1>" -#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:89 +#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:91 msgid "" "<p>When accessing a ZFCP device\n" "<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n" @@ -1295,7 +1295,7 @@ "<b>WRITE</b> 时，确保此访问是排它的。否则会有潜在的数据损坏风险。</p>" #. Disk add help 1/2 -#: src/include/s390/zfcp/helps.rb:71 +#: src/include/s390/zfcp/helps.rb:72 msgid "" "<p><b><big>Add New ZFCP Device</big></b><br>\n" "Enter the identifier of the device to add, the\n" @@ -1308,7 +1308,7 @@ "<b>LUN</b> 编号。</p>\n" #. Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" -#: src/include/s390/zfcp/helps.rb:78 +#: src/include/s390/zfcp/helps.rb:79 msgid "" "<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs conforming\n" "format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p>\n" @@ -1326,95 +1326,95 @@ #. popup label #. popup label -#: src/modules/DASDController.rb:187 src/modules/ZFCPController.rb:163 +#: src/modules/DASDController.rb:178 src/modules/ZFCPController.rb:153 msgid "Running mkinitrd." msgstr "正在运行 mkinitrd。" #. Create a textual summary and a list of configured devices #. @return summary of the current configuration -#: src/modules/DASDController.rb:333 +#: src/modules/DASDController.rb:311 msgid "Channel ID: %1, Format: %2, DIAG: %3" msgstr "通道 ID：%1，格式：%2，DIAG：%3" -#: src/modules/DASDController.rb:346 +#: src/modules/DASDController.rb:324 msgid "Channel ID: %1, Device: %2, DIAG: %3" msgstr "通道 ID：%1，设备：%2，DIAG：%3" #. popup label -#: src/modules/DASDController.rb:381 +#: src/modules/DASDController.rb:356 msgid "Reading Configured DASD Disks" msgstr "正在读取已配置的 DASD 磁盘" #. error report, %1 is device identification #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:472 src/modules/ZFCPController.rb:446 -#: src/modules/ZFCPController.rb:540 +#: src/modules/DASDController.rb:446 src/modules/ZFCPController.rb:422 +#: src/modules/ZFCPController.rb:515 msgid "%1: sysfs not mounted." msgstr "%1: 没有加载 sysfs." #. error report, %1 is device identification #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:480 src/modules/ZFCPController.rb:454 -#: src/modules/ZFCPController.rb:548 +#: src/modules/DASDController.rb:454 src/modules/ZFCPController.rb:430 +#: src/modules/ZFCPController.rb:523 msgid "%1: Invalid status for <online>." msgstr "%1：无效的 <online> 状态。" #. error report, %1 is device identification #. error report, %1 is device identification -#: src/modules/DASDController.rb:488 src/modules/ZFCPController.rb:462 +#: src/modules/DASDController.rb:462 src/modules/ZFCPController.rb:438 msgid "%1: No device found for <ccwid>." msgstr "%1：未找到 <ccwid> 设备。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:496 +#: src/modules/DASDController.rb:470 msgid "%1: Could not change state of the device." msgstr "%1：无法更改设备状态。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:505 +#: src/modules/DASDController.rb:479 msgid "%1: Device is not a DASD." msgstr "%1：设备不是 DASD。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:514 +#: src/modules/DASDController.rb:488 msgid "%1: Could not load module." msgstr "%1：无法装载模块。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:523 +#: src/modules/DASDController.rb:497 msgid "%1: Failed to activate DASD." msgstr "%1：无法激活 DASD。" #. error report, %1 is device identification -#: src/modules/DASDController.rb:532 +#: src/modules/DASDController.rb:506 msgid "%1: DASD is not formatted." msgstr "%1：DASD 未格式化。" #. error report, %1 is device identification, %2 is integer code #. error report, %1 is device identification, %2 is integer code #. error report, %1 is device identification, %2 is integer code -#: src/modules/DASDController.rb:540 src/modules/ZFCPController.rb:518 -#: src/modules/ZFCPController.rb:596 +#: src/modules/DASDController.rb:514 src/modules/ZFCPController.rb:494 +#: src/modules/ZFCPController.rb:571 msgid "%1: Unknown error %2." msgstr "%1：未知的错误 %2。" #. progress bar -#: src/modules/DASDController.rb:653 +#: src/modules/DASDController.rb:622 msgid "Formatting %1:" msgstr "正在格式化 %1：" #. error report, %1 is exit code of the command (integer) #. error report, %1 is exit code of the command (integer) -#: src/modules/DASDController.rb:682 src/modules/DASDController.rb:779 +#: src/modules/DASDController.rb:651 src/modules/DASDController.rb:747 msgid "Disks formatting failed. Exit code: %1." msgstr "磁盘格式化失败。退出代码：%1。" #. progress bar, %1 is device name, %2 and %3 #. integers, #. eg. Formatting /dev/dasda: cylinder 123 of 12334 done -#: src/modules/DASDController.rb:750 +#: src/modules/DASDController.rb:718 msgid "Formatting %1: cylinder %2 of %3 done" msgstr "正在格式化 %1: 共有 %3 个柱面, 已完成 %2" @@ -1453,9 +1453,9 @@ #. Progress finished #. Progress finished #: src/modules/Dump.rb:86 src/modules/Dump.rb:121 -#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:246 -#: src/modules/IUCVTerminalServer.rb:334 src/modules/IUCVTerminalServer.rb:478 -#: src/modules/OnPanic.rb:234 src/modules/OnPanic.rb:276 +#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:244 +#: src/modules/IUCVTerminalServer.rb:335 src/modules/IUCVTerminalServer.rb:478 +#: src/modules/OnPanic.rb:233 src/modules/OnPanic.rb:275 msgid "Finished" msgstr "已完成" @@ -1478,37 +1478,37 @@ msgstr "正在创建转储设备。此过程可能需要数分钟。" #. error description -#: src/modules/Dump.rb:148 +#: src/modules/Dump.rb:147 msgid "Invalid or unusable disk (fatal)." msgstr "磁盘无效或不可用（致命）。" #. error description -#: src/modules/Dump.rb:151 +#: src/modules/Dump.rb:150 msgid "Incompatible formatting or partitioning, correct with Force." msgstr "不兼容格式或分区，将强行纠正。" #. error description -#: src/modules/Dump.rb:156 +#: src/modules/Dump.rb:155 msgid "Missing support programs." msgstr "缺少支持程序。" #. error description -#: src/modules/Dump.rb:159 +#: src/modules/Dump.rb:158 msgid "Missing or wrong parameters." msgstr "参数缺少或错误。" #. error description -#: src/modules/Dump.rb:162 +#: src/modules/Dump.rb:161 msgid "Access problem." msgstr "访问问题。" #. error description, %1 is error code (integer) -#: src/modules/Dump.rb:165 +#: src/modules/Dump.rb:164 msgid "Error code from support program: %1." msgstr "支持程序的错误代码：%1." #. error report, %1 is device name, %2 error description -#: src/modules/Dump.rb:169 +#: src/modules/Dump.rb:168 msgid "" "Cannot create dump device %1:\n" "%2" @@ -1553,37 +1553,37 @@ msgstr "正在读取内核参数..." #. Inittab write dialog caption -#: src/modules/IUCVTerminal.rb:223 +#: src/modules/IUCVTerminal.rb:221 msgid "Saving IUCV Terminal Configuration" msgstr "正在保存 IUCV 终端配置" #. Progress stage 1/4 -#: src/modules/IUCVTerminal.rb:232 +#: src/modules/IUCVTerminal.rb:230 msgid "Write IUCVtty settings" msgstr "写入 IUCVtty 设置" #. Progress stage 2/4 -#: src/modules/IUCVTerminal.rb:234 +#: src/modules/IUCVTerminal.rb:232 msgid "Write HVC settings" msgstr "写入 HVC 设置" #. Progress stage 3/4 -#: src/modules/IUCVTerminal.rb:236 +#: src/modules/IUCVTerminal.rb:234 msgid "Write kernel parameters" msgstr "写入内核参数" #. Progress step 1/4 -#: src/modules/IUCVTerminal.rb:240 +#: src/modules/IUCVTerminal.rb:238 msgid "Writing IUCVtty settings..." msgstr "正在写入 IUCVtty 设置..." #. Progress step 2/4 -#: src/modules/IUCVTerminal.rb:242 +#: src/modules/IUCVTerminal.rb:240 msgid "Writing HVC settings..." msgstr "正在写入 HVC 设置..." #. Progress step 3/4 -#: src/modules/IUCVTerminal.rb:244 +#: src/modules/IUCVTerminal.rb:242 msgid "Writing kernel parameters..." msgstr "正在写入内核参数..." @@ -1594,27 +1594,27 @@ #. Read all settings #. @return true on success -#: src/modules/IUCVTerminalServer.rb:315 +#: src/modules/IUCVTerminalServer.rb:316 msgid "Loading IUCV Terminal Server Configuration" msgstr "正在装载 IUCV 终端服务器配置" #. Progress stage 1/2 -#: src/modules/IUCVTerminalServer.rb:324 +#: src/modules/IUCVTerminalServer.rb:325 msgid "Read configuration files" msgstr "读取配置文件" #. Progress stage 2/2 -#: src/modules/IUCVTerminalServer.rb:326 +#: src/modules/IUCVTerminalServer.rb:327 msgid "Load user/group settings" msgstr "装载用户/组设置" #. Progress step 1/2 -#: src/modules/IUCVTerminalServer.rb:330 +#: src/modules/IUCVTerminalServer.rb:331 msgid "Reading configuration files..." msgstr "正在读取配置文件..." #. Progress step 2/2 -#: src/modules/IUCVTerminalServer.rb:332 +#: src/modules/IUCVTerminalServer.rb:333 msgid "Loading user/group settings..." msgstr "正在装载用户/组设置..." @@ -1644,67 +1644,67 @@ msgstr "正在更新用户设置..." #. Dumpconf read dialog caption -#: src/modules/OnPanic.rb:215 +#: src/modules/OnPanic.rb:214 msgid "Reading Dumpconf Configuration" msgstr "正在读取 Dumpconf 配置" #. Progress stage 1/2 -#: src/modules/OnPanic.rb:224 +#: src/modules/OnPanic.rb:223 msgid "Checking dump devices" msgstr "正在检查转储设备" #. Progress stage 2/2 -#: src/modules/OnPanic.rb:226 +#: src/modules/OnPanic.rb:225 msgid "Reading settings" msgstr "正在读取设置" #. Progress step 1/2 -#: src/modules/OnPanic.rb:230 +#: src/modules/OnPanic.rb:229 msgid "Checking dump devices..." msgstr "正在检查转储设备..." #. Progress step 2/2 -#: src/modules/OnPanic.rb:232 +#: src/modules/OnPanic.rb:231 msgid "Reading the settings..." msgstr "正在读取设置..." #. Dumpconf write dialog caption -#: src/modules/OnPanic.rb:257 +#: src/modules/OnPanic.rb:256 msgid "Saving Dumpconf Configuration" msgstr "正在保存 Dumpconf 配置" #. Progress stage 1/2 -#: src/modules/OnPanic.rb:266 +#: src/modules/OnPanic.rb:265 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/OnPanic.rb:268 +#: src/modules/OnPanic.rb:267 msgid "Restart the service" msgstr "重启动服务" #. Progress step 1/2 -#: src/modules/OnPanic.rb:272 +#: src/modules/OnPanic.rb:271 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/OnPanic.rb:274 +#: src/modules/OnPanic.rb:273 msgid "Restarting service..." msgstr "正在重启动服务..." #. Create a textual summary and a list of configured devices #. @return summary of the current configuration -#: src/modules/ZFCPController.rb:304 +#: src/modules/ZFCPController.rb:279 msgid "Channel ID: %1, WWPN: %2, LUN: %3" msgstr "通道 ID：%1，WWPN：%2，LUN：%3" -#: src/modules/ZFCPController.rb:313 +#: src/modules/ZFCPController.rb:288 msgid "Channel ID: %1, WWPN: %2, LUN: %3, Device: %4" msgstr "通道 ID：%1，WWPN：%2，LUN：%3，设备：%4" #. TRANSLATORS: warning message -#: src/modules/ZFCPController.rb:372 +#: src/modules/ZFCPController.rb:348 msgid "" "Cannot evaluate ZFCP controllers (e.g. in LPAR).\n" "You will have to set it manually." @@ -1713,61 +1713,61 @@ "您将需要手动设置它。" #. popup label -#: src/modules/ZFCPController.rb:391 +#: src/modules/ZFCPController.rb:366 msgid "Reading Configured ZFCP Devices" msgstr "正在读取已配置的 ZFCP 设备" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:470 +#: src/modules/ZFCPController.rb:446 msgid "%1: WWPN invalid." msgstr "%1：WWPN 无效。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:478 +#: src/modules/ZFCPController.rb:454 msgid "%1: Could not activate WWPN for adapter %1." msgstr "%1：不能为适配器 %1 激活 WWPN。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:486 +#: src/modules/ZFCPController.rb:462 msgid "%1: Could not activate ZFCP device." msgstr "%1：无法激活 ZFCP 设备。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:494 +#: src/modules/ZFCPController.rb:470 msgid "%1: SCSI disk could not be deactivated." msgstr "%1：SCSI 磁盘不能禁用。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:502 +#: src/modules/ZFCPController.rb:478 msgid "%1: LUN could not be unregistered." msgstr "%1：无法取消注册 LUN。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:510 +#: src/modules/ZFCPController.rb:486 msgid "%1: WWPN could not be unregistered." msgstr "%1：无法取消注册 WWPN。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:556 +#: src/modules/ZFCPController.rb:531 msgid "%1: Device <ccwid> does not exist." msgstr "%1：设备 <ccwid> 不存在。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:564 +#: src/modules/ZFCPController.rb:539 msgid "%1: Module zfcp could not be loaded." msgstr "%1：模块 zfcp 不能装载。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:572 +#: src/modules/ZFCPController.rb:547 msgid "%1: Adapter status could not be changed." msgstr "%1：适配器状态不能更改。" #. error report, %1 is device identification -#: src/modules/ZFCPController.rb:580 +#: src/modules/ZFCPController.rb:555 msgid "%1: WWPN ports still active." msgstr "%1：WWPN 端口仍是活动的。" #. message, %1 is device identification -#: src/modules/ZFCPController.rb:588 +#: src/modules/ZFCPController.rb:563 msgid "%1: This host adapter supports allow_lun_scan." msgstr "%1：此主机适配器支持 allow_lun_scan。" Modified: branches/SLE12-SP3/yast/zh_CN/po/samba-server.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/samba-server.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/samba-server.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: samba-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 18:29+0200\n" +"POT-Creation-Date: 2017-04-05 02:29+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -1708,107 +1708,115 @@ #. translators: progress finished #. translators: write progress step -#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285 +#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:293 msgid "Finished" msgstr "已完成" +#: src/modules/SambaServer.pm:186 +msgid "" +"Cups is required by samba for printing to \n" +"work correctly. Do you wish to disable printing?\n" +"Note: To reenable printing you will need to \n" +"manually enable the \"printers\" share and install cups." +msgstr "" + #. Samba-server read dialog caption -#: src/modules/SambaServer.pm:255 +#: src/modules/SambaServer.pm:263 msgid "Saving Samba Server Configuration" msgstr "正在保存 Samba 服务器配置" #. translators: write progress stage -#: src/modules/SambaServer.pm:260 +#: src/modules/SambaServer.pm:268 msgid "Write global settings" msgstr "写入全局设置" #. translators: write progress stage -#: src/modules/SambaServer.pm:262 +#: src/modules/SambaServer.pm:270 msgid "Disable Samba services" msgstr "禁用 Samba 服务" #. translators: write progress stage -#: src/modules/SambaServer.pm:264 +#: src/modules/SambaServer.pm:272 msgid "Enable Samba services" msgstr "启用 Samba 服务" #. translators: write progress stage -#: src/modules/SambaServer.pm:266 +#: src/modules/SambaServer.pm:274 msgid "Write back-end settings" msgstr "写入后端设置" #. translators: write progress stage -#: src/modules/SambaServer.pm:268 +#: src/modules/SambaServer.pm:276 msgid "Write Samba accounts" msgstr "写入 Samba 帐户" #. translators: write progress stage -#: src/modules/SambaServer.pm:270 +#: src/modules/SambaServer.pm:278 msgid "Save firewall settings" msgstr "保存防火墙设置" #. translators: write progress step -#: src/modules/SambaServer.pm:273 +#: src/modules/SambaServer.pm:281 msgid "Writing global settings..." msgstr "正在写入全局设置..." #. translators: write progress step -#: src/modules/SambaServer.pm:275 +#: src/modules/SambaServer.pm:283 msgid "Disabling Samba services..." msgstr "正在禁用 Samba 服务..." #. translators: write progress step -#: src/modules/SambaServer.pm:277 +#: src/modules/SambaServer.pm:285 msgid "Enabling Samba services..." msgstr "正在启用 Samba 服务..." #. translators: write progress step -#: src/modules/SambaServer.pm:279 +#: src/modules/SambaServer.pm:287 msgid "Writing back-end settings..." msgstr "正在写入后端设置..." #. translators: write progress step -#: src/modules/SambaServer.pm:281 +#: src/modules/SambaServer.pm:289 msgid "Writing Samba accounts..." msgstr "正在写入 Samba 帐户..." #. translators: write progress step -#: src/modules/SambaServer.pm:283 +#: src/modules/SambaServer.pm:291 msgid "Saving firewall settings..." msgstr "正在保存防火墙设置..." #. /etc/samba/smb.conf is filename -#: src/modules/SambaServer.pm:309 +#: src/modules/SambaServer.pm:317 msgid "Cannot write settings to /etc/samba/smb.conf." msgstr "无法将设置写入 /etc/samba/smb.conf。" #. summary item: configured workgroup/domain -#: src/modules/SambaServer.pm:406 +#: src/modules/SambaServer.pm:414 msgid "Global Configuration:" msgstr "全局配置：" -#: src/modules/SambaServer.pm:408 +#: src/modules/SambaServer.pm:416 #, perl-format msgid "Workgroup or Domain: %s" msgstr "工作组或域：%s" #. summary item: selected role for the samba server -#: src/modules/SambaServer.pm:412 +#: src/modules/SambaServer.pm:420 #, perl-format msgid "Role: %s" msgstr "角色：%s" #. summary item: status of the samba service -#: src/modules/SambaServer.pm:415 +#: src/modules/SambaServer.pm:423 msgid "Samba server is disabled" msgstr "Samba 服务器已禁用" #. summary heading: configured shares -#: src/modules/SambaServer.pm:419 +#: src/modules/SambaServer.pm:427 msgid "Share Configuration:" msgstr "共享配置：" #. summary item: no configured shares -#: src/modules/SambaServer.pm:425 +#: src/modules/SambaServer.pm:433 msgid "None" msgstr "无" Modified: branches/SLE12-SP3/yast/zh_CN/po/scanner.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/scanner.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/scanner.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 18:29+0200\n" +"POT-Creation-Date: 2017-04-04 02:29+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -157,7 +157,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:2261 +#: src/modules/Scanner.rb:2235 msgid "Failed to deactivate %1." msgstr "未能停用 %1。" @@ -939,7 +939,7 @@ #. to add a preceding "The error message is:" comment #. to display an error message where #. %1 will be replaced by the actual error message: -#: src/modules/Scanner.rb:355 +#: src/modules/Scanner.rb:353 msgid "" "The error message is:\n" "\n" @@ -951,7 +951,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:377 +#: src/modules/Scanner.rb:375 msgid "Failed to determine the version of package %1." msgstr "未能确定包 %1 的版本。" @@ -961,7 +961,7 @@ #. Do not change or translate "Image Scan", it is a driver software name. #. Do not change or translate "Avasys", it is a manufacturer name. #. Do not change or translate "Epson", it is a manufacturer name. -#: src/modules/Scanner.rb:399 +#: src/modules/Scanner.rb:397 msgid "" "The third-party Image Scan driver software from Epson/Avasys is required.\n" "The Image Scan driver software is made and provided by Epson (formerly Avasys)\n" @@ -991,12 +991,12 @@ #. Is the package available to be installed? #. Package::Available returns nil if no package source is available. -#: src/modules/Scanner.rb:442 +#: src/modules/Scanner.rb:440 msgid "Required package %1 is not installed and there is no package repository available." msgstr "未安装必需的包 %1 且包的储存库不可用。" #. Message of a Popup::Error where %1 will be replaced by the package name: -#: src/modules/Scanner.rb:457 +#: src/modules/Scanner.rb:455 msgid "Required package %1 is not installed and not available in the repository." msgstr "未安装必需的包 %1 且储存库中的此包不可用。" @@ -1004,7 +1004,7 @@ #. Either the user has explicitly rejected to install the package, #. or 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:476 +#: src/modules/Scanner.rb:474 msgid "Failed to install required package %1." msgstr "未能安装必需的包 %1。" @@ -1012,7 +1012,7 @@ #. Do not change or translate "net", it is a metadriver name. #. Do not simply use "driver" because net is no normal driver but a metadriver. #. Do not change or translate "scanimage -L", it is a fixed command. -#: src/modules/Scanner.rb:497 +#: src/modules/Scanner.rb:495 msgid "" "Failed to determine the active scanners.\n" "If the net metadriver is activated while there is a problem\n" @@ -1030,7 +1030,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no active scanner was determined. #. The latter results no error. -#: src/modules/Scanner.rb:519 +#: src/modules/Scanner.rb:517 msgid "Failed to determine the active scanners." msgstr "未能确定活动扫描仪。" @@ -1042,8 +1042,8 @@ #. (i.e. a system which is not totally broken or totally messed up). #. 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:2500 +#: src/modules/Scanner.rb:531 src/modules/Scanner.rb:589 +#: src/modules/Scanner.rb:648 src/modules/Scanner.rb:2474 msgid "File %1 does not exist." msgstr "文件 %1 不存在。" @@ -1055,8 +1055,8 @@ #. (i.e. a system which is not totally broken or totally messed up). #. 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:2520 +#: src/modules/Scanner.rb:551 src/modules/Scanner.rb:609 +#: src/modules/Scanner.rb:668 src/modules/Scanner.rb:2494 msgid "Failed to read %1." msgstr "未能读取 %1。" @@ -1064,7 +1064,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no active driver was determined. #. The latter results no error. -#: src/modules/Scanner.rb:577 +#: src/modules/Scanner.rb:575 msgid "Failed to determine the active drivers." msgstr "未能确定活动驱动程序。" @@ -1072,7 +1072,7 @@ #. (i.e. a system which is not totally broken or totally messed up). #. Do not confuse this error with the case when no scanner was autodetected. #. The latter results no error. -#: src/modules/Scanner.rb:636 +#: src/modules/Scanner.rb:634 msgid "Failed to detect scanners automatically." msgstr "未能自动检测到扫描仪。" @@ -1084,53 +1084,53 @@ #. - Determine active backends #. - Try to autodetect USB and SCSI scanners and HP all-in-one USB and NETWORK scanners #. @return true on success -#: src/modules/Scanner.rb:766 +#: src/modules/Scanner.rb:764 msgid "Initializing Scanner Configuration" msgstr "正在初始化扫描仪配置" -#: src/modules/Scanner.rb:770 +#: src/modules/Scanner.rb:768 msgid "Check installed packages" msgstr "检查已安装的包" #. 2. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:772 +#: src/modules/Scanner.rb:770 msgid "Read or create the scanner database" msgstr "读取或创建扫描仪数据库" #. 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:1988 +#: src/modules/Scanner.rb:772 src/modules/Scanner.rb:1986 msgid "Determine active scanners" msgstr "确定活动扫描仪" #. 4. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:776 +#: src/modules/Scanner.rb:774 msgid "Determine active drivers" msgstr "确定活动驱动程序" #. 5. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:778 +#: src/modules/Scanner.rb:776 msgid "Detect scanners" msgstr "检测扫描仪" #. 1. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:781 +#: src/modules/Scanner.rb:779 msgid "Checking installed packages..." msgstr "正在检查已安装的包..." #. 2. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:783 +#: src/modules/Scanner.rb:781 msgid "Reading or creating the scanner database..." msgstr "正在读取或正在创建扫描仪数据库..." #. 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:2001 +#: src/modules/Scanner.rb:783 src/modules/Scanner.rb:1999 msgid "Determining active scanners..." msgstr "正在确定活动扫描仪..." #. 4. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:787 +#: src/modules/Scanner.rb:785 msgid "Determining active drivers..." msgstr "正在确定活动驱动程序..." @@ -1139,49 +1139,49 @@ #. Body of a Popup::ShowFeedback: #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1001 -#: src/modules/Scanner.rb:1070 +#: src/modules/Scanner.rb:787 src/modules/Scanner.rb:999 +#: src/modules/Scanner.rb:1068 msgid "Detecting scanners..." msgstr "正在检测扫描仪..." #. Last progress step progress bar title of a Progress::New: #. 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:2003 +#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1028 +#: src/modules/Scanner.rb:2001 msgid "Finished" msgstr "已完成" #. Progress 2. stage (Read or create the scanner database): -#: src/modules/Scanner.rb:859 +#: src/modules/Scanner.rb:857 msgid "Creating scanner database..." 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/Scanner.rb:893 +#: src/modules/Scanner.rb:891 msgid "Aborting: Failed to create the scanner database." 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/Scanner.rb:933 +#: src/modules/Scanner.rb:931 msgid "Aborting: Failed to read %1." msgstr "中止：未能读取 %1。" #. Write scanner settings: #. - Save the actual environment #. @return true on success -#: src/modules/Scanner.rb:1023 +#: src/modules/Scanner.rb:1021 msgid "Writing Scanner Configuration" msgstr "正在写入扫描仪配置" -#: src/modules/Scanner.rb:1026 +#: src/modules/Scanner.rb:1024 msgid "Save the actual environment" msgstr "保存实际环境" #. 1. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1028 +#: src/modules/Scanner.rb:1026 msgid "Saving the actual environment..." msgstr "正在保存实际环境..." @@ -1189,7 +1189,7 @@ #. Do not change or translate "ptal", it is a service name. #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "HPLIP", it is a subsystem name. -#: src/modules/Scanner.rb:1088 +#: src/modules/Scanner.rb:1086 msgid "" "There is at least one printer configuration that uses the ptal service.\n" "It is possible to proceed but then the running ptal service could prevent\n" @@ -1207,7 +1207,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/Scanner.rb:1099 +#: src/modules/Scanner.rb:1097 msgid "" "Cannot run hp-setup because no graphical display can be opened. \n" "This happens if YaST runs in text-only mode, or the user who runs YaST \n" @@ -1223,7 +1223,7 @@ #. Message of a Popup::YesNo when hplip should be installed. #. Do not change or translate "hp-setup", it is a program name. #. Do not change or translate "hplip", it is a package name: -#: src/modules/Scanner.rb:1111 +#: src/modules/Scanner.rb:1109 msgid "" "It seems hplip is not installed, which is required to run hp-setup.\n" "Should the hplip package be installed?\n" @@ -1233,7 +1233,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/Scanner.rb:1117 +#: src/modules/Scanner.rb:1115 msgid "" "Cannot run hp-setup because\n" "/usr/bin/hp-setup is not executable\n" @@ -1245,7 +1245,7 @@ #. Body of a Popup::ShowFeedback. #. Do not change or translate "hp-setup", it is a program name: -#: src/modules/Scanner.rb:1125 +#: src/modules/Scanner.rb:1123 msgid "" "Launched hp-setup.\n" "You must finish hp-setup before you can proceed with the scanner configuration.\n" @@ -1255,25 +1255,25 @@ #. where autodetected scanners are listed in the second column #. to denote those scanners which are not configured yet: -#: src/modules/Scanner.rb:1296 +#: src/modules/Scanner.rb:1294 msgid "Not Configured:" msgstr "未配置：" #. 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:2242 +#: src/modules/Scanner.rb:1324 src/modules/Scanner.rb:2216 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:2230 +#: src/modules/Scanner.rb:1330 src/modules/Scanner.rb:2204 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:2236 +#: src/modules/Scanner.rb:1333 src/modules/Scanner.rb:2210 msgid "Unknown model" msgstr "未知型号" @@ -1284,14 +1284,14 @@ #. %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:2225 +#: src/modules/Scanner.rb:1358 src/modules/Scanner.rb:2199 msgid "%1 %2 at %3" msgstr "%1 %2 的 %3" #. A suffix for the second column of a table #. where active scanner drivers are listed in the first column #. to denote those drivers for which there is no matching active scanner: -#: src/modules/Scanner.rb:1402 +#: src/modules/Scanner.rb:1400 msgid "No scanner recognized by this driver" msgstr "此驱动程序未识别出扫描仪" @@ -1299,12 +1299,12 @@ #. when neither a scanner was autodetected #. nor an active scanner was found #. nor an active driver was found: -#: src/modules/Scanner.rb:1426 +#: src/modules/Scanner.rb:1424 msgid "No scanner was detected and no active scanner or driver exists." msgstr "未检测到扫描仪并且不存在活动的扫描仪或驱动程序。" #. Scanner model list firmware entry for models which require a firmware upload: -#: src/modules/Scanner.rb:1455 +#: src/modules/Scanner.rb:1453 msgid "Firmware upload required." msgstr "需要固件上载。" @@ -1313,79 +1313,79 @@ #. Do not change or translate "Image Scan", it is a driver software name. #. Do not change or translate "Avasys", it is a manufacturer name. #. Do not change or translate "Epson", it is a manufacturer name. -#: src/modules/Scanner.rb:1461 +#: src/modules/Scanner.rb:1459 msgid "Third-party Image Scan driver software from Epson/Avasys required." msgstr "需要来自 Epson/Avasys 的第三方图片扫描驱动程序软件。" #. %1 will be replaced by the RPM package name #. which provides the driver for the particular model: -#: src/modules/Scanner.rb:1527 +#: src/modules/Scanner.rb:1525 msgid "Package %1" msgstr "包 %1" #. but where the backend (scanner driver) is unmaintained: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1548 +#: src/modules/Scanner.rb:1546 msgid "Unmaintained driver %1 may provide good functionality." msgstr "不再维护的驱动程序 %1 可以提供良好的功能。" #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1554 +#: src/modules/Scanner.rb:1552 msgid "Driver %1 should provide good functionality." msgstr "驱动程序 %1 应该能提供良好的功能。" #. Scanner model list status entry for "good" supported models: -#: src/modules/Scanner.rb:1561 +#: src/modules/Scanner.rb:1559 msgid "This scanner is not supported." msgstr "不支持该扫描仪。" #. which are listed as "unsupported" for a particular driver: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1566 +#: src/modules/Scanner.rb:1564 msgid "This scanner is not supported by the driver %1." msgstr "驱动程序 %1 不支持该扫描仪。" #. but where the backend (scanner driver) is unmaintained: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1576 +#: src/modules/Scanner.rb:1574 msgid "Unmaintained driver %1 may provide complete functionality." msgstr "不再维护的驱动程序 %1 可以提供完整的功能。" #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1584 +#: src/modules/Scanner.rb:1582 msgid "Driver %1 should provide complete functionality." msgstr "驱动程序 %1 应该能提供完整的功能。" #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1592 +#: src/modules/Scanner.rb:1590 msgid "Driver %1 may work, but was not tested." msgstr "驱动程序 %1 或许可以工作，但未经测试。" #. but where the backend (scanner driver) is unmaintained: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1601 +#: src/modules/Scanner.rb:1599 msgid "Unmaintained driver %1 may provide basic functionality." msgstr "不再维护的驱动程序 %1 可以能提供基本的功能。" #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1609 +#: src/modules/Scanner.rb:1607 msgid "Driver %1 should provide basic functionality." msgstr "驱动程序 %1 应该能提供基本的功能。" #. but where the backend (scanner driver) is unmaintained: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1619 +#: src/modules/Scanner.rb:1617 msgid "Unmaintained driver %1 may provide minimal functionality." msgstr "不再维护的驱动程序 %1 可以能提供精简的功能。" #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1627 +#: src/modules/Scanner.rb:1625 msgid "Driver %1 should provide minimal functionality." msgstr "驱动程序 %1 应该能提供精简的功能。" #. which are listed but without a known support status: #. %1 will be replaced by the backend (scanner driver) name -#: src/modules/Scanner.rb:1635 +#: src/modules/Scanner.rb:1633 msgid "Driver %1 may work, but the functionality is unknown." msgstr "驱动程序 %1 或许可以工作，但其功能未知。" @@ -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:1886 +#: src/modules/Scanner.rb:1884 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:1905 +#: src/modules/Scanner.rb:1903 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:1917 +#: src/modules/Scanner.rb:1915 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:1940 +#: src/modules/Scanner.rb:1938 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:1976 +#: src/modules/Scanner.rb:1974 msgid "Setting Up Driver %1" msgstr "正在设置驱动程序 %1" -#: src/modules/Scanner.rb:1980 +#: src/modules/Scanner.rb:1978 msgid "Check whether additional packages must be installed" msgstr "检查是否必须安装其它包" #. 2. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1982 +#: src/modules/Scanner.rb:1980 msgid "Check whether firmware upload is required" msgstr "检查是否需要上载固件" #. 3. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1984 +#: src/modules/Scanner.rb:1982 msgid "Test and set up special requirements for particular drivers" msgstr "测试并设置特定驱动程序的特殊需求" #. 4. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1986 +#: src/modules/Scanner.rb:1984 msgid "Activate the driver" msgstr "激活驱动程序" #. 1. progress stage name of a Progress::New: -#: src/modules/Scanner.rb:1991 +#: src/modules/Scanner.rb:1989 msgid "Checking whether additional packages must be installed..." msgstr "正在检查是否必须安装其它包..." #. 2. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:1993 +#: src/modules/Scanner.rb:1991 msgid "Checking whether firmware upload is required..." msgstr "正在检查是否需要上载固件..." #. 3. progress step progress bar title of a Progress::New: -#: src/modules/Scanner.rb:1995 +#: src/modules/Scanner.rb:1993 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:1999 +#: src/modules/Scanner.rb:1997 msgid "Activating the driver..." msgstr "正在激活驱动程序..." #. the third-party Image Scan driver software from Epson/Avasys: -#: src/modules/Scanner.rb:2020 +#: src/modules/Scanner.rb:2018 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:2028 +#: src/modules/Scanner.rb:2026 msgid "The driver %1 requires the package %2." msgstr "驱动程序 %1 需要包 %2。" @@ -1564,9 +1564,8 @@ #. 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:2034 src/modules/Scanner.rb:2075 -#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133 -#: src/modules/Scanner.rb:2143 +#: src/modules/Scanner.rb:2032 src/modules/Scanner.rb:2073 +#: src/modules/Scanner.rb:2106 src/modules/Scanner.rb:2117 msgid "Aborted" msgstr "已中止" @@ -1578,7 +1577,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:2054 +#: src/modules/Scanner.rb:2052 msgid "Firmware Upload Required" msgstr "需要固件上载" @@ -1587,19 +1586,12 @@ #. 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:2109 +#: src/modules/Scanner.rb:2096 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: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:2217 +#: src/modules/Scanner.rb:2191 msgid "" "The following scanners use the same driver.\n" "Therefore all those scanners will be deactivated:" @@ -1614,49 +1606,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:2285 +#: src/modules/Scanner.rb:2259 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:2300 +#: src/modules/Scanner.rb:2274 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:2311 +#: src/modules/Scanner.rb:2285 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:2370 +#: src/modules/Scanner.rb:2344 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:2372 +#: src/modules/Scanner.rb:2346 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:2387 +#: src/modules/Scanner.rb:2361 msgid "&Scanner to Test" msgstr "要测试的扫描仪(&S)" #. Test the device: -#: src/modules/Scanner.rb:2409 +#: src/modules/Scanner.rb:2383 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:2412 +#: src/modules/Scanner.rb:2386 msgid "Testing with 'scanimage -d %1 -v'..." msgstr "正在使用“scanimage -d %1 -v”进行测试..." @@ -1664,7 +1656,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:2424 +#: src/modules/Scanner.rb:2398 msgid "" "Test with 'scanimage -d %1 -v' failed.\n" "The results are:\n" @@ -1678,7 +1670,7 @@ #. Fallback message if the real results are missing: #. Fallback message if the real results are missing: -#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467 +#: src/modules/Scanner.rb:2409 src/modules/Scanner.rb:2441 msgid "(no results available)" msgstr "(无可用的结果)" @@ -1688,7 +1680,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:2450 +#: src/modules/Scanner.rb:2424 msgid "Successfully Tested %1" msgstr "已成功测试 %1" @@ -1696,7 +1688,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:2456 +#: src/modules/Scanner.rb:2430 msgid "" "Test with 'scanimage -d %1 -v' succeeded.\n" "The results are:\n" @@ -1712,7 +1704,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:2486 +#: src/modules/Scanner.rb:2460 msgid "Failed to determine the configuration for scanning via network." msgstr "未能确定通过网络进行扫描的配置。" @@ -1720,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 is to be set up. #. The latter results no error. -#: src/modules/Scanner.rb:2562 +#: src/modules/Scanner.rb:2536 msgid "Failed to set up scanning via network." msgstr "未能设置通过网络进行扫描。" @@ -1735,11 +1727,14 @@ #. 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:2590 +#: src/modules/Scanner.rb:2564 msgid "Check that your firewall allows scanning via network." msgstr "检查您的防火墙是否允许通过网络扫描。" #. Popup::MessageDetails information regarding details: -#: src/modules/Scanner.rb:2592 +#: src/modules/Scanner.rb:2566 msgid "For details regarding firewall see the help text of this dialog." msgstr "防火墙详情，请参考此对话框的帮助文本。" + +#~ msgid "Failed to set up the PTAL system." +#~ msgstr "未能设置 PTAL 系统。" Modified: branches/SLE12-SP3/yast/zh_CN/po/smt.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/smt.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/smt.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: smt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-04 17:26+0000\n" +"POT-Creation-Date: 2017-05-22 12:57+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -646,6 +646,19 @@ msgid "Writing patches..." msgstr "正在写入增补程序..." +#. bnc #390085 +#: src/include/smt/dialogs.rb:1129 +#, fuzzy +#| msgid "Database &Password" +msgid "Database Password for %1 User" +msgstr "数据库口令(&P)" + +#: src/include/smt/dialogs.rb:1137 +#, fuzzy +#| msgid "P&assword for user (again)" +msgid "Database Password for %1 User Once Again" +msgstr "用户的密码（再次）(&A)" + #. TRANSLATORS: error report #: src/include/smt/dialogs.rb:1167 src/modules/SMTData.rb:1130 msgid "The first and the second password do not match." Modified: branches/SLE12-SP3/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/storage.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/storage.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-03 01:29+0000\n" +"POT-Creation-Date: 2017-05-17 17:46+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -71,7 +71,7 @@ msgid "List partitions" msgstr "列出分区" -#. Title for dialogue +#. Title for dialog #: src/clients/inst_disk_proposal.rb:76 msgid "Suggested Partitioning" msgstr "建议的分区" @@ -88,7 +88,7 @@ #. popup text #: src/clients/inst_disk_proposal.rb:123 -#: src/clients/partitions_proposal.rb:105 +#: src/clients/partitions_proposal.rb:115 msgid "" "No automatic proposal possible.\n" "Specify mount points manually in the 'Partitioner' dialog." @@ -97,16 +97,14 @@ "请在\"分区工具\"对话框中手动指定安装点。" #. TRANSLATORS: button text -#. this is the resize case -#. -#. this is the normal case -#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164 -#: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185 +#. Return a term for a PushButton("Edit Proposal Settings") +#. or Empty() if that button is disabled in control.xml. +#: src/clients/inst_disk_proposal.rb:136 src/clients/inst_target_part.rb:500 msgid "Edit Proposal Settings" msgstr "编辑建议设置" #. help on suggested partitioning -#: src/clients/inst_disk_proposal.rb:165 +#: src/clients/inst_disk_proposal.rb:166 msgid "" "<p>\n" "Your hard disks have been checked. The partition setup\n" @@ -118,7 +116,7 @@ #. help text continued #. %1 is replaced by button text -#: src/clients/inst_disk_proposal.rb:175 +#: src/clients/inst_disk_proposal.rb:176 msgid "" "<p>\n" "To make only small adjustments to the proposed\n" @@ -133,7 +131,7 @@ "对话框中修改设置。</p>\n" #. help text continued -#: src/clients/inst_disk_proposal.rb:188 +#: src/clients/inst_disk_proposal.rb:189 msgid "" "<p>\n" "If the suggestion does not fit your needs, create\n" @@ -153,25 +151,25 @@ #. Attention! besides the testsuite, AutoYaST is using this to turn off #. the proposal screen too. See inst_autosetup.ycp -#: src/clients/inst_disk_proposal.rb:232 +#: src/clients/inst_disk_proposal.rb:233 msgid "Impossible to create the requested proposal." msgstr "不能创建请求的建议。" #. TRANSLATORS: popup error message -#: src/clients/inst_disk_proposal.rb:238 +#: src/clients/inst_disk_proposal.rb:239 msgid "Not enough space available to propose snapshots for root volume." msgstr "没有足够用于为根卷建议快照的空间。" #. TRANSLATORS: popup error message -#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449 +#: src/clients/inst_disk_proposal.rb:245 src/clients/inst_target_part.rb:449 msgid "Not enough space available to propose separate /home." msgstr "空间不足，无法请求单独的 /home。" -#: src/clients/inst_disk_proposal.rb:283 +#: src/clients/inst_disk_proposal.rb:284 msgid "Nothing assigned as root filesystem. Cannot continue." msgstr "未指派根文件系统。无法继续。" -#: src/clients/inst_disk_proposal.rb:304 +#: src/clients/inst_disk_proposal.rb:305 msgid "" "Computing this proposal will overwrite manual changes \n" "done so far. Continue with computing proposal?" @@ -636,12 +634,12 @@ #. loop over targetMap and build radio buttons for selection #. dont use foreach here since we need a counter (as a shortcut) #. anyway -#: src/clients/inst_target_selection.rb:115 +#: src/clients/inst_target_selection.rb:116 msgid "Available &Disks" msgstr "可用磁盘(&D)" #. label text -#: src/clients/inst_target_selection.rb:149 +#: src/clients/inst_target_selection.rb:150 msgid "&Custom Partitioning (for experts)" msgstr "自定义分区(仅限专家)(&C)" @@ -649,13 +647,13 @@ #. Below this label, all targets are listed that can be used as #. installation target #. heading text -#: src/clients/inst_target_selection.rb:161 +#: src/clients/inst_target_selection.rb:162 msgid "Hard Disk" msgstr "硬盘" #. normally the target is located on hard disks. Here no hard disks #. can be found. YaST2 cannot install. Update CD might have newer drivers. -#: src/clients/inst_target_selection.rb:172 +#: src/clients/inst_target_selection.rb:173 msgid "No disks found. Try using the update CD, if available, for installation." msgstr "未找到任何磁盘。尝试使用可用的更新 CD 来安装。" @@ -664,7 +662,7 @@ #. "Preparing Hard Disk" is the description of the dialog what to #. do while the following locale is the help description #. help part 1 of 3 -#: src/clients/inst_target_selection.rb:184 +#: src/clients/inst_target_selection.rb:185 msgid "" "<p>\n" "All hard disks automatically detected on your system\n" @@ -677,7 +675,7 @@ "</p>\n" #. help part 2 of 3 -#: src/clients/inst_target_selection.rb:193 +#: src/clients/inst_target_selection.rb:194 msgid "" "<p>\n" "You may select later which part of the disk is used for &product;.\n" @@ -688,7 +686,7 @@ "</p>\n" #. help part 3 of 3 -#: src/clients/inst_target_selection.rb:202 +#: src/clients/inst_target_selection.rb:203 msgid "" "\n" "<p>\n" @@ -707,7 +705,7 @@ #. first step of hd prepare, select a single disk or "expert" partitioning #. Information what to do, background information #. Information what to do, background information -#: src/clients/inst_target_selection.rb:215 +#: src/clients/inst_target_selection.rb:216 #: src/include/partitioning/auto_part_ui.rb:244 #: src/include/partitioning/auto_part_ui.rb:302 msgid "Preparing Hard Disk" @@ -715,14 +713,24 @@ #. there is a selection from which one option must be #. chosen - at the moment no option is chosen -#: src/clients/inst_target_selection.rb:271 +#: src/clients/inst_target_selection.rb:269 msgid "Select one of the options to continue." msgstr "请选择其中一个选项，然后继续。" -#: src/clients/inst_target_selection.rb:297 +#: src/clients/inst_target_selection.rb:295 msgid "Disk %1 is in use by %2" msgstr "磁盘 %1 正由 %2 使用" +#. Warning popup about using the expert partitioner +#: src/clients/inst_target_selection.rb:352 +msgid "" +"This is for experts only.\n" +"You might lose support if you use this!\n" +"\n" +"Please refer to the manual to make sure your custom\n" +"partitioning meets the requirements of this product." +msgstr "" + #. encoding: utf-8 #. Copyright (c) 2012 Novell, Inc. #. @@ -780,19 +788,35 @@ #. See also file proposal-API.txt for details. #: src/clients/partitions_proposal.rb:93 msgid "" +"No snapshots possible.\n" +"Please use larger root partition." +msgstr "" + +#: src/clients/partitions_proposal.rb:105 +msgid "" "The /home partition will not be formatted. After installation,\n" "ensure that ownerships of home directories are set properly." msgstr "" "/home 分区将不会格式化。安装后，\n" "请确保正确设置用户主目录的所有权。" +#. A custom configuration +#: src/clients/partitions_proposal.rb:123 +msgid "Custom" +msgstr "自定义" + +#. A standard configuration +#: src/clients/partitions_proposal.rb:126 +msgid "Standard" +msgstr "标准" + #. label text -#: src/clients/partitions_proposal.rb:218 +#: src/clients/partitions_proposal.rb:239 msgid "Partitioning" msgstr "分区" #. label text -#: src/clients/partitions_proposal.rb:220 +#: src/clients/partitions_proposal.rb:241 msgid "&Partitioning" msgstr "分区(&P)" @@ -959,7 +983,7 @@ #. Label text #. TRANSLATORS: checkbox text #: src/include/partitioning/auto_part_ui.rb:341 -#: src/modules/StorageProposal.rb:6272 +#: src/modules/StorageProposal.rb:6295 msgid "Propose Separate &Home Partition" msgstr "建议创建独立的主分区(&H)" @@ -977,7 +1001,7 @@ msgstr "建议类型" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:244 +#: src/include/partitioning/custom_part_check_generated.rb:248 msgid "" "You have not assigned a root partition for\n" "installation. This does not work. Assign the root mount point \"/\" to a\n" @@ -991,7 +1015,7 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:257 +#: src/include/partitioning/custom_part_check_generated.rb:261 msgid "" "You tried to mount a FAT partition to one of the following mount\n" "points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n" @@ -1006,7 +1030,7 @@ "确实要使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:270 +#: src/include/partitioning/custom_part_check_generated.rb:274 msgid "" "You tried to mount a FAT partition to the\n" "mount point /boot. This will very likely cause problems. Use a Linux file\n" @@ -1020,7 +1044,7 @@ "确实要使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:284 +#: src/include/partitioning/custom_part_check_generated.rb:288 msgid "" "You have mounted a partition with Btrfs to the\n" "mount point /boot. This will very likely cause problems. Use a Linux file\n" @@ -1035,7 +1059,7 @@ #. A PReP/CHRP partition is not supposed to be mounted. So if we find any #. other /boot partition, we should warn the user. -#: src/include/partitioning/custom_part_check_generated.rb:298 +#: src/include/partitioning/custom_part_check_generated.rb:302 msgid "" "Warning:\n" "Your system needs a boot partition, either with type 0x41 PReP/CHRP\n" @@ -1052,7 +1076,7 @@ "确定要使用此设置吗？\n" #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:314 +#: src/include/partitioning/custom_part_check_generated.rb:318 msgid "" "Warning:\n" "Your boot partition ends above cylinder %1.\n" @@ -1073,13 +1097,20 @@ "确定要使用此设置？\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:334 +#: src/include/partitioning/custom_part_check_generated.rb:338 +#, fuzzy +#| msgid "" +#| "Warning:\n" +#| "Your boot partition is smaller than %1.\n" +#| "We recommend to increase the size of /boot.\n" +#| "\n" +#| "Really keep this size of boot partition?\n" msgid "" "Warning:\n" "Your boot partition is smaller than %1.\n" "We recommend to increase the size of /boot.\n" "\n" -"Really keep this size of boot partition?\n" +"Really keep this size of the boot partition?\n" msgstr "" "警告：\n" "您的引导分区不足 %1。\n" @@ -1088,7 +1119,7 @@ "确定将引导分区的大小保留不变？\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:351 +#: src/include/partitioning/custom_part_check_generated.rb:355 msgid "" "Warning: There is no partition of type bios_grub present.\n" "Such a partition is recommended (required with Btrfs) when Grub2 is\n" @@ -1105,7 +1136,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:371 +#: src/include/partitioning/custom_part_check_generated.rb:375 msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" @@ -1124,7 +1155,7 @@ "确定要使用没有 /boot 分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:391 +#: src/include/partitioning/custom_part_check_generated.rb:395 msgid "" "Warning: According to your setup, you intend to\n" "boot your machine from the root partition (/), which, unfortunately,\n" @@ -1144,7 +1175,7 @@ "\n" "确定要使用此设置？\n" -#: src/include/partitioning/custom_part_check_generated.rb:417 +#: src/include/partitioning/custom_part_check_generated.rb:421 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1157,7 +1188,7 @@ "确实要使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:435 +#: src/include/partitioning/custom_part_check_generated.rb:441 msgid "" "Warning: With your current setup, your %1\n" "installation might not be directly bootable, because\n" @@ -1174,7 +1205,7 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:453 +#: src/include/partitioning/custom_part_check_generated.rb:459 msgid "" "Warning: With your current setup, your %2 installation\n" "will encounter problems when booting, because you have no\n" @@ -1199,7 +1230,7 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:475 +#: src/include/partitioning/custom_part_check_generated.rb:481 msgid "" "Warning: With your current setup, your %2 installation will\n" "encounter problems when booting, because you have no \n" @@ -1224,12 +1255,12 @@ "确定要使用此设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:498 +#: src/include/partitioning/custom_part_check_generated.rb:504 msgid "Really use this setup?" msgstr "确定要使用此设置？" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:506 +#: src/include/partitioning/custom_part_check_generated.rb:512 msgid "" "\n" "You have not assigned a swap partition. In most cases, we highly recommend \n" @@ -1250,7 +1281,7 @@ "确定要使用没有交换分区的设置？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:522 +#: src/include/partitioning/custom_part_check_generated.rb:528 msgid "" "\n" "You chose to install onto an existing partition that will not be\n" @@ -1263,7 +1294,7 @@ "特别是在以下情况下：\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:529 +#: src/include/partitioning/custom_part_check_generated.rb:535 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1276,7 +1307,7 @@ "- 如果这个分区尚不包含文件系统\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:536 +#: src/include/partitioning/custom_part_check_generated.rb:542 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" @@ -1286,7 +1317,7 @@ "一个像 /、/boot、/opt 或 /var 这样的标准安装点时。\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:542 +#: src/include/partitioning/custom_part_check_generated.rb:548 msgid "" "If you decide to format the partition, all data on it will be lost.\n" "\n" @@ -1297,7 +1328,7 @@ "确定要将分区保持未格式化？\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:603 +#: src/include/partitioning/custom_part_check_generated.rb:609 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1306,7 +1337,7 @@ "编辑该设备之前，请将其从该 RAID 中去除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:614 +#: src/include/partitioning/custom_part_check_generated.rb:620 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1315,7 +1346,7 @@ "编辑该设备之前，请将其从该卷组中去除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:624 +#: src/include/partitioning/custom_part_check_generated.rb:630 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1324,7 +1355,7 @@ "编辑之前请去除该卷。\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:657 +#: src/include/partitioning/custom_part_check_generated.rb:663 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1333,7 +1364,7 @@ "删除该设备之前，请将其从 RAID 中去除。\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:668 +#: src/include/partitioning/custom_part_check_generated.rb:674 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1341,12 +1372,12 @@ "设备 (%2) 已被 %1 使用。\n" "编辑之前请去除 %1。\n" -#: src/include/partitioning/custom_part_check_generated.rb:680 +#: src/include/partitioning/custom_part_check_generated.rb:686 msgid "It cannot be deleted while mounted." msgstr "无法在装入时删除它。" #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:716 +#: src/include/partitioning/custom_part_check_generated.rb:722 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" @@ -1355,7 +1386,7 @@ "并且另一个编号更高的逻辑分区正在使用它。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:792 +#: src/include/partitioning/custom_part_check_generated.rb:798 msgid "" "The selected extended partition contains partitions which are currently mounted:\n" "%1\n" @@ -1368,7 +1399,7 @@ "除非您完全了解正在执行的操作，否则请选择“取消”。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:810 +#: src/include/partitioning/custom_part_check_generated.rb:816 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1383,7 +1414,7 @@ "再删除该扩展分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:821 +#: src/include/partitioning/custom_part_check_generated.rb:827 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1398,7 +1429,7 @@ "再删除该扩展分区。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:832 +#: src/include/partitioning/custom_part_check_generated.rb:838 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1410,6 +1441,30 @@ "正在使用的分区。删除扩展分区之前\n" "请去除已使用的卷。\n" +#. popup text, %1 is a size +#: src/include/partitioning/custom_part_check_generated.rb:905 +#, fuzzy +#| msgid "" +#| "Warning:\n" +#| "Your boot partition is smaller than %1.\n" +#| "We recommend to increase the size of /boot.\n" +#| "\n" +#| "Really keep this size of boot partition?\n" +msgid "" +"Warning:\n" +"\n" +"Your root partition is very small for snapshots.\n" +"We recommend to increase the size of the root partition\n" +"to %1 or more or to disable snapshots.\n" +"\n" +"Really keep the current setup?\n" +msgstr "" +"警告：\n" +"您的引导分区不足 %1。\n" +"建议增加 /boot 大小。\n" +"\n" +"确定将引导分区的大小保留不变？\n" + #. heading text #: src/include/partitioning/custom_part_dialogs.rb:70 msgid "Enter your Password for the Encrypted File System." @@ -1417,13 +1472,13 @@ #. label text #: src/include/partitioning/custom_part_dialogs.rb:74 -#: src/include/partitioning/ep-dialogs.rb:806 -#: src/modules/StorageProposal.rb:6400 +#: src/include/partitioning/ep-dialogs.rb:805 +#: src/modules/StorageProposal.rb:6423 msgid "Do not forget what you enter here!" msgstr "请不要忘记在此输入的内容！" #: src/include/partitioning/custom_part_dialogs.rb:78 -#: src/include/partitioning/ep-dialogs.rb:809 +#: src/include/partitioning/ep-dialogs.rb:808 msgid "Empty password allowed." msgstr "允许口令为空。" @@ -1452,7 +1507,7 @@ #. Label: get password for user root #. Please use newline if label is longer than 40 characters #: src/include/partitioning/custom_part_dialogs.rb:136 -#: src/include/partitioning/ep-dialogs.rb:834 +#: src/include/partitioning/ep-dialogs.rb:833 msgid "&Enter a Password for your File System:" msgstr "输入您的文件系统的口令(&E)：" @@ -1463,7 +1518,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:147 -#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4007 +#: src/include/partitioning/ep-dialogs.rb:817 src/modules/Storage.rb:4002 msgid "Reenter the Password for &Verification:" msgstr "再输一遍口令以便确认(&V)：" @@ -1486,7 +1541,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:196 -#: src/modules/Storage.rb:3963 +#: src/modules/Storage.rb:3958 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1497,7 +1552,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:203 -#: src/modules/Storage.rb:3971 +#: src/modules/Storage.rb:3966 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -1617,47 +1672,54 @@ msgstr "文件系统(&S)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1053 +#: src/include/partitioning/custom_part_dialogs.rb:1059 msgid "O&ptions..." msgstr "选项(&P)..." +#. Translators: checkbox text +#. TRANSLATORS: checkbox text +#: src/include/partitioning/custom_part_dialogs.rb:1069 +#: src/modules/StorageProposal.rb:6276 +msgid "Enable Snapshots" +msgstr "启用快照" + #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1069 +#: src/include/partitioning/custom_part_dialogs.rb:1084 msgid "&Encrypt Device" msgstr "加密设备(&E)" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1144 +#: src/include/partitioning/custom_part_dialogs.rb:1159 msgid "File system &ID:" msgstr "文件系统 ID(&I)：" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1176 +#: src/include/partitioning/custom_part_dialogs.rb:1191 msgid "Format" msgstr "格式" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1186 +#: src/include/partitioning/custom_part_dialogs.rb:1201 msgid "Do ¬ format" msgstr "不格式化(&N)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1196 +#: src/include/partitioning/custom_part_dialogs.rb:1211 msgid "&Format" msgstr "格式化(&F)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1249 +#: src/include/partitioning/custom_part_dialogs.rb:1264 msgid "Fs&tab Options" msgstr "Fstab 选项(&T)" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1256 +#: src/include/partitioning/custom_part_dialogs.rb:1271 msgid "&Mount Point" msgstr "安装点(&M)" #. popup text %1 is a partition name, %2 a dirctory -#: src/include/partitioning/custom_part_dialogs.rb:1268 +#: src/include/partitioning/custom_part_dialogs.rb:1283 msgid "" "\n" "The selected partition (%1) is currently mounted on %2.\n" @@ -1682,7 +1744,7 @@ "是否继续？\n" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1297 +#: src/include/partitioning/custom_part_dialogs.rb:1312 msgid "" "\n" "The file system on the partition cannot be shrunk by YaST2.\n" @@ -1693,7 +1755,7 @@ "只有 fat、ext2、ext3、ext4 和 reiser 才允许收缩文件系统。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1304 +#: src/include/partitioning/custom_part_dialogs.rb:1319 msgid "" "\n" "The file system on the logical volume cannot be shrunk by YaST2.\n" @@ -1704,21 +1766,21 @@ "只有 fat、ext2、ext3、ext4 和 reiser 才允许收缩文件系统。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1316 +#: src/include/partitioning/custom_part_dialogs.rb:1331 msgid "You risk losing data if you shrink this partition." msgstr "如果收缩此分区，将会有丢失数据的风险。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1322 +#: src/include/partitioning/custom_part_dialogs.rb:1337 msgid "You risk losing data if you shrink this logical volume." msgstr "如果收缩此逻辑卷，将会有丢失数据的风险。" -#: src/include/partitioning/custom_part_dialogs.rb:1326 +#: src/include/partitioning/custom_part_dialogs.rb:1341 msgid "Continue?" msgstr "是否继续？" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1342 +#: src/include/partitioning/custom_part_dialogs.rb:1357 msgid "" "\n" "The file system on the selected partition cannot be extended by YaST2.\n" @@ -1729,7 +1791,7 @@ "只有 fat、ext2、ext3、ext4、xfs 和 reiser 才允许扩展文件系统。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1349 +#: src/include/partitioning/custom_part_dialogs.rb:1364 msgid "" "\n" "The file system on the selected logical volume cannot be extended by YaST2.\n" @@ -1739,20 +1801,20 @@ "YaST2 无法扩展所选逻辑卷上的文件系统。\n" "只有 fat、ext2、ext3、ext4、xfs 和 reiser 才允许扩展文件系统。" -#: src/include/partitioning/custom_part_dialogs.rb:1357 +#: src/include/partitioning/custom_part_dialogs.rb:1372 msgid "Continue resizing?" msgstr "是否继续改变大小？" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1374 +#: src/include/partitioning/custom_part_dialogs.rb:1389 msgid "You decreased a partition with a reiser file system on it." msgstr "您减小了装载有 reiser 文件系统的分区。" -#: src/include/partitioning/custom_part_dialogs.rb:1376 +#: src/include/partitioning/custom_part_dialogs.rb:1391 msgid "You decreased a logical volume with a reiser file system on it." msgstr "您减小了装载有 reiser 文件系统的逻辑卷。" -#: src/include/partitioning/custom_part_dialogs.rb:1383 +#: src/include/partitioning/custom_part_dialogs.rb:1398 msgid "" "\n" "It is possible to shrink a reiser file system, but this feature is not\n" @@ -1767,7 +1829,7 @@ "立即收缩文件系统吗？" #. popup text, %1 is replaced by device name -#: src/include/partitioning/custom_part_dialogs.rb:1437 +#: src/include/partitioning/custom_part_dialogs.rb:1452 msgid "" "The selected device contains partitions that are currently mounted:\n" "%1\n" @@ -1780,7 +1842,7 @@ "除非您完全了解正在执行的操作，否则请选择“取消”。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_dialogs.rb:1460 +#: src/include/partitioning/custom_part_dialogs.rb:1475 msgid "" "\n" "The selected device contains at least one LVM partition\n" @@ -1795,7 +1857,7 @@ "分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_dialogs.rb:1471 +#: src/include/partitioning/custom_part_dialogs.rb:1486 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1810,7 +1872,7 @@ "RAID 系统中取消指派该分区。\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1482 +#: src/include/partitioning/custom_part_dialogs.rb:1497 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1823,47 +1885,40 @@ "使用该分区的卷。\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:1543 +#: src/include/partitioning/custom_part_dialogs.rb:1558 msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n" msgstr "<p>在 Btrfs 文件系统中创建和去除子卷。</p>\n" -#: src/include/partitioning/custom_part_dialogs.rb:1548 +#: src/include/partitioning/custom_part_dialogs.rb:1563 msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>" msgstr "<p>使用 snapper 为 Btrfs 文件系统启用自动快照。</p>" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1562 +#: src/include/partitioning/custom_part_dialogs.rb:1577 msgid "Existing Subvolumes:" msgstr "现有子卷：" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1568 +#: src/include/partitioning/custom_part_dialogs.rb:1583 msgid "New Subvolume" msgstr "新子卷" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1574 +#: src/include/partitioning/custom_part_dialogs.rb:1589 msgid "Add new" msgstr "新增" #. button text #. push button text -#: src/include/partitioning/custom_part_dialogs.rb:1580 +#: src/include/partitioning/custom_part_dialogs.rb:1595 #: src/modules/DualMultiSelectionBox.rb:147 msgid "Remove" msgstr "去除" -#. TRANSLATOR: checkbox text -#. TRANSLATORS: checkbox text -#: src/include/partitioning/custom_part_dialogs.rb:1592 -#: src/modules/StorageProposal.rb:6253 -msgid "Enable Snapshots" -msgstr "启用快照" - #. heading text #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1603 -#: src/include/partitioning/custom_part_lib.rb:409 +#: src/include/partitioning/custom_part_dialogs.rb:1605 +#: src/include/partitioning/custom_part_lib.rb:386 msgid "Subvolume Handling" msgstr "子卷处理" @@ -1883,7 +1938,7 @@ msgid "Subvolume name %1 already exists." msgstr "子卷名称 %1 已存在。" -#: src/include/partitioning/custom_part_dialogs.rb:1711 +#: src/include/partitioning/custom_part_dialogs.rb:1702 msgid "Modifications done so far in this dialog will be lost." msgstr "本对话框中当前所做的修改将会丢失。" @@ -1926,7 +1981,7 @@ #. helptext #: src/include/partitioning/custom_part_helptexts.rb:87 -#: src/include/partitioning/ep-dialogs.rb:746 +#: src/include/partitioning/ep-dialogs.rb:745 msgid "" "<p>\n" "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n" @@ -1945,7 +2000,7 @@ #. help text, continued #. helptext #: src/include/partitioning/custom_part_helptexts.rb:100 -#: src/include/partitioning/ep-dialogs.rb:761 +#: src/include/partitioning/ep-dialogs.rb:760 msgid "" "<p>\n" "If you forget your password, you will lose access to the data on your file system.\n" @@ -1964,7 +2019,7 @@ #. help text, continued #. helptext, %1 is replaced by integer #: src/include/partitioning/custom_part_helptexts.rb:114 -#: src/include/partitioning/ep-dialogs.rb:775 +#: src/include/partitioning/ep-dialogs.rb:774 msgid "" "<p>\n" "You must distinguish between uppercase and lowercase. A password should have at\n" @@ -1996,7 +2051,7 @@ #. help text, continued #. helptext #: src/include/partitioning/custom_part_helptexts.rb:142 -#: src/include/partitioning/ep-dialogs.rb:787 +#: src/include/partitioning/ep-dialogs.rb:786 msgid "" "<p>\n" "Do not forget this password!\n" @@ -2067,17 +2122,17 @@ "您需要选中此磁盘上所有要去除的分区。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:51 +#: src/include/partitioning/custom_part_lib.rb:50 msgid "You cannot use the mount point \"%1\" for LVM.\n" msgstr "您不能对 LVM 使用安装点\"%1\"。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:78 +#: src/include/partitioning/custom_part_lib.rb:77 msgid "You cannot use the mount point %1 for RAID." msgstr "您不能对 RAID 使用安装点 %1。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:97 +#: src/include/partitioning/custom_part_lib.rb:96 msgid "" "You have selected to not automatically mount at start-up a file system\n" "that may contain files that the system needs to work properly.\n" @@ -2094,21 +2149,8 @@ "确定要执行该操作？\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:120 +#: src/include/partitioning/custom_part_lib.rb:138 msgid "" -"You have assigned an encrypted file system to a partition\n" -"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n" -"/var\". This is not possible. Change the mount point or use a\n" -"nonloopbacked file system.\n" -msgstr "" -"已将加密文件系统指派给分区，\n" -"该分区具有以下安装点之一：\"/\"、“/usr”、“/boot”\n" -"或“/var”。这是不可能的。请更改安装点或使用\n" -"非回送文件系统。\n" - -#. error popup text -#: src/include/partitioning/custom_part_lib.rb:158 -msgid "" "You have set a file system as mountable by users. The file system\n" "may contain files that need to be executable.\n" "\n" @@ -2127,28 +2169,28 @@ #. @param [Hash{String => map}] targetMap the TargetMap #. @param mount mount point #. @return [Boolean] -#: src/include/partitioning/custom_part_lib.rb:205 +#: src/include/partitioning/custom_part_lib.rb:185 msgid "Mount point must not be empty." msgstr "安装点不得为空。" #. error popup -#: src/include/partitioning/custom_part_lib.rb:210 +#: src/include/partitioning/custom_part_lib.rb:190 msgid "Swap devices must have swap as mount point." msgstr "交换设备安装点必须为 swap。" #. error popup -#: src/include/partitioning/custom_part_lib.rb:214 +#: src/include/partitioning/custom_part_lib.rb:194 msgid "Only swap devices may have swap as mount point." msgstr "仅交换设备可以使用 swap 作为安装点。" #. && mount!="swap" ) #. error popup text -#: src/include/partitioning/custom_part_lib.rb:229 +#: src/include/partitioning/custom_part_lib.rb:209 msgid "This mount point is already in use. Select a different one." msgstr "此安装点已在使用。请另选一个。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:239 +#: src/include/partitioning/custom_part_lib.rb:219 msgid "" "FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n" "This is not possible." @@ -2157,12 +2199,12 @@ "这是不可能的。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:248 +#: src/include/partitioning/custom_part_lib.rb:228 msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point." msgstr "安装点中的字符无效。不要在安装点中使用“`'!\"%#”。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:257 +#: src/include/partitioning/custom_part_lib.rb:237 msgid "" "You cannot use any of the following mount points:\n" "/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n" @@ -2173,12 +2215,12 @@ "/var/adm/mnt\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:266 +#: src/include/partitioning/custom_part_lib.rb:246 msgid "Your mount point must start with a \"/\" " msgstr "您的安装点必须以\"/\"开头" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:272 +#: src/include/partitioning/custom_part_lib.rb:252 msgid "" "It is not allowed to assign the mount point swap\n" "to a device without a swap file system." @@ -2187,17 +2229,23 @@ "的设备指派安装点交换。" #. warning message, %1 is replaced by fs name (e.g. Ext3) -#. %2 is prelaced by a size (e.g. 10 MB) -#: src/include/partitioning/custom_part_lib.rb:299 +#. %2 is replaced by the user entered size (e.g. 20GB) +#. %3 is replaced by a size (e.g. 10 MB) +#: src/include/partitioning/custom_part_lib.rb:280 +#, fuzzy +#| msgid "" +#| "Your partition is too small to use %1.\n" +#| "The minimum size for this file system is %2.\n" msgid "" "Your partition is too small to use %1.\n" -"The minimum size for this file system is %2.\n" +"The size you entered (after rounding up) is %2.\n" +"The minimum size for this file system is %3.\n" msgstr "" "您的分区过小，无法使用 %1。\n" "此文件系统的最小大小为 %2。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:369 +#: src/include/partitioning/custom_part_lib.rb:346 msgid "" "It is not allowed to assign a mount point\n" "to a device with nonexistent or unknown file system." @@ -2206,7 +2254,7 @@ "设备指派安装点。" #. warning message, %1 is replaced by fs name (e.g. Ext3) -#: src/include/partitioning/custom_part_lib.rb:482 +#: src/include/partitioning/custom_part_lib.rb:545 msgid "" "\n" "WARNING:\n" @@ -2230,12 +2278,12 @@ #. ////////////////////////////////////////////// #. modify map new -#: src/include/partitioning/custom_part_lib.rb:924 -#: src/include/partitioning/custom_part_lib.rb:951 +#: src/include/partitioning/custom_part_lib.rb:980 +#: src/include/partitioning/custom_part_lib.rb:1007 msgid "The file system is currently mounted on %1." msgstr "文件系统当前装入到 %1 上。" -#: src/include/partitioning/custom_part_lib.rb:929 +#: src/include/partitioning/custom_part_lib.rb:985 msgid "" "You can try to unmount it now, continue without unmounting or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2245,12 +2293,12 @@ #. button text #. button text -#: src/include/partitioning/custom_part_lib.rb:940 -#: src/include/partitioning/custom_part_lib.rb:965 +#: src/include/partitioning/custom_part_lib.rb:996 +#: src/include/partitioning/custom_part_lib.rb:1021 msgid "Unmount" msgstr "卸载" -#: src/include/partitioning/custom_part_lib.rb:956 +#: src/include/partitioning/custom_part_lib.rb:1012 msgid "" "You can try to unmount it now or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2258,15 +2306,15 @@ "您可以尝试立即卸载或取消。\n" "除非您完全了解正在执行的操作，否则请单击“取消”。" -#: src/include/partitioning/custom_part_lib.rb:1002 +#: src/include/partitioning/custom_part_lib.rb:1058 msgid "It is not possible to shrink the file system while it is mounted." msgstr "文件系统已装入时无法收缩。" -#: src/include/partitioning/custom_part_lib.rb:1015 +#: src/include/partitioning/custom_part_lib.rb:1071 msgid "It is not possible to extend the file system while it is mounted." msgstr "文件系统已装入时无法扩展。" -#: src/include/partitioning/custom_part_lib.rb:1026 +#: src/include/partitioning/custom_part_lib.rb:1082 msgid "It is not possible to resize the file system while it is mounted." msgstr "文件系统已装入时无法调整大小。" @@ -2746,47 +2794,47 @@ msgstr "<p>然后，选择是否要装入分区并输入安装点（/、/boot、/home、/var 等）。</p>" #. set globals -#: src/include/partitioning/ep-dialogs.rb:337 +#: src/include/partitioning/ep-dialogs.rb:336 msgid "Formatting Options" msgstr "格式化选项" -#: src/include/partitioning/ep-dialogs.rb:345 +#: src/include/partitioning/ep-dialogs.rb:344 msgid "Format partition" msgstr "格式化分区" -#: src/include/partitioning/ep-dialogs.rb:356 +#: src/include/partitioning/ep-dialogs.rb:355 msgid "Do not format partition" msgstr "不格式化分区" -#: src/include/partitioning/ep-dialogs.rb:372 +#: src/include/partitioning/ep-dialogs.rb:371 msgid "Do not mount partition" msgstr "不装入分区" -#: src/include/partitioning/ep-dialogs.rb:391 +#: src/include/partitioning/ep-dialogs.rb:390 msgid "Mounting Options" msgstr "装入选项" -#: src/include/partitioning/ep-dialogs.rb:399 +#: src/include/partitioning/ep-dialogs.rb:398 msgid "Mount partition" msgstr "装入分区" #. Column header -#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144 +#: src/include/partitioning/ep-dialogs.rb:404 src/modules/StorageFields.rb:144 msgid "Mount Point" msgstr "安装点" #. button text -#: src/include/partitioning/ep-dialogs.rb:412 +#: src/include/partitioning/ep-dialogs.rb:411 msgid "Fs&tab Options..." msgstr "Fstab 选项(&T)..." #. error popup -#: src/include/partitioning/ep-dialogs.rb:596 +#: src/include/partitioning/ep-dialogs.rb:595 msgid "Crypt files must be encrypted." msgstr "crypt 文件必须进行加密。" #. error popup -#: src/include/partitioning/ep-dialogs.rb:607 +#: src/include/partitioning/ep-dialogs.rb:606 msgid "" "You chose to create the crypt file, but did not specify\n" "that it should be formatted. This does not make sense.\n" @@ -2799,17 +2847,17 @@ "还要检查格式选项。\n" #. error popup -#: src/include/partitioning/ep-dialogs.rb:623 +#: src/include/partitioning/ep-dialogs.rb:622 msgid "Crypt files require a mount point." msgstr "crypt 文件需要安装点。" #. error popup -#: src/include/partitioning/ep-dialogs.rb:637 +#: src/include/partitioning/ep-dialogs.rb:636 msgid "Tmpfs requires a mount point." msgstr "Tmpfs 需要安装点。" #. helptext -#: src/include/partitioning/ep-dialogs.rb:721 +#: src/include/partitioning/ep-dialogs.rb:720 msgid "" "<p>\n" "Keep in mind that this file system is only protected when it is not\n" @@ -2824,7 +2872,7 @@ " </p>" #. helptext -#: src/include/partitioning/ep-dialogs.rb:734 +#: src/include/partitioning/ep-dialogs.rb:733 msgid "" "<p>\n" "The file system used for this volume is swap. You can leave the encryption \n" @@ -2838,21 +2886,21 @@ "就不能用于休眠（挂起到磁盘）。\n" "</p>\n" -#: src/include/partitioning/ep-dialogs.rb:804 +#: src/include/partitioning/ep-dialogs.rb:803 msgid "All data stored on the volume will be lost!" msgstr "所有存储在此卷上的数据都将丢失！" -#: src/include/partitioning/ep-dialogs.rb:827 +#: src/include/partitioning/ep-dialogs.rb:826 msgid "Password" msgstr "口令" #. popup text -#: src/include/partitioning/ep-dialogs.rb:924 +#: src/include/partitioning/ep-dialogs.rb:923 msgid "Resize not supported by underlying device." msgstr "底层设备不支持大小调整。" #. popup text -#: src/include/partitioning/ep-dialogs.rb:929 +#: src/include/partitioning/ep-dialogs.rb:928 msgid "" "\n" "You cannot resize the selected partition because the file system\n" @@ -2862,7 +2910,7 @@ "您不能改变所选分区的大小，\n" "因为此分区上的文件系统不支持改变大小。\n" -#: src/include/partitioning/ep-dialogs.rb:953 +#: src/include/partitioning/ep-dialogs.rb:952 msgid "" "It is not possible to check whether a NTFS\n" "can be resized while it is mounted." @@ -2871,7 +2919,7 @@ "检查其是否可调整大小。" #. FIXME: Really? -#: src/include/partitioning/ep-dialogs.rb:972 +#: src/include/partitioning/ep-dialogs.rb:971 msgid "" "Partition %1 cannot be resized\n" "because the filesystem seems to be inconsistent.\n" @@ -2880,21 +2928,21 @@ "因为文件系统似乎不一致。\n" #. Heading for dialog -#: src/include/partitioning/ep-dialogs.rb:999 +#: src/include/partitioning/ep-dialogs.rb:998 msgid "Resize Partition %1" msgstr "调整分区 %1 大小" #. Heading for dialog -#: src/include/partitioning/ep-dialogs.rb:1020 +#: src/include/partitioning/ep-dialogs.rb:1019 msgid "Resize Logical Volume %1" msgstr "调整逻辑卷 %1 大小" #. size_k + min_size_k could be > max_size_k -#: src/include/partitioning/ep-dialogs.rb:1052 +#: src/include/partitioning/ep-dialogs.rb:1051 msgid "Current size: %1" msgstr "当前大小：%1" -#: src/include/partitioning/ep-dialogs.rb:1064 +#: src/include/partitioning/ep-dialogs.rb:1063 msgid "Currently used: %1" msgstr "当前已用：%1" @@ -2902,8 +2950,8 @@ #. input field label #. combo box label #. Column header -#: src/include/partitioning/ep-dialogs.rb:1077 -#: src/include/partitioning/ep-dialogs.rb:1114 +#: src/include/partitioning/ep-dialogs.rb:1076 +#: src/include/partitioning/ep-dialogs.rb:1113 #: src/include/partitioning/ep-hd-dialogs.rb:256 #: src/include/partitioning/ep-loop-dialogs.rb:118 #: src/include/partitioning/ep-lvm-dialogs.rb:559 @@ -2915,33 +2963,33 @@ #. radio button text, %1 is replaced by size #. radio button text, %1 is replaced by size -#: src/include/partitioning/ep-dialogs.rb:1087 +#: src/include/partitioning/ep-dialogs.rb:1086 #: src/include/partitioning/ep-hd-dialogs.rb:242 #: src/include/partitioning/ep-lvm-dialogs.rb:535 msgid "Maximum Size (%1)" msgstr "最大大小 (%1)" #. radio button text, %1 is replaced by size -#: src/include/partitioning/ep-dialogs.rb:1097 +#: src/include/partitioning/ep-dialogs.rb:1096 msgid "Minimum Size (%1)" msgstr "最小大小 (%1)" #. radio button text #. radio button text -#: src/include/partitioning/ep-dialogs.rb:1106 +#: src/include/partitioning/ep-dialogs.rb:1105 #: src/include/partitioning/ep-hd-dialogs.rb:251 #: src/include/partitioning/ep-lvm-dialogs.rb:568 msgid "Custom Size" msgstr "自定义大小" #. help text -#: src/include/partitioning/ep-dialogs.rb:1140 +#: src/include/partitioning/ep-dialogs.rb:1139 msgid "<p>Choose new size.</p>" msgstr "<p>选择新的大小。</p>" #. error popup, %1 and %2 are replaced by sizes #. error popup, %1 and %2 are replaced by sizes -#: src/include/partitioning/ep-dialogs.rb:1191 +#: src/include/partitioning/ep-dialogs.rb:1190 #: src/include/partitioning/ep-hd-dialogs.rb:359 #: src/include/partitioning/ep-lvm-dialogs.rb:692 msgid "The size entered is invalid. Enter a size between %1 and %2." @@ -2951,7 +2999,7 @@ #. after user tries to do that is stupid - in some cases #. we can tell beforehand, thus user should never get to this #. point (e.g. when the partition is mounted) -#: src/include/partitioning/ep-dialogs.rb:1234 +#: src/include/partitioning/ep-dialogs.rb:1233 msgid "" "You are extending a mounted filesystem by %1 Gigabyte. \n" "This may be quite slow and can take hours. You might possibly want \n" @@ -2963,12 +3011,12 @@ "这会显著提升调整速度。" #. label for log view -#: src/include/partitioning/ep-dialogs.rb:1310 +#: src/include/partitioning/ep-dialogs.rb:1309 msgid "Output of %1" msgstr "%1 的输出" #. popup text -#: src/include/partitioning/ep-dialogs.rb:1337 +#: src/include/partitioning/ep-dialogs.rb:1336 msgid "Rescanning disks..." msgstr "正在重扫描磁盘..." @@ -3229,7 +3277,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5226 +#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5221 msgid "The disk is in use and cannot be modified." msgstr "该磁盘正在使用中，无法进行修改。" @@ -5259,12 +5307,12 @@ msgstr "模式文件" #. label text -#: src/modules/FileSystems.rb:278 +#: src/modules/FileSystems.rb:289 msgid "Tmpfs &Size" msgstr "Tmpfs 大小(&S)" #. popup text -#: src/modules/FileSystems.rb:287 +#: src/modules/FileSystems.rb:298 msgid "" "Invalid Size specified. Use number followed by K, M, G or %.\n" "Value must be above 100k or between 1% and 200%. Try again." @@ -5272,12 +5320,12 @@ "指定了无效的大小。请使用数字，并以 K、M、G 或 % 结尾。\n" "值必须大于 100k 或介于 1% 和 200% 之间。请重试。" -#: src/modules/FileSystems.rb:290 +#: src/modules/FileSystems.rb:301 msgid "Value must be between 1% and 200%. Try again." msgstr "值必须介于 1% 和 200% 之间。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:297 +#: src/modules/FileSystems.rb:308 msgid "" "<p><b>Tmpfs Size:</b>\n" "Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n" @@ -5288,17 +5336,17 @@ "，也可以为数字后跟百分比符号（表示内存百分比）。</p>" #. label text -#: src/modules/FileSystems.rb:311 +#: src/modules/FileSystems.rb:322 msgid "Swap &Priority" msgstr "交换优先级(&P)" #. popup text -#: src/modules/FileSystems.rb:319 +#: src/modules/FileSystems.rb:330 msgid "Value must be between 0 and 32767. Try again." msgstr "值须在 0 和 32767 之间。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:326 +#: src/modules/FileSystems.rb:337 msgid "" "<p><b>Swap Priority:</b>\n" "Enter the swap priority. Higher numbers mean higher priority.</p>\n" @@ -5307,12 +5355,12 @@ "输入交换优先级。较高的值代表较高优先级。</p>\n" #. button text -#: src/modules/FileSystems.rb:481 +#: src/modules/FileSystems.rb:494 msgid "Mount &Read-Only" msgstr "只读装入(&R)" #. help text, richtext format -#: src/modules/FileSystems.rb:485 +#: src/modules/FileSystems.rb:498 msgid "" "<p><b>Mount Read-Only:</b>\n" "Writing to the file system is not possible. Default is false. During installation\n" @@ -5323,12 +5371,12 @@ "安装期间文件系统总是以读写模式装入的。</p>" #. button text -#: src/modules/FileSystems.rb:497 +#: src/modules/FileSystems.rb:510 msgid "No &Access Time" msgstr "不更新访问时间(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:501 +#: src/modules/FileSystems.rb:514 msgid "" "<p><b>No Access Time:</b>\n" "Access times are not updated when a file is read. Default is false.</p>\n" @@ -5337,12 +5385,12 @@ "读取文件时不更新访问时间。默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:511 +#: src/modules/FileSystems.rb:524 msgid "Mountable by User" msgstr "可由用户装入" #. help text, richtext format -#: src/modules/FileSystems.rb:515 +#: src/modules/FileSystems.rb:528 msgid "" "<p><b>Mountable by User:</b>\n" "The file system may be mounted by an ordinary user. Default is false.</p>\n" @@ -5351,12 +5399,12 @@ "普通用户可装入文件系统。默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:528 +#: src/modules/FileSystems.rb:541 msgid "Do Not Mount at System &Start-up" msgstr "不在系统启动时装入(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:534 +#: src/modules/FileSystems.rb:547 msgid "" "<p><b>Do Not Mount at System Start-up:</b>\n" "The file system is not automatically mounted when the system starts.\n" @@ -5371,12 +5419,12 @@ "装入文件系统（<安装点> 是文件系统的装入目录）。默认为否。</p>\n" #. button text -#: src/modules/FileSystems.rb:551 +#: src/modules/FileSystems.rb:564 msgid "Enable &Quota Support" msgstr "启用定额支持(&Q)" #. help text, richtext format -#: src/modules/FileSystems.rb:557 +#: src/modules/FileSystems.rb:570 msgid "" "<p><b>Enable Quota Support:</b>\n" "The file system is mounted with user quotas enabled.\n" @@ -5387,12 +5435,12 @@ "默认值为 false。</p>\n" #. label text -#: src/modules/FileSystems.rb:576 +#: src/modules/FileSystems.rb:589 msgid "Data &Journaling Mode" msgstr "数据日记模式(&J)" #. help text, richtext format -#: src/modules/FileSystems.rb:585 +#: src/modules/FileSystems.rb:598 msgid "" "<p><b>Data Journaling Mode:</b>\n" "Specifies the journaling mode for file data.\n" @@ -5411,12 +5459,12 @@ "<tt>回写</tt> -- 不保留数据顺序。不影响性能。</p>\n" #. button text -#: src/modules/FileSystems.rb:606 +#: src/modules/FileSystems.rb:619 msgid "&Access Control Lists (ACL)" msgstr "访问控制列表 (ACL)(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:610 +#: src/modules/FileSystems.rb:623 msgid "" "<p><b>Access Control Lists (ACL):</b>\n" "Enable access control lists on the file system.</p>\n" @@ -5425,12 +5473,12 @@ "对文件系统启用访问控制列表。</p>\n" #. button text -#: src/modules/FileSystems.rb:621 +#: src/modules/FileSystems.rb:634 msgid "&Extended User Attributes" msgstr "扩展用户特性(&E)" #. help text, richtext format -#: src/modules/FileSystems.rb:625 +#: src/modules/FileSystems.rb:638 msgid "" "<p><b>Extended User Attributes:</b>\n" "Allow extended user attributes on the file system.</p>\n" @@ -5439,16 +5487,16 @@ "允许在文件系统中使用扩展用户特性。</p>\n" #. label text -#: src/modules/FileSystems.rb:642 +#: src/modules/FileSystems.rb:655 msgid "Arbitrary Option &Value" msgstr "自由选项值(&V)" -#: src/modules/FileSystems.rb:647 +#: src/modules/FileSystems.rb:660 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again." msgstr "自由选项值中有无效字符。请勿使用空格或 Tab。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:651 +#: src/modules/FileSystems.rb:664 msgid "" "<p><b>Arbitrary Option Value:</b>\n" "In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n" @@ -5459,12 +5507,12 @@ "多个选项用逗号隔开。</p>\n" #. label text -#: src/modules/FileSystems.rb:668 +#: src/modules/FileSystems.rb:681 msgid "Char&set for file names" msgstr "文件名所用字符集(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:689 +#: src/modules/FileSystems.rb:702 msgid "" "<p><b>Charset for File Names:</b>\n" "Set the charset used for display of file names in Windows partitions.</p>\n" @@ -5473,12 +5521,12 @@ "设置在 Windows 分区中显示文件名所用的字符集。</p>\n" #. label text -#: src/modules/FileSystems.rb:700 +#: src/modules/FileSystems.rb:713 msgid "Code&page for short FAT names" msgstr "FAT 短名称的代码页(&P)" #. help text, richtext format -#: src/modules/FileSystems.rb:706 +#: src/modules/FileSystems.rb:719 msgid "" "<p><b>Codepage for Short FAT Names:</b>\n" "This codepage is used for converting to shortname characters on FAT file systems.</p>\n" @@ -5487,12 +5535,12 @@ "使用此代码页可以转换为 FAT 文件系统上的短名称字符。</p>\n" #. label text -#: src/modules/FileSystems.rb:720 +#: src/modules/FileSystems.rb:733 msgid "Number of &FATs" msgstr "FAT 数目(&F)" #. help text, richtext format -#: src/modules/FileSystems.rb:726 +#: src/modules/FileSystems.rb:739 msgid "" "<p><b>Number of FATs:</b>\n" "Specify the number of file allocation tables in the file system. The default is 2.</p>" @@ -5501,12 +5549,12 @@ "指定文件系统中的文件分配表的数目。默认值是 2。</p>" #. label text -#: src/modules/FileSystems.rb:735 +#: src/modules/FileSystems.rb:748 msgid "FAT &Size" msgstr "FAT 大小(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:746 +#: src/modules/FileSystems.rb:759 msgid "" "<p><b>FAT Size:</b>\n" "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n" @@ -5515,17 +5563,17 @@ "指定所用文件分配表使用的类型（12 位、16 位或 32 位）。如果指定自动选项，YaST 将为文件系统大小自动选择最适合的值。</p>\n" #. label text -#: src/modules/FileSystems.rb:755 +#: src/modules/FileSystems.rb:768 msgid "Root &Dir Entries" msgstr "根目录项(&D)" #. popup text -#: src/modules/FileSystems.rb:763 +#: src/modules/FileSystems.rb:776 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again." msgstr "“根目录项”的最小大小为 112。请重试。" #. help text, richtext format -#: src/modules/FileSystems.rb:767 +#: src/modules/FileSystems.rb:780 msgid "" "<p><b>Root Dir Entries:</b>\n" "Select the number of entries available in the root directory.</p>\n" @@ -5534,12 +5582,12 @@ "选择根目录中可用的项数。</p>\n" #. label text -#: src/modules/FileSystems.rb:780 +#: src/modules/FileSystems.rb:793 msgid "Hash &Function" msgstr "哈希函数(&F)" #. help text, richtext format -#: src/modules/FileSystems.rb:787 +#: src/modules/FileSystems.rb:800 msgid "" "<p><b>Hash Function:</b>\n" "This specifies the name of the hash function to use to sort the file names in directories.</p>\n" @@ -5548,12 +5596,12 @@ "此选项指定对目录中的文件名进行排序所用的哈希函数的名称。</p>\n" #. label text -#: src/modules/FileSystems.rb:796 +#: src/modules/FileSystems.rb:809 msgid "FS &Revision" msgstr "FS 版本(&R)" #. help text, richtext format -#: src/modules/FileSystems.rb:803 +#: src/modules/FileSystems.rb:816 msgid "" "<p><b>FS Revision:</b>\n" "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n" @@ -5563,12 +5611,12 @@ #. label text #. label text -#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980 +#: src/modules/FileSystems.rb:829 src/modules/FileSystems.rb:993 msgid "Block &Size in Bytes" msgstr "块大小 (B)(&S)" #. help text, richtext format -#: src/modules/FileSystems.rb:823 +#: src/modules/FileSystems.rb:836 msgid "" "<p><b>Block Size:</b>\n" "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n" @@ -5578,13 +5626,13 @@ #. label text #. label text -#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062 +#: src/modules/FileSystems.rb:845 src/modules/FileSystems.rb:1075 msgid "&Inode Size" msgstr "Inode 大小(&I)" #. help text, richtext format #. help text, richtext format -#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068 +#: src/modules/FileSystems.rb:851 src/modules/FileSystems.rb:1081 msgid "" "<p><b>Inode Size:</b>\n" "This option specifies the inode size of the file system.</p>\n" @@ -5593,12 +5641,12 @@ "此选项指定文件系统的 inode 大小。</p>\n" #. label text -#: src/modules/FileSystems.rb:847 +#: src/modules/FileSystems.rb:860 msgid "&Percentage of Inode Space" msgstr "Inode 空间百分比(&P)" #. help text, richtext format -#: src/modules/FileSystems.rb:875 +#: src/modules/FileSystems.rb:888 msgid "" "<p><b>Percentage of Inode Space:</b>\n" "The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n" @@ -5607,12 +5655,12 @@ "“Inode 空间百分比”选项指定文件系统中可分配给 inode 的最大空间百分比。</p>\n" #. label text -#: src/modules/FileSystems.rb:884 +#: src/modules/FileSystems.rb:897 msgid "Inode &Aligned" msgstr "Inode 对齐(&A)" #. help text, richtext format -#: src/modules/FileSystems.rb:890 +#: src/modules/FileSystems.rb:903 msgid "" "<p><b>Inode Aligned:</b>\n" "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n" @@ -5625,12 +5673,12 @@ "通常比未对齐的效率高。</p>\n" #. label text -#: src/modules/FileSystems.rb:920 +#: src/modules/FileSystems.rb:933 msgid "&Log Size in Megabytes" msgstr "日志大小 (MB)(&L)" #. popup text -#: src/modules/FileSystems.rb:929 +#: src/modules/FileSystems.rb:942 msgid "" "The \"Log Size\" value is incorrect.\n" "Enter a value greater than zero.\n" @@ -5640,7 +5688,7 @@ #. xgettext: no-c-format #. help text, richtext format -#: src/modules/FileSystems.rb:934 +#: src/modules/FileSystems.rb:947 msgid "" "<p><b>Log Size</b>\n" "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n" @@ -5649,17 +5697,17 @@ "设置日志大小（以 MB 为单位）。如果选择自动选项，默认值为总大小的 40%。</p>\n" #. label text -#: src/modules/FileSystems.rb:942 +#: src/modules/FileSystems.rb:955 msgid "Invoke Bad Blocks List &Utility" msgstr "调用坏块列表实用程序(&U)" #. label text -#: src/modules/FileSystems.rb:956 +#: src/modules/FileSystems.rb:969 msgid "Stride &Length in Blocks" msgstr "块中的步幅(&L)" #. popup text -#: src/modules/FileSystems.rb:964 +#: src/modules/FileSystems.rb:977 msgid "" "The \"Stride Length in Blocks\" value is invalid.\n" "Select a value greater than 1.\n" @@ -5668,7 +5716,7 @@ "请选择大于 1 的值。\n" #. help text, richtext format -#: src/modules/FileSystems.rb:968 +#: src/modules/FileSystems.rb:981 msgid "" "<p><b>Stride Length in Blocks:</b>\n" "Set RAID-related options for the file system. Currently, the only supported\n" @@ -5681,7 +5729,7 @@ "作为自己的自变量。</p>\n" #. help text, richtext format -#: src/modules/FileSystems.rb:987 +#: src/modules/FileSystems.rb:1000 msgid "" "<p><b>Block Size:</b>\n" "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n" @@ -5690,12 +5738,12 @@ "以字节为单位指定块大小。有效的块大小值为每个块 1024、2048 和 4096 字节。如果选中自动选项，块大小将由文件系统的大小和预期使用量来决定。</p>\n" #. label text -#: src/modules/FileSystems.rb:996 +#: src/modules/FileSystems.rb:1009 msgid "Bytes per &Inode" msgstr "每 inode 的字节数(&I)" #. help text, richtext format -#: src/modules/FileSystems.rb:1002 +#: src/modules/FileSystems.rb:1015 msgid "" "<p><b>Bytes per Inode:</b> \n" "Specify the bytes to inode ratio. YaST creates an inode for every\n" @@ -5716,12 +5764,12 @@ "</p>\n" #. label text -#: src/modules/FileSystems.rb:1018 +#: src/modules/FileSystems.rb:1031 msgid "Percentage of Blocks &Reserved for root" msgstr "为 root 保留的块的百分比(&R)" #. popup text -#: src/modules/FileSystems.rb:1028 +#: src/modules/FileSystems.rb:1041 msgid "" "The \"Percentage of Blocks Reserved for root\" value is incorrect.\n" "Allowed are float numbers no larger than 99 (e.g. 0.5).\n" @@ -5731,17 +5779,17 @@ #. xgettext: no-c-format #. help text, richtext format -#: src/modules/FileSystems.rb:1033 +#: src/modules/FileSystems.rb:1046 msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>" msgstr "<p><b>为 root 保留的块的百分比：</b>指定为超级用户保留的块的百分比。该值默认会自动计算，通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>" #. checkbox text -#: src/modules/FileSystems.rb:1042 +#: src/modules/FileSystems.rb:1055 msgid "Disable Regular Checks" msgstr "禁用常规检查" #. help text, richtext format -#: src/modules/FileSystems.rb:1050 +#: src/modules/FileSystems.rb:1063 msgid "" "<p><b>Disable Regular Checks:</b>\n" "Disable regular file system check at booting.</p>\n" @@ -5750,12 +5798,12 @@ "开机时禁用常规文件系统检查。</p>\n" #. label text -#: src/modules/FileSystems.rb:1077 +#: src/modules/FileSystems.rb:1090 msgid "&Directory Index Feature" msgstr "目录索引功能(&D)" #. help text, richtext format -#: src/modules/FileSystems.rb:1084 +#: src/modules/FileSystems.rb:1097 msgid "" "<p><b>Directory Index:</b>\n" "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n" @@ -5764,12 +5812,12 @@ "允许使用哈希 b-trees 加速在大目录中的查找。</p>\n" #. label text -#: src/modules/FileSystems.rb:1096 +#: src/modules/FileSystems.rb:1109 msgid "&No Journal" msgstr "无日记(&N)" #. help text, richtext format -#: src/modules/FileSystems.rb:1103 +#: src/modules/FileSystems.rb:1116 msgid "" "<p><b>No Journal:</b>\n" "Suppressed use of journaling on filesystem. Only activate this when you really\n" @@ -5881,7 +5929,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:994 +#: src/modules/Storage.rb:989 msgid "Resize Not Possible:" msgstr "无法改变大小：" @@ -5894,7 +5942,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:2697 src/modules/Storage.rb:3920 +#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915 msgid "" "Could not set encryption.\n" "System error code is %1.\n" @@ -5907,7 +5955,7 @@ "提供的加密口令可能有误。\n" #. popup text -#: src/modules/Storage.rb:3951 +#: src/modules/Storage.rb:3946 msgid "" "The first and the second version\n" "of the password do not match.\n" @@ -5918,7 +5966,7 @@ "请重试。" #. popup text -#: src/modules/Storage.rb:3982 +#: src/modules/Storage.rb:3977 msgid "" "The password may only contain the following characters:\n" "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n" @@ -5930,24 +5978,24 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4036 +#: src/modules/Storage.rb:4031 msgid "&Enter Encryption Password:" msgstr "输入加密口令(&E)：" #. Clear password fields on every round. -#: src/modules/Storage.rb:4095 +#: src/modules/Storage.rb:4090 msgid "Provide Password" msgstr "提供口令" -#: src/modules/Storage.rb:4114 +#: src/modules/Storage.rb:4109 msgid "The following encrypted volumes are already available." msgstr "下列加密卷已可用。" -#: src/modules/Storage.rb:4129 +#: src/modules/Storage.rb:4124 msgid "Encrypted Volume Activation" msgstr "加密卷激活" -#: src/modules/Storage.rb:4133 +#: src/modules/Storage.rb:4128 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -5959,12 +6007,12 @@ "如果在更新过程中需要这些卷，或者\n" "如果它们包含加密的 LVM 物理卷，则需要知道口令。" -#: src/modules/Storage.rb:4145 +#: src/modules/Storage.rb:4140 msgid "Do you want to provide encryption passwords?" msgstr "是否要提供加密口令？" #. text in help field -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4197 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -5975,69 +6023,69 @@ "会尝试将口令用于所有设备。" #. header text -#: src/modules/Storage.rb:4208 +#: src/modules/Storage.rb:4203 msgid "Enter Encryption Password" msgstr "输入加密口令" -#: src/modules/Storage.rb:4211 +#: src/modules/Storage.rb:4206 msgid "There are no encrypted volume to unlock." msgstr "没有需要解除锁定的加密卷。" #. label text, multiple device names follow -#: src/modules/Storage.rb:4224 +#: src/modules/Storage.rb:4219 msgid "Provide password for any of the following devices:" msgstr "提供下列任一设备的口令：" #. label text, one device name follows -#: src/modules/Storage.rb:4227 +#: src/modules/Storage.rb:4222 msgid "Provide password for the following device:" msgstr "提供如下设备的口令：" -#: src/modules/Storage.rb:4240 +#: src/modules/Storage.rb:4235 msgid "Trying to unlock encrypted volumes..." msgstr "正在尝试解除加密卷的锁定..." -#: src/modules/Storage.rb:4264 +#: src/modules/Storage.rb:4259 msgid "Password did not unlock any volume." msgstr "口令未解除任何卷的锁定。" -#: src/modules/Storage.rb:4350 +#: src/modules/Storage.rb:4345 msgid "IDE Disk" msgstr "IDE 磁盘" -#: src/modules/Storage.rb:4356 +#: src/modules/Storage.rb:4351 msgid "SCSI Disk" msgstr "SCSI 磁盘" -#: src/modules/Storage.rb:4362 +#: src/modules/Storage.rb:4357 msgid "Disk" msgstr "磁盘" -#: src/modules/Storage.rb:4390 +#: src/modules/Storage.rb:4385 msgid "DM RAID" msgstr "DM RAID" -#: src/modules/Storage.rb:4403 +#: src/modules/Storage.rb:4398 msgid "MD RAID" msgstr "MD RAID" #. TODO: more informative error message, but the Package module does #. not provide anything #. TRANSLATORS: error popup -#: src/modules/Storage.rb:4898 +#: src/modules/Storage.rb:4893 msgid "Installing required packages failed." msgstr "安装必需的包失败。" -#: src/modules/Storage.rb:4899 src/modules/StorageClients.rb:159 +#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159 msgid "Continue despite the error?" msgstr "尽管出错还是继续？" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5238 +#: src/modules/Storage.rb:5233 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区，因为磁盘上有其他分区处于使用状态。" -#: src/modules/Storage.rb:5264 +#: src/modules/Storage.rb:5259 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6047,7 +6095,7 @@ "设备 %1 无法修改，因为它包含\n" "运行安装所需的激活的交换分区。\n" -#: src/modules/Storage.rb:5278 +#: src/modules/Storage.rb:5273 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6057,7 +6105,7 @@ "设备 %1 无法修改，因为它包含执行安装所需的\n" "安装数据。\n" -#: src/modules/Storage.rb:5307 +#: src/modules/Storage.rb:5302 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6067,7 +6115,7 @@ "设备 %1 无法去除，因为它包含\n" "运行安装所需的激活的交换分区。\n" -#: src/modules/Storage.rb:5316 +#: src/modules/Storage.rb:5311 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6077,7 +6125,7 @@ "设备 %1 无法去除，因为它包含执行安装所需的\n" "安装数据。\n" -#: src/modules/Storage.rb:5345 +#: src/modules/Storage.rb:5340 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6089,7 +6137,7 @@ "改变设备 %2，而该设备包含用于\n" "运行安装的已激活 swap。\n" -#: src/modules/Storage.rb:5356 +#: src/modules/Storage.rb:5351 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6100,7 +6148,7 @@ "包含执行安装所需数据的设备 %2 。\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5378 +#: src/modules/Storage.rb:5373 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -6111,18 +6159,18 @@ "其他分区正在使用它。\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5467 +#: src/modules/Storage.rb:5462 msgid "Nothing assigned as root filesystem!" msgstr "未指派根文件系统！" -#: src/modules/Storage.rb:5468 +#: src/modules/Storage.rb:5463 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:6018 +#: src/modules/Storage.rb:6013 msgid "Adding the following resolvables failed: %1" msgstr "添加下列可解析项时失败：%1" @@ -6772,31 +6820,31 @@ #. bsc#983003 #. penalty for not having separate /home -#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724 +#: src/modules/StorageProposal.rb:4624 src/modules/StorageProposal.rb:5747 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows." msgstr "由于文件系统不一致，无法调整大小。请尝试在 Windows 下检查文件系统。" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6239 +#: src/modules/StorageProposal.rb:6262 msgid "File System for Root Partition" msgstr "根分区的文件系统" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6286 +#: src/modules/StorageProposal.rb:6309 msgid "File System for Home Partition" msgstr "主分区的文件系统" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6304 +#: src/modules/StorageProposal.rb:6327 msgid "Enlarge &Swap for Suspend" msgstr "增大交换区以用于挂起(&S)" -#: src/modules/StorageProposal.rb:6314 +#: src/modules/StorageProposal.rb:6337 msgid "Proposal Settings" msgstr "建议设置" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6329 +#: src/modules/StorageProposal.rb:6352 msgid "" "<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n" "Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n" @@ -6807,7 +6855,7 @@ "如果想加密系统，请选择<b>基于加密 LVM 的建议</b>。</p>" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6337 +#: src/modules/StorageProposal.rb:6360 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" @@ -6820,7 +6868,7 @@ "大小。</p>" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6346 +#: src/modules/StorageProposal.rb:6369 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>" @@ -6829,7 +6877,7 @@ "相应的组合框选择主分区的文件系统。</p>" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6353 +#: src/modules/StorageProposal.rb:6376 msgid "" "<p>The swap partition can be made large enough to be used to suspend\n" "the system to disk in most cases.</p>" @@ -6837,32 +6885,32 @@ "<p>可将交换分区设置得足够大，以便在大多数情况下\n" "都能将系统暂挂到磁盘。</p>" -#: src/modules/StorageProposal.rb:6378 +#: src/modules/StorageProposal.rb:6401 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:6385 +#: src/modules/StorageProposal.rb:6408 msgid "Password:" msgstr "密码：" #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6396 +#: src/modules/StorageProposal.rb:6419 msgid "Reenter the password for verification:" msgstr "再次输入口令以便确认：" #. Clear password fields on every round. -#: src/modules/StorageProposal.rb:6594 +#: src/modules/StorageProposal.rb:6617 msgid "&Partition-based Proposal" msgstr "基于分区的建议(&P)" -#: src/modules/StorageProposal.rb:6596 +#: src/modules/StorageProposal.rb:6619 msgid "&LVM-based Proposal" msgstr "基于 LVM 的建议(&L)" -#: src/modules/StorageProposal.rb:6598 +#: src/modules/StorageProposal.rb:6621 msgid "&Encrypted LVM-based Proposal" msgstr "基于加密 LVM 的建议(&E)" @@ -6908,3 +6956,14 @@ #: src/modules/StorageSettings.rb:183 msgid "Visible Information on Storage Devices:" msgstr "储存设备上的可见信息：" + +#~ msgid "" +#~ "You have assigned an encrypted file system to a partition\n" +#~ "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n" +#~ "/var\". This is not possible. Change the mount point or use a\n" +#~ "nonloopbacked file system.\n" +#~ msgstr "" +#~ "已将加密文件系统指派给分区，\n" +#~ "该分区具有以下安装点之一：\"/\"、“/usr”、“/boot”\n" +#~ "或“/var”。这是不可能的。请更改安装点或使用\n" +#~ "非回送文件系统。\n" Modified: branches/SLE12-SP3/yast/zh_CN/po/update.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/update.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/update.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-31 02:31+0000\n" +"POT-Creation-Date: 2017-04-20 02:29+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -167,8 +167,8 @@ #: 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:157 -#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448 -#: src/modules/RootPart.rb:2006 +#: src/modules/RootPart.rb:1445 src/modules/RootPart.rb:1451 +#: src/modules/RootPart.rb:2009 msgid "Unknown" msgstr "未知" @@ -658,19 +658,19 @@ msgstr "跳过装载(&S)" #. yes-no popup -#: src/modules/RootPart.rb:1066 +#: src/modules/RootPart.rb:1069 msgid "Incorrect password. Try again?" msgstr "口令不正确。重试吗？" #. TRANSLATORS: a popup headline -#: src/modules/RootPart.rb:1169 +#: src/modules/RootPart.rb:1172 msgid "Warning" msgstr "警告" #. TRANSLATORS: error message, #. %1 is replaced with the current /boot partition size #. %2 with the recommended size -#: src/modules/RootPart.rb:1174 +#: src/modules/RootPart.rb:1177 msgid "" "Your /boot partition is too small (%1 MB).\n" "We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n" @@ -687,7 +687,7 @@ "您要继续更新当前系统吗？\n" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.rb:1266 +#: src/modules/RootPart.rb:1269 msgid "" "The partition %1 could not be mounted.\n" "\n" @@ -708,27 +708,27 @@ "要中止更新，请单击“取消”。\n" #. push button -#: src/modules/RootPart.rb:1284 +#: src/modules/RootPart.rb:1287 msgid "&Specify Mount Options" msgstr "指定装入选项(&S)" #. popup heading -#: src/modules/RootPart.rb:1300 +#: src/modules/RootPart.rb:1303 msgid "Mount Options" msgstr "装入选项" #. text entry label -#: src/modules/RootPart.rb:1303 +#: src/modules/RootPart.rb:1306 msgid "&Mount Point" msgstr "加载点(&M)" #. tex entry label -#: src/modules/RootPart.rb:1306 +#: src/modules/RootPart.rb:1309 msgid "&Device" msgstr "设备(&D)" #. text entry label -#: src/modules/RootPart.rb:1311 +#: src/modules/RootPart.rb:1314 msgid "" "&File System\n" "(empty for autodetection)" @@ -737,12 +737,12 @@ "(对于自动检测为空)" #. error message -#: src/modules/RootPart.rb:1388 +#: src/modules/RootPart.rb:1391 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:1429 +#: src/modules/RootPart.rb:1432 msgid "" "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n" "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n" @@ -754,17 +754,17 @@ "<b>udev ID：</b>%5，<br>\n" "<b>udev 路径：</b>%6" -#: src/modules/RootPart.rb:1443 +#: src/modules/RootPart.rb:1446 msgid "None" msgstr "无" #. a popup caption -#: src/modules/RootPart.rb:1466 +#: src/modules/RootPart.rb:1469 msgid "Unable to find the /var partition automatically" msgstr "无法自动查找 /var 分区" #. a popup message -#: src/modules/RootPart.rb:1471 +#: src/modules/RootPart.rb:1474 msgid "" "Your system uses a separate /var partition which is required for the upgrade\n" "process to detect the disk-naming changes. Select the /var partition manually\n" @@ -775,22 +775,22 @@ "来继续升级过程。" #. a combo-box label -#: src/modules/RootPart.rb:1484 +#: src/modules/RootPart.rb:1487 msgid "&Select /var Partition Device" msgstr "选择 /var 分区设备(&S)" #. an informational rich-text widget label -#: src/modules/RootPart.rb:1490 +#: src/modules/RootPart.rb:1493 msgid "Device Info" msgstr "设备信息" #. error message -#: src/modules/RootPart.rb:1631 +#: src/modules/RootPart.rb:1634 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:1662 +#: src/modules/RootPart.rb:1665 msgid "" "Partitions could not be mounted.\n" "\n" @@ -803,7 +803,7 @@ #. read the keyboard settings now, so that it used when #. typing passwords for encrypted partitions #. Calling a script because otherwise this module would depend on yast2-country -#: src/modules/RootPart.rb:1706 +#: src/modules/RootPart.rb:1709 msgid "" "Some partitions in the system on %1 are mounted by kernel-device name. This is\n" "not reliable for the update since kernel-device names are unfortunately not\n" @@ -816,37 +816,37 @@ "其他方法并应用于所有分区。" #. error message -#: src/modules/RootPart.rb:1724 +#: src/modules/RootPart.rb:1727 msgid "No fstab found." msgstr "未找到 fstab。" #. message part 1 -#: src/modules/RootPart.rb:1749 +#: src/modules/RootPart.rb:1752 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "/etc/fstab 中的根分区包含无效的根设备。\n" #. message part 2 -#: src/modules/RootPart.rb:1754 +#: src/modules/RootPart.rb:1757 msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "它当前被作为 %1 装入，但作为 %2 列出。\n" #. TRANSLATORS: label for filesystem snapshot taken before system update -#: src/modules/RootPart.rb:1810 +#: src/modules/RootPart.rb:1813 msgid "before update" msgstr "更新前" #. prepare progress-bar -#: src/modules/RootPart.rb:2131 +#: src/modules/RootPart.rb:2134 msgid "Evaluating root partition. One moment please..." msgstr "正在评估根分区。请稍候..." #. intermediate popup while mounting partitions -#: src/modules/RootPart.rb:2214 +#: src/modules/RootPart.rb:2217 msgid "Mounting partitions. One moment please..." msgstr "正在装入分区。请稍候..." #. TRANSLATORS: dialog caption -#: src/modules/RootPart.rb:2229 +#: src/modules/RootPart.rb:2232 msgid "Searching for Available Systems" msgstr "正在搜索可用的系统" Modified: branches/SLE12-SP3/yast/zh_CN/po/vm.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/vm.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/vm.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: vm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-01 02:29+0000\n" +"POT-Creation-Date: 2017-03-31 02:29+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -21,7 +21,7 @@ msgstr "安装超级管理程序和工具" #. progress step title -#: src/clients/vm_finish.rb:69 +#: src/clients/vm_finish.rb:70 msgid "Configuring the virtual machine..." msgstr "正在配置虚拟机..." Modified: branches/SLE12-SP3/yast/zh_CN/po/xpram.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/xpram.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/xpram.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: xpram\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-31 17:53+0200\n" +"POT-Creation-Date: 2017-05-16 19:52+0200\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -55,46 +55,46 @@ msgstr "<p>此工具当前仅支持将整个 XPRAM 分配到一个分区。要使用多个分区，请查看 Linux 内核 2.6 - 2004 年 4 月流的“设备驱动程序、功能和命令(2004 年 11 月 30 日)。</p><p>在这种情况下，禁用此模块中的 XPRAM。</p>" #. help text for XPRAM 3/4 -#: src/include/s390/xpram/ui.rb:57 +#: src/include/s390/xpram/ui.rb:60 msgid "<p>Choose the correct mount point for <b>Mount Point</b>.</p>" msgstr "<p>在<b>安装点</b>中，选择正确的安装点。</p>" #. help text for XPRAM 4/4 -#: src/include/s390/xpram/ui.rb:59 +#: src/include/s390/xpram/ui.rb:62 msgid "<p>Next, choose the file system to use on the device.</p>" msgstr "<p>下一步，选择要在该设备上使用的文件系统。</p>" #. radio button label for to not start xpram -#: src/include/s390/xpram/ui.rb:83 +#: src/include/s390/xpram/ui.rb:86 msgid "Do No&t Start XPRAM" msgstr "不启动 XPARM(&T)" #. radio button label for to start xpram -#: src/include/s390/xpram/ui.rb:92 +#: src/include/s390/xpram/ui.rb:95 msgid "&Start XPRAM" msgstr "启动 XPRAM(&S)" -#: src/include/s390/xpram/ui.rb:104 +#: src/include/s390/xpram/ui.rb:107 msgid "Install File System or Swap Although &XPRAM Contains Valid Data" msgstr "安装文件系统或交换空间(即使 XPRAM 包含有效数据)(&X)" #. frame label -#: src/include/s390/xpram/ui.rb:113 +#: src/include/s390/xpram/ui.rb:116 msgid "Mount Point" msgstr "安装点" #. combobox label -#: src/include/s390/xpram/ui.rb:122 +#: src/include/s390/xpram/ui.rb:125 msgid "&Mount Point" msgstr "安装点(&M)" #. frame label -#: src/include/s390/xpram/ui.rb:137 +#: src/include/s390/xpram/ui.rb:140 msgid "File System Type" msgstr "文件系统类型" #. combobox label -#: src/include/s390/xpram/ui.rb:146 +#: src/include/s390/xpram/ui.rb:149 msgid "F&ile System to Use:" msgstr "要使用的文件系统(&I)：" @@ -104,36 +104,34 @@ msgstr "正在保存 XPRAM 配置" #. Progress stage 1/2 -#: src/modules/Xpram.rb:109 +#: src/modules/Xpram.rb:108 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Xpram.rb:111 +#: src/modules/Xpram.rb:110 msgid "Restart the service" msgstr "重启动服务" #. Progress step 1/2 -#: src/modules/Xpram.rb:115 +#: src/modules/Xpram.rb:114 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Xpram.rb:117 +#: src/modules/Xpram.rb:116 msgid "Restarting service..." msgstr "正在重启动服务..." #. Progress finished -#: src/modules/Xpram.rb:119 +#: src/modules/Xpram.rb:118 msgid "Finished" msgstr "已完成" -#: src/modules/Xpram.rb:136 +#: src/modules/Xpram.rb:135 msgid "Error stopping xpram. Try \"rcxpram stop\" manually." msgstr "停止 xpram 时出错。请尝试手动运行“rcxpram stop”。" -#. map out = (map) SCR::Execute(.target.bash_output,"bash -x /etc/init.d/xpram start", $["TERM":"raw"]); -#. y2milestone("got %1", out); -#: src/modules/Xpram.rb:154 +#: src/modules/Xpram.rb:151 msgid "Error starting xpram. Try \"rcxpram start\" manually." msgstr "启动 xpram 时出错。请尝试手动运行“rcxpram start”。" Modified: branches/SLE12-SP3/yast/zh_CN/po/yast2-apparmor.zh_CN.po =================================================================== --- branches/SLE12-SP3/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2017-05-23 07:12:01 UTC (rev 97364) +++ branches/SLE12-SP3/yast/zh_CN/po/yast2-apparmor.zh_CN.po 2017-05-23 07:12:57 UTC (rev 97365) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-30 18:26+0200\n" +"POT-Creation-Date: 2017-04-05 02:27+0000\n" "PO-Revision-Date: 2017-04-18 14:02\n" "Last-Translator: Novell language \n" "Language-Team: Novell language \n" @@ -78,7 +78,7 @@ #. AppArmor dialog caption #. Network dialog caption -#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:440 +#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:60 msgid "AppArmor Configuration" msgstr "AppArmor 配置" @@ -136,119 +136,11 @@ #. you may find current contact information at www.novell.com #. #. *************************************************************************** -#: src/include/apparmor/aa-config.rb:52 -msgid "This operation generated the following error. Check your installation and AppArmor profile settings." -msgstr "此操作产生了以下错误。请检查安装的系统和 AppArmor 配置文件的设置。" +#: src/include/apparmor/aa-config.rb:48 +msgid "Failed to change apparmor service. Please use journal (journalctl -n -u apparmor) to diagnose" +msgstr "" -#: src/include/apparmor/aa-config.rb:91 src/include/apparmor/aa-config.rb:103 -#: src/include/apparmor/aa-config.rb:115 -msgid "Disabled" -msgstr "已禁用" - -#: src/include/apparmor/aa-config.rb:92 src/include/apparmor/aa-config.rb:104 -#: src/include/apparmor/aa-config.rb:116 -msgid "1 minute" -msgstr "1 分钟" - -#: src/include/apparmor/aa-config.rb:93 src/include/apparmor/aa-config.rb:105 -#: src/include/apparmor/aa-config.rb:117 -msgid "5 minutes" -msgstr "5 分钟" - -#: src/include/apparmor/aa-config.rb:94 src/include/apparmor/aa-config.rb:106 -#: src/include/apparmor/aa-config.rb:118 -msgid "10 minutes" -msgstr "10 分钟" - -#: src/include/apparmor/aa-config.rb:95 src/include/apparmor/aa-config.rb:107 -#: src/include/apparmor/aa-config.rb:119 -msgid "15 minutes" -msgstr "15 分钟" - -#: src/include/apparmor/aa-config.rb:96 src/include/apparmor/aa-config.rb:108 -#: src/include/apparmor/aa-config.rb:120 -msgid "30 minutes" -msgstr "30 分钟" - -#: src/include/apparmor/aa-config.rb:97 src/include/apparmor/aa-config.rb:109 -#: src/include/apparmor/aa-config.rb:121 -msgid "1 hour" -msgstr "1 小时" - -#: src/include/apparmor/aa-config.rb:98 src/include/apparmor/aa-config.rb:110 -#: src/include/apparmor/aa-config.rb:122 -msgid "1 day" -msgstr "1 天" - -#: src/include/apparmor/aa-config.rb:99 src/include/apparmor/aa-config.rb:111 -#: src/include/apparmor/aa-config.rb:123 -msgid "1 week" -msgstr "1 周" - -#: src/include/apparmor/aa-config.rb:131 src/include/apparmor/aa-config.rb:233 -msgid "Security Event Notification" -msgstr "安全性事件通知" - -#: src/include/apparmor/aa-config.rb:138 -msgid "Terse Notification" -msgstr "简明通知" - -#: src/include/apparmor/aa-config.rb:142 src/include/apparmor/aa-config.rb:171 -#: src/include/apparmor/aa-config.rb:200 -msgid "Frequency" -msgstr "频率" - -#: src/include/apparmor/aa-config.rb:145 src/include/apparmor/aa-config.rb:174 -#: src/include/apparmor/aa-config.rb:203 -msgid "Email Address" -msgstr "电子邮件地址" - -#: src/include/apparmor/aa-config.rb:150 src/include/apparmor/aa-config.rb:179 -#: src/include/apparmor/aa-config.rb:208 -msgid "Severity" -msgstr "严重性" - -#: src/include/apparmor/aa-config.rb:159 src/include/apparmor/aa-config.rb:188 -#: src/include/apparmor/aa-config.rb:217 -msgid "Include Unknown Severity Events" -msgstr "包含未知的安全性事件" - -#: src/include/apparmor/aa-config.rb:167 -msgid "Summary Notification" -msgstr "摘要通知" - -#: src/include/apparmor/aa-config.rb:196 -msgid "Verbose Notification" -msgstr "详细通知" - -#: src/include/apparmor/aa-config.rb:270 src/include/apparmor/aa-config.rb:310 -#: src/include/apparmor/aa-config.rb:350 -msgid "An email address is required for each selected notification method." -msgstr "选择的每种通知方式都必须有一个电子邮件地址。" - -#: src/include/apparmor/aa-config.rb:394 -msgid "Configuration failed for the following operations: " -msgstr "以下操作配置失败：" - -#: src/include/apparmor/aa-config.rb:401 src/include/apparmor/aa-config.rb:434 -msgid "Notification is enabled" -msgstr "通知已启用" - -#. Notification Status -#: src/include/apparmor/aa-config.rb:403 src/include/apparmor/aa-config.rb:431 -msgid "Notification is disabled" -msgstr "通知已禁用" - -#. AppArmor Status -#: src/include/apparmor/aa-config.rb:422 -msgid "AppArmor is disabled" -msgstr "AppArmor 已禁用" - -#: src/include/apparmor/aa-config.rb:426 -msgid "AppArmor is enabled" -msgstr "AppArmor 已启用" - -#: src/include/apparmor/aa-config.rb:441 +#: src/include/apparmor/aa-config.rb:61 msgid "" "<p><b>AppArmor Status</b><br>This reports whether the AppArmor policy enforcement \n" "module is loaded and functioning.</p>" @@ -256,13 +148,13 @@ "p><b>AppArmor 状态</b><br>报告 AppArmor 策略执行模块\n" "是否已装载并可正常工作。</p>" -#: src/include/apparmor/aa-config.rb:444 +#: src/include/apparmor/aa-config.rb:64 msgid "" "<p><b>Security Event Notification</b><br>Configure this tool if you want \n" "to be notified by email when access violations have occurred.</p>" msgstr "<p><b>安全事件通知</b><br>配置该工具是否在发生访问违规时发出邮件通知。</p>" -#: src/include/apparmor/aa-config.rb:447 +#: src/include/apparmor/aa-config.rb:67 msgid "" "<p><b>Profile Modes</b><br>Use this tool to change the way that AppArmor \n" "uses individual profiles.</p>" @@ -270,38 +162,28 @@ "<p><b>配置文件模式</b><br>使用该工具来更改\n" "AppArmor 使用每个配置文件的方式。</p>" -#: src/include/apparmor/aa-config.rb:462 +#: src/include/apparmor/aa-config.rb:82 msgid "&Enable AppArmor" msgstr "启用 AppArmor(&E)" -#: src/include/apparmor/aa-config.rb:469 +#: src/include/apparmor/aa-config.rb:89 msgid "Configure AppArmor" msgstr "配置 AppArmor" -#. event notification disabled due to changes in AppArmor -#. `Frame ( _("Security Event Notification"), -#. `HBox( -#. `VSpacing(1), `HSpacing(1), -#. `HVCenter( `Label( `id(`notifyLabel), evEnStr )), -#. `PushButton( `id(`ntconf), _("C&onfigure")), -#. `VSpacing(1), `HSpacing(1) -#. ) -#. ), -#. `VSpacing(1), `HSpacing(20), -#: src/include/apparmor/aa-config.rb:485 +#: src/include/apparmor/aa-config.rb:95 msgid "Configure Profile Modes" msgstr "配置配置文件模式" -#: src/include/apparmor/aa-config.rb:491 +#: src/include/apparmor/aa-config.rb:101 msgid "Set profile modes" msgstr "设置配置文件模式" -#: src/include/apparmor/aa-config.rb:494 +#: src/include/apparmor/aa-config.rb:104 msgid "Co&nfigure" msgstr "配置(&N)" #. May want to replace Wizard() with UI() -#: src/include/apparmor/aa-config.rb:518 +#: src/include/apparmor/aa-config.rb:128 #: src/include/apparmor/config_complain.rb:187 #: src/include/apparmor/config_complain.rb:235 #: src/include/apparmor/config_complain.rb:245 @@ -1922,7 +1804,77 @@ msgid "You must select a profile to edit." msgstr "必须选择要编辑的配置文件。" -#: perl-lib/Notify.pm:51 -#, perl-format -msgid "Failed copying %s." -msgstr "复制 %s 失败。" +#~ msgid "This operation generated the following error. Check your installation and AppArmor profile settings." +#~ msgstr "此操作产生了以下错误。请检查安装的系统和 AppArmor 配置文件的设置。" + +#~ msgid "Disabled" +#~ msgstr "已禁用" + +#~ msgid "1 minute" +#~ msgstr "1 分钟" + +#~ msgid "5 minutes" +#~ msgstr "5 分钟" + +#~ msgid "10 minutes" +#~ msgstr "10 分钟" + +#~ msgid "15 minutes" +#~ msgstr "15 分钟" + +#~ msgid "30 minutes" +#~ msgstr "30 分钟" + +#~ msgid "1 hour" +#~ msgstr "1 小时" + +#~ msgid "1 day" +#~ msgstr "1 天" + +#~ msgid "1 week" +#~ msgstr "1 周" + +#~ msgid "Security Event Notification" +#~ msgstr "安全性事件通知" + +#~ msgid "Terse Notification" +#~ msgstr "简明通知" + +#~ msgid "Frequency" +#~ msgstr "频率" + +#~ msgid "Email Address" +#~ msgstr "电子邮件地址" + +#~ msgid "Severity" +#~ msgstr "严重性" + +#~ msgid "Include Unknown Severity Events" +#~ msgstr "包含未知的安全性事件" + +#~ msgid "Summary Notification" +#~ msgstr "摘要通知" + +#~ msgid "Verbose Notification" +#~ msgstr "详细通知" + +#~ msgid "An email address is required for each selected notification method." +#~ msgstr "选择的每种通知方式都必须有一个电子邮件地址。" + +#~ msgid "Configuration failed for the following operations: " +#~ msgstr "以下操作配置失败：" + +#~ msgid "Notification is enabled" +#~ msgstr "通知已启用" + +#~ msgid "Notification is disabled" +#~ msgstr "通知已禁用" + +#~ msgid "AppArmor is disabled" +#~ msgstr "AppArmor 已禁用" + +#~ msgid "AppArmor is enabled" +#~ msgstr "AppArmor 已启用" + +#~ msgid "Failed copying %s." +#~ msgstr "复制 %s 失败。"