[evolvis-commits] r12121: Merged l10n-style patch from Christian Perrier

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:40:22 CET 2011


Author: mirabilos
Date: 2011-02-24 18:40:22 +0100 (Thu, 24 Feb 2011)
New Revision: 12121

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/common-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/downloadhost-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/groupid-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/host-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/ldap-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/lists-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/migration.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/replace-files.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/shellhost-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/users-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/web-variables.templates
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.templates.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.templates.dsfh-in
Log:
Merged l10n-style patch from Christian Perrier

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,3 +1,10 @@
+gforge (4.6.99+svn6094-2+1) UNRELEASED; urgency=low
+
+  * Merged in a patch from Christian Perrier and the Debian i18n and
+    English l10n team, bringing better style to Debconf templates.
+
+ -- Roland Mas <lolando at debian.org>  Wed, 26 Sep 2007 17:31:21 +0200
+
 gforge (4.6.99+svn6094-2) unstable; urgency=low
 
   * Added Homepage: field to debian/control.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-24 17:40:22 UTC (rev 12121)
@@ -17,7 +17,7 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
+ page / FTP hosting, release management, etc. All these services are
  integrated into one web site and managed via a nice web interface.
  .
  This meta-package installs a complete Gforge site.
@@ -30,8 +30,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package contains files and programs used by several other
  subpackages.
@@ -44,8 +44,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package contains a set of various plugins.
 
@@ -59,8 +59,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package contains the files needed to run the web part of
  Gforge on an Apache webserver.
@@ -70,7 +70,7 @@
 Depends: gforge-web-apache2
 Description: transition package to gforge-web-apache2
  This package exists only as a means to make transitions to apache2
- easier.  You can safely uninstall it.
+ easier. You can safely uninstall it.
 
 Package: gforge-db-postgresql
 Architecture: all
@@ -81,8 +81,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package installs, configures and maintains the Gforge
  database.
@@ -96,8 +96,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package configures the Exim 4 mail transfer agent to run
  Gforge.
@@ -111,8 +111,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package configures the Postfix mail transfer agent to run
  Gforge.
@@ -126,8 +126,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package configures the Courier mail transfer agent to run
  Gforge.
@@ -141,8 +141,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package provides shell accounts authenticated via the PostgreSQL
  database to Gforge users.
@@ -156,8 +156,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package configures the ProFTPd FTP server for Gforge.
 
@@ -170,8 +170,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package configures and maintains the DNS zones for Gforge.
 
@@ -184,8 +184,8 @@
  Gforge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper, web
- page / FTP hosting, release management, etc.  All these services are
- integrated into one web site and managed via a nice web interface.
+ page / FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
  .
  This package controls the interaction of Gforge and Mailman.
 
@@ -193,7 +193,7 @@
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, libipc-run-perl, rcs, liburi-perl, cvs, php5-cli, python, libphp-snoopy
 Description: CVS plugin for Gforge
- This plug-in contains the CVS subsystem of Gforge.  It allows each
+ This plug-in contains the CVS subsystem of Gforge. It allows each
  Gforge project to have its own CVS repository, and gives some control
  over it to the project's administrator.
 Provides: gforge-plugin-scm
@@ -202,7 +202,7 @@
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, subversion, subversion-tools, viewcvs, python-subversion, python (>= 2.3), php5-cli
 Description: Subversion plugin for Gforge
- This plug-in contains the Subversion subsystem of Gforge.  It allows
+ This plug-in contains the Subversion subsystem of Gforge. It allows
  each Gforge project to have its own Subversion repository, and gives
  some control over it to the project's administrator.
 Provides: gforge-plugin-scm

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/common-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/common-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/common-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,17 +1,19 @@
 Template: gforge/shared/domain_name
 Type: string
-_Description: Your Gforge domain or subdomain name:
- The domain that will host your Gforge installation.  Some services will be
- given their own subdomain in that domain (scm, lists, etc.).
+_Description: Gforge domain or subdomain name:
+ Please enter the domain that will host the Gforge installation. Some
+ services will be given their own subdomain in that domain (scm,
+ lists, etc.).
 
 Template: gforge/shared/server_admin
 Type: string
