trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

4 files changed, 88 insertions, 97 deletions

diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po
index 22f4fe58b0..1c5854b480 100644
--- a/packaging/Debian/debian/po/es.po
+++ b/packaging/Debian/debian/po/es.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 2.999+3.0.alpha21-4\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-03-09 20:27-0600\n"
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"PO-Revision-Date: 2003-07-02 21:51-0500\n"
 "Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
@@ -32,18 +33,15 @@ msgstr "Juego de caracteres para el sistema de ficheros Unix"
 #: ../samba-common.templates:3
 msgid ""
 "You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
 msgstr ""
 "Actualmente hay una opción de \"character set\" en smb.conf.  En Samba 3.0 "
-"esta opción ha sido reemplazado por dos opciones nuevas: \"unix charset\" y "
-"\"display charset\".  Por favor, indique el juego de caracteres que desea "
-"usar para estas opciones nuevas, que controlan cómo Samba interpretará los "
-"nombres en el sistema de ficheros y también cómo smbclient los interpretará "
-"al conectarse a un servidor de ficheros."
+"esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por "
+"favor, indique el juego de caracteres que desea usar para esta opción "
+"nueva, que controla cómo Samba interpretará los nombres en el sistema de "
+"ficheros."
 
 #. Description
 #: ../samba-common.templates:3
@@ -51,12 +49,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed."
 msgstr "Si deja en blanco este campo, no se cambiará smb.conf."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Juego de caracteres para los clientes DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid ""
 "You currently have a \"client code page\" set in your smb.conf.  In Samba "
 "3.0, this option is replaced by the option \"dos charset\".  Please specify "
@@ -73,13 +71,13 @@ msgstr ""
 "cambiará smb.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -94,7 +92,7 @@ msgstr ""
 "de /etc/samba/dhcp.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
@@ -102,12 +100,12 @@ msgstr ""
 "Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "¿Configurar smb.conf mediante debconf?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
@@ -123,7 +121,7 @@ msgstr ""
 "arregle a mano."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "If you don't use debconf to configure smb.conf, you will have to handle any "
 "configuration changes yourself, and will not be able to take advantage of "
@@ -136,12 +134,12 @@ msgstr ""
 "sea posible."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Nombre del dominio o del grupo de trabajo"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid ""
 "This controls what workgroup your server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
@@ -152,12 +150,12 @@ msgstr ""
 "de dominio que se usa con la configuración security=domain."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "¿Utilizar contraseñas cifradas?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid ""
 "Recent Windows clients communicate with SMB servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po
index bb8cf41e35..130a92ee11 100644
--- a/packaging/Debian/debian/po/fr.po
+++ b/packaging/Debian/debian/po/fr.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 2.999+3.0.alpha23-1\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-04-19 08:28-0100\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"PO-Revision-Date: 2003-07-02 21:52-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
@@ -31,20 +32,15 @@ msgstr "Jeu de caractères pour les systèmes de fichiers Unix"
 #: ../samba-common.templates:3
 msgid ""
 "You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
 msgstr ""
 "Une instruction « character set » (jeu de caractères) est utilisée dans "
-"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par deux "
-"nouvelles options, « unix charset » (jeu de caractères Unix) et « display "
-"charset » (jeu de caractères à l'affichage). Veuillez indiquer le jeu de "
-"caractères que vous voulez utiliser avec chacune de ces deux options. La "
-"première permet d'interpréter les noms de fichiers sur le système et la "
-"seconde permet à smbclient d'interpréter ces noms lors d'une connexion à un "
-"serveur de fichiers."
+"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par une "
+"nouvelle option, « unix charset » (jeu de caractères Unix).  Veuillez "
+"indiquer le jeu de caractères que vous voulez utiliser avec cette option, "
+"qui permet d'interpréter les noms de fichiers sur le système."
 
 #. Description
 #: ../samba-common.templates:3
@@ -54,12 +50,12 @@ msgstr ""
 "réponse."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Jeu de caractères pour les clients DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid ""
 "You currently have a \"client code page\" set in your smb.conf.  In Samba "
 "3.0, this option is replaced by the option \"dos charset\".  Please specify "
@@ -78,12 +74,12 @@ msgstr ""
 "sans réponse. "
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -98,19 +94,19 @@ msgstr ""
 "serveur DHCP soient lus dans /etc/samba/dhcp.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
 msgstr "Pour cela, le paquet dhcp3-client doit être installé."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "Voulez-vous configurer smb.conf avec debconf ?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
@@ -125,7 +121,7 @@ msgstr ""
 "il vaut mieux gérer manuellement le contenu de ce fichier."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "If you don't use debconf to configure smb.conf, you will have to handle any "
 "configuration changes yourself, and will not be able to take advantage of "
