Package: openldap2.2 Severity: normal Tags: patch The recently added debconf templates do not follow some of the writing guidelines you may find in the Developers Reference (I'm afraid I'm responsible for these guidelines....usually called "DTSG" for Debconf Templates Style Guide).
Please find attached a patch which implements most of the changes I think are needed. It also changes some wording for what I think is better English (but, well, my English is far from being perfect). Aftrer talking with Steve Langasek on IRC, I understood he's involved in this package development, so I think that he can fix the English wording in the templates as well. If you apply these changes or other changes to debconf templates, please run the "debconf-updatepo" utility. Then, as soon as the templates wording is carved in stone, please use the "podebconf-report-po" utility to request updates to translators. This utility is part of the "po-debconf" package. Given the importance of this package, you may also consider posting a call for translations to [EMAIL PROTECTED], to get more translations. If you do do, don't forget to mention the existing translations and mention that these translators have been individually notified. Otherwise, some people could start translating while something already exists. Feel free to ask me for any clarification about all this. -- System Information: Debian Release: 3.1 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: i386 (i686) Kernel: Linux 2.6.9-1-686 Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to fr_FR.UTF-8)
--- slapd.templates.old 2005-04-03 10:11:49.034547159 +0200 +++ slapd.templates 2005-04-03 10:21:39.252309573 +0200 @@ -2,85 +2,85 @@ Type: boolean Default: false _Description: Do you want to omit the configuration of slapd? - If you choose yes here, no default configuration or database will be + If you choose this option, no default configuration or database will be created. Template: slapd/dump_database Type: select Choices: always, when needed, never Default: when needed -_Description: Dump databases to file on upgrade - Before upgrading to a new version of the OpenLDAP server the data of +_Description: Dump databases to file on upgrade: + Before upgrading to a new version of the OpenLDAP server the data of your LDAP directories can be dumped to plain text files (LDIF format) - which is a standardized description of that data (LDIF stands for - LDAP Data Interchange Format). - - Selecting always will make the maintainer scripts dump your databases - before upgrading unconditionally. Selecting "when needed" will only - dump the database if the new version is incompatible with the old - database format and it has to be reimported. Never will just go ahead - without ever dumping your database. + which is a standardized description of that data (LDIF stands for + LDAP Data Interchange Format). + . + Selecting "always" will make the maintainer scripts dump your + databases before upgrading unconditionally. Selecting "when needed" + will only dump the database if the new version is incompatible with + the old database format and it has to be reimported. The "never" + choice will just go ahead without ever dumping your database. Template: slapd/dump_database_destdir Type: string Default: /var/backups/slapd-VERSION -_Description: Directory to dump databases - You can specify into which directory the LDAP databases are to be - exported. The string VERSION is replaced with the server version you +_Description: Directory to dump databases: + Please specify the directory where the LDAP databases will be + exported. The string VERSION is replaced with the server version you are upgrading from. Template: slapd/move_old_database Type: boolean Default: true -_Description: Move old database +_Description: Move old database? There are still files in /var/lib/ldap which will probably break - the configuration process. With this option enabled the maintainer + the configuration process. If you choose this option, the maintainer scripts will move the old database files out of the way before creating a new database. Template: slapd/invalid_config Type: boolean Default: true -_Description: Retry configuration +_Description: Invalid configuration. Retry configuration? The configuration you entered is invalid. Make sure that the DNS domain name has a valid syntax, the organization is not left empty and that the admin passwords match. If you decide not to retry the configuration the LDAP server - will not be set up. Run dpkg-reconfigure if you want to retry later. + will not be set up. Run "dpkg-reconfigure" if you want to retry later. Template: slapd/domain Type: string -_Description: Enter your DNS domain name +_Description: DNS domain name: The DNS domain name is used to construct the base DN of your LDAP directory. Entering foo.bar.org will give you the base DN dc=foo, dc=bar, dc=org. Template: shared/organization Type: string -_Description: Enter the name of your organization +_Description: Name of your organization: Whatever you enter here will be stored as the name of your organization in the base DN of your LDAP directory. Template: slapd/admin Type: string -_Description: Admin entry +_Description: Admin entry: The admin entry is the entry in the directory which has full read and write access. Template: slapd/password1 Type: password -_Description: Admin password +_Description: Admin password: Please enter the password for the admin entry in your LDAP directory. Template: slapd/password2 Type: password -_Description: Verify password +_Description: Confirm password: Please reenter the admin password for your LDAP directory for verification. Template: slapd/password_mismatch Type: note -_Description: passwords do not match - You need to enter the admin password twice. Please note that differences - such as uppercase/lowercase and added whitespace matter. +_Description: Passowrd mismatch + The admin password and its confirmation must match. Please note that + differences such as uppercase/lowercase and added whitespace matter. Template: slapd/purge_database Type: boolean @@ -89,26 +89,28 @@ Template: slapd/internal/adminpw Type: password -_Description: encrypted admin password +_Description: Encrypted admin password: Template: slapd/autoconf_modules Type: boolean Default: true -_Description: Change configuration to load backend modules +_Description: Change configuration to load backend modules? With OpenLDAP 2.1 backends are not longer built into the server but are instead dynamically loaded at startup. This means that the slapd configuration has to be changed to load the modules for the backends you - are using. If you select this option I'll try to fix the configuration for - you. If you don't select this then you *must* fix your configuration file + are using. + . + If you choose this option, an attempt to fix the configuration will be + made. If you don't select this, you *must* fix your configuration file yourself or slapd (and slapcat if you are upgrading from an older version) - will fail and the package will not be installed. For more information + will fail and the package will not be installed. For more information, read /usr/share/doc/slapd/README.Debian. Template: slapd/allow_ldap_v2 Type: boolean Default: false -_Description: Allow LDAPv2 protocol - slapd now defaults to having the old LDAPv2 protocol not allowed. +_Description: Allow LDAPv2 protocol? + The slapd daemon now disables the old LDAPv2 protocol by default. Programs and users are generally expected to be upgraded to LDAPv3. If you have old programs which have not been moved to use LDAPv3 and you still need LDAPv2 support then select this option and @@ -118,12 +120,14 @@ Template: slapd/fix_directory Type: boolean Default: true -_Description: Fix LDAP directory on upgrade +_Description: Fix LDAP directory on upgrade? The installation scripts of the old OpenLDAP 2.0 packages create a directory that does not conform to the ldap schema. The new version is more strict about this and you won't be able to access your directory - after the upgrade without fixing it. If you select this option I'll try to - fix it for you automagically. + after the upgrade without fixing it. + . + If you choose this option, an attempt to fix it for you will + occur. Template: slapd/suffix_change Type: boolean @@ -131,14 +135,14 @@ _Description: Move aside current database and create a new one? You have specified a directory suffix (domain) that doesn't match the one currently in /etc/ldap/slapd.conf. Changing the directory suffix - requires moving aside the current LDAP database and creating a new one. - Are you sure you want to abandon the current database? (A backup will - be made.) + requires moving aside the current LDAP database and creating a new + one. Please confirm whether you want to abandon the current database + (a backup will be made). Template: slapd/upgrade_slapcat_failure Type: note _Description: slapcat failed during upgrade - When attempting to upgrade your LDAP directory there was an error. + An error occured durin the attempt to upgrade your LDAP directory. This error occured when performing the 'slapcat' which attempts to extract your LDAP directory. This failure could be because of an incorrect config file. For example, if the appropriate moduleload @@ -147,22 +151,23 @@ about to be moved to /var/backups. If you want to try this upgrade again then move the old database files back into place, fix whatever caused slapcat to fail, and run: - slapcat | /usr/share/slapd/fix_ldif -w -o "$organization" > $location - Move the database files back to a backup area and then try and + slapcat | /usr/share/slapd/fix_ldif -w -o "$organization" > $location + . + Then move the database files back to a backup area and then try running slapadd from $location. Template: slapd/upgrade_slapadd_failure Type: note _Description: slapadd failed during upgrade - When attempting to upgrade your LDAP directory there was an error. + An error occured during the attempt to upgrade your LDAP directory. This error occured when performing the 'slapadd' which attempts to populate an empty new LDAP directory using the information from your original LDAP directory. Your original LDAP directory files have been saved in /var/backups. The results of the attempted upgrade is the ldif file in /var/backups. slapadd may have failed due to a configuration problem (in which case slapcat would have failed - too) or due to a problem in the ldif. If the problem was with the - ldif then you may be able to fix it and attempt the slapadd again. + too) or due to a problem in the LDIF file. If the problem was with the + LDIF file, you may be able to fix it and attempt the slapadd again. Template: slapd/slave_databases_require_updateref Type: note @@ -181,7 +186,7 @@ Type: select Choices: BDB, LDBM Default: BDB -_Description: Which database backend would you like to use? +_Description: Database backend to use: While the BDB backend is the recommended choice of the OpenLDAP developers, the LDBM backend has proven to be more reliable for some Debian users, especially when the BDB database wasn't properly configured. When using the
