remove rootbind{dn,pw} options from packaging because the options are not likely to be implemented in the future

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

17 files changed, 396 insertions, 744 deletions

diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index 3bddfe6..e1a6101 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -82,13 +82,6 @@ parsecfg()
   # find bindpw
   bindpw=`sed -n 's/^bindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1`
   db_set libnss-ldapd/ldap-bindpw "$bindpw"
-# DISABLE rootbinddn for now because it's not supported
-#  # find rootbinddb
-#  rootbinddn=`sed -n 's/^rootbinddn[[:space:]]*//ip' "$cfgfile" | tail -n 1`
-#  db_set libnss-ldapd/ldap-rootbinddn "$rootbinddn"
-#  # find rootbindpw
-#  rootbindpw=`sed -n 's/^rootbindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1`
-#  db_set libnss-ldapd/ldap-rootbindpw "$rootbindpw"
   # we're done
   return 0
 }
@@ -109,9 +102,6 @@ parsensswitch()
 # clear some settings in case they are not set in the config
 db_set libnss-ldapd/ldap-binddn ""
 db_set libnss-ldapd/ldap-bindpw ""
-# DISABLE rootbinddn for now because it's not supported
-#db_set libnss-ldapd/ldap-rootbinddn ""
-#db_set libnss-ldapd/ldap-rootbindpw ""
 
 # fill our defaults with the current configuration if available
 # and fall back to guessing the config from some other system files
@@ -167,39 +157,14 @@ do
       db_set libnss-ldapd/ldap-bindpw ""
     fi
     # ask the question, go to the next question or back
-#    state="rootbinddn"
     state="nsswitch"
     db_go || state="binddn"
     ;;
-# DISABLE rootbinddn for now because it's not supported
-#  rootbinddn)
-#    # ask for login information
-#    db_input medium libnss-ldapd/ldap-rootbinddn || true
-#    # ask the question, go to the next question or back
-#    state="rootbindpw"
-#    db_go || state="bindpw"
-#    ;;
-#  rootbindpw)
-#    # only ask question if we have a rootbinddn
-#    db_get libnss-ldapd/ldap-rootbinddn
-#    if [ -n "$RET" ]
-#    then
-#      # ask for login information
-#      db_input medium libnss-ldapd/ldap-rootbindpw || true
-#    else
-#      # clear password
-#      db_set libnss-ldapd/ldap-rootbindpw ""
-#    fi
-#    # ask the question, go to the next question or back
-#    state="nsswitch"
-#    db_go || state="rootbinddn"
-#    ;;
   nsswitch)
     # ask for which nsswitch options to configure
     db_capb multiselect
     db_input high libnss-ldapd/nsswitch || true
     state="done"
-#    db_go || state="rootbindpw"
     db_go || state="bindpw"
     ;;
   esac
diff --git a/debian/libnss-ldapd.postinst b/debian/libnss-ldapd.postinst
index 32cfe59..4786caf 100644
--- a/debian/libnss-ldapd.postinst
+++ b/debian/libnss-ldapd.postinst
@@ -143,10 +143,6 @@ base dc=example,dc=net
 #binddn cn=annonymous,dc=example,dc=net
 #bindpw secret
 
-# The DN to bind with for lookups as root.
-#rootbinddn cn=administrator,dc=example,dc=net
-#rootbindpw verysecret
-
 # The search scope.
 #scope sub
 
@@ -187,25 +183,6 @@ then
   fi
   # remove password from database
   db_set libnss-ldapd/ldap-bindpw ""
-# DISABLE rootbinddn for now because it's not supported
-#  # set root bind dn/pw
-#  db_get libnss-ldapd/ldap-rootbinddn
-#  if [ -n "$RET" ]
-#  then
-#    cfg_set rootbinddn "$RET"
-#    db_get libnss-ldapd/ldap-rootbindpw
-#    cfg_set rootbindpw "$RET"
-#  else
-#    # no binddn/pw, disable options
-#    cfg_disable rootbinddn
-#    if grep -i -q "^rootbindpw " $CONFFILE
-#    then
-#      cfg_set rootbindpw "*removed*"
-#      cfg_disable rootbindpw
-#    fi
-#  fi
-#  # remove password from database
-#  db_set libnss-ldapd/ldap-rootbindpw ""
   # modify /etc/nsswitch.conf
   db_get libnss-ldapd/nsswitch
   enablenss=`echo "$RET" | sed 's/,//g'`
