do not make default values translatable

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

14 files changed, 290 insertions, 470 deletions

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 5435557..da06ad8 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -84,20 +84,14 @@ msgstr ""
 "cal suprimir les entrades d'LDAP del fitxer nsswitch.conf."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=exemple,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "nom distingit de la base de la cerca"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -176,20 +170,14 @@ msgid "All new installations will have this by default."
 msgstr "Totes les noves instal·lacions ho tindran de forma predeterminada."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=exemple,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "usuari de la base de dades sense privilegis"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -212,20 +200,14 @@ msgstr ""
 "de dades de l'LDAP."
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Versió de l'LDAP a utilitzar"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -234,21 +216,14 @@ msgstr ""
 "és una bona idea especificar el nombre de versió més gran disponible."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -257,7 +232,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -337,6 +312,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=exemple,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=exemple,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ 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"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 7d7873c..22248c4 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -91,20 +91,14 @@ msgstr ""
 "conf zase odstranit, aby byla zachována funkčnost základních služeb."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=priklad,dc=cz"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "Rozlišitelný název prohledávaného stromu"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -180,20 +174,14 @@ msgid "All new installations will have this by default."
 msgstr "Toto je výchozí nastavení pro všechny nové instalace."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuzivatel,dc=priklad,dc=cz"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "Neprivilegovaný databázový uživatel"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -212,20 +200,14 @@ 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
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Verze LDAPu, která se má použít"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -234,21 +216,14 @@ msgstr ""
 "doporučuje použít nejvyšší dostupnou verzi."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -257,7 +232,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -336,6 +311,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=priklad,dc=cz"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuzivatel,dc=priklad,dc=cz"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "Adresa počítače s LDAP serverem"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 4b0b9e5..9d0b61c 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -88,20 +88,14 @@ msgstr ""
 "nsswitch.conf, s� de grundl�ggende services stadig kan fungere."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=eksempel,dc=dk"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "skelnet navn p� s�gebasen"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -175,20 +169,14 @@ msgid "All new installations will have this by default."
 msgstr "Alle nyinstallationer vil have dette som udgangspunkt."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxybruger,dc=eksempel,dc=dk"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "upriviligeret databasebruger"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -207,12 +195,6 @@ msgstr "adgangskode til databasekontoen"
 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: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
 #  Template: libnss-ldap/confperm
 #  ddtp-prioritize: 56
 #
@@ -335,14 +317,14 @@ msgstr "3, 2"
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "LDAP-version der skal bruges"
 
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -351,21 +333,14 @@ msgstr ""
 "normalt en god id� at s�tte den til det h�jest mulige versionsnummer."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -375,7 +350,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -454,6 +429,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=eksempel,dc=dk"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxybruger,dc=eksempel,dc=dk"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #  Template: shared/ldapns/ldap-server
 #  ddtp-prioritize: 56
 #
diff --git a/debian/po/de.po b/debian/po/de.po
index 6574d7e..d5c87f2 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_220-1_de\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -100,25 +100,19 @@ msgstr ""
 "l�schen, bevor Sie dieses Paket entfernen, um die Funktion der Grunddienste "
 "zu erhalten."
 
-#. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=example,dc=net"
-
 #  Template: shared/ldapns/base-dn
 #  ddtp-prioritize: 56
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "DN (distinguished name) der Suchbasis"
 
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -207,25 +201,19 @@ msgstr ""
 msgid "All new installations will have this by default."
 msgstr "Alle Neuinstallationen werden das als Voreinstellung haben."
 
-#. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=example,dc=net"
-
 #  Template: libnss-ldap/binddn
 #  ddtp-prioritize: 56
 #
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "nicht priviligierter Datenbank-Nutzer"
 
 #
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -247,25 +235,19 @@ msgstr "Passwort f�r das Datenbank-Login-Konto"
 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."
 
-#. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
 #  Template: shared/ldapns/ldap_version
 #  ddtp-prioritize: 56
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Welche LDAP-Version soll genutzt werden?"
 
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -275,21 +257,14 @@ msgstr ""
 "Versionsnummer zu setzen."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -299,7 +274,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -379,6 +354,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=example,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=example,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #  Template: shared/ldapns/ldap-server
 #  ddtp-prioritize: 56
 #
diff --git a/debian/po/es.po b/debian/po/es.po
index 3ed310d..e820c3a 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Debian Description Translation Project <debconf@ddtp.debian."
 "org>\n"
@@ -71,12 +71,6 @@ msgid ""
 "from nsswitch.conf to keep basic services functioning."
 msgstr ""
 
-#. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr ""
-
 #  Template: libnss-ldap/confperm
 #  ddtp-prioritize: 56
 #
@@ -123,14 +117,14 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "El nombre distintivo (DN) de la base de b�squedas."
 
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -201,20 +195,14 @@ msgid "All new installations will have this by default."
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -232,12 +220,6 @@ msgstr ""
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
-#. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr ""
-
 #  Template: libnss-ldap/dblogin
 #  ddtp-prioritize: 56
 #
