summaryrefslogtreecommitdiff
path: root/po/zh_CN/boot-installer.po
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2013-04-01 21:12:14 +0000
committerHolger Wansing <linux@wansing-online.de>2013-04-01 21:12:14 +0000
commitf8d5097c2e964dc290b106d0d1812bc2110781b1 (patch)
tree068f50a89ec757a6f309faf15c18ba8eb9145c5f /po/zh_CN/boot-installer.po
parent22a6bc9b47753ea1b3c49f91f5d559fed53f56a0 (diff)
downloadinstallation-guide-f8d5097c2e964dc290b106d0d1812bc2110781b1.zip
Update po|pot files after changings in en:
M po/tl/random-bits.po M po/tl/using-d-i.po M po/tl/boot-installer.po M po/ro/random-bits.po M po/ro/using-d-i.po M po/ro/boot-installer.po M po/pt/random-bits.po M po/pt/using-d-i.po M po/pt/boot-installer.po M po/da/random-bits.po M po/da/using-d-i.po M po/da/boot-installer.po M po/ru/random-bits.po M po/ru/using-d-i.po M po/ru/boot-installer.po M po/sv/random-bits.po M po/sv/using-d-i.po M po/sv/boot-installer.po M po/ja/partitioning.po M po/ja/install-methods.po M po/ja/random-bits.po M po/ja/preseed.po M po/ja/preparing.po M po/ja/using-d-i.po M po/ja/hardware.po M po/ja/boot-installer.po M po/zh_TW/random-bits.po M po/zh_TW/using-d-i.po M po/zh_TW/boot-installer.po M po/fi/random-bits.po M po/fi/using-d-i.po M po/fi/boot-installer.po M po/el/random-bits.po M po/el/using-d-i.po M po/el/boot-installer.po M po/zh_CN/random-bits.po M po/zh_CN/using-d-i.po M po/zh_CN/boot-installer.po M po/pot/random-bits.pot M po/pot/using-d-i.pot M po/pot/boot-installer.pot M po/es/random-bits.po M po/es/using-d-i.po M po/es/boot-installer.po M po/ko/random-bits.po M po/ko/using-d-i.po M po/ko/boot-installer.po M po/nl/random-bits.po M po/nl/using-d-i.po M po/nl/boot-installer.po M po/nn/random-bits.po M po/nn/using-d-i.po M po/nn/boot-installer.po M po/hu/random-bits.po M po/hu/using-d-i.po M po/hu/boot-installer.po M po/vi/random-bits.po M po/vi/using-d-i.po M po/vi/boot-installer.po
Diffstat (limited to 'po/zh_CN/boot-installer.po')
-rw-r--r--po/zh_CN/boot-installer.po44
1 files changed, 29 insertions, 15 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 83c62d6dd..c3896c0d4 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-01-30 19:23+0000\n"
+"POT-Creation-Date: 2013-04-01 21:08+0000\n"
"PO-Revision-Date: 2012-11-25 16:26+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2977,28 +2977,39 @@ msgstr "netcfg/disable_autoconfig"
#. Tag: para
#: boot-installer.xml:2314
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "By default, the &d-i; automatically probes for network configuration via "
+#| "DHCP. If the probe succeeds, you won't have a chance to review and change "
+#| "the obtained settings. You can get to the manual network setup only in "
+#| "case the DHCP probe fails."
msgid ""
"By default, the &d-i; automatically probes for network configuration via "
-"DHCP. If the probe succeeds, you won't have a chance to review and change "
-"the obtained settings. You can get to the manual network setup only in case "
-"the DHCP probe fails."
+"IPv6 autoconfiguration and DHCP. If the probe succeeds, you won't have a "
+"chance to review and change the obtained settings. You can get to the manual "
+"network setup only in case the automatic configuration fails."
msgstr ""
"缺省情况下,&d-i; 会通过 DHCP 来自动检测网络。如果检测成功的话,您将不需要审"
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
#: boot-installer.xml:2321
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have a DHCP server on your local network, but want to avoid it "
+#| "because e.g. it gives wrong answers, you can use the parameter "
+#| "<userinput>netcfg/disable_autoconfig=true</userinput> to prevent "
+#| "configuring the network with DHCP and to enter the information manually."
msgid ""
-"If you have a DHCP server on your local network, but want to avoid it "
-"because e.g. it gives wrong answers, you can use the parameter "
-"<userinput>netcfg/disable_autoconfig=true</userinput> to prevent configuring the "
-"network with DHCP and to enter the information manually."
+"If you have an IPv6 router or a DHCP server on your local network, but want "
+"to avoid them because e.g. they give wrong answers, you can use the "
+"parameter <userinput>netcfg/disable_autoconfig=true</userinput> to prevent "
+"any automatic configuration of the network (neither v4 nor v6) and to enter "
+"the information manually."
msgstr ""
"如果您的网络上面具备一台 DHCP 服务器,但是不想使用它,比如,因为它给出错误的"
-"答案。您可以使用参数 <userinput>netcfg/disable_autoconfig=true</userinput> 来阻止通"
-"过 DHCP 配置网络,并手工输入信息。"
+"答案。您可以使用参数 <userinput>netcfg/disable_autoconfig=true</userinput> 来"
+"阻止通过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
#: boot-installer.xml:2332
@@ -3343,10 +3354,13 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:2547
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Set to <userinput>true</userinput> if you want to disable DHCP and "
+#| "instead force static network configuration."
msgid ""
-"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
-"force static network configuration."
+"Set to <userinput>true</userinput> if you want to disable IPv6 "
+"autoconfiguration and DHCP and instead force static network configuration."
msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"