Author: keichwa
Date: 2014-10-13 09:24:58 +0200 (Mon, 13 Oct 2014)
New Revision: 89993
Modified:
trunk/yast/zh_CN/po/network.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-13 07:24:13 UTC (rev 89992)
+++ trunk/yast/zh_CN/po/network.zh_CN.po 2014-10-13 07:24:58 UTC (rev 89993)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-18 11:54+0000\n"
+"POT-Creation-Date: 2014-10-10 11:10+0200\n"
"PO-Revision-Date: 2014-08-23 02:08+0800\n"
"Last-Translator: 玛格丽特 · 苏 \n"
"Language-Team: Chinese Simplified \n"
@@ -97,45 +97,35 @@
msgstr "正在写入防火墙配置..."
#. Proposal title
-#: src/clients/firewall_stage1_proposal.rb:133
+#: src/clients/firewall_stage1_proposal.rb:137
msgid "Firewall and SSH"
msgstr "防火墙和 SSH"
#. Menu entry label
-#: src/clients/firewall_stage1_proposal.rb:135
+#: src/clients/firewall_stage1_proposal.rb:139
msgid "&Firewall and SSH"
msgstr "防火墙和 SSH(&F)"
-#: src/clients/firewall_stage1_proposal.rb:146
+#: src/clients/firewall_stage1_proposal.rb:152
msgid "Basic Firewall and SSH Configuration"
msgstr "基本防火墙和 SSH 配置"
-#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:152
-msgid "Open &VNC Ports"
-msgstr "打开 &VNC 端口"
-
#. frame label
-#: src/clients/firewall_stage1_proposal.rb:160
+#: src/clients/firewall_stage1_proposal.rb:157
msgid "Firewall and SSH service"
msgstr "防火墙和 SSH 服务"
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:171
+#: src/clients/firewall_stage1_proposal.rb:168
msgid "Enable Firewall"
msgstr "启用防火墙"
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:179
-msgid "Open SSH Port"
-msgstr "打开 SSH 端口"
-
-#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:187
+#: src/clients/firewall_stage1_proposal.rb:177
msgid "Enable SSH Service"
msgstr "启用 SSH 服务"
-#: src/clients/firewall_stage1_proposal.rb:199
+#: src/clients/firewall_stage1_proposal.rb:191
msgid ""
"<p><b><big>Firewall and SSH</big></b><br>\n"
"Firewall is a defensive mechanism that protects your computer from network attacks.\n"
@@ -146,13 +136,13 @@
"防火墙是保护您的计算机免受网络攻击的防御机制。\n"
"SSH 是允许通过专用 SSH 客户端远程登入此计算机的服务。</p>"
-#: src/clients/firewall_stage1_proposal.rb:205
+#: src/clients/firewall_stage1_proposal.rb:197
msgid ""
"<p>Here you can choose whether the firewall will be enabled or disabled after\n"
"the installation. It is recommended to keep it enabled.</p>"
msgstr "<p>在此您可以选择在安装后启用或禁用防火墙。推荐保持启用。</p>"
-#: src/clients/firewall_stage1_proposal.rb:208
+#: src/clients/firewall_stage1_proposal.rb:200
msgid ""
"<p>With enabled firewall, you can decide whether to open firewall port for SSH\n"
"service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n"
@@ -162,7 +152,7 @@
"另外您也可以决定是否启用 SSH 服务(即，它将在计算机引导时启动)。</p>"
#. TRANSLATORS: help text
-#: src/clients/firewall_stage1_proposal.rb:215
+#: src/clients/firewall_stage1_proposal.rb:207
msgid ""
"<p>You can also open VNC ports in firewall. It will not enable\n"
"the remote administration service on a running system but it is\n"
@@ -173,36 +163,49 @@
#. anything but enabling the firewall closes this dialog
#. (VNC and SSH checkboxes do nothing)
-#: src/clients/firewall_stage1_proposal.rb:292
+#: src/clients/firewall_stage1_proposal.rb:278
msgid "Firewall will be enabled (disable</a>)"
msgstr "将启用防火墙 (禁用</a>)"
-#: src/clients/firewall_stage1_proposal.rb:296
+#: src/clients/firewall_stage1_proposal.rb:282
msgid "Firewall will be disabled (enable</a>)"
msgstr "将禁用防火墙 (启用</a>)"
-#: src/clients/firewall_stage1_proposal.rb:301
+#: src/clients/firewall_stage1_proposal.rb:287
msgid "SSH service will be enabled (disable</a>)"
msgstr "将启用 SSH 服务 (禁用</a>)"
-#: src/clients/firewall_stage1_proposal.rb:305
+#: src/clients/firewall_stage1_proposal.rb:291
msgid "SSH service will be disabled (enable</a>)"
msgstr "将禁用 SSH 服务 (启用</a>)"
-#. Display vnc port only if installing over VNC
-#: src/clients/firewall_stage1_proposal.rb:317
+#. TRANSLATORS: check-box label
+#: src/clients/firewall_stage1_proposal.rb:307
+msgid "Open SSH Port"
+msgstr "打开 SSH 端口"
+
+#. TRANSLATORS: check-box label
+#: src/clients/firewall_stage1_proposal.rb:321
+msgid "Open &VNC Ports"
+msgstr "打开 &VNC 端口"
+
+#. Show VNC port only if installing over VNC
+#: src/clients/firewall_stage1_proposal.rb:339
msgid "VNC ports will be open (close</a>)"
msgstr "将打开 VNC 端口 (关闭</a>)"
-#: src/clients/firewall_stage1_proposal.rb:319
+#: src/clients/firewall_stage1_proposal.rb:341
msgid "VNC ports will be blocked (open</a>)"
msgstr "将屏蔽 VNC 端口 (打开</a>)"
-#: src/clients/firewall_stage1_proposal.rb:324
+#. Returns the SSH-port part of the firewall proposal description
+#. Returns nil if this part should be skipped
+#. @return [String] proposal html text
+#: src/clients/firewall_stage1_proposal.rb:352
msgid "SSH port will be open (block</a>)"
msgstr "将打开 SSH 端口 (屏蔽</a>)"
-#: src/clients/firewall_stage1_proposal.rb:328
+#: src/clients/firewall_stage1_proposal.rb:354
msgid "SSH port will be blocked (open</a>)"
msgstr "将屏蔽 SSH 端口 (打开</a>)"
@@ -675,7 +678,7 @@
msgid "Device"
msgstr "设备"
-#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:416
+#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:417
msgid "Options"
msgstr "选项"
@@ -744,13 +747,13 @@
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1361
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1356
msgid "Warning: no encryption is used."
msgstr "警告：未使用加密。"
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1358
msgid "Change."
msgstr "修改。"
@@ -1109,14 +1112,14 @@
#. ComboBox label
#. ComboBox label
#: src/include/network/lan/address.rb:155
-#: src/include/network/lan/hardware.rb:367
+#: src/include/network/lan/hardware.rb:369
msgid "&Device Type"
msgstr "设备类型(&D)"
#. ComboBox label
#. TextEntry label
#: src/include/network/lan/address.rb:174
-#: src/include/network/lan/hardware.rb:353
+#: src/include/network/lan/hardware.rb:355
msgid "&Configuration Name"
msgstr "配置名称(&C)"
@@ -1710,7 +1713,7 @@
#. it is basically useful if user aborts dialog and he has done some
#. changes already. Calling this function may results in confirmation
#. popup.
-#: src/include/network/lan/complex.rb:523
+#: src/include/network/lan/complex.rb:526
msgid "Network Settings"
msgstr "网络设置"
@@ -1737,7 +1740,7 @@
msgstr "通过 DHCP 修改默认路由"
#. Manual network card setup help 1/4
-#: src/include/network/lan/hardware.rb:81
+#: src/include/network/lan/hardware.rb:83
msgid ""
"<p>Set up hardware-specific options for \n"
"your network device here.</p>\n"
@@ -1745,13 +1748,13 @@
#. Manual network card setup help 2/4
#. translators: do not translated udev, MAC, BusID
-#: src/include/network/lan/hardware.rb:90
+#: src/include/network/lan/hardware.rb:92
msgid ""
"<p><b>Device Type</b>. Various device types are available, select \n"
"one according your needs.</p>"
msgstr "<p><b>设备类型</b>。根据您的需要从多种可用设备类型中择一。</p>"
-#: src/include/network/lan/hardware.rb:98
+#: src/include/network/lan/hardware.rb:100
msgid ""
"<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n"
"associating the MAC address or BusID of the network device with its name (for\n"
@@ -1761,7 +1764,7 @@
"它允许把网络设备的 MAC 地址或者 BusID 与其名称(例如，eth1, wlan0 ) 相关联，\n"
"并保证了重启后设备名称的一致。\n"
-#: src/include/network/lan/hardware.rb:104
+#: src/include/network/lan/hardware.rb:106
msgid ""
"<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n"
"Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n"
@@ -1772,7 +1775,7 @@
"</p>"
#. Manual network card setup help 2/4
-#: src/include/network/lan/hardware.rb:117
+#: src/include/network/lan/hardware.rb:119
msgid ""
"<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n"
"for your network device here. If the device is already configured, see if there is more than one driver available for\n"
@@ -1783,7 +1786,7 @@
"若有必要，从列表中选择一个驱动，但通常默认值就可以。</p>\n"
#. Manual networ card setup help 3/4
-#: src/include/network/lan/hardware.rb:124
+#: src/include/network/lan/hardware.rb:126
msgid ""
"<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
"format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
@@ -1793,12 +1796,12 @@
"使用此格式：<i>选项</i>=<i>值</i>。每项之间以空格分隔，例如 <i>io=0x300 irq=5</i>。\n"
"<b>注意：</b>若用同一个模块名称配置了两块网卡，则保存时将合并这些选项。</p>\n"
-#: src/include/network/lan/hardware.rb:130
+#: 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"
#. Manual dialog help 4/4
-#: src/include/network/lan/hardware.rb:139
+#: src/include/network/lan/hardware.rb:141
msgid ""
"<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n"
"If you have a <b>USB</b> network card, select USB.</p>\n"
@@ -1808,92 +1811,91 @@
#. overwrite help
#. Manual dialog help 5/4
-#: src/include/network/lan/hardware.rb:148
+#: src/include/network/lan/hardware.rb:150
msgid ""
"<p>Here, set up your networking device. The values will be\n"
"written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
msgstr "<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/chandev.conf</i>。</p>\n"
#. Manual dialog help 6/4
-#: src/include/network/lan/hardware.rb:152
+#: src/include/network/lan/hardware.rb:154
msgid ""
"<p>Options for the module should be written in the format specified\n"
"in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"
msgstr "<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>"
#. Manual dialog caption
-#: src/include/network/lan/hardware.rb:269
+#: src/include/network/lan/hardware.rb:271
msgid "Manual Network Card Configuration"
msgstr "手动网卡配置"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:282
+#: src/include/network/lan/hardware.rb:284
msgid "&PCMCIA"
msgstr "&PCMCIA"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:291
+#: src/include/network/lan/hardware.rb:293
msgid "&USB"
msgstr "&USB"
#. ComboBox label
-#: src/include/network/lan/hardware.rb:300
+#: src/include/network/lan/hardware.rb:302
msgid "&Hotplug Type"
msgstr "热插拔类型(&H)"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:305
+#: src/include/network/lan/hardware.rb:307
msgid "P&CI"
msgstr "P&CI"
#. #116211 - allow user to change modules from list
#. Frame label
-#: src/include/network/lan/hardware.rb:317
+#: src/include/network/lan/hardware.rb:319
msgid "&Kernel Module"
msgstr "内核模块(&K)"
#. Text entry label
-#: src/include/network/lan/hardware.rb:327
+#: src/include/network/lan/hardware.rb:329
msgid "&Module Name"
msgstr "模块名称(&M)"
-#. TODO: Ud ... Rules
-#: src/include/network/lan/hardware.rb:382
+#: src/include/network/lan/hardware.rb:383
msgid "Udev Rules"
msgstr "Udev 规则"
-#: src/include/network/lan/hardware.rb:384
+#: src/include/network/lan/hardware.rb:385
msgid "Device Name"
msgstr "设备名称"
-#: src/include/network/lan/hardware.rb:385
+#: src/include/network/lan/hardware.rb:386
msgid "Change"
msgstr "修改"
-#: src/include/network/lan/hardware.rb:396
+#: src/include/network/lan/hardware.rb:397
msgid "Show Visible Port Identification"
msgstr "显示可见端口标识"
#. translators: how many seconds will card be blinking
-#: src/include/network/lan/hardware.rb:401
+#: src/include/network/lan/hardware.rb:402
msgid "Seconds"
msgstr "秒"
-#: src/include/network/lan/hardware.rb:406
+#: src/include/network/lan/hardware.rb:407
msgid "Blink"
msgstr "闪烁"
-#: src/include/network/lan/hardware.rb:411
+#: src/include/network/lan/hardware.rb:412
msgid "Ethtool Options"
msgstr "Ethtool 选项"
#. Manual selection caption
-#: src/include/network/lan/hardware.rb:491
+#: src/include/network/lan/hardware.rb:492
msgid "Manual Network Card Selection"
msgstr "手动网卡选择"
#. Manual selection help
-#: src/include/network/lan/hardware.rb:494
+#: src/include/network/lan/hardware.rb:495
msgid ""
"<p>Select the network card to configure. Search\n"
"for a particular network card by entering the name in the search entry.</p>"
@@ -1901,19 +1903,18 @@
#. Selection box label
#. Selection box title
-#: src/include/network/lan/hardware.rb:504
-#: src/include/network/lan/hardware.rb:559
+#: src/include/network/lan/hardware.rb:505
+#: src/include/network/lan/hardware.rb:560
msgid "&Network Card"
msgstr "网卡(&N)"
#. Text entry field
-#: src/include/network/lan/hardware.rb:508
+#: src/include/network/lan/hardware.rb:509
msgid "&Search"
msgstr "搜索(&S)"
-#. Remember current device number (#308763)
-#. see also bnc#391802
-#: src/include/network/lan/hardware.rb:824
+#. bnc#767946
+#: src/include/network/lan/hardware.rb:819
msgid ""
"Configuration name %1 already exists.\n"
"Choose a different one."
@@ -1922,7 +1923,7 @@
"请选择一个不同的名称。"
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:868
+#: src/include/network/lan/hardware.rb:874
msgid "S/390 Network Card Configuration"
msgstr "S/390 网卡配置"
@@ -1930,131 +1931,131 @@
#. Frame label
#. Frame label
#. Frame label
-#: src/include/network/lan/hardware.rb:888
-#: src/include/network/lan/hardware.rb:990
-#: src/include/network/lan/hardware.rb:1057
-#: src/include/network/lan/hardware.rb:1094
+#: src/include/network/lan/hardware.rb:894
+#: src/include/network/lan/hardware.rb:996
+#: src/include/network/lan/hardware.rb:1063
+#: src/include/network/lan/hardware.rb:1100
msgid "S/390 Device Settings"
msgstr "S/390 设备设置"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:898
+#: src/include/network/lan/hardware.rb:904
msgid "&Port Name"
msgstr "端口名称(&P)"
-#: src/include/network/lan/hardware.rb:903
+#: src/include/network/lan/hardware.rb:909
msgid "Port Number"
msgstr "端口号"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:917
+#: src/include/network/lan/hardware.rb:923
msgid "&Enable IPA Takeover"
msgstr "启用 IPA 接管(&E)"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:924
+#: src/include/network/lan/hardware.rb:930
msgid "Enable &Layer 2 Support"
msgstr "启用第 2 层支持(&L)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:931
+#: src/include/network/lan/hardware.rb:937
msgid "Layer2 &MAC Address"
msgstr "第 2 层 MAC 地址(&M)"
-#: src/include/network/lan/hardware.rb:939
-#: src/include/network/lan/hardware.rb:1015
-#: src/include/network/lan/hardware.rb:1069
+#: src/include/network/lan/hardware.rb:945
+#: src/include/network/lan/hardware.rb:1021
+#: src/include/network/lan/hardware.rb:1075
msgid "Read Channel"
msgstr "读取通道"
-#: src/include/network/lan/hardware.rb:945
-#: src/include/network/lan/hardware.rb:1021
-#: src/include/network/lan/hardware.rb:1075
+#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1081
msgid "Write Channel"
msgstr "写入通道"
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:957
msgid "Control Channel"
msgstr "控制通道"
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:962
+#: src/include/network/lan/hardware.rb:968
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>输入此接口的<b>端口名称</b>(大小写敏感)。</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:966
+#: src/include/network/lan/hardware.rb:972
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:969
+#: 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>"
msgstr "<p>若应为此接口启用 IP 地址接管，请选择<b>启用 IPA 接管</b>。</p>"
-#: src/include/network/lan/hardware.rb:972
+#: 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>"
msgstr "<p>若此卡已配置了第 2 层支持，请选择<b>启用第 2 层支持</b>。</p>"
-#: src/include/network/lan/hardware.rb:975
+#: 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>"
msgstr "<p>若此卡已配置了第 2 层支持，请输入<b>第 2 层 MAC 地址</b>。</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1005
msgid "&Port Number"
msgstr "端口号(&P)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1007
+#: src/include/network/lan/hardware.rb:1013
msgid "&LANCMD Time-Out"
msgstr "&LANCMD 超时"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1032
+#: src/include/network/lan/hardware.rb:1038
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>选择此接口的<b>端口号</b>。</p>"
-#: src/include/network/lan/hardware.rb:1033
+#: src/include/network/lan/hardware.rb:1039
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>为此接口指定 <b>LANCMD 超时</b>。</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1038
+#: src/include/network/lan/hardware.rb:1044
msgid "Compatibility Mode"
msgstr "兼容模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1040
+#: src/include/network/lan/hardware.rb:1046
msgid "Extended Mode"
msgstr "扩展模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1042
+#: src/include/network/lan/hardware.rb:1048
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "基于 CTC 的控制台 (Linux 到 Linux 连接)"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1044
+#: src/include/network/lan/hardware.rb:1050
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "OS/390 和 z/OS 兼容模式"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1063
+#: src/include/network/lan/hardware.rb:1069
msgid "&Protocol"
msgstr "协议(&P)"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1086
+#: src/include/network/lan/hardware.rb:1092
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>选择此接口的<b>协议</b>。</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1103
+#: src/include/network/lan/hardware.rb:1109
msgid "&Peer Name"
msgstr "对等点名称(&P)"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1114
+#: src/include/network/lan/hardware.rb:1120
msgid ""
"<p>Enter the name of the IUCV peer,\n"
"for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
@@ -2063,7 +2064,7 @@
"例如，要连接的 z/VM 用户名 (大小写敏感)。</p>\n"
#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1238
+#: src/include/network/lan/hardware.rb:1244
msgid ""
"An error occurred while creating device.\n"
"See YaST log for details."
@@ -2073,7 +2074,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1260
+#: src/include/network/lan/hardware.rb:1266
msgid "Hardware Dialog"
msgstr "硬件对话框"
@@ -2114,7 +2115,7 @@
"按<b>中止</b>可中止保存。</p>\n"
#. Network setup method help
-#. NetworkManager and ifup are programs
+#. NetworkManager and wicked are programs
#: src/include/network/lan/help.rb:51
msgid ""
"<p><b><big>Network Setup Method</big></b></p>\n"
@@ -2126,9 +2127,7 @@
"<p>使用 <b>NetworkManager</b> 桌面挂件管理全部接口的连接。\n"
"它很适合于要在有线和无线网络间切换的场景。</p>\n"
-#. Network setup method help
-#. NetworkManager and wicked are programs
-#: src/include/network/lan/help.rb:59
+#: src/include/network/lan/help.rb:57
msgid ""
"<p>Use <b>wicked</b> if you do not run a desktop environment\n"
"or need to use multiple interfaces at the same time.</p>\n"
@@ -2136,8 +2135,17 @@
"<p>若您未运行桌面环境或需要同时使用多个接口，\n"
"请使用<b>怪兽方法</b>。</p>\n"
-#: src/include/network/lan/help.rb:63
+#. For systems not including NetworkManager by default (bnc#892678)
+#: src/include/network/lan/help.rb:62
msgid ""
+"<p><b>NetworkManager</b> is not part of every base\n"
+"installation repository. For example, to enable it on SUSE\n"
+"Linux Enterprise Server add the Workstation Extension\n"
+"repository and install the 'NetworkManager' package.</p>\n"
+msgstr ""
+
+#: src/include/network/lan/help.rb:68
+msgid ""
"<p><b><big>Network Card Overview</big></b><br>\n"
"Obtain an overview of installed network cards. Additionally,\n"
"edit their configuration.<br></p>\n"
@@ -2146,7 +2154,7 @@
"获得已安装网卡的概览。\n"
"此外，还可编辑其配置。<br></p>\n"
-#: src/include/network/lan/help.rb:68
+#: src/include/network/lan/help.rb:73
msgid ""
"<p><b><big>Adding a Network Card:</big></b><br>\n"
"Press <b>Add</b> to configure a new network card manually.</p>\n"
@@ -2154,7 +2162,7 @@
"<p><b><big>添加网卡：</big></b><br>\n"
"按<b>添加</b>手动配置新网卡。</p>\n"
-#: src/include/network/lan/help.rb:71
+#: src/include/network/lan/help.rb:76
msgid ""
"<p><b><big>Configuring or Deleting:</big></b><br>\n"
"Choose a network card to change or remove.\n"
@@ -2165,7 +2173,7 @@
"然后分别按<b>编辑</b>或<b>删除</b>。</p>\n"
#. IPv6 help
-#: src/include/network/lan/help.rb:78
+#: src/include/network/lan/help.rb:83
msgid ""
"<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
"<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
@@ -2180,12 +2188,12 @@
"要禁用 IPv6，请反选此选项。这将屏蔽 ipv6 内核模块。\n"
"若您的网络未使用 ipv6 协议，这样做响应时间会更短。</p>\n"
-#: src/include/network/lan/help.rb:86
+#: src/include/network/lan/help.rb:91
msgid "<p>All changes will be applied after reboot.</p>"
msgstr "<p>全部修改都将在重启后应用。</p>"
#. Routing dialog help 1/2
-#: src/include/network/lan/help.rb:89
+#: src/include/network/lan/help.rb:94
msgid ""
"<p>The routing can be set up in this dialog.\n"
"The <b>Default Gateway</b> matches every possible destination, but poorly. \n"
@@ -2198,7 +2206,7 @@
"若存在任何其它匹配要求地址的项，则将使用该项而不使用默认路由。\n"
"设计默认路由的目的只是为了提供一个 \"万一没有目的地时的目的地\"。</p>\n"
-#: src/include/network/lan/help.rb:96
+#: src/include/network/lan/help.rb:101
msgid ""
"<p>For each route, enter destination network IP address, gateway address,\n"
"and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
@@ -2210,13 +2218,13 @@
"\"-\" 表示任何接口。</p>\n"
#. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:102
+#: src/include/network/lan/help.rb:107
msgid ""
"<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
msgstr "<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网络)。\n"
-#: src/include/network/lan/help.rb:106
+#: src/include/network/lan/help.rb:111
msgid ""
"<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2226,7 +2234,7 @@
"<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网络)。\n"
"<b>警告：</b>IPv6 转发将禁用自动配置 IPv6 无状态地址(SLAAC)。"
-#: src/include/network/lan/help.rb:112
+#: src/include/network/lan/help.rb:117
msgid ""
"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
"You should enable masquerading and/or set at least one redirect rule in the\n"
@@ -2236,7 +2244,7 @@
"您应该启用伪装和/或在防火墙配置中设置至少一条重定向规则。\n"
"请使用 YaST 防火墙模块。</p>\n"
-#: src/include/network/lan/help.rb:117
+#: src/include/network/lan/help.rb:122
msgid ""
"<p>If you are using DHCP to get an IP address, check whether you get\n"
"also a hostname via DHCP. The hostname will be set automatically by the DHCP client.\n"
@@ -2250,7 +2258,7 @@
"因此，若您要连接到指派了不同主机名的不同网络，请禁用此选项。\n"
"</p>"
-#: src/include/network/lan/help.rb:124
+#: src/include/network/lan/help.rb:129
msgid ""
"<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
@@ -2262,7 +2270,7 @@
"若您想要在任何情况下都能解析主机名，即使在没有活动网络的情况下也能，那么这是一个有用的选项。\n"
"在其它任何情况下，请谨慎使用之，尤其是当此计算机提供了一些网络服务时。</p>\n"
-#: src/include/network/lan/help.rb:131
+#: src/include/network/lan/help.rb:136
msgid ""
"<p>Enter the name servers and domain search list for resolving \n"
"hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2271,7 +2279,7 @@
"通常它们可由 DHCP 获得。</p>\n"
#. resolver dialog help
-#: src/include/network/lan/help.rb:135
+#: src/include/network/lan/help.rb:140
msgid ""
"<p>A name server is a computer that translates hostnames into\n"
"IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2282,7 +2290,7 @@
"(例如 192.168.0.42)，而不是主机名。</p>\n"
#. resolver dialog help
-#: src/include/network/lan/help.rb:141
+#: src/include/network/lan/help.rb:146
msgid ""
"<p>Search domain is the domain name where hostname searching starts.\n"
"The primary search domain is usually the same as the domain name of\n"
@@ -2293,7 +2301,7 @@
"主搜索域通常与您计算机的域名称 (例如 suse.de) 相同。\n"
"还可能有额外的搜索域 (诸如 suse.com)。请用逗号或空格分隔这些域。</p>\n"
-#: src/include/network/lan/help.rb:147
+#: src/include/network/lan/help.rb:152
msgid ""
"<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
"(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
@@ -2303,7 +2311,7 @@
"<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 <i>marguerite.su</i>)。\n"
"若此计算机是一个邮件服务器，那么域尤其关键。您可以使用 <i>hostname</i> 命令查看您计算机的主机名。</p>"
-#: src/include/network/lan/help.rb:153
+#: src/include/network/lan/help.rb:158
msgid ""
"<p>Select the way how the DNS configuration will be modified (name servers,\n"
"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
@@ -2316,7 +2324,7 @@
"通常由 <i>netconfig</i> 脚本处理，该脚本会合并静态定义的数据和动态获得的数据 (例如，从 DHCP 客户端、NetworkManager 等)。\n"
"这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n"
-#: src/include/network/lan/help.rb:161
+#: src/include/network/lan/help.rb:166
msgid ""
"<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
"allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2334,7 +2342,7 @@
#. Address dialog help 1-6/8: dynamic address preferred
#. Address dialog help 1/8
-#: src/include/network/lan/help.rb:174
+#: src/include/network/lan/help.rb:179
msgid ""
"<p><b><big>Address Setup</big></b></p>\n"
"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
@@ -2344,19 +2352,19 @@
"<p>若您不想为此设备指派一个 IP 地址，则请选择<b>无地址设置</b>。\n"
"这在绑定以太网设备时特别有用。</p>\n"
-#: src/include/network/lan/help.rb:179
+#: 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"
msgstr "<p>若您想要保留在 BIOS 中配置的网络，请勾选 <b>iBFT</b>。</p>\n"
#. Address dialog help 2/8
-#: src/include/network/lan/help.rb:183
+#: src/include/network/lan/help.rb:188
msgid ""
"<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
"assigned by the system administrator or your Internet provider.</p>\n"
msgstr "<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址，请选择<b>动态地址</b>。</p>\n"
#. Address dialog help 3/8
-#: src/include/network/lan/help.rb:187
+#: src/include/network/lan/help.rb:192
msgid ""
"<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
"if you have a DHCP server running on your local network. Network addresses \n"
@@ -2367,7 +2375,7 @@
"之后将自动从服务器获得网络地址。</p>\n"
#. Address dialog help 4/8
-#: src/include/network/lan/help.rb:193
+#: src/include/network/lan/help.rb:198
msgid ""
"<p>To search for an IP address and assign it statically, select \n"
"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
@@ -2378,7 +2386,7 @@
"否则，必须<b>静态</b>指派网络地址。</p>\n"
#. Address dialog help 5/8
-#: src/include/network/lan/help.rb:199
+#: src/include/network/lan/help.rb:204
msgid ""
"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
" <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2388,7 +2396,7 @@
"和对等点的<b>远程 IP 地址</b> (例如，<tt>192.168.100.254</tt>)。</p>\n"
#. Address dialog help 6/8
-#: src/include/network/lan/help.rb:205
+#: src/include/network/lan/help.rb:210
msgid ""
"<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
@@ -2399,13 +2407,13 @@
"输入一个完全限定主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n"
#. Address dialog help 8/8
-#: src/include/network/lan/help.rb:211
+#: src/include/network/lan/help.rb:216
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
msgstr "<p>有关网络配置的更多信息，请垂询您的<b>网络管理员</b>。</p>"
-#: src/include/network/lan/help.rb:214
+#: src/include/network/lan/help.rb:219
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
@@ -2413,7 +2421,7 @@
"<p>此产品不推荐 DHCP 配置。\n"
"此产品的组件可能无法与 DHCP 协作。</p>"
-#: src/include/network/lan/help.rb:217
+#: src/include/network/lan/help.rb:222
msgid ""
"<p><b><big>Firewall Zone</big></b></p>\n"
"<p>Select the firewall zone to put the interface into. If you\n"
@@ -2431,11 +2439,11 @@
"若您未选择区域且不存在其它位于此防火墙中的接口，\n"
"则将禁用防火墙。</p>"
-#: src/include/network/lan/help.rb:226
+#: 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>"
msgstr "<p><b>必备接口</b>指定了若引导时接口未能启动，网络服务是否报告失败。</p>"
-#: src/include/network/lan/help.rb:229
+#: src/include/network/lan/help.rb:234
msgid ""
"<p><b><big>Maximum Transfer Unit</big></b></p>\n"
"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2449,7 +2457,7 @@
"通常，您不需要设置 MTU，但使用较小的 MTU 或许会改善网络性能，尤其是在慢速拨号连接下。\n"
"您可从推荐值中择一，或定义另一个值。</p>\n"
-#: src/include/network/lan/help.rb:237
+#: src/include/network/lan/help.rb:242
msgid ""
"<p>Select the slave devices for the bond device.\n"
"Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
@@ -2458,12 +2466,12 @@
"只有设备激活设为<b>从不</b>和设置了<b>无地址设置</b>的设备才可用。</p>"
#. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:242
+#: src/include/network/lan/help.rb:247
msgid "<p><b><big>DHCP Client Options</big></b></p>"
msgstr "<p><b><big>DHCP 客户端选项</big></b></p>"
#. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:244
+#: src/include/network/lan/help.rb:249
msgid ""
"<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
"the hardware address of the network interface. It must be different for each\n"
@@ -2477,7 +2485,7 @@
"请在此指定一个唯一的格式自由的标识符。</p>"
#. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:252
+#: src/include/network/lan/help.rb:257
msgid ""
"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
"hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
@@ -2495,7 +2503,7 @@
"若您不想要发送主机名，请将该字段留空。</p>\n"
#. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:264
+#: src/include/network/lan/help.rb:269
msgid ""
"<p><b><big>Additional Addresses</big></b></p>\n"
"<p>Configure additional addresses of an interface in this table.</p>\n"
@@ -2504,14 +2512,14 @@
"<p>在此表中配置接口的附加地址。</p>\n"
#. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:268
+#: src/include/network/lan/help.rb:273
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
msgstr "<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</p>"
#. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:272
+#: src/include/network/lan/help.rb:277
msgid ""
"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n"
" length of interface name (inclusive of the colon and label) is\n"
@@ -2521,14 +2529,14 @@
"接口名全长 (包括冒号和标签) 的限制为 15 个字符，并且过时的 ifconfig 工具会把它截断为 9 个字符。</p>"
#. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:278
+#: 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>"
#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
#. Translators: dialog help
-#: src/include/network/lan/help.rb:284
+#: src/include/network/lan/help.rb:289
msgid ""
"<p>Choose between three <b>Key Input Types</b> for your key.\n"
"<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2555,14 +2563,14 @@
"</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:299
+#: src/include/network/lan/help.rb:304
msgid ""
"<p>Here, set the most important settings\n"
"for wireless networking.</p>"
msgstr "<p>在此设置无线联网最重要的设置。</p>"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:303
+#: src/include/network/lan/help.rb:308
msgid ""
"<p>The <b>Operating Mode</b> depends on the network topology. The mode\n"
"can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
@@ -2576,7 +2584,7 @@
"或<b>主控</b> (网卡作为访问点使用)。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:311
+#: src/include/network/lan/help.rb:316
msgid ""
"<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
"cells that are part of the same virtual network. All stations in a\n"
@@ -2593,7 +2601,7 @@
"在此情况下，您的 WLAN 卡将关联到信号强度最好的访问点。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:321
+#: src/include/network/lan/help.rb:326
msgid ""
"<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
"It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2627,7 +2635,7 @@
"只有在运行模式为 <b>受管</b> 时才能这样做。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:340
+#: src/include/network/lan/help.rb:345
msgid ""
"<p>To use WEP, enter the\n"
"WEP encryption key to use. It can have a key\n"
@@ -2639,7 +2647,7 @@
"在这些密钥中，有 24 位是动态生成的，所以您只需输入 40 到 232 位。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:348
+#: src/include/network/lan/help.rb:353
msgid ""
"<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
"enter the preshared key. This\n"
@@ -2655,7 +2663,7 @@
"请不要使用易猜出的词作为密码短语。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:357
+#: src/include/network/lan/help.rb:362
msgid ""
"<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
"enter some additional parameters in the next dialog.</p>\n"
@@ -2664,7 +2672,7 @@
"请在下一个对话框中输入一些额外参数。</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:361
+#: src/include/network/lan/help.rb:366
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -3281,12 +3289,12 @@
msgstr "远程管理设置"
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:155
msgid "These packages need to be installed:"
msgstr "需要安装这些软件包："
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:173
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3301,72 +3309,72 @@
#. Translators: Appended after a network card name to indicate that
#. there is no carrier, no link to the network, the cable is not
#. plugged in. Preferably a short string.
-#: src/include/network/routines.rb:254
+#: src/include/network/routines.rb:265
msgid "unplugged"
msgstr "拔出"
#. Table field (Unknown device)
-#: src/include/network/routines.rb:260
+#: src/include/network/routines.rb:271
msgid "Unknown"
msgstr "未知"
#. Popup headline
-#: src/include/network/routines.rb:288
+#: src/include/network/routines.rb:299
msgid "Configuration Successfully Saved"
msgstr "已成功保存配置"
#. Popup headline
-#: src/include/network/routines.rb:293
+#: src/include/network/routines.rb:304
msgid "DNS Configuration Successfully Saved"
msgstr "已成功保存 DNS 配置"
#. Popup headline
-#: src/include/network/routines.rb:295
+#: src/include/network/routines.rb:306
msgid "DSL Configuration Successfully Saved"
msgstr "已成功保存 DSL 配置"
#. Popup headline
-#: src/include/network/routines.rb:297
+#: src/include/network/routines.rb:308
msgid "Hosts Configuration Successfully Saved"
msgstr "已成功保存主机配置"
#. Popup headline
-#: src/include/network/routines.rb:301
+#: src/include/network/routines.rb:312
msgid "ISDN Configuration Successfully Saved"
msgstr "已成功保存 ISDN 配置"
#. Popup headline
-#: src/include/network/routines.rb:305
+#: src/include/network/routines.rb:316
msgid "Network Card Configuration Successfully Saved"
msgstr "已成功保存网卡配置"
#. Popup headline
-#: src/include/network/routines.rb:309
+#: src/include/network/routines.rb:320
msgid "Modem Configuration Successfully Saved"
msgstr "已成功保存调制解调器配置"
#. Popup headline
-#: src/include/network/routines.rb:313
+#: src/include/network/routines.rb:324
msgid "Proxy Configuration Successfully Saved"
msgstr "已成功保存代理配置"
#. Popup headline
-#: src/include/network/routines.rb:317
+#: src/include/network/routines.rb:328
msgid "Provider Configuration Successfully Saved"
msgstr "已成功保存服务提供商配置"
#. Popup headline
-#: src/include/network/routines.rb:321
+#: src/include/network/routines.rb:332
msgid "Routing Configuration Successfully Saved"
msgstr "已成功保存路由配置"
#. Popup text
-#: src/include/network/routines.rb:330
+#: src/include/network/routines.rb:341
msgid "Configure mail now?"
msgstr "现在配置邮件吗？"
#. Popup text
-#: src/include/network/routines.rb:335
+#: src/include/network/routines.rb:346
msgid "Run configuration of %1?"
msgstr "运行 %1 的配置吗？"
@@ -3376,7 +3384,7 @@
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1008
+#: src/include/network/routines.rb:1019
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
@@ -3385,26 +3393,26 @@
"YaST 无法配置某些选项。"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1067
+#: src/include/network/routines.rb:1078
msgid "Network Cards"
msgstr "网卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1071
+#: src/include/network/routines.rb:1082
msgid "Modems"
msgstr "调制解调器"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1075
+#: src/include/network/routines.rb:1086
msgid "ISDN Cards"
msgstr "ISDN 卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1079
+#: src/include/network/routines.rb:1090
msgid "DSL Devices"
msgstr "DSL 设备"
-#: src/include/network/routines.rb:1084
+#: src/include/network/routines.rb:1095
msgid "All Network Devices"
msgstr "全部网络设备"
@@ -3964,94 +3972,94 @@
msgstr "由于是桥接网络，YaST2 需要重启网络以应用设置。"
#. Opens dialog for editing NIC name
-#: src/lib/network/edit_nic_name.rb:95
+#: src/lib/network/edit_nic_name.rb:97
msgid "Device Name:"
msgstr "设备名称："
-#: src/lib/network/edit_nic_name.rb:101
+#: src/lib/network/edit_nic_name.rb:103
msgid "Base Udev Rule On"
msgstr "将 udev 规则基于"
#. make sure there is enough space (#367239)
-#: src/lib/network/edit_nic_name.rb:110
+#: src/lib/network/edit_nic_name.rb:112
msgid "MAC address: %s"
msgstr "MAC 地址：%s"
-#: src/lib/network/edit_nic_name.rb:116
+#: src/lib/network/edit_nic_name.rb:118
msgid "BusID: %s"
msgstr "BusID：%s"
#. check if the name is assigned to another device already
-#: src/lib/network/edit_nic_name.rb:153
+#: src/lib/network/edit_nic_name.rb:155
msgid "Configuration name already exists."
msgstr "配置名称已存在。"
-#: src/lib/network/edit_nic_name.rb:157
+#: src/lib/network/edit_nic_name.rb:159
msgid "Invalid configuration name."
msgstr "无效配置文件名称。"
#. Progress stage 1
-#: src/modules/DNS.rb:371
+#: src/modules/DNS.rb:390
msgid "Write hostname"
msgstr "写入主机名"
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:373 src/modules/Lan.rb:535
+#: src/modules/DNS.rb:392 src/modules/Lan.rb:535
msgid "Update configuration"
msgstr "更新配置"
#. Progress stage 3
-#: src/modules/DNS.rb:375
+#: src/modules/DNS.rb:394
msgid "Update /etc/resolv.conf"
msgstr "更新 /etc/resolv.conf"
#. Write dialog caption
-#: src/modules/DNS.rb:379
+#: src/modules/DNS.rb:398
msgid "Saving Hostname and DNS Configuration"
msgstr "正在保存主机名和 DNS 配置..."
#. Allow to set hostname even if it's modified by DHCP (#13427)
#. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) {
#. Progress step 1/3
-#: src/modules/DNS.rb:388
+#: src/modules/DNS.rb:407
msgid "Writing hostname..."
msgstr "正在写入主机名..."
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:405 src/modules/Lan.rb:630
+#: src/modules/DNS.rb:424 src/modules/Lan.rb:630
msgid "Updating configuration..."
msgstr "正在更新配置..."
#. if(SCR::Read(.target.size, resolv_conf) < 0)
#. SCR::Write(.target.string, resolv_conf, "");
#. Progress step 3/3
-#: src/modules/DNS.rb:416
+#: src/modules/DNS.rb:435
msgid "Updating /etc/resolv.conf ..."
msgstr "正在更新 /etc/resolv.conf ..."
#. Summary text
-#: src/modules/DNS.rb:533
+#: src/modules/DNS.rb:552
msgid "Hostname: Set by DHCP"
msgstr "主机名：由 DHCP 设置"
#. Summary text
-#: src/modules/DNS.rb:539
+#: src/modules/DNS.rb:558
msgid "Hostname: %1"
msgstr "主机名：%1"
-#: src/modules/DNS.rb:547
+#: src/modules/DNS.rb:566
msgid "Hostname will not be written to /etc/hosts"
msgstr "主机名将不会写入 /etc/hosts"
#. Summary text
-#: src/modules/DNS.rb:569
+#: src/modules/DNS.rb:588
msgid "Name Servers: %1"
msgstr "名称服务器：%1"
#. Summary text
-#: src/modules/DNS.rb:579
+#: src/modules/DNS.rb:598
msgid "Search List: %1"
msgstr "搜索列表：%1"
@@ -4232,7 +4240,7 @@
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:528 src/modules/Remote.rb:289
+#: src/modules/Lan.rb:528 src/modules/Remote.rb:293
msgid "Write firewall settings"
msgstr "写入防火墙设置"
@@ -4272,7 +4280,7 @@
msgstr "正在设置网络服务..."
#. Progress step 8
-#: src/modules/Lan.rb:595 src/modules/Remote.rb:303
+#: src/modules/Lan.rb:595 src/modules/Remote.rb:307
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."
@@ -4336,107 +4344,107 @@
msgstr "禁用了对 IPv6 协议的支持"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:195
+#: src/modules/LanItems.rb:194
msgid "connected"
msgstr "已连接"
-#: src/modules/LanItems.rb:196
+#: src/modules/LanItems.rb:195
msgid "datagram"
msgstr "数据报"
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1251 src/modules/LanItems.rb:1255
-#: src/modules/LanItems.rb:1259
+#: src/modules/LanItems.rb:1246 src/modules/LanItems.rb:1250
+#: src/modules/LanItems.rb:1254
msgid "Started automatically at boot"
msgstr "引导时自动启动"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1263
+#: src/modules/LanItems.rb:1258
msgid "Started automatically on cable connection"
msgstr "连接网线时自动启动"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1267
+#: src/modules/LanItems.rb:1262
msgid "Managed by NetworkManager"
msgstr "由 NetworkManager 管理"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1271
+#: src/modules/LanItems.rb:1266
msgid "Will not be started at all"
msgstr "根本不会启动"
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1271
msgid "Started manually"
msgstr "手动启动"
#. do nothing
-#: src/modules/LanItems.rb:1288
+#: src/modules/LanItems.rb:1283
msgid "IP address assigned using"
msgstr "IP 地址指派自"
-#: src/modules/LanItems.rb:1292
+#: src/modules/LanItems.rb:1287
msgid "IP address: %s/%s"
msgstr "IP 地址：%s/%s"
-#: src/modules/LanItems.rb:1295
+#: src/modules/LanItems.rb:1290
msgid "IP address: %s, subnet mask %s"
msgstr "IP 地址：%s，子网掩码 %s"
#. FIXME:
#. - side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1326
+#: src/modules/LanItems.rb:1321
msgid "Not configured"
msgstr "未配置"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1349 src/modules/LanItems.rb:1415
+#: src/modules/LanItems.rb:1344 src/modules/LanItems.rb:1410
msgid "Device Name: %s"
msgstr "设备名称：%s"
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1364
msgid "Bonding slaves"
msgstr "绑定从属"
-#: src/modules/LanItems.rb:1383
+#: src/modules/LanItems.rb:1378
msgid "enslaved in %s"
msgstr "从属于 %s"
-#: src/modules/LanItems.rb:1384
+#: src/modules/LanItems.rb:1379
msgid "Bonding master"
msgstr "绑定主体"
-#: src/modules/LanItems.rb:1398
+#: src/modules/LanItems.rb:1393
msgid "Not connected"
msgstr "未连接"
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1396
msgid "No hwinfo"
msgstr "无硬件信息"
-#: src/modules/LanItems.rb:1421
+#: 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 输出。"
-#: src/modules/LanItems.rb:1427
+#: src/modules/LanItems.rb:1422
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr "设备尚未配置。请按<b>编辑</b>配置。\n"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1429
msgid "Needed firmware"
msgstr "所需固件"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1429
msgid "unknown"
msgstr "未知"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:239
+#: src/modules/Remote.rb:243
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -4445,59 +4453,66 @@
"将禁用防火墙设置。"
#. Progress stage 2
-#: src/modules/Remote.rb:291
+#: src/modules/Remote.rb:295
msgid "Configure display manager"
msgstr "配置显示管理器"
#. Progress stage 3
-#: src/modules/Remote.rb:296
+#: src/modules/Remote.rb:300
msgid "Restart the services"
msgstr "重启服务"
-#: src/modules/Remote.rb:299
+#: src/modules/Remote.rb:303
msgid "Saving Remote Administration Configuration"
msgstr "正在保存远程管理配置"
-#: src/modules/Remote.rb:308
+#: src/modules/Remote.rb:312
msgid "Configuring display manager..."
msgstr "正在配置显示管理器..."
+#: src/modules/Remote.rb:316
+msgid "Restarting the service..."
+msgstr "正在重启服务..."
+
#. Enable xinetd
#. Enable XDM
-#: src/modules/Remote.rb:327 src/modules/Remote.rb:335
+#: src/modules/Remote.rb:343 src/modules/Remote.rb:351
msgid "Enabling service %{service} has failed"
msgstr "启动服务 %{service} 失败"
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:359
-msgid "Restarting the service..."
-msgstr "正在重启服务..."
+#: src/modules/Remote.rb:378
+msgid ""
+"Your display manager must be restarted.\n"
+"To take the changes in remote administration into account, \n"
+"please restart it manually or log out and log in again."
+msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:393
+#: src/modules/Remote.rb:409
msgid "Remote administration is enabled."
msgstr "已启用远程管理。"
-#: src/modules/Remote.rb:393
+#: src/modules/Remote.rb:409
msgid "Remote administration is disabled."
msgstr "已禁用远程管理。"
#. Progress stage 1
-#: src/modules/Routing.rb:221
+#: src/modules/Routing.rb:244
msgid "Write IP forwarding settings"
msgstr "写入 IP 转发设置"
#. Progress stage 2
-#: src/modules/Routing.rb:223
+#: src/modules/Routing.rb:246
msgid "Write routing settings"
msgstr "写入路由设置"
-#: src/modules/Routing.rb:226
+#: src/modules/Routing.rb:249
msgid "Saving Routing Configuration"
msgstr "正在保存路由配置"
#. Progress stage 1/2
-#: src/modules/Routing.rb:232
+#: src/modules/Routing.rb:254
msgid "Writing IP forwarding settings..."
msgstr "正在写入 IP 转发设置..."
@@ -4506,37 +4521,37 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:243
+#: src/modules/Routing.rb:264
msgid "Writing routing settings..."
msgstr "正在写入路由设置..."
#. Summary text
-#: src/modules/Routing.rb:353
+#: src/modules/Routing.rb:413
msgid "Gateway: %s"
msgstr "网关：%s"
#. Summary text
-#: src/modules/Routing.rb:357
+#: src/modules/Routing.rb:417
msgid "IP Forwarding for IPv4: %s"
msgstr "IPv4 转发：%s"
#. Summary text
-#: src/modules/Routing.rb:361
+#: src/modules/Routing.rb:421
msgid "IP Forwarding for IPv6: %s"
msgstr "IPv6 转发：%s"
#. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:121
+#: src/modules/SuSEFirewall4Network.rb:125
msgid "Automatically Assigned Zone"
msgstr "自动指派的区域"
#. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:123
+#: src/modules/SuSEFirewall4Network.rb:127
msgid "Firewall Disabled"
msgstr "已禁用防火墙"
#. TRANSLATORS: Part of combo box item -> "Internal Zone (Unprotected)"
-#: src/modules/SuSEFirewall4Network.rb:135
+#: src/modules/SuSEFirewall4Network.rb:139
msgid "(Unprotected)"
msgstr "(无保护的)"
--
To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org
