From e423c05465aeb87050285c8765c52e9d290cfc88 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 30 Apr 2013 21:31:22 +0000 Subject: Switch from dhcp3-server to isc-dhcp-server Thanks Salvatore Bonaccorso for the report. Closes: #706103. --- po/zh_CN/install-methods.po | 22 +++++++++++----------- po/zh_CN/preseed.po | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'po/zh_CN') diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po index 18e7ea6e4..8a84951d1 100644 --- a/po/zh_CN/install-methods.po +++ b/po/zh_CN/install-methods.po @@ -1746,13 +1746,13 @@ msgstr "设置 DHCP 服务器" #, no-c-format msgid "" "One free software DHCP server is ISC dhcpd. For &debian-" -"gnu;, the dhcp3-server package is recommended. Here " -"is a sample configuration file for it (see /etc/dhcp3/dhcpd.confisc-dhcp-server package is recommended. Here " +"is a sample configuration file for it (see /etc/dhcp/dhcpd.conf):" msgstr "" "一个 DHCP 服务器自由软件是 ISC dhcpd。对于 &debian-gnu;，" -"推荐使用 dhcp3-server 软件包。这里是它的一个简单的配置" -"示例文件(参阅 /etc/dhcp3/dhcpd.conf)：" +"推荐使用 isc-dhcp-server 软件包。这里是它的一个简单的配置" +"示例文件(参阅 /etc/dhcp/dhcpd.conf)：" #. Tag: screen #: install-methods.xml:1243 @@ -1819,10 +1819,10 @@ msgstr "" #, no-c-format msgid "" "After you have edited the dhcpd configuration file, " -"restart it with /etc/init.d/dhcp3-server restart." +"restart it with /etc/init.d/isc-dhcp-server restart." msgstr "" "在编辑了 dhcpd 配置文件后，您需要使用下面的命令重新启动：" -"/etc/init.d/dhcp3-server restart。" +"/etc/init.d/isc-dhcp-server restart。" #. Tag: title #: install-methods.xml:1263 @@ -1913,13 +1913,13 @@ msgid "" "There are two BOOTP servers available for GNU/Linux. The first is CMU " "bootpd. The other is actually a DHCP server: ISC " "dhcpd. In &debian-gnu; these are contained in the " -"bootp and dhcp3-server " +"bootp and isc-dhcp-server " "packages respectively." msgstr "" "在 GNU/Linux 下面可以使用两种 BOOTP 服务器。首先是 CMU bootpd，另外一种实际上是 DHCP 服务器：ISC dhcpd。" "&debian-gnu; 中它们分别被包含在 bootp 和 " -"dhcp3-server 软件包。" +"isc-dhcp-server 软件包。" #. Tag: para #: install-methods.xml:1293 @@ -1995,14 +1995,14 @@ msgid "" "adding the allow bootp directive to the configuration " "block for the subnet containing the client in /etc/dhcp3/dhcpd." "conf, and restart dhcpd with /etc/" -"init.d/dhcp3-server restart." +"init.d/isc-dhcp-server restart." msgstr "" "相反，通过 ISC dhcpd 设置 BOOTP 就非常容易。因为它把 " "BOOTP 客户程序看成一个特殊的 DHCP 客户端。部分体系结构需要经过复杂的设置才能" "从 BOOTP 启动客户端。如果您的机器属于这种情况，请阅读。否则，大概只需要将 allow bootp 指令添加到包含客户机" -"的子网的配置部分 /etc/dhcp3/dhcpd.conf，并用命令 " -"/etc/init.d/dhcp3-server restart 重新启动 " +"的子网的配置部分 /etc/dhcp/dhcpd.conf，并用命令 " +"/etc/init.d/isc-dhcp-server restart 重新启动 " "dhcpd。" #. Tag: title diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po index 965b96788..d920bdbd7 100644 --- a/po/zh_CN/preseed.po +++ b/po/zh_CN/preseed.po @@ -1063,13 +1063,13 @@ msgid "" "is a file to netboot, but if it appears to be an URL then installation media " "that support network preseeding will download the file from the URL and use " "it as a preconfiguration file. Here is an example of how to set it up in the " -"dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; " +"dhcpd.conf for version 3 of the ISC DHCP server (the isc-dhcp-server &debian; " "package)." msgstr "" "还可以使用 DHCP 来指定从网络下载的预置文件。DHCP 允许指定文件名。通常是用于 " "netboot 的文件，但如果是一个 URL，那么支持网络预置的安装介质就会从该 URL 下" "载，并用作预置文件。这里有一个在 dhcpd.conf 中使用的例子，它用于 ISC DHCP 服" -"务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。" +"务器第 3 版(&debian; 里面是 isc-dhcp-server 软件包)。" #. Tag: screen #: preseed.xml:569 -- cgit v1.2.3