-_Description: The Gforge admin email address:
- The email address of the Gforge administrator of your site.  Needed in
- case a problem occurs.
+_Description: Gforge administrator email address:
+ Please enter the email address of the Gforge administrator of this site. It
+ will be used when problems occur.
 
 Template: gforge/shared/system_name
 Type: string
 Default: Gforge
-_Description: The Gforge system name:
- This name is used in various places throughout the system.
+_Description: Gforge system name:
+ Please enter the name of the system. It is used in various places
+ throughout the system.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/dbpasswd-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,10 +1,11 @@
 Template: gforge/shared/db_password
 Type: password
 _Description: Password used for the database:
- The connecton to the DB system requires a password.  Please choose a
- password here.
+ The connection to the database system requires a password.
+ .
+ Please choose this connection password.
 
 Template: gforge/shared/db_password_confirm
 Type: password
-_Description: Password used for the database - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/downloadhost-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/downloadhost-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/downloadhost-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,5 +1,6 @@
 Template: gforge/shared/download_host
 Type: string
-_Description: Your download server:
- The hostname of the server that will host your Gforge packages. It should
- not be the same as your main Gforge host.
+_Description: Download server:
+ Please enter the host name of the server that will host the Gforge packages.
+ .
+ It should not be the same as the main Gforge host.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/groupid-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/groupid-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/groupid-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,17 +1,17 @@
 Template: gforge/shared/newsadmin_groupid
 Type: string
 Default: 2
-_Description: The news admin group id:
- Members of the news admin group can approve news for the Gforge main
- page.  This group id MUST NOT be 1. You only need to touch this group if
- you upgrade from a previous version and want to keep your data.
+_Description: News administrative group ID:
+ The members of the news admin group can approve news for the Gforge main
+ page. This group's ID must not be 1. This should be changed only if
+ you upgrade from a previous version and want to keep the data.
 
 Template: gforge/shared/statsadmin_groupid
 Type: string
 Default: 3
-_Description: The stats admin group id:
+_Description: Statistics administrative group ID:
 
 Template: gforge/shared/peerrating_groupid
 Type: string
 Default: 4
-_Description: The peer rating admin group id:
+_Description: Peer rating administrative group ID:

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/host-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/host-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/host-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,5 +1,7 @@
 Template: gforge/shared/ip_address
 Type: string
-_Description: Your IP address:
- The IP address of the server that will host your Gforge installation. This
- is needed for the Apache virtualhosting configuration.
+_Description: IP address:
+ Please enter the IP address of the server that will host the Gforge
+ installation.
+ .
+ This is needed for the Apache virtual hosting configuration.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/ldap-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/ldap-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/ldap-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,21 +1,20 @@
 Template: gforge/shared/ldap_base_dn
 Type: string
-_Description: The LDAP base DN:
- The DN is used to refer to the LDAP directory unambiguously.  You could
- use, for instance, "dc=gforge,dc=example,dc=com"
+_Description: LDAP base DN:
+ The DN is used to refer to the LDAP directory unambiguously. 
+ Example: "dc=gforge,dc=example,dc=com"
 
 Template: gforge/shared/ldap_host
 Type: string
-_Description: The LDAP host:
- The hostname of the LDAP server.
+_Description: LDAP server host name:
 
 Template: gforge/shared/ldap_web_add_password
 Type: password
 _Description: LDAP password used to add users from the web:
- In order to add users into the LDAP directory from the web, you need to
- provide a password.
+ Please provide the password to use when adding users into the LDAP directory
+ from the web.
 
 Template: gforge/shared/ldap_web_add_password_confirm
 Type: password
-_Description: LDAP password - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/lists-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/lists-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/lists-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,5 +1,7 @@
 Template: gforge/shared/lists_host
 Type: string
