[Fusionforge-commits] r7833 - in trunk/gforge: deb-specific debian debian/dsf-helper debian/dsf-in debian/dsf-po

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sat Jun 13 10:56:17 CEST 2009


Author: cbayle
Date: 2009-06-13 10:56:17 +0200 (Sat, 13 Jun 2009)
New Revision: 7833

Modified:
   trunk/gforge/deb-specific/dsf-helper.pl
   trunk/gforge/debian/changelog
   trunk/gforge/debian/cvssh.sgml
   trunk/gforge/debian/dsf-helper/common-variables.config
   trunk/gforge/debian/dsf-helper/common-variables.templates
   trunk/gforge/debian/dsf-helper/dbhost-variables.config
   trunk/gforge/debian/dsf-helper/dbhost-variables.templates
   trunk/gforge/debian/dsf-helper/dbpasswd-variables.config
   trunk/gforge/debian/dsf-helper/dbpasswd-variables.templates
   trunk/gforge/debian/dsf-helper/downloadhost-variables.config
   trunk/gforge/debian/dsf-helper/downloadhost-variables.templates
   trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.config
   trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.templates
   trunk/gforge/debian/dsf-helper/groupid-variables.config
   trunk/gforge/debian/dsf-helper/groupid-variables.templates
   trunk/gforge/debian/dsf-helper/handle-mainconffile.config
   trunk/gforge/debian/dsf-helper/handle-mainconffile.postinst
   trunk/gforge/debian/dsf-helper/handle-mainconffile.postrm
   trunk/gforge/debian/dsf-helper/host-variables.config
   trunk/gforge/debian/dsf-helper/host-variables.templates
   trunk/gforge/debian/dsf-helper/jabberhost-variables.config
   trunk/gforge/debian/dsf-helper/jabberhost-variables.templates
   trunk/gforge/debian/dsf-helper/lists-variables.config
   trunk/gforge/debian/dsf-helper/lists-variables.templates
   trunk/gforge/debian/dsf-helper/shellhost-variables.config
   trunk/gforge/debian/dsf-helper/shellhost-variables.templates
   trunk/gforge/debian/dsf-helper/uploadhost-variables.config
   trunk/gforge/debian/dsf-helper/uploadhost-variables.templates
   trunk/gforge/debian/dsf-helper/users-variables.config
   trunk/gforge/debian/dsf-helper/users-variables.templates
   trunk/gforge/debian/dsf-helper/web-variables.config
   trunk/gforge/debian/dsf-helper/web-variables.templates
   trunk/gforge/debian/dsf-in/common.postinst
   trunk/gforge/debian/dsf-in/common.postrm
   trunk/gforge/debian/dsf-in/common.prerm
   trunk/gforge/debian/dsf-in/db-postgresql.config.dsfh-in
   trunk/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in
   trunk/gforge/debian/dsf-in/db-postgresql.prerm
   trunk/gforge/debian/dsf-in/db-postgresql.templates.dsfh-in
   trunk/gforge/debian/dsf-in/dns-bind9.postinst
   trunk/gforge/debian/dsf-in/dns-bind9.prerm
   trunk/gforge/debian/dsf-in/dns-bind9.templates.dsfh-in
   trunk/gforge/debian/dsf-in/ftp-proftpd.postinst
   trunk/gforge/debian/dsf-in/ftp-proftpd.prerm
   trunk/gforge/debian/dsf-in/lists-mailman.postinst
   trunk/gforge/debian/dsf-in/mta-exim4.config.dsfh-in
   trunk/gforge/debian/dsf-in/mta-exim4.postinst
   trunk/gforge/debian/dsf-in/mta-exim4.prerm
   trunk/gforge/debian/dsf-in/mta-exim4.templates.dsfh-in
   trunk/gforge/debian/dsf-in/mta-postfix.postinst
   trunk/gforge/debian/dsf-in/mta-postfix.prerm
   trunk/gforge/debian/dsf-in/mta-postfix.templates.dsfh-in
   trunk/gforge/debian/dsf-in/plugin-extratabs.postinst
   trunk/gforge/debian/dsf-in/plugin-extratabs.prerm
   trunk/gforge/debian/dsf-in/plugin-globalsearch.postinst
   trunk/gforge/debian/dsf-in/plugin-globalsearch.prerm
   trunk/gforge/debian/dsf-in/plugin-mediawiki.postinst
   trunk/gforge/debian/dsf-in/plugin-mediawiki.prerm
   trunk/gforge/debian/dsf-in/plugin-projectlabels.postinst
   trunk/gforge/debian/dsf-in/plugin-projectlabels.prerm
   trunk/gforge/debian/dsf-in/plugin-scmcvs.postinst
   trunk/gforge/debian/dsf-in/plugin-scmcvs.prerm
   trunk/gforge/debian/dsf-in/shell-postgresql.postinst
   trunk/gforge/debian/dsf-in/shell-postgresql.prerm
   trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/gforge/debian/dsf-in/web-apache2.prerm
   trunk/gforge/debian/dsf-po/POTFILES.in
   trunk/gforge/debian/dsf-po/cs.po
   trunk/gforge/debian/dsf-po/de.po
   trunk/gforge/debian/dsf-po/es.po
   trunk/gforge/debian/dsf-po/fi.po
   trunk/gforge/debian/dsf-po/fr.po
   trunk/gforge/debian/dsf-po/gl.po
   trunk/gforge/debian/dsf-po/nl.po
   trunk/gforge/debian/dsf-po/pt.po
   trunk/gforge/debian/dsf-po/ru.po
   trunk/gforge/debian/dsf-po/sv.po
   trunk/gforge/debian/dsf-po/templates.pot
   trunk/gforge/debian/dsf-po/vi.po
   trunk/gforge/debian/rules
Log:
use @PACKAGE@ instead of gforge everywhere i can


Modified: trunk/gforge/deb-specific/dsf-helper.pl
===================================================================
--- trunk/gforge/deb-specific/dsf-helper.pl	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/deb-specific/dsf-helper.pl	2009-06-13 08:56:17 UTC (rev 7833)
@@ -71,6 +71,10 @@
 ###
 # DO THE JOB
 @package_list = split /\n/, qx! dh_listpackages ! ;
+my $package_name = qx! grep ^PACKAGE= debian/rules | cut -d= -f2 ! ;
+$package_name =~ s/\n//;
+my $forge_name = qx! grep ^FORGENAME= debian/rules | cut -d= -f2 ! ;
+$forge_name =~ s/\n//;
 
 if ($ARGV[0] && $ARGV[0] eq "--clean") {
  EXTLOOP: for my $ext (@known_files) {
@@ -120,7 +124,8 @@
 	   $dest =~ s/^\n*//g ;
 	   $dest =~ s/\n\n+/\n\n/g ;
        }
-       $dest =~ s/pkgname/$package_list[0]/g ;
+       $dest =~ s/\@PACKAGE\@/$package_name/g ;
+       $dest =~ s/\@FORGENAME\@/$forge_name/g ;
 
        open D, "> $destfile" ;
        print D "$dest" ;
@@ -128,4 +133,5 @@
        close S ;
    }
  }
-       print "pkgname: $package_list[0]\n" ;
+       print "package_name: $package_name\n" ;
+       print "forge_name: $forge_name\n" ;

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/changelog	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,8 +1,9 @@
-gforge (4.8.52-1) experimental; urgency=low
+gforge (4.8.53-1) experimental; urgency=low
 
   [ Christian Bayle ]
   * bump to new version because on binary commit
   * put debian postinst/prerm/config/.. files in dsf-in dir
+  * use @PACKAGE@ instead of gforge everywhere i can
 
   [ Roland Mas ]
   * Use standard Sort::Versions module to compare database schema version

Modified: trunk/gforge/debian/cvssh.sgml
===================================================================
--- trunk/gforge/debian/cvssh.sgml	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/cvssh.sgml	2009-06-13 08:56:17 UTC (rev 7833)
@@ -10,7 +10,7 @@
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
   <!ENTITY dhemail     "<email>bayle at aist.enst.fr</email>">
   <!ENTITY dhusername  "Christian Bayle">
-  <!ENTITY dhucpackage "<refentrytitle>GForge</refentrytitle>">
+  <!ENTITY dhucpackage "<refentrytitle>@FORGENAME@</refentrytitle>">
   <!ENTITY dhpackage   "cvssh">
 
   <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
@@ -40,7 +40,7 @@
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>CVS shell for GForge / General execution wRAPper LITE!
+    <refpurpose>CVS shell for @FORGENAME@ / General execution wRAPper LITE!
     </refpurpose>
   </refnamediv>
 
@@ -109,7 +109,7 @@
   <refsect1>
     <title>SEE ALSO</title>
 
-    <para>GForge package documentation.</para>
+    <para>@FORGENAME@ package documentation.</para>
   </refsect1>
   <refsect1>
     <title>AUTHOR</title>

Modified: trunk/gforge/debian/dsf-helper/common-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/common-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/common-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,19 +1,19 @@
-db_fget pkgname/shared/domain_name seen || true
+db_fget @PACKAGE@/shared/domain_name seen || true
 if [ "$RET" = "false" ] ; then
    hostname=$(hostname -f 2>/dev/null) || hostname=localhost
-   db_set pkgname/shared/domain_name $hostname
+   db_set @PACKAGE@/shared/domain_name $hostname
 fi
-db_input medium pkgname/shared/domain_name || true
+db_input medium @PACKAGE@/shared/domain_name || true
 db_go || true
 
-db_fget pkgname/shared/server_admin seen || true
+db_fget @PACKAGE@/shared/server_admin seen || true
 if [ "$RET" = "false" ] ; then
-  db_get pkgname/shared/domain_name || true
-  db_set pkgname/shared/server_admin "webmaster@$RET"
+  db_get @PACKAGE@/shared/domain_name || true
+  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
 fi
 
-db_input medium pkgname/shared/server_admin || true
-db_input low pkgname/shared/system_name || true
+db_input medium @PACKAGE@/shared/server_admin || true
+db_input low @PACKAGE@/shared/system_name || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/common-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/common-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/common-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,22 +7,22 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/domain_name
+Template: @PACKAGE@/shared/domain_name
 Type: string
-_Description: GForge domain or subdomain name:
- Please enter the domain that will host the GForge installation. Some
+_Description: @FORGENAME@ domain or subdomain name:
+ Please enter the domain that will host the @FORGENAME@ installation. Some
  services (scm, lists, etc.) will be given their own subdomain in that
  domain.
 
-Template: pkgname/shared/server_admin
+Template: @PACKAGE@/shared/server_admin
 Type: string
-_Description: GForge administrator e-mail address:
- Please enter the e-mail address of the GForge administrator of this site. It
+_Description: @FORGENAME@ administrator e-mail address:
+ Please enter the e-mail address of the @FORGENAME@ administrator of this site. It
  will be used when problems occur.
 
-Template: pkgname/shared/system_name
+Template: @PACKAGE@/shared/system_name
 Type: string
-Default: GForge
-_Description: GForge system name:
- Please enter the name of the GForge system. It is used in various places
+Default: @FORGENAME@
+_Description: @FORGENAME@ system name:
+ Please enter the name of the @FORGENAME@ system. It is used in various places
  throughout the system.

Modified: trunk/gforge/debian/dsf-helper/dbhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/dbhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/dbhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,12 +1,12 @@
-db_fget pkgname/shared/db_host seen || true
-[ "$RET" = "false" ] && db_set pkgname/shared/db_host 127.0.0.1
-db_input medium pkgname/shared/db_host || true
+db_fget @PACKAGE@/shared/db_host seen || true
+[ "$RET" = "false" ] && db_set @PACKAGE@/shared/db_host 127.0.0.1
+db_input medium @PACKAGE@/shared/db_host || true
 
-db_fget pkgname/shared/db_name seen || true
-db_input medium pkgname/shared/db_name || true
+db_fget @PACKAGE@/shared/db_name seen || true
+db_input medium @PACKAGE@/shared/db_name || true
 
-db_fget pkgname/shared/db_user seen || true
-db_input medium pkgname/shared/db_user || true
+db_fget @PACKAGE@/shared/db_user seen || true
+db_input medium @PACKAGE@/shared/db_user || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/dbhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/dbhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/dbhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,21 +7,21 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/db_host
+Template: @PACKAGE@/shared/db_host
 Type: string
 _Description: Database server:
  Please enter the IP address (or hostname) of the server that will
- host the GForge database.
+ host the @FORGENAME@ database.
 
-Template: pkgname/shared/db_name
+Template: @PACKAGE@/shared/db_name
 Type: string
-Default: pkgname
+Default: @PACKAGE@
 _Description: Database name:
- Please enter the name of the database that will host the GForge database.
+ Please enter the name of the database that will host the @FORGENAME@ database.
 
-Template: pkgname/shared/db_user
+Template: @PACKAGE@/shared/db_user
 Type: string
-Default: pkgname
+Default: @PACKAGE@
 _Description: Database administrator username:
  Please enter the username of the database administrator for the server
- that will host the GForge database.
+ that will host the @FORGENAME@ database.

Modified: trunk/gforge/debian/dsf-helper/dbpasswd-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/dbpasswd-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/dbpasswd-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,11 +1,11 @@
-db_fget pkgname/shared/db_password seen || true
+db_fget @PACKAGE@/shared/db_password seen || true
 if [ "$RET" = "false" ]; then
-    db_set pkgname/shared/db_password $(gen_random_pw)
-    db_get pkgname/shared/db_password || true
+    db_set @PACKAGE@/shared/db_password $(gen_random_pw)
+    db_get @PACKAGE@/shared/db_password || true
     echo "Since you asked not to see all the debconf questions, I generated a random"
     echo "password for the database.  Use it if you want to have a peek at the"
     echo "database by hand.  It is '${RET}'." ;
-    db_fset pkgname/shared/db_password seen true
+    db_fset @PACKAGE@/shared/db_password seen true
 fi
 
 db_go || true

Modified: trunk/gforge/debian/dsf-helper/dbpasswd-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/dbpasswd-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/dbpasswd-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,14 +7,14 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/db_password
+Template: @PACKAGE@/shared/db_password
 Type: password
 _Description: Password used for the database:
  Connections to the database system are authenticated by a password.
  .
  Please choose the connection password.
 
-Template: pkgname/shared/db_password_confirm
+Template: @PACKAGE@/shared/db_password_confirm
 Type: password
 _Description: Password confirmation:
  Please re-type the password for confirmation.

Modified: trunk/gforge/debian/dsf-helper/downloadhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/downloadhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/downloadhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/download_host seen || true
+db_fget @PACKAGE@/shared/download_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/download_host download.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/download_host download.$RET
 fi
 
-db_input low pkgname/shared/download_host || true
+db_input low @PACKAGE@/shared/download_host || true
 db_go || true
 
 vars="download_host"

Modified: trunk/gforge/debian/dsf-helper/downloadhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/downloadhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/downloadhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,9 +7,9 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/download_host
+Template: @PACKAGE@/shared/download_host
 Type: string
 _Description: Download server:
- Please enter the host name of the server that will host the GForge packages.
+ Please enter the host name of the server that will host the @FORGENAME@ packages.
  .
- It should not be the same as the main GForge host.
+ It should not be the same as the main @FORGENAME@ host.

Modified: trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/ftpuploadhost seen || true
+db_fget @PACKAGE@/shared/ftpuploadhost seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/ftpuploadhost upload.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/ftpuploadhost upload.$RET
 fi
 
-db_input low pkgname/shared/ftpuploadhost || true
+db_input low @PACKAGE@/shared/ftpuploadhost || true
 db_go || true
 
 vars="ftpuploadhost"

Modified: trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/ftpuploadhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,4 +1,4 @@
-Template: pkgname/shared/ftpuploadhost
+Template: @PACKAGE@/shared/ftpuploadhost
 Type: string
 _Description: Your upload server for released files:
  The hostname of the server where you will upload files

Modified: trunk/gforge/debian/dsf-helper/groupid-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/groupid-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/groupid-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,6 +1,6 @@
-db_input low pkgname/shared/newsadmin_groupid || true
-db_input low pkgname/shared/statsadmin_groupid || true
-db_input low pkgname/shared/peerrating_groupid || true
+db_input low @PACKAGE@/shared/newsadmin_groupid || true
+db_input low @PACKAGE@/shared/statsadmin_groupid || true
+db_input low @PACKAGE@/shared/peerrating_groupid || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/groupid-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/groupid-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/groupid-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,20 +7,20 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/newsadmin_groupid
+Template: @PACKAGE@/shared/newsadmin_groupid
 Type: string
 Default: 2
 _Description: News administrative group ID:
- The members of the news admin group can approve news for the GForge main
+ The members of the news admin group can approve news for the @FORGENAME@ 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: pkgname/shared/statsadmin_groupid
+Template: @PACKAGE@/shared/statsadmin_groupid
 Type: string
 Default: 3
 _Description: Statistics administrative group ID:
 
-Template: pkgname/shared/peerrating_groupid
+Template: @PACKAGE@/shared/peerrating_groupid
 Type: string
 Default: 4
 _Description: Peer rating administrative group ID:

Modified: trunk/gforge/debian/dsf-helper/handle-mainconffile.config
===================================================================
--- trunk/gforge/debian/dsf-helper/handle-mainconffile.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/handle-mainconffile.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,8 +1,8 @@
 ###
-# Functions to handle the main Gforge configuration file
+# Functions to handle the main @FORGENAME@ configuration file
 ###
-mainconfdir=/etc/pkgname
-mainconffile=$mainconfdir/pkgname.conf
+mainconfdir=/etc/@PACKAGE@
+mainconffile=$mainconfdir/@PACKAGE at .conf
 create_mainconffile () {
     if [ ! -e $mainconfdir ] ; then
 	mkdir -p $mainconfdir
@@ -22,11 +22,11 @@
     update_onevar_from_mainconfile__retcode=0
     value=$(grep ^$key= $mainconffile | tail -1 | cut -d= -f2-)
     if [ ! -z "$value" ] ; then
-	db_set pkgname/shared/$key $value || update_onevar_from_mainconfile__retcode=$? || true
+	db_set @PACKAGE@/shared/$key $value || update_onevar_from_mainconfile__retcode=$? || true
 #     case $update_onevar_from_mainconfile__retcode in
 # 	0)
 # 	    echo "$key = $value injected into Debconf OK"
-# 	    db_fset pkgname/shared/$key seen true || true
+# 	    db_fset @PACKAGE@/shared/$key seen true || true
 # 	    ;;
 # 	10)
 # 	    echo "$key = $value not injected into Debconf (non-existing question maybe?)"
@@ -40,7 +40,7 @@
 }
 update_mainconffile () {
     for key in $@ ; do
-	db_get pkgname/shared/$key
+	db_get @PACKAGE@/shared/$key
 	val=$RET
 	update_onevar_mainconffile $key $val
     done

Modified: trunk/gforge/debian/dsf-helper/handle-mainconffile.postinst
===================================================================
--- trunk/gforge/debian/dsf-helper/handle-mainconffile.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/handle-mainconffile.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,7 +1,7 @@
 ###
-# Functions to handle the main Gforge configuration file
+# Functions to handle the main @FORGENAME@ configuration file
 ###
-mainconffile=/etc/pkgname/pkgname.conf
+mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
 # Update it for the variables received as parameters
 create_mainconffile () {
     if [ ! -e $mainconffile ] ; then
@@ -11,7 +11,7 @@
 }
 update_mainconffile () {
     for key in $@ ; do
-	db_get pkgname/shared/$key
+	db_get @PACKAGE@/shared/$key
 	val=$RET
 	update_onevar_mainconffile $key $val
     done

Modified: trunk/gforge/debian/dsf-helper/handle-mainconffile.postrm
===================================================================
--- trunk/gforge/debian/dsf-helper/handle-mainconffile.postrm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/handle-mainconffile.postrm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,7 +1,7 @@
 ###
-# Functions to handle the main Gforge confguration file
+# Functions to handle the main @FORGENAME@ confguration file
 ###
-mainconffile=/etc/pkgname/pkgname.conf
+mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
 # Delete the main configuration file
 delete_mainconffile () {
     rm -f $mainconffile

Modified: trunk/gforge/debian/dsf-helper/host-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/host-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/host-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,11 +1,11 @@
-db_fget pkgname/shared/ip_address seen || true
+db_fget @PACKAGE@/shared/ip_address seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/ip_address $(hostname -i | cut -f1 -d" ")
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/ip_address $(hostname -i | cut -f1 -d" ")
 fi
 
-db_input medium pkgname/shared/ip_address || true
-db_input medium pkgname/shared/server_admin || true
+db_input medium @PACKAGE@/shared/ip_address || true
+db_input medium @PACKAGE@/shared/server_admin || true
 db_go || true
 
 

Modified: trunk/gforge/debian/dsf-helper/host-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/host-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/host-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,10 +7,10 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/ip_address
+Template: @PACKAGE@/shared/ip_address
 Type: string
 _Description: IP address:
- Please enter the IP address of the server that will host the GForge
+ Please enter the IP address of the server that will host the @FORGENAME@
  installation.
  .
  This is needed for the configuration of Apache virtual hosting.

Modified: trunk/gforge/debian/dsf-helper/jabberhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/jabberhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/jabberhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/jabber_host seen || true
+db_fget @PACKAGE@/shared/jabber_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/jabber_host jabber.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/jabber_host jabber.$RET
 fi
 
-db_input low pkgname/shared/jabber_host || true
+db_input low @PACKAGE@/shared/jabber_host || true
 db_go || true
 
 vars="jabber_host"

Modified: trunk/gforge/debian/dsf-helper/jabberhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/jabberhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/jabberhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,4 +1,4 @@
-Template: pkgname/shared/jabber_host
+Template: @PACKAGE@/shared/jabber_host
 Type: string
 _Description: Your jabber server:
  The hostname of the server that will host your Jabber server

Modified: trunk/gforge/debian/dsf-helper/lists-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/lists-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/lists-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/lists_host seen || true
+db_fget @PACKAGE@/shared/lists_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/lists_host lists.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/lists_host lists.$RET
 fi
 
-db_input medium pkgname/shared/lists_host || true
+db_input medium @PACKAGE@/shared/lists_host || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/lists-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/lists-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/lists-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,10 +7,10 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/lists_host
+Template: @PACKAGE@/shared/lists_host
 Type: string
 _Description: Mailing lists server:
- Please enter the host name of the server that will host the GForge
+ Please enter the host name of the server that will host the @FORGENAME@
  mailing lists.
  .
- It should not be the same as the main GForge host.
+ It should not be the same as the main @FORGENAME@ host.

Modified: trunk/gforge/debian/dsf-helper/shellhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/shellhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/shellhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/shell_host seen || true
+db_fget @PACKAGE@/shared/shell_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/shell_host shell.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/shell_host shell.$RET
 fi
 
-db_input low pkgname/shared/shell_host || true
+db_input low @PACKAGE@/shared/shell_host || true
 db_go || true
 
 vars="shell_host"

Modified: trunk/gforge/debian/dsf-helper/shellhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/shellhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/shellhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,8 +7,8 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/shell_host
+Template: @PACKAGE@/shared/shell_host
 Type: string
 _Description: Shell server:
- Please enter the host name of the server that will host the GForge
+ Please enter the host name of the server that will host the @FORGENAME@
  shell accounts.

Modified: trunk/gforge/debian/dsf-helper/uploadhost-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/uploadhost-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/uploadhost-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/upload_host seen || true
+db_fget @PACKAGE@/shared/upload_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/upload_host upload.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/upload_host upload.$RET
 fi
 
-db_input low pkgname/shared/upload_host || true
+db_input low @PACKAGE@/shared/upload_host || true
 db_go || true
 
 vars="upload_host"

Modified: trunk/gforge/debian/dsf-helper/uploadhost-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/uploadhost-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/uploadhost-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,4 +1,4 @@
-Template: pkgname/shared/upload_host
+Template: @PACKAGE@/shared/upload_host
 Type: string
 _Description: Your upload server:
  The hostname of the server where you will upload files available

Modified: trunk/gforge/debian/dsf-helper/users-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/users-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/users-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,10 +1,10 @@
-db_fget pkgname/shared/users_host seen || true
+db_fget @PACKAGE@/shared/users_host seen || true
 if [ "$RET" = "false" ] ; then
-    db_get pkgname/shared/domain_name
-    db_set pkgname/shared/users_host users.$RET
+    db_get @PACKAGE@/shared/domain_name
+    db_set @PACKAGE@/shared/users_host users.$RET
 fi
 
-db_input medium pkgname/shared/users_host || true
+db_input medium @PACKAGE@/shared/users_host || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/users-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/users-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/users-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,10 +7,10 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/users_host
+Template: @PACKAGE@/shared/users_host
 Type: string
 _Description: User mail redirector server:
- Please enter the host name of the server that will host the GForge user mail
+ Please enter the host name of the server that will host the @FORGENAME@ user mail
  redirector.
  .
- It should not be the same as the main GForge host.
+ It should not be the same as the main @FORGENAME@ host.

Modified: trunk/gforge/debian/dsf-helper/web-variables.config
===================================================================
--- trunk/gforge/debian/dsf-helper/web-variables.config	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/web-variables.config	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
-db_input low pkgname/shared/sys_lang || true
-db_input low pkgname/shared/sys_theme || true
+db_input low @PACKAGE@/shared/sys_lang || true
+db_input low @PACKAGE@/shared/sys_theme || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-helper/web-variables.templates
===================================================================
--- trunk/gforge/debian/dsf-helper/web-variables.templates	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-helper/web-variables.templates	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,16 +7,16 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: pkgname/shared/sys_lang
+Template: @PACKAGE@/shared/sys_lang
 Type: select
 __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[ Default language]
 _Description: Default language:
  Please choose the default language for web pages.
 
-Template: pkgname/shared/sys_theme
+Template: @PACKAGE@/shared/sys_theme
 Type: string
-Default: pkgname
+Default: @PACKAGE@
 _Description: Default theme:
  Please choose the default theme for web pages. This must be a valid
  name.

Modified: trunk/gforge/debian/dsf-in/common.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/common.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/common.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,12 +27,12 @@
 
 case "$1" in
     configure)
-	adduser --system --group --home /var/www/pkgname pkgname > /dev/null 2>&1
-	adduser --system --group --home /var/lib/pkgname/chroot/cvsroot anonscm-pkgname > /dev/null 2>&1
-	adduser --system --group --home /var/lib/pkgname/chroot/cvsroot scm-pkgname > /dev/null 2>&1
-	adduser --system --group --home /var/lib/pkgname/chroot/cvsroot www-pkgname > /dev/null 2>&1
+	adduser --system --group --home /var/www/@PACKAGE@ @PACKAGE@ > /dev/null 2>&1
+	adduser --system --group --home /var/lib/@PACKAGE@/chroot/cvsroot anonscm- at PACKAGE@ > /dev/null 2>&1
+	adduser --system --group --home /var/lib/@PACKAGE@/chroot/cvsroot scm- at PACKAGE@ > /dev/null 2>&1
+	adduser --system --group --home /var/lib/@PACKAGE@/chroot/cvsroot www- at PACKAGE@ > /dev/null 2>&1
 
-	pkgname-config
+	@PACKAGE at -config
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/common.postrm
===================================================================
--- trunk/gforge/debian/dsf-in/common.postrm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/common.postrm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for pkgname
+# postrm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -18,8 +18,8 @@
 
 case "$1" in
     purge)
-	rm -rf /var/lib/pkgname
-	[ -d /etc/pkgname ] && rm -rf /etc/pkgname
+	rm -rf /var/lib/@PACKAGE@
+	[ -d /etc/@PACKAGE@ ] && rm -rf /etc/@PACKAGE@
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;

Modified: trunk/gforge/debian/dsf-in/common.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/common.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/common.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -21,7 +21,7 @@
 
 case "$1" in
     remove)
-	rm -f /etc/pkgname/local.pl
+	rm -f /etc/@PACKAGE@/local.pl
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/db-postgresql.config.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/db-postgresql.config.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/db-postgresql.config.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -14,15 +14,15 @@
 #DSFHELPER:dbhost-variables#
 #DSFHELPER:dbpasswd-variables#
 
-db_input low pkgname/shared/admin_login || true
-db_fget pkgname/shared/admin_password seen || true
+db_input low @PACKAGE@/shared/admin_login || true
+db_fget @PACKAGE@/shared/admin_password seen || true
 if [ "$RET" = "false" ]; then
-    if [ "$(get_pw pkgname/shared/admin_password high)" = "not-asked" ] ; then
-	db_set pkgname/shared/admin_password $(gen_random_pw)
-	db_get pkgname/shared/admin_password || true
+    if [ "$(get_pw @PACKAGE@/shared/admin_password high)" = "not-asked" ] ; then
+	db_set @PACKAGE@/shared/admin_password $(gen_random_pw)
+	db_get @PACKAGE@/shared/admin_password || true
 	echo "Since you asked not to see all the debconf questions, I generated a random"
 	echo "password for the admin user.  It is '${RET}'." ;
-	db_fset pkgname/shared/admin_password seen true
+	db_fset @PACKAGE@/shared/admin_password seen true
     fi
 fi
 
@@ -33,7 +33,7 @@
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:groupid-variables#
 
-db_input low pkgname/shared/skill_list || true
+db_input low @PACKAGE@/shared/skill_list || true
 
 db_go || true
 

Modified: trunk/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -17,11 +17,11 @@
 		export pg_hba_dir=/etc/postgresql/${pg_version}/main
 	else
 		echo "No database found online on port 5432"
-		echo "Couldn't initialize or upgrade pkgname database."
+		echo "Couldn't initialize or upgrade @PACKAGE@ database."
 		echo "Please see postgresql documentation"
-		echo "and run dpkg-reconfigure -plow pkgname-db-postgresql"
+		echo "and run dpkg-reconfigure -plow @PACKAGE at -db-postgresql"
 		echo "once the problem is solved"
-		echo "exiting without error, but pkgname db will not work"
+		echo "exiting without error, but @PACKAGE@ db will not work"
 		echo "right now"
 		exit 0
 	fi
@@ -56,19 +56,19 @@
     configure)
 	add_onevar_mainconfile default_trove_cat 18
 
-	pkgname-config
+	@PACKAGE at -config
 
         # Patch DB configuration files
-	/usr/share/pkgname/bin/install-db.sh configure-files
-	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf.pkgname-new ${pg_hba_dir}/pg_hba.conf
-	rm ${pg_hba_dir}/pg_hba.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-db.sh configure-files
+	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at PACKAGE@-new ${pg_hba_dir}/pg_hba.conf
+	rm ${pg_hba_dir}/pg_hba.conf. at PACKAGE@-new
 
 	# Make sure the database accepts connections from these new users
 	pg_name=postgresql-$pg_version
 	invoke-rc.d ${pg_name} reload
 
         # Setup our DB
-	/usr/share/pkgname/bin/install-db.sh configure
+	/usr/share/@PACKAGE@/bin/install-db.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/db-postgresql.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/db-postgresql.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/db-postgresql.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -17,11 +17,11 @@
 		export pg_hba_dir=/etc/postgresql/${pg_version}/main/
 	else
 		echo "No database found online on port 5432"
-		echo "Couldn't initialize or upgrade pkgname database."
+		echo "Couldn't initialize or upgrade @PACKAGE@ database."
 		echo "Please see postgresql documentation"
-		echo "and run dpkg-reconfigure -plow pkgname-db-postgresql"
+		echo "and run dpkg-reconfigure -plow @PACKAGE at -db-postgresql"
 		echo "once the problem is solved"
-		echo "exiting without error, but pkgname db will not work"
+		echo "exiting without error, but @PACKAGE@ db will not work"
 		echo "right now"
 		exit 0
 	fi
@@ -46,12 +46,12 @@
 case "$1" in
     remove)
         # Remove our database
-	/usr/share/pkgname/bin/install-db.sh purge
+	/usr/share/@PACKAGE@/bin/install-db.sh purge
 
         # Unpatch DB configuration files
-	/usr/share/pkgname/bin/install-db.sh purge-files
-	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf.pkgname-new ${pg_hba_dir}/pg_hba.conf
-	rm ${pg_hba_dir}/pg_hba.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-db.sh purge-files
+	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at PACKAGE@-new ${pg_hba_dir}/pg_hba.conf
+	rm ${pg_hba_dir}/pg_hba.conf. at PACKAGE@-new
 	ucf --purge ${pg_hba_dir}/pg_hba.conf
 
 	pg_name=postgresql-$pg_version

Modified: trunk/gforge/debian/dsf-in/db-postgresql.templates.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/db-postgresql.templates.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/db-postgresql.templates.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -9,61 +9,61 @@
 
 #DSFHELPER:common-variables#
 
-Template: pkgname/shared/shell_host
+Template: @PACKAGE@/shared/shell_host
 Type: string
 _Description: Shell server:
- Please enter the hostname of the server that will host the GForge
+ Please enter the hostname of the server that will host the @FORGENAME@
  shell accounts.
 
 #DSFHELPER:users-variables#
 
 #DSFHELPER:lists-variables#
 
-Template: pkgname/shared/download_host
+Template: @PACKAGE@/shared/download_host
 Type: string
 _Description: Download server:
- Please enter the hostname of the server that will host the GForge
+ Please enter the hostname of the server that will host the @FORGENAME@
  packages. 
  .
- It should not be the same as the main GForge host.
+ It should not be the same as the main @FORGENAME@ host.
 
 #DSFHELPER:dbpasswd-variables#
 
-Template: pkgname/shared/admin_login
+Template: @PACKAGE@/shared/admin_login
 Type: string
 Default: admin
-_Description: GForge administrator login:
- The GForge administrator account will have full privileges on the
+_Description: @FORGENAME@ administrator login:
+ The @FORGENAME@ administrator account will have full privileges on the
  system. It will be used to approve the creation of new projects.
  .
  Please choose the username for this account.
 
-Template: pkgname/shared/ip_address
+Template: @PACKAGE@/shared/ip_address
 Type: string
 _Description: IP address:
- Please enter the IP address of the server that will host the GForge
+ Please enter the IP address of the server that will host the @FORGENAME@
  installation.
  .
  This is needed for the configuration of Apache virtual hosting.
 
-Template: pkgname/shared/admin_password
+Template: @PACKAGE@/shared/admin_password
 Type: password
-_Description: GForge administrator password:
- The GForge administrator account will have full privileges on the
+_Description: @FORGENAME@ administrator password:
+ The @FORGENAME@ administrator account will have full privileges on the
  system. It will be used to approve the creation of new projects.
  .
  Please choose the password for this account.
 
-Template: pkgname/shared/admin_password_confirm
+Template: @PACKAGE@/shared/admin_password_confirm
 Type: password
 _Description: Password confirmation:
  Please re-type the password for confirmation.
 
-Template: pkgname/shared/skill_list
+Template: @PACKAGE@/shared/skill_list
 Type: string
 Default: Ada;C;C++;HTML;LISP;Perl;PHP;Python;SQL
 _Description: Initial list of skills:
- GForge allows users to define a list of their skills, to be chosen from
+ @FORGENAME@ allows users to define a list of their skills, to be chosen from
  those present in the database. This list is the initial list of
  skills that will enter the database.
  .

Modified: trunk/gforge/debian/dsf-in/dns-bind9.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/dns-bind9.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/dns-bind9.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,17 +27,17 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 
 	# Patch Bind configuration files
-	/usr/share/pkgname/bin/install-dns.sh configure-files
-	ucf --debconf-ok /etc/bind/named.conf.pkgname-new /etc/bind/named.conf
-	rm /etc/bind/named.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-dns.sh configure-files
+	ucf --debconf-ok /etc/bind/named.conf. at PACKAGE@-new /etc/bind/named.conf
+	rm /etc/bind/named.conf. at PACKAGE@-new
 
 	db_stop
 
 	# Create the DNS zone
-	/usr/share/pkgname/bin/install-dns.sh configure
+	/usr/share/@PACKAGE@/bin/install-dns.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/dns-bind9.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/dns-bind9.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/dns-bind9.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -20,19 +20,19 @@
 
 case "$1" in
     remove)
-	db_title "Unconfiguring Gforge"
+	db_title "Unconfiguring @FORGENAME@"
 
 	# Unpatch Bind configuration files
-	/usr/share/pkgname/bin/install-dns.sh purge-files
-	ucf --debconf-ok /etc/bind/named.conf.pkgname-new /etc/bind/named.conf
-	rm /etc/bind/named.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-dns.sh purge-files
+	ucf --debconf-ok /etc/bind/named.conf. at PACKAGE@-new /etc/bind/named.conf
+	rm /etc/bind/named.conf. at PACKAGE@-new
 	ucf --purge /etc/bind/named.conf
 	
 	# Clean debconf after ourselves
 	db_stop
 
         # DNS config removal
-	/usr/share/pkgname/bin/install-dns.sh purge
+	/usr/share/@PACKAGE@/bin/install-dns.sh purge
 
 	;;
     upgrade|deconfigure|failed-upgrade)

Modified: trunk/gforge/debian/dsf-in/dns-bind9.templates.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/dns-bind9.templates.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/dns-bind9.templates.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -15,12 +15,12 @@
 #DSFHELPER:host-variables#
 #DSFHELPER:web-variables#
 
-Template: pkgname/shared/simple_dns
+Template: @PACKAGE@/shared/simple_dns
 Type: boolean
 Default: false
 # Translators: SCM here means "Source Control Management"
 #              (cvs, svn, etc.)
-_Description: Do you want a simple DNS setup for GForge?
+_Description: Do you want a simple DNS setup for @FORGENAME@?
  You can use a simple DNS setup with wildcards to map all
  project web-hosts to a single IP address, and direct all the scm-hosts
  to a single SCM server, or a complex setup which allows

Modified: trunk/gforge/debian/dsf-in/ftp-proftpd.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/ftp-proftpd.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/ftp-proftpd.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,21 +27,21 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 
         # Patch Proftpd configuration files
-	/usr/share/pkgname/bin/install-ftp.sh configure-files
-	if [ -f /etc/proftpd/proftpd.conf.pkgname-new ]
+	/usr/share/@PACKAGE@/bin/install-ftp.sh configure-files
+	if [ -f /etc/proftpd/proftpd.conf. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/proftpd/proftpd.conf.pkgname-new /etc/proftpd/proftpd.conf
-		rm /etc/proftpd/proftpd.conf.pkgname-new
+		ucf --debconf-ok /etc/proftpd/proftpd.conf. at PACKAGE@-new /etc/proftpd/proftpd.conf
+		rm /etc/proftpd/proftpd.conf. at PACKAGE@-new
 	fi
 
         # Setup our FTP
-	/usr/share/pkgname/bin/install-ftp.sh configure 
+	/usr/share/@PACKAGE@/bin/install-ftp.sh configure 
 
         # Setup our FRS
-	chown www-data:www-data /var/lib/pkgname/download
+	chown www-data:www-data /var/lib/@PACKAGE@/download
 	
     ;;
 

Modified: trunk/gforge/debian/dsf-in/ftp-proftpd.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/ftp-proftpd.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/ftp-proftpd.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -19,19 +19,19 @@
 
 case "$1" in
     remove)
-	db_title "Unconfiguring Gforge"
+	db_title "Unconfiguring @FORGENAME@"
 
 	# Unpatch Proftpd configuration files
-	/usr/share/pkgname/bin/install-ftp.sh purge-files
-	ucf --debconf-ok /etc/proftpd/proftpd.conf.pkgname-new /etc/proftpd/proftpd.conf
-	rm /etc/proftpd/proftpd.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-ftp.sh purge-files
+	ucf --debconf-ok /etc/proftpd/proftpd.conf. at PACKAGE@-new /etc/proftpd/proftpd.conf
+	rm /etc/proftpd/proftpd.conf. at PACKAGE@-new
 	ucf --purge /etc/proftpd/proftpd.conf
 
 	# Clean debconf after ourselves
 	db_stop
 
         # FTP config removal
-	/usr/share/pkgname/bin/install-ftp.sh purge
+	/usr/share/@PACKAGE@/bin/install-ftp.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/lists-mailman.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/lists-mailman.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/lists-mailman.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,11 +27,11 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 	
 	echo "Fixing past damage in mailing-lists..."
 	if [ -z "$2" ] || dpkg --compare-versions $2 le 3rc2-4 ; then
-	    su -s /bin/sh pkgname -c /usr/share/pkgname/bin/fix-mailing-lists.pl
+	    su -s /bin/sh @PACKAGE@ -c /usr/share/@PACKAGE@/bin/fix-mailing-lists.pl
 	fi
     ;;
 

Modified: trunk/gforge/debian/dsf-in/mta-exim4.config.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/mta-exim4.config.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-exim4.config.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -13,25 +13,25 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-if [ -f /etc/aliases.pkgname-new ] 
+if [ -f /etc/aliases. at PACKAGE@-new ] 
 then
-	ucf --debconf-ok /etc/aliases.pkgname-new /etc/aliases
-	rm /etc/aliases.pkgname-new
+	ucf --debconf-ok /etc/aliases. at PACKAGE@-new /etc/aliases
+	rm /etc/aliases. at PACKAGE@-new
 fi
-if [ -f /etc/exim4/exim4.conf.pkgname-new ]
+if [ -f /etc/exim4/exim4.conf. at PACKAGE@-new ]
 then
-	ucf --debconf-ok /etc/exim4/exim4.conf.pkgname-new /etc/exim4/exim4.conf
-	rm /etc/exim4/exim4.conf.pkgname-new
+	ucf --debconf-ok /etc/exim4/exim4.conf. at PACKAGE@-new /etc/exim4/exim4.conf
+	rm /etc/exim4/exim4.conf. at PACKAGE@-new
 fi
-if [ -f /etc/exim4/exim4.conf.template.pkgname-new ]
+if [ -f /etc/exim4/exim4.conf.template. at PACKAGE@-new ]
 then
-	ucf --debconf-ok /etc/exim4/exim4.conf.template.pkgname-new /etc/exim4/exim4.conf.template
-	rm /etc/exim4/exim4.conf.template.pkgname-new
+	ucf --debconf-ok /etc/exim4/exim4.conf.template. at PACKAGE@-new /etc/exim4/exim4.conf.template
+	rm /etc/exim4/exim4.conf.template. at PACKAGE@-new
 fi
-if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new ]
+if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new ]
 then
-	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
-	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new
+	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new
 fi
 db_stop
 

Modified: trunk/gforge/debian/dsf-in/mta-exim4.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/mta-exim4.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-exim4.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -28,28 +28,28 @@
 case "$1" in
     configure)
 
-	pkgname-config
+	@PACKAGE at -config
         # Patch Exim configuration files
-	/usr/share/pkgname/bin/install-exim4.sh configure-files
-	if [ -f /etc/aliases.pkgname-new ]
+	/usr/share/@PACKAGE@/bin/install-exim4.sh configure-files
+	if [ -f /etc/aliases. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/aliases.pkgname-new /etc/aliases
-		rm /etc/aliases.pkgname-new
+		ucf --debconf-ok /etc/aliases. at PACKAGE@-new /etc/aliases
+		rm /etc/aliases. at PACKAGE@-new
 	fi
-	if [ -f /etc/exim4/exim4.conf.pkgname-new ]
+	if [ -f /etc/exim4/exim4.conf. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/exim4/exim4.conf.pkgname-new /etc/exim4/exim4.conf
-		rm /etc/exim4/exim4.conf.pkgname-new
+		ucf --debconf-ok /etc/exim4/exim4.conf. at PACKAGE@-new /etc/exim4/exim4.conf
+		rm /etc/exim4/exim4.conf. at PACKAGE@-new
 	fi
-	if [ -f /etc/exim4/exim4.conf.template.pkgname-new ]
+	if [ -f /etc/exim4/exim4.conf.template. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/exim4/exim4.conf.template.pkgname-new /etc/exim4/exim4.conf.template
-		rm /etc/exim4/exim4.conf.template.pkgname-new
+		ucf --debconf-ok /etc/exim4/exim4.conf.template. at PACKAGE@-new /etc/exim4/exim4.conf.template
+		rm /etc/exim4/exim4.conf.template. at PACKAGE@-new
 	fi
-	if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new ]
+	if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
-		rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new
+		ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+		rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new
 	fi
     ;;
 

Modified: trunk/gforge/debian/dsf-in/mta-exim4.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/mta-exim4.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-exim4.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -19,21 +19,21 @@
 
 case "$1" in
     remove)
-	db_title "Unconfiguring Gforge"
+	db_title "Unconfiguring @FORGENAME@"
 
 	# Unpatch Exim configuration files
-	/usr/share/pkgname/bin/install-exim4.sh purge-files
-	ucf --debconf-ok /etc/aliases.pkgname-new /etc/aliases
-	if [ -f /etc/exim4/exim4.conf.pkgname-new ]
+	/usr/share/@PACKAGE@/bin/install-exim4.sh purge-files
+	ucf --debconf-ok /etc/aliases. at PACKAGE@-new /etc/aliases
+	if [ -f /etc/exim4/exim4.conf. at PACKAGE@-new ]
 	then
-		ucf --debconf-ok /etc/exim4/exim4.conf.pkgname-new /etc/exim4/exim4.conf
-		rm /etc/exim4/exim4.conf.pkgname-new
+		ucf --debconf-ok /etc/exim4/exim4.conf. at PACKAGE@-new /etc/exim4/exim4.conf
+		rm /etc/exim4/exim4.conf. at PACKAGE@-new
 	fi
-	ucf --debconf-ok /etc/exim4/exim4.conf.template.pkgname-new /etc/exim4/exim4.conf.template
-	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
-	rm /etc/aliases.pkgname-new
-	rm /etc/exim4/exim4.conf.template.pkgname-new
-	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.pkgname-new
+	ucf --debconf-ok /etc/exim4/exim4.conf.template. at PACKAGE@-new /etc/exim4/exim4.conf.template
+	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/aliases. at PACKAGE@-new
+	rm /etc/exim4/exim4.conf.template. at PACKAGE@-new
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at PACKAGE@-new
 	ucf --purge /etc/aliases
 	ucf --purge /etc/exim4/exim4.conf
 	ucf --purge /etc/exim4/exim4.conf.template
@@ -43,7 +43,7 @@
 	db_stop
 
         # Exim config removal
-	/usr/share/pkgname/bin/install-exim4.sh purge
+	/usr/share/@PACKAGE@/bin/install-exim4.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/mta-exim4.templates.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/mta-exim4.templates.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-exim4.templates.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -2,11 +2,11 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-Template: pkgname/shared/noreply_to_bitbucket
+Template: @PACKAGE@/shared/noreply_to_bitbucket
 Type: boolean
 Default: true
 _Description: Do you want mail to ${noreply} to be deleted?
- Gforge sends plenty of e-mail from the "${noreply}" address,
+ @FORGENAME@ 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

Modified: trunk/gforge/debian/dsf-in/mta-postfix.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/mta-postfix.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-postfix.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,15 +27,15 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 
         # Patch Postfix configuration files
-	/usr/share/pkgname/bin/install-postfix.sh configure-files
-	ucf --debconf-ok /etc/aliases.pkgname-new /etc/aliases
-	ucf --debconf-ok /etc/postfix/main.cf.pkgname-new /etc/postfix/main.cf
-	rm /etc/aliases.pkgname-new
-	rm /etc/postfix/main.cf.pkgname-new
-	/usr/share/pkgname/bin/install-postfix.sh configure
+	/usr/share/@PACKAGE@/bin/install-postfix.sh configure-files
+	ucf --debconf-ok /etc/aliases. at PACKAGE@-new /etc/aliases
+	ucf --debconf-ok /etc/postfix/main.cf. at PACKAGE@-new /etc/postfix/main.cf
+	rm /etc/aliases. at PACKAGE@-new
+	rm /etc/postfix/main.cf. at PACKAGE@-new
+	/usr/share/@PACKAGE@/bin/install-postfix.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/mta-postfix.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/mta-postfix.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-postfix.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -19,14 +19,14 @@
 
 case "$1" in
     remove)
-	db_title "Unconfiguring Gforge"
+	db_title "Unconfiguring @FORGENAME@"
 
 	# Unpatch Postfix configuration files
-	/usr/share/pkgname/bin/install-postfix.sh purge-files
-	ucf --debconf-ok /etc/aliases.pkgname-new /etc/aliases
-	ucf --debconf-ok /etc/postfix/main.cf.pkgname-new /etc/postfix/main.cf
-	rm /etc/aliases.pkgname-new
-	rm /etc/postfix/main.cf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-postfix.sh purge-files
+	ucf --debconf-ok /etc/aliases. at PACKAGE@-new /etc/aliases
+	ucf --debconf-ok /etc/postfix/main.cf. at PACKAGE@-new /etc/postfix/main.cf
+	rm /etc/aliases. at PACKAGE@-new
+	rm /etc/postfix/main.cf. at PACKAGE@-new
 	ucf --purge /etc/aliases
 	ucf --purge /etc/postfix/main.cf
 
@@ -34,7 +34,7 @@
 	db_stop
 
         # Exim config removal
-	/usr/share/pkgname/bin/install-postfix.sh purge
+	/usr/share/@PACKAGE@/bin/install-postfix.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/mta-postfix.templates.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/mta-postfix.templates.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/mta-postfix.templates.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -11,11 +11,11 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-Template: pkgname/shared/noreply_to_bitbucket
+Template: @PACKAGE@/shared/noreply_to_bitbucket
 Type: boolean
 Default: true
 _Description: Do you want mail to ${noreply} to be discarded?