diff --git a/debian/libnss-ldapd.templates b/debian/libnss-ldapd.templates
index 9089b1f..85496e1 100644
--- a/debian/libnss-ldapd.templates
+++ b/debian/libnss-ldapd.templates
@@ -35,24 +35,6 @@ Type: password
 _Description: LDAP user password:
  Enter the password that will be used to log in to the LDAP database.
 
-Template: libnss-ldapd/ldap-rootbinddn
-Type: string
-Default: cn=manager,dc=example,dc=net
-_Description: LDAP account for root:
- 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).
- .
- Leave this empty to not do anything special for root lookups.
- .
- This value should be specified as a DN (distinguished name).
-
-Template: libnss-ldapd/ldap-rootbindpw
-Type: password
-_Description: LDAP root account password:
- Enter the password that will be used to log in to the LDAP database
- when the root process does lookups.
-
 Template: libnss-ldapd/nsswitch
 Type: multiselect
 Choices: aliases, ethers, group, hosts, netgroup, networks, passwd, protocols, rpc, services, shadow
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 0d22139..13bff91 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 211-4\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -69,8 +69,8 @@ msgid ""
 msgstr ""
 "Introduïu el nom distingit de la base de la cerca de l'LDAP. Molts llocs "
 "utilitzen els components del seu nom del domini. Per exemple, el domini "
-"«exemple.net» utilitzaria el nom distingit de la base de la cerca "
-"«dc=exemple,dc=net»."
+"«exemple.net» utilitzaria el nom distingit de la base de la cerca «dc=exemple,"
+"dc=net»."
 
 #. Type: string
 #. Description
@@ -89,9 +89,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -109,53 +107,15 @@ 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -163,7 +123,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -171,6 +131,14 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "Versió de l'LDAP a utilitzar"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index de915ae..30e722a 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -96,9 +96,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -114,51 +112,15 @@ msgstr ""
 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -166,7 +128,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -174,6 +136,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "Verze LDAPu, která se má použít"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 85940f8..02714f0 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -8,8 +8,8 @@
 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: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -95,9 +95,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -113,51 +111,15 @@ msgstr ""
 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -165,13 +127,20 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
 "review these changes."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "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."
+
 #  Template: libnss-ldap/confperm
 #  ddtp-prioritize: 56
 #
diff --git a/debian/po/de.po b/debian/po/de.po
index 197d9c8..9df00b8 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.5\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2008-01-27 21:02+0100\n"
 "Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -100,9 +100,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Dieser Wert sollte als ein DN (distinguished name) eingegeben werden."
 
@@ -119,58 +117,15 @@ msgstr "Passwort des LDAP-Benutzers:"
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "LDAP-Zugangname für root:"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 ""
-"Dieser Zugangsname wird für NSS-Anfragen mit Root-Rechten verwendet. Das "
-"dient dazu, Root-Prozessen mehr Informationen (z. B. Shadow-Einträge der "
-"Benutzer oder Passwörter der Gruppen) zu bieten."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-"Lassen Sie das Feld leer, wenn bei Root-Anfragen nichts Spezielles geschehen "
-"soll."
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "Passwort des LDAP-Root-Zugangsnamen:"
-
-#
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"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 die Anmeldung an der LDAP-Datenbank ein, wenn "
-"Root-Prozesse Anfragen stellen."
-
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "Namensauflösungsdienste, die eingerichtet werden sollen:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -180,7 +135,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -189,3 +144,31 @@ msgstr ""
 "Sie können die Dienste auswählen, für die LDAP-Anfragen (nicht) zugelassen "
 "werden. Die neuen LDAP-Anfragen werden als letzte Möglichkeit angefügt. "
 "Kontrollieren Sie unbedingt die Änderungen."
