update po and pot files based on current templates

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@159 ef36b2f9-881f-0410-afb5-c4e39611909c

14 files changed, 2140 insertions, 2751 deletions

diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index cef83a3..79c2430 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] libnss-ldapd.templates
diff --git a/debian/po/ca.po b/debian/po/ca.po
index da06ad8..e9d617c 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 211-4\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2004-11-02 20:49+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -15,83 +15,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "fes que la configuració només la pugui llegir/escriure el propietari"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Voleu que la configuració del libnss-ldap només la pugui llegir i escriure "
-"el propietari del fitxer?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Si la configuració del libnss-ldap conté contrasenyes, és una bona idea "
-"definir el mode 0600 pel fitxer (només el pot llegir i escriure el "
-"propietari)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Nota: el libnss-ldap comprovarà si teniu instal·lat l'nscd. Si ho està, "
-"definirà el mode 0600."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "el fitxer nsswitch.conf no es gestiona automàticament"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Per fer funcionar el paquet necessiteu modificar el fitxer /etc/nsswitch."
-"conf perquè utilitzi l'origen de dades de l'LDAP. Podeu utilitzar d'exemple "
-"el fitxer /usr/share/doc/libnss-ldap/examples/nsswitch.ldap o copiar-lo "
-"sobre la vostra configuració actual."
+"Nota: normalment és una bona idea utilitzar una adreça d'IP; redueix el risc "
+"de produir-se errors si el serveis de noms dels esdeveniments no està "
+"disponible."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Per mantenir els serveis bàsics funcionant i abans de suprimir el paquet, "
-"cal suprimir les entrades d'LDAP del fitxer nsswitch.conf."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "nom distingit de la base de la cerca"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "adreça de l'ordinador del servidor d'LDAP"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -103,215 +68,219 @@ msgstr ""
 "«exemple.net» utilitzaria el nom distingit de la base de la cerca "
 "«dc=exemple,dc=net»."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "la base de dades requereix d'autenticació d'accés"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "La base de dades d'LDAP requereix d'autenticació d'accés?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Contesteu positivament només si no podeu obtenir les entrades de la base de "
-"dades sense autenticar-vos."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Nota: en una configuració normal no és necessari."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr ""
-"habilita les actualitzacions de configuració automàtiques a través del "
-"debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"Voleu que el debconf actualitzi automàticament el fitxer de configuració del "
-"libnss-ldap?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "el libnss-ldap ha canviat a utilitzar el debconf en la configuració."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"S'afegirà la línia «###DEBCONF###» al principi del fitxer; podeu inhabilitar-"
-"ne les actualitzacions del debconf suprimint-la."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Totes les noves instal·lacions ho tindran de forma predeterminada."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "usuari de la base de dades sense privilegis"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Introduïu el nom del compte que s'utilitzarà per entrar a la base de dades "
-"de l'LDAP."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "contrasenya pel compte d'accés autenticat de la base de dades"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-"Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
-"de dades de l'LDAP."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Versió de l'LDAP a utilitzar"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Introduïu la versió del protocol d'LDAP que utilitza el ldapns. Normalment "
 "és una bona idea especificar el nombre de versió més gran disponible."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "usuari de la base de dades sense privilegis"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Nota: normalment és una bona idea utilitzar una adreça d'IP; redueix el risc "
-"de produir-se errors si el serveis de noms dels esdeveniments no està "
-"disponible."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
+"Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
+"de dades de l'LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
+"Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
+"de dades de l'LDAP."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Per fer funcionar el paquet necessiteu modificar el fitxer /etc/nsswitch."
+"conf perquè utilitzi l'origen de dades de l'LDAP. Podeu utilitzar d'exemple "
+"el fitxer /usr/share/doc/libnss-ldap/examples/nsswitch.ldap o copiar-lo "
+"sobre la vostra configuració actual."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "nom distingit de la base de la cerca"
+
+#~ msgid "password for database login account"
+#~ msgstr "contrasenya pel compte d'accés autenticat de la base de dades"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "el fitxer nsswitch.conf no es gestiona automàticament"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr ""
+#~ "fes que la configuració només la pugui llegir/escriure el propietari"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Voleu que la configuració del libnss-ldap només la pugui llegir i "
+#~ "escriure el propietari del fitxer?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Si la configuració del libnss-ldap conté contrasenyes, és una bona idea "
+#~ "definir el mode 0600 pel fitxer (només el pot llegir i escriure el "
+#~ "propietari)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Nota: el libnss-ldap comprovarà si teniu instal·lat l'nscd. Si ho està, "
+#~ "definirà el mode 0600."
+
+#~ msgid "database requires login"
+#~ msgstr "la base de dades requereix d'autenticació d'accés"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "La base de dades d'LDAP requereix d'autenticació d'accés?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Contesteu positivament només si no podeu obtenir les entrades de la base "
+#~ "de dades sense autenticar-vos."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Nota: en una configuració normal no és necessari."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr ""
+#~ "habilita les actualitzacions de configuració automàtiques a través del "
+#~ "debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Voleu que el debconf actualitzi automàticament el fitxer de configuració "
+#~ "del libnss-ldap?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr ""
+#~ "el libnss-ldap ha canviat a utilitzar el debconf en la configuració."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "S'afegirà la línia «###DEBCONF###» al principi del fitxer; podeu "
+#~ "inhabilitar-ne les actualitzacions del debconf suprimint-la."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Totes les noves instal·lacions ho tindran de forma predeterminada."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Introduïu el nom del compte que s'utilitzarà per entrar a la base de "
+#~ "dades de l'LDAP."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Per mantenir els serveis bàsics funcionant i abans de suprimir el paquet, "
+#~ "cal suprimir les entrades d'LDAP del fitxer nsswitch.conf."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=exemple,dc=net"
 
@@ -325,8 +294,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "adreça de l'ordinador del servidor d'LDAP"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Introduïu l'adreça del servidor d'LDAP utilitzat."
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 22248c4..f1b04b3 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2005-07-10 16:33+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -23,82 +23,47 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "Umožnit čtení/zápis do konfigurace pouze vlastníkovi"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Nastavit oprávnění konfiguračního souboru libnss-ldap tak, aby jej mohl číst/"
-"zapisovat pouze vlastník souboru?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Používáte-li ve své konfiguraci libnss-ldap hesla, je obvykle dobrým nápadem "
-"nastavit souboru práva 0600 (čtení a zápis pouze pro vlastníka souboru)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Poznámka: libnss-ldap ještě zkontroluje, zda máte nainstalován nscd a "
-"oprávnění změní pouze v případě, že ano."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf není spravován automaticky"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Aby tento balík fungoval, musíte upravit svůj /etc/nsswitch.conf, aby jako "
-"zdroj dat používal ldap. V /usr/share/doc/libnss-ldap/examples/nsswitch.ldap "
-"se nachází vzorový soubor, který můžete použít jako základ pro vaše "
-"nastavení (stačí jej i prostě zkopírovat)."
+"Poznámka: vždy je lepší použít IP adresu, protože se tím snižuje riziko "
+"chyby v případě, že je služba překladu jmen nedostupná."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Podobně je vhodné při odinstalování balíčku tyto ldap záznamy z nsswitch."
-"conf zase odstranit, aby byla zachována funkčnost základních služeb."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "Rozlišitelný název prohledávaného stromu"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "Adresa počítače s LDAP serverem"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -110,207 +75,209 @@ msgstr ""
 "\"priklad.cz\" by jako rozlišitelné jméno svého stromu použila \"dc=priklad,"
 "dc=cz\"."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "Databáze vyžaduje přihlášení"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Vyžaduje LDAP databáze přihlášení?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Souhlaste pouze v případě, že nemůžete získávat záznamy z databáze bez "
-"přihlášení."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Poznámka: při běžném nastavení to není potřeba."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "Povolit automatické zásahy do konfigurace pomocí debconfu"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr "Má debconf automaticky aktualizovat konfigurační soubor libnss-ldap?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr ""
-"libnss-ldap se konečně pochlapil a pro svou konfiguraci používá debconf."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Na začátek souboru bude přidán řádek \"###DEBCONF###\". Chcete-li, aby "
-"debconf do souboru nezasahoval, stačí zmíněný řádek odstranit."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Toto je výchozí nastavení pro všechny nové instalace."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "Neprivilegovaný databázový uživatel"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr "Zadejte jméno účtu, který se použije pro přístup k LDAP databázi."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "Heslo pro přihlášení k databázi"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Verze LDAPu, která se má použít"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Zadejte verzi LDAP protokolu, kterou má ldapns používat. Obvykle se "
 "doporučuje použít nejvyšší dostupnou verzi."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "Neprivilegovaný databázový uživatel"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Poznámka: vždy je lepší použít IP adresu, protože se tím snižuje riziko "
-"chyby v případě, že je služba překladu jmen nedostupná."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
-msgstr ""
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Aby tento balík fungoval, musíte upravit svůj /etc/nsswitch.conf, aby jako "
+"zdroj dat používal ldap. V /usr/share/doc/libnss-ldap/examples/nsswitch.ldap "
+"se nachází vzorový soubor, který můžete použít jako základ pro vaše "
+"nastavení (stačí jej i prostě zkopírovat)."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "Rozlišitelný název prohledávaného stromu"
+
+#~ msgid "password for database login account"
+#~ msgstr "Heslo pro přihlášení k databázi"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf není spravován automaticky"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "Umožnit čtení/zápis do konfigurace pouze vlastníkovi"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Nastavit oprávnění konfiguračního souboru libnss-ldap tak, aby jej mohl "
+#~ "číst/zapisovat pouze vlastník souboru?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Používáte-li ve své konfiguraci libnss-ldap hesla, je obvykle dobrým "
+#~ "nápadem nastavit souboru práva 0600 (čtení a zápis pouze pro vlastníka "
+#~ "souboru)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Poznámka: libnss-ldap ještě zkontroluje, zda máte nainstalován nscd a "
+#~ "oprávnění změní pouze v případě, že ano."
+
+#~ msgid "database requires login"
+#~ msgstr "Databáze vyžaduje přihlášení"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Vyžaduje LDAP databáze přihlášení?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Souhlaste pouze v případě, že nemůžete získávat záznamy z databáze bez "
+#~ "přihlášení."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Poznámka: při běžném nastavení to není potřeba."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "Povolit automatické zásahy do konfigurace pomocí debconfu"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Má debconf automaticky aktualizovat konfigurační soubor libnss-ldap?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr ""
+#~ "libnss-ldap se konečně pochlapil a pro svou konfiguraci používá debconf."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Na začátek souboru bude přidán řádek \"###DEBCONF###\". Chcete-li, aby "
+#~ "debconf do souboru nezasahoval, stačí zmíněný řádek odstranit."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Toto je výchozí nastavení pro všechny nové instalace."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr "Zadejte jméno účtu, který se použije pro přístup k LDAP databázi."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Podobně je vhodné při odinstalování balíčku tyto ldap záznamy z nsswitch."
+#~ "conf zase odstranit, aby byla zachována funkčnost základních služeb."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=priklad,dc=cz"
 
