Author: keichwa Date: 2014-10-28 14:50:32 +0100 (Tue, 28 Oct 2014) New Revision: 90356 Modified: trunk/yast/zh_CN/po/network.zh_CN.po trunk/yast/zh_CN/po/storage.zh_CN.po Log: merged Modified: trunk/yast/zh_CN/po/network.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/network.zh_CN.po 2014-10-28 13:46:09 UTC (rev 90355) +++ trunk/yast/zh_CN/po/network.zh_CN.po 2014-10-28 13:50:32 UTC (rev 90356) @@ -1797,12 +1797,8 @@ "<b>注意：</b>若用同一个模块名称配置了两块网卡，则保存时将合并这些选项。</p>\n" #: src/include/network/lan/hardware.rb:132 -msgid "" -"<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool " -"with these options.</p>\n" -msgstr "" -"<p>若您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。" -"</p>\n" +msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n" +msgstr "<p>若您通过 <b>Ethtool 选项</b>指定了选项，ifup 将使用这些选项调用 ethtool。</p>\n" #. Manual dialog help 4/4 #: src/include/network/lan/hardware.rb:141 @@ -1989,27 +1985,19 @@ #. S/390 dialog help: QETH Options #: src/include/network/lan/hardware.rb:972 -msgid "" -"<p>Enter any additional <b>Options</b> for this interface (separated by " -"spaces).</p>" +msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>" msgstr "<p>输入此接口的任何附加<b>选项</b> (以空格分隔)。</p>" #: src/include/network/lan/hardware.rb:975 -msgid "" -"<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be " -"enabled for this interface.</p>" +msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>" msgstr "<p>若应为此接口启用 IP 地址接管，请选择<b>启用 IPA 接管</b>。</p>" #: src/include/network/lan/hardware.rb:978 -msgid "" -"<p>Select <b>Enable Layer 2 Support</b> if this card has been configured " -"with layer 2 support.</p>" +msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>若此卡已配置了第 2 层支持，请选择<b>启用第 2 层支持</b>。</p>" #: src/include/network/lan/hardware.rb:981 -msgid "" -"<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured " -"with layer 2 support.</p>" +msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>" msgstr "<p>若此卡已配置了第 2 层支持，请输入<b>第 2 层 MAC 地址</b>。</p>" #. TextEntry label @@ -2368,9 +2356,7 @@ "这在绑定以太网设备时特别有用。</p>\n" #: src/include/network/lan/help.rb:184 -msgid "" -"<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS." -"</p>\n" +msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n" msgstr "<p>若您想要保留在 BIOS 中配置的网络，请勾选 <b>iBFT</b>。</p>\n" #. Address dialog help 2/8 @@ -2457,9 +2443,7 @@ "则将禁用防火墙。</p>" #: src/include/network/lan/help.rb:231 -msgid "" -"<p><b>Mandatory Interface</b> specifies whether the network service reports " -"failure if the interface fails to start at boot time.</p>" +msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>" msgstr "<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>" #: src/include/network/lan/help.rb:234 @@ -2549,12 +2533,8 @@ #. Aliases dialog help 3/4, #83766 #: src/include/network/lan/help.rb:283 -msgid "" -"<p>Do not include the interface name in the alias name. For example, enter " -"<b>foo</b> instead of <b>eth0:foo</b>.</p>" -msgstr "" -"<p>不要在别名中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。" -"</p>" +msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>" +msgstr "<p>不要在别名中包含接口名称。例如，请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>" #. shared between WirelessDialog and WirelessKeyPopup #. this is suited to the button-switched key typing @@ -4448,13 +4428,8 @@ msgstr "无硬件信息" #: src/modules/LanItems.rb:1416 -msgid "" -"Unable to configure the network card because the kernel device (eth0, wlan0) " -"is not present. This is mostly caused by missing firmware (for wlan " -"devices). See dmesg output for details." -msgstr "" -"由于没有内核设备 (eth0, wlan0)，无法配置网卡。这大多是缺少固件 (对于 wlan 设" -"备) 造成的。细节请参考 dmesg 输出。" +msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details." +msgstr "由于没有内核设备 (eth0, wlan0)，无法配置网卡。这大多是缺少固件 (对于 wlan 设备) 造成的。细节请参考 dmesg 输出。" #: src/modules/LanItems.rb:1422 msgid "" Modified: trunk/yast/zh_CN/po/storage.zh_CN.po =================================================================== --- trunk/yast/zh_CN/po/storage.zh_CN.po 2014-10-28 13:46:09 UTC (rev 90355) +++ trunk/yast/zh_CN/po/storage.zh_CN.po 2014-10-28 13:50:32 UTC (rev 90356) @@ -641,8 +641,7 @@ #. can be found. YaST2 cannot install. Update CD might have newer drivers. #: src/clients/inst_target_selection.rb:172 msgid "No disks found. Try using the update CD, if available, for installation." -msgstr "" -"未找到磁盘。如果有的话，请尝试使用更新 CD 来安装，它或许有新一些磁盘驱动。" +msgstr "未找到磁盘。如果有的话，请尝试使用更新 CD 来安装，它或许有新一些磁盘驱动。" #. There are several hard disks found. Linux is completely installed on #. one hard disk - this selection is done here @@ -2284,8 +2283,7 @@ msgid "" "<p>By selecting a table entry you can\n" "navigate to the view with detailed information about the device.</p>" -msgstr "" -"<p>选中一个表格项，您可以导航到一个视图，该视图下可以显示设备的详细信息。</p>" +msgstr "<p>选中一个表格项，您可以导航到一个视图，该视图下可以显示设备的详细信息。</p>" #. popup text #: src/include/partitioning/ep-all.rb:233 @@ -2660,8 +2658,7 @@ msgid "" "<p>Then, choose whether the partition should\n" "be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>" -msgstr "" -"<p>然后，选择是否要挂载分区并输入挂载点(/、/boot、/home、/var 等)。</p>" +msgstr "<p>然后，选择是否要挂载分区并输入挂载点(/、/boot、/home、/var 等)。</p>" #. set globals #: src/include/partitioning/ep-dialogs.rb:309 @@ -3811,8 +3808,7 @@ msgid "" "The name for the volume group contains illegal characters. Allowed\n" "are alphanumeric characters, \".\", \"_\", \"-\" and \"+\"." -msgstr "" -"卷组名称包含非法字符。允许的字符为字母数字，''.''，''_''，''-'' 和 ''+''。" +msgstr "卷组名称包含非法字符。允许的字符为字母数字，''.''，''_''，''-'' 和 ''+''。" #. error popup text #: src/include/partitioning/ep-lvm-dialogs.rb:76 @@ -3853,8 +3849,7 @@ msgid "" "The data entered is invalid. Insert a physical extent size larger than %1\n" "in powers of 2, for example, \"%2\" or \"%3\"" -msgstr "" -"输入的数据无效。输入一个大于 %1 两倍的物理区域尺寸，例如，''%2'' 或 ''%3''" +msgstr "输入的数据无效。输入一个大于 %1 两倍的物理区域尺寸，例如，''%2'' 或 ''%3''" #. error popup text #: src/include/partitioning/ep-lvm-dialogs.rb:167 @@ -3871,8 +3866,7 @@ msgid "" "The name for the logical volume contains illegal characters. Allowed\n" "are alphanumeric characters, \".\", \"_\", \"-\" and \"+\"." -msgstr "" -"逻辑卷名称包含非法字符。允许的字符为字母数字，''.''，''_''，''-'' 和 ''+''。" +msgstr "逻辑卷名称包含非法字符。允许的字符为字母数字，''.''，''_''，''-'' 和 ''+''。" #. error popup text #: src/include/partitioning/ep-lvm-dialogs.rb:197 @@ -3924,8 +3918,7 @@ "<p>Enter the size as well as the number and size\n" "of stripes for the new logical volume. The number of stripes cannot be higher\n" "than the number of physical volumes of the volume group.</p>" -msgstr "" -"<p>为新逻辑卷输入尺寸、分带数和分带尺寸。分带数不能大于卷组的物理卷数。</p>" +msgstr "<p>为新逻辑卷输入尺寸、分带数和分带尺寸。分带数不能大于卷组的物理卷数。</p>" #. helptext #: src/include/partitioning/ep-lvm-dialogs.rb:500 @@ -4800,8 +4793,7 @@ "<p>This view shows devices that have no mount\n" "point assigned to them, disks that are unpartitioned and volume groups that\n" "have no logical volumes.</p>" -msgstr "" -"<p>该视图显示了没有指派挂载点的设备、未分区的磁盘和没有逻辑卷的卷组。</p>" +msgstr "<p>该视图显示了没有指派挂载点的设备、未分区的磁盘和没有逻辑卷的卷组。</p>" #. popup message #: src/include/partitioning/ep-unused.rb:130 @@ -5011,16 +5003,14 @@ msgid "" "<p>After choosing classes for devices you can order the \n" "devices by pressing one of the buttons labeled \"%1\" or \"%2\"." -msgstr "" -"<p>为设备归类之后，您可以通过按带标签 \"%1\" 或 \"%2\" 的按钮来排序设备。" +msgstr "<p>为设备归类之后，您可以通过按带标签 \"%1\" 或 \"%2\" 的按钮来排序设备。" #. dialog help text #: src/modules/DualMultiSelectionBox.rb:351 msgid "" "<b>Sorted</b> puts all devices of class A before all devices\n" "of class B and so on." -msgstr "" -"<b>排序</b>将所有分类为 A 的设备放置到所有分类为 B 的设备之前，诸如此类。" +msgstr "<b>排序</b>将所有分类为 A 的设备放置到所有分类为 B 的设备之前，诸如此类。" #. dialog help text #: src/modules/DualMultiSelectionBox.rb:359 @@ -5808,8 +5798,7 @@ #. TRANSLATORS: error popup #: src/modules/Storage.rb:5176 -msgid "" -"Partitions cannot be created since other partitions on the disk are used." +msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "无法创建分区因为磁盘上的其它分区正在使用中。" #: src/modules/Storage.rb:5202 @@ -5999,8 +5988,7 @@ msgid "" "<b>Bus</b> shows how the device is connected to\n" "the system. This field can be empty, e.g. for multipath disks." -msgstr "" -"<b>总线</b> 显示设备是如何连接到系统的。该字段可以为空，如多路径磁盘即为空。" +msgstr "<b>总线</b> 显示设备是如何连接到系统的。该字段可以为空，如多路径磁盘即为空。" #. helptext for table column and overview entry #: src/modules/StorageFields.rb:239 @@ -6169,8 +6157,7 @@ msgid "" "<b>Parity Algorithm</b> shows the parity\n" "algorithm for RAID devices with RAID type 5, 6 or 10." -msgstr "" -"<b>奇偶校验算法</b> 显示 RAID 类型为 5、6 或 10 的 RAID 设备的奇偶校验算法。" +msgstr "<b>奇偶校验算法</b> 显示 RAID 类型为 5、6 或 10 的 RAID 设备的奇偶校验算法。" #. helptext for table column and overview entry #: src/modules/StorageFields.rb:401 @@ -6210,8 +6197,7 @@ msgid "" "<b>Stripes</b> shows the stripe number for LVM\n" "logical volumes and, if greater than one, the stripe size in parenthesis.\n" -msgstr "" -"<b>分带</b> 显示 LVM 逻辑卷分带数和，若大于一的话，以括号括起的分带尺寸。\n" +msgstr "<b>分带</b> 显示 LVM 逻辑卷分带数和，若大于一的话，以括号括起的分带尺寸。\n" #. helptext for table column and overview entry #: src/modules/StorageFields.rb:439 @@ -6239,8 +6225,7 @@ msgid "" "<b>Used By</b> shows if a device is used by\n" "e.g. RAID or LVM. If not, this column is empty.\n" -msgstr "" -"<b>使用对象</b>显示设备是否由，例如 RAID 或 LVM，使用。若不是，则此列为空。\n" +msgstr "<b>使用对象</b>显示设备是否由，例如 RAID 或 LVM，使用。若不是，则此列为空。\n" #. helptext for table column and overview entry #: src/modules/StorageFields.rb:469 @@ -6500,9 +6485,7 @@ #. enable snapshots for root volume if desired #. penalty for not having separate /home #: src/modules/StorageProposal.rb:4552 src/modules/StorageProposal.rb:5675 -msgid "" -"Resize impossible due to inconsistent file system. Try checking file system " -"under Windows." +msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows." msgstr "由于文件系统不一致，无法调整尺寸。请试试在 Windows 下检查文件系统。" #. TRANSLATORS: checkbox text -- To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org