+
+#~ msgid "LDAP account for root:"
+#~ msgstr "LDAP-Zugangname für root:"
+
+#~ 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 ""
+#~ "Dieser Zugangsname wird für NSS-Anfragen mit Root-Rechten verwendet. Das "
+#~ "dient dazu, Root-Prozessen mehr Informationen (z. B. Shadow-Einträge der "
+#~ "Benutzer oder Passwörter der Gruppen) zu bieten."
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr ""
+#~ "Lassen Sie das Feld leer, wenn bei Root-Anfragen nichts Spezielles "
+#~ "geschehen soll."
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "Passwort des LDAP-Root-Zugangsnamen:"
+
+#
+#~ msgid ""
+#~ "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 die Anmeldung an der LDAP-Datenbank ein, wenn "
+#~ "Root-Prozesse Anfragen stellen."
diff --git a/debian/po/es.po b/debian/po/es.po
index 6bdc6dd..b18796e 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -31,8 +31,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2008-02-03 20:20-0500\n"
 "Last-Translator: Rudy Godoy Guillén <rudy@stone-head.org>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -53,7 +53,10 @@ 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."
-msgstr "Introduzca el URI del servidor LDAP. Este es una cadena de la forma ldap://<nombre de máquina o IP>:<puerto>/. También se puede utilizar ldaps:// o ldapi://. El valor del puerto es opcional."
+msgstr ""
+"Introduzca el URI del servidor LDAP. Este es una cadena de la forma ldap://"
+"<nombre de máquina o IP>:<puerto>/. También se puede utilizar ldaps:// o "
+"ldapi://. El valor del puerto es opcional."
 
 #
 #. Type: string
@@ -62,7 +65,10 @@ msgstr "Introduzca el URI del servidor LDAP. Este es una cadena de la forma ldap
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
-msgstr "Cuando utilice los esquemas ldap o ldaps es siempre una buena idea especificar una dirección IP, pues reduce el riesgo de fallos en caso de que el servicio de nombres no esté disponible."
+msgstr ""
+"Cuando utilice los esquemas ldap o ldaps es siempre una buena idea "
+"especificar una dirección IP, pues reduce el riesgo de fallos en caso de que "
+"el servicio de nombres no esté disponible."
 
 #. Type: string
 #. Description
@@ -85,7 +91,11 @@ msgid ""
 "the components of their domain names for this purpose.  For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
-msgstr "Por favor introduzca el nombre distintivo (DN) de la base de búsquedas LDAP. En muchos sitios se utilizan las componentes del nombre de dominio con este propósito. Por ejemplo, el dominio «ejemplo.net» utilizaría «dc=ejemplo,dc=net» como nombre distintivo de la base de búsquedas."
+msgstr ""
+"Por favor introduzca el nombre distintivo (DN) de la base de búsquedas LDAP. "
+"En muchos sitios se utilizan las componentes del nombre de dominio con este "
+"propósito. Por ejemplo, el dominio «ejemplo.net» utilizaría «dc=ejemplo,"
+"dc=net» como nombre distintivo de la base de búsquedas."
 
 #. Type: string
 #. Description
@@ -99,13 +109,13 @@ msgstr "Usuario de base de datos LDAP:"
 msgid ""
 "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 "Introduzca el nombre de la cuenta que utilizará si la base de datos LDAP requiere un usuario para búsquedas. En caso contrario deje en blanco."
+msgstr ""
+"Introduzca el nombre de la cuenta que utilizará si la base de datos LDAP "
+"requiere un usuario para búsquedas. En caso contrario deje en blanco."
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Debe ingresar el valor en forma de DN (nombre distintivo)."
 
@@ -119,65 +129,63 @@ msgstr "Contraseña de usuario LDAP:"
 #. Description
 #: ../libnss-ldapd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Introduzca la contraseña que se utilizará para acceder a la base de datos LDAP."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "Cuenta de superusuario LDAP:"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 "Esta cuenta será utilizada para solicitudes nss con privilegios de superusuario. Esto se puede utilizar para ofrecer más información a los procesos del superusuario (ej. entradas shadow de usuarios, o contraseñas de grupo)."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr "Deje en blanco si no desea utilizar esta característica."
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "Contraseña de la cuenta de superusuario LDAP:"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"Enter the password that will be used to log in to the LDAP database when the "
-"root process does lookups."
-msgstr "Introduzca la contraseña que se utilizará para acceder a la base de datos LDAP cuando un proceso de superusuario realice búsquedas."
+msgstr ""
+"Introduzca la contraseña que se utilizará para acceder a la base de datos "
+"LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "Indique los servicios a configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
-msgstr "Para que este programa funcione, debe modificar el fichero «/etc/nsswitch.conf» para que utilice la fuente de datos de LDAP."
+msgstr ""
+"Para que este programa funcione, debe modificar el fichero «/etc/nsswitch."
+"conf» para que utilice la fuente de datos de LDAP."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
 "review these changes."