@@ -324,8 +291,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "Adresa počítače s LDAP serverem"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Zadejte prosím adresu použitého LDAP serveru."
diff --git a/debian/po/da.po b/debian/po/da.po
index 9d0b61c..9393255 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_211-4_da\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2004-02-28 18:38+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -19,83 +19,51 @@ msgstr ""
 "org>\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "g�r kun op�tningsfilen l�sbar og skrivbar for ejeren"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Skal libnss-ldap's ops�tningsfil kun v�re l�sbar og skrivbar for filens ejer?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Hvis du bruger adgangskoder i din libnss-ldap-ops�tning, er det normalt en "
-"god id� at give ops�tningsfilen filrettigheden 0600 (l�sbar og skrivbar for "
-"ejeren alene)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Bem�rk: libnss-ldap vil tjekke om du har installeret nscd, og vil kun s�tte "
-"filrettigheden til 0600 hvis nscd er til stede."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf h�ndteres ikke automatisk"
 
-#. Type: note
+#
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"For at denne pakke kan fungere, skal du �ndre /etc/nsswitch.conf, s� den "
-"bruger ldap-datakilderne. Der er en eksempelfil i /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap, som kan bruges som skabelon for din nsswitch-"
-"ops�tning, eller den kan kopieres over som erstatning for din nuv�rende "
-"ops�tning."
+"Bem�rk: Det er normalt en god id� at bruge en IP-adresse: det reducerer "
+"risikoen for fejl hvis navneservicen ikke er tilg�ngelig."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"F�r fjernelse af denne pakke, er det klogt at fjerne ldap-linjerne fra "
-"nsswitch.conf, s� de grundl�ggende services stadig kan fungere."
 
+#  Template: shared/ldapns/ldap-server
+#  ddtp-prioritize: 56
+#
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "skelnet navn p� s�gebasen"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "LDAP-serverens v�rtsnavn"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -106,95 +74,6 @@ msgstr ""
 "dom�nenavn til dette form�l. For eksempel ville dom�net \"eksempel.dk\" "
 "bruge \"dc=eksempel,dc=dk\" som det skelnede navn p� s�gebasen."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "databasen kr�ver logind"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Kr�ver LDAP-databasen at du logger p�?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Accep�r kun her, hvis du ikke kan hente poster fra databasen uden at logge "
-"p�."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Bem�rk: Ved normale ops�tninger bruges dette ikke."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "aktiv�r automatisk opdatering af ops�tningen med debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr "Skal debconf automatisk opdatere libnss-ldap's ops�tningsfil?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "libnss-ldap er g�et over til at benytte debconf til sin ops�tning."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Der vil blive indf�jet \"###DEBCONF###\" i starten af filen. Du kan "
-"deaktivere debconf-opdateringerne ved at fjerne denne linje."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Alle nyinstallationer vil have dette som udgangspunkt."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "upriviligeret databasebruger"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Angiv navnet p� den konto, der skal bruges til at logge p� LDAP-databasen."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "adgangskode til databasekontoen"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Angiv den adgangskode, der skal bruges til at logge p� LDAP-databasen."
-
 #  Template: libnss-ldap/confperm
 #  ddtp-prioritize: 56
 #
@@ -317,118 +196,208 @@ msgstr "Angiv den adgangskode, der skal bruges til at logge p� LDAP-databasen."
 #
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "LDAP-version der skal bruges"
 
 #
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Angiv hvilken version af LDAP-protokollen, som ldapns skal bruge. Det er "
 "normalt en god id� at s�tte den til det h�jest mulige versionsnummer."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "upriviligeret databasebruger"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
-#
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Bem�rk: Det er normalt en god id� at bruge en IP-adresse: det reducerer "
-"risikoen for fejl hvis navneservicen ikke er tilg�ngelig."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
-msgstr ""
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "Angiv den adgangskode, der skal bruges til at logge p� LDAP-databasen."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "Angiv den adgangskode, der skal bruges til at logge p� LDAP-databasen."
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"For at denne pakke kan fungere, skal du �ndre /etc/nsswitch.conf, s� den "
+"bruger ldap-datakilderne. Der er en eksempelfil i /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap, som kan bruges som skabelon for din nsswitch-"
+"ops�tning, eller den kan kopieres over som erstatning for din nuv�rende "
+"ops�tning."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "skelnet navn p� s�gebasen"
+
+#~ msgid "password for database login account"
+#~ msgstr "adgangskode til databasekontoen"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf h�ndteres ikke automatisk"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "g�r kun op�tningsfilen l�sbar og skrivbar for ejeren"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Skal libnss-ldap's ops�tningsfil kun v�re l�sbar og skrivbar for filens "
+#~ "ejer?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Hvis du bruger adgangskoder i din libnss-ldap-ops�tning, er det normalt "
+#~ "en god id� at give ops�tningsfilen filrettigheden 0600 (l�sbar og "
+#~ "skrivbar for ejeren alene)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Bem�rk: libnss-ldap vil tjekke om du har installeret nscd, og vil kun "
+#~ "s�tte filrettigheden til 0600 hvis nscd er til stede."
+
+#~ msgid "database requires login"
+#~ msgstr "databasen kr�ver logind"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Kr�ver LDAP-databasen at du logger p�?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Accep�r kun her, hvis du ikke kan hente poster fra databasen uden at "
+#~ "logge p�."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Bem�rk: Ved normale ops�tninger bruges dette ikke."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "aktiv�r automatisk opdatering af ops�tningen med debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr "Skal debconf automatisk opdatere libnss-ldap's ops�tningsfil?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "libnss-ldap er g�et over til at benytte debconf til sin ops�tning."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Der vil blive indf�jet \"###DEBCONF###\" i starten af filen. Du kan "
+#~ "deaktivere debconf-opdateringerne ved at fjerne denne linje."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Alle nyinstallationer vil have dette som udgangspunkt."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Angiv navnet p� den konto, der skal bruges til at logge p� LDAP-databasen."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "F�r fjernelse af denne pakke, er det klogt at fjerne ldap-linjerne fra "
+#~ "nsswitch.conf, s� de grundl�ggende services stadig kan fungere."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=eksempel,dc=dk"
 
@@ -442,12 +411,6 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#  Template: shared/ldapns/ldap-server
-#  ddtp-prioritize: 56
-#
-#~ msgid "LDAP server host address"
-#~ msgstr "LDAP-serverens v�rtsnavn"
-
 #
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Indtast adressen p� den LDAP-server, der skal bruges."
diff --git a/debian/po/de.po b/debian/po/de.po
index d5c87f2..66b2174 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_220-1_de\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2004-11-12 21:55+0100\n"
 "Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -19,100 +19,53 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#  Template: libnss-ldap/confperm
-#  ddtp-prioritize: 56
-#
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "Konfiguration nur f�r den Eigent�mer les-/schreibbar machen"
-
-#
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Soll die libnss-ldap-Konfigurationsdatei nur vom Eigent�mer les- und "
-"schreibbar sein?"
-
-#
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Falls Sie Passworte in Ihrer libnss-ldap-Konfiguration verwenden, ist es "
-"�blicherweise eine gute Idee, die Konfiguration auf den Modus 0600 (les- und "
-"schreibbar nur durch den Eigent�mer) zu setzen."
 
-#
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Anmerkung: Als Sinnpr�fung checkt libnss-ldap, ob Sie nscd installierten und "
-"setzt mode 0600 nur, falls nscd vorhanden ist."
-
-#  Template: libnss-ldap/nsswitch
-#  ddtp-prioritize: 56
-#
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf wird nicht automatisch verwaltet"
 
 #
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Damit dieses Paket arbeitet, m�ssen Sie Ihre Datei /etc/nsswitch.conf f�r "
-"die ldap-Datenquelle anpassen.  Es gibt eine Beispieldatei unter /usr/share/"
-"doc/libnss-ldap/examples/nsswitch.ldap, die als Beispiel f�r Ihr nsswitch-"
-"Setup verwendet kann oder mit der Ihr aktuelles Setup �berschrieben werden "
-"kann."
+"Beachten Sie:  Es ist �blicherweise eine gute Idee, eine IP-Adresse zu "
+"verwenden; dieses reduziert das Risiko eines Ausfalls, falls der Name-"
+"Service einmal unerreichbar ist."
 
-#
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Dar�berhinaus ist es klug, die ldap-Eintr�ge aus der nsswitch.conf zu "
-"l�schen, bevor Sie dieses Paket entfernen, um die Funktion der Grunddienste "
-"zu erhalten."
 
-#  Template: shared/ldapns/base-dn
+#  Template: shared/ldapns/ldap-server
 #  ddtp-prioritize: 56
 #
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "DN (distinguished name) der Suchbasis"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "LDAP-Server Host-Adresse"
 
 #
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -123,236 +76,253 @@ msgstr ""
 "ihrer Domain-Namen f�r diesen Zweck. Beispielsweise w�rde die Dom�ne "
 "�example.net� �dc=example,dc=net� als den DN der Suchbasis benutzen."
 
-#  Template: libnss-ldap/dblogin
+#  Template: shared/ldapns/ldap_version
 #  ddtp-prioritize: 56
 #
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "Datenbank ben�tigt Login"
-
-#
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Ben�tigt die LDAP-Datenbank einen Login?"
+#: ../libnss-ldapd.templates:3001
+msgid "LDAP version to use"
+msgstr "Welche LDAP-Version soll genutzt werden?"
 
 #
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../templates:4001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
-"Best�tigen Sie das nur, wenn Sie keine Abfragen aus der Datenbank ohne Login "
-"vornehmen k�nnen."
-
-#
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Anmerkung: Bei einem normalen Setup ist das nicht n�tig."
+"Bitte geben Sie an, welche Version des LDAP-Protokolls von ldapns genutzt "
+"werden soll.  Es ist �blicherweise eine gute Idee, die h�chstm�gliche "
+"Versionsnummer zu setzen."
 
-#  Template: libnss-ldap/override
+#  Template: libnss-ldap/binddn
 #  ddtp-prioritize: 56
 #
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "Aktivieren automatischer Konfigurations-Updates durch debconf"
-
-#
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"Soll debconf automatisch die Konfigurations-Datei von libnss-ldap updaten?"
-
-#
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr ""
-"libnss-ldap wurde auf den Gebrauch von debconf f�r die Konfiguration "
-"umgestellt."
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "nicht priviligierter Datenbank-Nutzer"
 
-#
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:5001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
-"Der Datei wird ein �###DEBCONF###� vorangestellt; Sie k�nnen Updates durch "
-"debconf verhindern, indem Sie diese Zeile entfernen."
 
-#
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Alle Neuinstallationen werden das als Voreinstellung haben."
-
-#  Template: libnss-ldap/binddn
-#  ddtp-prioritize: 56
-#
 #. Type: string
 #. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "nicht priviligierter Datenbank-Nutzer"
-
-#
 #. Type: string
 #. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr "Geben Sie den Namen eines Benutzerkontos f�r die LDAP-Datenbank ein."
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
+msgstr ""
 
-#  Template: libnss-ldap/bindpw
-#  ddtp-prioritize: 56
-#
 #. Type: password
 #. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "Passwort f�r das Datenbank-Login-Konto"
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
+msgstr ""
 
 #
 #. Type: password
 #. Description
