[Pkg-openldap-devel] r1257 - in openldap/trunk/debian: . po

Sat Apr 17 11:52:20 UTC 2010

tags 231950 pending
thanks

Author: matthijs
Date: 2010-04-17 11:52:20 +0000 (Sat, 17 Apr 2010)
New Revision: 1257

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/po/cs.po
   openldap/trunk/debian/po/da.po
   openldap/trunk/debian/po/de.po
   openldap/trunk/debian/po/es.po
   openldap/trunk/debian/po/eu.po
   openldap/trunk/debian/po/fi.po
   openldap/trunk/debian/po/fr.po
   openldap/trunk/debian/po/gl.po
   openldap/trunk/debian/po/it.po
   openldap/trunk/debian/po/ja.po
   openldap/trunk/debian/po/nl.po
   openldap/trunk/debian/po/pt.po
   openldap/trunk/debian/po/pt_BR.po
   openldap/trunk/debian/po/ru.po
   openldap/trunk/debian/po/sv.po
   openldap/trunk/debian/po/templates.pot
   openldap/trunk/debian/po/vi.po
   openldap/trunk/debian/slapd.config
   openldap/trunk/debian/slapd.postinst
   openldap/trunk/debian/slapd.scripts-common
   openldap/trunk/debian/slapd.templates
Log:
 * Add slapd/internal/generated_adminpw
 * Move crypt_admin_pass to the postinst, then slappasswd is available.
 * If an empty password is given, then generate a password and set the
   rootdn and rootpw in the configuration file.


Modified: openldap/trunk/debian/changelog
===================================================================