-msgstr "Puede elegir los servicios que se debe habilitar o deshabilitar para las búsquedas de LDAP. Las nuevas búsquedas LDAP serán añadidas como última opción. Asegúrese de revisar estos cambios."
+msgstr ""
+"Puede elegir los servicios que se debe habilitar o deshabilitar para las "
+"búsquedas de LDAP. Las nuevas búsquedas LDAP serán añadidas como última "
+"opción. Asegúrese de revisar estos cambios."
+
+#~ msgid "LDAP account for root:"
+#~ msgstr "Cuenta de superusuario LDAP:"
+
+#~ 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 ""
+#~ "Esta cuenta será utilizada para solicitudes nss con privilegios de "
+#~ "superusuario. Esto se puede utilizar para ofrecer más información a los "
+#~ "procesos del superusuario (ej. entradas shadow de usuarios, o contraseñas "
+#~ "de grupo)."
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr "Deje en blanco si no desea utilizar esta característica."
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "Contraseña de la cuenta de superusuario LDAP:"
+
+#~ msgid ""
+#~ "Enter the password that will be used to log in to the LDAP database when "
+#~ "the root process does lookups."
+#~ msgstr ""
+#~ "Introduzca la contraseña que se utilizará para acceder a la base de datos "
+#~ "LDAP cuando un proceso de superusuario realice búsquedas."
 
 #  Template: libnss-ldap/dblogin
 #  ddtp-prioritize: 56
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 3b86dfc..035c8c7 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2007-10-13 12:31+0200\n"
 "Last-Translator: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -91,9 +91,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Cette valeur doit être un nom distingué (« DN »)."
 
@@ -111,59 +109,15 @@ msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
 "LDAP."
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "Identifiant LDAP du superutilisateur :"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 ""
-"Veuillez indiquer l'identifiant à utiliser pour les requêtes NSS avec les "
-"droits superutilisateur. Cela peut être utilisé pour fournir plus "
-"d'informations à des processus lancés avec les droits superutilisateur "
-"(p. ex. les entrées des utilisateurs dans « shadow » ou les mots de passe de "
-"groupe)."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-"N'indiquez rien si aucune identification particulière n'est nécessaire pour "
-"les requêtes superutilisateur."
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "Mot de passe du superutilisateur LDAP :"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"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 à utiliser pour s'identifier sur la base "
-"LDAP en tant que superutilisateur."
-
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "Services de nom à configurer :"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -173,7 +127,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -184,13 +138,42 @@ msgstr ""
 "ajoutées comme dernière option. Il est important de bien contrôler ces "
 "modifications."
 
+#~ msgid "LDAP account for root:"
+#~ msgstr "Identifiant LDAP du superutilisateur :"
+
+#~ 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 ""
+#~ "Veuillez indiquer l'identifiant à utiliser pour les requêtes NSS avec les "
+#~ "droits superutilisateur. Cela peut être utilisé pour fournir plus "
+#~ "d'informations à des processus lancés avec les droits superutilisateur "
+#~ "(p. ex. les entrées des utilisateurs dans « shadow » ou les mots de passe "
+#~ "de groupe)."
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr ""
+#~ "N'indiquez rien si aucune identification particulière n'est nécessaire "
+#~ "pour les requêtes superutilisateur."
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "Mot de passe du superutilisateur LDAP :"
+
+#~ msgid ""
+#~ "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 à utiliser pour s'identifier sur la "
+#~ "base LDAP en tant que superutilisateur."
+
 #~ msgid ""
 #~ "When using the ldapi scheme, %2f should be used to escape slashes (e.g. "
 #~ "ldapi://%2fvar%2frun%2fldapi_sock/)"
 #~ msgstr ""
 #~ "Lorsque le protocole « ldapi » est utilisé, %2f doit être utilisé pour "