- GForge sends and receives plenty of e-mail to and from the
+ @FORGENAME@ sends and receives plenty of e-mail to and from the
  "${noreply}" address.
  .
  E-mail to that address should be directed to a

Modified: trunk/gforge/debian/dsf-in/plugin-extratabs.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-extratabs.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-extratabs.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname-plugin-extratabs
+# postinst script for @PACKAGE at -plugin-extratabs
 #
 # see: dh_installdeb(1)
 
@@ -25,8 +25,8 @@
 
 case "$1" in
     configure)
-        /usr/share/pkgname/plugins/extratabs/bin/db-upgrade.pl
-        /usr/share/pkgname/bin/register-plugin extratabs "Extra Tabs"
+        /usr/share/@PACKAGE@/plugins/extratabs/bin/db-upgrade.pl
+        /usr/share/@PACKAGE@/bin/register-plugin extratabs "Extra Tabs"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/plugin-extratabs.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-extratabs.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-extratabs.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname-plugin-extratabs
+# prerm script for @PACKAGE at -plugin-extratabs
 #
 # see: dh_installdeb(1)
 
@@ -19,8 +19,8 @@
 
 case "$1" in
     remove|deconfigure)
-        /usr/share/pkgname/bin/unregister-plugin extratabs
-        /usr/share/pkgname/plugins/extratabs/bin/db-delete.pl
+        /usr/share/@PACKAGE@/bin/unregister-plugin extratabs
+        /usr/share/@PACKAGE@/plugins/extratabs/bin/db-delete.pl
         ;;
     upgrade|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/plugin-globalsearch.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-globalsearch.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-globalsearch.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname-plugin-globalsearch
+# postinst script for @PACKAGE at -plugin-globalsearch
 #
 # see: dh_installdeb(1)
 
@@ -25,8 +25,8 @@
 
 case "$1" in
     configure)
-        /usr/share/pkgname/plugins/globalsearch/bin/db-upgrade.pl
-        /usr/share/pkgname/bin/register-plugin globalsearch "Global Search"
+        /usr/share/@PACKAGE@/plugins/globalsearch/bin/db-upgrade.pl
+        /usr/share/@PACKAGE@/bin/register-plugin globalsearch "Global Search"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/plugin-globalsearch.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-globalsearch.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-globalsearch.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname-plugin-globalsearch
+# prerm script for @PACKAGE at -plugin-globalsearch
 #
 # see: dh_installdeb(1)
 
@@ -19,8 +19,8 @@
 
 case "$1" in
     remove|deconfigure)
-        /usr/share/pkgname/bin/unregister-plugin globalsearch
-        /usr/share/pkgname/plugins/globalsearch/bin/db-delete.pl
+        /usr/share/@PACKAGE@/bin/unregister-plugin globalsearch
+        /usr/share/@PACKAGE@/plugins/globalsearch/bin/db-delete.pl
         ;;
     upgrade|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/plugin-mediawiki.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-mediawiki.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-mediawiki.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname-plugin-mediawiki
+# postinst script for @PACKAGE at -plugin-mediawiki
 #
 # see: dh_installdeb(1)
 
@@ -25,9 +25,9 @@
 
 case "$1" in
     configure)
-	# /usr/share/pkgname/plugins/mediawiki/bin/db-upgrade.pl
-	/usr/share/pkgname/bin/register-plugin mediawiki "Mediawiki"
-	pkgname-config
+	# /usr/share/@PACKAGE@/plugins/mediawiki/bin/db-upgrade.pl
+	/usr/share/@PACKAGE@/bin/register-plugin mediawiki "Mediawiki"
+	@PACKAGE at -config
 	for flavour in apache apache-perl apache-ssl apache2 ; do
 	    if [ -x /usr/sbin/$flavour ]; then
 		invoke-rc.d $flavour reload || true

Modified: trunk/gforge/debian/dsf-in/plugin-mediawiki.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-mediawiki.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-mediawiki.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname-plugin-mediawiki
+# prerm script for @PACKAGE at -plugin-mediawiki
 #
 # see: dh_installdeb(1)
 
@@ -19,9 +19,9 @@
 
 case "$1" in
     remove|deconfigure)
-	/usr/share/pkgname/bin/unregister-plugin mediawiki
+	/usr/share/@PACKAGE@/bin/unregister-plugin mediawiki
 	invoke-rc.d apache reload
-	# /usr/share/pkgname/plugins/mediawiki/bin/db-delete.pl
+	# /usr/share/@PACKAGE@/plugins/mediawiki/bin/db-delete.pl
         ;;
     upgrade|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/plugin-projectlabels.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-projectlabels.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-projectlabels.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname-plugin-projectlabels
+# postinst script for @PACKAGE at -plugin-projectlabels
 #
 # see: dh_installdeb(1)
 
@@ -25,8 +25,8 @@
 
 case "$1" in
     configure)
-        /usr/share/pkgname/plugins/projectlabels/bin/db-upgrade.pl
-        /usr/share/pkgname/bin/register-plugin projectlabels "Project Labels"
+        /usr/share/@PACKAGE@/plugins/projectlabels/bin/db-upgrade.pl
+        /usr/share/@PACKAGE@/bin/register-plugin projectlabels "Project Labels"
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/plugin-projectlabels.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-projectlabels.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-projectlabels.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname-plugin-projectlabels
+# prerm script for @PACKAGE at -plugin-projectlabels
 #
 # see: dh_installdeb(1)
 
@@ -19,8 +19,8 @@
 
 case "$1" in
     remove|deconfigure)
-        /usr/share/pkgname/bin/unregister-plugin projectlabels
-        /usr/share/pkgname/plugins/projectlabels/bin/db-delete.pl
+        /usr/share/@PACKAGE@/bin/unregister-plugin projectlabels
+        /usr/share/@PACKAGE@/plugins/projectlabels/bin/db-delete.pl
         ;;
     upgrade|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/dsf-in/plugin-scmcvs.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-scmcvs.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-scmcvs.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname-plugin-scmcvs
+# postinst script for @PACKAGE at -plugin-scmcvs
 #
 # see: dh_installdeb(1)
 
@@ -25,10 +25,10 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 
 	# Prepare database
-	su -s /bin/sh pkgname -c '/usr/share/pkgname/bin/register-plugin scmcvs "CVS"'
+	su -s /bin/sh @PACKAGE@ -c '/usr/share/@PACKAGE@/bin/register-plugin scmcvs "CVS"'
 	test -f /etc/default/apache2 && . /etc/default/apache2
 	if [ "$NO_START" != "0" ]; then
 		if [ -x /usr/sbin/apache ]; then
@@ -40,22 +40,22 @@
 		fi
 	fi
         # Setup our CVS
-	/usr/share/pkgname/plugins/scmcvs/bin/install-cvs.sh configure
+	/usr/share/@PACKAGE@/plugins/scmcvs/bin/install-cvs.sh configure
 
 	# Making user group and cvs update from database 