-_Description: Your mailing-lists server:
- The hostname of the server that will host your Gforge mailing-lists. It
- should not be the same as your main Gforge host.
+_Description: Mailing lists server:
+ Please enter the host name of the server that will host the Gforge
+ mailing lists.
+ .
+ It should not be the same as the main Gforge host.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/migration.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/migration.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/migration.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,25 +1,24 @@
 Template: gforge/migrate_from_sourceforge
 Type: boolean
 Default: false
-_Description: Migrate to Gforge:
+_Description: Migrate to Gforge?
  The free software version of the Sourceforge software has been
- renamed to "Gforge".  Accordingly, the Debian package has been
+ renamed to "Gforge". Accordingly, the package has been
  renamed to "gforge", and "sourceforge" is no longer supported or
- maintained.  The transition to Gforge should be rather simple, as
+ maintained. The transition to Gforge should be rather simple, as
  most of the work is automated: once this package has been
- successfully installed, just install the "gforge" package and things
- should go smoothly.
+ successfully installed, just install the "gforge" package.
  .
  You still have the option not to upgrade to Gforge yet, for instance
- if you want to backup things beforehand.  If you refuse the upgrade,
+ if you want to backup things beforehand. If you refuse the upgrade,
  nothing will happen.
 
 Template: gforge/sourceforge_empty_package
 Type: note
-_Description: Sourceforge is no more
+_Description: Sourceforge discontinued
  Sourceforge has been renamed Gforge, and is no longer maintained as
  free software. This "sourceforge" package is only here to help you
- upgrade to Gforge.  Once you have installed this package and the one
- it depends on (gforge-sourceforge-transition), your data have been
- saved, and you can safely uninstall the "sourceforge" package and
+ upgrade to Gforge. Once you have installedit and the one
+ it depends on (gforge-sourceforge-transition), the data are saved
+ and you can safely uninstall the "sourceforge" package and
  proceed to install Gforge.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/replace-files.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/replace-files.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/replace-files.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -2,30 +2,28 @@
 Type: boolean
 Default: false
 _Description: Do you want ${file} to be updated?
- In order for Gforge to fully work, some changes must be made to the
- ${file} file.
+ In order for Gforge to be operational, some changes must
+ happen in ${file}.
  .
- Installer can either do them for you (and backup the current version in
- ${file}.gforge-old), or write the changes to another file
- (${file}.gforge-new) and let you propagate the changes to ${file}
- yourself.
+ This can be done automatically (the current version will be backed up in
+ ${file}.gforge-old). Alternatively, the needed changes may be written 
+ to another file (${file}.gforge-new) to let you adapt ${file} yourself.
 
 Template: gforge/shared/replace_file_remove
 Type: boolean
 Default: false
 _Description: Do you want ${file} to be updated?
- In order for Gforge to be fully deinstalled, some changes must be made to
- the ${file} file.
+ In order for Gforge to be fully uninstalled, some changes must
+ happen in ${file}.
  .
- Installer can either do them for you (and backup the current version in
- ${file}.gforge-old), or write the changes to another file
- (${file}.gforge-new) and let you propagate the changes to ${file}
- yourself.
+ This can be done automatically (the current version will be backed up in
+ ${file}.gforge-old). Alternatively, the needed changes may be written 
+ to another file (${file}.gforge-new) to let you adapt ${file} yourself.
 
 Template: gforge/shared/file_changed
 Type: note
-_Description: Please check ${file}
- You have chosen not to let the Gforge package update the ${file} file. 
- Very well, Installer has not changed it.  Instead, It has written the suggested
- changes into ${file}.gforge-new. Please check this file and apply the
- appropriate changes to ${file}.
+_Description: ${file} must be checked
+ You have chosen to not change ${file} automatically.
+ .
+ Instead, the suggested changes have been written into ${file}.gforge-new.
+ Please check this file and apply the appropriate changes to ${file}.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/shellhost-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/shellhost-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/shellhost-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,4 +1,5 @@
 Template: gforge/shared/shell_host
 Type: string