-#~ "remplacer les barres obliques (« slashes »), par exemple : « ldapi://%"
-#~ "2fvar%2frun%2fldapi_sock/ »."
+#~ "remplacer les barres obliques (« slashes »), par exemple : « ldapi://%2fvar%"
+#~ "2frun%2fldapi_sock/ »."
 
 #~ msgid "LDAP version to use:"
 #~ msgstr "Version du protocole LDAP :"
@@ -208,7 +191,7 @@ msgstr ""
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
-#~ "Pour que ce paquet fonctionne, il est nécessaire de modifier le fichier "
-#~ "« /etc/nsswitch.conf » pour pointer vers la source de données LDAP. Le "
+#~ "Pour que ce paquet fonctionne, il est nécessaire de modifier le fichier « /"
+#~ "etc/nsswitch.conf » pour pointer vers la source de données LDAP. Le "
 #~ "fichier /usr/share/doc/libnss-ldap/examples/nsswitch.ldap est un exemple "
 #~ "que vous pouvez adapter à votre configuration."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 98857e7..87ac6e5 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2007-10-14 16:31+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -36,7 +36,10 @@ 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."
-msgstr "利用するLDAP サーバの URI を入力してください。これは ldap://<ホスト名または IP>:<ポート>/ 形式の文字列です。ldaps:// または ldapi:// も利用できます。ポート番号は省略できます。"
+msgstr ""
+"利用するLDAP サーバの URI を入力してください。これは ldap://<ホスト名または "
+"IP>:<ポート>/ 形式の文字列です。ldaps:// または ldapi:// も利用できます。ポー"
+"ト番号は省略できます。"
 
 #. Type: string
 #. Description
@@ -44,7 +47,9 @@ msgstr "利用するLDAP サーバの URI を入力してください。これ�
 msgid ""
 "When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
 "address; this reduces the risk of failure when name services are unavailable."
-msgstr "ldap または ldaps スキーマを使うとき、IP アドレスを使うのは、通常、良い考えです。これはネームサービスが利用できないときの障害の危険を減らします。"
+msgstr ""
+"ldap または ldaps スキーマを使うとき、IP アドレスを使うのは、通常、良い考えで"
+"す。これはネームサービスが利用できないときの障害の危険を減らします。"
 
 #. Type: string
 #. Description
@@ -83,13 +88,13 @@ msgstr "LDAP データベースユーザ:"
 msgid ""
 "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 "通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用するアカウント名をここに入力してください。そうでなければ空のままにします。"
+msgstr ""
+"通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用"
+"するアカウント名をここに入力してください。そうでなければ空のままにします。"
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "この値は DN (識別名) として指定すべきです。"
 
@@ -105,60 +110,57 @@ msgstr "LDAP ユーザパスワード:"
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "root 用の LDAP アカウント:"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 "このアカウントは root 権限で nss 要求するのに使われます。これは root のプロセスに、より多くの情報 (ユーザのシャドウエントリやグループパスワードなど) を与えるのに使うことができます。"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr "root のルックアップに何も特別なことをさせないのであれば、ここは空のままにします。"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "LDAP の root アカウントパスワード:"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"Enter the password that will be used to log in to the LDAP database when the "
-"root process does lookups."
-msgstr "root プロセスがルックアップを行うときに LDAP データベースにログインするのに使うパスワードを入力してください。"
-
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "設定する名前サービス:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
-msgstr "このパッケージが動作するために、ldap データソースを使うようあなたの /etc/nsswitch.conf を変更する必要があります。"
+msgstr ""
+"このパッケージが動作するために、ldap データソースを使うようあなたの /etc/"
+"nsswitch.conf を変更する必要があります。"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
 "review these changes."
