After our various discussions, please find attached the last version of the proposed patch.
Please confirm that you're OK with that patch...or again propose changes if needed. I now need to go to the next step, namely the call for translations.
--- /home/bubulle/travail/debian/rewrite/BTS/dtc/dtc-0.25.1.old/debian/dtc.templates 2007-03-08 20:33:52.722693198 +0100 +++ /home/bubulle/travail/debian/rewrite/BTS/dtc/dtc-0.25.1/debian/dtc.templates 2007-03-18 11:42:30.739187249 +0100 @@ -2,222 +2,197 @@ Type: string Default: localhost _Description: MySQL hostname: - Enter the hostname or ip do you want to use to connect to your MySQL server. - If the MySQL server runs locally, then you can safely leave the default to - localhost. + Please enter the hostname or IP address of the MySQL server. Template: dtc/conf_mysqllogin Type: string Default: root -_Description: MySQL Login: - Enter the MySQL root login. DTC needs it to access to your MySQL table - in order to grant privileges to it's users. It's suggested that you add a - user specialy for dtc that has the rights for modifying grant tables, but - root is also working. +_Description: MySQL administrator: + Please enter the login name of a MySQL user with administrative + privileges. DTC will use it to grant privileges for the tables to + its users. Template: dtc/conf_mysqlpass Type: password -_Description: MySQL Password: - Please enter your MySQL root password so DTC can connect to MySQL and - add/remove databases. +_Description: MySQL administrator password: + Please enter the password of the MySQL administrator. Template: dtc/conf_mysqldb Type: string Default: dtc _Description: DTC database name: - DTC save all it's hosting information in a database automatically created. - You should enter it's name here. + Please enter the name of the database to use for storing all DTC + hosting information. Template: dtc/conf_mysql_change_root Type: boolean Default: false -_Description: Change MySQL root? - When installing mysql-server package under Debian, the default installed - root password for database access is an empty password. DTC can change - that root password for you if you didn't change it before. If you have - setup a root password for MySQL before, or if you are just upgrading DTC - to a newer version, you might don't need to setup a new root password. - If your root MySQL password is not set yet, then you can ask DTC to change - it with the root password you just entered. Please note that if DTC can't - connect with root, then install will fail. +_Description: Change MySQL root password? + By default, the mysql-server package does not require a password for + the MySQL root user. This can be changed during the configuration of + the DTC package. Template: dtc/main_domainname Type: string Default: example.com _Description: Domain name: - Enter the first domain name you want DTC to administrate. This domain - name will be used for installing the root admin and customer web control - panel of DTC (on one of this domain subdomains). + Please enter the first domain which you want DTC to + manage. This domain name will be used to install the root + admin and customer web control panel of DTC (under one of this domain's + subdomains). Template: dtc/dtc_adminsubdomain Type: string Default: dtc _Description: DTC root panel subdomain: - Enter the subdomain you want DTC to install it's control panel. + Please enter the subdomain to be used by the DTC control panel. Template: dtc/conf_ipaddr Type: string Default: 192.168.0.2 _Description: Primary IP address: - Enter your primary IP address here. This IP will be used for the domain - name you just provided, and will be used as default for most DTC variables. - In case of NAT, please enter your EXTERNAL IP address. + Please enter this host's primary IP address. This address will be + used for the domain name you just provided, and will be used as the + default for most DTC variables. If you are using Network Address + Translation (NAT), please enter your external IP address. Template: dtc/conf_hostingpath Type: string Default: /var/www/sites _Description: Path for hosted domains: - This path is where you want DTC to store all hosted domains - files (mail and web files) ? + Please enter the directory to be used by DTC to store files for + all hosted domains. . - Please note that apache's standard installation setup /var/www as the - apache web area (document root). Remove this manually in your - /etc/apache/httpd.conf (or in /etc/apache2) if you choose /var/www/sites - as DTC's hosting area. + If you choose /var/www, which is Apache's default document root, all + files hosted in that directory may become publicly accessible. It is + therefore recommended to change the DocumentRoot setting in Apache + configuration if you choose /var/www as path for hosted domains. Template: dtc/conf_chroot_path Type: string Default: /var/lib/dtc/chroot_template -_Description: Path where to build the chroot environment: - Please enter the path where you want DTC to build the cgi-bin chroot +_Description: Path for the chroot environment template: + Please enter the directory to be used by DTC to build the cgi-bin chroot environment template. Template: dtc/conf_admlogin Type: string Default: dtc _Description: Main domain admin name: - DTC has to bind an admin for each of it's domains. Please enter the admin - name for the domain name holding the control panel installation. + Each DTC domain must have an administrator. Please enter the login + name of the administrator for the domain name containing the control + panel installation. Template: dtc/conf_admpass Type: password -Default: _Description: Main domain admin password: - Please give the main domain's administrator a password. Note that access - to the control panel is to be managed manually in /var/www/sites/.htpasswd - currently (or in an other path if you decided not to use /var/www as your - hosting root path). + Please choose the main domain administrator's password. Access + to the control panel must be managed manually through a .htpasswd + file in the root path. Template: dtc/conf_mta_type Type: select Choices: postfix, qmail -_Description: Mail Transfer Agent Type: - Select the type of MTA that planed to use with DTC. Please not that this - software must be installed BEFORE installing DTC otherwise some of the - install script parts could be skiped and so your configuration will not be - fully done. If you didn't setup any MTA (Postfix or Qmail), then you must - finish the setup of DTC, install your MTA, and dpkg-reconfigure dtc. +_Description: Mail Transfer Agent (MTA) type: + Please select the MTA that will be used with DTC. It + should be installed on the system already. If no such MTA is currently + installed, please complete the setup of DTC, install a MTA + package, then run "dpkg-reconfigure dtc". Template: dtc/conf_use_cyrus Type: boolean Default: false -_Description: Use cyrus mail system? - If you are using the Cyrus for mail delivery, imap and MTA, you should - inform the DTC installer about it. This assumes that you are also using - Postfix as MTA (and not Qmail). +_Description: Use Cyrus mail system? + Please choose this option if you are using Cyrus for mail + delivery, IMAP and MTA. This option is only compatible with Postfix. Template: dtc/conf_apache_version Type: select Choices: 2, 1 _Description: Apache version to configure: - DTC now supports both Apache and Apache2, but you need to tell which of - them you want to use/configure, as both could be run at the same time - under Debian. + DTC supports both Apache and Apache2. Please enter the version + which DTC should use. Template: dtc/conf_use_nated_vhosts Type: boolean Default: false -_Description: Use nated vhosts? - It's possible that DTC generates apache files to use a LAN IP address that - your server is using. If your server is in the LAN behind a firewall that - does NAT and port redirections of the public IP(s) address(es) to your - server, then you must ask to generate nated vhosts here, otherwise (if - your server is connected directly to the internet with a public static IP) - leave it to default which is to use a public static IP. +_Description: Use "NATed" vhosts? + DTC can configure Apache to use one of your IP addresses. If the + server is firewalled with NAT and port redirections of public IP(s) + address(es), a "NATed" vhost configuration can be generated. . - Note that in the case of a dynamic IP address, using NAT and port forwarding - is the only way to use DTC (because apache vhost file wont need to be - regenerated at each IP change). + This option should be chosen only if the server is not connected to + the Internet directly, but through a firewall doing network address + translation (NAT). If the server uses a dynamic public IP address, + NAT and port forwarding are mandatory for DTC. Template: dtc/conf_nated_vhosts_ip Type: string Default: 192.168.0.2 -_Description: NATed LAN IP: - This is the LAN (local area network) IP of your server, so DTC can - generate all the vhosts of Apache using this IP. +_Description: NATed LAN IP address: + Please enter the IP address of the server for DTC to + generate all vhosts that will be used by Apache. Template: dtc/conf_gen_ssl_cert Type: boolean Default: false -_Description: Generate OpenSSL certificate for DTC? - If you decide generate a certificate, then DTC will generate an self - signed OpenSSL certificate for you, so you can enjoy browsing the panel - with Secure Socket Layer connections. +_Description: Generate an SSL certificate for DTC? + If you choose this option, DTC will generate a self-signed SSL + certificate and will use SSL to browse the panel. SSL will also be + activated and the generated Apache configuration will activate HTTPS + URLs for the control panel. . - You can later upgrade to a root CA certificate by using - /usr/share/dtc/etc/ssl/new.cert.csr when buying the certificate from a - trusted SSL provider. You will then change - /usr/share/dtc/etc/ssl/new.cert.cert by a real certificate. + This certificate can be changed for a root CA certificate later. . - Note that even you ask to generate the certificate, DTC will also activate - SSL directly and generate the apache config to use HTTPS url for the panel, - if you don't, it will leave the value stored in the database (which is not - to use SSL at the first install). - . - As well, note that DTC will never overrite a previously generated - certificate. If you wish to regenerate it, you need to remove all the - files in /usr/share/dtc/etc/ssl. + Previously-generated certificates will never be overwritten. To + regenerate the certificate, you need to remove all the files in + /usr/share/dtc/etc/ssl. Template: dtc/conf_cert_passphrase Type: password _Description: DTC certificate passphrase: - To generate a certificate request and a certificate, OpenSSL needs you - enter a password. Please type it here. + Please choose a passphrase to protect the generated SSL certificate. Template: dtc/conf_cert_countrycode Type: string Default: FR -_Description: DTC SSL certificate 2 letters country code: - Please enter the 2 letter country code of your server location. Example: - AU, UK, US, FR, DE, etc. +_Description: Country code for the DTC SSL certificate: + Please enter the 2-letter country code for the generated + certificate. This should usually be the code for the country the + server is located in. Template: dtc/conf_cert_locality Type: string Default: Paris -_Description: DTC SSL certificate city name: - Please enter the city name of your server location. +_Description: City name for the DTC SSL certificate: Template: dtc/conf_cert_organization Type: string Default: GPLHost -_Description: DTC SSL certificate organization name: - Please enter your organization name. +_Description: Organization name for the DTC SSL certificate: Template: dtc/conf_cert_unit Type: string Default: no-unit -_Description: DTC SSL certificate organization unit: - Please enter your organization unit name. +_Description: Organizational unit for the DTC SSL certificate: Template: dtc/conf_cert_email Type: string -_Description: DTC SSL certificate email address: - Please enter your certificate email address. +_Description: Email address for the DTC SSL certificate: Template: dtc/conf_cert_challenge_pass Type: password -_Description: DTC SSL certificate challenge pass: - Please enter your certificate challenge password. +_Description: DTC SSL certificate challenge password: Template: dtc/conf_upgrade_pear Type: boolean Default: true -_Description: Update pear installation? - You can ask DTC to check your pear installation during install. This - REQUIRES a network connection to the internet. If you can't do so here, - please check that you have the following PEAR modules up-to-date: - Crypt_CBC and Auth_SASL. The files should be in /usr/share/php if you - want to check. +_Description: Update PEAR installation? + DTC can check the PEAR installation during its own installation + process. This requires your server to be connected to the network. If + you can't do so here, please check whether the Crypt_CBC and + Auth_SASL PEAR modules are up-to-date. The relevant files are located in + /usr/share/php. Template: dtc/conf_dnsbl_list Type: string @@ -229,24 +204,22 @@ Template: dtc/conf_eth2monitor Type: string _Description: Network devices to monitor: - Please enter here all the network devices you wish to be monitored by the - RRDTools graphing. + Please enter all the network devices you wish to be monitored by the + RRDTool graphing utility. Template: dtc/conf_report_setup_stat Type: boolean Default: true -_Description: Allow to report anonymous statistic to GPLHost? - You can help GPLHost to know how many DTC setup has been done, by - reporting your installation to it's web site. No data will be collected - except the operating system (Debian in your case), IP address of the setup - (the IP is used as an identifier so GPLHost don't account upgrades and/or - reinstallations, it will never be used for commercial purpose). You have - to be connected to internet and wget must be installed to do the report. +_Description: Allow to report anonymous statistics to GPLHost? + DTC installations can be reported to the GPLHost web site. The only + collected data are the operating system name (Debian) and the IP + address (used as a unique identifier only). An Internet connection + and the wget binary are required to report the statistics. Template: dtc/conf_omit_dev_mknod Type: boolean Default: false -_Description: Skip mknod calls when building chroot template? - In some environment, like Linux vServer, mknod is not allowed to be - executed. For that reason, it's possible to skip the creation of the dev - null, random and urandom devices during the chroot template creation. +_Description: Skip mknod calls when building the chroot template? + In some environments, such as Linux vServer, mknod cannot be + executed. This option allows skipping the creation of the null, + random and urandom devices during the chroot template creation. --- /home/bubulle/travail/debian/rewrite/BTS/dtc/dtc-0.25.1.old/debian/dtc-postfix-courier.templates 2007-03-08 20:33:52.754695198 +0100 +++ /home/bubulle/travail/debian/rewrite/BTS/dtc/dtc-0.25.1/debian/dtc-postfix-courier.templates 2007-03-20 07:25:13.037681262 +0100 @@ -2,222 +2,197 @@ Type: string Default: localhost _Description: MySQL hostname: - Enter the hostname or ip do you want to use to connect to your MySQL server. - If the MySQL server runs locally, then you can safely leave the default to - localhost. + Please enter the hostname or IP address of the MySQL server. Template: dtc/conf_mysqllogin Type: string Default: root -_Description: MySQL Login: - Enter the MySQL root login. DTC needs it to access to your MySQL table - in order to grant privileges to it's users. It's suggested that you add a - user specialy for dtc that has the rights for modifying grant tables, but - root is also working. +_Description: MySQL administrator: + Please enter the login name of a MySQL user with administrative + privileges. DTC will use it to grant privileges for the tables to + its users. Template: dtc/conf_mysqlpass Type: password -_Description: MySQL Password: - Please enter your MySQL root password so DTC can connect to MySQL and - add/remove databases. +_Description: MySQL administrator password: + Please enter the password of the MySQL administrator. Template: dtc/conf_mysqldb Type: string Default: dtc _Description: DTC database name: - DTC save all it's hosting information in a database automatically created. - You should enter it's name here. + Please enter the name of the database to use for storing all DTC + hosting information. Template: dtc/conf_mysql_change_root Type: boolean Default: false -_Description: Change MySQL root? - When installing mysql-server package under Debian, the default installed - root password for database access is an empty password. DTC can change - that root password for you if you didn't change it before. If you have - setup a root password for MySQL before, or if you are just upgrading DTC - to a newer version, you might don't need to setup a new root password. - If your root MySQL password is not set yet, then you can ask DTC to change - it with the root password you just entered. Please note that if DTC can't - connect with root, then install will fail. +_Description: Change MySQL root password? + By default, the mysql-server package does not require a password for + the MySQL root user. This can be changed during the configuration of + the DTC package. Template: dtc/main_domainname Type: string Default: example.com _Description: Domain name: - Enter the first domain name you want DTC to administrate. This domain - name will be used for installing the root admin and customer web control - panel of DTC (on one of this domain subdomains). + Please enter the first domain which you want DTC to + manage. This domain name will be used to install the root + admin and customer web control panel of DTC (under one of this domain's + subdomains). Template: dtc/dtc_adminsubdomain Type: string Default: dtc _Description: DTC root panel subdomain: - Enter the subdomain you want DTC to install it's control panel. + Please enter the subdomain to be used by the DTC control panel. Template: dtc/conf_ipaddr Type: string Default: 192.168.0.2 _Description: Primary IP address: - Enter your primary IP address here. This IP will be used for the domain - name you just provided, and will be used as default for most DTC variables. - In case of NAT, please enter your EXTERNAL IP address. + Please enter this host's primary IP address. This address will be + used for the domain name you just provided, and will be used as the + default for most DTC variables. If you are using Network Address + Translation (NAT), please enter your external IP address. Template: dtc/conf_hostingpath Type: string Default: /var/www/sites _Description: Path for hosted domains: - This path is where you want DTC to store all hosted domains - files (mail and web files) ? + Please enter the directory to be used by DTC to store files for + all hosted domains. . - Please note that apache's standard installation setup /var/www as the - apache web area (document root). Remove this manually in your - /etc/apache/httpd.conf (or in /etc/apache2) if you choose /var/www/sites - as DTC's hosting area. + If you choose /var/www, which is Apache's default document root, all + files hosted in that directory may become publicly accessible. It is + therefore recommended to change the DocumentRoot setting in Apache + configuration if you choose /var/www as path for hosted domains. Template: dtc/conf_chroot_path Type: string Default: /var/lib/dtc/chroot_template -_Description: Path where to build the chroot environment: - Please enter the path where you want DTC to build the cgi-bin chroot +_Description: Path for the chroot environment template: + Please enter the directory to be used by DTC to build the cgi-bin chroot environment template. Template: dtc/conf_admlogin Type: string Default: dtc _Description: Main domain admin name: - DTC has to bind an admin for each of it's domains. Please enter the admin - name for the domain name holding the control panel installation. + Each DTC domain must have an administrator. Please enter the login + name of the administrator for the domain name containing the control + panel installation. Template: dtc/conf_admpass Type: password -Default: _Description: Main domain admin password: - Please give the main domain's administrator a password. Note that access - to the control panel is to be managed manually in /var/www/sites/.htpasswd - currently (or in an other path if you decided not to use /var/www as your - hosting root path). + Please choose the main domain administrator's password. Access + to the control panel must be managed manually through a .htpasswd + file in the root path. Template: dtc/conf_mta_type Type: select Choices: postfix, qmail -_Description: Mail Transfer Agent Type: - Select the type of MTA that planed to use with DTC. Please not that this - software must be installed BEFORE installing DTC otherwise some of the - install script parts could be skiped and so your configuration will not be - fully done. If you didn't setup any MTA (Postfix or Qmail), then you must - finish the setup of DTC, install your MTA, and dpkg-reconfigure dtc. +_Description: Mail Transfer Agent (MTA) type: + Please select the MTA that will be used with DTC. It + should be installed on the system already. If no such MTA is currently + installed, please complete the setup of DTC, install a MTA + package, then run "dpkg-reconfigure dtc". Template: dtc/conf_use_cyrus Type: boolean Default: false -_Description: Use cyrus mail system? - If you are using the Cyrus for mail delivery, imap and MTA, you should - inform the DTC installer about it. This assumes that you are also using - Postfix as MTA (and not Qmail). +_Description: Use Cyrus mail system? + Please choose this option if you are using Cyrus for mail + delivery, IMAP and MTA. This option is only compatible with Postfix. Template: dtc/conf_apache_version Type: select Choices: 2, 1 _Description: Apache version to configure: - DTC now supports both Apache and Apache2, but you need to tell which of - them you want to use/configure, as both could be run at the same time - under Debian. + DTC supports both Apache and Apache2. Please enter the version + which DTC should use. Template: dtc/conf_use_nated_vhosts Type: boolean Default: false -_Description: Use nated vhosts? - It's possible that DTC generates apache files to use a LAN IP address that - your server is using. If your server is in the LAN behind a firewall that - does NAT and port redirections of the public IP(s) address(es) to your - server, then you must ask to generate nated vhosts here, otherwise (if - your server is connected directly to the internet with a public static IP) - leave it to default which is to use a public static IP. +_Description: Use "NATed" vhosts? + DTC can configure Apache to use one of your IP addresses. If the + server is firewalled with NAT and port redirections of public IP(s) + address(es), a "NATed" vhost configuration can be generated. . - Note that in the case of a dynamic IP address, using NAT and port forwarding - is the only way to use DTC (because apache vhost file wont need to be - regenerated at each IP change). + This option should be chosen only if the server is not connected to + the Internet directly, but through a firewall doing network address + translation (NAT). If the server uses a dynamic public IP address, + NAT and port forwarding are mandatory for DTC. Template: dtc/conf_nated_vhosts_ip Type: string Default: 192.168.0.2 -_Description: NATed LAN IP: - This is the LAN (local area network) IP of your server, so DTC can - generate all the vhosts of Apache using this IP. +_Description: NATed LAN IP address: + Please enter the IP address of the server for DTC to + generate all vhosts that will be used by Apache. Template: dtc/conf_gen_ssl_cert Type: boolean Default: false -_Description: Generate OpenSSL certificate for DTC? - If you decide generate a certificate, then DTC will generate an self - signed OpenSSL certificate for you, so you can enjoy browsing the panel - with Secure Socket Layer connections. +_Description: Generate an SSL certificate for DTC? + If you choose this option, DTC will generate a self-signed SSL + certificate and will use SSL to browse the panel. SSL will also be + activated and the generated Apache configuration will activate HTTPS + URLs for the control panel. . - You can later upgrade to a root CA certificate by using - /usr/share/dtc/etc/ssl/new.cert.csr when buying the certificate from a - trusted SSL provider. You will then change - /usr/share/dtc/etc/ssl/new.cert.cert by a real certificate. + This certificate can be changed for a root CA certificate later. . - Note that even you ask to generate the certificate, DTC will also activate - SSL directly and generate the apache config to use HTTPS url for the panel, - if you don't, it will leave the value stored in the database (which is not - to use SSL at the first install). - . - As well, note that DTC will never overrite a previously generated - certificate. If you wish to regenerate it, you need to remove all the - files in /usr/share/dtc/etc/ssl. + Previously-generated certificates will never be overwritten. To + regenerate the certificate, you need to remove all the files in + /usr/share/dtc/etc/ssl. Template: dtc/conf_cert_passphrase Type: password _Description: DTC certificate passphrase: - To generate a certificate request and a certificate, OpenSSL needs you - enter a password. Please type it here. + Please choose a passphrase to protect the generated SSL certificate. Template: dtc/conf_cert_countrycode Type: string Default: FR -_Description: DTC SSL certificate 2 letters country code: - Please enter the 2 letter country code of your server location. Example: - AU, UK, US, FR, DE, etc. +_Description: Country code for the DTC SSL certificate: + Please enter the 2-letter country code for the generated + certificate. This should usually be the code for the country the + server is located in. Template: dtc/conf_cert_locality Type: string Default: Paris -_Description: DTC SSL certificate city name: - Please enter the city name of your server location. +_Description: City name for the DTC SSL certificate: Template: dtc/conf_cert_organization Type: string Default: GPLHost -_Description: DTC SSL certificate organization name: - Please enter your organization name. +_Description: Organization name for the DTC SSL certificate: Template: dtc/conf_cert_unit Type: string Default: no-unit -_Description: DTC SSL certificate organization unit: - Please enter your organization unit name. +_Description: Organizational unit for the DTC SSL certificate: Template: dtc/conf_cert_email Type: string -_Description: DTC SSL certificate email address: - Please enter your certificate email address. +_Description: Email address for the DTC SSL certificate: Template: dtc/conf_cert_challenge_pass Type: password -_Description: DTC SSL certificate challenge pass: - Please enter your certificate challenge password. +_Description: DTC SSL certificate challenge password: Template: dtc/conf_upgrade_pear Type: boolean Default: true -_Description: Update pear installation? - You can ask DTC to check your pear installation during install. This - REQUIRES a network connection to the internet. If you can't do so here, - please check that you have the following PEAR modules up-to-date: - Crypt_CBC and Auth_SASL. The files should be in /usr/share/php if you - want to check. +_Description: Update PEAR installation? + DTC can check the PEAR installation during its own installation + process. This requires your server to be connected to the network. If + you can't do so here, please check whether the Crypt_CBC and + Auth_SASL PEAR modules are up-to-date. The relevant files are located in + /usr/share/php. Template: dtc/conf_dnsbl_list Type: string @@ -229,24 +204,22 @@ Template: dtc/conf_eth2monitor Type: string _Description: Network devices to monitor: - Please enter here all the network devices you wish to be monitored by the - RRDTools graphing. + Please enter all the network devices you wish to be monitored by the + RRDTool graphing utility. Template: dtc/conf_report_setup_stat Type: boolean Default: true -_Description: Allow to report anonymous statistic to GPLHost? - You can help GPLHost to know how many DTC setup has been done, by - reporting your installation to it's web site. No data will be collected - except the operating system (Debian in your case), IP address of the setup - (the IP is used as an identifier so GPLHost don't account upgrades and/or - reinstallations, it will never be used for commercial purpose). You have - to be connected to internet and wget must be installed to do the report. +_Description: Allow to report anonymous statistics to GPLHost? + DTC installations can be reported to the GPLHost web site. The only + collected data are the operating system name (Debian) and the IP + address (used as a unique identifier only). An Internet connection + and the wget binary are required to report the statistics. Template: dtc/conf_omit_dev_mknod Type: boolean Default: false -_Description: Skip mknod calls when building chroot template? - In some environment, like Linux vServer, mknod is not allowed to be - executed. For that reason, it's possible to skip the creation of the dev - null, random and urandom devices during the chroot template creation. +_Description: Skip mknod calls when building the chroot template? + In some environments, such as Linux vServer, mknod cannot be + executed. This option allows skipping the creation of the null, + random and urandom devices during the chroot template creation.