-_Description: Your shell server:
- The hostname of the server that will host your Gforge shell accounts
+_Description: Shell server:
+ Please enter the host name of the server that will host the Gforge
+ shell accounts.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/users-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/users-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/users-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,5 +1,7 @@
 Template: gforge/shared/users_host
 Type: string
-_Description: Your user mail redirector server:
- The hostname of the server that will host your Gforge user mail
- redirector. It should not be the same as your main Gforge host.
+_Description: User mail redirector server:
+ Please enter the host name of the server that will host the Gforge user mail
+ redirector.
+ .
+ It should not be the same as the main Gforge host.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/web-variables.templates
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/web-variables.templates	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/web-variables.templates	2011-02-24 17:40:22 UTC (rev 12121)
@@ -1,13 +1,13 @@
 Template: gforge/shared/sys_lang
 Type: select
-_Choices: English, Bulgarian, Catalan, Chinese, Dutch, Esperanto, French, German, Greek, Hebrew, Indonesian, Italian, Japanese, Korean, Latin, Norwegian, Polish, PortugueseBrazilian, Portuguese, Russian, SimplifiedChinese, Spanish, Swedish, Thai
+__Choices: English, Bulgarian, Catalan, Chinese (Traditional), Dutch, Esperanto, French, German, Greek, Hebrew, Indonesian, Italian, Japanese, Korean, Latin, Norwegian, Polish, Portuguese (Brazilian), Portuguese, Russian, Chinese (Simplified), Spanish, Swedish, Thai
 _DefaultChoice: English
 _Description: Default language:
- Here is the default language for web pages.
+ Please choose the default language for web pages.
 
 Template: gforge/shared/sys_theme
 Type: string
 Default: gforge
 _Description: Default theme:
- Here is the default theme for web pages, be carreful to enter a valid
+ Please choose the default theme for web pages. This has to be a valid
  name.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in	2011-02-24 17:40:22 UTC (rev 12121)
@@ -4,8 +4,9 @@
 
 Template: gforge/shared/shell_host
 Type: string
-_Description: Your shell server:
- The hostname of the server that will host your Gforge shell accounts
+_Description: Shell server:
+ Please enter the host name of the server that will host the Gforge
+ shell accounts.
 
 #DSFHELPER:users-variables#
 
@@ -13,45 +14,50 @@
 
 Template: gforge/shared/download_host
 Type: string
-_Description: Your download server:
- The hostname of the server that will host your Gforge packages. 
- It should not be the same as your main Gforge host.
+_Description: Download server:
+ Please enter the host name of the server that will host the Gforge
+ packages. 
+ .
+ It should not be the same as the main Gforge host.
 
 #DSFHELPER:dbpasswd-variables#
 
 Template: gforge/shared/admin_login
 Type: string
 _Default: admin
-_Description: The Gforge administrator login:
- This Gforge account will have all privileges on the Gforge
- system.  It is needed to approve the creation of the projects.
+_Description: Gforge administrator login:
+ Please choose the Gforge administrator account name. It will have all
+ privileges on the system. It will be used to approve new projects'
+ creations.
 
 Template: gforge/shared/ip_address
 Type: string
-_Description: Your IP address:
- The IP address of the server that will host your Gforge installation.
- This is needed for the Apache virtualhosting configuration.
+_Description: IP address:
+ Please enter the IP address of the server that will host the Gforge
+ installation.
+ .
+ This is needed for the Apache virtual hosting configuration.
 
 Template: gforge/shared/admin_password
 Type: password
-_Description: The Gforge administrator password:
- This Gforge account will have all privileges on the Gforge
- system.  It is needed to approve the creation of the projects.  Please
- type a password here.
+_Description: Gforge administrator password:
+ The Gforge administrator account that will have all privileges
+ on the system. It will be used to approve new projects' creations.
 
 Template: gforge/shared/admin_password_confirm
 Type: password
-_Description: The Gforge administrator password - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.
 
 Template: gforge/shared/skill_list
 Type: string
 Default: Ada;C;C++;HTML;LISP;Perl;PHP;Python;SQL