-msgstr "LDAP ルックアップを有効または無効にしたいサービスを選択できます。新しい LDAP ルックアップは最後の選択肢として追加されます。これらの変更を見て確認してください。"
+msgstr ""
+"LDAP ルックアップを有効または無効にしたいサービスを選択できます。新しい LDAP "
+"ルックアップは最後の選択肢として追加されます。これらの変更を見て確認してくだ"
+"さい。"
+
+#~ msgid "LDAP account for root:"
+#~ msgstr "root 用の LDAP アカウント:"
+
+#~ 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 ""
+#~ "このアカウントは root 権限で nss 要求するのに使われます。これは root のプ"
+#~ "ロセスに、より多くの情報 (ユーザのシャドウエントリやグループパスワードな"
+#~ "ど) を与えるのに使うことができます。"
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr ""
+#~ "root のルックアップに何も特別なことをさせないのであれば、ここは空のままに"
+#~ "します。"
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "LDAP の root アカウントパスワード:"
+
+#~ msgid ""
+#~ "Enter the password that will be used to log in to the LDAP database when "
+#~ "the root process does lookups."
+#~ msgstr ""
+#~ "root プロセスがルックアップを行うときに LDAP データベースにログインするの"
+#~ "に使うパスワードを入力してください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 2a61848..68054b9 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2008-02-26 17:12+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -33,14 +33,25 @@ msgstr "URI (Uniform Resource Identifier) van de LDAP-server:"
 #. Type: string
 #. Description
 #: ../libnss-ldapd.templates:1001
-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."
-msgstr "Wat is de URI van de gebruikte LDAP-server? Dit is een string met de vorm ldap://<computernaam of IP>:<poortnummer>/ . ldaps:// of ldapi:// kan ook gebruikt worden. Het poortnummer is optioneel."
+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."
+msgstr ""
+"Wat is de URI van de gebruikte LDAP-server? Dit is een string met de vorm "
+"ldap://<computernaam of IP>:<poortnummer>/ . ldaps:// of ldapi:// kan ook "
+"gebruikt worden. Het poortnummer is optioneel."
 
 #. Type: string
 #. Description
 #: ../libnss-ldapd.templates:1001
-msgid "When useing the ldap or ldaps schemes it is usually a good idea to use an IP address; this reduces the risk of failure when name services are unavailable."
-msgstr "Bij gebruik van  'ldap'- of 'ldaps'-schema's is het gewoonlijk een goed idee om een IP-adres te gebruiken aangezien dit de kans op mislukkingen verminderd wanneer naamdiensten onbeschikbaar zijn."
+msgid ""
+"When useing the ldap or ldaps schemes it is usually a good idea to use an IP "
+"address; this reduces the risk of failure when name services are unavailable."
+msgstr ""
+"Bij gebruik van  'ldap'- of 'ldaps'-schema's is het gewoonlijk een goed idee "
+"om een IP-adres te gebruiken aangezien dit de kans op mislukkingen "
+"verminderd wanneer naamdiensten onbeschikbaar zijn."
 
 #. Type: string
 #. Description
@@ -57,8 +68,16 @@ msgstr "LDAP-server zoekbasis:"
 #. Type: string
 #. Description
 #: ../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 domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished name of the search base."
-msgstr "Gelieve de onderscheiden naam van de LDAP-zoekbasis in te voeren. Veel sites gebruiken de componenten van hun domeinnaam voor dit doel. Bijvoorbeeld: de domeinnaam \"example.net\" zou gebruik maken van \"dc=example,dc=net\" als de onderscheiden naam van de zoekbasis."
+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 "
+"domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
+"name of the search base."
+msgstr ""
+"Gelieve de onderscheiden naam van de LDAP-zoekbasis in te voeren. Veel sites "
+"gebruiken de componenten van hun domeinnaam voor dit doel. Bijvoorbeeld: de "
+"domeinnaam \"example.net\" zou gebruik maken van \"dc=example,dc=net\" als "
+"de onderscheiden naam van de zoekbasis."
 
 #. Type: string
 #. Description
@@ -69,15 +88,17 @@ msgstr "LDAP-databasegebruiker:"
 #. Type: string
 #. Description
 #: ../libnss-ldapd.templates:3001
-msgid "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 "Als de LDAP-database aanmelden vereist voor normale zoekacties dient u hier de naam van de te gebruiken account op te geven. As aanmelden niet nodig kunt u dit gewoon leeg laten."
+msgid ""
+"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 ""
+"Als de LDAP-database aanmelden vereist voor normale zoekacties dient u hier "
+"de naam van de te gebruiken account op te geven. As aanmelden niet nodig "
+"kunt u dit gewoon leeg laten."
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
 #: ../libnss-ldapd.templates:3001
-#: ../libnss-ldapd.templates:5001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Deze waarde dient opgegeven te worden als een DN (distinguished name)."
 