@@ -306,14 +288,14 @@ msgstr ""
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Versi�n de LDAP a utilizar"
 
 #
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -323,20 +305,14 @@ msgstr ""
 "est� disponible."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-msgid "ldap://127.0.0.1/"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -346,7 +322,7 @@ msgstr ""
 #
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 19d838a..bec8edb 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -86,20 +86,14 @@ msgstr ""
 "fichier nsswitch.conf pour que les services de base continuent � fonctionner."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=exemple,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "Nom distinctif (DN) de la base de recherche�:"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -179,20 +173,14 @@ msgstr ""
 "Cette possibilit� est activ�e par d�faut pour les premi�res installations."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=exemple,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "Utilisateur non privil�gi� de la base�:"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -212,20 +200,14 @@ msgstr ""
 "Veuillez indiquer le mot de passe qui permettra l'acc�s � la base LDAP."
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Version de LDAP � utiliser�:"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -234,21 +216,14 @@ msgstr ""
 "est recommand� de choisir le num�ro de version le plus �lev� disponible."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -257,7 +232,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -336,6 +311,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=exemple,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=exemple,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "Adresse du serveur LDAP�:"
 
diff --git a/debian/po/ja.po b/debian/po/ja.po
index e88fceb..ec88dc5 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -92,20 +92,14 @@ msgstr ""
 "nsswitch.conf ���� ldap ����ȥ�������Ƥ����Τ������Ǥ���"
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "�����١����μ���̾"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -179,20 +173,14 @@ msgid "All new installations will have this by default."
 msgstr "�����Υ��󥹥ȡ���ǤϤ��٤ơ����줬�ǥե���Ȥ�¸�ߤ��ޤ���"
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "�ø��Τʤ��ǡ����١����桼��"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -212,20 +200,14 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "LDAP �ǡ����١����˥������󤹤�Τ˻Ȥ��ѥ���ɤ����Ϥ��Ƥ���������"
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "���Ѥ��� LDAP �С������"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -234,21 +216,14 @@ msgstr ""
 "��⤤�С�������ֹ�򤳤������ꤹ��Τϡ��̾�ɤ��ͤ��Ǥ���"
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -257,7 +232,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -336,6 +311,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=example,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=example,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "LDAP �����ФΥۥ��ȥ��ɥ쥹"
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index a291624..7b1f28f 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -94,20 +94,14 @@ msgstr ""
 "werkend te houden."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=voorbeeld,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "onderscheiden naam van de zoek basis"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -184,20 +178,14 @@ msgid "All new installations will have this by default."
 msgstr "Alle nieuwe installaties gebruiken dit bij default."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxygebruiker,dc=voorbeeld,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "niet bevoorrechte database gebruiker"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -220,20 +208,14 @@ msgstr ""
 "melden."
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Te gebruiken LDAP versie"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -243,21 +225,14 @@ msgstr ""
 "nummer in te stellen."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -266,7 +241,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -346,6 +321,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=voorbeeld,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxygebruiker,dc=voorbeeld,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "LDAP server host adres"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index fe4285a..877e752 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -93,20 +93,14 @@ msgstr ""
 "ldap do arquivo nsswitch.conf para manter os servi�os b�sicos funcionando."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "O nome distinto (dn) da base de procura."
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -183,20 +177,14 @@ msgid "All new installations will have this by default."
 msgstr "Todas as novas instala��es ter�o isso por padr�o."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "Usu�rio n�o previlegiado da base de dados."
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -218,20 +206,14 @@ msgstr ""
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Vers�o do protocolo LDAP a ser utilizada."
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -241,21 +223,14 @@ msgstr ""
 "alto dispon�vel."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -264,7 +239,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -343,6 +318,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=example,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=example,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "Endere�o da m�quina servidora LDAP."
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c4d1e7a..1f14fd6 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -85,12 +85,6 @@ msgstr ""
 "�����: ����� ��������� ����� ������, �� ������ ������ ldap �� ����� nsswitch."
 "conf, ����� ������ �������� �������� �� ����������."
 
-#. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=example,dc=net"
-
 #  Template: libnss-ldap/confperm
 #  ddtp-prioritize: 56
 #
@@ -137,14 +131,14 @@ msgstr "dc=example,dc=net"
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "�������������� ��� ���� ������."
 
 #
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -219,20 +213,14 @@ msgid "All new installations will have this by default."
 msgstr "��� ����� ������������� ������� ������ ����� ��� �� ���������."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "������������������� ������������ ���� ������"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -252,20 +240,14 @@ msgstr ""
 "������� ������, ������� ����� ����������� ��� ����������� � ���� ������ LDAP."
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "������������ ������ LDAP"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -274,21 +256,14 @@ msgstr ""
 "����� ������������ ������ � ���������� �������."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -297,7 +272,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -376,6 +351,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=example,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=example,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "�������� ����� ������� LDAP"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index b2b5b75..63d1bbb 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: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -95,20 +95,14 @@ msgstr ""
 "nsswitch.conf f�r att h�lla ig�ng de grundl�ggande tj�nsterna."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=exempel,dc=se"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr "DN-namnet f�r s�kbasen"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -182,20 +176,14 @@ msgid "All new installations will have this by default."
 msgstr "Alla nya installationer kommer att ha detta som standard."
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=exempel,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr "icke-priviligerad databasanv�ndare"
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -215,20 +203,14 @@ 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
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "LDAP-version som anv�nds"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -238,21 +220,14 @@ msgstr ""
 "versionsnumret."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -261,7 +236,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -340,6 +315,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=exempel,dc=se"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=exempel,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ msgid "ldap://127.0.0.1/"
