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

Author: keichwa Date: 2015-10-01 13:25:27 +0200 (Thu, 01 Oct 2015) New Revision: 92993 Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po trunk/yast/zh_CN/po/bootloader.zh_CN.po trunk/yast/zh_CN/po/crowbar.zh_CN.po trunk/yast/zh_CN/po/kdump.zh_CN.po trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po trunk/yast/zh_CN/po/qt-pkg.zh_CN.po trunk/yast/zh_CN/po/registration.zh_CN.po trunk/yast/zh_CN/po/storage.zh_CN.po trunk/yast/zh_CN/po/vpn.zh_CN.po Log: merged Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/autoinst.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/autoinst.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-10-30 17:21+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -37,7 +37,7 @@ #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123 #: src/include/autoinstall/conftree.rb:622 -#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360 +#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352 msgid "This may take a while" msgstr "这可能要花费一点时间" @@ -57,12 +57,12 @@ #. command line options #. Init variables -#. We will have to set default entries which are defined -#. in the import call of ServicesManager +#. Import users configuration from the profile +#. #. Backup #. Now check if there any classes defined in theis pre final control file #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148 -#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389 +#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410 #: src/clients/inst_autosetup_upgrade.rb:484 #: src/modules/AutoInstallRules.rb:1001 msgid "" @@ -504,92 +504,106 @@ #. Uwe Gansert #. #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ -#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47 +#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>" msgstr "<P>系统正在准备自动安装，请稍候。</P>" -#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52 +#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52 msgid "Execute pre-install user scripts" msgstr "执行安装前用户脚本" -#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51 +#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51 msgid "Configure General Settings " msgstr "配置常规设置" -#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53 +#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53 msgid "Set up language" msgstr "设置语言" -#: src/clients/inst_autosetup.rb:57 +#: src/clients/inst_autosetup.rb:60 msgid "Create partition plans" msgstr "创建分区计划" -#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56 +#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56 msgid "Configure Bootloader" msgstr "配置引导加载器" -#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54 +#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54 msgid "Registration" msgstr "注册" -#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55 +#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55 msgid "Configure Software selections" msgstr "配置软件选集" -#: src/clients/inst_autosetup.rb:61 +#: src/clients/inst_autosetup.rb:64 msgid "Configure Systemd Default Target" msgstr "配置 Systemd 默认对象" -#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61 +#: src/clients/inst_autosetup.rb:65 +#, fuzzy +#| msgid "Configure Volume Groups" +msgid "Configure users and groups" +msgstr "配置卷组" + +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "正在执行安装前用户脚本..." -#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60 +#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60 msgid "Configuring general settings..." msgstr "正在配置常规设置..." -#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62 +#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62 msgid "Setting up language..." msgstr "正在设置语言..." -#: src/clients/inst_autosetup.rb:68 +#: src/clients/inst_autosetup.rb:72 msgid "Creating partition plans..." msgstr "正在创建分区计划..." -#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65 +#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65 msgid "Configuring Bootloader..." msgstr "正在配置引导加载器..." -#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63 +#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63 msgid "Registering the system..." msgstr "正在注册系统..." -#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64 +#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." msgstr "正在配置软件选集..." -#: src/clients/inst_autosetup.rb:72 +#: src/clients/inst_autosetup.rb:76 msgid "Configuring Systemd Default Target..." msgstr "正在配置 Systemd 默认对象..." -#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69 +#: src/clients/inst_autosetup.rb:77 +msgid "Importing users and groups configuration..." +msgstr "" + +#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69 msgid "Preparing System for Automated Installation" msgstr "准备系统以进行自动安装" -#. configure general settings -#: src/clients/inst_autosetup.rb:164 +#. Second stage of installation will not be called but a +#. network configuration is available. So this will be written +#. while the general inst_finish process at the end of the +#. first stage. But for the installation workflow the linuxrc +#. network settings will be taken. (bnc#944942) +#: src/clients/inst_autosetup.rb:183 msgid "Handling Add-On Products..." msgstr "正在处理附加产品..." #. Set it in the Language module. #. #. Set it in the Language module. -#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149 +#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149 msgid "Configuring language..." msgstr "正在配置语言..." #. Yes, do not set Storage testsuite here as we want really GUI with proposal -#: src/clients/inst_autosetup.rb:273 +#: src/clients/inst_autosetup.rb:290 msgid "" "Error while configuring partitions.\n" "Try again.\n" @@ -598,7 +612,7 @@ "请重试。\n" #. Software -#: src/clients/inst_autosetup.rb:331 +#: src/clients/inst_autosetup.rb:344 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -1547,7 +1561,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807 msgid "Checking XML with RNG validation..." msgstr "正在进行 RNG 校验以检查 XML..." @@ -1557,7 +1571,7 @@ msgstr "部分 %1：" #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819 msgid "Checking XML with RNC validation..." msgstr "正在进行 RNC 校验以检查 XML..." @@ -2238,7 +2252,7 @@ #. @param [String] result_profile the resulting control file path #. @return [Boolean] true on success #. autoyast has read the autoyast configuration file but something went wrong -#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746 +#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为：\n" @@ -2708,14 +2722,14 @@ #. Prepare Profile for saving and remove empty data structs #. @return [void] -#: src/modules/Profile.rb:359 +#: src/modules/Profile.rb:351 msgid "Collecting configuration data..." msgstr "正在嵬集配置数据..." #. Save YCP data into XML #. @param path to file #. @return [Boolean] true on success -#: src/modules/Profile.rb:462 +#: src/modules/Profile.rb:454 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "加密的 AutoYaST 方案。请输入两次密码。" @@ -2723,14 +2737,14 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:536 +#: src/modules/Profile.rb:528 msgid "Could not write section %1 to file %2." msgstr "无法将部分 %1 写入到文件 %2。" #. Read XML into YCP data #. @param path to file #. @return [Boolean] -#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190 +#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190 msgid "Encrypted AutoYaST profile. Enter the correct password." msgstr "加密的 AutoYaST 方案。请输入正确的密码。" @@ -2847,9 +2861,6 @@ #~ " 在此处创建和编辑卷组。此后，需要在物理硬盘的分区对话框中向此卷组指定物理分区。将那些分区的分区 ID 设置为 0x8e。\n" #~ " </P>\n" -#~ msgid "Configure Volume Groups" -#~ msgstr "配置卷组" - #~ msgid "&Volume Group" #~ msgstr "卷组(&V)" Modified: trunk/yast/zh_CN/po/bootloader.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/bootloader.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/bootloader.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-10-30 17:34+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -380,7 +380,7 @@ msgstr "启用多设备 (MD) 阵列冗余(&U)" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:56 +#: src/include/bootloader/grub2/dialogs.rb:57 msgid "Boot Code Options" msgstr "引导代码选项" @@ -447,27 +447,19 @@ msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>" msgstr "<p><b>保护性 MBR 旗标</b>是一个专家设置，仅在一些诡异的硬件上需要。细节请参考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>" -#: src/include/bootloader/grub2/helps.rb:35 -msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>" -msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>" - -#: src/include/bootloader/grub2/helps.rb:41 +#: src/include/bootloader/grub2/helps.rb:38 msgid "O&ptional Kernel Command Line Parameter" msgstr "可选内核命令行参数(&P)" -#: src/include/bootloader/grub2/helps.rb:42 -msgid "D&istributor" -msgstr "发行方(&I)" - -#: src/include/bootloader/grub2/helps.rb:43 +#: src/include/bootloader/grub2/helps.rb:39 msgid "&Vga Mode" msgstr "&VGA 模式" -#: src/include/bootloader/grub2/helps.rb:44 +#: src/include/bootloader/grub2/helps.rb:40 msgid "Probe Foreign OS" msgstr "探测外来操作系统" -#: src/include/bootloader/grub2/helps.rb:45 +#: src/include/bootloader/grub2/helps.rb:41 msgid "Protective MBR flag" msgstr "保护性 MBR 旗标" @@ -553,7 +545,7 @@ #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237 +#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239 msgid "The boot partition is of type NFS. Bootloader cannot be installed." msgstr "引导分区类型是 NFS。无法安装引导加载器。" @@ -896,7 +888,7 @@ "这用于引导其它操作系统。</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:101 +#: src/include/bootloader/routines/lilolike.rb:108 msgid "Order of Hard Disks: %1" msgstr "硬盘顺序：%1" @@ -1083,49 +1075,49 @@ msgstr "引导(&B)" #. warning text in the summary richtext -#: src/lib/bootloader/proposal_client.rb:178 +#: src/lib/bootloader/proposal_client.rb:174 msgid "No boot loader is selected for installation. Your system might not be bootable." msgstr "未选择安装任何引导加载器。您的系统可能无法引导。" #. error in the proposal -#: src/lib/bootloader/proposal_client.rb:187 +#: src/lib/bootloader/proposal_client.rb:183 msgid "Because of the partitioning, the bootloader cannot be installed properly" msgstr "出于分区原因，无法正确安装引导加载器" #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:194 +#: src/modules/BootGRUB2.rb:168 msgid "Install bootcode into MBR (do not install</a>)" msgstr "安装引导代码至 MBR(不安装</a>)" -#: src/modules/BootGRUB2.rb:198 +#: src/modules/BootGRUB2.rb:172 msgid "Do not install bootcode into MBR (install</a>)" msgstr "不安装引导代码至 MBR(安装</a>)" #. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB2.rb:211 +#: src/modules/BootGRUB2.rb:185 msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "安装引导代码至 /boot 分区(不安装</a>)" -#: src/modules/BootGRUB2.rb:215 +#: src/modules/BootGRUB2.rb:189 msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "不安装引导代码至 /boot 分区(安装</a>)" -#: src/modules/BootGRUB2.rb:221 +#: src/modules/BootGRUB2.rb:195 msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "安装引导代码至 \"/\" 分区(不安装</a>)" -#: src/modules/BootGRUB2.rb:225 +#: src/modules/BootGRUB2.rb:199 msgid "Do not install bootcode into \"/\" partition (install</a>)" msgstr "不安装引导代码至 \"/\" 分区(安装</a>)" #. no location chosen, so warn user that it is problem unless he is sure -#: src/modules/BootGRUB2.rb:235 +#: src/modules/BootGRUB2.rb:209 msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." msgstr "警告：没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。" #. TRANSLATORS: title for list of location proposals -#: src/modules/BootGRUB2.rb:243 +#: src/modules/BootGRUB2.rb:217 msgid "Change Location: %s" msgstr "变动位置：%s" @@ -1133,22 +1125,22 @@ #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100 +#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100 msgid "Boot Loader Type: %1" msgstr "引导加载器类型：%1" #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/modules/BootGRUB2.rb:263 +#: src/modules/BootGRUB2.rb:237 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/modules/BootGRUB2.rb:271 +#: src/modules/BootGRUB2.rb:245 msgid " (MBR)" msgstr " (主引导记录)" -#: src/modules/BootGRUB2.rb:278 +#: src/modules/BootGRUB2.rb:252 msgid "Status Location: %1" msgstr "状态位置：%1" @@ -1182,80 +1174,95 @@ msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置，例如，主引导记录" #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:243 +#: src/modules/BootSupportCheck.rb:239 msgid "Missing ext partition for booting. Cannot install boot code." msgstr "缺失用于引导的 ext 分区。无法安装引导代码。" +#. activate set or there is already activate flag +#: src/modules/BootSupportCheck.rb:248 +msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot." +msgstr "" + +#: src/modules/BootSupportCheck.rb:255 +msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk." +msgstr "" + #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:144 +#: src/modules/Bootloader.rb:146 msgid "Check boot loader" msgstr "检查引导加载器" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:146 +#: src/modules/Bootloader.rb:148 msgid "Read partitioning" msgstr "读取分区" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:148 +#: src/modules/Bootloader.rb:150 msgid "Load boot loader settings" msgstr "加载引导加载器设置" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:152 +#: src/modules/Bootloader.rb:154 msgid "Checking boot loader..." msgstr "正在检查引导加载器..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:154 +#: src/modules/Bootloader.rb:156 msgid "Reading partitioning..." msgstr "正在读取分区..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:156 +#: src/modules/Bootloader.rb:158 msgid "Loading boot loader settings..." msgstr "正在加载引导加载器设置..." #. dialog header -#: src/modules/Bootloader.rb:160 +#: src/modules/Bootloader.rb:162 msgid "Initializing Boot Loader Configuration" msgstr "正在初始化引导加载器配置" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:279 +#: src/modules/Bootloader.rb:281 msgid "Create initrd" msgstr "创建 initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:281 +#: src/modules/Bootloader.rb:283 msgid "Save boot loader configuration files" msgstr "保存引导加载器配置文件" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:283 +#: src/modules/Bootloader.rb:285 msgid "Install boot loader" msgstr "安装引导加载器" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:287 +#: src/modules/Bootloader.rb:289 msgid "Creating initrd..." msgstr "正在创建 initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:289 +#: src/modules/Bootloader.rb:291 msgid "Saving boot loader configuration files..." msgstr "正在保存引导加载器配置文件..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:291 +#: src/modules/Bootloader.rb:293 msgid "Installing boot loader..." msgstr "正在安装引导加载器..." #. progress line -#: src/modules/Bootloader.rb:297 +#: src/modules/Bootloader.rb:299 msgid "Saving Boot Loader Configuration" msgstr "正在保存引导加载器配置" +#~ msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>" +#~ msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>" + +#~ msgid "D&istributor" +#~ msgstr "发行方(&I)" + #~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" #~ msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>" Modified: trunk/yast/zh_CN/po/crowbar.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/crowbar.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/crowbar.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-10-30 17:12+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -441,8 +441,14 @@ #. popup message %1 is FQDN #: src/include/crowbar/complex.rb:1731 +#, fuzzy +#| msgid "" +#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" +#| "currently not supported.\n" +#| "\n" +#| "You can visit the Crowbar web UI on http://%1:3000/" msgid "" -"The SUSE Cloud Admin Server has been deployed. Changing the network is\n" +"The Crowbar Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" "\n" "You can visit the Crowbar web UI on http://%1:3000/" @@ -485,9 +491,15 @@ #. Ovreview dialog help #: src/include/crowbar/helps.rb:49 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "See the SUSE Cloud deployment guide for details on the network\n" +#| "configuration and on using this YaST module.\n" +#| "</p>" msgid "" "<p>\n" -"See the SUSE Cloud deployment guide for details on the network\n" +"See the product deployment guide for details on the network\n" "configuration and on using this YaST module.\n" "</p>" msgstr "" Modified: trunk/yast/zh_CN/po/kdump.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/kdump.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/kdump.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-06-08 16:51+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -315,11 +315,11 @@ msgid "Kdump immediate reboots: %1" msgstr "Kdump 立即重启：%1" -#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 +#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262 msgid "Enabled" msgstr "已启用" -#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260 +#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263 msgid "Disabled" msgstr "已禁用" @@ -360,14 +360,19 @@ #. TRANSLATORS: CommandLine printed text #: src/clients/kdump.rb:747 -msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." +#, fuzzy +#| msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." +msgid "" +"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n" +"It will be rewritten." msgstr "内核选项 \"crashkernel\" 包含范围。它们将被重写。" +#. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text -#. Popup::Message(crash_value); -#. delete crashkernel paramter from bootloader -#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570 -#: src/modules/Kdump.rb:589 +#. start kdump at boot +#. delete crashkernel parameter from bootloader +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487 +#: src/modules/Kdump.rb:500 msgid "To apply changes a reboot is necessary." msgstr "需要重启来应用变更。" @@ -386,39 +391,39 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816 -#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065 -#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099 -#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130 -#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173 -#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207 -#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250 +#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819 +#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068 +#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102 +#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133 +#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176 +#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210 +#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253 msgid "Wrong options were used." msgstr "使用了错误的选项。" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:778 +#: src/clients/kdump.rb:781 msgid "Dump level was set." msgstr "已设置转储级别。" #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:782 src/clients/kdump.rb:807 +#: src/clients/kdump.rb:785 src/clients/kdump.rb:810 msgid "Wrong value of option." msgstr "选项值错误。" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:803 +#: src/clients/kdump.rb:806 msgid "Dump format was set." msgstr "已设置转储格式。" #. TRANSLATORS: CommandLine printed text help -#: src/clients/kdump.rb:810 +#: src/clients/kdump.rb:813 msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value." msgstr "选项只能包括 \"none\"、\"ELF\"、\"compressed\" 或 \"lzo\" 值。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:830 +#: src/clients/kdump.rb:833 msgid "File %1 does not exist." msgstr "文件 %1 不存在。" @@ -426,8 +431,8 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935 -#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016 +#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938 +#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019 msgid "Value for \"dir\" missing." msgstr "\"文件夹\" 的值缺失。" @@ -435,48 +440,48 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957 -#: src/clients/kdump.rb:983 +#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960 +#: src/clients/kdump.rb:986 msgid "Value for \"server\" missing." msgstr "\"服务器\" 的值缺失。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:995 +#: src/clients/kdump.rb:998 msgid "Value for \"share\" missing." msgstr "\"共享\" 的值缺失。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1037 +#: src/clients/kdump.rb:1040 msgid "Wrong value for target." msgstr "错误的目标值。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1148 +#: src/clients/kdump.rb:1151 msgid "Wrong value of options \"no\"." msgstr "错误的选项值 \"无\"。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1168 +#: src/clients/kdump.rb:1171 msgid "Wrong value for option \"server\"." msgstr "错误的选项值 \"服务器\"。" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1188 +#: src/clients/kdump.rb:1191 msgid "Wrong value for option \"user\"." msgstr "错误的选项值 \"用户\"。" #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245 +#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248 msgid "Wrong value for option \"email\"." msgstr "错误的选项值 \"电子邮件\"。" -#: src/clients/kdump.rb:1257 +#: src/clients/kdump.rb:1260 msgid "Firmware-assisted dump: %{status}" msgstr "固件辅助转储：%{status}" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1275 +#: src/clients/kdump.rb:1278 msgid "No option has been defined." msgstr "未定义选项。" @@ -496,109 +501,96 @@ msgstr "Kdump(&K)" #. TRANSLATORS: RadioButtonGroup Label -#: src/include/kdump/dialogs.rb:53 +#: src/include/kdump/dialogs.rb:57 msgid "Enable/Disable Kdump" msgstr "启用/禁用 Kdump" -#: src/include/kdump/dialogs.rb:58 +#: src/include/kdump/dialogs.rb:62 msgid "Enable Kd&ump" msgstr "启用 Kdump(&U)" -#: src/include/kdump/dialogs.rb:59 +#: src/include/kdump/dialogs.rb:63 msgid "&Disable Kdump" msgstr "禁用 Kdump(&D)" -#. "handle" : HandleEnableDisalbeKdump, -#: src/include/kdump/dialogs.rb:79 -msgid "Total System Memory [MB]:" -msgstr "全部系统内存 [MB]：" - -#: src/include/kdump/dialogs.rb:86 -msgid "Usable Memory [MB]:" -msgstr "可用内存 [MB]：" - -#: src/include/kdump/dialogs.rb:95 -msgid "Kdump Memor&y [MB]" -msgstr "Kdump 内存(&Y) [MB]" - #. ---------============ Dump Filtering screen=============------------ -#: src/include/kdump/dialogs.rb:134 +#: src/include/kdump/dialogs.rb:111 msgid "Include in Dumping" msgstr "包含在转储中" -#: src/include/kdump/dialogs.rb:141 +#: src/include/kdump/dialogs.rb:118 msgid "&Pages Filled with Zero" msgstr "以零填充的页面(&P)" #. `VStretch () -#: src/include/kdump/dialogs.rb:147 +#: src/include/kdump/dialogs.rb:124 msgid "Cach&e Pages" msgstr "缓存页面(&E)" -#: src/include/kdump/dialogs.rb:157 +#: src/include/kdump/dialogs.rb:134 msgid "Cache Priva&te Pages" msgstr "缓存隐私页面(&T)" -#: src/include/kdump/dialogs.rb:162 +#: src/include/kdump/dialogs.rb:139 msgid "&User Data Pages" msgstr "用户数据页面(&U)" -#: src/include/kdump/dialogs.rb:163 +#: src/include/kdump/dialogs.rb:140 msgid "&Free Pages" msgstr "空余页面(&F)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:191 +#: src/include/kdump/dialogs.rb:168 msgid "&Dump Format" msgstr "转储格式(&D)" -#: src/include/kdump/dialogs.rb:194 +#: src/include/kdump/dialogs.rb:171 msgid "&No Dump" msgstr "无转储(&N)" -#: src/include/kdump/dialogs.rb:195 +#: src/include/kdump/dialogs.rb:172 msgid "&ELF Format" msgstr "&ELF 格式" -#: src/include/kdump/dialogs.rb:196 +#: src/include/kdump/dialogs.rb:173 msgid "C&ompressed Format" msgstr "压缩格式(&O)" -#: src/include/kdump/dialogs.rb:197 +#: src/include/kdump/dialogs.rb:174 msgid "&LZO Compressed Format" msgstr "&LZO 压缩格式" #. ---------============ Dump Target screen=============------------ -#: src/include/kdump/dialogs.rb:217 +#: src/include/kdump/dialogs.rb:194 msgid "&Select Target" msgstr "选择目标(&S)" -#: src/include/kdump/dialogs.rb:221 +#: src/include/kdump/dialogs.rb:198 msgid "Local Directory" msgstr "本地目录" -#: src/include/kdump/dialogs.rb:222 src/include/kdump/uifunctions.rb:106 +#: src/include/kdump/dialogs.rb:199 src/include/kdump/uifunctions.rb:106 msgid "FTP" msgstr "FTP" -#: src/include/kdump/dialogs.rb:223 +#: src/include/kdump/dialogs.rb:200 msgid "SSH" msgstr "SSH" -#: src/include/kdump/dialogs.rb:224 +#: src/include/kdump/dialogs.rb:201 msgid "SFTP" msgstr "" -#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173 +#: src/include/kdump/dialogs.rb:202 src/include/kdump/uifunctions.rb:173 msgid "NFS" msgstr "NFS" -#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188 +#: src/include/kdump/dialogs.rb:203 src/include/kdump/uifunctions.rb:188 msgid "CIFS (SMB)" msgstr "CIFS (SMB)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:251 +#: src/include/kdump/dialogs.rb:228 msgid "&SMTP Server" msgstr "SMTP 服务器(&S)" @@ -606,7 +598,7 @@ #. text entry #. text entry #. text entry -#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130 +#: src/include/kdump/dialogs.rb:240 src/include/kdump/uifunctions.rb:130 #: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212 msgid "&User Name" msgstr "用户名(&U)" @@ -615,117 +607,147 @@ #. password entry #. password entry #. password entry -#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133 +#: src/include/kdump/dialogs.rb:252 src/include/kdump/uifunctions.rb:133 #: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215 msgid "&Password" msgstr "密码(&P)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:287 +#: src/include/kdump/dialogs.rb:264 msgid "Notification &To" msgstr "通知接收对象(&T)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:303 +#: src/include/kdump/dialogs.rb:280 msgid "Notifica&tion CC" msgstr "通知抄送对象(&t)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:320 +#: src/include/kdump/dialogs.rb:297 msgid "Custom Kdump &Kernel" msgstr "自定义 Kdump 内核(&K)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:332 +#: src/include/kdump/dialogs.rb:309 msgid "Kdump Co&mmand Line" msgstr "Kdump 命令行(&m)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:344 +#: src/include/kdump/dialogs.rb:321 msgid "Kdump Command &Line Append" msgstr "Kdump 命令行附加(&L)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:361 +#: src/include/kdump/dialogs.rb:338 msgid "&Enable Immediate Reboot After Saving the Core" msgstr "启用保存核心后立即重启(&E)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:375 +#: src/include/kdump/dialogs.rb:352 msgid "Enable Copy Ke&rnel into the Dump Directory" msgstr "启用复制内核到转储目录(&r)" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:389 +#: src/include/kdump/dialogs.rb:366 msgid "Enable &Delete Old Dump Images" msgstr "启用删除旧的转储映像(&D)" #. TRANSLATORS: IntField Label -#: src/include/kdump/dialogs.rb:406 +#: src/include/kdump/dialogs.rb:383 msgid "N&umber of Old Dumps" msgstr "旧的转储的数量(&U)" #. "handle" : -#: src/include/kdump/dialogs.rb:427 +#: src/include/kdump/dialogs.rb:408 msgid "Kdump Memory" msgstr "Kdump 内存" -#: src/include/kdump/dialogs.rb:432 +#: src/include/kdump/dialogs.rb:413 msgid "Kdump Start-Up" msgstr "Kdump 启动" -#: src/include/kdump/dialogs.rb:433 +#: src/include/kdump/dialogs.rb:414 msgid "Start-Up" msgstr "启动" -#: src/include/kdump/dialogs.rb:448 +#: src/include/kdump/dialogs.rb:429 msgid "Kdump - Dump Filtering" msgstr "Kdump - 转储过滤" -#: src/include/kdump/dialogs.rb:449 +#: src/include/kdump/dialogs.rb:430 msgid "Dump Filtering" msgstr "转储过滤" -#: src/include/kdump/dialogs.rb:455 +#: src/include/kdump/dialogs.rb:436 msgid "Saving Target for Kdump Image" msgstr "Kdump 映像的保存目标" -#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463 +#: src/include/kdump/dialogs.rb:443 src/include/kdump/dialogs.rb:444 msgid "Dump Target" msgstr "转储目标" -#: src/include/kdump/dialogs.rb:469 +#: src/include/kdump/dialogs.rb:450 msgid "SMTP Server" msgstr "SMTP 服务器" -#: src/include/kdump/dialogs.rb:479 +#: src/include/kdump/dialogs.rb:460 msgid "Notification Email Addresses" msgstr "通知电子邮件地址" -#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488 +#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469 msgid "Email Notification" msgstr "电子邮件通知" -#: src/include/kdump/dialogs.rb:501 +#: src/include/kdump/dialogs.rb:482 msgid "Custom Kernel for Kdump" msgstr "自定义转储内核" -#: src/include/kdump/dialogs.rb:506 +#: src/include/kdump/dialogs.rb:487 msgid "Command Line" msgstr "命令行" -#: src/include/kdump/dialogs.rb:514 +#: src/include/kdump/dialogs.rb:495 msgid "Dump Settings" msgstr "转储设置" -#: src/include/kdump/dialogs.rb:527 +#: src/include/kdump/dialogs.rb:508 msgid "Kdump Expert Settings" msgstr "Kdump 专家设置" -#: src/include/kdump/dialogs.rb:528 +#: src/include/kdump/dialogs.rb:509 msgid "Expert Settings" msgstr "专家设置" +#: src/include/kdump/dialogs.rb:529 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump &Low Memory [MiB]" +msgstr "Kdump 内存(&Y) [MB]" + +#: src/include/kdump/dialogs.rb:531 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump Memor&y [MiB]" +msgstr "Kdump 内存(&Y) [MB]" + +#: src/include/kdump/dialogs.rb:537 +#, fuzzy +#| msgid "Total System Memory [MB]:" +msgid "Total System Memory [MiB]:" +msgstr "全部系统内存 [MB]：" + +#: src/include/kdump/dialogs.rb:544 +#, fuzzy +#| msgid "Usable Memory [MB]:" +msgid "Usable Memory [MiB]:" +msgstr "可用内存 [MB]：" + +#: src/include/kdump/dialogs.rb:567 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump &High Memory [MiB]" +msgstr "Kdump 内存(&Y) [MB]" + #. Enable/Disable Kdump - RadioButtons 1/1 #: src/include/kdump/helps.rb:36 msgid "" @@ -1197,19 +1219,21 @@ #. several ranges and ask user about rewritting #. #. "KdumpMemory" -#: src/include/kdump/uifunctions.rb:1439 -msgid "Kernel option includes several ranges. Rewrite it?" +#: src/include/kdump/uifunctions.rb:1449 +#, fuzzy +#| msgid "Kernel option includes several ranges. Rewrite it?" +msgid "Kernel option includes several ranges or redundant values. Rewrite it?" msgstr "内核选项包括一些范围。重写吗？" #. T: Checkbox label -#: src/include/kdump/uifunctions.rb:1467 +#: src/include/kdump/uifunctions.rb:1482 msgid "Use &Firmware-Assisted Dump" msgstr "使用固件辅助转储(&F)" #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:495 +#: src/modules/Kdump.rb:412 msgid "" "Error updating initrd while calling '%{cmd}'.\n" "See %{log} for details." @@ -1218,125 +1242,133 @@ "细节请参考 %{log}。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:605 +#: src/modules/Kdump.rb:514 msgid "Initializing kdump Configuration" msgstr "初始化 kdump 配置" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622 +#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531 msgid "Reading the config file..." msgstr "正在读取配置文件..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:616 +#: src/modules/Kdump.rb:525 msgid "Reading kernel boot options..." msgstr "正在读取内核引导选项..." #. Progress stage 4/4 -#. Progress finished 3/4 -#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626 -msgid "Reading available memory..." -msgstr "正在读取可用的内存..." +#: src/modules/Kdump.rb:527 +msgid "Calculating memory limits..." +msgstr "" #. Progress step 2/4 -#: src/modules/Kdump.rb:624 +#: src/modules/Kdump.rb:533 msgid "Reading partitions of disks..." msgstr "正在读取磁盘分区..." +#. Progress finished 3/4 +#: src/modules/Kdump.rb:535 +#, fuzzy +#| msgid "Reading available memory..." +msgid "Reading available memory and calibrating usage..." +msgstr "正在读取可用的内存..." + #. Error message -#: src/modules/Kdump.rb:638 +#: src/modules/Kdump.rb:547 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "无法读取配置文件 /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:646 +#: src/modules/Kdump.rb:555 msgid "Cannot read kernel boot options." msgstr "无法读取内核引导选项。" #. Error message -#: src/modules/Kdump.rb:653 +#: src/modules/Kdump.rb:563 msgid "Cannot read available memory." msgstr "无法读取可用内存。" #. Kdump read dialog caption -#: src/modules/Kdump.rb:679 +#: src/modules/Kdump.rb:589 msgid "Saving kdump Configuration" msgstr "保存 kdump 配置" #. Progress stage 1/2 -#: src/modules/Kdump.rb:708 +#: src/modules/Kdump.rb:618 msgid "Write the settings" msgstr "写入设置" #. Progress stage 2/2 -#: src/modules/Kdump.rb:710 +#: src/modules/Kdump.rb:620 msgid "Update boot options" msgstr "更新引导选项" #. Progress step 1/2 -#: src/modules/Kdump.rb:714 +#: src/modules/Kdump.rb:624 msgid "Writing the settings..." msgstr "正在写入设置..." #. Progress step 2/2 -#: src/modules/Kdump.rb:716 +#: src/modules/Kdump.rb:626 msgid "Updating boot options..." msgstr "正在更新引导选项..." #. Progress finished -#: src/modules/Kdump.rb:718 +#: src/modules/Kdump.rb:628 msgid "Finished" msgstr "已完成" #. Error message -#: src/modules/Kdump.rb:728 +#: src/modules/Kdump.rb:638 msgid "Cannot write settings." msgstr "无法写入设置。" #. Error message -#: src/modules/Kdump.rb:737 +#: src/modules/Kdump.rb:647 msgid "Adding crashkernel parameter to bootloader fault." msgstr "添加 crashkernel 参数到引导加载器失败。" -#. Create a textual summary and a list of unconfigured cards +#. Create a textual summary #. @return summary of the current configuration -#: src/modules/Kdump.rb:851 +#: src/modules/Kdump.rb:758 msgid "Kdump status: %1" msgstr "Kdump 状态：%1" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "enabled" msgstr "已启用" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "disabled" msgstr "已禁用" -#: src/modules/Kdump.rb:859 -msgid "Value of crashkernel option: %1" +#: src/modules/Kdump.rb:766 +#, fuzzy +#| msgid "Value of crashkernel option: %1" +msgid "Value(s) of crashkernel option: %1" msgstr "crashkernel 选项的值：%1" -#: src/modules/Kdump.rb:866 +#: src/modules/Kdump.rb:773 msgid "Dump format: %1" msgstr "转储格式：%1" -#: src/modules/Kdump.rb:873 +#: src/modules/Kdump.rb:780 msgid "Target of dumps: %1" msgstr "转储目标：%1" -#: src/modules/Kdump.rb:880 +#: src/modules/Kdump.rb:787 msgid "Number of dumps: %1" msgstr "转储数目：%1" #. TRANSLATORS: warning message in installation proposal, #. do not translate %{requested} and %{available} - they are replaced with actual sizes later -#: src/modules/Kdump.rb:972 +#: src/modules/Kdump.rb:879 msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available." msgstr "" #. Trying to use fadump on unsupported hardware -#: src/modules/Kdump.rb:1065 +#: src/modules/Kdump.rb:974 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." Modified: trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/ncurses-pkg.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-06-11 01:02+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -88,14 +88,14 @@ #. add the Cancel button #. begin: the label of the Cancel button #: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836 -#: src/NCPkgStrings.cc:684 +#: src/NCPkgStrings.cc:691 msgid "&Cancel" msgstr "取消(&C)" #. add the OK button #. the label of an Accept button #: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841 -#: src/NCPkgStrings.cc:698 +#: src/NCPkgStrings.cc:705 msgid "&Accept" msgstr "接受(&A)" @@ -1026,34 +1026,41 @@ msgid "&OK" msgstr "好(&O)" +#. begin: the label of the Contiunue button +#: src/NCPkgStrings.cc:684 +#, fuzzy +#| msgid "&Continue anyway" +msgid "C&ontinue" +msgstr "强行继续(&C)" + #. the label of the Yes button -#: src/NCPkgStrings.cc:691 +#: src/NCPkgStrings.cc:698 msgid "&Yes" msgstr "是(&Y)" #. the label of the No button -#: src/NCPkgStrings.cc:705 +#: src/NCPkgStrings.cc:712 msgid "&No" msgstr "否(&N)" #. the label of the Solve button - 'try again' implies that user #. has to make some action (#213602) -#: src/NCPkgStrings.cc:713 +#: src/NCPkgStrings.cc:720 msgid "&OK -- Try Again" msgstr "好 -- 重试(&O)" #. text for a Notify popup -#: src/NCPkgStrings.cc:721 +#: src/NCPkgStrings.cc:728 msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" msgstr "<p>将丢失软件包、补丁或软件集选集中的全部修改。<br>真的退出吗？</p>" #. the label of language table -#: src/NCPkgStrings.cc:729 +#: src/NCPkgStrings.cc:736 msgid "Available Languages" msgstr "可用语言" #. the label of language table -#: src/NCPkgStrings.cc:736 +#: src/NCPkgStrings.cc:743 msgid "Available Repositories" msgstr "可用软件源" @@ -1061,65 +1068,83 @@ #. (the list shows all patches which are needed) #. static const std::string value = _( "Installable Patches" ); #. static const std::string value = _( "Relevant Patches" ); -#: src/NCPkgStrings.cc:746 +#: src/NCPkgStrings.cc:753 msgid "Needed Patches" msgstr "需要的补丁" #. A label for a list of YOU Patches - keep it short - max. 25 chars! #. (the list shows all patches which are already installed) -#: src/NCPkgStrings.cc:754 +#: src/NCPkgStrings.cc:761 msgid "Installed Patches" msgstr "已安装补丁" #. A common label for a list of YOU Patches - keep it short - max. 25 chars! -#: src/NCPkgStrings.cc:762 +#: src/NCPkgStrings.cc:769 msgid "Online Update Patches" msgstr "在线更新补丁" #. the label Filter: Update Problem ( keep it short - max. 25 chars ) -#: src/NCPkgStrings.cc:769 +#: src/NCPkgStrings.cc:776 msgid "Update Problem -- see help" msgstr "更新问题 -- 参见帮助" #. the label for Filter: Search results -#: src/NCPkgStrings.cc:776 +#: src/NCPkgStrings.cc:783 msgid "Search Results" msgstr "搜索结果" #. the headline of the dependency popup -#: src/NCPkgStrings.cc:783 +#: src/NCPkgStrings.cc:790 msgid "Package Dependencies" msgstr "软件包依赖关系" #. help text package status -#: src/NCPkgStrings.cc:790 +#: src/NCPkgStrings.cc:797 msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>" msgstr "<b>更新问题列表</b><br><p>无法自动更新列表中的软件包。</p><p>可能原因：</p><p>其它软件包淘汰了它们。</p><p>在任何安装介质上都没有可更新的较新版本。</p><p>它们是第三方软件包。</p><p>请手动选择要对这些包执行的动作。最安全的做法是将它们删除。</p>" #. column header source RPM installation (keep it short!) -#: src/NCPkgStrings.cc:797 +#: src/NCPkgStrings.cc:804 msgid "Source" msgstr "源代码" #. menu entry Update List -#: src/NCPkgStrings.cc:805 +#: src/NCPkgStrings.cc:812 msgid "&Update List" msgstr "更新列表(&U)" #. part of the patch description -#: src/NCPkgStrings.cc:812 +#: src/NCPkgStrings.cc:819 msgid "<b>Patch: </b>" msgstr "<b>补丁：</b>" #. info line is shown if YOU patch list is empty -#: src/NCPkgStrings.cc:819 +#: src/NCPkgStrings.cc:826 msgid "No patches available" msgstr "无可用补丁" -#: src/NCPkgStrings.cc:825 +#: src/NCPkgStrings.cc:832 msgid "Script" msgstr "脚本" +#: src/NCPkgStrings.cc:838 +#, fuzzy +#| msgid "Package Versions" +msgid "Incompatible Package Versions" +msgstr "软件包版本" + +#: src/NCPkgStrings.cc:845 +msgid "<p>You are trying to install multiversion-capable and non-multiversion-capable versions of this package at the same time.</p>" +msgstr "" + +#: src/NCPkgStrings.cc:854 +msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>" +msgstr "" + +#: src/NCPkgStrings.cc:864 +msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>" +msgstr "" + #~ msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package. To get packages recommeded by already installed packages the option <b>Install Recommended Packages for Already Installed Packages</b> from <b>Dependencies</b> menu has to be set." #~ msgstr "这是一个有用软件包的列表。若新安装的软件包推荐了它们，则将附加安装它们。要获得已安装软件包推荐的软件包，需设置<b>依赖关系</b>菜单下的<b>安装已安装软件包的推荐软件包</b>选项。" Modified: trunk/yast/zh_CN/po/qt-pkg.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/qt-pkg.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/qt-pkg.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: packages-qt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2014-06-10 10:31+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -52,7 +52,7 @@ msgstr "搜索(&E)" #. DEBUG -#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114 msgid "&Keywords" msgstr "关键字(&K)" @@ -92,8 +92,8 @@ #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398 -#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258 -#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219 +#: src/YQPkgSearchFilterView.cc:249 src/YQPkgTextDialog.cc:258 +#: src/YQPkgVersionsView.cc:413 src/YQSimplePatchSelector.cc:219 msgid "&Cancel" msgstr "取消(&C)" @@ -381,7 +381,7 @@ msgstr "除了您手选的软件包，还变动了以下软件包以解决依赖关系：" #: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326 -#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428 +#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:412 msgid "C&ontinue" msgstr "继续(&O)" @@ -1307,15 +1307,11 @@ msgid "Unmaintained Packages" msgstr "失去维护的软件包" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:180 +#: src/YQPkgRepoFilterView.cc:177 msgid "Search" msgstr "搜索" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:199 +#: src/YQPkgRepoFilterView.cc:192 msgid "Installation Summary" msgstr "安装摘要" @@ -1329,78 +1325,78 @@ msgstr "zzz 全部" #. Search button -#: src/YQPkgSearchFilterView.cc:92 +#: src/YQPkgSearchFilterView.cc:93 msgid "&Search" msgstr "搜索(&S)" #. #. Where to search #. -#: src/YQPkgSearchFilterView.cc:105 +#: src/YQPkgSearchFilterView.cc:106 msgid "Search in" msgstr "搜索范围" -#: src/YQPkgSearchFilterView.cc:111 +#: src/YQPkgSearchFilterView.cc:112 msgid "Nam&e" msgstr "名称(&E)" -#: src/YQPkgSearchFilterView.cc:115 +#: src/YQPkgSearchFilterView.cc:116 msgid "Su&mmary" msgstr "摘要(&M)" -#: src/YQPkgSearchFilterView.cc:117 +#: src/YQPkgSearchFilterView.cc:118 msgid "Descr&iption" msgstr "描述(&I)" -#: src/YQPkgSearchFilterView.cc:122 +#: src/YQPkgSearchFilterView.cc:123 msgid "RPM \"P&rovides\"" msgstr "RPM \"提供\"(&R)" -#: src/YQPkgSearchFilterView.cc:124 +#: src/YQPkgSearchFilterView.cc:125 msgid "RPM \"Re&quires\"" msgstr "RPM \"需要\"(&Q)" -#: src/YQPkgSearchFilterView.cc:127 +#: src/YQPkgSearchFilterView.cc:128 msgid "File list" msgstr "文件列表" #. #. Search mode #. -#: src/YQPkgSearchFilterView.cc:142 +#: src/YQPkgSearchFilterView.cc:143 msgid "Search &Mode:" msgstr "搜索模式(&M)：" #. Caution: combo box items must be inserted in the same order as enum SearchMode! -#: src/YQPkgSearchFilterView.cc:155 +#: src/YQPkgSearchFilterView.cc:156 msgid "Contains" msgstr "包含" -#: src/YQPkgSearchFilterView.cc:156 +#: src/YQPkgSearchFilterView.cc:157 msgid "Begins with" msgstr "开始为" -#: src/YQPkgSearchFilterView.cc:157 +#: src/YQPkgSearchFilterView.cc:158 msgid "Exact Match" msgstr "精确匹配" -#: src/YQPkgSearchFilterView.cc:158 +#: src/YQPkgSearchFilterView.cc:159 msgid "Use Wild Cards" msgstr "使用通配符" -#: src/YQPkgSearchFilterView.cc:159 +#: src/YQPkgSearchFilterView.cc:160 msgid "Use Regular Expression" msgstr "使用正则表达式" -#: src/YQPkgSearchFilterView.cc:166 +#: src/YQPkgSearchFilterView.cc:167 msgid "Case Sensiti&ve" msgstr "区分大小写(&V)" -#: src/YQPkgSearchFilterView.cc:244 +#: src/YQPkgSearchFilterView.cc:248 msgid "Searching..." msgstr "正在搜索..." -#: src/YQPkgSearchFilterView.cc:330 +#: src/YQPkgSearchFilterView.cc:334 msgid "No Results." msgstr "无结果。" @@ -1409,7 +1405,7 @@ #. if it's a user error (e.g., syntax error in regular expression) or #. an internal error. But there is a "Details" button that will return #. the original (translated) error message. -#: src/YQPkgSearchFilterView.cc:345 +#: src/YQPkgSearchFilterView.cc:349 msgid "Query Error" msgstr "查询出错" @@ -1535,14 +1531,14 @@ msgstr "%1-%2 来自厂商 %3 (已安装)" #. Translators: Popup dialog text. Try to keep the lines about the same length. -#: src/YQPkgVersionsView.cc:398 +#: src/YQPkgVersionsView.cc:382 msgid "" "You are trying to install multiversion-capable\n" "and non-multiversion-capable versions of this\n" "package at the same time." msgstr "" -#: src/YQPkgVersionsView.cc:406 +#: src/YQPkgVersionsView.cc:390 msgid "" "This version is multiversion-capable.\n" "\n" @@ -1551,7 +1547,7 @@ "\"Cancel\" to unselect this version and keep the other one." msgstr "" -#: src/YQPkgVersionsView.cc:415 +#: src/YQPkgVersionsView.cc:399 msgid "" "This version is not multiversion-capable.\n" "\n" @@ -1561,7 +1557,7 @@ msgstr "" #. Dialog heading -#: src/YQPkgVersionsView.cc:423 +#: src/YQPkgVersionsView.cc:407 #, fuzzy #| msgid "Package Versions" msgid "Incompatible Package Versions" @@ -1576,11 +1572,11 @@ #. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE #. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ #. %1 %2 %3 %4 %5 -#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586 +#: src/YQPkgVersionsView.cc:533 src/YQPkgVersionsView.cc:570 msgid "%1-%2 from %3 with priority %4 and vendor %5" msgstr "%1-%2 来自 %3 软件源，优先级 %4，厂商 %5" -#: src/YQPkgVersionsView.cc:570 +#: src/YQPkgVersionsView.cc:554 msgid "This version is installed in your system." msgstr "系统上已安装了此版本。" Modified: trunk/yast/zh_CN/po/registration.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/registration.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/registration.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-27 10:52+0200\n" +"POT-Creation-Date: 2015-09-28 18:17+0200\n" "PO-Revision-Date: 2014-10-30 17:15+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Traditional \n" @@ -64,7 +64,7 @@ #: src/clients/inst_scc.rb:186 #: src/lib/registration/ui/autoyast_config_dialog.rb:104 #: src/lib/registration/ui/base_system_registration_dialog.rb:48 -#: src/lib/registration/ui/migration_repos_workflow.rb:270 +#: src/lib/registration/ui/migration_repos_workflow.rb:287 #: src/lib/registration/ui/registered_system_dialog.rb:37 #: src/lib/registration/ui/registration_update_dialog.rb:41 msgid "Registration" @@ -99,8 +99,8 @@ #. %s is name of given product #. then register the product(s) #. %s is name of given product -#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247 -#: src/lib/registration/registration_ui.rb:277 +#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281 +#: src/lib/registration/registration_ui.rb:311 msgid "Registering %s ..." msgstr "正在注册 %s ..." @@ -313,24 +313,36 @@ msgid "Details: %s" msgstr "细节：%s" +#. TRANSLATORS: multiline error message - a SSL certificate has been +#. imported but the registration server still cannot be accessed securely, +#. user has to solve the certificate issue manually. +#: src/lib/registration/connect_helpers.rb:226 +msgid "" +"A certificate has been already imported\n" +"but the server connection still cannot be trusted.\n" +"\n" +"Please fix the certificate issue manually, ensure that the server\n" +"can be connected securely and start the YaST module again." +msgstr "" + #. progress label -#: src/lib/registration/connect_helpers.rb:222 +#: src/lib/registration/connect_helpers.rb:238 msgid "Importing the SSL certificate" msgstr "导入 SSL 证书" -#: src/lib/registration/connect_helpers.rb:223 +#: src/lib/registration/connect_helpers.rb:239 msgid "Importing '%s' certificate..." msgstr "正在导入 '%s' 证书..." #. try to use a translatable message first, if not found then use #. the original error message from openSSL -#: src/lib/registration/connect_helpers.rb:244 +#: src/lib/registration/connect_helpers.rb:260 msgid "Secure connection error: %s" msgstr "安全连接错误：%s" #. TRANSLATORS: error message, %s is a server URL, #. e.g. https://smt.example.com -#: src/lib/registration/connect_helpers.rb:263 +#: src/lib/registration/connect_helpers.rb:279 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -371,46 +383,57 @@ #. 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:233 +#: src/lib/registration/registration_ui.rb:267 msgid "Registering the System..." msgstr "正在注册系统..." #. updating base product registration, %s is a new base product name +#. updating product registration, %s is a product name #. updating registered addon/extension, %s is an extension name +#. TRANSLATORS: Progress label #: src/lib/registration/registration_ui.rb:106 -#: src/lib/registration/registration_ui.rb:312 +#: src/lib/registration/registration_ui.rb:146 +#: src/lib/registration/registration_ui.rb:346 +#: src/lib/registration/ui/migration_repos_workflow.rb:304 msgid "Updating to %s ..." msgstr "正在更新到 %s ..." +#. TRANSLATORS: progress label +#: src/lib/registration/registration_ui.rb:163 +#, fuzzy +#| msgid "Loading configuration %1..." +msgid "Synchronizing Products..." +msgstr "正在加载配置 %1..." + #. load available addons from SCC server #. the result is cached to avoid reloading when going back and forth in the #. installation workflow #. @return [ArrayRegistration::Addon] available addons #. download the addons from SCC, let the user select addons to install #. @return [Symbol] the user input -#: src/lib/registration/registration_ui.rb:143 -#: src/lib/registration/ui/autoyast_config_workflow.rb:109 +#: src/lib/registration/registration_ui.rb:177 +#: src/lib/registration/ui/autoyast_config_workflow.rb:106 msgid "Loading Available Extensions and Modules..." msgstr "正在加载可用扩展和模块..." -#: src/lib/registration/registration_ui.rb:157 +#: src/lib/registration/registration_ui.rb:191 #, fuzzy #| msgid "Loading configuration %1..." msgid "Loading Migration Products..." msgstr "正在加载配置 %1..." #. dialog title -#: src/lib/registration/registration_ui.rb:174 +#: src/lib/registration/registration_ui.rb:208 msgid "Register Extensions and Modules" msgstr "注册扩展和模块" #. help text -#: src/lib/registration/registration_ui.rb:178 +#: src/lib/registration/registration_ui.rb:212 msgid "<p>Extensions and Modules are being registered.</p>" msgstr "<p>正在注册扩展和模块。</p>" #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:203 +#: src/lib/registration/registration_ui.rb:237 #, fuzzy #| msgid "No registration server selected." msgid "" @@ -419,22 +442,26 @@ msgstr "未选择注册服务器。" #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:207 +#: src/lib/registration/registration_ui.rb:241 #, fuzzy #| msgid "" #| "Would you like to use these mount points\n" #| "for your new installation?" -msgid "Would you like to enable these repositories during installation\n" +msgid "" +"Would you like to enable these repositories during installation\n" +"in order to receive the latest updates?" msgstr "" "是否要在安装新系统的过程中使用\n" "这些挂载点？" #. Yast::Mode.update #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:211 +#: src/lib/registration/registration_ui.rb:245 #, fuzzy #| msgid "Would you like to open this profile in editing mode?" -msgid "Would you like to enable these repositories during upgrade\n" +msgid "" +"Would you like to enable these repositories during upgrade\n" +"in order to receive the latest updates?" msgstr "是否要以编辑方式打开此设置存档？" #. indent size used in summary text @@ -442,42 +469,53 @@ msgid "Certificate:" msgstr "证书：" +#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed +#. when a migration repository cannot be accessed, there are [Skip] +#. and [Abort] buttons displayed below the question +#: src/lib/registration/sw_mgmt.rb:97 +msgid "" +"Repository '%s'\n" +"cannot be loaded.\n" +"\n" +"Skip the repository or abort?" +msgstr "" + #. create UI label for a base product #. @param base_product [Hash] Product (hash from pkg-bindings) #. @return [String] UI Label -#: src/lib/registration/sw_mgmt.rb:147 +#: src/lib/registration/sw_mgmt.rb:192 msgid "Unknown product" msgstr "未知产品" #. error message #. error message -#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248 +#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292 msgid "Saving repository configuration failed." msgstr "保存软件源配置失败。" #. # error message #. error message -#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223 +#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267 msgid "Updating service '%s' failed." msgstr "更新服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:218 +#: src/lib/registration/sw_mgmt.rb:262 msgid "Adding service '%s' failed." msgstr "添加服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:230 +#: src/lib/registration/sw_mgmt.rb:274 msgid "Saving service '%s' failed." msgstr "保存服务 '%s' 失败。" #. error message -#: src/lib/registration/sw_mgmt.rb:235 +#: src/lib/registration/sw_mgmt.rb:279 msgid "Refreshing service '%s' failed." msgstr "刷新服务 '%s' 失败。" #. TRANSLATORS: %s is a product name -#: src/lib/registration/sw_mgmt.rb:438 +#: src/lib/registration/sw_mgmt.rb:486 #, fuzzy #| msgid "No products found to be registered." msgid "" @@ -889,8 +927,17 @@ msgid "&Local Registration Server URL" msgstr "本地注册服务器 URL(&L)" +#. TRANSLATORS: error message, %s are details +#. TRANSLATORS: error message, %s are details +#: src/lib/registration/ui/media_addon_workflow.rb:95 +#: src/lib/registration/ui/wizard_client.rb:57 +#, fuzzy +#| msgid "Internal error" +msgid "Internal error: %s" +msgstr "内部错误" + #. register the base system if not already registered -#: src/lib/registration/ui/media_addon_workflow.rb:130 +#: src/lib/registration/ui/media_addon_workflow.rb:132 msgid "" "The base system has to be registered in order to register the '%s' add-on.\n" "Skip the base system and the add-on registration?" @@ -898,10 +945,8 @@ #. TRANSLATORS: dialog title #: src/lib/registration/ui/migration_repos_selection_dialog.rb:47 -#, fuzzy -#| msgid "Additional Repositories" -msgid "Migration Repositories" -msgstr "附加源" +msgid "Repositories used for Migration" +msgstr "" #. TRANSLATORS: help text #: src/lib/registration/ui/migration_repos_selection_dialog.rb:50 @@ -911,9 +956,9 @@ #. TRANSLATORS: Multiselection widget label #: src/lib/registration/ui/migration_repos_selection_dialog.rb:85 #, fuzzy -#| msgid "Di&rectory to Contain Repositories:" -msgid "Select the Migration Repositories" -msgstr "包含源的目录(&R):" +#| msgid "Reset the target system to %1" +msgid "Select the Repositories used for Migration" +msgstr "重置目标系统到 %1" #. TRANSLATORS: Push button label, starts the repository management module #: src/lib/registration/ui/migration_repos_selection_dialog.rb:89 @@ -936,98 +981,84 @@ msgid "Priority: %s" msgstr "优先级" -#. a dummy message which will be used later, just make sure we have it -#. before the translation deadline... -#. TRANSLATORS: popup question, confirm installing the available -#. updates now -#: src/lib/registration/ui/migration_repos_workflow.rb:50 +#. 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 msgid "" -"Online updates are available for installation.\n" -"It is recommended to install all updates before proceeding.\n" -"\n" -"Would you like to install the updates now?" +"The system is not registered,\n" +"to run the online migration you need\n" +"to register the system first." msgstr "" -#. TRANSLATORS: error message, %s are details -#: src/lib/registration/ui/migration_repos_workflow.rb:86 -#, fuzzy -#| msgid "Internal error" -msgid "Internal error: %s" -msgstr "内部错误" - #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:170 +#: src/lib/registration/ui/migration_repos_workflow.rb:183 msgid "No installed product found." msgstr "" #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:199 +#: src/lib/registration/ui/migration_repos_workflow.rb:212 msgid "No migration product found." msgstr "" -#. TRANSLATORS: Progress label -#: src/lib/registration/ui/migration_repos_workflow.rb:246 -#, fuzzy -#| msgid "Registering Product..." -#| msgid_plural "Registering Products..." -msgid "Registering Migration Products..." -msgstr "正在注册产品..." - #. TRANSLATORS: progress message -#: src/lib/registration/ui/migration_repos_workflow.rb:272 +#: src/lib/registration/ui/migration_repos_workflow.rb:289 #, fuzzy #| msgid "Saving Repositories..." msgid "Preparing Migration Repositories..." msgstr "正在保存安装源..." #. TRANSLATORS: dialog title -#: src/lib/registration/ui/migration_selection_dialog.rb:61 +#: src/lib/registration/ui/migration_selection_dialog.rb:62 #, fuzzy #| msgid "Select the Mount Point" msgid "Select the Migration Target" msgstr "选择挂载点" #. TRANSLATORS: help text (1/3) -#: src/lib/registration/ui/migration_selection_dialog.rb:64 +#: src/lib/registration/ui/migration_selection_dialog.rb:65 #, fuzzy #| msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>" msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>" msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>" #. TRANSLATORS: help text (2/3) -#: src/lib/registration/ui/migration_selection_dialog.rb:67 +#: src/lib/registration/ui/migration_selection_dialog.rb:68 msgid "<p>Only one migration target from the list can be selected.</p>" msgstr "" #. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label -#: src/lib/registration/ui/migration_selection_dialog.rb:69 +#: src/lib/registration/ui/migration_selection_dialog.rb:70 msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>" msgstr "" -#. TRANSLATORS: check button label -#: src/lib/registration/ui/migration_selection_dialog.rb:70 -#: src/lib/registration/ui/migration_selection_dialog.rb:139 +#: src/lib/registration/ui/migration_selection_dialog.rb:71 #, fuzzy #| msgid "Add all selected online repositories" msgid "Manually Select Migration Repositories" msgstr "添加所有选中的在线安装源" #. TRANSLATORS: error popup, no target migration is selected -#: src/lib/registration/ui/migration_selection_dialog.rb:96 +#: src/lib/registration/ui/migration_selection_dialog.rb:97 #, fuzzy #| msgid "Reset the target system to %1" msgid "Select the target migration." msgstr "重置目标系统到 %1" +#. TRANSLATORS: check button label +#: src/lib/registration/ui/migration_selection_dialog.rb:138 +msgid "Manually Adjust the Repositories for Migration" +msgstr "" + #. TRANSLATORS: selection box label -#: src/lib/registration/ui/migration_selection_dialog.rb:151 +#: src/lib/registration/ui/migration_selection_dialog.rb:153 #, fuzzy #| msgid "Possible &Solutions" msgid "Possible Migration Targets" msgstr "可能的解决方法(&S)" #. TRANSLATORS: RichText header (details for the selected item) -#: src/lib/registration/ui/migration_selection_dialog.rb:189 +#: src/lib/registration/ui/migration_selection_dialog.rb:191 #, fuzzy #| msgid "Configuration Summary" msgid "Migration Summary" @@ -1039,14 +1070,14 @@ #. 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:214 msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration." msgstr "" #. this is rather a theoretical case, but anyway.... #. TRANSLATORS: Summary message, rich text format #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" -#: src/lib/registration/ui/migration_selection_dialog.rb:223 +#: src/lib/registration/ui/migration_selection_dialog.rb:225 #, fuzzy #| msgid "Package %1 will be installed." msgid "%s <b>will be installed.</b>" @@ -1054,25 +1085,25 @@ #. TRANSLATORS: Summary message, rich text format #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12" -#: src/lib/registration/ui/migration_selection_dialog.rb:240 +#: src/lib/registration/ui/migration_selection_dialog.rb:242 msgid "%s <b>stays unchanged.</b>" msgstr "" #. TRANSLATORS: Summary message, rich text format #. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12" #. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" -#: src/lib/registration/ui/migration_selection_dialog.rb:250 +#: src/lib/registration/ui/migration_selection_dialog.rb:252 msgid "%{old_product} <b>will be upgraded to</b> %{new_product}." msgstr "" #. TRANSLATORS: Summary message, rich text format #. %{old_product} and %{new_product} are product names -#: src/lib/registration/ui/migration_selection_dialog.rb:255 +#: src/lib/registration/ui/migration_selection_dialog.rb:257 msgid "%{old_product} <b>will be downgraded to</b> %{new_product}." msgstr "" #. TRANSLATORS: an error popup message -#: src/lib/registration/ui/migration_selection_dialog.rb:285 +#: src/lib/registration/ui/migration_selection_dialog.rb:290 msgid "" "The selected migration contains a product\n" "which is not available at the registration server.\n" @@ -1130,6 +1161,22 @@ msgid "Looking up local registration servers..." msgstr "正在查找本地注册服务器..." +#, fuzzy +#~| msgid "Additional Repositories" +#~ msgid "Migration Repositories" +#~ msgstr "附加源" + +#, fuzzy +#~| msgid "Di&rectory to Contain Repositories:" +#~ msgid "Select the Migration Repositories" +#~ msgstr "包含源的目录(&R):" + +#, fuzzy +#~| msgid "Registering Product..." +#~| msgid_plural "Registering Products..." +#~ msgid "Registering Migration Products..." +#~ msgstr "正在注册产品..." + #~ msgid "" #~ "Registration added some update repositories.\n" #~ "\n" Modified: trunk/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/storage.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/storage.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-27 10:53+0200\n" +"POT-Creation-Date: 2015-09-28 18:17+0200\n" "PO-Revision-Date: 2014-10-30 17:20+0800\n" "Last-Translator: 玛格丽特 · 苏 \n" "Language-Team: Chinese Simplified \n" @@ -954,7 +954,7 @@ msgstr "提案类型" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:246 +#: src/include/partitioning/custom_part_check_generated.rb:251 msgid "" "You have not assigned a root partition for\n" "installation. This does not work. Assign the root mount point \"/\" to a\n" @@ -968,7 +968,7 @@ "真的使用此设置吗？(你会挂)\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:259 +#: src/include/partitioning/custom_part_check_generated.rb:264 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" @@ -983,7 +983,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:272 +#: src/include/partitioning/custom_part_check_generated.rb:277 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" @@ -997,7 +997,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:286 +#: src/include/partitioning/custom_part_check_generated.rb:291 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" @@ -1010,8 +1010,19 @@ "\n" "真的使用此设置吗？\n" +#. 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:305 +msgid "" +"Warning:\n" +"Your system needs a boot partition with type 0x41 PReP/CHRP.\n" +"Please, consider creating one.\n" +"\n" +"Really use this setup?\n" +msgstr "" + #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:301 +#: src/include/partitioning/custom_part_check_generated.rb:320 msgid "" "Warning:\n" "Your boot partition ends above cylinder %1.\n" @@ -1030,7 +1041,7 @@ "真的使用此设置吗？\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:321 +#: src/include/partitioning/custom_part_check_generated.rb:340 msgid "" "Warning:\n" "Your boot partition is smaller than %1.\n" @@ -1045,7 +1056,7 @@ "真的保留该尺寸的引导分区吗？\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:338 +#: src/include/partitioning/custom_part_check_generated.rb:357 #, fuzzy #| msgid "" #| "Warning: There is no partition of type bios_grub present.\n" @@ -1067,13 +1078,21 @@ #. popup text #. If the user chooses 'no' here, the system will not be able to #. boot from the hard drive! -#: src/include/partitioning/custom_part_check_generated.rb:360 +#: src/include/partitioning/custom_part_check_generated.rb:377 +#, fuzzy +#| msgid "" +#| "Warning: There is no partition mounted as /boot.\n" +#| "To boot from your hard disk, a small /boot partition\n" +#| "(approx. %1) is required. Consider creating one.\n" +#| "Partitions assigned to /boot will automatically be changed to\n" +#| "type 0x41 PReP/CHRP.\n" +#| "\n" +#| "Really use the setup without /boot partition?\n" msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" -"(approx. %1) is required. Consider creating one.\n" -"Partitions assigned to /boot will automatically be changed to\n" -"type 0x41 PReP/CHRP.\n" +"(approx. %1) is required. Consider creating one\n" +"with type 0x41 PReP/CHRP.\n" "\n" "Really use the setup without /boot partition?\n" msgstr "" @@ -1085,7 +1104,7 @@ "真的使用没有 /boot 分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:380 +#: src/include/partitioning/custom_part_check_generated.rb:396 msgid "" "Warning: According to your setup, you intend to\n" "boot your machine from the root partition (/), which, unfortunately,\n" @@ -1103,7 +1122,7 @@ "\n" "真的使用此设置吗？\n" -#: src/include/partitioning/custom_part_check_generated.rb:400 +#: src/include/partitioning/custom_part_check_generated.rb:416 msgid "" "Warning: Some subvolumes of the root filesystem are shadowed by\n" "mount points of other filesystem. This could lead to problems.\n" @@ -1115,7 +1134,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:417 +#: src/include/partitioning/custom_part_check_generated.rb:433 msgid "" "Warning: With your current setup, your %1\n" "installation might not be directly bootable, because\n" @@ -1131,7 +1150,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:435 +#: src/include/partitioning/custom_part_check_generated.rb:451 msgid "" "Warning: With your current setup, your %2 installation\n" "will encounter problems when booting, because you have no\n" @@ -1154,7 +1173,7 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:457 +#: src/include/partitioning/custom_part_check_generated.rb:473 msgid "" "Warning: With your current setup, your %2 installation will\n" "encounter problems when booting, because you have no \n" @@ -1177,12 +1196,12 @@ "真的使用此设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:480 +#: src/include/partitioning/custom_part_check_generated.rb:496 msgid "Really use this setup?" msgstr "真的使用此设置吗？" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:488 +#: src/include/partitioning/custom_part_check_generated.rb:504 msgid "" "\n" "You have not assigned a swap partition. In most cases, we highly recommend \n" @@ -1202,7 +1221,7 @@ "真的使用没有交换分区的设置吗？\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:504 +#: src/include/partitioning/custom_part_check_generated.rb:520 msgid "" "\n" "You chose to install onto an existing partition that will not be\n" @@ -1215,7 +1234,7 @@ "尤其是在下列情景下：\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:511 +#: src/include/partitioning/custom_part_check_generated.rb:527 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1227,7 +1246,7 @@ "- 若这个分区尚未包含一个文件系统\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:518 +#: src/include/partitioning/custom_part_check_generated.rb:534 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" @@ -1237,7 +1256,7 @@ "一个像 /, /boot, /opt 或 /var 这样的标准挂载点时。\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:524 +#: src/include/partitioning/custom_part_check_generated.rb:540 msgid "" "If you decide to format the partition, all data on it will be lost.\n" "\n" @@ -1248,7 +1267,7 @@ "真的不格式化分区吗？\n" #. popup text %1 is replaced by a raid name e.g. md0 -#: src/include/partitioning/custom_part_check_generated.rb:579 +#: src/include/partitioning/custom_part_check_generated.rb:595 msgid "" "The selected device belongs to the RAID (%1).\n" "Remove it from the RAID before editing it.\n" @@ -1257,7 +1276,7 @@ "编辑该设备前请先从该 RAID 将其移除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:590 +#: src/include/partitioning/custom_part_check_generated.rb:606 msgid "" "The selected device belongs to a volume group (%1).\n" "Remove it from the volume group before editing it.\n" @@ -1266,7 +1285,7 @@ "编辑该设备前请先从该卷组将其移除。\n" #. popup text %1 is replaced by a name e.g. system -#: src/include/partitioning/custom_part_check_generated.rb:600 +#: src/include/partitioning/custom_part_check_generated.rb:616 msgid "" "The selected device is used by volume (%1).\n" "Remove the volume before editing it.\n" @@ -1275,7 +1294,7 @@ "编辑前请先移除该卷。\n" #. popup text %2 is a device name, %1 is the raid name -#: src/include/partitioning/custom_part_check_generated.rb:633 +#: src/include/partitioning/custom_part_check_generated.rb:649 msgid "" "The device (%2) belongs to the RAID (%1).\n" "Remove it from the RAID before deleting it.\n" @@ -1284,7 +1303,7 @@ "删除该设备前请先从该 RAID 将其移除。\n" #. popup text, %1 and %2 are device names -#: src/include/partitioning/custom_part_check_generated.rb:644 +#: src/include/partitioning/custom_part_check_generated.rb:660 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1292,19 +1311,19 @@ "设备 (%2) 正被 %1 使用。\n" "删除该设备前请先移除 %1。\n" -#: src/include/partitioning/custom_part_check_generated.rb:656 +#: src/include/partitioning/custom_part_check_generated.rb:672 msgid "It cannot be deleted while mounted." msgstr "无法在挂载时删除分区。" #. popup text, %1 is a device name -#: src/include/partitioning/custom_part_check_generated.rb:692 +#: src/include/partitioning/custom_part_check_generated.rb:708 msgid "" "The device (%1) cannot be removed since it is a logical partition and \n" "another logical partition with a higher number is in use.\n" msgstr "无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使用中。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:768 +#: src/include/partitioning/custom_part_check_generated.rb:784 msgid "" "The selected extended partition contains partitions which are currently mounted:\n" "%1\n" @@ -1317,7 +1336,7 @@ "除非您完全明白您在做什么，否则请选择\"取消\"。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:786 +#: src/include/partitioning/custom_part_check_generated.rb:802 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1330,7 +1349,7 @@ "删除该扩展分区前请先从相关卷组中移除全部位于它上面的分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:797 +#: src/include/partitioning/custom_part_check_generated.rb:813 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1343,7 +1362,7 @@ "删除该扩展分区前请先从相关 RAID 系统中取消指派位于它上面的分区。\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:808 +#: src/include/partitioning/custom_part_check_generated.rb:824 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1355,37 +1374,37 @@ "删除该扩展分区前请先移除使用中的卷。\n" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:71 +#: src/include/partitioning/custom_part_dialogs.rb:70 msgid "Enter your Password for the Encrypted File System." msgstr "请输入您加密文件系统的密码。" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:75 +#: src/include/partitioning/custom_part_dialogs.rb:74 #: src/include/partitioning/ep-dialogs.rb:768 #: src/modules/StorageProposal.rb:6372 msgid "Do not forget what you enter here!" msgstr "求别忘您在这儿输入的东东！" -#: src/include/partitioning/custom_part_dialogs.rb:79 +#: src/include/partitioning/custom_part_dialogs.rb:78 #: src/include/partitioning/ep-dialogs.rb:771 msgid "Empty password allowed." msgstr "密码允许为空。" #. heading text, %1 is replaced by device name (e.g. /dev/hda1) -#: src/include/partitioning/custom_part_dialogs.rb:85 +#: src/include/partitioning/custom_part_dialogs.rb:84 msgid "Password for Encrypted File System on %1" msgstr "%1 上加密文件系统的密码" #. translator comment: %1 is the device name, %2 is a directory #. example: "...password for device /dev/hda6 mounted on /var" -#: src/include/partitioning/custom_part_dialogs.rb:106 +#: src/include/partitioning/custom_part_dialogs.rb:105 msgid "" "Enter your encryption password for\n" "device %1 mounted on %2.\n" msgstr "请输入您挂载在 %2 上的设备 %1 的加密密码。\n" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:122 +#: src/include/partitioning/custom_part_dialogs.rb:121 msgid "Enter your Password for the Encrypted File System" msgstr "请输入您加密文件系统的密码" @@ -1393,7 +1412,7 @@ #. Please use newline if label is longer than 40 characters #. Label: get password for user root #. Please use newline if label is longer than 40 characters -#: src/include/partitioning/custom_part_dialogs.rb:137 +#: src/include/partitioning/custom_part_dialogs.rb:136 #: src/include/partitioning/ep-dialogs.rb:796 msgid "&Enter a Password for your File System:" msgstr "请输入您文件系统的密码(&E)：" @@ -1404,18 +1423,18 @@ #. Please use newline if label is longer than 40 characters #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/include/partitioning/custom_part_dialogs.rb:148 -#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001 +#: src/include/partitioning/custom_part_dialogs.rb:147 +#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002 msgid "Reenter the Password for &Verification:" msgstr "劳驾再输一遍密码以便确认(&V)：" #. Cancel button -#: src/include/partitioning/custom_part_dialogs.rb:160 +#: src/include/partitioning/custom_part_dialogs.rb:159 msgid "&Skip" msgstr "跳过(&S)" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:189 +#: src/include/partitioning/custom_part_dialogs.rb:188 msgid "" "The first and the second version\n" "of the password do not match!\n" @@ -1426,8 +1445,8 @@ #. popup text #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:197 -#: src/modules/Storage.rb:3957 +#: src/include/partitioning/custom_part_dialogs.rb:196 +#: src/modules/Storage.rb:3958 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1437,8 +1456,8 @@ #. popup text #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:204 -#: src/modules/Storage.rb:3965 +#: src/include/partitioning/custom_part_dialogs.rb:203 +#: src/modules/Storage.rb:3966 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -1446,17 +1465,17 @@ "密码必须有至少 %1 个字符。\n" "请重试。\n" -#: src/include/partitioning/custom_part_dialogs.rb:238 +#: src/include/partitioning/custom_part_dialogs.rb:237 msgid "No floating point number." msgstr "不能有浮点数。" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:362 +#: src/include/partitioning/custom_part_dialogs.rb:361 msgid "File system options:" msgstr "文件系统选项：" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:444 +#: src/include/partitioning/custom_part_dialogs.rb:443 msgid "" "The character '/' is no longer permitted in a volume label.\n" "Change your volume label so that it does not contain this character.\n" @@ -1465,7 +1484,7 @@ "请修改您的卷标去掉此字符。\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:467 +#: src/include/partitioning/custom_part_dialogs.rb:466 msgid "" "<p><b>Mount in /etc/fstab by:</b>\n" "Normally, a file system to mount is identified in /etc/fstab\n" @@ -1481,7 +1500,7 @@ "若禁用了某个选项，这样就会不行了。\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:480 +#: src/include/partitioning/custom_part_dialogs.rb:479 msgid "" "<p><b>Volume Label:</b>\n" "The name entered in this field is used as the volume label. This usually makes sense only \n" @@ -1494,44 +1513,44 @@ "卷标不能包含 / 字符或空格。\n" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:495 +#: src/include/partitioning/custom_part_dialogs.rb:494 msgid "Mount in /etc/fstab by" msgstr "挂载到 /etc/fstab 的方式" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:502 +#: src/include/partitioning/custom_part_dialogs.rb:501 msgid "&Device Name" msgstr "设备名称(&D)" #. label text #. label text -#: src/include/partitioning/custom_part_dialogs.rb:509 -#: src/include/partitioning/custom_part_dialogs.rb:545 +#: src/include/partitioning/custom_part_dialogs.rb:508 +#: src/include/partitioning/custom_part_dialogs.rb:544 msgid "Volume &Label" msgstr "卷标(&L)" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:516 +#: src/include/partitioning/custom_part_dialogs.rb:515 msgid "&UUID" msgstr "&UUID" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:526 +#: src/include/partitioning/custom_part_dialogs.rb:525 msgid "Device &ID" msgstr "设备 &ID" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:533 +#: src/include/partitioning/custom_part_dialogs.rb:532 msgid "Device &Path" msgstr "设备路径(&P)" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:673 +#: src/include/partitioning/custom_part_dialogs.rb:672 msgid "Fstab Options:" msgstr "Fstab 选项：" #. popup text %1 is a number -#: src/include/partitioning/custom_part_dialogs.rb:847 +#: src/include/partitioning/custom_part_dialogs.rb:846 msgid "" "\n" "Maximum volume label length for the selected file system\n" @@ -1542,62 +1561,62 @@ "您的卷标已被截断为到此长度。\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:870 +#: src/include/partitioning/custom_part_dialogs.rb:869 msgid "Provide a volume label to mount by label." msgstr "要通过卷标挂载请先给卷标。" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:881 +#: src/include/partitioning/custom_part_dialogs.rb:880 msgid "This volume label is already in use. Select a different one." msgstr "此卷标已在使用。请另选一个。" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1050 +#: src/include/partitioning/custom_part_dialogs.rb:1046 msgid "File &System" msgstr "文件系统(&S)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1057 +#: src/include/partitioning/custom_part_dialogs.rb:1053 msgid "O&ptions..." msgstr "选项(&P)..." #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1073 +#: src/include/partitioning/custom_part_dialogs.rb:1069 msgid "&Encrypt Device" msgstr "加密设备(&E)" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1148 +#: src/include/partitioning/custom_part_dialogs.rb:1144 msgid "File system &ID:" msgstr "文件系统 &ID：" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1180 +#: src/include/partitioning/custom_part_dialogs.rb:1176 msgid "Format" msgstr "格式化" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1190 +#: src/include/partitioning/custom_part_dialogs.rb:1186 msgid "Do ¬ format" msgstr "不格式化(&N)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1200 +#: src/include/partitioning/custom_part_dialogs.rb:1196 msgid "&Format" msgstr "格式化(&F)" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1253 +#: src/include/partitioning/custom_part_dialogs.rb:1249 msgid "Fs&tab Options" msgstr "Fs&tab 选项" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1260 +#: src/include/partitioning/custom_part_dialogs.rb:1256 msgid "&Mount Point" msgstr "挂载点(&M)" #. popup text %1 is a partition name, %2 a dirctory -#: src/include/partitioning/custom_part_dialogs.rb:1272 +#: src/include/partitioning/custom_part_dialogs.rb:1268 msgid "" "\n" "The selected partition (%1) is currently mounted on %2.\n" @@ -1622,7 +1641,7 @@ "继续吗？\n" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1301 +#: src/include/partitioning/custom_part_dialogs.rb:1297 msgid "" "\n" "The file system on the partition cannot be shrunk by YaST2.\n" @@ -1633,7 +1652,7 @@ "只有 fat、ext2、ext3、ext4 和 reiser 文件系统才允许收缩分区。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1308 +#: src/include/partitioning/custom_part_dialogs.rb:1304 msgid "" "\n" "The file system on the logical volume cannot be shrunk by YaST2.\n" @@ -1644,21 +1663,21 @@ "只有 fat、ext2、ext3、ext4 和 reiser 文件系统才允许收缩分区。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1320 +#: src/include/partitioning/custom_part_dialogs.rb:1316 msgid "You risk losing data if you shrink this partition." msgstr "若您收缩此分区，您将冒丢失数据的风险哦。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1326 +#: src/include/partitioning/custom_part_dialogs.rb:1322 msgid "You risk losing data if you shrink this logical volume." msgstr "若您收缩此逻辑卷，您将冒丢失数据的风险哦。" -#: src/include/partitioning/custom_part_dialogs.rb:1330 +#: src/include/partitioning/custom_part_dialogs.rb:1326 msgid "Continue?" msgstr "继续吗？" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1346 +#: src/include/partitioning/custom_part_dialogs.rb:1342 msgid "" "\n" "The file system on the selected partition cannot be extended by YaST2.\n" @@ -1669,7 +1688,7 @@ "只有 fat、ext2、ext3、ext4、xfs 和 reiser 文件系统才允许扩展的。" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1353 +#: src/include/partitioning/custom_part_dialogs.rb:1349 msgid "" "\n" "The file system on the selected logical volume cannot be extended by YaST2.\n" @@ -1679,20 +1698,20 @@ "YaST2 无法扩展所选逻辑卷上的文件系统。\n" "只有 fat、ext2、ext3、ext4、xfs 和 reiser 文件系统才允许扩展的。" -#: src/include/partitioning/custom_part_dialogs.rb:1361 +#: src/include/partitioning/custom_part_dialogs.rb:1357 msgid "Continue resizing?" msgstr "继续缩放吗？" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1378 +#: src/include/partitioning/custom_part_dialogs.rb:1374 msgid "You decreased a partition with a reiser file system on it." msgstr "您收缩了一个带有 reiser 文件系统的分区。" -#: src/include/partitioning/custom_part_dialogs.rb:1380 +#: src/include/partitioning/custom_part_dialogs.rb:1376 msgid "You decreased a logical volume with a reiser file system on it." msgstr "您收缩了一个带有 reiser 文件系统的逻辑卷。" -#: src/include/partitioning/custom_part_dialogs.rb:1387 +#: src/include/partitioning/custom_part_dialogs.rb:1383 msgid "" "\n" "It is possible to shrink a reiser file system, but this feature is not\n" @@ -1706,7 +1725,7 @@ "现在就收缩该文件系统吗？" #. popup text, %1 is replaced by device name -#: src/include/partitioning/custom_part_dialogs.rb:1441 +#: src/include/partitioning/custom_part_dialogs.rb:1437 msgid "" "The selected device contains partitions that are currently mounted:\n" "%1\n" @@ -1719,7 +1738,7 @@ "除非您完全明白您在做什么，否则请选择\"取消\"。\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_dialogs.rb:1464 +#: src/include/partitioning/custom_part_dialogs.rb:1460 msgid "" "\n" "The selected device contains at least one LVM partition\n" @@ -1732,7 +1751,7 @@ "删除该设备前请先从相关卷组中移除全部位于它上面的分区。\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_dialogs.rb:1475 +#: src/include/partitioning/custom_part_dialogs.rb:1471 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1745,7 +1764,7 @@ "删除该设备前请先从相关 RAID 系统中取消指派位于它上面的分区。\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1486 +#: src/include/partitioning/custom_part_dialogs.rb:1482 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1757,55 +1776,55 @@ "删除该设备前请先删除使用它的卷。\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:1547 +#: src/include/partitioning/custom_part_dialogs.rb:1543 msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n" msgstr "<p>在 Btrfs 文件系统中创建和移除子卷。</p>\n" -#: src/include/partitioning/custom_part_dialogs.rb:1552 +#: src/include/partitioning/custom_part_dialogs.rb:1548 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:1566 +#: src/include/partitioning/custom_part_dialogs.rb:1562 msgid "Existing Subvolumes:" msgstr "现有子卷：" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1572 +#: src/include/partitioning/custom_part_dialogs.rb:1568 msgid "New Subvolume" msgstr "新子卷" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1578 +#: src/include/partitioning/custom_part_dialogs.rb:1574 msgid "Add new" msgstr "添加新子卷" #. button text #. push button text -#: src/include/partitioning/custom_part_dialogs.rb:1584 +#: src/include/partitioning/custom_part_dialogs.rb:1580 #: src/modules/DualMultiSelectionBox.rb:147 msgid "Remove" msgstr "移除" #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text -#: src/include/partitioning/custom_part_dialogs.rb:1596 +#: src/include/partitioning/custom_part_dialogs.rb:1592 #: src/modules/StorageProposal.rb:6226 msgid "Enable Snapshots" msgstr "启用快照" #. heading text #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1607 -#: src/include/partitioning/custom_part_lib.rb:420 +#: src/include/partitioning/custom_part_dialogs.rb:1603 +#: src/include/partitioning/custom_part_lib.rb:409 msgid "Subvolume Handling" msgstr "子卷处理中" -#: src/include/partitioning/custom_part_dialogs.rb:1670 +#: src/include/partitioning/custom_part_dialogs.rb:1666 msgid "Empty subvolume name not allowed." msgstr "子卷名不允许为空。" -#: src/include/partitioning/custom_part_dialogs.rb:1674 +#: src/include/partitioning/custom_part_dialogs.rb:1670 msgid "" "Only subvolume names starting with \"%1\" currently allowed!\n" "Automatically prepending \"%1\" to name of subvolume." @@ -1813,11 +1832,11 @@ "目前只允许以 \"%1\" 开头的子卷名！\n" "正在自动给子卷名加 \"%1\" 前缀。" -#: src/include/partitioning/custom_part_dialogs.rb:1684 +#: src/include/partitioning/custom_part_dialogs.rb:1680 msgid "Subvolume name %1 already exists." msgstr "子卷名 %1 已存在。" -#: src/include/partitioning/custom_part_dialogs.rb:1713 +#: src/include/partitioning/custom_part_dialogs.rb:1709 msgid "Modifications done so far in this dialog will be lost." msgstr "目前为止在此对话框中所做的修改都将不复存在。" @@ -1996,17 +2015,17 @@ "您必须标记移除此磁盘上的全部分区即全盘格式化。因为 MBR 和 GPT 分区无法共存。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:62 +#: src/include/partitioning/custom_part_lib.rb:51 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:89 +#: src/include/partitioning/custom_part_lib.rb:78 msgid "You cannot use the mount point %1 for RAID." msgstr "您不能对 RAID 使用挂载点 %1。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:108 +#: src/include/partitioning/custom_part_lib.rb:97 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" @@ -2022,7 +2041,7 @@ "真的要这样吗？表啊～\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:131 +#: src/include/partitioning/custom_part_lib.rb:120 msgid "" "You have assigned an encrypted file system to a partition\n" "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n" @@ -2034,7 +2053,7 @@ "请修改挂载点或使用一个非回环 (non-loopback) 文件系统。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:169 +#: 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" @@ -2054,28 +2073,28 @@ #. @param [Hash{String => map}] targetMap the TargetMap #. @param mount mount point #. @return [Boolean] -#: src/include/partitioning/custom_part_lib.rb:216 +#: src/include/partitioning/custom_part_lib.rb:205 msgid "Mount point must not be empty." msgstr "挂载点不能为空。" #. error popup -#: src/include/partitioning/custom_part_lib.rb:221 +#: src/include/partitioning/custom_part_lib.rb:210 msgid "Swap devices must have swap as mount point." msgstr "Swap 设备挂载点必须为 swap 。" #. error popup -#: src/include/partitioning/custom_part_lib.rb:225 +#: src/include/partitioning/custom_part_lib.rb:214 msgid "Only swap devices may have swap as mount point." msgstr "仅 swap 设备可以使用 swap 作为挂载点。" #. && mount!="swap" ) #. error popup text -#: src/include/partitioning/custom_part_lib.rb:240 +#: src/include/partitioning/custom_part_lib.rb:229 msgid "This mount point is already in use. Select a different one." msgstr "此挂载点已在使用。请另选一个。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:250 +#: src/include/partitioning/custom_part_lib.rb:239 msgid "" "FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n" "This is not possible." @@ -2084,12 +2103,12 @@ "这是不可行的。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:259 +#: src/include/partitioning/custom_part_lib.rb:248 msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point." msgstr "挂载点中的字符无效。不要在挂载点中使用 \"`'!\"%#\"。" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:268 +#: src/include/partitioning/custom_part_lib.rb:257 msgid "" "You cannot use any of the following mount points:\n" "/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n" @@ -2100,12 +2119,12 @@ "/var/adm/mnt。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:277 +#: src/include/partitioning/custom_part_lib.rb:266 msgid "Your mount point must start with a \"/\" " msgstr "您的挂载点必须以 \"/\" 开头" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:283 +#: src/include/partitioning/custom_part_lib.rb:272 msgid "" "It is not allowed to assign the mount point swap\n" "to a device without a swap file system." @@ -2113,7 +2132,7 @@ #. 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:310 +#: src/include/partitioning/custom_part_lib.rb:299 msgid "" "Your partition is too small to use %1.\n" "The minimum size for this file system is %2.\n" @@ -2122,7 +2141,7 @@ "此文件系统的最小尺寸为 %2。\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:380 +#: src/include/partitioning/custom_part_lib.rb:369 msgid "" "It is not allowed to assign a mount point\n" "to a device with nonexistent or unknown file system." @@ -2131,7 +2150,7 @@ "设备创建挂载点。" #. warning message, %1 is replaced by fs name (e.g. Ext3) -#: src/include/partitioning/custom_part_lib.rb:502 +#: src/include/partitioning/custom_part_lib.rb:491 msgid "" "\n" "WARNING:\n" @@ -2155,12 +2174,12 @@ #. ////////////////////////////////////////////// #. modify map new -#: src/include/partitioning/custom_part_lib.rb:948 -#: src/include/partitioning/custom_part_lib.rb:975 +#: src/include/partitioning/custom_part_lib.rb:919 +#: src/include/partitioning/custom_part_lib.rb:946 msgid "The file system is currently mounted on %1." msgstr "文件系统当前挂载在 %1 上。" -#: src/include/partitioning/custom_part_lib.rb:953 +#: src/include/partitioning/custom_part_lib.rb:924 msgid "" "You can try to unmount it now, continue without unmounting or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2170,12 +2189,12 @@ #. button text #. button text -#: src/include/partitioning/custom_part_lib.rb:964 -#: src/include/partitioning/custom_part_lib.rb:989 +#: src/include/partitioning/custom_part_lib.rb:935 +#: src/include/partitioning/custom_part_lib.rb:960 msgid "Unmount" msgstr "卸载" -#: src/include/partitioning/custom_part_lib.rb:980 +#: src/include/partitioning/custom_part_lib.rb:951 msgid "" "You can try to unmount it now or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2183,15 +2202,15 @@ "您可以尝试立即卸载或取消。\n" "除非您知道您在干什么，否则请点击取消。" -#: src/include/partitioning/custom_part_lib.rb:1026 +#: src/include/partitioning/custom_part_lib.rb:997 msgid "It is not possible to shrink the file system while it is mounted." msgstr "挂载时无法收缩文件系统。" -#: src/include/partitioning/custom_part_lib.rb:1039 +#: src/include/partitioning/custom_part_lib.rb:1010 msgid "It is not possible to extend the file system while it is mounted." msgstr "挂载时无法扩展文件系统。" -#: src/include/partitioning/custom_part_lib.rb:1050 +#: src/include/partitioning/custom_part_lib.rb:1021 msgid "It is not possible to resize the file system while it is mounted." msgstr "挂载时无法调整文件系统。" @@ -3116,7 +3135,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211 +#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240 msgid "The disk is in use and cannot be modified." msgstr "磁盘使用中，无法修改。" @@ -3578,18 +3597,30 @@ msgid "<p>No changes to partitioning.</p>" msgstr "<p>没有分区的变更。</p>" -#: src/include/partitioning/ep-lib.rb:485 +#: src/include/partitioning/ep-lib.rb:484 msgid "<p>Changes to partitioning:</p>" msgstr "<p>分区的变更：</p>" -#: src/include/partitioning/ep-lib.rb:490 +#: src/include/partitioning/ep-lib.rb:487 msgid "<p>No changes to storage settings.</p>" msgstr "<p>没有存储设置的变更。</p>" -#: src/include/partitioning/ep-lib.rb:493 +#: src/include/partitioning/ep-lib.rb:489 msgid "<p>Storage settings:</p>" msgstr "<p>存储设置：</p>" +#: src/include/partitioning/ep-lib.rb:498 +#, fuzzy +#| msgid "<p>Storage settings:</p>" +msgid "<p>Packages to install:</p>" +msgstr "<p>存储设置：</p>" + +#: src/include/partitioning/ep-lib.rb:500 +#, fuzzy +#| msgid "<p>No changes to storage settings.</p>" +msgid "<p>No packages need to be installed.</p>" +msgstr "<p>没有存储设置的变更。</p>" + #. heading #. tree node label #: src/include/partitioning/ep-log.rb:43 @@ -5650,7 +5681,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:991 +#: src/modules/Storage.rb:992 msgid "Resize Not Possible:" msgstr "无法调整尺寸：" @@ -5663,7 +5694,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:2691 src/modules/Storage.rb:3914 +#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915 msgid "" "Could not set encryption.\n" "System error code is %1.\n" @@ -5676,7 +5707,7 @@ "提供的加密密码可能有误。\n" #. popup text -#: src/modules/Storage.rb:3945 +#: src/modules/Storage.rb:3946 msgid "" "The first and the second version\n" "of the password do not match.\n" @@ -5687,7 +5718,7 @@ "请重试。" #. popup text -#: src/modules/Storage.rb:3976 +#: 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" @@ -5699,24 +5730,24 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4030 +#: src/modules/Storage.rb:4031 msgid "&Enter Encryption Password:" msgstr "输入加密密码 (&E)：" #. Clear password fields on every round. -#: src/modules/Storage.rb:4089 +#: src/modules/Storage.rb:4090 msgid "Provide Password" msgstr "输入密码" -#: src/modules/Storage.rb:4108 +#: src/modules/Storage.rb:4109 msgid "The following encrypted volumes are already available." msgstr "如下加密卷已可用。" -#: src/modules/Storage.rb:4123 +#: src/modules/Storage.rb:4124 msgid "Encrypted Volume Activation" msgstr "激活加密卷" -#: src/modules/Storage.rb:4127 +#: src/modules/Storage.rb:4128 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -5727,12 +5758,12 @@ "如果更新时需要这些卷或卷中包含加密的 LVM 物理卷，\n" "那您必须提供这些密码。" -#: src/modules/Storage.rb:4139 +#: src/modules/Storage.rb:4140 msgid "Do you want to provide encryption passwords?" msgstr "您想要提供加密密码吗？" #. text in help field -#: src/modules/Storage.rb:4196 +#: src/modules/Storage.rb:4197 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -5742,58 +5773,69 @@ "密码将在所有设备上尝试。" #. header text -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4203 msgid "Enter Encryption Password" msgstr "输入加密密码" -#: src/modules/Storage.rb:4205 +#: src/modules/Storage.rb:4206 msgid "There are no encrypted volume to unlock." msgstr "没有加密卷可供解锁。" #. label text, multiple device names follow -#: src/modules/Storage.rb:4218 +#: 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:4221 +#: src/modules/Storage.rb:4222 msgid "Provide password for the following device:" msgstr "提供如下设备的密码：" -#: src/modules/Storage.rb:4234 +#: src/modules/Storage.rb:4235 msgid "Trying to unlock encrypted volumes..." msgstr "尝试解锁加密卷..." -#: src/modules/Storage.rb:4258 +#: src/modules/Storage.rb:4259 msgid "Password did not unlock any volume." msgstr "密码没能解锁任何卷。" -#: src/modules/Storage.rb:4344 +#: src/modules/Storage.rb:4345 msgid "IDE Disk" msgstr "集成驱动电子设备 (IDE) 磁盘" -#: src/modules/Storage.rb:4350 +#: src/modules/Storage.rb:4351 msgid "SCSI Disk" msgstr "小型计算机系统接口 (SCSI) 磁盘" -#: src/modules/Storage.rb:4356 +#: src/modules/Storage.rb:4357 msgid "Disk" msgstr "磁盘" -#: src/modules/Storage.rb:4384 +#: src/modules/Storage.rb:4385 msgid "DM RAID" msgstr "设备映射器独立磁盘冗余阵列 (DM RAID)" -#: src/modules/Storage.rb:4397 +#: 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:5223 +#: src/modules/Storage.rb:4893 +msgid "Installing required packages failed." +msgstr "" + +#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159 +msgid "Continue despite the error?" +msgstr "尽管出错也要继续吗？" + +#. TRANSLATORS: error popup +#: src/modules/Storage.rb:5252 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区因为磁盘上的其它分区正在使用中。" -#: src/modules/Storage.rb:5249 +#: src/modules/Storage.rb:5278 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -5802,7 +5844,7 @@ "\n" "无法修改设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5263 +#: src/modules/Storage.rb:5292 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -5811,7 +5853,7 @@ "\n" "无法修改设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5292 +#: src/modules/Storage.rb:5321 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -5820,7 +5862,7 @@ "\n" "无法移除设备 %1 因为其含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5301 +#: src/modules/Storage.rb:5330 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -5829,7 +5871,7 @@ "\n" "无法移除设备 %1 因为其含有执行安装所需的安装数据。\n" -#: src/modules/Storage.rb:5330 +#: src/modules/Storage.rb:5359 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5839,7 +5881,7 @@ "\n" "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有激活的 swap，那是运行安装所需要的。\n" -#: src/modules/Storage.rb:5341 +#: src/modules/Storage.rb:5370 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -5849,7 +5891,7 @@ "无法移除设备 %1 因为这将间接地修改设备 %2，后者含有执行安装所需的数据。\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5363 +#: src/modules/Storage.rb:5392 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -5859,18 +5901,18 @@ "无法移除分区 %1 因为磁盘 %2 上的其它分区已经被用掉了。\n" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5452 +#: src/modules/Storage.rb:5481 msgid "Nothing assigned as root filesystem!" msgstr "未指派根文件系统！" -#: src/modules/Storage.rb:5453 +#: src/modules/Storage.rb:5482 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:6003 +#: src/modules/Storage.rb:6032 msgid "Adding the following resolvables failed: %1" msgstr "添加以下解析项失败：%1" @@ -5883,10 +5925,6 @@ msgid "System error code was: %1" msgstr "系统错误代码为：%1" -#: src/modules/StorageClients.rb:159 -msgid "Continue despite the error?" -msgstr "尽管出错也要继续吗？" - #. Label: get password for device #. Please use newline if label is longer than 40 characters #: src/modules/StorageClients.rb:199 Modified: trunk/yast/zh_CN/po/vpn.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/vpn.zh_CN.po 2015-10-01 11:25:26 UTC (rev 92992) +++ trunk/yast/zh_CN/po/vpn.zh_CN.po 2015-10-01 11:25:27 UTC (rev 92993) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2015-09-28 18:17+0200\n" "PO-Revision-Date: 2004-04-02 10:52+0200\n" "Last-Translator: 裴寒牧 \n" "Language-Team: 中华 \n" @@ -209,36 +209,43 @@ msgid "Client - Certificate" msgstr "客户身份验证(&C)" +#. Load parameters from connections of known scenarios +#: src/lib/vpn/ipsec.rb:239 +msgid "" +"ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n" +"Continue using the module will remove your customisation." +msgstr "" + #. Create a new connection, by default it is a site-to-site client. Return true if successful. -#: src/lib/vpn/ipsec.rb:303 +#: src/lib/vpn/ipsec.rb:310 #, fuzzy #| msgid "The server name is already in configured." msgid "The connection name is already used." msgstr "服务器名已经在配置中." #. Find an unused gateway scenario -#: src/lib/vpn/ipsec.rb:320 +#: src/lib/vpn/ipsec.rb:327 msgid "" "You may only have one gateway connection per scenario.\n" "All of gateway scenarios are already used." msgstr "" #. Warn against duplicated configuration -#: src/lib/vpn/ipsec.rb:337 +#: src/lib/vpn/ipsec.rb:344 msgid "" "The scenario is already configured with another gateway.\n" "You may not have two gateways operating under one scenario." msgstr "" #. Create the user (:xauth or :eap). Return true if successful. -#: src/lib/vpn/ipsec.rb:432 +#: src/lib/vpn/ipsec.rb:439 #, fuzzy #| msgid "The server name is already in configured." msgid "The user name is already used." msgstr "服务器名已经在配置中." #. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. -#: src/lib/vpn/ipsec.rb:496 +#: src/lib/vpn/ipsec.rb:503 msgid "Cannot find a matching client connection." msgstr ""