@@ -91,53 +112,59 @@ msgstr "Wachtwoord van de LDAP-gebruiker:"
 #. Description
 #: ../libnss-ldapd.templates:4001
 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "LDAP-account voor root:"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 "Deze account wordt gebruikt voor nss-zoekacties met beheerdersrechten. Dit kan gebruikt worden om het root-proces meer informatie te geven (bv. de shadow-ingangen van gebruikers, of groepswachtwoorden)."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr "Laat dit leeg als er voor root-zoekacties niks speciaals nodig is."
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "Wachtwoord van de LDAP-account voor root:"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "Enter the password that will be used to log in to the LDAP database when the root process does lookups."
-msgstr "Wat is het wachtwoord dat gebruikt zal worden om op de LDAP-database aan te melden wanneer het root-proces zoekacties doet?"
+msgstr ""
+"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
+"melden."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "Te configureren naamdiensten:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
-msgid "For this package to work, you need to modify your /etc/nsswitch.conf to use the ldap datasource."
-msgstr "Opdat dit pakket zou werken dient het bestand /etc/nsswitch.conf aangepast te worden om de 'ldap'-gegevensbron te gebruiken."
+#: ../libnss-ldapd.templates:5001
+msgid ""
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource."
+msgstr ""
+"Opdat dit pakket zou werken dient het bestand /etc/nsswitch.conf aangepast "
+"te worden om de 'ldap'-gegevensbron te gebruiken."
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
-msgid "You can select the services that should be enabled or disabled for LDAP lookups. The new LDAP lookups will be added as last option. Be sure to review these changes."
-msgstr "Hier kunt u de diensten selecteren die voor LDAP-zoekacties geactiveerd en gedeactiveerd dienen te worden. De nieuwe LDAP-zoekacties worden toegevoegd als de laatste optie. Gelieve deze aanpassingen te controleren."
-
+#: ../libnss-ldapd.templates:5001
+msgid ""
+"You can select the services that should be enabled or disabled for LDAP "
+"lookups. The new LDAP lookups will be added as last option. Be sure to "
+"review these changes."
+msgstr ""
+"Hier kunt u de diensten selecteren die voor LDAP-zoekacties geactiveerd en "
+"gedeactiveerd dienen te worden. De nieuwe LDAP-zoekacties worden toegevoegd "
+"als de laatste optie. Gelieve deze aanpassingen te controleren."
+
+#~ msgid "LDAP account for root:"
+#~ msgstr "LDAP-account voor root:"
+
+#~ 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 ""
+#~ "Deze account wordt gebruikt voor nss-zoekacties met beheerdersrechten. "
+#~ "Dit kan gebruikt worden om het root-proces meer informatie te geven (bv. "
+#~ "de shadow-ingangen van gebruikers, of groepswachtwoorden)."
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr "Laat dit leeg als er voor root-zoekacties niks speciaals nodig is."
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "Wachtwoord van de LDAP-account voor root:"
+
+#~ msgid ""
+#~ "Enter the password that will be used to log in to the LDAP database when "
+#~ "the root process does lookups."
+#~ msgstr ""
+#~ "Wat is het wachtwoord dat gebruikt zal worden om op de LDAP-database aan "
+#~ "te melden wanneer het root-proces zoekacties doet?"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index dfb2378..bce88dd 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2007 Américo Monteiro
 # Released under the same license as the nss-ldapd package
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\n"
 "PO-Revision-Date: 2007-08-19 14:06+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -90,9 +90,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr "Este valor deve ser especificado como um nome distinto (DN)."
 
@@ -109,57 +107,15 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Indique a password que vai ser usada para autenticação na base de dados LDAP."
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr "Conta de administrador (root) LDAP:"
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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 ""
-"Esta conta será usada para pedidos nss com privilégios de administrador. "
-"Isto pode ser usado para dar aos processos de administrador mais informação "
-"(ex. entradas escondidas de utilizadores ou passwords de grupos)."
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-"Deixe este campo vazio para não fazer nada de especial para buscas de "
-"administrador."
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr "Password da conta de administrador (root) LDAP:"
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"Enter the password that will be used to log in to the LDAP database when the "
-"root process does lookups."
-msgstr ""
-"Indique a password que será usada para autenticação na base de dados LDAP, "
-"quando processos de administrador fazem buscas."
-
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr "Nomes de serviços para configurar:"
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -169,7 +125,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -179,6 +135,34 @@ msgstr ""
 "para buscas LDAP. Novas buscas LDAP serão adicionadas como últimas opções."
 "Certifique-se de rever estas alterações."
 