-_Description: The initial list of skills:
+_Description: Initial list of skills:
  Gforge allows users to define a list of their skills, to be chosen
- amongst those present in the database.  This list is the initial list of
- skills that will enter the database.  Please enter the skill names
- separated by semi-colons `;'.
+ amongst those present in the database. This list is the initial list of
+ skills that will enter the database.
+ .
+ Please enter a semi-colon separated list of skill names.
 
 #DSFHELPER:dbhost-variables#
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.templates.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.templates.dsfh-in	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.templates.dsfh-in	2011-02-24 17:40:22 UTC (rev 12121)
@@ -9,52 +9,53 @@
 Template: gforge/shared/db_password
 Type: password
 _Description: Password used for the database:
- The connection to the DB system requires a password.  Please choose a
- password here.
+ The connection to the database system requires a password.
+ .
+ Please choose this connection password.
 
 Template: gforge/shared/db_password_confirm
 Type: password
-_Description: Password used for the database - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.
 
 Template: gforge/shared/admin_login
 Type: string
 _Default: admin
-_Description: The Gforge administrator login:
- This Gforge account will have all privileges on the Gforge
- system.  It is needed to approve the creation of the projects.
+_Description: Gforge administrator login:
+ Please choose the Gforge administrator account name. It will have all
+ privileges on the system. It will be used to approve new projects'
+ creations.
 
 Template: gforge/shared/admin_password
 Type: password
-_Description: The Gforge administrator password:
- This Gforge account will have all privileges on the Gforge
- system.  It is needed to approve the creation of the projects.  Please
- type a password here.
+_Description: Gforge administrator password:
+ The Gforge administrator account that will have all privileges
+ on the system. It will be used to approve new projects' creations.
 
 Template: gforge/shared/admin_password_confirm
 Type: password
-_Description: The Gforge administrator password - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.
 
 Template: gforge/shared/skill_list
 Type: string
 Default: Ada;C;C++;HTML;LISP;Perl;PHP;Python;SQL
-_Description: The initial list of skills:
+_Description: Initial list of skills:
  Gforge allows users to define a list of their skills, to be chosen
- amongst those present in the database.  This list is the initial list of
- skills that will enter the database.  Please enter the skill names
- separated by semi-colons `;'.
+ amongst those present in the database. This list is the initial list of
+ skills that will enter the database.
+ .
+ Please enter a semi-colon separated list of skill names.
 
 Template: gforge/shared/ldap_base_dn
 Type: string
-_Description: The LDAP base DN:
- The DN is used to refer to the LDAP directory unambiguously.  You could use,
- for instance, "dc=gforge,dc=example,dc=com"
+_Description: LDAP base DN:
+ The DN is used to refer to the LDAP directory unambiguously. 
+ Example: "dc=gforge,dc=example,dc=com"
 
 Template: gforge/shared/ldap_host
 Type: string
-_Description: The LDAP host:
- The hostname of the LDAP server.
+_Description: LDAP server host name:
 
 Template: gforge/shared/noreply_to_bitbucket
 Type: boolean
@@ -63,26 +64,24 @@
  Gforge sends plenty of e-mail from the "${noreply}" address,
  and maybe even some e-mail to that address too.
  .
- It is advised that you let the package direct e-mail to that address to a
+ It is suggested that e-mail to that address is directed to a
  black hole (/dev/null), unless you have another use for that address.
- .
- Accepting this option will perform that redirection.
 
 Template: gforge/shared/ldap_web_add_password
 Type: password
 _Description: LDAP password used to add users from the web:
- In order to add users into the LDAP directory from the web, you need to
- provide a password.
+ Please provide the password to use when adding users into the LDAP directory
+ from the web.
 
 Template: gforge/shared/ldap_web_add_password_confirm
 Type: password
-_Description: LDAP password - again:
+_Description: Password confirmation:
  Please re-type the password for confirmation.
 
 Template: gforge/shared/mod_ssl_cert
 Type: note