+#~ msgstr "127.0.0.1"
+
 #~ msgid "LDAP server host address"
 #~ msgstr "V�rdadress f�r LDAP-server"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 5a39158..65d7bfa 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldapd 0.1.0\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -80,20 +80,14 @@ msgid ""
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 msgid "distinguished name of the search base"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -160,20 +154,14 @@ msgid "All new installations will have this by default."
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid "unprivileged database user"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -192,40 +180,28 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr ""
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../templates:9001
-msgid "ldap://127.0.0.1/"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -234,7 +210,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index ca5ebd6..79f7d1f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1\n"
-"Report-Msgid-Bugs-To: adejong@debian.org\n"
-"POT-Creation-Date: 2006-12-08 17:27+0100\n"
+"Report-Msgid-Bugs-To: Arthur de Jong <adejong@debian.org>\n"
+"POT-Creation-Date: 2006-12-08 19:37+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"
@@ -84,20 +84,14 @@ msgstr ""
 "tin nsswitch.conf, để cho phép dịch vụ cơ bản tiếp tục hoạt động."
 
 #. Type: string
-#. Default
-#: ../templates:3001
-msgid "dc=example,dc=net"
-msgstr "dc=thídụ,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:3002
+#: ../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"
 
 #. Type: string
 #. Description
-#: ../templates:3002
+#: ../templates:3001
 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 "
@@ -172,20 +166,14 @@ 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
-#. Default
-#: ../templates:6001
-msgid "cn=proxyuser,dc=example,dc=net"
-msgstr "cn=proxyuser,dc=example,dc=net"
-
-#. Type: string
 #. Description
-#: ../templates:6002
+#: ../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:6002
+#: ../templates:6001
 msgid ""
 "Enter the name of the account that will be used to log in to the LDAP "
 "database."
@@ -205,20 +193,14 @@ 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
-#. Choices
-#: ../templates:8001
-msgid "3, 2"
-msgstr "3, 2"
-
-#. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 msgid "LDAP version to use"
 msgstr "Phiên bản LDAP cần dùng"
 
 #. Type: select
 #. Description
-#: ../templates:8002
+#: ../templates:8001
 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."
@@ -227,21 +209,14 @@ msgstr ""
 "tốt để lập số phiên bản cao nhất có thể."
 
 #. Type: string
-#. Default
-#: ../templates:9001
-#, fuzzy
-msgid "ldap://127.0.0.1/"
-msgstr "127.0.0.1"
-
-#. Type: string
 #. Description
-#: ../templates:9002
+#: ../templates:9001
 msgid "LDAP server Uniform Resource Identifier"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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 "
@@ -250,7 +225,7 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:9002
+#: ../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."
@@ -329,6 +304,19 @@ msgstr ""
 msgid "Entering an empty password will re-use the old password."
 msgstr ""
 
+#~ msgid "dc=example,dc=net"
+#~ msgstr "dc=thídụ,dc=net"
+
+#~ msgid "cn=proxyuser,dc=example,dc=net"
+#~ msgstr "cn=proxyuser,dc=example,dc=net"
+
+#~ msgid "3, 2"
+#~ msgstr "3, 2"
+
+#, fuzzy
+#~ 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"
 
diff --git a/debian/templates b/debian/templates
index ecf49bf..ecbda97 100644
--- a/debian/templates
+++ b/debian/templates
@@ -26,7 +26,7 @@ _Description: nsswitch.conf is not managed automatically
 
 Template: shared/ldapns/base-dn
 Type: string
-_Default: dc=example,dc=net
+Default: dc=example,dc=net
 _Description: distinguished name of the search base
  Please enter the distinguished name of the LDAP search base.  Many sites
  use the components of their domain names for this purpose.  For example,
@@ -59,7 +59,7 @@ _Description: enable automatic configuration updates by debconf
 
 Template: libnss-ldap/binddn
 Type: string
-_Default: cn=proxyuser,dc=example,dc=net
+Default: cn=proxyuser,dc=example,dc=net
 _Description: unprivileged database user
  Enter the name of the account that will be used to log in to the LDAP
  database.
@@ -71,7 +71,7 @@ _Description: password for database login account
 
 Template: shared/ldapns/ldap_version
 Type: select
-_Choices: 3, 2
+Choices: 3, 2
 Default: 3
 _Description: LDAP version to use
  Please enter which version of the LDAP protocol ldapns is to use.  It is
@@ -79,7 +79,7 @@ _Description: LDAP version to use
 
 Template: shared/ldapns/ldap-server
 Type: string
-_Default: ldap://127.0.0.1/
+Default: ldap://127.0.0.1/
 _Description: LDAP server Uniform Resource Identifier
  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