--- openldap/trunk/debian/changelog	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/changelog	2010-04-17 11:52:20 UTC (rev 1257)
@@ -18,8 +18,9 @@
   * Reworked the configure.options a bit to include some more options
   * Enable dynamic acls
   * Use slappasswd to create a secure password (Closes: #490930)
+  * Set a rootdn and rootpw if no password is given by debconf (Closes: #231950)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Wed, 14 Apr 2010 22:30:05 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 16 Apr 2010 15:27:28 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/po/cs.po
===================================================================
--- openldap/trunk/debian/po/cs.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/cs.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 11:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -243,13 +243,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Povolit protokol LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -263,13 +263,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "ZazÃ¡lohovat stÃ¡vajÃcÃ databÃ¡zi a vytvoÅ™it novou?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -283,19 +283,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat bÄ›hem aktualizace selhal"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "PÅ™i pokusu o aktualizaci LDAP adresÃ¡Å™e se vyskytla chyba."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -309,7 +309,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -325,7 +325,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -335,13 +335,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "DatabÃ¡zovÃ½ backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -353,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -364,13 +364,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd je zastaralÃ½, repliky se musÃ znovu nastavit ruÄnÄ›"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -383,7 +383,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -396,13 +396,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Hodnota TLSCipherSuite se zmÄ›nila"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -417,7 +417,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/da.po
===================================================================
--- openldap/trunk/debian/po/da.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/da.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2 debconf\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2006-05-13 10:30+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -250,13 +250,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Tillad LDAPv2-protokollen?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 #, fuzzy
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
@@ -272,14 +272,14 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 #, fuzzy
 msgid "Back up current database and create a new one?"
 msgstr "Flyt den aktuelle database og opret en ny?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 #, fuzzy
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
@@ -294,21 +294,21 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid "slapcat failure during upgrade"
 msgstr "slapcat mislykkedes under opgraderingen"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Der opstod en fejl under forsøget på at opgradere din LDAP-bog."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
@@ -323,7 +323,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 #, fuzzy
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
@@ -340,7 +340,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -350,13 +350,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Database-bagende, der skal benyttes:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -365,7 +365,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 #, fuzzy
 msgid ""
 "In either case, you should review the resulting database configuration for "
@@ -377,13 +377,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -392,7 +392,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -402,13 +402,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -418,7 +418,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/de.po
===================================================================
--- openldap/trunk/debian/po/de.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/de.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-5\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-02-14 20:32+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -244,13 +244,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "LDAPv2-Protokoll erlauben?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -264,13 +264,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Die aktuelle Datenbank sichern und eine neue erstellen?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -285,13 +285,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat-Fehlschlag beim Upgrade"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr ""
 "Während des Versuchs, ein Upgrade des LDAP-Verzeichnisses durchzuführen, "
@@ -299,7 +299,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -314,7 +314,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -331,7 +331,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -341,13 +341,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Zu verwendendes Datenbank-Backend:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -359,7 +359,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -370,13 +370,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "Slurpd ist veraltet; Replikas müssen von Hand rekonfiguriert werden"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -388,7 +388,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -402,13 +402,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite-Werte haben sich geändert"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -423,7 +423,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/es.po
===================================================================
--- openldap/trunk/debian/po/es.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/es.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -37,7 +37,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.15-1\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2009-03-20 13:48+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -272,13 +272,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Â¿Permitir el protocolo LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -293,7 +293,7 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr ""
 "Â¿Desea crear una copia de seguridad de la base de datos actual y crear una "
@@ -301,7 +301,7 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -316,19 +316,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "fallo de slapcat durante la actualizaciÃ³n"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Se produjo un error mientras se actualizaba su directorio LDAP. "
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -342,7 +342,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -358,7 +358,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -368,13 +368,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a utilizar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -387,7 +387,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -397,13 +397,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd es obsoleto; hay que configurar las rÃ©plicas a mano"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -416,7 +416,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -430,13 +430,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Los valores de TLSCipherSuite han cambiado"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -451,7 +451,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/eu.po
===================================================================
--- openldap/trunk/debian/po/eu.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/eu.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap-eu\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 16:41+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -236,13 +236,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Onartu LDAPv2 protokoloa?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -256,13 +256,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Dagoen datubasearen babeskopia egin eta berri bat sortu?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -276,19 +276,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat hutsa bertsio-berritzean"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Errore bat gertatu da LDAP direktorioa bertsio-berritzean."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -302,7 +302,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -319,7 +319,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -329,13 +329,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Erabili behar den datubase interfazea:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -347,7 +347,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -358,13 +358,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd zaharkiturik dago, erreplikak eskuz konfiguratu behar dira"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -377,7 +377,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -391,13 +391,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite balioak aldatu egin dira"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -411,7 +411,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/fi.po
===================================================================
--- openldap/trunk/debian/po/fi.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/fi.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-04-09 20:55+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -228,13 +228,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Sallitaanko LDAPv2-yhteyskÃ¤ytÃ¤ntÃ¶?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -248,13 +248,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "TehdÃ¤Ã¤nkÃ¶ nykyisestÃ¤ tietokannasta varmuuskopio ja luodaanko uusi?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -268,19 +268,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "ToimintahÃ¤iriÃ¶ ohjelmassa slapcat pÃ¤ivityksen aikana"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "PÃ¤ivitettÃ¤essÃ¤ LDAP-hakemistoa tapahtui virhe."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -294,7 +294,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -311,7 +311,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -321,13 +321,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "KÃ¤ytettÃ¤vÃ¤ taustatietokanta:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -339,7 +339,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -350,13 +350,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd on vanhentunut; kopioiden asetukset tulee tehdÃ¤ kÃ¤sin uudelleen"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -368,7 +368,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -382,13 +382,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite-arvot ovat muuttuneet"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -402,7 +402,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/fr.po
===================================================================
--- openldap/trunk/debian/po/fr.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/fr.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-03-10 19:56+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -246,13 +246,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Faut-il autoriser le protocole LDAPv2Â ?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -267,14 +267,14 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr ""
 "Faut-il sauvegarder l'ancienne base de donnÃ©es et en crÃ©er une nouvelleÂ ?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -289,19 +289,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "Ã‰chec de slapcat durant la mise Ã  niveau"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Une erreur s'est produite lors de la mise Ã  niveau de l'annuaire LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -316,7 +316,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -332,7 +332,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -342,13 +342,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Module de base de donnÃ©es Ã  utiliserÂ :"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -360,7 +360,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -371,13 +371,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "Programme slurpd obsolÃ¨teÂ : reconfiguration manuelle des rÃ©plicats"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -390,7 +390,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -403,13 +403,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Changement des valeurs possibles pour Â«Â TLSCipherSuiteÂ Â»"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -424,7 +424,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/gl.po
===================================================================
--- openldap/trunk/debian/po/gl.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/gl.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 20:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -237,13 +237,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Â¿Admitir o protocolo LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -257,13 +257,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Â¿Facer unha copia da base de datos actual e crear unha nova?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -277,19 +277,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "Fallou a execuciÃ³n de slapcat durante a actualizaciÃ³n"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Houbo un erro ao actualizar o directorio LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -303,7 +303,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -319,7 +319,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -329,13 +329,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Motor de base de datos a empregar:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -347,7 +347,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -358,13 +358,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd estÃ¡ obsoleto; Ã© preciso reconfigurar as rÃ©plicas Ã¡ man"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -376,7 +376,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -390,13 +390,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores de TLSCipherSuite cambiaron"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -411,7 +411,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/it.po
===================================================================
--- openldap/trunk/debian/po/it.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/it.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7 italian debconf templates\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-04-22 21:55+0200\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -239,13 +239,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Abilitare il protocollo LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -260,13 +260,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Fare il backup del database attuale e crearne uno nuovo?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -281,20 +281,20 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "Problema con slapcat durante l'aggiornamento"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr ""
 "Si Ã¨ verificato un errore durante l'aggiornamento della directory LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -309,7 +309,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -325,7 +325,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -335,13 +335,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Database di backend da usare:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -353,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -364,13 +364,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd Ã¨ obsoleto; le repliche devono essere riconfigurate manualmente"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -383,7 +383,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -397,13 +397,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Sono cambiati i valori di TLSCipherSuite"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -418,7 +418,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/ja.po
===================================================================
--- openldap/trunk/debian/po/ja.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/ja.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-09 11:50+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -238,13 +238,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "LDAPv2 ãƒ—ãƒãƒˆã‚³ãƒ«ã‚’è¨±å¯ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -258,14 +258,14 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr ""
 "ç¾åœ¨ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã—ã¦ã€æ–°ã—ã„ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ä½œæˆã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -279,19 +279,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "æ›´æ–°ä¸ã« slapcat ãŒå¤±æ•—"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "LDAP ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®æ›´æ–°ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -305,7 +305,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -321,7 +321,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -331,13 +331,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "åˆ©ç”¨ã™ã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -349,7 +349,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -359,13 +359,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd ã¯æ™‚ä»£é…ã‚Œã§ã™; è¤‡è£½ã¯æ‰‹å‹•ã§è¨å®šã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -377,7 +377,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -390,13 +390,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "TLSCipherSuite ã®å€¤ãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -410,7 +410,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/nl.po
===================================================================
--- openldap/trunk/debian/po/nl.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/nl.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap2\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 12:42+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -248,13 +248,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "LDAPv2-protocol toelaten?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -268,7 +268,7 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr ""
 "Wilt u dat er een reservekopie van de huidige database en een nieuwe "
@@ -276,7 +276,7 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -291,20 +291,20 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat gaf een fout tijdens de opwaardering"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr ""
 "Er is een fout opgetreden tijdens het opwaarderen van uw LDAP-catalogus."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -318,7 +318,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -335,7 +335,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -345,13 +345,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Welk database-backend wilt u gebruiken?"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -363,7 +363,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -374,13 +374,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd is verouderd; replica's dienen handmatig ingesteld te worden"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -392,7 +392,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -406,13 +406,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "De TLSCipherSuite-waardes zijn veranderd"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -426,7 +426,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/pt.po
===================================================================
--- openldap/trunk/debian/po/pt.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/pt.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.3.38-2\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-12 21:10+0100\n"
 "Last-Translator: Tiago Fernandes <tjg.fernandes at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -242,13 +242,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Permitir o protocolo LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -262,13 +262,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Fazer cÃ³pia de seguranÃ§a da base de dados actual e criar uma nova?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -283,19 +283,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "Falha do slapcat durante a actualizaÃ§Ã£o"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Ocorreu um erro durante a actualizaÃ§Ã£o do directÃ³rio LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -309,7 +309,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -326,7 +326,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -336,13 +336,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Backend a usar para a base de dados:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -354,7 +354,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -365,13 +365,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "o slurpd estÃ¡ obsoleto; as rÃ©plicas terÃ£o de ser configuradas Ã¡ mÃ£o"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -384,7 +384,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -398,13 +398,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores para TLSCipherSuite foram alterados"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -419,7 +419,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/pt_BR.po
===================================================================
--- openldap/trunk/debian/po/pt_BR.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/pt_BR.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-3\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-08 10:00-0300\n"
 "Last-Translator: Eder L. Marques (frolic) <frolic at debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -248,13 +248,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Permitir o protocolo LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -268,13 +268,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Fazer backup da base de dados atual e criar uma nova?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -288,19 +288,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "falha do slapcat durante a atualizaÃ§Ã£o"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Um erro ocorreu durante a atualizaÃ§Ã£o do diretÃ³rio LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -315,7 +315,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -332,7 +332,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -342,13 +342,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "\"Backend\" de base de dados a ser usado:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -360,7 +360,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -371,13 +371,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "O slurpd estÃ¡ obsoleto, rÃ©plicas devem ser configuradas manualmente."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -390,7 +390,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -404,13 +404,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Os valores da TLSCipherSuite mudou"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -425,7 +425,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/ru.po
===================================================================
--- openldap/trunk/debian/po/ru.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/ru.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-6.4\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-11 08:49+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -246,13 +246,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð» LDAPv2?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -266,13 +266,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ Ð¸Ð¼ÐµÑŽÑ‰ÐµÐ¹ÑÑ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð¸ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²ÑƒÑŽ?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -286,19 +286,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° slapcat Ð¿Ñ€Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Ð’Ð¾Ð·Ð½Ð¸ÐºÐ»Ð° Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¿Ñ‹Ñ‚ÐºÐµ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð° LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -313,7 +313,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -329,7 +329,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -339,13 +339,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ñ‹Ðµ ÑÐµÑ€Ð²ÐµÑ€Ñ‹ Ð±Ð°Ð· Ð´Ð°Ð½Ð½Ñ‹Ñ…:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -357,7 +357,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -368,13 +368,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd ÑƒÑÑ‚Ð°Ñ€ÐµÐ»; Ñ€ÐµÐ¿Ð»Ð¸ÐºÐ¸ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ñ‹ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -386,7 +386,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -400,13 +400,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ÑÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ TLSCipherSuite"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -420,7 +420,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/sv.po
===================================================================
--- openldap/trunk/debian/po/sv.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/sv.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: openldap_2.4.10-2_sv\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-07-28 18:16+0200\n"
 "Last-Translator: Martin Ã…gren <martin.agren at gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -237,13 +237,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "TillÃ¥t LDAPv2-protokollet?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -257,13 +257,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "SÃ¤kerhetskopiera aktuell databas och skapa en ny?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -277,19 +277,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat-fel vid uppgradering"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Ett fel intrÃ¤ffade nÃ¤r LDAP-katalogen uppgraderades."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -303,7 +303,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -319,7 +319,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -329,13 +329,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "DatabasbakÃ¤nda att anvÃ¤nda:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -347,7 +347,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -358,13 +358,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd Ã¤r inte aktuell; repliker mÃ¥ste konfigureras fÃ¶r hand"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -377,7 +377,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -390,13 +390,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "VÃ¤rden pÃ¥ TLSCipherSuite har Ã¤ndrats"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -411,7 +411,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/templates.pot
===================================================================
--- openldap/trunk/debian/po/templates.pot	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/templates.pot	2010-04-17 11:52:20 UTC (rev 1257)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-17 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -199,13 +199,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -215,13 +215,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -231,19 +231,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -254,7 +254,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -266,7 +266,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -274,13 +274,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -289,7 +289,7 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -297,13 +297,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -312,7 +312,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -322,13 +322,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -338,7 +338,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/po/vi.po
===================================================================
--- openldap/trunk/debian/po/vi.po	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/po/vi.po	2010-04-17 11:52:20 UTC (rev 1257)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: openldap 2.4.7-6.4\n"
 "Report-Msgid-Bugs-To: openldap at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-11 15:18+0200\n"
+"POT-Creation-Date: 2010-04-16 15:49+0200\n"
 "PO-Revision-Date: 2008-05-09 00:24+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -237,13 +237,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr "Cho phÃ©p giao thá»©c LDAPv2 khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
 "The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
 "users should upgrade to LDAPv3.  If you have old programs which can't use "
@@ -257,13 +257,13 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid "Back up current database and create a new one?"
 msgstr "Sao lÆ°u cÆ¡ sá»Ÿ dá»¯ liá»‡u hiá»‡n thá»i vÃ  táº¡o Ä‘iá»u má»›i khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
 "The directory suffix (domain) you specified doesn't match the one currently "
 "in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
@@ -277,19 +277,19 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "slapcat failure during upgrade"
 msgstr "slapcat bá»‹ lá»—i trong khi nÃ¢ng cáº¥p"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid "An error occurred while upgrading the LDAP directory."
 msgstr "Gáº·p lá»—i trong khi nÃ¢ng cáº¥p thÆ° má»¥c LDAP."
 
 #. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "The 'slapcat' program failed while extracting the LDAP directory. This may "
 "be caused by an incorrect configuration file (for example, missing "
@@ -303,7 +303,7 @@
 #. Description
 #. This paragraph is followed by a (non translatable) paragraph
 #. containing a command line
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "This failure will cause 'slapadd' to fail later as well. The old database "
 "files will be moved to /var/backups. If you want to try this upgrade again, "
@@ -319,7 +319,7 @@
 #. Description
 #. Translators: keep "$location" unchanged. This is a variable that
 #. will be replaced by a directory name at execution
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
 "Then move the database files back to a backup area and then try running "
 "slapadd from $location."
@@ -329,13 +329,13 @@
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid "Database backend to use:"
 msgstr "Háºu phÆ°Æ¡ng cÆ¡ sá»Ÿ dá»¯ liá»‡u cáº§n dÃ¹ng:"
 
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "The HDB backend is recommended. HDB and BDB use similar storage formats, but "
 "HDB adds support for subtree renames. Both support the same configuration "
@@ -351,7 +351,7 @@
 # DB_CONFIG.gz
 #. Type: select
 #. Description
-#: ../slapd.templates:16001
+#: ../slapd.templates:17001
 msgid ""
 "In either case, you should review the resulting database configuration for "
 "your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
@@ -362,13 +362,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid "slurpd is obsolete; replicas must be reconfigured by hand"
 msgstr "slurpd quÃ¡ cÅ© ; má»—i báº£n sao pháº£i Ä‘Æ°á»£c cáº¥u hÃ¬nh láº¡i báº±ng tay"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "One or more slurpd \"replica\" options were found in your slapd config when "
 "upgrading.  Because slurpd is obsolete beginning with OpenLDAP 2.4, you will "
@@ -380,7 +380,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:17001
+#: ../slapd.templates:18001
 msgid ""
 "The conversion from slurpd to the pull-based syncrepl protocol cannot be "
 "done automatically and you will need to configure your replica servers by "
@@ -394,13 +394,13 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid "TLSCipherSuite values have changed"
 msgstr "GiÃ¡ trá»‹ TLSCipherSuite bá»‹ thay Ä‘á»•i"
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "A \"TLSCipherSuite\" option was found in your slapd config when upgrading. "
 "The values allowed for this option are determined by the SSL implementation "
@@ -415,7 +415,7 @@
 
 #. Type: error
 #. Description
-#: ../slapd.templates:18001
+#: ../slapd.templates:19001
 msgid ""
 "This setting has been automatically commented out for you.  If you have "
 "specific encryption needs that require this option to be re-enabled, see the "

Modified: openldap/trunk/debian/slapd.config
===================================================================
--- openldap/trunk/debian/slapd.config	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/slapd.config	2010-04-17 11:52:20 UTC (rev 1257)
@@ -151,7 +151,6 @@
 	if ! want_manual_configuration; then
 		set_defaults_for_unseen_entries
 		query_initial_config
-		crypt_admin_pass
 		configure_allow_v2_binds
 	fi
 fi

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/slapd.postinst	2010-04-17 11:52:20 UTC (rev 1257)
@@ -15,6 +15,7 @@
 	if manual_configuration_wanted; then
 		echo "  Omitting slapd configuration as requested." >&2
 	else
+		crypt_admin_pass
 		create_new_configuration
 		configure_v2_protocol_support
 	fi

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/slapd.scripts-common	2010-04-17 11:52:20 UTC (rev 1257)
@@ -310,7 +310,7 @@
 		changeConfig($config, $regexp);'
 
 	# Use perl to execute the function above.
-	perl -e "$script" $conf $reg
+	perl -e "$script" "$conf" "$reg"
 }
 # }}}
 write_database_info() {							# {{{
@@ -688,6 +688,13 @@
 		-e "s/@SUFFIX@/$basedn/g" \
 		-e "s/@ADMIN@/cn=admin,$basedn/g" \
 		-e "s/@BACKEND@/$backend/g"
+
+	# Set a generated password if no password is given.
+	db_get slapd/internal/generated_adminpw
+	if [ ! -z "$RET" ]; then
+		write_slapd_conf "$conf_new" "s|^#\s(rootdn\s+\"cn=admin.*)|\$1\\nrootpw\ $RET|"
+	fi
+
 	install_new_slapd_conf "$conf_new"
 	echo "done." >&2
 
@@ -707,7 +714,7 @@
 EOF
 		exit 1
 	fi
-} 
+}
 # }}}
 noisy_slapadd() {							# {{{
 # Run slapadd and output the ldif file if something goes wrong.
@@ -916,20 +923,48 @@
 crypt_admin_pass() {							# {{{
 # Store the encrypted admin password into the debconf db
 # Usage: crypt_admin_pass
-# XXX: This is the standard unix crypt. Maybe we can get something stronger?
 
-  	db_get slapd/password1
-    if [ ! -z "$RET" ]; then
-      db_set slapd/internal/adminpw `create_password_hash "$RET"`
-    fi
+	local adminpw;
+
+	db_get slapd/password1
+	if [ ! -z "$RET" ]; then
+		db_set slapd/internal/adminpw `create_password_hash "$RET"`
+	else
+
+		# Set the password.
+		adminpw=`generate_admin_pass`
+		db_set slapd/internal/generated_adminpw $adminpw
+		db_set slapd/internal/adminpw `create_password_hash "$adminpw"`
+	fi
 }
 
+generate_admin_pass() {
+# Generate a password, if no password given then generate one.
+# Usage: generate_admin_pass
+
+	perl << 'EOF'
+# --------
+sub generatePassword {
+	$length = shift;
+	$possible = 'abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	$password = '';
+	while(length($password) < $length) {
+		$password.= substr($possible, (int(rand(length($possible)))), 1);
+	}
+	return $password;
+}
+print generatePassword(15);
+EOF
+# --------
+}
+
 wipe_admin_pass() {
 # Remove passwords after creating the initial ldap database.
 # Usage: wipe_admin_pass
-    db_set slapd/password1 ""
-    db_set slapd/password2 ""
-    db_set slapd/internal/adminpw ""
+	db_set slapd/password1 ""
+	db_set slapd/password2 ""
+	db_set slapd/internal/adminpw ""
+	db_set slapd/internal/generated_adminpw ""
 }
 
 # }}}

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2010-04-14 20:46:04 UTC (rev 1256)
+++ openldap/trunk/debian/slapd.templates	2010-04-17 11:52:20 UTC (rev 1257)
@@ -89,6 +89,11 @@
 Description: Encrypted admin password:
  Internal template, should never be displayed to users.
 
+Template: slapd/internal/generated_adminpw
+Type: password
+Description: Generated admin password:
+ Internal template, should never be displayed to users.
+
 Template: slapd/allow_ldap_v2
 Type: boolean
 Default: false