-#: ../templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Geben Sie das Passwort f�r das Login zur LDAP-Datenbank ein."
 
-#  Template: shared/ldapns/ldap_version
-#  ddtp-prioritize: 56
-#
-#. Type: select
+#. Type: string
 #. Description
-#: ../templates:8001
-msgid "LDAP version to use"
-msgstr "Welche LDAP-Version soll genutzt werden?"
+#: ../libnss-ldapd.templates:6001
+msgid "LDAP account for root"
+msgstr ""
 
-#
-#. Type: select
+#. Type: string
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:6001
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
-"Bitte geben Sie an, welche Version des LDAP-Protokolls von ldapns genutzt "
-"werden soll.  Es ist �blicherweise eine gute Idee, die h�chstm�gliche "
-"Versionsnummer zu setzen."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
-#. Type: string
+#. Type: password
 #. Description
-#: ../templates:9001
-msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+#: ../libnss-ldapd.templates:7001
+msgid "LDAP root account password"
 msgstr ""
 
 #
-#. Type: string
+#. Type: password
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Beachten Sie:  Es ist �blicherweise eine gute Idee, eine IP-Adresse zu "
-"verwenden; dieses reduziert das Risiko eines Ausfalls, falls der Name-"
-"Service einmal unerreichbar ist."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "Geben Sie das Passwort f�r das Login zur LDAP-Datenbank ein."
 
-#. Type: boolean
+#. Type: multiselect
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: boolean
+#
+#. Type: multiselect
 #. Description
-#: ../templates:10001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Damit dieses Paket arbeitet, m�ssen Sie Ihre Datei /etc/nsswitch.conf f�r "
+"die ldap-Datenquelle anpassen.  Es gibt eine Beispieldatei unter /usr/share/"
+"doc/libnss-ldap/examples/nsswitch.ldap, die als Beispiel f�r Ihr nsswitch-"
+"Setup verwendet kann oder mit der Ihr aktuelles Setup �berschrieben werden "
+"kann."
 
-#. Type: boolean
+#. Type: multiselect
 #. Description
-#: ../templates:10001
+#: ../libnss-ldapd.templates:8001
 msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../templates:11001
-msgid "LDAP account for root"
-msgstr ""
+#  Template: shared/ldapns/base-dn
+#  ddtp-prioritize: 56
+#
+#~ msgid "distinguished name of the search base"
+#~ msgstr "DN (distinguished name) der Suchbasis"
 
-#. Type: string
-#. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
-msgstr ""
+#  Template: libnss-ldap/bindpw
+#  ddtp-prioritize: 56
+#
+#~ msgid "password for database login account"
+#~ msgstr "Passwort f�r das Datenbank-Login-Konto"
 
-#. Type: string
-#. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
-msgstr ""
+#  Template: libnss-ldap/nsswitch
+#  ddtp-prioritize: 56
+#
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf wird nicht automatisch verwaltet"
 
-#. Type: password
-#. Description
-#: ../templates:12001
-msgid "LDAP root account password"
-msgstr ""
+#  Template: libnss-ldap/confperm
+#  ddtp-prioritize: 56
+#
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "Konfiguration nur f�r den Eigent�mer les-/schreibbar machen"
 
-#. Type: password
-#. Description
-#: ../templates:12001
-msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
-msgstr ""
+#
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Soll die libnss-ldap-Konfigurationsdatei nur vom Eigent�mer les- und "
+#~ "schreibbar sein?"
 
-#. Type: password
-#. Description
-#: ../templates:12001
-msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
-msgstr ""
+#
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Falls Sie Passworte in Ihrer libnss-ldap-Konfiguration verwenden, ist es "
+#~ "�blicherweise eine gute Idee, die Konfiguration auf den Modus 0600 (les- "
+#~ "und schreibbar nur durch den Eigent�mer) zu setzen."
 
-#. Type: password
-#. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
-msgstr ""
+#
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Anmerkung: Als Sinnpr�fung checkt libnss-ldap, ob Sie nscd installierten "
+#~ "und setzt mode 0600 nur, falls nscd vorhanden ist."
+
+#  Template: libnss-ldap/dblogin
+#  ddtp-prioritize: 56
+#
+#~ msgid "database requires login"
+#~ msgstr "Datenbank ben�tigt Login"
+
+#
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Ben�tigt die LDAP-Datenbank einen Login?"
+
+#
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Best�tigen Sie das nur, wenn Sie keine Abfragen aus der Datenbank ohne "
+#~ "Login vornehmen k�nnen."
+
+#
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Anmerkung: Bei einem normalen Setup ist das nicht n�tig."
+
+#  Template: libnss-ldap/override
+#  ddtp-prioritize: 56
+#
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "Aktivieren automatischer Konfigurations-Updates durch debconf"
+
+#
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Soll debconf automatisch die Konfigurations-Datei von libnss-ldap updaten?"
+
+#
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr ""
+#~ "libnss-ldap wurde auf den Gebrauch von debconf f�r die Konfiguration "
+#~ "umgestellt."
+
+#
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Der Datei wird ein �###DEBCONF###� vorangestellt; Sie k�nnen Updates "
+#~ "durch debconf verhindern, indem Sie diese Zeile entfernen."
+
+#
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Alle Neuinstallationen werden das als Voreinstellung haben."
+
+#
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Geben Sie den Namen eines Benutzerkontos f�r die LDAP-Datenbank ein."
+
+#
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Dar�berhinaus ist es klug, die ldap-Eintr�ge aus der nsswitch.conf zu "
+#~ "l�schen, bevor Sie dieses Paket entfernen, um die Funktion der "
+#~ "Grunddienste zu erhalten."
 
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=example,dc=net"
@@ -367,12 +337,6 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#  Template: shared/ldapns/ldap-server
-#  ddtp-prioritize: 56
-#
-#~ msgid "LDAP server host address"
-#~ msgstr "LDAP-Server Host-Adresse"
-
 #
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Bitte geben Sie die vom LDAP-Server genutzte Adresse an."
diff --git a/debian/po/es.po b/debian/po/es.po
index e820c3a..3231a45 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Debian Description Translation Project <debconf@ddtp.debian."
 "org>\n"
@@ -16,115 +16,53 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
 
-#. Type: note
+#
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
+"NOTA: Es siempre una buena idea especificar una direcci�n IP en vez de un "
+"nombre, ya que reduce el riesgo de fallos en caso de que el servicio de "
+"nombres no est� disponible."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
-#  Template: libnss-ldap/confperm
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "make configuration readable/writeable by owner only"
-# msgstr ""
-#
-# msgid ""
-# "Should the libnss-ldap configuration file be readable and writable only by "
-# "the file owner?"
-# msgstr ""
-#
-# msgid ""
-# "If you use passwords in your libnss-ldap configuration, it is usually a "
-# "good idea to have the configuration set with mode 0600 (readable and "
-# "writable only by the file's owner)."
-# msgstr ""
-#
-# msgid ""
-# "Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-# "and will only set the mode to 0600 if nscd is present."
-# msgstr ""
-#  Template: libnss-ldap/nsswitch
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "nsswitch.conf is not managed automatically"
-# msgstr ""
-#
-# msgid ""
-# "For this package to work, you need to modify your /etc/nsswitch.conf to "
-# "use the ldap datasource.  There is an example file at "
-# "/usr/share/doc/libnss-ldap/examples/nsswitch.ldap which can be used as an "
-# "example for your nsswitch setup, or it can be copied over your current "
-# "setup."
-# msgstr ""
-#
-# msgid ""
-# "Also, before removing this package, it is wise to remove the ldap entries "
-# "from nsswitch.conf to keep basic services functioning."
-# msgstr ""
-#  Template: shared/ldapns/base-dn
+#  Template: shared/ldapns/ldap-server
 #  ddtp-prioritize: 56
 #
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "El nombre distintivo (DN) de la base de b�squedas."
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "Servidor LDAP"
 
 #
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -136,90 +74,6 @@ msgstr ""
 "prop�sito. Por ejemplo, el dominio \"ejemplo.net\" utilizar�a \"dc=ejemplo,"
 "dc=net\" como nombre distintivo de la base de b�squedas."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-
 #  Template: libnss-ldap/dblogin
 #  ddtp-prioritize: 56
 #
@@ -288,17 +142,18 @@ msgstr ""
 #
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Versi�n de LDAP a utilizar"
 
 #
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Por favor introduzca la versi�n del protocolo LDAP que usar� ldapns. "
 "Generalmente es una buena idea utilizar el n�mero de versi�n m�s alto que "
@@ -306,107 +161,144 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
+#: ../libnss-ldapd.templates:4001
+msgid "LDAP database user"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
-#
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"NOTA: Es siempre una buena idea especificar una direcci�n IP en vez de un "
-"nombre, ya que reduce el riesgo de fallos en caso de que el servicio de "
-"nombres no est� disponible."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
-#  Template: shared/ldapns/ldap-server
+#  Template: libnss-ldap/confperm
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "make configuration readable/writeable by owner only"
+# msgstr ""
+#
+# msgid ""
+# "Should the libnss-ldap configuration file be readable and writable only by "
+# "the file owner?"
+# msgstr ""
+#
+# msgid ""
+# "If you use passwords in your libnss-ldap configuration, it is usually a "
+# "good idea to have the configuration set with mode 0600 (readable and "
+# "writable only by the file's owner)."
+# msgstr ""
+#
+# msgid ""
+# "Note: As a sanity check, libnss-ldap will check if you have nscd installed "
+# "and will only set the mode to 0600 if nscd is present."
+# msgstr ""
+#  Template: libnss-ldap/nsswitch
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "nsswitch.conf is not managed automatically"
+# msgstr ""
+#
+# msgid ""
+# "For this package to work, you need to modify your /etc/nsswitch.conf to "
+# "use the ldap datasource.  There is an example file at "
+# "/usr/share/doc/libnss-ldap/examples/nsswitch.ldap which can be used as an "
+# "example for your nsswitch setup, or it can be copied over your current "
+# "setup."
+# msgstr ""
+#
+# msgid ""
+# "Also, before removing this package, it is wise to remove the ldap entries "
+# "from nsswitch.conf to keep basic services functioning."
+# msgstr ""
+#  Template: shared/ldapns/base-dn
 #  ddtp-prioritize: 56
 #
-#~ msgid "LDAP server host address"
-#~ msgstr "Servidor LDAP"
+#~ msgid "distinguished name of the search base"
+#~ msgstr "El nombre distintivo (DN) de la base de b�squedas."
 
 #
 #~ msgid "Please enter the address of the LDAP server used."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index bec8edb..e719557 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2004-02-17 07:40+0100\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -14,86 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr ""