-_Description: Generate an SSL certificate
- You need a valid SSL/TLS certificate to run Gforge.
+_Description: SSL certificate generation
+ A valid SSL/TLS certificate is needed to run Gforge.
  If you don't already have one, you'll have to run the
  "mod-ssl-makecert" command to generate one, and restart Apache
  afterwards.
@@ -92,47 +91,49 @@
 
 Template: gforge/shared/pam_ldap_config
 Type: note
-_Description: Gforge requires appropriate PAM-LDAP configuration
+_Description: Appropriate PAM-LDAP configuration required for Gforge
  Gforge requires the libpam-ldap package to be configured
- appropriately.  You might need to "dpkg-reconfigure libpam-ldap" in
+ appropriately. You might need to "dpkg-reconfigure libpam-ldap" in
  order to fix incorrect parameters.
  .
  Known good values are: LDAP protocol version=3, make root database
  admin=yes, root login account="cn=admin,dc=<your-dc-here>", crypt to
- use for passwords=crypt.  Make sure that you type the same password
- for the libpam-ldap root password and the Gforge LDAP password.
+ use for passwords=crypt.
+ .
+ Make sure that you type the same password for the libpam-ldap root
+ password and the Gforge LDAP password.
 
 Template: gforge/shared/simple_dns
 Type: boolean
 Default: false
-_Description: Do you want a simple DNS setup?
- You can have a simple DNS setup wich uses wildcards to map all
+# Translators: SCM here means "Source Control Management"
+#              (cvs, svn, etc.)
+_Description: Do you want a simple DNS setup for Gforge?
+ You can use a simple DNS setup with wildcards to map all
  project web-hosts to a single IP, and direct all the scm-hosts
  to a single SCM server, or a complex setup wich allows you to
  have many servers as project web servers or SCM servers.
  .
- Even though you have a simple DNS setup, you can still have
- separate boxes for your project servers, it just assumes you
- have all the project web dirs on the same server and a single
- server for SCM.
+ Even though you use a simple DNS setup, you can still use
+ separate boxes for your project servers, it just assumes that
+ all the project web directories are on the same server with a single
+ SCM server.
 
 Template: gforge/shared/replace_file_remove
 Type: boolean
 Default: false
 _Description: Do you want ${file} to be updated?
- In order for Gforge to be fully deinstalled, some changes must
- be made to the ${file} file.
+ In order for Gforge to be fully uninstalled, some changes must
+ happen in ${file}.
  .
- Installer can either do them for you (and backup the current version in
- ${file}.gforge-old), or write the changes to another file
- (${file}.gforge-new) and let you propagate the changes to
- ${file} yourself.
+ This can be done automatically (the current version will be backed up in
+ ${file}.gforge-old). Alternatively, the needed changes may be written 
+ to another file (${file}.gforge-new) to let you adapt ${file} yourself.
 
 Template: gforge/shared/file_changed
 Type: note
-_Description: Please check ${file}
- You have chosen not to let the Gforge package update the
- ${file} file.  Very well, Installer has not changed it.  Instead,
- It has written the suggested changes into ${file}.gforge-new.
- Please check this file and apply the appropriate changes
- to ${file}.
+_Description: ${file} must be checked
+ You have chosen to not change ${file} automatically.
+ .
+ Instead, the suggested changes have been written into ${file}.gforge-new.
+ Please check this file and apply the appropriate changes to ${file}.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.templates.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.templates.dsfh-in	2011-02-24 17:40:19 UTC (rev 12120)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.templates.dsfh-in	2011-02-24 17:40:22 UTC (rev 12121)
@@ -9,7 +9,5 @@
  Gforge sends plenty of e-mail from the "${noreply}" address,
  and maybe even some e-mail to that address too.
  .
- It is advised that you let the package direct e-mail to that address to a
+ It is suggested that e-mail to that address is directed to a
  black hole (/dev/null), unless you have another use for that address.
- .
- Accepting this option will perform that redirection.



More information about the evolvis-commits mailing list