[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. upstream/4.1.1-68-g121567b

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 121567ba9f2439e8277f500f9263633637d6e08e
Author: Andrew Pollock <apollock at debian.org>
Date:   Wed Jul 7 07:39:32 2010 -0700

    Debconf template updates
    
    * Update French translation
    * Correct path reference for v4 paths

diff --git a/debian/changelog b/debian/changelog
index 6e1e533..2533dce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ isc-dhcp (4.1.1-P1-8) UNRELEASED; urgency=low
 
   * debian/dhcp3-client.postrm: bring back to clean up cruft (closes: #588203)
   * debian/dhcp3-server.postrm: bring back to clean up cruft
+  * Updated French debconf templates translation (closes: #588281)
+  * debian/isc-dhcp-server.templates: corrected /etc/dhcp3 -> /etc/dhcp
 
- -- Andrew Pollock <apollock at debian.org>  Mon, 05 Jul 2010 23:09:34 -0700
+ -- Andrew Pollock <apollock at debian.org>  Tue, 06 Jul 2010 17:38:58 -0700
 
 isc-dhcp (4.1.1-P1-7) unstable; urgency=low
 
diff --git a/debian/isc-dhcp-server.templates b/debian/isc-dhcp-server.templates
index 391f3d9..af7c316 100644
--- a/debian/isc-dhcp-server.templates
+++ b/debian/isc-dhcp-server.templates
@@ -11,7 +11,7 @@ Template: isc-dhcp-server/config_warn
 Type: note
 _Description: Manual configuration required after installation
  After the DHCP server is installed, you will need to manually configure it
- by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf
+ by editing the file /etc/dhcp/dhcpd.conf. Please note that the dhcpd.conf
  supplied is just a sample, and must be adapted to the network environment.
  .
  Please configure the DHCP server as soon as the installation finishes.
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 2a8be67..b964bac 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-06-06 20:37+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,19 +102,13 @@ msgstr "Configuration du serveur DHCP requise après l'installation"
 #. Type: note
 #. Description
 #: ../isc-dhcp-server.templates:2001
-#, fuzzy
-#| msgid ""
-#| "After the DHCP server is installed, you will need to manually configure "
-#| "it by editing the file /etc/isc-dhcp/dhcpd.conf. Please note that the "
-#| "dhcpd.conf supplied is just a sample, and must be adapted to the network "
-#| "environment."
 msgid ""
 "After the DHCP server is installed, you will need to manually configure it "
 "by editing the file /etc/dhcp3/dhcpd.conf. Please note that the dhcpd.conf "
 "supplied is just a sample, and must be adapted to the network environment."
 msgstr ""
 "Après l'installation du serveur DHCP, vous devrez le configurer vous-même en "
-"modifiant le fichier /etc/isc-dhcp/dhcpd.conf. Veuillez noter qu'un exemple "
+"modifiant le fichier /etc/dhcp3/dhcpd.conf. Veuillez noter qu'un exemple "
 "de fichier dhcpd.conf est fourni, mais que cette configuration est partielle "
 "et qu'elle doit être adaptée à votre environnement réseau."
 

-- 
ISC DHCP packaging for Debian