-	/usr/share/pkgname/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
-	rm -f /var/lib/pkgname/dumps/*cvs*dump
-	su -s /bin/sh pkgname -c /usr/share/pkgname/plugins/scmcvs/cronjobs/cvs_dump.pl
-	/usr/share/pkgname/plugins/scmcvs/cronjobs/cvs_update.pl
+	/usr/share/@PACKAGE@/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
+	rm -f /var/lib/@PACKAGE@/dumps/*cvs*dump
+	su -s /bin/sh @PACKAGE@ -c /usr/share/@PACKAGE@/plugins/scmcvs/cronjobs/cvs_dump.pl
+	/usr/share/@PACKAGE@/plugins/scmcvs/cronjobs/cvs_update.pl
 
-	if [ ! -e /var/lib/pkgname/chroot/cvs ] ; then
-	    cd /var/lib/pkgname/chroot
+	if [ ! -e /var/lib/@PACKAGE@/chroot/cvs ] ; then
+	    cd /var/lib/@PACKAGE@/chroot
 	    ln -s cvsroot cvs
 	fi
 
 	# logs
-	chown root:pkgname /var/log/pkgname/cvs
-	chmod 775 /var/log/pkgname/cvs
+	chown root:@PACKAGE@ /var/log/@PACKAGE@/cvs
+	chmod 775 /var/log/@PACKAGE@/cvs
 
 	# Restart some services
 	[ -d /etc/ssh ] && invoke-rc.d ssh restart || true

Modified: trunk/gforge/debian/dsf-in/plugin-scmcvs.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/plugin-scmcvs.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/plugin-scmcvs.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname-plugin-scmcvs
+# prerm script for @PACKAGE at -plugin-scmcvs
 #
 # see: dh_installdeb(1)
 set -e
@@ -22,9 +22,9 @@
     remove|deconfigure)
     	if [ -f /var/run/postgresql/.s.PGSQL.5432 ]
 	then
-		/usr/share/pkgname/bin/unregister-plugin scmcvs
+		/usr/share/@PACKAGE@/bin/unregister-plugin scmcvs
 	else
-		echo "WARNING: GForge database not available to unregister scmcvs plugin"
+		echo "WARNING: @FORGENAME@ database not available to unregister scmcvs plugin"
 	fi
 	test -f /etc/default/apache2 && . /etc/default/apache2
 	if [ "$NO_START" != "0" ]; then

Modified: trunk/gforge/debian/dsf-in/shell-postgresql.postinst
===================================================================
--- trunk/gforge/debian/dsf-in/shell-postgresql.postinst	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/shell-postgresql.postinst	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -27,19 +27,19 @@
 
 case "$1" in
     configure)
-	pkgname-config
+	@PACKAGE at -config
 
         # Patch NSS configuration files
-	/usr/share/pkgname/bin/install-nsspgsql.sh configure-files
-	ucf --debconf-ok /etc/nss-pgsql.conf.pkgname-new /etc/nss-pgsql.conf
-	ucf --debconf-ok /etc/nss-pgsql-root.conf.pkgname-new /etc/nss-pgsql-root.conf
-	ucf --debconf-ok /etc/nsswitch.conf.pkgname-new /etc/nsswitch.conf
-	rm /etc/nss-pgsql.conf.pkgname-new
-	rm /etc/nss-pgsql-root.conf.pkgname-new
-	rm /etc/nsswitch.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-nsspgsql.sh configure-files
+	ucf --debconf-ok /etc/nss-pgsql.conf. at PACKAGE@-new /etc/nss-pgsql.conf
+	ucf --debconf-ok /etc/nss-pgsql-root.conf. at PACKAGE@-new /etc/nss-pgsql-root.conf
+	ucf --debconf-ok /etc/nsswitch.conf. at PACKAGE@-new /etc/nsswitch.conf
+	rm /etc/nss-pgsql.conf. at PACKAGE@-new
+	rm /etc/nss-pgsql-root.conf. at PACKAGE@-new
+	rm /etc/nsswitch.conf. at PACKAGE@-new
 
 	# Install the chroot environment
-	/usr/share/pkgname/bin/install-chroot.sh configure
+	/usr/share/@PACKAGE@/bin/install-chroot.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/dsf-in/shell-postgresql.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/shell-postgresql.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/shell-postgresql.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -19,16 +19,16 @@
 
 case "$1" in
     remove)
-	db_title "Unconfiguring Gforge"
+	db_title "Unconfiguring @FORGENAME@"
 
         # Unpatch Slapd configuration files
-	/usr/share/pkgname/bin/install-nsspgsql.sh purge-files
-	ucf --debconf-ok /etc/nss-pgsql.conf.pkgname-new /etc/nss-pgsql.conf
-	ucf --debconf-ok /etc/nss-pgsql-root.conf.pkgname-new /etc/nss-pgsql-root.conf
-	ucf --debconf-ok /etc/nsswitch.conf.pkgname-new /etc/nsswitch.conf
-	rm /etc/nss-pgsql.conf.pkgname-new
-	rm /etc/nss-pgsql-root.conf.pkgname-new
-	rm /etc/nsswitch.conf.pkgname-new
+	/usr/share/@PACKAGE@/bin/install-nsspgsql.sh purge-files
+	ucf --debconf-ok /etc/nss-pgsql.conf. at PACKAGE@-new /etc/nss-pgsql.conf
+	ucf --debconf-ok /etc/nss-pgsql-root.conf. at PACKAGE@-new /etc/nss-pgsql-root.conf
+	ucf --debconf-ok /etc/nsswitch.conf. at PACKAGE@-new /etc/nsswitch.conf
+	rm /etc/nss-pgsql.conf. at PACKAGE@-new
+	rm /etc/nss-pgsql-root.conf. at PACKAGE@-new
+	rm /etc/nsswitch.conf. at PACKAGE@-new
 	ucf --purge /etc/libnss-pgsql.conf
 	ucf --purge /etc/libnss-pgsql-root.conf
 	ucf --purge /etc/nsswitch.conf

Modified: trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for pkgname
+# postinst script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -49,33 +49,33 @@
 	    add_onevar_mainconfile cronolog_path /usr/bin/cronolog
 	fi
 
-	if [ ! -e /etc/pkgname/ssl-cert.pem ] || [ ! -e /etc/pkgname/ssl-cert.key ] ; then
+	if [ ! -e /etc/@PACKAGE@/ssl-cert.pem ] || [ ! -e /etc/@PACKAGE@/ssl-cert.key ] ; then
 	    # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
 	    if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then
 		# What, not even the snakeoil cert is there?  Let's generate it
 		make-ssl-cert generate-default-snakeoil
 	    fi
 	    # Right.  At this point, it should be safe to set the symlinks.
-	    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/pkgname/ssl-cert.pem
-	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/pkgname/ssl-cert.key
-	    if grep -q ^sys_use_ssl=false$ /etc/pkgname/pkgname.conf \
-		&& grep -q ^sys_sslcrt=$ /etc/pkgname/pkgname.conf \
-		&& grep -q ^sys_sslkey=$ /etc/pkgname/pkgname.conf ; then
+	    ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/@PACKAGE@/ssl-cert.pem
+	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/@PACKAGE@/ssl-cert.key
+	    if grep -q ^sys_use_ssl=false$ /etc/@PACKAGE@/@PACKAGE at .conf \
+		&& grep -q ^sys_sslcrt=$ /etc/@PACKAGE@/@PACKAGE at .conf \
+		&& grep -q ^sys_sslkey=$ /etc/@PACKAGE@/@PACKAGE at .conf ; then
 		# Okay, previous installations failed to locate SSL certs
 		# and disabled SSL altogether.  Let's fix that
-		sed -i -e 's,^sys_use_ssl=false$,sys_use_ssl=true,' /etc/pkgname/pkgname.conf 
-		sed -i -e 's,^sys_sslcrt=$,sys_sslcrt=/etc/pkgname/ssl-cert.pem,' /etc/pkgname/pkgname.conf 
-		sed -i -e 's,^sys_sslkey=$,sys_sslkey=/etc/pkgname/ssl-cert.key,' /etc/pkgname/pkgname.conf
+		sed -i -e 's,^sys_use_ssl=false$,sys_use_ssl=true,' /etc/@PACKAGE@/@PACKAGE at .conf 
+		sed -i -e 's,^sys_sslcrt=$,sys_sslcrt=/etc/@PACKAGE@/ssl-cert.pem,' /etc/@PACKAGE@/@PACKAGE at .conf 
+		sed -i -e 's,^sys_sslkey=$,sys_sslkey=/etc/@PACKAGE@/ssl-cert.key,' /etc/@PACKAGE@/@PACKAGE at .conf
 	    fi
 	fi
 	
-        pkgname-config
+        @PACKAGE at -config
 
 	db_stop
         # Setup our Apache
-	touch /var/lib/pkgname/etc/templates/httpd.vhosts  && \
-		chown pkgname:pkgname /var/lib/pkgname/etc/templates/httpd.vhosts && \
-		/usr/share/pkgname/bin/create-vhosts.sh --norestart
+	touch /var/lib/@PACKAGE@/etc/templates/httpd.vhosts  && \
+		chown @PACKAGE@:@PACKAGE@ /var/lib/@PACKAGE@/etc/templates/httpd.vhosts && \
+		/usr/share/@PACKAGE@/bin/create-vhosts.sh --norestart
 
 	# Enable required modules
 	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod php5 || true
@@ -85,14 +85,14 @@
 	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod headers || true
 	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod rewrite || true
 	
-	# Enable the Gforge configuration
-	if [ -e /etc/apache2/conf.d/pkgname.httpd.conf ] ; then
-	    rm -f /etc/apache2/conf.d/pkgname.httpd.conf
+	# Enable the @FORGENAME@ configuration
+	if [ -e /etc/apache2/conf.d/@PACKAGE at .httpd.conf ] ; then
+	    rm -f /etc/apache2/conf.d/@PACKAGE at .httpd.conf
 	fi
-	if [ -d /etc/apache2/sites-available ] && [ ! -e /etc/apache2/sites-available/pkgname ] ; then
-	    ln -s /etc/pkgname/httpd.conf /etc/apache2/sites-available/pkgname
+	if [ -d /etc/apache2/sites-available ] && [ ! -e /etc/apache2/sites-available/@PACKAGE@ ] ; then
+	    ln -s /etc/@PACKAGE@/httpd.conf /etc/apache2/sites-available/@PACKAGE@
 	fi
-	a2ensite pkgname
+	a2ensite @PACKAGE@
 	
 	# Make Apache see these new changes
 	invoke-rc.d apache2 restart || true

Modified: trunk/gforge/debian/dsf-in/web-apache2.prerm
===================================================================
--- trunk/gforge/debian/dsf-in/web-apache2.prerm	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-in/web-apache2.prerm	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for pkgname
+# prerm script for @PACKAGE@
 #
 # see: dh_installdeb(1)
 
@@ -19,8 +19,8 @@
 
 case "$1" in
     remove)
-	a2dissite pkgname || true
-	rm -f /etc/apache2/sites-available/pkgname
+	a2dissite @PACKAGE@ || true
+	rm -f /etc/apache2/sites-available/@PACKAGE@
 	invoke-rc.d apache2 reload || true
 	;;
     upgrade|deconfigure|failed-upgrade)

Modified: trunk/gforge/debian/dsf-po/POTFILES.in
===================================================================
--- trunk/gforge/debian/dsf-po/POTFILES.in	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/POTFILES.in	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,7 +1,7 @@
-[type: gettext/rfc822deb] @PACKAGE at -common.templates
-[type: gettext/rfc822deb] @PACKAGE at -db-postgresql.templates
-[type: gettext/rfc822deb] @PACKAGE at -dns-bind9.templates
-[type: gettext/rfc822deb] @PACKAGE at -mta-postfix.templates
+[type: gettext/rfc822deb] dsf-in/common.templates.dsfh-in
+[type: gettext/rfc822deb] dsf-in/db-postgresql.templates.dsfh-in
+[type: gettext/rfc822deb] dsf-in/dns-bind9.templates.dsfh-in
+[type: gettext/rfc822deb] dsf-in/mta-postfix.templates.dsfh-in
 [type: gettext/rfc822deb] dsf-helper/common-variables.templates
 [type: gettext/rfc822deb] dsf-helper/dbhost-variables.templates
 [type: gettext/rfc822deb] dsf-helper/dbpasswd-variables.templates

Modified: trunk/gforge/debian/dsf-po/cs.po
===================================================================
--- trunk/gforge/debian/dsf-po/cs.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/cs.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-30 14:36+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,137 +25,165 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Server se shellovými účty:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
-msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty GForge."
+msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Server pro stahování:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Zadejte prosím jméno serveru, který bude hostit balíky GForge."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Měl by to být jiný počítač než je hlavní server GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Měl by to být jiný počítač než je hlavní server @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Přihlašovací jméno správce GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Přihlašovací jméno správce @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Správce GForge bude mít v systému GForge všechna práva. Používá se například "
+"Správce @FORGENAME@ bude mít v systému @FORGENAME@ všechna práva. Používá se například "
 "pro schvalování vytváření nových projektů."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Zadejte prosím přihlašovací jméno tohoto účtu."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP adresa:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Zadejte prosím IP adresu serveru, který bude hostit instalaci GForge."
+msgstr "Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "To je vyžadováno pro nastavení virtuálních hostů v Apachi."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Heslo správce GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Heslo správce @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Zadejte prosím heslo pro tento účet."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Potvrzení hesla:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Zadejte heslo ještě jednou pro potvrzení."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Počáteční seznam schopností:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge umožňuje uživatelům, aby si ze seznamu schopností definovali své "
+"@FORGENAME@ umožňuje uživatelům, aby si ze seznamu schopností definovali své "
 "dovednosti. Seznam, který zde zadáte, bude uložen v databázi jako výchozí "
 "seznam schopností."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Jednotlivé položky seznamu schopností oddělte středníky."
 
@@ -163,15 +191,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Chcete mít v GForge jednoduchou konfiguraci DNS?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Chcete mít v @FORGENAME@ jednoduchou konfiguraci DNS?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -187,7 +217,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -199,23 +229,27 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Chcete, aby se pošta doručená na ${noreply} zahazovala?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge využívá adresu „${noreply}“ k odesílání i příjmu velkého množství "
+"@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého množství "
 "pošty."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -226,49 +260,68 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Název GForge domény nebo subdomény:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Název @FORGENAME@ domény nebo subdomény:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Zadejte prosím doménu, která bude hostit vaši instalaci GForge. Některé "
+"Zadejte prosím doménu, která bude hostit vaši instalaci @FORGENAME at . Některé "
 "služby obdrží své vlastní subdomény této domény (scm, lists, atd.)."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Emailová adresa správce GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Emailová adresa správce @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Zadejte prosím emailovou adresu správce tohoto systému GForge. Adresa se "
+"Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . Adresa se "
 "použije v případě výskytu problémů."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Jméno GForge systému:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Jméno @FORGENAME@ systému:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Zadejte prosím jméno GForge systému. Toto jméno je v systému používáno na "
+"Zadejte prosím jméno @FORGENAME@ systému. Toto jméno je v systému používáno na "
 "několika místech."
 
 #. Type: string
@@ -280,11 +333,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
-"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši GForge "
+"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši @FORGENAME@ "
 "databázi."
 
 #. Type: string
@@ -296,9 +353,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Zadejte prosím jméno databáze, která bude obsahovat databázi GForge."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -309,12 +370,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Zadejte prosím uživatelské jméno správce databáze na serveru, který bude "
-"hostit databázi GForge."
+"hostit databázi @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -337,9 +402,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
-msgstr "Zadejte prosím jméno serveru, který bude hostit balíky GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -350,13 +420,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Členové správcovské skupiny pro novinky mohou schvalovat novinky pro hlavní "
-"stránku GForge. Tato skupina nesmí mít ID 1. Toto byste měli měnit jen v "
+"stránku @FORGENAME at . Tato skupina nesmí mít ID 1. Toto byste měli měnit jen v "
 "případě, že přecházíte z dřívější verze a chcete zachovat svá data."
 
 #. Type: string
@@ -380,19 +455,27 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit poštovní konference GForge."
+"Zadejte prosím jméno serveru, který bude hostit poštovní konference @FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
-msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
+msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -403,12 +486,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Zadejte prosím jméno serveru, který bude hostit přesměrování pošty pro "
-"uživatele GForge."
+"uživatele @FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/dsf-po/de.po
===================================================================
--- trunk/gforge/debian/dsf-po/de.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/de.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-06 22:57+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -16,145 +16,173 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Shell-Server:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre GForge-Shell-"
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
 "Konten beherbergen wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Download-Server:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre GForge-Pakete "
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Pakete "
 "beherbergen wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr ""
-"Dieser sollte nicht mit dem Namen des Haupt-GForge-Rechners übereinstimmen."
+"Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners übereinstimmen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "GForge-Administrator-Anmeldung:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "@FORGENAME at -Administrator-Anmeldung:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Das GForge-Administrator-Konto wird alle Privilegien auf dem GForge-System "
+"Das @FORGENAME at -Administrator-Konto wird alle Privilegien auf dem @FORGENAME at -System "
 "haben. Es wird benötigt, um die Erstellung von neuen Projekten zu bewilligen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Bitte wählen Sie den Benutzernamen für dieses Konto."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-Adresse:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Bitte geben Sie die IP-Adresse des Servers ein, der Ihre GForge-Installation "
+"Bitte geben Sie die IP-Adresse des Servers ein, der Ihre @FORGENAME at -Installation "
 "beherbergen wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Diese wird für die virtualhosting-Konfiguration des Apache benötigt."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "GForge-Administrator-Passwort:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "@FORGENAME at -Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Bitte wählen Sie das Passwort für dieses Konto."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Bestätigung des Passworts:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Bitte geben Sie zur Bestätigung das Passwort erneut ein."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Anfängliche Liste der Fähigkeiten:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge erlaubt es den Benutzern, eine Liste Ihrer Fähigkeiten zu definieren, "
+"@FORGENAME@ erlaubt es den Benutzern, eine Liste Ihrer Fähigkeiten zu definieren, "
 "die aus allen in der Datenbank hinterlegten Fähigkeiten ausgewählt werden "
 "können. Diese Liste ist die anfängliche Liste von Fähigkeiten, die in die "
 "Datenbank eingegeben wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Bitte geben Sie die Namen der Fähigkeiten, getrennt durch Semikola »;«, ein."
@@ -163,15 +191,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Möchten Sie eine einfache DNS-Installation für GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Möchten Sie eine einfache DNS-Installation für @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -187,7 +217,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -200,23 +230,26 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge sendet und empfängt viele E-Mails von und auf der »${noreply}«-"
-"Adresse."
+"@FORGENAME@ sendet und empfängt viele E-Mails von und auf der »${noreply}«-Adresse."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -228,50 +261,69 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "GForge Domain- oder Subdomain-Name:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Bitte geben Sie die Domain an, die Ihre GForge-Installation beherbergen "
+"Bitte geben Sie die Domain an, die Ihre @FORGENAME at -Installation beherbergen "
 "wird. Einigen Diensten (scm, lists, usw.) wird innerhalb der Domain eine "
 "eigene Subdomain zugewiesen."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "E-Mail-Adresse des GForge-Administrators:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Bitte geben Sie die E-Mail-Adresse des GForge-Administrators Ihrer Site an. "
+"Bitte geben Sie die E-Mail-Adresse des @FORGENAME at -Administrators Ihrer Site an. "
 "Diese wird beim Auftritt von Problemen benötigt."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "GForge-Systemname:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME at -Systemname:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Bitte geben Sie den Namen des GForge-Systems ein. Er wird an verschiedenen "
+"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an verschiedenen "
 "Stellen im ganzen System verwendet."
 
 #. Type: string
@@ -283,12 +335,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 "Bitte geben Sie die IP-Adresse (oder den Rechnernamen) des Servers ein, der "
-"die GForge-Datenbank beherbergen wird."
+"die @FORGENAME at -Datenbank beherbergen wird."
 
 #. Type: string
 #. Description
@@ -299,10 +355,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
-"Bitte geben Sie den Namen der Datenbank an, die die GForge-Datenbank "
+"Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
 "beherbergen wird."
 
 #. Type: string
@@ -314,12 +374,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Bitte geben Sie den Benutzernamen des Datenbankadministrators für den Server "
-"ein, der die GForge-Datenbank beherbergen wird."
+"ein, der die @FORGENAME at -Datenbank beherbergen wird."
 
 #. Type: password
 #. Description
@@ -343,10 +407,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre GForge-Pakete "
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Pakete "
 "beherbergen wird."
 
 #. Type: string
@@ -358,12 +427,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
-"Mitglieder der News-Administrator-Gruppe können Nachrichten für die GForge-"
+"Mitglieder der News-Administrator-Gruppe können Nachrichten für die @FORGENAME at -"
 "Hauptseite genehmigen. Diese Gruppen-ID darf nicht 1 sein. Dies sollte nur "
 "geändert werden, falls Sie ein Upgrade von einer vorhergehenden Version "
 "durchführen und Ihre Daten behalten möchten."
@@ -389,21 +463,29 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre GForge-"
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
 "Mailinglisten beherbergen wird."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre GForge-Shell-"
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
 "Konten beherbergen wird."
 
 #. Type: string
@@ -415,11 +497,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren GForge-Benutzer-"
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -Benutzer-"
 "E-Mail-Umleiter beherbergen wird."
 
 #. Type: select

Modified: trunk/gforge/debian/dsf-po/es.po
===================================================================
--- trunk/gforge/debian/dsf-po/es.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/es.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -30,8 +30,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.7~rc2-7\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2009-04-15 14:37+0200\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -41,202 +41,313 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Servidor de la consola:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
-msgid "Please enter the hostname of the server that will host the GForge shell accounts."
-msgstr "Introduzca el nombre del servidor que albergará las cuentas de la consola de GForge."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
+msgid ""
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
+"accounts."
+msgstr ""
+"Introduzca el nombre del servidor que albergará las cuentas de la consola de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Servidor de descargas:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the GForge packages."
-msgstr "Introduzca el nombre del servidor que albergará los paquetes de GForge."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
+msgid ""
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr ""
+"Introduzca el nombre del servidor que albergará los paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "No debería ser igual al de la máquina principal de GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "No debería ser igual al de la máquina principal de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Usuario del administrador de GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Usuario del administrador de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "The GForge administrator account will have full privileges on the system. It will be used to approve the creation of new projects."
-msgstr "La cuenta de administrador de GForge tendrá privilegios completos sobre el sistema. Se debe utilizar para aprobar la creación de nuevos proyectos."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
+msgid ""
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
+msgstr ""
+"La cuenta de administrador de @FORGENAME@ tendrá privilegios completos sobre el "
+"sistema. Se debe utilizar para aprobar la creación de nuevos proyectos."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Escriba el nombre de usuario para esta cuenta."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Dirección IP:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
-msgid "Please enter the IP address of the server that will host the GForge installation."
-msgstr "Introduzca la dirección IP del servidor que albergará la instalación de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
+msgid ""
+"Please enter the IP address of the server that will host the @FORGENAME@ "
+"installation."
+msgstr ""
+"Introduzca la dirección IP del servidor que albergará la instalación de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Es necesario para la configuración del servidor virtual de Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Contraseña del administrador de Gforge"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Contraseña del administrador de @FORGENAME@"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Escriba la contraseña para esta cuenta."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación de la contraseña:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Escriba nuevamente la contraseña para su confirmación."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Lista inicial de habilidades:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
-msgid "GForge allows users to define a list of their skills, to be chosen from those present in the database. This list is the initial list of skills that will enter the database."
-msgstr "Gforge permite que los usuarios definan una lista de habilidades, a elegir de las presentes en la base de datos. Esta lista es la lista inicial de habilidades que se introducirá en la base de datos."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
+msgid ""
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+"those present in the database. This list is the initial list of skills that "
+"will enter the database."
+msgstr ""
+"@FORGENAME@ permite que los usuarios definan una lista de habilidades, a elegir "
+"de las presentes en la base de datos. Esta lista es la lista inicial de "
+"habilidades que se introducirá en la base de datos."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
-msgstr "Introduzca una lista de nombres de habilidades, separados por punto y coma."
+msgstr ""
+"Introduzca una lista de nombres de habilidades, separados por punto y coma."
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "¿Quiere una configuración sencilla de DNS para GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "¿Quiere una configuración sencilla de DNS para @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "You can use a simple DNS setup with wildcards to map all project web-hosts to a single IP address, and direct all the scm-hosts to a single SCM server, or a complex setup which allows many servers as project web servers or SCM servers."
-msgstr "Puede utilizar una configuración sencilla de DNS que utilizará comodines para asignar todos los anfitriones web de proyectos a una única dirección IP, y dirigir a todos los anfitriones de SCM a un único servidor de SCM, o una configuración compleja que le permitirá tener muchos servidores como servidores de proyectos web o de SCM."
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+msgid ""
+"You can use a simple DNS setup with wildcards to map all project web-hosts "
+"to a single IP address, and direct all the scm-hosts to a single SCM server, "
+"or a complex setup which allows many servers as project web servers or SCM "
+"servers."
+msgstr ""
+"Puede utilizar una configuración sencilla de DNS que utilizará comodines "
+"para asignar todos los anfitriones web de proyectos a una única dirección "
+"IP, y dirigir a todos los anfitriones de SCM a un único servidor de SCM, o "
+"una configuración compleja que le permitirá tener muchos servidores como "
+"servidores de proyectos web o de SCM."
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Even if you use a simple DNS setup, you can still use separate machines as project servers; it just assumes that all the project web directories are on the same server with a single SCM server."
-msgstr "Incluso si tiene una configuración sencilla de DNS, aún puede utilizar máquinas diferentes para los servidores de proyecto. Simplemente se asumirá que todos los directorios web de los proyectos están en el mismo servidor y que tiene un único servidor para SCM."
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+msgid ""
+"Even if you use a simple DNS setup, you can still use separate machines as "
+"project servers; it just assumes that all the project web directories are on "
+"the same server with a single SCM server."
+msgstr ""
+"Incluso si tiene una configuración sencilla de DNS, aún puede utilizar "
+"máquinas diferentes para los servidores de proyecto. Simplemente se asumirá "
+"que todos los directorios web de los proyectos están en el mismo servidor y "
+"que tiene un único servidor para SCM."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "¿Desea borrar los correos enviados a ${noreply}?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
-msgid "GForge sends and receives plenty of e-mail to and from the \"${noreply}\" address."
-msgstr "Gforge envía y recibe muchos correos electrónicos hacia y desde la dirección «${noreply}»."
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
+msgid ""
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
+msgstr ""
+"@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la dirección "
+"«${noreply}»."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
-msgid "E-mail to that address should be directed to a black hole (/dev/null), unless you have another use for that address."
-msgstr "Los correos electrónicos que se envíen a esa dirección se deberían redireccionar a un agujero negro («/dev/null»), a menos que esa dirección tenga otro uso."
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+msgid ""
+"E-mail to that address should be directed to a black hole (/dev/null), "
+"unless you have another use for that address."
+msgstr ""
+"Los correos electrónicos que se envíen a esa dirección se deberían "
+"redireccionar a un agujero negro («/dev/null»), a menos que esa dirección "
+"tenga otro uso."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "El nombre de dominio o subdominio de Gforge:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "El nombre de dominio o subdominio de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "Please enter the domain that will host the GForge installation. Some services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr "Introduzca el dominio que albergará la instalación de Gforge. Algunos servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Introduzca el dominio que albergará la instalación de @FORGENAME at . Algunos "
+"servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Dirección de correo electrónico del administrador de Gforge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Dirección de correo electrónico del administrador de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "Please enter the e-mail address of the GForge administrator of this site. It will be used when problems occur."
-msgstr "Introduzca la dirección de correo electrónico del administrador de Gforge de este sitio. Se utilizará en caso de que ocurra un problema."
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
+msgid ""
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
+msgstr ""
+"Introduzca la dirección de correo electrónico del administrador de @FORGENAME@ de "
+"este sitio. Se utilizará en caso de que ocurra un problema."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Nombre del sistema de Gforge:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nombre del sistema de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "Please enter the name of the GForge system. It is used in various places throughout the system."
-msgstr "Introduzca el nombre del sistema de GForge. Se utiliza en varios sitios del sistema."
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios del "
+"sistema."
 
 #. Type: string
 #. Description
@@ -247,8 +358,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Please enter the IP address (or hostname) of the server that will host the GForge database."
-msgstr "Introduzca la dirección IP (o nombre de la máquina) del servidor que alberga la base de datos de Gforge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
+msgid ""
+"Please enter the IP address (or hostname) of the server that will host the "
+"@FORGENAME@ database."
+msgstr ""
+"Introduzca la dirección IP (o nombre de la máquina) del servidor que alberga "
+"la base de datos de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -259,8 +378,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the GForge database."
-msgstr "Introduzca el nombre de la base de datos que albergará la base de datos de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
+msgid ""
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr ""
+"Introduzca el nombre de la base de datos que albergará la base de datos de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -271,8 +397,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Please enter the username of the database administrator for the server that will host the GForge database."
-msgstr "Introduzca el nombre de usuario del administrador de la base de datos del servidor en el que se albergará la base de datos de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
+msgid ""
+"Please enter the username of the database administrator for the server that "
+"will host the @FORGENAME@ database."
+msgstr ""
+"Introduzca el nombre de usuario del administrador de la base de datos del "
+"servidor en el que se albergará la base de datos de @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -284,7 +418,9 @@
 #. Description
 #: ../dsf-helper/dbpasswd-variables.templates:2001
 msgid "Connections to the database system are authenticated by a password."
-msgstr "Las conexiones al sistema de la base de datos se autentican con una contraseña."
+msgstr ""
+"Las conexiones al sistema de la base de datos se autentican con una "
+"contraseña."
 
 #. Type: password
 #. Description
@@ -295,8 +431,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge packages."
-msgstr "Introduzca el nombre del servidor que albergará los paquetes de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr ""
+"Introduzca el nombre del servidor que albergará los paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -307,8 +450,20 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
-msgid "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."
-msgstr "Los miembros del grupo de administradores de noticias pueden aprobar nuevas noticias en la página principal de GForge. El identificador de este grupo no debe ser «1». Esto se debería cambiar sólo si actualiza desde una versión previa y quiere mantener los datos."
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
+msgid ""
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
+msgstr ""
+"Los miembros del grupo de administradores de noticias pueden aprobar nuevas "
+"noticias en la página principal de @FORGENAME at . El identificador de este grupo no "
+"debe ser «1». Esto se debería cambiar sólo si actualiza desde una versión "
+"previa y quiere mantener los datos."
 
 #. Type: string
 #. Description
@@ -331,14 +486,30 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge mailing lists."
-msgstr "Introduzca el nombre del servidor que albergará las listas de correo de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
+msgstr ""
+"Introduzca el nombre del servidor que albergará las listas de correo de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge shell accounts."
-msgstr "Introduzca el nombre del servidor que albergará las cuentas de la consola de Gforge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
+msgstr ""
+"Introduzca el nombre del servidor que albergará las cuentas de la consola de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -349,8 +520,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge user mail redirector."
-msgstr "Introduzca el nombre del servidor que albergará el redirector de los correos electrónicos de usuarios de GForge."
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
+msgstr ""
+"Introduzca el nombre del servidor que albergará el redirector de los correos "
+"electrónicos de usuarios de @FORGENAME at ."
 
 #. Type: select
 #. Choices
@@ -523,6 +702,7 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
-msgstr "Elija el tema predeterminado para las páginas web. Debe ser un nombre válido."
-
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
+msgstr ""
+"Elija el tema predeterminado para las páginas web. Debe ser un nombre válido."

Modified: trunk/gforge/debian/dsf-po/fi.po
===================================================================
--- trunk/gforge/debian/dsf-po/fi.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/fi.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-24 17:41+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -14,137 +14,165 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Komentorivipalvelin:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
-msgstr "Anna GForgen komentorivitunnuksia isännöivän palvelimen verkkonimi."
+msgstr "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Latauspalvelin:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Anna GForge-paketteja isännöivän palvelimen verkkonimi."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Anna @FORGENAME at -paketteja isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Tämän ei tulisi olla GForgen pääpalvelin."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Tämän ei tulisi olla @FORGENAME at n pääpalvelin."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "GForgen ylläpitotunnus:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "@FORGENAME at n ylläpitotunnus:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"GForgen ylläpitotunnuksella tulee olemaan täydet oikeudet järjestelmään. "
+"@FORGENAME at n ylläpitotunnuksella tulee olemaan täydet oikeudet järjestelmään. "
 "Sitä käytetään hyväksyttäessä uusien projektien luominen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Valitse tämän tunnuksen nimi."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-osoite:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Anna GForge-asennusta isännöivän palvelimen IP-osoite."
+msgstr "Anna @FORGENAME at -asennusta isännöivän palvelimen IP-osoite."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Tätä tarvitaan Apachen näennäiskoneiden asetukseen."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "GForgen ylläpitosalasana:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "@FORGENAME at n ylläpitosalasana:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Valitse tunnuksen salasana."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Salasanan vahvistus:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Anna salasana uudestaan vahvistukseksi."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Alkuperäinen lista taidoista:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge antaa käyttäjien määrittää listan taidoistaan. Ne valitaan "
+"@FORGENAME@ antaa käyttäjien määrittää listan taidoistaan. Ne valitaan "
 "tietokannassa tällä hetkellä olevista. Tämä alkuperäinen taitolista "
 "tallennetaan tietokantaan."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Anna puolipisteillä erotettu lista taitojen nimistä."
 
@@ -152,15 +180,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Käytetäänkö GForgen kanssa yksinkertaista DNS-asetusta?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Käytetäänkö @FORGENAME at n kanssa yksinkertaista DNS-asetusta?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -177,7 +207,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -190,24 +220,28 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr ""
 "Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge lähettää ja vastaanottaa paljon sähköpostia osoitteen ”${noreply}” "
+"@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen ”${noreply}” "
 "kautta."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -218,49 +252,68 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "GForgen verkkotunnus tai aliverkkotunnus:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME at n verkkotunnus tai aliverkkotunnus:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Anna GForge-asennuksen verkkotunnus. Joillekin palveluille (versionhallinta, "
+"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille (versionhallinta, "
 "listat, jne.) annetaan oma aliverkkotunnus tämän verkkotunnuksen alta."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "GForgen ylläpidon sähköpostiosoite:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "@FORGENAME at n ylläpidon sähköpostiosoite:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Anna GForgen ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia "
+"Anna @FORGENAME at n ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia "
 "ilmaantuu."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "GForgen järjestelmänimi:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME at n järjestelmänimi:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Anna GForge-järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
+"Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
 "järjestelmää."
 
 #. Type: string
@@ -272,11 +325,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
-"Anna GForgen tietokantaa isännöivän palvelimen IP-osoite (tai verkkonimi)."
+"Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai verkkonimi)."
 
 #. Type: string
 #. Description
@@ -287,9 +344,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Anna GForgen tietokantaa isännöivän tietokannan nimi."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Anna @FORGENAME at n tietokantaa isännöivän tietokannan nimi."
 
 #. Type: string
 #. Description
@@ -300,11 +361,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
-"Anna GForgen tietokantaa isännöivän palvelimen tietokannan "
+"Anna @FORGENAME at n tietokantaa isännöivän palvelimen tietokannan "
 "ylläpitokäyttäjätunnus."
 
 #. Type: password
@@ -328,9 +393,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
-msgstr "Anna GForgen paketteja isännöivän palvelimen verkkonimi."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Anna @FORGENAME at n paketteja isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
@@ -341,12 +411,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
-"Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia GForgen "
+"Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia @FORGENAME at n "
 "pääsivulle. Tämän ryhmän ID:n ei tule olla 1. Tätä tulisi muuttaa vain, jos "
 "päivität aikaisemmasta versiosta ja haluat säilyttää tiedot."
 
@@ -371,18 +446,26 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
-msgstr "Anna GForgen postituslistoja isännöivän palvelimen verkkonimi."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
+msgstr "Anna @FORGENAME at n postituslistoja isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
-msgstr "Anna GForgen komentorivitunnuksia isännöivän palvelimen verkkonimi."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
+msgstr "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
@@ -393,11 +476,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
-"Anna GForgen käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
+"Anna @FORGENAME at n käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
 "verkkonimi."
 
 #. Type: select

Modified: trunk/gforge/debian/dsf-po/fr.po
===================================================================
--- trunk/gforge/debian/dsf-po/fr.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/fr.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -18,89 +18,110 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Serveur interactif (« shell server ») :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
 "Veuillez indiquer le nom du serveur qui hébergera les comptes interactifs "
-"GForge."
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Serveur de téléchargement :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera les paquets de GForge."
+"Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Ce nom devrait être différent du nom d'hôte principal de GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Ce nom devrait être différent du nom d'hôte principal de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Identifiant de l'administrateur de GForge :"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Identifiant de l'administrateur de @FORGENAME@ :"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Le compte d'administration de GForge aura tous les privilèges sur le système "
-"GForge. Il servira à approuver la création de projets."
+"Le compte d'administration de @FORGENAME@ aura tous les privilèges sur le système "
+"@FORGENAME at . Il servira à approuver la création de projets."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Veuillez choisir l'identifiant à utiliser pour ce compte."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Adresse IP :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Veuillez indiquer l'adresse IP du serveur qui hébergera GForge."
+msgstr "Veuillez indiquer l'adresse IP du serveur qui hébergera @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr ""
@@ -109,50 +130,57 @@
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Mot de passe de l'administrateur de GForge :"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Mot de passe de l'administrateur de @FORGENAME@ :"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Veuillez choisir le mot de passe de ce compte."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Veuillez entrer à nouveau le mot de passe, pour confirmation."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Liste initiale de domaines de compétences :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"Les utilisateurs de GForge peuvent afficher leurs niveaux de compétence dans "
+"Les utilisateurs de @FORGENAME@ peuvent afficher leurs niveaux de compétence dans "
 "différents domaines. Cette liste est la liste initiale de ces domaines. "
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Veuillez indiquer les noms de ces domaines de compétence, séparés par des "
@@ -162,15 +190,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Souhaitez-vous une configuration DNS simplifiée ?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -188,7 +218,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -201,22 +231,26 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge envoie fréquemment des courriers de et vers l'adresse « ${noreply} »."
+"@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse « ${noreply} »."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -227,50 +261,69 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Nom de domaine ou de sous-domaine GForge :"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Veuillez indiquer le nom de domaine qui hébergera le serveur GForge. "
+"Veuillez indiquer le nom de domaine qui hébergera le serveur @FORGENAME at . "
 "Certains services auront leur propre sous-domaine à l'intérieur de ce "
 "domaine (scm, lists, etc.)."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Adresse électronique de l'administrateur GForge :"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Veuillez indiquer l'adresse de l'administrateur de GForge. Elle est utilisée "
+"Veuillez indiquer l'adresse de l'administrateur de @FORGENAME at . Elle est utilisée "
 "quand un problème se produit."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Nom du système GForge :"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nom du système @FORGENAME@ :"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Veuillez indiquer le nom du système GForge. Il est utilisé dans plusieurs "
+"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans plusieurs "
 "parties du serveur."
 
 #. Type: string
@@ -282,12 +335,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 "Veuillez indiquer l'adresse IP ou le nom du serveur qui hébergera la base de "
-"données de GForge."
+"données de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -298,9 +355,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Veuillez indiquer le nom de la base de données pour GForge."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Veuillez indiquer le nom de la base de données pour @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -311,12 +372,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Veuillez indiquer l'identifiant de l'administrateur du serveur de bases de "
-"données qui hébergera la base de données de GForge."
+"données qui hébergera la base de données de @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -341,10 +406,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera les paquets de GForge."
+"Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -355,13 +425,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Les membres du groupe d'administration des nouvelles peuvent approuver des "
-"nouvelles pour les publier sur la page d'accueil de GForge. Le numéro de ce "
+"nouvelles pour les publier sur la page d'accueil de @FORGENAME at . Le numéro de ce "
 "groupe ne doit pas être 1. Cette information n'est requise que si vous "
 "mettez à jour une installation précédente et que vous voulez garder vos "
 "données."
@@ -387,22 +462,30 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les listes de "
-"diffusion de GForge."
+"diffusion de @FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
-"interactifs GForge."
+"interactifs @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -413,12 +496,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Veuillez indiquer le nom du serveur qui hébergera le redirecteur du courriel "
-"utilisateurs de GForge."
+"utilisateurs de @FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/dsf-po/gl.po
===================================================================
--- trunk/gforge/debian/dsf-po/gl.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/gl.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-25 03:47+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,139 +16,167 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Servidor de shell:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Introduza o nome do servidor que ha hospedar as contas shell de GForge."
+"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Servidor de descargas:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Introduza o nome do servidor que ha hospedar os paquetes de GForge."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Non debería ser o mesmo que o servidor principal de GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Non debería ser o mesmo que o servidor principal de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Nome do usuario administrador de GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Nome do usuario administrador de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"A conta de administrador de GForge ha ter tódolos privilexios no sistema. "
+"A conta de administrador de @FORGENAME@ ha ter tódolos privilexios no sistema. "
 "Hase empregar para aprobar a creación de novos proxectos."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Escolla o nome de usuario para esta conta."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Enderezo IP:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Introduza o enderezo IP do servidor que ha hospedar a instalación de GForge."
+"Introduza o enderezo IP do servidor que ha hospedar a instalación de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Isto é preciso para configurar a hospedaxe virtual de Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Contrasinal de administrador de GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Contrasinal de administrador de @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Escolla un contrasinal para esta conta."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación do contrasinal:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Volva introducir o contrasinal para confirmalo."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Lista inicial de coñecementos:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge permítelle aos usuarios facer unha lista cos seus coñecementos, que "
+"@FORGENAME@ permítelle aos usuarios facer unha lista cos seus coñecementos, que "
 "poden escoller entre os que figuran na base de datos. Esta lista é a lista "
 "inicial de coñecementos que han entrar na base de datos."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Introduza unha lista de nomes de coñecementos separados por signos de punto "
@@ -158,15 +186,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "¿Quere unha configuración de DNS simple para GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "¿Quere unha configuración de DNS simple para @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -182,7 +212,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -194,22 +224,26 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "¿Quere que se descarten as mensaxes enviadas a ${noreply}?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge envía e recibe moito email desde e para o enderezo \"${noreply}\"."
+"@FORGENAME@ envía e recibe moito email desde e para o enderezo \"${noreply}\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -220,49 +254,68 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Nome de dominio ou subdominio de GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nome de dominio ou subdominio de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Introduza o dominio que ha hospedar a instalación de GForge. Algúns servizos "
+"Introduza o dominio que ha hospedar a instalación de @FORGENAME at . Algúns servizos "
 "(scm, listas, etc.) han ter o seu propio subdominio dentro dese dominio."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Enderezo de email do administrador de GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Enderezo de email do administrador de @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Introduza o enderezo de email do administrador de GForge deste sitio. Hase "
+"Introduza o enderezo de email do administrador de @FORGENAME@ deste sitio. Hase "
 "empregar se aparecen problemas."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Nome do sistema GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Introduza o nome do sistema GForge. Emprégase en varios lugares do sistema."
+"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do sistema."
 
 #. Type: string
 #. Description
@@ -273,12 +326,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 "Introduza o enderezo IP (ou nome) do servidor que ha hospedar a base de "
-"datos de GForge."
+"datos de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -289,10 +346,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
-"Introduza o nome da base de datos que ha hospedar as contas shell de Gforge"
+"Introduza o nome da base de datos que ha hospedar as contas shell de @FORGENAME@"
 
 #. Type: string
 #. Description
@@ -303,12 +364,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Introduza o nome de usuario do administrador de bases de datos do servidor "
-"que ha hospedar a base de datos de GForge."
+"que ha hospedar a base de datos de @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -332,9 +397,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
-msgstr "Introduza o nome do servidor que ha hospedar os paquetes de GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -345,13 +415,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Os membros do grupo de administradores de novas poden aprobar as novas da "
-"páxina principal de Gforge. Este ID de grupo non debe ser 1. Só se debería "
+"páxina principal de @FORGENAME at . Este ID de grupo non debe ser 1. Só se debería "
 "cambiar se está a se actualizar dunha versión anterior e quere conservar os "
 "datos."
 
@@ -376,20 +451,28 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
-"Introduza o nome do servidor que ha hospedar as listas de correo de GForge."
+"Introduza o nome do servidor que ha hospedar as listas de correo de @FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
-"Introduza o nome do servidor que ha hospedar as contas shell de GForge."
+"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -400,12 +483,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Introduza o nome do servidor que ha hospedar o redirector do correo dos "
-"usuarios de GForge."
+"usuarios de @FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/dsf-po/nl.po
===================================================================
--- trunk/gforge/debian/dsf-po/nl.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/nl.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-28 14:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -28,7 +28,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Shell-server:"
@@ -37,19 +37,23 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Wat is de computernaam van de server die de GForge-shellaccounts gaat "
+"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
 "aanbieden?"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Downloadserver:"
@@ -58,29 +62,38 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Wat is de computernaam van de server waarop de GForge-pakketten gehost gaan "
+"Wat is de computernaam van de server waarop de @FORGENAME at -pakketten gehost gaan "
 "worden?"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Dit dient te verschillen van de hoofd-GForge-server."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Dit dient te verschillen van de hoofd- at FORGENAME@-server."
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Gebruikersnaam GForge-beheerder:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Gebruikersnaam @FORGENAME at -beheerder:"
 
 #  Type: string
 #  Description
@@ -88,18 +101,22 @@
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"De GForge-beheerdersaccount krijgt volledige rechten binnen GForge-systeem, "
+"De @FORGENAME at -beheerdersaccount krijgt volledige rechten binnen @FORGENAME at -systeem, "
 "en wordt gebruikt om nieuwe projecten goed te keuren."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Wat is de gebruikersnaam voor deze account?"
 
@@ -107,7 +124,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-adres:"
@@ -116,17 +133,21 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Wat is de computernaam van de server die de GForge-installatie gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -installatie gaat hosten?"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Dit is nodig voor om de 'virtual hosting' van Apache in te stellen."
@@ -135,15 +156,17 @@
 #  Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Wachtwoord van de GForge-beheerder:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Wachtwoord van de @FORGENAME at -beheerder:"
 
 #  Type: password
 #  Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Wat is het wachtwoord van deze account?"
 
@@ -151,7 +174,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Wachtwoordbevestiging:"
@@ -160,7 +183,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Ter bevestiging dient het wachtwoord nogmaals ingevoerd te worden."
@@ -169,7 +192,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Initiële lijst van vaardigheden:"
 
@@ -177,19 +200,24 @@
 #  Description
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge geeft gebruikers de mogelijkheid om een lijst met hun vaardigheden op "
+"@FORGENAME@ geeft gebruikers de mogelijkheid om een lijst met hun vaardigheden op "
 "te geven, gekozen uit deze aanwezig in de database. Dit is de de initiële "
 "lijst van vaardigheden voor de database."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Gelieve een met puntkomma's gescheiden lijst van vaardigheidsnamen in te "
@@ -201,9 +229,11 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Wilt u een eenvoudige DNS-opzet voor GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Wilt u een eenvoudige DNS-opzet voor @FORGENAME@?"
 
 #  Type: boolean
 #  Description
@@ -211,7 +241,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -230,7 +260,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -245,7 +275,7 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Wilt u dat e-mail voor ${noreply} weggegooid wordt?"
 
@@ -253,19 +283,23 @@
 #  Description
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge verstuurt en ontvangt een heleboel e-mails van en naar  het adres "
+"@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het adres "
 "'${noreply}'."
 
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -278,19 +312,26 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "De GForge-domeinnaam (of subdomeinnaam):"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "De @FORGENAME at -domeinnaam (of subdomeinnaam):"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Wat is het domein waarop uw GForge-installatie gehost wordt? Sommige "
+"Wat is het domein waarop uw @FORGENAME at -installatie gehost wordt? Sommige "
 "diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
 "binnen dat domein."
 
@@ -299,19 +340,25 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "E-mailadres van de GForge-beheerder:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "E-mailadres van de @FORGENAME at -beheerder:"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Wat is het e-mail-adres van de GForge-beheerder op dit systeem? Wordt "
+"Wat is het e-mail-adres van de @FORGENAME at -beheerder op dit systeem? Wordt "
 "gebruikt wanneer er problemen optreden."
 
 #  Type: string
@@ -319,19 +366,25 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Naam van het GForge-systeem:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Naam van het @FORGENAME at -systeem:"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Wat is de naam van het GForge-systeem? Deze naam wordt op verschillende "
+"Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
 "plaatsen in het systeem gebruikt."
 
 #  Type: string
@@ -347,11 +400,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
-"Wat is het IP-adres (of de computernaam) van de server die de GForge-"
+"Wat is het IP-adres (of de computernaam) van de server die de @FORGENAME at -"
 "database gaat hosten?"
 
 #  Type: string
@@ -367,10 +424,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
-"Wat is de naam van de database die als de GForge-database gebruikt gaat "
+"Wat is de naam van de database die als de @FORGENAME at -database gebruikt gaat "
 "worden?"
 
 #  Type: string
@@ -384,12 +445,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Wat is de gebruikersnaam van de database-beheerder van de server die de "
-"GForge-database gaat hosten?"
+"@FORGENAME at -database gaat hosten?"
 
 #  Type: password
 #  Description
@@ -418,10 +483,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Wat is de computernaam van de server die de GForge-pakketten gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat hosten?"
 
 #. Type: string
 #. Description
@@ -434,12 +504,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
-"De leden van de niews-beheerdersgroep kunnen nieuws voor de GForge-"
+"De leden van de niews-beheerdersgroep kunnen nieuws voor de @FORGENAME at -"
 "hoofdpagina goedkeuren. Deze groep-ID mag niet 1 zijn. Dit optie is enkel "
 "van belang als u opwaardeerd van een eerdere versie en uw gegevens wilt "
 "bewaren."
@@ -469,22 +544,30 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
-"Wat is de computernaam van de server die de GForge-e-maillijsten gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten gaat hosten?"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
-"Wat is de computernaam van de server die de GForge-shellaccounts gaat "
+"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
 "aanbieden?"
 
 #  Type: string
@@ -500,12 +583,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
-"van de mail voor GForge-gebruikers?"
+"van de mail voor @FORGENAME at -gebruikers?"
 
 #  Type: select
 #  DefaultChoice

Modified: trunk/gforge/debian/dsf-po/pt.po
===================================================================
--- trunk/gforge/debian/dsf-po/pt.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/pt.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-04-12 21:30+0100\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -17,143 +17,171 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Servidor de shells:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
 "Por favor introduza o nome da máquina do servidor onde ficarão as contas "
-"shell do GForge."
+"shell do @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Servidor de downloads:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes GForge."
+"Por favor introduza o nome do servidor que irá guardar os pacotes @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Não deve ser o mesmo que o host principal do GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Não deve ser o mesmo que o host principal do @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Login do administrador do GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Login do administrador do @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"A conta de administrador do GForge terá privilégios totais sobre o sistema. "
+"A conta de administrador do @FORGENAME@ terá privilégios totais sobre o sistema. "
 "Será usada para aprovar a criação de novos projectos."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Por favor escolha o nome de utilizador para esta conta."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Endereço IP:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
 "Por favor introduza o endereço IP do servidor onde será feita a instalação "
-"do GForge."
+"do @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Isto é necessário para a configuração de 'virtual hosts' do Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Palavra-passe do administrador do GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Palavra-passe do administrador do @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Por favor escolha a palavra-passe para esta conta."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmação da palavra-passe:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Por favor, reescreva a palavra-passe para confirmação."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Lista inicial de competências:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"O Gforge permite que os utilizadores definam uma lista com as suas "
+"O @FORGENAME@ permite que os utilizadores definam uma lista com as suas "
 "competências, a serem escolhidas de entre aquelas que estão na base de "
 "dados. Esta lista é a lista inicial de competências que irão figurar na base "
 "de dados."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Por favor introduza uma lista de nomes de capacidades, separadas pelo "
@@ -163,15 +191,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Deseja uma configuração simples de DNS no GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Deseja uma configuração simples de DNS no @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -188,7 +218,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -201,23 +231,27 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Deseja que o mail para ${noreply} seja apagado?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"O GForge envia e recebe bastante e-mail para e a partir do endereço "
+"O @FORGENAME@ envia e recebe bastante e-mail para e a partir do endereço "
 "\"${noreply}\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -228,50 +262,69 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "O nome do domínio ou subdomínio do GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Por favor introduza o domínio que vai conter a instalação do GForge. Alguns "
+"Por favor introduza o domínio que vai conter a instalação do @FORGENAME at . Alguns "
 "serviços (scm, listas de mail, etc.) terão o seu próprio subdomínio nesse "
 "domínio."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Endereço de email do administrador do GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Endereço de email do administrador do @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Por favor introduza o endereço de email do administrador GForge neste site. "
+"Por favor introduza o endereço de email do administrador @FORGENAME@ neste site. "
 "Será usado quando houverem problemas."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Nome do sistema GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Por favor introduza o nome do sistema GForge. Este nome é utilizado em "
+"Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
 "vários lugares pelo sistema."
 
 #. Type: string
@@ -283,12 +336,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 "Por favor introduza o endereço IP (ou nome da máquina) do servidor que irá "
-"guardar a base de dados do GForge."
+"guardar a base de dados do @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -299,11 +356,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
 "Por favor introduza o nome da base de dados que irá guardar a base de dados "
-"do GForge."
+"do @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -314,12 +375,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Por favor introduza o nome de utilizador do administrador do servidor que "
-"irá guardar a base de dados do GForge."
+"irá guardar a base de dados do @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -342,10 +407,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes do GForge."
+"Por favor introduza o nome do servidor que irá guardar os pacotes do @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -356,13 +426,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Os membros do grupo de administradores de notícias podem aprovar notícias "
-"afixadas na página principal do GForge. Este identificador de grupo não pode "
+"afixadas na página principal do @FORGENAME at . Este identificador de grupo não pode "
 "ser 1. Isto deve ser mudado apenas se actualizar a partir de uma versão "
 "antiga e quiser manter os seus dados."
 
@@ -387,22 +462,30 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Por favor introduza o nome do servidor que irá guardar as listas de email do "
-"GForge."
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Por favor introduza o nome do servidor onde irão ficar as contas de shell do "
-"GForge."
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -413,12 +496,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Por favor introduza o nome do servidor que fará o redireccionamento do mail "
-"dos utilizadores do GForge."
+"dos utilizadores do @FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/dsf-po/ru.po
===================================================================
--- trunk/gforge/debian/dsf-po/ru.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/ru.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-24 20:32+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -20,140 +20,168 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Сервер оболочек:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
 "Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для GForge."
+"для @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Сервер загрузок:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Введите имя сервера, на котором будут расположены пакеты GForge."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Оно не должно совпадать с главным хостом GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Учётная запись администратора GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Учётная запись администратора @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Учётная запись администратора GForge будет иметь все привилегии в системе. "
+"Учётная запись администратора @FORGENAME@ будет иметь все привилегии в системе. "
 "Она будет использована для подтверждения создания новых проектов."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Введите имя пользователя учётной записи для этого."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-адрес:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Введите IP-адрес сервера, на котором будет располагаться установка GForge."
+"Введите IP-адрес сервера, на котором будет располагаться установка @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Это нужно для настройки виртуального хостинга Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Пароль администратора GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Пароль администратора @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Введите пароль для этой учётной записи."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Подтверждение пароля:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Введите пароль ещё раз для подтверждения."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Начальный список навыков:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge позволяет пользователям составить список своих навыков из имеющихся в "
+"@FORGENAME@ позволяет пользователям составить список своих навыков из имеющихся в "
 "базе данных. Запрашиваемый сейчас начальный список навыков будет введён в "
 "базу данных."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Введите названия навыков, разделяя их точкой с запятой."
 
@@ -161,15 +189,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Выполнить простую настройку DNS для GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Выполнить простую настройку DNS для @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -185,7 +215,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -198,23 +228,27 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Удалять почту, присланную на адрес ${noreply}?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge посылает и принимает множество электронных писем на адрес \"${noreply}"
+"@FORGENAME@ посылает и принимает множество электронных писем на адрес \"${noreply}"
 "\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -225,50 +259,69 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Имя домена или поддомена GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Имя домена или поддомена @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Введите домен, который будет обслуживать установку GForge. В этом домене "
+"Введите домен, который будет обслуживать установку @FORGENAME at . В этом домене "
 "некоторым сервисам (scm, lists и т.д.) будут присвоены свои собственные "
 "поддомены."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Адрес электронной почты администратора GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Адрес электронной почты администратора @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Введите e-mail адрес администратора GForge для этого сайта. Он будет "
+"Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
 "использован при возникновении проблем."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Имя системы GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Имя системы @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Введите имя системы GForge. Оно используется в разных местах по всей системе."
+"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей системе."
 
 #. Type: string
 #. Description
@@ -279,12 +332,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 "Введите IP-адрес (или имя хоста) сервера, на котором будет расположена база "
-"данных GForge."
+"данных @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -295,9 +352,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Введите имя базы данных, которая будет содержать базу данных GForge."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -308,12 +369,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Введите имя пользователя администратора базы данных для сервера, на котором "
-"будет расположена база данных GForge."
+"будет расположена база данных @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -336,10 +401,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Введите имя хоста сервера, на котором будут располагаться пакеты GForge."
+"Введите имя хоста сервера, на котором будут располагаться пакеты @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -350,13 +420,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Члены административной группы новостей могут утверждать новости для главной "
-"страницы GForge. Данный ID не должен быть равен 1. Он должен быть изменён, "
+"страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен быть изменён, "
 "только если вы обновляетесь с предыдущей версии и хотите сохранить данные."
 
 #. Type: string
@@ -380,22 +455,30 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Введите имя хоста сервера, который будет обслуживать списки почтовых "
-"рассылок GForge."
+"рассылок @FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для GForge."
+"для @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -406,11 +489,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
-"Введите имя сервера, который будет перенаправлять почту пользователей GForge."
+"Введите имя сервера, который будет перенаправлять почту пользователей @FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/dsf-po/sv.po
===================================================================
--- trunk/gforge/debian/dsf-po/sv.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/sv.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE at _4.6.99+svn6580-1_sv\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-07-29 18:44+0200\n"
 "Last-Translator: Martin Ågren <martin.agren at gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -28,136 +28,167 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Skalserver:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för GForge."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Hämtningsserver:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the GForge packages."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla GForge-paketen."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
+msgid ""
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Det ska inte vara samma som huvudvärden för GForge."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Det ska inte vara samma som huvudvärden för @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "GForge-administratörens användarnamn:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "@FORGENAME at -administratörens användarnamn:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Administratörskontot för GForge kommer att ha alla rättigheter i GForge-systemet. "
-"Det behövs för att godkänna skapandet av projekten."
+"Administratörskontot för @FORGENAME@ kommer att ha alla rättigheter i @FORGENAME at -"
+"systemet. Det behövs för att godkänna skapandet av projekten."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Ange användarnamnet för detta konto."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-adress:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Ange IP-adressen för servern som kommer tillhandahålla GForge-installationen."
+msgstr ""
+"Ange IP-adressen för servern som kommer tillhandahålla @FORGENAME at -installationen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "GForge-administratörens lösenord:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "@FORGENAME at -administratörens lösenord:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Mata in lösenordet för detta konto."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Lösenordsbekräftelse:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Mata in lösenordet igen för bekräftelse."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Initiala listan över färdigheter:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge låter användarna definiera en lista över sina färdigheter, som kan "
-"väljas av de som finns i databasen.  Denna lista är den initiala listan "
-"som kommer att läggas in i databasen."
+"@FORGENAME@ låter användarna definiera en lista över sina färdigheter, som kan "
+"väljas av de som finns i databasen.  Denna lista är den initiala listan som "
+"kommer att läggas in i databasen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Mata in namn på färdigheter, separerade med semikolon."
 
@@ -165,15 +196,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Vill du ha en enkel DNS-konfiguration för GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Vill du ha en enkel DNS-konfiguration för @FORGENAME@?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -181,15 +214,16 @@
 "servers."
 msgstr ""
 "Du kan ha en enkel DNS-konfiguration som använder jokertecken för att peka "
-"alla projektwebbplatser till en enda IP-adress och vidaresända alla källkodshanterings"
-"värdar till en enda källkodshanteringsserver, eller en komplex konfiguration som låter "
-"dig ha många servrar som projektwebbservrar eller källkodshanteringsservrar."
+"alla projektwebbplatser till en enda IP-adress och vidaresända alla "
+"källkodshanteringsvärdar till en enda källkodshanteringsserver, eller en "
+"komplex konfiguration som låter dig ha många servrar som projektwebbservrar "
+"eller källkodshanteringsservrar."
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -201,76 +235,100 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Vill du att e-post till ${noreply} ska tas bort?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"GForge skickar och tar emot en mängd e-postmeddelanden till och från "
+"@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
 "adressen \"${noreply}\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
 msgstr ""
-"E-post till den adressen ska pekas mot "
-"ett svart hål (/dev/null) såvida du inte har andra användningsområden för "
-"den adressen."
+"E-post till den adressen ska pekas mot ett svart hål (/dev/null) såvida du "
+"inte har andra användningsområden för den adressen."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Namn på GForge-domänen eller -underdomänen:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Ange den domän som kommer att vara värd för GForge-installationen.  Vissa "
-"tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina egna underdomäner i den domänen."
+"Ange den domän som kommer att vara värd för @FORGENAME at -installationen.  Vissa "
+"tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina egna "
+"underdomäner i den domänen."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "GForge-administratörens e-postadress:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "@FORGENAME at -administratörens e-postadress:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Ange e-postadressen för GForge-administratören på systemet. "
-"Den kommer användas ifall problem uppstår."
+"Ange e-postadressen för @FORGENAME at -administratören på systemet. Den kommer "
+"användas ifall problem uppstår."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "GForges systemnamn:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME at s systemnamn:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
-msgstr "Ange namnet på GForge-systemet. Det används på olika ställen i systemet."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Ange namnet på @FORGENAME at -systemet. Det används på olika ställen i systemet."
 
 #. Type: string
 #. Description
@@ -281,12 +339,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
-"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
-"GForge-databasen."
+"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla @FORGENAME at -"
+"databasen."
 
 #. Type: string
 #. Description
@@ -297,8 +359,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the GForge database."
-msgstr "Ange namnet på databasen som kommer tillhandahålla GForge-databasen."
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
+msgid ""
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Ange namnet på databasen som kommer tillhandahålla @FORGENAME at -databasen."
 
 #. Type: string
 #. Description
@@ -309,12 +376,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
-"Ange användarnamnet på databasadministratören för servers "
-"som kommer tillhandahålla GForge-databasen."
+"Ange användarnamnet på databasadministratören för servers som kommer "
+"tillhandahålla @FORGENAME at -databasen."
 
 #. Type: password
 #. Description
@@ -337,8 +408,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge packages."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla GForge-paketen."
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
 #. Type: string
 #. Description
@@ -349,12 +426,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
-"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för GForges "
+"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för @FORGENAME at s "
 "förstasida.  Detta grupp-id får inte vara 1. Du behöver bara ändra detta "
 "värde om du uppgraderar från en tidigare version och vill behålla ditt data."
 
@@ -379,18 +461,29 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -401,10 +494,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver för användarnas e-post för GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver för "
+"användarnas e-post för @FORGENAME at ."
 
 #. Type: select
 #. Choices
@@ -577,8 +676,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Ange standardtemat för webbsidorna. Detta måste vara ett giltigt "
-"namn."
-
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
+msgstr "Ange standardtemat för webbsidorna. Detta måste vara ett giltigt namn."

Modified: trunk/gforge/debian/dsf-po/templates.pot
===================================================================
--- trunk/gforge/debian/dsf-po/templates.pot	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/templates.pot	2009-06-13 08:56:17 UTC (rev 7833)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+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"
@@ -18,132 +18,133 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
+msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+msgid "@FORGENAME@ administrator login:"
 msgstr ""
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+msgid "@FORGENAME@ administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 
@@ -151,15 +152,15 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -171,7 +172,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -180,21 +181,21 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -203,43 +204,43 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
+msgid "@FORGENAME@ system name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
 
 #. Type: string
@@ -253,7 +254,7 @@
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
 
 #. Type: string
@@ -266,7 +267,8 @@
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
 msgid ""
-"Please enter the name of the database that will host the GForge database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
 
 #. Type: string
@@ -280,7 +282,7 @@
 #: ../dsf-helper/dbhost-variables.templates:4001
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 
 #. Type: password
@@ -305,7 +307,8 @@
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
 
 #. Type: string
@@ -318,8 +321,8 @@
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 
@@ -345,16 +348,16 @@
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 
 #. Type: string
@@ -367,8 +370,8 @@
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 
 #. Type: select

Modified: trunk/gforge/debian/dsf-po/vi.po
===================================================================
--- trunk/gforge/debian/dsf-po/vi.po	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/dsf-po/vi.po	2009-06-13 08:56:17 UTC (rev 7833)
@@ -1,4 +1,4 @@
-# Vietnamese Translation for GForge.
+# Vietnamese Translation for @FORGENAME at .
 # Copyright © 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the @PACKAGE@ 4.6.99+svn6387-1 package.
 # Clytie Siddall <clytie at riverland.net.au>, 2005-2008.
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGE@@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:50+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-29 18:46+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -19,138 +19,166 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Máy phục vụ trình bao :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the hostname of the server that will host the GForge shell "
+"Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ cung cấp các tài khoản trình bao GForge."
+"Hãy gõ tên máy của máy phục vụ sẽ cung cấp các tài khoản trình bao @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Máy phục vụ tải xuống:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#, fuzzy
+#| msgid ""
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the hostname of the server that will host the GForge packages."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ cung cấp các gói GForge."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Hãy gõ tên máy của máy phục vụ sẽ cung cấp các gói @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
-msgid "It should not be the same as the main GForge host."
-msgstr "Không nên trùng với máy chủ GForge chính."
+#, fuzzy
+#| msgid "It should not be the same as the main @FORGENAME@ host."
+msgid "It should not be the same as the main @FORGENAME@ host."
+msgstr "Không nên trùng với máy chủ @FORGENAME@ chính."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-msgid "GForge administrator login:"
-msgstr "Tên đăng nhập quản trị GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator login:"
+msgid "@FORGENAME@ administrator login:"
+msgstr "Tên đăng nhập quản trị @FORGENAME@:"
 
 #. Type: string
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid ""
+#| "The @FORGENAME@ administrator account will have full privileges on the system. "
+#| "It will be used to approve the creation of new projects."
 msgid ""
-"The GForge administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Tài khoản quản trị GForge này sẽ được mọi quyền truy cập hệ thống. Nó dùng "
+"Tài khoản quản trị @FORGENAME@ này sẽ được mọi quyền truy cập hệ thống. Nó dùng "
 "để tán thành việc tạo dự án mới."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Hãy chọn tên người dùng cho tài khoản này."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Địa chỉ IP:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address of the server that will host the @FORGENAME@ "
+#| "installation."
 msgid ""
-"Please enter the IP address of the server that will host the GForge "
+"Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Hãy gõ địa chỉ IP của máy phục vụ sẽ chứa bản cài đặt GForge."
+msgstr "Hãy gõ địa chỉ IP của máy phục vụ sẽ chứa bản cài đặt @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Nó cần để cấu hình dịch vụ ảo Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
-msgid "GForge administrator password:"
-msgstr "Mật khẩu quản trị GForge:"
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#, fuzzy
+#| msgid "@FORGENAME@ administrator password:"
+msgid "@FORGENAME@ administrator password:"
+msgstr "Mật khẩu quản trị @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Hãy chọn mật khẩu cho tài khoản này."
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Xác nhận mật khẩu :"
 
 #. Type: password
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Hãy gõ lại mật khẩu để xác nhận nó."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Danh sách kỹ năng ban đầu :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
+#| "those present in the database. This list is the initial list of skills "
+#| "that will enter the database."
 msgid ""
-"GForge allows users to define a list of their skills, to be chosen from "
+"@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"GForge cho mỗi người dùng có khả năng định nghĩa một danh sách các kỹ năng "
+"@FORGENAME@ cho mỗi người dùng có khả năng định nghĩa một danh sách các kỹ năng "
 "của mình, để được chọn trong các điều nằm trong cơ sở dữ liệu. Danh sách này "
 "là danh sách kỹ năng ban đầu sẽ vào cơ sở dữ liệu."
 
 #. Type: string
 #. Description
-#: ../@PACKAGE at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Hãy gõ danh sách các tên kỹ năng định giới bằng dấu chấm phẩy « ; »."
 
@@ -158,15 +186,17 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
-msgid "Do you want a simple DNS setup for GForge?"
-msgstr "Bạn có muốn thiết lập DNS đơn giản cho GForge không?"
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#, fuzzy
+#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgid "Do you want a simple DNS setup for @FORGENAME@?"
+msgstr "Bạn có muốn thiết lập DNS đơn giản cho @FORGENAME@ không?"
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -182,7 +212,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGE at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -195,21 +225,25 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Bạn có muốn hủy mọi thư được gửi cho ${noreply} không?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
+#, fuzzy
+#| msgid ""
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
+#| "address."
 msgid ""
-"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
-msgstr "GForge gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} »."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
+msgstr "@FORGENAME@ gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} »."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGE at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -220,49 +254,68 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "GForge domain or subdomain name:"
-msgstr "Tên miền hay miền con GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Tên miền hay miền con @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
 msgid ""
-"Please enter the domain that will host the GForge installation. Some "
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
 "services (scm, lists, etc.) will be given their own subdomain in that domain."
 msgstr ""
-"Hãy gõ miền sẽ chứa bản cài đặt GForge. Một số dịch vụ (scm, lists v.v.) sẽ "
+"Hãy gõ miền sẽ chứa bản cài đặt @FORGENAME at . Một số dịch vụ (scm, lists v.v.) sẽ "
 "nhận miền con riêng ở trong miền đó."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "GForge administrator e-mail address:"
-msgstr "Địa chỉ thư của quản trị GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ administrator e-mail address:"
+msgid "@FORGENAME@ administrator e-mail address:"
+msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
+#| "It will be used when problems occur."
 msgid ""
-"Please enter the e-mail address of the GForge administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Hãy gõ địa chỉ thư điện tử của quản trị GForge của địa chỉ Web này. Nó sẽ "
+"Hãy gõ địa chỉ thư điện tử của quản trị @FORGENAME@ của địa chỉ Web này. Nó sẽ "
 "dùng khi gặp vấn đề."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "GForge system name:"
-msgstr "Tên hệ thống GForge:"
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Tên hệ thống @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various places "
+#| "throughout the system."
 msgid ""
-"Please enter the name of the GForge system. It is used in various places "
-"throughout the system."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
 msgstr ""
-"Hãy gõ tên của hệ thống GForge. Nó dùng ở các nơi khác nhau trên khắp hệ "
+"Hãy gõ tên của hệ thống @FORGENAME at . Nó dùng ở các nơi khác nhau trên khắp hệ "
 "thống."
 
 #. Type: string
@@ -274,11 +327,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the IP address (or hostname) of the server that will host "
+#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
-"GForge database."
+"@FORGENAME@ database."
 msgstr ""
-"Hãy gõ địa chỉ IP (hay tên máy) của máy phục vụ sẽ chứa cơ sở dữ liệu GForge."
+"Hãy gõ địa chỉ IP (hay tên máy) của máy phục vụ sẽ chứa cơ sở dữ liệu @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -289,9 +346,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
-"Please enter the name of the database that will host the GForge database."
-msgstr "Hãy gõ tên của cơ sở dữ liệu sẽ chứa cơ sở dữ liệu GForge."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr "Hãy gõ tên của cơ sở dữ liệu sẽ chứa cơ sở dữ liệu @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -302,12 +363,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the username of the database administrator for the server "
+#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
-"will host the GForge database."
+"will host the @FORGENAME@ database."
 msgstr ""
 "Hãy gõ tên người dùng của quản trị cơ sở dữ liệu cho máy phục vụ sẽ chứa cơ "
-"sở dữ liệu GForge."
+"sở dữ liệu @FORGENAME at ."
 
 #. Type: password
 #. Description
@@ -330,9 +395,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "packages."
 msgid ""
-"Please enter the host name of the server that will host the GForge packages."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các gói GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các gói @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -343,13 +413,18 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "The members of the news admin group can approve news for the @FORGENAME@ 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."
 msgid ""
-"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 "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"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."
 msgstr ""
 "Mọi thành viên của nhóm quản trị tin tức có quyền tán thành tin tức để hiển "
-"thị trên trang chính GForge. ID nhóm (GID) này PHẢI khác với số 1. Thay đổi "
+"thị trên trang chính @FORGENAME at . ID nhóm (GID) này PHẢI khác với số 1. Thay đổi "
 "nó chỉ nếu bạn nâng cấp từ phiên bản cũ và muốn giữ lại dữ liệu."
 
 #. Type: string
@@ -373,18 +448,26 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "mailing lists."
 msgid ""
-"Please enter the host name of the server that will host the GForge mailing "
-"lists."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các hộp thư chung GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
+msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các hộp thư chung @FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
+#| "accounts."
 msgid ""
-"Please enter the host name of the server that will host the GForge shell "
-"accounts."
-msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao GForge."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
+msgstr "Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -395,12 +478,16 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the host name of the server that will host the @FORGENAME@ user "
+#| "mail redirector."
 msgid ""
-"Please enter the host name of the server that will host the GForge user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Hãy gõ tên máy của máy phục vụ sẽ chứa bộ chuyển hướng thư tín người dùng "
-"GForge."
+"@FORGENAME at ."
 
 #. Type: select
 #. Choices

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2009-06-12 18:13:05 UTC (rev 7832)
+++ trunk/gforge/debian/rules	2009-06-13 08:56:17 UTC (rev 7833)
@@ -8,7 +8,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=$(shell dh_listpackages | head -1)
+#PACKAGE=$(shell dh_listpackages | head -1)
+PACKAGE=gforge
 FORGENAME=FusionForge
 include /usr/share/dpatch/dpatch.make
 
@@ -69,8 +70,7 @@
 #$(foreach PO,$(wildcard debian/dsf-po/*.po), cp $(PO) debian/po ; ) 
 
 debian/po/templates.pot: $(POFILES) $(wildcard debian/dsf-in/*.templates.dsfh-in) $(wildcard debian/dsf-helper/*.templates)
-	perl $(CURDIR)/deb-specific/dsf-helper.pl
-	@debconf-updatepo
+	@debconf-updatepo --podir=debian/dsf-po
 
 debian/po/%:
 	cat $(patsubst debian/po/%,debian/dsf-po/%,$@) | sed 's/@PACKAGE@/$(PACKAGE)/g' | sed 's/@FORGENAME@/$(FORGENAME)/g' > $@




More information about the Fusionforge-commits mailing list