-"Le fichier de configuration doit-il �tre lisible et modifiable uniquement "
-"par son propri�taire�?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Vous pouvez choisir de r�server l'acc�s en lecture et en �criture au fichier "
-"de configuration de libnss-ldap � son seul propri�taire."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Si vous utilisez des mots de passe dans la configuration de libnss-ldap, "
-"mettre le syst�me des permissions � 0600 (seul le propri�taire peut lire ou "
-"modifier le fichier) est recommand�."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Note�: bien s�r, libnss-ldap v�rifiera que nscd est install� et ne mettra le "
-"mode � 0600 que si nscd est pr�sent."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "Nsswitch.conf n'est pas g�r� automatiquement"
+"Note�: utiliser une adresse IP est recommand�; les risques d'�chec sont "
+"r�duits en cas d'indisponibilit� du service de noms."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Pour que ce paquet fonctionne, vous devez modifier /etc/nsswitch.conf pour "
-"qu'il utilise la base de donn�es LDAP. Un fichier mod�le se trouve dans /usr/"
-"share/doc/libnss-ldap/examples/nsswitch.ldap�; vous pouvez l'utiliser pour "
-"la configuration de nsswitch ou bien le mettre � la place de votre "
-"configuration actuelle."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
-msgstr ""
-"Avant de supprimer ce paquet, il est sage de supprimer les entr�es LDAP du "
-"fichier nsswitch.conf pour que les services de base continuent � fonctionner."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "Nom distinctif (DN) de la base de recherche�:"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "Adresse du serveur LDAP�:"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -105,212 +66,220 @@ msgstr ""
 "domaine ��exemple.net��, le nom distinctif utilis� serait ��dc=exemple,"
 "dc=net��."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "La base de donn�es demande-t-elle une identification�?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "La base LDAP demande-t-elle une identification�?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Choisissez cette option s'il est n�cessaire de s'identifier avant de pouvoir "
-"utiliser la base."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Note�: avec une configuration classique, ce n'est pas n�cessaire."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr ""
-"Faut-il autoriser les mises � jour automatiques de la configuration par "
-"Debconf�?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"Debconf peut-il mettre � jour automatiquement le fichier de configuration de "
-"libnss-ldap�?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "Libnss-ldap a �t� modifi� pour utiliser debconf pour sa configuration."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Ce fichier commencera par ��###DEBCONF###���; vous pouvez d�sactiver la "
-"gestion par debconf en supprimant cette ligne."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr ""
-"Cette possibilit� est activ�e par d�faut pour les premi�res installations."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "Utilisateur non privil�gi� de la base�:"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr "Veuillez indiquer l'identifiant qui permettra l'acc�s � la base LDAP."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "Mot de passe de l'utilisateur de la base�:"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-"Veuillez indiquer le mot de passe qui permettra l'acc�s � la base LDAP."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Version de LDAP � utiliser�:"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Veuillez indiquer la version du protocole LDAP que doit utiliser ldapns. Il "
 "est recommand� de choisir le num�ro de version le plus �lev� disponible."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "Utilisateur non privil�gi� de la base�:"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Note�: utiliser une adresse IP est recommand�; les risques d'�chec sont "
-"r�duits en cas d'indisponibilit� du service de noms."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
+"Veuillez indiquer le mot de passe qui permettra l'acc�s � la base LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
+"Veuillez indiquer le mot de passe qui permettra l'acc�s � la base LDAP."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Pour que ce paquet fonctionne, vous devez modifier /etc/nsswitch.conf pour "
+"qu'il utilise la base de donn�es LDAP. Un fichier mod�le se trouve dans /usr/"
+"share/doc/libnss-ldap/examples/nsswitch.ldap�; vous pouvez l'utiliser pour "
+"la configuration de nsswitch ou bien le mettre � la place de votre "
+"configuration actuelle."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "Nom distinctif (DN) de la base de recherche�:"
+
+#~ msgid "password for database login account"
+#~ msgstr "Mot de passe de l'utilisateur de la base�:"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "Nsswitch.conf n'est pas g�r� automatiquement"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr ""
+#~ "Le fichier de configuration doit-il �tre lisible et modifiable uniquement "
+#~ "par son propri�taire�?"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Vous pouvez choisir de r�server l'acc�s en lecture et en �criture au "
+#~ "fichier de configuration de libnss-ldap � son seul propri�taire."
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Si vous utilisez des mots de passe dans la configuration de libnss-ldap, "
+#~ "mettre le syst�me des permissions � 0600 (seul le propri�taire peut lire "
+#~ "ou modifier le fichier) est recommand�."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Note�: bien s�r, libnss-ldap v�rifiera que nscd est install� et ne mettra "
+#~ "le mode � 0600 que si nscd est pr�sent."
+
+#~ msgid "database requires login"
+#~ msgstr "La base de donn�es demande-t-elle une identification�?"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "La base LDAP demande-t-elle une identification�?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Choisissez cette option s'il est n�cessaire de s'identifier avant de "
+#~ "pouvoir utiliser la base."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Note�: avec une configuration classique, ce n'est pas n�cessaire."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr ""
+#~ "Faut-il autoriser les mises � jour automatiques de la configuration par "
+#~ "Debconf�?"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Debconf peut-il mettre � jour automatiquement le fichier de configuration "
+#~ "de libnss-ldap�?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr ""
+#~ "Libnss-ldap a �t� modifi� pour utiliser debconf pour sa configuration."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Ce fichier commencera par ��###DEBCONF###���; vous pouvez d�sactiver la "
+#~ "gestion par debconf en supprimant cette ligne."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr ""
+#~ "Cette possibilit� est activ�e par d�faut pour les premi�res installations."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Veuillez indiquer l'identifiant qui permettra l'acc�s � la base LDAP."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Avant de supprimer ce paquet, il est sage de supprimer les entr�es LDAP "
+#~ "du fichier nsswitch.conf pour que les services de base continuent � "
+#~ "fonctionner."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=exemple,dc=net"
 