@@ -138,12 +134,12 @@ msgstr ""
 "est conseillé d'utiliser debconf."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Groupe de travail et nom de domaine ?"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid ""
 "This controls what workgroup your server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
@@ -154,12 +150,12 @@ msgstr ""
 "« security=domain »."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "Voulez-vous chiffrer les mots de passe ?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid ""
 "Recent Windows clients communicate with SMB servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po
index a6f02f7706..63ffd9a983 100644
--- a/packaging/Debian/debian/po/pt_BR.po
+++ b/packaging/Debian/debian/po/pt_BR.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: samba_2.999+3.0.alpha20-4\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-04-05 13:30-0300\n"
-"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
+"Project-Id-Version: samba_3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-0500\n"
+"PO-Revision-Date: 2003-07-02 21:56-0500\n"
+"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #. Description
 #: ../samba-common.templates:3
@@ -29,21 +30,19 @@ msgstr "Conjunto de caracteres para sistema de arquivos Unix"
 
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
 "You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
 msgstr ""
 "Atualmente existe um \"conjunto de caracteres\" (\"character set\") "
 "configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi "
-"substituída por duas novas opções, \"unix charset\" e \"display charset\". "
-"Por favor especifique o conjunto de caracteres a ser usado para essas novas "
-"opções, as quais controlam como o Samba interpreta nomes de arquivos no "
-"sistema de arquivos e como o smbclient irá interpretar esses nomes quando "
-"você se conectar a um servidor de arquivos, respectivamente."
+"substituída por uma nova opção, \"unix charset\". Por favor especifique "
+"o conjunto de caracteres a ser usado para essa nova opção, a qual "
+"controla como o Samba interpreta nomes de arquivos no sistema de "
+"arquivos."
 
 #. Description
 #: ../samba-common.templates:3
@@ -53,12 +52,12 @@ msgstr ""
 "modificado."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Conjunto de caracteres para clientes DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid ""
 "You currently have a \"client code page\" set in your smb.conf.  In Samba "
 "3.0, this option is replaced by the option \"dos charset\".  Please specify "
@@ -76,12 +75,12 @@ msgstr ""
 "será modificado."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -97,7 +96,7 @@ msgstr ""
 "arquivo smb.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
@@ -106,12 +105,12 @@ msgstr ""
 "recurso."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "Configurar smb.conf através do debconf ?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
@@ -127,7 +126,7 @@ msgstr ""
 "lo funcional novamente."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "If you don't use debconf to configure smb.conf, you will have to handle any "
 "configuration changes yourself, and will not be able to take advantage of "
@@ -140,12 +139,12 @@ msgstr ""
 "Por esse motivo, é recomendado usar o debconf, caso seja possível."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Nome de Domínio/Grupo de Trabalho ?"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid ""
 "This controls what workgroup your server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
@@ -157,12 +156,12 @@ msgstr ""
 "security=domain."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "Usar encriptação de senhas ?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid ""
 "Recent Windows clients communicate with SMB servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "
diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot
index 4798ca9cfa..b636ba2e48 100644
--- a/packaging/Debian/debian/po/templates.pot
+++ b/packaging/Debian/debian/po/templates.pot
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
+"POT-Creation-Date: 2003-07-02 21:50-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,11 +32,9 @@ msgstr ""
 #: ../samba-common.templates:3
 msgid ""
 "You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
+"specify the character set you wish to use for theis new option, which "
+"controls how Samba interprets filenames on the file system."
 msgstr ""
 
 #. Description
@@ -45,12 +43,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed."
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid ""
 "You currently have a \"client code page\" set in your smb.conf.  In Samba "
 "3.0, this option is replaced by the option \"dos charset\".  Please specify "
@@ -61,12 +59,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "If your computer gets IP address information from a DHCP server on the "
 "network, the DHCP server may also provide information about WINS servers "
@@ -76,19 +74,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "The rest of the configuration of Samba deals with questions that affect "
 "parameters in /etc/samba/smb.conf, which is the file used to configure the "
@@ -98,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid ""
 "If you don't use debconf to configure smb.conf, you will have to handle any "
 "configuration changes yourself, and will not be able to take advantage of "
@@ -107,12 +105,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid ""
 "This controls what workgroup your server will appear to be in when queried "
 "by clients. Note that this parameter also controls the Domain name used with "
@@ -120,12 +118,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid ""
 "Recent Windows clients communicate with SMB servers using encrypted "
 "passwords. If you want to use clear text passwords you will need to change a "