+#~ msgid "LDAP account for root:"
+#~ msgstr "Conta de administrador (root) LDAP:"
+
+#~ 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 ""
+#~ "Esta conta será usada para pedidos nss com privilégios de administrador. "
+#~ "Isto pode ser usado para dar aos processos de administrador mais "
+#~ "informação (ex. entradas escondidas de utilizadores ou passwords de "
+#~ "grupos)."
+
+#~ msgid "Leave this empty to not do anything special for root lookups."
+#~ msgstr ""
+#~ "Deixe este campo vazio para não fazer nada de especial para buscas de "
+#~ "administrador."
+
+#~ msgid "LDAP root account password:"
+#~ msgstr "Password da conta de administrador (root) LDAP:"
+
+#~ msgid ""
+#~ "Enter the password that will be used to log in to the LDAP database when "
+#~ "the root process does lookups."
+#~ msgstr ""
+#~ "Indique a password que será usada para autenticação na base de dados "
+#~ "LDAP, quando processos de administrador fazem buscas."
+
 #~ msgid ""
 #~ "When using the ldapi scheme, %2f should be used to escape slashes (e.g. "
 #~ "ldapi://%2fvar%2frun%2fldapi_sock/)"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index e49e1a4..ff0e70f 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_203-1\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -96,9 +96,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -115,52 +113,15 @@ 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -168,7 +129,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -176,6 +137,13 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "Vers�o do protocolo LDAP a ser utilizada."
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index b503d9a..69fe107 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_211-4\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -91,9 +91,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -110,52 +108,15 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -163,7 +124,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -171,6 +132,14 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "Enter the password that will be used to log in to the LDAP database when "
+#~ "the root process does lookups."
+#~ msgstr ""
+#~ "������� ������, ������� ����� ����������� ��� ����������� � ���� ������ "
+#~ "LDAP."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "������������ ������ LDAP"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index d186bab..4579341 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -14,8 +14,8 @@
 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: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -97,9 +97,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -115,51 +113,15 @@ msgstr ""
 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -167,7 +129,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -175,6 +137,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "LDAP-version som anv�nds"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 7d60096..542f1eb 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nss-ldapd 0.3\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Project-Id-Version: nss-ldapd 0.6\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -77,9 +77,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -95,50 +93,15 @@ msgstr ""
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid ""
-"Enter the password that will be used to log in to the LDAP database when the "
-"root process does lookups."
-msgstr ""
-
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -146,7 +109,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 6e13fdf..5f7624f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,12 +1,12 @@
 # Vietnamese Translation for libnss-ldap.
 # Copyright © 2005 Free Software Foundation, Inc.
 # Clytie Siddall <clytie@riverland.net.au>, 2005.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1\n"
-"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
-"POT-Creation-Date: 2007-09-28 10:02+0200\n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-05 16:33+0200\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"
@@ -87,9 +87,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:3001 ../libnss-ldapd.templates:5001
+#: ../libnss-ldapd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
 msgstr ""
 
@@ -105,51 +103,15 @@ msgstr ""
 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
-#: ../libnss-ldapd.templates:5001
-msgid "LDAP account for root:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libnss-ldapd.templates:5001
-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
-#: ../libnss-ldapd.templates:5001
-msgid "Leave this empty to not do anything special for root lookups."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-msgid "LDAP root account password:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../libnss-ldapd.templates:6001
-#, fuzzy
-msgid ""
-"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:7001
+#: ../libnss-ldapd.templates:5001
 msgid "Name services to configure:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
@@ -157,7 +119,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../libnss-ldapd.templates:7001
+#: ../libnss-ldapd.templates:5001
 msgid ""
 "You can select the services that should be enabled or disabled for LDAP "
 "lookups. The new LDAP lookups will be added as last option. Be sure to "
@@ -165,6 +127,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "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."
+
+#, fuzzy
 #~ msgid "LDAP version to use:"
 #~ msgstr "Phiên bản LDAP cần dùng"