@@ -324,8 +293,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "Adresse du serveur LDAP�:"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Veuillez indiquer l'adresse IP du serveur LDAP�:"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index ec88dc5..9cb17eb 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2003-09-15 11:02+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -23,83 +23,47 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "�����ʤΤ�����ե�������ɤ߽񤭤��Ǥ���褦�ˤ���"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"�ե�����Υ����ʤΤ� libnss-ldap ����ե�������ɤ߽񤭤��Ǥ���褦�ˤ��ޤ�"
-"��?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"libnss-ldap ����ǥѥ���ɤ�Ȥ���硢����˥⡼�� 0600 (�ե�����Υ����ʤ�"
-"���ɤ߽񤭲�ǽ) �򥻥åȤ���Τ��ɤ��ͤ��Ǥ���"
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"����: �����������å��Ȥ��ơ�libnss-ldap �� nscd �򥤥󥹥ȡ��뤷�Ƥ��뤫��"
-"�����å�����nscd ���󶡤���Ƥ������ 0600 �˥⡼�ɤ򥻥åȤ�������ˤ���"
-"����"
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf �ϼ�ưŪ�ˤϴ�������ޤ���"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"���Υѥå�������ư��뤿��ˡ�ldap �ǡ����꥽������Ȥ��褦 /etc/nsswitch."
-"conf ���ѹ�����ɬ�פ�����ޤ���/usr/share/doc/libnss-ldap/examples/nsswitch."
-"ldap �ˡ����ʤ��� nsswitch �Υ��åȥ��åפ���Ȥ������ѡ����뤤�ϸ��ߤΥ��å�"
-"���åפ˾�񤭥��ԡ��Ǥ��븫�ܥե����뤬����ޤ���"
+"����: IP ���ɥ쥹��Ȥ��Τϡ��̾�ɤ��ͤ��Ǥ�������ϥ͡��ॵ���ӥ������Ѥ�"
+"���ʤ��Ȥ��ξ㳲�δ����򸺤餷�ޤ���"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"�ޤ������Υѥå����������������ˤϡ�����Ū�ʥ����ӥ���ǽ���ݻ����뤿��� "
-"nsswitch.conf ���� ldap ����ȥ�������Ƥ����Τ������Ǥ���"
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "�����١����μ���̾"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "LDAP �����ФΥۥ��ȥ��ɥ쥹"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -110,207 +74,208 @@ msgstr ""
 "�Ǥ򤳤���Ū�˻ȤäƤ��ޤ������Ȥ��С��ɥᥤ�� \"example.net\" �Ǥϸ����١���"
 "�μ���̾�Ȥ��� \"dc=example,dc=net\" ��ȤäƤ���Ǥ��礦��"
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "�ǡ����١����Υ��������ɬ��"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "LDAP �ǡ����١����ϥ��������ɬ�פȤ��ޤ���?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"��������ʤ��˥ǡ����١������饨��ȥ������Ǥ��ʤ��Ȥ����Ȥ��˸¤ꡢ�֤�"
-"���פ򤳤μ���������Ƥ���������"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "����: �̾�Υ��åȥ��åײ��Ǥϡ������ɬ�פ���ޤ���"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "debconf �ˤ�뼫ư���깹����ͭ���ˤ���"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr "debconf �� libnss-ldap ������ե������ưŪ�˹������ޤ���?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "libnss-ldap �Ϥ�������� debconf ��Ȥ��褦���ѹ�����ޤ�����"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"�ե�����ˤ� \"###DEBCONF###\" �������ղä���Ƥ��ޤ������ιԤ������뤳��"
-"�ǡ�debconf �ι�����̵���ˤǤ��ޤ���"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "�����Υ��󥹥ȡ���ǤϤ��٤ơ����줬�ǥե���Ȥ�¸�ߤ��ޤ���"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "�ø��Τʤ��ǡ����١����桼��"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ����������̾�����Ϥ��Ƥ���������"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "�ǡ����١����������󥢥�����ȤΥѥ����"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ��ѥ���ɤ����Ϥ��Ƥ���������"
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "���Ѥ��� LDAP �С������"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "���Ѥ��� LDAP �ץ��ȥ��� ldapns �ΥС����������Ϥ��Ƥ������������ѤǤ����"
 "��⤤�С�������ֹ�򤳤������ꤹ��Τϡ��̾�ɤ��ͤ��Ǥ���"
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "�ø��Τʤ��ǡ����١����桼��"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"����: IP ���ɥ쥹��Ȥ��Τϡ��̾�ɤ��ͤ��Ǥ�������ϥ͡��ॵ���ӥ������Ѥ�"
-"���ʤ��Ȥ��ξ㳲�δ����򸺤餷�ޤ���"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
-msgstr ""
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ��ѥ���ɤ����Ϥ��Ƥ���������"
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ��ѥ���ɤ����Ϥ��Ƥ���������"
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"���Υѥå�������ư��뤿��ˡ�ldap �ǡ����꥽������Ȥ��褦 /etc/nsswitch."
+"conf ���ѹ�����ɬ�פ�����ޤ���/usr/share/doc/libnss-ldap/examples/nsswitch."
+"ldap �ˡ����ʤ��� nsswitch �Υ��åȥ��åפ���Ȥ������ѡ����뤤�ϸ��ߤΥ��å�"
+"���åפ˾�񤭥��ԡ��Ǥ��븫�ܥե����뤬����ޤ���"
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "�����١����μ���̾"
+
+#~ msgid "password for database login account"
+#~ msgstr "�ǡ����١����������󥢥�����ȤΥѥ����"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf �ϼ�ưŪ�ˤϴ�������ޤ���"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "�����ʤΤ�����ե�������ɤ߽񤭤��Ǥ���褦�ˤ���"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "�ե�����Υ����ʤΤ� libnss-ldap ����ե�������ɤ߽񤭤��Ǥ���褦�ˤ���"
+#~ "����?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "libnss-ldap ����ǥѥ���ɤ�Ȥ���硢����˥⡼�� 0600 (�ե�����Υ���"
+#~ "�ʤΤ��ɤ߽񤭲�ǽ) �򥻥åȤ���Τ��ɤ��ͤ��Ǥ���"
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "����: �����������å��Ȥ��ơ�libnss-ldap �� nscd �򥤥󥹥ȡ��뤷�Ƥ��뤫��"
+#~ "�����å�����nscd ���󶡤���Ƥ������ 0600 �˥⡼�ɤ򥻥åȤ�������ˤ�"
+#~ "�ޤ���"
+
+#~ msgid "database requires login"
+#~ msgstr "�ǡ����١����Υ��������ɬ��"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "LDAP �ǡ����١����ϥ��������ɬ�פȤ��ޤ���?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "��������ʤ��˥ǡ����١������饨��ȥ������Ǥ��ʤ��Ȥ����Ȥ��˸¤ꡢ�֤�"
+#~ "���פ򤳤μ���������Ƥ���������"
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "����: �̾�Υ��åȥ��åײ��Ǥϡ������ɬ�פ���ޤ���"
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "debconf �ˤ�뼫ư���깹����ͭ���ˤ���"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr "debconf �� libnss-ldap ������ե������ưŪ�˹������ޤ���?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "libnss-ldap �Ϥ�������� debconf ��Ȥ��褦���ѹ�����ޤ�����"
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "�ե�����ˤ� \"###DEBCONF###\" �������ղä���Ƥ��ޤ������ιԤ������뤳"
+#~ "�Ȥǡ�debconf �ι�����̵���ˤǤ��ޤ���"
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "�����Υ��󥹥ȡ���ǤϤ��٤ơ����줬�ǥե���Ȥ�¸�ߤ��ޤ���"
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ����������̾�����Ϥ��Ƥ���������"
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "�ޤ������Υѥå����������������ˤϡ�����Ū�ʥ����ӥ���ǽ���ݻ����뤿��"
+#~ "�� nsswitch.conf ���� ldap ����ȥ�������Ƥ����Τ������Ǥ���"
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=example,dc=net"
 
@@ -324,8 +289,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "LDAP �����ФΥۥ��ȥ��ɥ쥹"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "���Ѥ��� LDAP �����ФΥ��ɥ쥹�����Ϥ��Ƥ���������"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 7b1f28f..e065088 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2003-08-08 23:07+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,85 +23,48 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr ""
-"zorg dat de configuratie enkel te bekijken/veranderen is door de eigenaar"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Wilt u dat het libnss-ldap configuratiebestand enkel te bekijken en "
-"veranderen is door de bestandeigenaar?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Indien u wachtwoorden gebruikt in uw libnss-ldap configuratie is het meestal "
-"een goed idee om het configuratie bestand modus 0600 te geven (enkel lees- "
-"en schrijfbaar door de eigenaar van het bestand."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Opmerking: libnss-ldap zal nagaan of u nscd geinstalleerd heeft, en zal de "
-"modus enkel naar 0600 zetten indien nscd aanwezig is."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf wordt niet automatisch beheerd"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Opdat dit pakket zou werken dient u uw /etc/nsswitch.conf bestand aan te "
-"passen om de ldap databron te gebruiken. Er is een voorbeeldbestand te "
-"vinden in /usr/share/doc/libnss-ldap/examples/nsswitch.ldap , u kunt dit "
-"gebruiken als een startpunt."
+"Opmerking: In het algemeen is het een goed idee om een IP adres te "
+"gebruiken; dit vermindert de kans op mislukkingen indien de eventnaam dienst "
+"onbeschikbaar is."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Daarnaast is het wenselijk om voor de verwijdering van dit pakket de ldap "
-"ingangen uit nsswitch.conf te verwijderen, teneinde de basis diensten "
-"werkend te houden."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "onderscheiden naam van de zoek basis"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "LDAP server host adres"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -113,112 +76,19 @@ msgstr ""
 "Bijvoorbeeld: de domein naam\"voorbeeld.net\" zou gebruik maken van "
 "\"dc=voorbeeld,dc=net\" als de onderscheiden naam van de zoek basis."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "database vereist aanmelding"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Wordt aanmelden door de LDAP database vereist?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Beantwoord dit enkel positief indien u geen ingangen van de database kunt "
-"ontvangen zonder aan te melden."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Opmerking: In een normale opzet is dit niet nodig."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "activeer automatische actualizatie van de configuratie via debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"Wilt u het libnss-ldap configuratiebestand automatisch door debconf laten "
-"actualizeren?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "libnss-ldap is overgeschakeld naar debconf voor configuratie."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Dit bestand zal beginnen met \"###DEBCONF###\"; u kunt debconf actualizatie "
-"uitschakelen door deze regel te verwijderen."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Alle nieuwe installaties gebruiken dit bij default."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "niet bevoorrechte database gebruiker"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Voer de naam in van de account die zal gebruikt worden voor aanmelding bij "
-"de LDAP database"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "wachtwoord voor de database aanmeldings account"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP database aan te "
-"melden."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Te gebruiken LDAP versie"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Gelieve de door ldapns te gebruiken versie van het LDAP protocol in te "
 "voeren. Gewoonlijk is het een goed idee om dit op het hoogst beschikbare "
@@ -226,101 +96,198 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "niet bevoorrechte database gebruiker"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Opmerking: In het algemeen is het een goed idee om een IP adres te "
-"gebruiken; dit vermindert de kans op mislukkingen indien de eventnaam dienst "
-"onbeschikbaar is."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
+"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP database aan te "
+"melden."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
+"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP database aan te "
+"melden."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Opdat dit pakket zou werken dient u uw /etc/nsswitch.conf bestand aan te "
+"passen om de ldap databron te gebruiken. Er is een voorbeeldbestand te "
+"vinden in /usr/share/doc/libnss-ldap/examples/nsswitch.ldap , u kunt dit "
+"gebruiken als een startpunt."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "onderscheiden naam van de zoek basis"
+
+#~ msgid "password for database login account"
+#~ msgstr "wachtwoord voor de database aanmeldings account"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf wordt niet automatisch beheerd"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr ""
+#~ "zorg dat de configuratie enkel te bekijken/veranderen is door de eigenaar"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Wilt u dat het libnss-ldap configuratiebestand enkel te bekijken en "
+#~ "veranderen is door de bestandeigenaar?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Indien u wachtwoorden gebruikt in uw libnss-ldap configuratie is het "
+#~ "meestal een goed idee om het configuratie bestand modus 0600 te geven "
+#~ "(enkel lees- en schrijfbaar door de eigenaar van het bestand."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Opmerking: libnss-ldap zal nagaan of u nscd geinstalleerd heeft, en zal "
+#~ "de modus enkel naar 0600 zetten indien nscd aanwezig is."
+
+#~ msgid "database requires login"
+#~ msgstr "database vereist aanmelding"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Wordt aanmelden door de LDAP database vereist?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Beantwoord dit enkel positief indien u geen ingangen van de database kunt "
+#~ "ontvangen zonder aan te melden."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Opmerking: In een normale opzet is dit niet nodig."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "activeer automatische actualizatie van de configuratie via debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Wilt u het libnss-ldap configuratiebestand automatisch door debconf laten "
+#~ "actualizeren?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "libnss-ldap is overgeschakeld naar debconf voor configuratie."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Dit bestand zal beginnen met \"###DEBCONF###\"; u kunt debconf "
+#~ "actualizatie uitschakelen door deze regel te verwijderen."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Alle nieuwe installaties gebruiken dit bij default."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Voer de naam in van de account die zal gebruikt worden voor aanmelding "
+#~ "bij de LDAP database"
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Daarnaast is het wenselijk om voor de verwijdering van dit pakket de ldap "
+#~ "ingangen uit nsswitch.conf te verwijderen, teneinde de basis diensten "
+#~ "werkend te houden."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=voorbeeld,dc=net"
 
@@ -334,8 +301,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "LDAP server host adres"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Gelieve het adres van de te gebruiken LDAP server in te voeren."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 877e752..4a12eb0 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_203-1\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2003-03-08 11:39+0300\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -23,84 +23,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "Tornar a configura��o leg�vel/grav�vel somente pelo dono"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"O arquivo de configura��o da libnss-ldap deve ser leg�vel e grav�vel somente "
-"pelo dono do arquivo ?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Caso voc� use senhas em seu arquivo de configura��o da libnss-ldap � "
-"normalmente uma boa id�ia ter as permiss�es do arquivo de configura��o "
-"definidas para o modo 0600 (leg�vel e grav�vel apenas pelo dono do arquivo)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Nota : Como uma medida extra, a libnss-ldap ir� checar se voc� possui o nscd "
-"instalado e somente ir� deinir o modo 0600 caso o nscd esteja instalado."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "O arquivo nsswitch.conf n�o � gerenciado automaticamente."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Para que este pacote funcione, voc� precisa modificar seu arquivo /etc/"
-"nsswitch.conf para usar a fonte de dados ldap. Existe um arquivo de exemplo "
-"em /usr/share/doc/libnss-ldap/examples/nsswitch.ldap que pode ser usado como "
-"um exemplo para a sua configura��o do nsswitch ou que pode ser copiado "
-"sobrepondo sua configura��o atual."
+"Nota: � normalmente uma boa id�ia usar um endere�o IP; isto reduz riscos de "
+"falhas no caso do servidor de nomes n�o estar dispon�vel."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Adicionalmente, antes de remover este pacote, � s�bio remover as entradas "
-"ldap do arquivo nsswitch.conf para manter os servi�os b�sicos funcionando."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "O nome distinto (dn) da base de procura."
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "Endere�o da m�quina servidora LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -112,111 +75,19 @@ msgstr ""
 "dom�nio \"example.net\" usaria \"dc=example,dc=net\" como o nome distinto da "
 "base de procura."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "Base de dados requer autentica��o."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "A base de dados LDAP requer autentica��o ?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Responda a esta quest�o afirmativamente somente caso voc� n�o possa obter "
-"entradas da base de dados LDAP sem antes se autenticar."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Nota : Sob um configura��o normal, isto n�o � necess�rio."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "Habilitar atualiza��es autom�ticas de configura��o pelo debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"O debconf deve atualizar automaticamente o arquivo de configura��o da libnss-"
-"ldap ?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "A libnss-ldap est� agora usando debconf para sua configura��o."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"O arquivo de configura��o ser� marcado com \"###DEBCONF###\"; voc� pode "
-"desabilitar as atualiza��es debconf removendo essa linha."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Todas as novas instala��es ter�o isso por padr�o."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "Usu�rio n�o previlegiado da base de dados."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Informe o nome da conta que ser� usada para se autenticar na base de dados "
-"LDAP."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "Senha para a autentica��o na base de dados."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-"Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Vers�o do protocolo LDAP a ser utilizada."
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Por favor informe qual vers�o do protocolo LDAP ldapns deve ser usada. "
 "Normalmente � uma boa id�ia definir esta op��o para o n�mero de vers�o mais "
@@ -224,100 +95,197 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "Usu�rio n�o previlegiado da base de dados."
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Nota: � normalmente uma boa id�ia usar um endere�o IP; isto reduz riscos de "
-"falhas no caso do servidor de nomes n�o estar dispon�vel."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
+"Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
+"Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
-#. Type: password
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Para que este pacote funcione, voc� precisa modificar seu arquivo /etc/"
+"nsswitch.conf para usar a fonte de dados ldap. Existe um arquivo de exemplo "
+"em /usr/share/doc/libnss-ldap/examples/nsswitch.ldap que pode ser usado como "
+"um exemplo para a sua configura��o do nsswitch ou que pode ser copiado "
+"sobrepondo sua configura��o atual."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "O nome distinto (dn) da base de procura."
+
+#~ msgid "password for database login account"
+#~ msgstr "Senha para a autentica��o na base de dados."
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "O arquivo nsswitch.conf n�o � gerenciado automaticamente."
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "Tornar a configura��o leg�vel/grav�vel somente pelo dono"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "O arquivo de configura��o da libnss-ldap deve ser leg�vel e grav�vel "
+#~ "somente pelo dono do arquivo ?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Caso voc� use senhas em seu arquivo de configura��o da libnss-ldap � "
+#~ "normalmente uma boa id�ia ter as permiss�es do arquivo de configura��o "
+#~ "definidas para o modo 0600 (leg�vel e grav�vel apenas pelo dono do "
+#~ "arquivo)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Nota : Como uma medida extra, a libnss-ldap ir� checar se voc� possui o "
+#~ "nscd instalado e somente ir� deinir o modo 0600 caso o nscd esteja "
+#~ "instalado."
+
+#~ msgid "database requires login"
+#~ msgstr "Base de dados requer autentica��o."
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "A base de dados LDAP requer autentica��o ?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Responda a esta quest�o afirmativamente somente caso voc� n�o possa obter "
+#~ "entradas da base de dados LDAP sem antes se autenticar."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Nota : Sob um configura��o normal, isto n�o � necess�rio."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "Habilitar atualiza��es autom�ticas de configura��o pelo debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "O debconf deve atualizar automaticamente o arquivo de configura��o da "
+#~ "libnss-ldap ?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "A libnss-ldap est� agora usando debconf para sua configura��o."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "O arquivo de configura��o ser� marcado com \"###DEBCONF###\"; voc� pode "
+#~ "desabilitar as atualiza��es debconf removendo essa linha."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Todas as novas instala��es ter�o isso por padr�o."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Informe o nome da conta que ser� usada para se autenticar na base de "
+#~ "dados LDAP."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Adicionalmente, antes de remover este pacote, � s�bio remover as entradas "
+#~ "ldap do arquivo nsswitch.conf para manter os servi�os b�sicos funcionando."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=example,dc=net"
 
@@ -331,8 +299,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "Endere�o da m�quina servidora LDAP."
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Por favor informe o endere�o do servidor LDAP usada."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 1f14fd6..2db87e5 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_211-4\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2003-11-19 15:00+0500\n"
 "Last-Translator: Ilgiz Kalmetev <translator@ilgiz.pp.ru>\n"
 "Language-Team: russian <debian-russian@lists.debian.org>\n"
@@ -17,128 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "��������� ������/������ ��������� ������ ���������"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"����� �� ������� ���, ����� ������/������ � ���� �������� libnss-ldap ��� "
-"������ �������� �����?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"���� �� ����������� ������ � ����� ���������� libnss-ldap, ����� ���� �� "
-"������� ���������� ����� ������� � ����� �������� � 0600 (������ � ������ "
-"��������� ������ ��������� �����)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"����������: ��� ������������, libnss-ldap ��������, ���������� �� �� nscd, � "
-"��������� ����� ������� 0600, ���� nscd ����������."
 
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf �� ����������� �������������"
-
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"����� ���� ����� ���������: ��� ���� ��������������� ���� /etc/nsswitch."
-"conf, ����� �� ����������� ldap-���������. ������ ��������� nsswitch ���� � /"
-"usr/share/doc/libnss-ldap/examples/nsswitch.ldap, ��� ����� ����� �� ������ "
-"����� ���������."
+"����������: ������, ����� ������������ IP-�����; ��� ������� ���� ��������� "
+"�������, ���� ������ ���� �������� �����������."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"�����: ����� ��������� ����� ������, �� ������ ������ ldap �� ����� nsswitch."
-"conf, ����� ������ �������� �������� �� ����������."
 
-#  Template: libnss-ldap/confperm
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "make configuration readable/writeable by owner only"
-# msgstr ""
-#
-# msgid ""
-# "Should the libnss-ldap configuration file be readable and writable only by "
-# "the file owner?"
-# msgstr ""
-#
-# msgid ""
-# "If you use passwords in your libnss-ldap configuration, it is usually a "
-# "good idea to have the configuration set with mode 0600 (readable and "
-# "writable only by the file's owner)."
-# msgstr ""
-#
-# msgid ""
-# "Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-# "and will only set the mode to 0600 if nscd is present."
-# msgstr ""
-#  Template: libnss-ldap/nsswitch
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "nsswitch.conf is not managed automatically"
-# msgstr ""
-#
-# msgid ""
-# "For this package to work, you need to modify your /etc/nsswitch.conf to "
-# "use the ldap datasource.  There is an example file at "
-# "/usr/share/doc/libnss-ldap/examples/nsswitch.ldap which can be used as an "
-# "example for your nsswitch setup, or it can be copied over your current "
-# "setup."
-# msgstr ""
-#
-# msgid ""
-# "Also, before removing this package, it is wise to remove the ldap entries "
-# "from nsswitch.conf to keep basic services functioning."
-# msgstr ""
-#  Template: shared/ldapns/base-dn
-#  ddtp-prioritize: 56
-#
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "�������������� ��� ���� ������."
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "�������� ����� ������� LDAP"
 
 #
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -150,207 +70,254 @@ msgstr ""
 "\"example.net\"   �����������   ��   \"dc=example,dc=net\"  ��� "
 "�������������� ��� ��� ���� ������."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "���� ������ ������� ������� ���"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "���� ������ LDAP ������� ������� ���?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"����� �� ���� ������ ����������� ������ � ��� ������, ���� �� �� ������� "
-"�������� ������ �� ���� �� ���� ������� ������."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "����������: ��� ������� ��������� ��� �� ���������."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "��������� �������������� ���������� � ������� debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr "������ �� debconf ������������� ��������� ���� �������� libnss-ldap?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "libnss-ldap ��� ����� ��������� ���������� debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"���� ����� ������� ��������� � ������ \"###DEBCONF###\"; �� ������ ��������� "
-"���������� debconf, ������ ��� ������."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "��� ����� ������������� ������� ������ ����� ��� �� ���������."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "������������������� ������������ ���� ������"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr "������� ��� ������� ������ ��� ����������� � ���� ������ LDAP."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "������ ��� ������� ������ ���� ������"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-"������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "������������ ������ LDAP"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "������� ������ ��������� LDAP, ������� ����� ������������ ldapns. ������ "
 "����� ������������ ������ � ���������� �������."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "������������������� ������������ ���� ������"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"����������: ������, ����� ������������ IP-�����; ��� ������� ���� ��������� "
-"�������, ���� ������ ���� �������� �����������."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
+"������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
+"������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
 
-#. Type: password
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"����� ���� ����� ���������: ��� ���� ��������������� ���� /etc/nsswitch."
+"conf, ����� �� ����������� ldap-���������. ������ ��������� nsswitch ���� � /"
+"usr/share/doc/libnss-ldap/examples/nsswitch.ldap, ��� ����� ����� �� ������ "
+"����� ���������."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#  Template: libnss-ldap/confperm
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "make configuration readable/writeable by owner only"
+# msgstr ""
+#
+# msgid ""
+# "Should the libnss-ldap configuration file be readable and writable only by "
+# "the file owner?"
+# msgstr ""
+#
+# msgid ""
+# "If you use passwords in your libnss-ldap configuration, it is usually a "
+# "good idea to have the configuration set with mode 0600 (readable and "
+# "writable only by the file's owner)."
+# msgstr ""
+#
+# msgid ""
+# "Note: As a sanity check, libnss-ldap will check if you have nscd installed "
+# "and will only set the mode to 0600 if nscd is present."
+# msgstr ""
+#  Template: libnss-ldap/nsswitch
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "nsswitch.conf is not managed automatically"
+# msgstr ""
+#
+# msgid ""
+# "For this package to work, you need to modify your /etc/nsswitch.conf to "
+# "use the ldap datasource.  There is an example file at "
+# "/usr/share/doc/libnss-ldap/examples/nsswitch.ldap which can be used as an "
+# "example for your nsswitch setup, or it can be copied over your current "
+# "setup."
+# msgstr ""
+#
+# msgid ""
+# "Also, before removing this package, it is wise to remove the ldap entries "
+# "from nsswitch.conf to keep basic services functioning."
+# msgstr ""
+#  Template: shared/ldapns/base-dn
+#  ddtp-prioritize: 56
+#
+#~ msgid "distinguished name of the search base"
+#~ msgstr "�������������� ��� ���� ������."
+
+#~ msgid "password for database login account"
+#~ msgstr "������ ��� ������� ������ ���� ������"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf �� ����������� �������������"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "��������� ������/������ ��������� ������ ���������"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "����� �� ������� ���, ����� ������/������ � ���� �������� libnss-ldap ��� "
+#~ "������ �������� �����?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "���� �� ����������� ������ � ����� ���������� libnss-ldap, ����� ���� �� "
+#~ "������� ���������� ����� ������� � ����� �������� � 0600 (������ � ������ "
+#~ "��������� ������ ��������� �����)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "����������: ��� ������������, libnss-ldap ��������, ���������� �� �� "
+#~ "nscd, � ��������� ����� ������� 0600, ���� nscd ����������."
+
+#~ msgid "database requires login"
+#~ msgstr "���� ������ ������� ������� ���"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "���� ������ LDAP ������� ������� ���?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "����� �� ���� ������ ����������� ������ � ��� ������, ���� �� �� ������� "
+#~ "�������� ������ �� ���� �� ���� ������� ������."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "����������: ��� ������� ��������� ��� �� ���������."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "��������� �������������� ���������� � ������� debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "������ �� debconf ������������� ��������� ���� �������� libnss-ldap?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "libnss-ldap ��� ����� ��������� ���������� debconf"
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "���� ����� ������� ��������� � ������ \"###DEBCONF###\"; �� ������ "
+#~ "��������� ���������� debconf, ������ ��� ������."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "��� ����� ������������� ������� ������ ����� ��� �� ���������."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr "������� ��� ������� ������ ��� ����������� � ���� ������ LDAP."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "�����: ����� ��������� ����� ������, �� ������ ������ ldap �� ����� "
+#~ "nsswitch.conf, ����� ������ �������� �������� �� ����������."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=example,dc=net"
 
@@ -364,8 +331,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "�������� ����� ������� LDAP"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "������� �����, ������� ���������� ������ LDAP."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 63d1bbb..94f5899 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1.1\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2005-11-24 19:26+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -25,84 +25,47 @@ msgstr ""
 "X-Poedit-Language: sv\n"
 "X-Poedit-Country: sv\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "g�r konfigurationen endast l�sbar/skrivbar f�r �garen"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Ska konfigurationsfilen f�r libnss-ldap vara l�s- och skrivbar bara f�r "
-"fil�garen?"
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Om du anv�nder l�senord i din konfiguration f�r libnss-ldap �r det normalt "
-"sett en bra ide att ha konfigurationsfilen satt till 0600 (l�s- och skrivbar "
-"bara f�r fil�garen)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Notera: Som en ren kontroll kommer libnss-ldap att kontrollera om du har "
-"nscd installerad och kommer bara att s�tta 0600 om nscd finns p� systemet."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "nsswitch.conf hanteras inte automatiskt"
+"Notera: Det �r vanligtvis en bra ide att anv�nda en IP-address; detta "
+"reducerar risken f�r fel om namntj�nsten �r otillg�nglig."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"F�r att detta paket ska fungera beh�ver du modifiera din /etc/nsswitch.conf "
-"att anv�nda en LDAP-datak�lla. Det finns en exempelfil, /usr/share/doc/"
-"libnss-ldap/examples/nsswitch.ldap som kan anv�ndas som ett exempel f�r din "
-"konfiguration av nsswitch eller s� kan den kopieras �ver din nuvarande "
-"konfiguration."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
-msgstr ""
-"F�re borttagning av detta paket �r det bra att ta bort ldap-posterna fr�n "
-"nsswitch.conf f�r att h�lla ig�ng de grundl�ggande tj�nsterna."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "DN-namnet f�r s�kbasen"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "V�rdadress f�r LDAP-server"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -113,107 +76,19 @@ msgstr ""
 "deras dom�nnamn f�r denna funktion.  Till exempel att dom�nen \"exempel.se\" "
 "skulle anv�nda \"dc=exempel,dc=se\" som sitt DN-namn f�r s�kbasen."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "databasen kr�ver inloggning"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Kr�ver LDAP-databasen inloggning?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Svara ja p� fr�gan om du inte kan h�mta poster fr�n databasen utan att logga "
-"in f�rst."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Notera: Under en normal konfiguration kommer detta inte att beh�vas."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "aktivera automatisk uppdatering av konfiguration med debconf"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr "Ska debconf automatiskt uppdatera konfigurationsfilen f�r libnss-ldap?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "libnss-ldap har b�rjat anv�nda debconf f�r dess konfiguration."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Filen kommer att inledas med \"###DEBCONF###\"; du kan st�nga av debconf-"
-"uppdateringar genom att ta bort den raden."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Alla nya installationer kommer att ha detta som standard."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "icke-priviligerad databasanv�ndare"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Ange namnet f�r kontot som ska anv�ndas f�r att logga in p� LDAP-databasen."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "l�senordet f�r databaskontot"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Ange l�senord som ska anv�ndas f�r att logga in p� LDAP-databasen."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "LDAP-version som anv�nds"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Ange vilken version av LDAP-protokollet som ldapns ska anv�nda. Det �r "
 "normalt sett en bra ide att s�tta detta till det h�gsta tillg�ngliga "
@@ -221,100 +96,193 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "icke-priviligerad databasanv�ndare"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Notera: Det �r vanligtvis en bra ide att anv�nda en IP-address; detta "
-"reducerar risken f�r fel om namntj�nsten �r otillg�nglig."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
-msgstr ""
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "Ange l�senord som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "Ange l�senord som ska anv�ndas f�r att logga in p� LDAP-databasen."
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"F�r att detta paket ska fungera beh�ver du modifiera din /etc/nsswitch.conf "
+"att anv�nda en LDAP-datak�lla. Det finns en exempelfil, /usr/share/doc/"
+"libnss-ldap/examples/nsswitch.ldap som kan anv�ndas som ett exempel f�r din "
+"konfiguration av nsswitch eller s� kan den kopieras �ver din nuvarande "
+"konfiguration."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "DN-namnet f�r s�kbasen"
+
+#~ msgid "password for database login account"
+#~ msgstr "l�senordet f�r databaskontot"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "nsswitch.conf hanteras inte automatiskt"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "g�r konfigurationen endast l�sbar/skrivbar f�r �garen"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Ska konfigurationsfilen f�r libnss-ldap vara l�s- och skrivbar bara f�r "
+#~ "fil�garen?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Om du anv�nder l�senord i din konfiguration f�r libnss-ldap �r det "
+#~ "normalt sett en bra ide att ha konfigurationsfilen satt till 0600 (l�s- "
+#~ "och skrivbar bara f�r fil�garen)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Notera: Som en ren kontroll kommer libnss-ldap att kontrollera om du har "
+#~ "nscd installerad och kommer bara att s�tta 0600 om nscd finns p� systemet."
+
+#~ msgid "database requires login"
+#~ msgstr "databasen kr�ver inloggning"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Kr�ver LDAP-databasen inloggning?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Svara ja p� fr�gan om du inte kan h�mta poster fr�n databasen utan att "
+#~ "logga in f�rst."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr ""
+#~ "Notera: Under en normal konfiguration kommer detta inte att beh�vas."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "aktivera automatisk uppdatering av konfiguration med debconf"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Ska debconf automatiskt uppdatera konfigurationsfilen f�r libnss-ldap?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "libnss-ldap har b�rjat anv�nda debconf f�r dess konfiguration."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Filen kommer att inledas med \"###DEBCONF###\"; du kan st�nga av debconf-"
+#~ "uppdateringar genom att ta bort den raden."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Alla nya installationer kommer att ha detta som standard."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Ange namnet f�r kontot som ska anv�ndas f�r att logga in p� LDAP-"
+#~ "databasen."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "F�re borttagning av detta paket �r det bra att ta bort ldap-posterna fr�n "
+#~ "nsswitch.conf f�r att h�lla ig�ng de grundl�ggande tj�nsterna."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=exempel,dc=se"
 
@@ -328,8 +296,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "V�rdadress f�r LDAP-server"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Ange addressen f�r LDAP-servern som ska anv�ndas."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 65d7bfa..623ba5f 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldapd 0.1.0\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\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"
@@ -24,70 +24,44 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
+#: ../libnss-ldapd.templates:2001
+msgid "LDAP server search base"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -95,194 +69,110 @@ msgid ""
 "name of the search base."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr ""
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
+#: ../libnss-ldapd.templates:4001
+msgid "LDAP database user"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
+msgstr ""
+
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 79f7d1f..49c54ab 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1\n"
 "Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2006-12-08 19:37+0100\n"
+"POT-Creation-Date: 2006-12-11 23:32+0100\n"
 "PO-Revision-Date: 2005-06-08 15:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -15,83 +15,47 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid "make configuration readable/writeable by owner only"
-msgstr "cho phép chỉ người sở hữu đọc/ghi vào cấu hình"
-
-#. Type: boolean
-#. Description
-#: ../templates:1001
-msgid ""
-"Should the libnss-ldap configuration file be readable and writable only by "
-"the file owner?"
-msgstr ""
-"Cho phép chỉ người sở hữu tập tin cấu hình libnss-ldap đọc và ghi vào nó "
-"không?"
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
-msgid ""
-"If you use passwords in your libnss-ldap configuration, it is usually a good "
-"idea to have the configuration set with mode 0600 (readable and writable "
-"only by the file's owner)."
+#: ../libnss-ldapd.templates:1001
+msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
-"Nếu bạn sử dụng mật khẩu trong cấu hình libnss-ldap thì thường là ý kiến tốt "
-"để lập cấu hình ấy trong chế độ 0600 (chỉ cho phép chỉ người sở hữu tập tin "
-"ấy đọc/ghi vào nó)."
 
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"Note: As a sanity check, libnss-ldap will check if you have nscd installed "
-"and will only set the mode to 0600 if nscd is present."
+"Please enter the URI of the LDAP server used. This is a string in the form "
+"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
+"port number is optional."
 msgstr ""
-"Ghi chú: để đảm bảo thông tin hữu ích, trình libnss-ldap sẽ kiểm tra nếu bạn "
-"đã cài đặt nscd hay không, và sẽ chỉ lập chế độ thành 0600 nếu có ncsd."
-
-#. Type: note
-#. Description
-#: ../templates:2001
-msgid "nsswitch.conf is not managed automatically"
-msgstr "Không tự động quản lý tập tin nsswitch.conf"
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
+#: ../libnss-ldapd.templates:1001
 msgid ""
-"For this package to work, you need to modify your /etc/nsswitch.conf to use "
-"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
-"examples/nsswitch.ldap which can be used as an example for your nsswitch "
-"setup, or it can be copied over your current setup."
+"Note: It is usually a good idea to use an IP address; this reduces risks of "
+"failure in the event name service is unavailable."
 msgstr ""
-"Gói tin này sẽ hoạt động sau khi bạn sửa đổi tập tin «/etc/nsswitch.conf» để "
-"dùng nguồn dữ liệu LDAP. Có một tập tin thí dụ tại «usr/share/doc/libnss-"
-"ldap/examples/nsswitch.ldap» mà bạn có thể sử dụng là lời thí dụ cho thiết "
-"lập nsswitch bạn, hoặc có thể sao chép nó trên thiết lập hiện có."
+"Ghi chú: thường là ý kiến tốt để sử dụng một địa chỉ dạng IP vì sẽ gặp ít "
+"lỗi hơn nếu dịch vụ tên miền không sẵn sàng."
 
-#. Type: note
+#. Type: string
 #. Description
-#: ../templates:2001
-msgid ""
-"Also, before removing this package, it is wise to remove the ldap entries "
-"from nsswitch.conf to keep basic services functioning."
+#: ../libnss-ldapd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
 msgstr ""
-"Hơn nữa, trước loại bỏ gói tin này, bạn nên loại bỏ các mục nhập LDAP ra tập "
-"tin nsswitch.conf, để cho phép dịch vụ cơ bản tiếp tục hoạt động."
 
 #. Type: string
 #. Description
-#: ../templates:3001
-msgid "distinguished name of the search base"
-msgstr "tên phân biệt của cơ bản tìm kiếm"
+#: ../libnss-ldapd.templates:2001
+#, fuzzy
+msgid "LDAP server search base"
+msgstr "Địa chỉ máy phục vụ LDAP"
 
 #. Type: string
 #. Description
-#: ../templates:3001
+#: ../libnss-ldapd.templates:2001
 msgid ""
 "Please enter the distinguished name of the LDAP search base.  Many sites use "
 "the components of their domain names for this purpose.  For example, the "
@@ -102,208 +66,211 @@ msgstr ""
 "thành phần của tên miền là giá trị này. Lấy thí dụ, miền «thídụ.net» sẽ dùng "
 "«dc=thídụ,dc=net» là tên phân biệt của cơ baản tìm kiếm."
 
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "database requires login"
-msgstr "cơ sở dữ liệu cần đến đăng nhập"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Does the LDAP database require login?"
-msgstr "Cơ sở dữ liệu LDAP ấy cần đến đăng nhập không?"
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid ""
-"Answer this question affirmatively only if you can't retreive entries from "
-"the database without logging in."
-msgstr ""
-"Trả lời «Có» tại đây chỉ nếu bạn không gọi được mục nhập từ cơ sở dữ liệu ấy "
-"khi chưa đang nhập."
-
-#. Type: boolean
-#. Description
-#: ../templates:4001
-msgid "Note: Under a normal setup, this is not needed."
-msgstr "Ghi chú: trong một thiết lập thường, không cần điều này."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "enable automatic configuration updates by debconf"
-msgstr "hiệu lực debconf tự động cập nhật cấu hình"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Should debconf automatically update libnss-ldap's configuration file?"
-msgstr ""
-"Cho phép debconf tự động cập nhật tập tin cấu hình của libnss-ldap không?"
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "libnss-ldap has been moved to use debconf for its configuration."
-msgstr "Đã lập libnss-ldap sẽ dùng debconf để cấu hình."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"The file will be prepended with \"###DEBCONF###\"; you can disable the "
-"debconf updates by removing that line."
-msgstr ""
-"Sẽ thêm «###DEBCONF###» vào đầu tập tin ấy: bạn có thể vô hiệu hóa thiết lập "
-"tự cập nhật debconf bằng cách loại bỏ dòng ấy."
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "All new installations will have this by default."
-msgstr "Mọi bản cài đặt mới sẽ có thiết lập này theo mặc định."
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "unprivileged database user"
-msgstr "người dùng cơ sở dữ liệu không có quyền truy cập đặc biệt"
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Enter the name of the account that will be used to log in to the LDAP "
-"database."
-msgstr ""
-"Hãy nhập tên của tài khoản sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "password for database login account"
-msgstr "mật khẩu cho tài khoản cơ sở dữ liệu"
-
-#. Type: password
-#. Description
-#: ../templates:7001
-msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Hãy nhập mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
-
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
 msgid "LDAP version to use"
 msgstr "Phiên bản LDAP cần dùng"
 
 #. Type: select
 #. Description
-#: ../templates:8001
+#: ../libnss-ldapd.templates:3001
+#, fuzzy
 msgid ""
-"Please enter which version of the LDAP protocol ldapns is to use.  It is "
-"usually a good idea to set this to highest available version number."
+"Please enter which version of the LDAP protocol is to use.  It is usually a "
+"good idea to set this to highest available version number."
 msgstr ""
 "Hãy nhập phiên bản giao thức LDAP nào mà ldapns nên dùng. Thường là ý kiến "
 "tốt để lập số phiên bản cao nhất có thể."
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid "LDAP server Uniform Resource Identifier"
-msgstr ""
+#: ../libnss-ldapd.templates:4001
+#, fuzzy
+msgid "LDAP database user"
+msgstr "người dùng cơ sở dữ liệu không có quyền truy cập đặc biệt"
 
 #. Type: string
 #. Description
-#: ../templates:9001
+#: ../libnss-ldapd.templates:4001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"If the LDAP database requires a login for normal lookups, enter the name of "
+"the account that will be used here. Leave empty otherwise."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9001
-msgid ""
-"Note: It is usually a good idea to use an IP address; this reduces risks of "
-"failure in the event name service is unavailable."
-msgstr ""
-"Ghi chú: thường là ý kiến tốt để sử dụng một địa chỉ dạng IP vì sẽ gặp ít "
-"lỗi hơn nếu dịch vụ tên miền không sẵn sàng."
-
-#. Type: boolean
+#. Type: string
 #. Description
-#: ../templates:10001
-msgid "special LDAP privileges for root"
+#: ../libnss-ldapd.templates:4001 ../libnss-ldapd.templates:6001
+msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"This option will allow tools that perform requests to the nss system with "
-"libnss-ldap as backend to return more information when called as root."
+#: ../libnss-ldapd.templates:5001
+msgid "LDAP user password"
 msgstr ""
 
-#. Type: boolean
+#. Type: password
 #. Description
-#: ../templates:10001
-msgid ""
-"If you are using NFS mounted /etc or any other custom setup, you should "
-"disable this."
-msgstr ""
+#: ../libnss-ldapd.templates:5001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "Hãy nhập mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
 #. Type: string
 #. Description
-#: ../templates:11001
+#: ../libnss-ldapd.templates:6001
 msgid "LDAP account for root"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid "This account will be used for nss requests with root privileges."
+#: ../libnss-ldapd.templates:6001
+msgid ""
+"This account will be used for nss requests with root privileges. This can be "
+"used to give root processes more information (e.g. users' shadow entries or "
+"group passwords)."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:11001
-msgid ""
-"Note: For this to work the account needs permission to access the attributes "
-"in the LDAP directory that are related to the users' shadow entries as well "
-"as users' and groups' passwords."
+#: ../libnss-ldapd.templates:6001
+msgid "Leave this empty to not do anything special for root lookups."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
 msgid "LDAP root account password"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:7001
+#, fuzzy
 msgid ""
-"This password will be used when libnss-ldap tries to login to the LDAP "
-"directory using the LDAP account for root."
+"Enter the password that will be used to log in to the LDAP database when the "
+"root process does lookups."
+msgstr "Hãy nhập mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:8001
+msgid "Name services to configure:"
 msgstr ""
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
+#: ../libnss-ldapd.templates:8001
+#, fuzzy
 msgid ""
-"The password will be stored in a separate file /etc/libnss-ldap.secret which "
-"will be made readable to root only."
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource.  There is an example file at /usr/share/doc/libnss-ldap/"
+"examples/nsswitch.ldap which can be used as an example for your nsswitch "
+"setup."
 msgstr ""
+"Gói tin này sẽ hoạt động sau khi bạn sửa đổi tập tin «/etc/nsswitch.conf» để "
+"dùng nguồn dữ liệu LDAP. Có một tập tin thí dụ tại «usr/share/doc/libnss-"
+"ldap/examples/nsswitch.ldap» mà bạn có thể sử dụng là lời thí dụ cho thiết "
+"lập nsswitch bạn, hoặc có thể sao chép nó trên thiết lập hiện có."
 
-#. Type: password
+#. Type: multiselect
 #. Description
-#: ../templates:12001
-msgid "Entering an empty password will re-use the old password."
+#: ../libnss-ldapd.templates:8001
+msgid ""
+"You can also select the services that should be enabled or disabled for LDAP "
+"lookups. New LDAP lookups will be added as last option. Be sure to review "
+"these changes."
 msgstr ""
 
+#~ msgid "distinguished name of the search base"
+#~ msgstr "tên phân biệt của cơ bản tìm kiếm"
+
+#~ msgid "password for database login account"
+#~ msgstr "mật khẩu cho tài khoản cơ sở dữ liệu"
+
+#~ msgid "nsswitch.conf is not managed automatically"
+#~ msgstr "Không tự động quản lý tập tin nsswitch.conf"
+
+#~ msgid "make configuration readable/writeable by owner only"
+#~ msgstr "cho phép chỉ người sở hữu đọc/ghi vào cấu hình"
+
+#~ msgid ""
+#~ "Should the libnss-ldap configuration file be readable and writable only "
+#~ "by the file owner?"
+#~ msgstr ""
+#~ "Cho phép chỉ người sở hữu tập tin cấu hình libnss-ldap đọc và ghi vào nó "
+#~ "không?"
+
+#~ msgid ""
+#~ "If you use passwords in your libnss-ldap configuration, it is usually a "
+#~ "good idea to have the configuration set with mode 0600 (readable and "
+#~ "writable only by the file's owner)."
+#~ msgstr ""
+#~ "Nếu bạn sử dụng mật khẩu trong cấu hình libnss-ldap thì thường là ý kiến "
+#~ "tốt để lập cấu hình ấy trong chế độ 0600 (chỉ cho phép chỉ người sở hữu "
+#~ "tập tin ấy đọc/ghi vào nó)."
+
+#~ msgid ""
+#~ "Note: As a sanity check, libnss-ldap will check if you have nscd "
+#~ "installed and will only set the mode to 0600 if nscd is present."
+#~ msgstr ""
+#~ "Ghi chú: để đảm bảo thông tin hữu ích, trình libnss-ldap sẽ kiểm tra nếu "
+#~ "bạn đã cài đặt nscd hay không, và sẽ chỉ lập chế độ thành 0600 nếu có "
+#~ "ncsd."
+
+#~ msgid "database requires login"
+#~ msgstr "cơ sở dữ liệu cần đến đăng nhập"
+
+#~ msgid "Does the LDAP database require login?"
+#~ msgstr "Cơ sở dữ liệu LDAP ấy cần đến đăng nhập không?"
+
+#~ msgid ""
+#~ "Answer this question affirmatively only if you can't retreive entries "
+#~ "from the database without logging in."
+#~ msgstr ""
+#~ "Trả lời «Có» tại đây chỉ nếu bạn không gọi được mục nhập từ cơ sở dữ liệu "
+#~ "ấy khi chưa đang nhập."
+
+#~ msgid "Note: Under a normal setup, this is not needed."
+#~ msgstr "Ghi chú: trong một thiết lập thường, không cần điều này."
+
+#~ msgid "enable automatic configuration updates by debconf"
+#~ msgstr "hiệu lực debconf tự động cập nhật cấu hình"
+
+#~ msgid ""
+#~ "Should debconf automatically update libnss-ldap's configuration file?"
+#~ msgstr ""
+#~ "Cho phép debconf tự động cập nhật tập tin cấu hình của libnss-ldap không?"
+
+#~ msgid "libnss-ldap has been moved to use debconf for its configuration."
+#~ msgstr "Đã lập libnss-ldap sẽ dùng debconf để cấu hình."
+
+#~ msgid ""
+#~ "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+#~ "debconf updates by removing that line."
+#~ msgstr ""
+#~ "Sẽ thêm «###DEBCONF###» vào đầu tập tin ấy: bạn có thể vô hiệu hóa thiết "
+#~ "lập tự cập nhật debconf bằng cách loại bỏ dòng ấy."
+
+#~ msgid "All new installations will have this by default."
+#~ msgstr "Mọi bản cài đặt mới sẽ có thiết lập này theo mặc định."
+
+#~ msgid ""
+#~ "Enter the name of the account that will be used to log in to the LDAP "
+#~ "database."
+#~ msgstr ""
+#~ "Hãy nhập tên của tài khoản sẽ được dùng để đăng nhập vào cơ sở dữ liệu "
+#~ "LDAP."
+
+#~ msgid ""
+#~ "Also, before removing this package, it is wise to remove the ldap entries "
+#~ "from nsswitch.conf to keep basic services functioning."
+#~ msgstr ""
+#~ "Hơn nữa, trước loại bỏ gói tin này, bạn nên loại bỏ các mục nhập LDAP ra "
+#~ "tập tin nsswitch.conf, để cho phép dịch vụ cơ bản tiếp tục hoạt động."
+
 #~ msgid "dc=example,dc=net"
 #~ msgstr "dc=thídụ,dc=net"
 
@@ -317,8 +284,5 @@ msgstr ""
 #~ msgid "ldap://127.0.0.1/"
 #~ msgstr "127.0.0.1"
 
-#~ msgid "LDAP server host address"
-#~ msgstr "Địa chỉ máy phục vụ LDAP"
-
 #~ msgid "Please enter the address of the LDAP server used."
 #~ msgstr "Hãy nhập địa chỉ của máy phục vụ LDAP sẽ dùng."