[Fusionforge-commits] r15601 - in branches/Branch_5_2: . src/common/include src/deb-specific src/debian/dsf-helper src/debian/dsf-in src/debian/dsf-po src/plugins/authopenid/bin src/plugins/contribtracker/bin src/plugins/externalsearch/bin src/plugins/extratabs/bin src/plugins/extsubproj/bin src/plugins/forumml/bin src/plugins/globaldashboard/bin src/plugins/globalsearch/bin src/plugins/helloworld/bin src/plugins/hudson/bin src/plugins/mailman/bin src/plugins/mantisbt/bin src/plugins/mediawiki/bin src/plugins/oauthprovider/bin src/plugins/projectlabels/bin src/plugins/projects-hierarchy/bin src/plugins/scmdarcs/bin src/plugins/scmgit/bin src/plugins/soapadmin/bin src/utils

Roland Mas lolando at fusionforge.org
Tue May 29 18:50:50 CEST 2012


Author: lolando
Date: 2012-05-29 18:50:48 +0200 (Tue, 29 May 2012)
New Revision: 15601

Removed:
   branches/Branch_5_2/src/debian/dsf-helper/common-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/common-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.config
   branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postinst
   branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postrm
   branches/Branch_5_2/src/debian/dsf-helper/host-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/host-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/lists-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/lists-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.templates
   branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates
Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/common/include/config-vars.php
   branches/Branch_5_2/src/deb-specific/db-convert-to-unicode.pl
   branches/Branch_5_2/src/deb-specific/gforge-inject.pl
   branches/Branch_5_2/src/deb-specific/old-db-upgrade.pl
   branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config
   branches/Branch_5_2/src/debian/dsf-in/db-postgresql.postinst
   branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates
   branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates
   branches/Branch_5_2/src/debian/dsf-po/POTFILES.in
   branches/Branch_5_2/src/debian/dsf-po/cs.po
   branches/Branch_5_2/src/debian/dsf-po/de.po
   branches/Branch_5_2/src/debian/dsf-po/es.po
   branches/Branch_5_2/src/debian/dsf-po/fi.po
   branches/Branch_5_2/src/debian/dsf-po/fr.po
   branches/Branch_5_2/src/debian/dsf-po/gl.po
   branches/Branch_5_2/src/debian/dsf-po/nl.po
   branches/Branch_5_2/src/debian/dsf-po/pt.po
   branches/Branch_5_2/src/debian/dsf-po/ru.po
   branches/Branch_5_2/src/debian/dsf-po/sv.po
   branches/Branch_5_2/src/debian/dsf-po/templates.pot
   branches/Branch_5_2/src/debian/dsf-po/vi.po
   branches/Branch_5_2/src/plugins/authopenid/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/authopenid/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/contribtracker/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/contribtracker/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/externalsearch/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/externalsearch/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/extratabs/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/extratabs/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/extsubproj/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/extsubproj/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/forumml/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/globaldashboard/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/globaldashboard/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/globalsearch/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/globalsearch/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/helloworld/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/helloworld/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/hudson/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/hudson/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/mailman/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/mailman/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/mantisbt/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/mantisbt/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/mediawiki/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/mediawiki/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/oauthprovider/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/oauthprovider/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/projectlabels/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/projectlabels/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/scmdarcs/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/scmdarcs/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/scmgit/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/scmgit/bin/db-upgrade.pl
   branches/Branch_5_2/src/plugins/soapadmin/bin/db-delete.pl
   branches/Branch_5_2/src/plugins/soapadmin/bin/db-upgrade.pl
   branches/Branch_5_2/src/utils/include.pl
Log:
Removed unused variables

Modified: branches/Branch_5_2/src/common/include/config-vars.php
===================================================================
--- branches/Branch_5_2/src/common/include/config-vars.php	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/common/include/config-vars.php	2012-05-29 16:50:48 UTC (rev 15601)
@@ -103,7 +103,6 @@
 	forge_set_config_item_bool ('use_project_database', 'core') ;
 	forge_define_config_item ('use_project_multimedia', 'core', $GLOBALS['sys_use_project_multimedia']) ;
 	forge_set_config_item_bool ('use_project_multimedia', 'core') ;
-	forge_define_config_item ('download_host', 'core', $GLOBALS['sys_download_host']) ;
 	forge_define_config_item ('shell_host', 'core', $GLOBALS['sys_shell_host']) ;
 	forge_define_config_item ('users_host', 'core', $GLOBALS['sys_users_host']) ;
 	forge_define_config_item ('lists_host', 'core', $GLOBALS['sys_lists_host']) ;

Modified: branches/Branch_5_2/src/deb-specific/db-convert-to-unicode.pl
===================================================================
--- branches/Branch_5_2/src/deb-specific/db-convert-to-unicode.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/deb-specific/db-convert-to-unicode.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 
 sub debug ( $ ) ;

Modified: branches/Branch_5_2/src/deb-specific/gforge-inject.pl
===================================================================
--- branches/Branch_5_2/src/deb-specific/gforge-inject.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/deb-specific/gforge-inject.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -16,13 +16,13 @@
 use DBI ;
 use Data::Dumper ;
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 
 sub debug ( $ ) ;

Modified: branches/Branch_5_2/src/deb-specific/old-db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/deb-specific/old-db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/deb-specific/old-db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -14,13 +14,13 @@
 use Digest::MD5 ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_scm_host $sys_download_host
+use vars qw/$sys_default_domain $sys_scm_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $libdir $sqldir/ ;
 
 $libdir="/usr/share/gforge/lib";

Deleted: branches/Branch_5_2/src/debian/dsf-helper/common-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/common-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/common-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,23 +0,0 @@
-#- beginning of included section from common-variables.config
-db_get @PACKAGE@/shared/domain_name || true
-if [ -z "$RET" ] ; then
-   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
-   db_set @PACKAGE@/shared/domain_name $hostname
-fi
-db_input medium @PACKAGE@/shared/domain_name || true
-db_go || true
-
-db_get @PACKAGE@/shared/server_admin || true
-if [ -z "$RET" ] ; then
-  db_get @PACKAGE@/shared/domain_name || true
-  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
-fi
-
-db_input medium @PACKAGE@/shared/server_admin || true
-db_input low @PACKAGE@/shared/system_name || true
-
-db_go || true
-
-vars="system_name domain_name server_admin"
-update_mainconffile $vars
-#- end of included section from common-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/common-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/common-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/common-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,28 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/domain_name
-Type: string
-_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: @PACKAGE@/shared/server_admin
-Type: string
-_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: @PACKAGE@/shared/system_name
-Type: string
-Default: @FORGENAME@
-_Description: @FORGENAME@ system name:
- Please enter the name of the @FORGENAME@ system. It is used in various places
- throughout the system.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,16 +0,0 @@
-#- beginning of included section from dbhost-variables.config
-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 @PACKAGE@/shared/db_name seen || true
-db_input medium @PACKAGE@/shared/db_name || true
-
-db_fget @PACKAGE@/shared/db_user seen || true
-db_input medium @PACKAGE@/shared/db_user || true
-
-db_go || true
-
-vars="db_host db_name db_user"
-update_mainconffile $vars
-#- end of included section from dbhost-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/dbhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,27 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/db_host
-Type: string
-_Description: Database server:
- Please enter the IP address (or hostname) of the server that will
- host the @FORGENAME@ database.
-
-Template: @PACKAGE@/shared/db_name
-Type: string
-Default: @PACKAGE@
-_Description: Database name:
- Please enter the name of the database that will host the @FORGENAME@ database.
-
-Template: @PACKAGE@/shared/db_user
-Type: string
-Default: @PACKAGE@
-_Description: Database administrator username:
- Please enter the username of the database administrator for the server
- that will host the @FORGENAME@ database.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,25 +0,0 @@
-#- beginning of included section from dbpasswd-variables.config
-db_fget @PACKAGE@/shared/db_password seen || true
-if [ "$RET" = "false" ]; then
-    pw=$(gen_random_pw)
-    if [ -e /etc/gforge/config.ini.d/debian-install-secrets.ini ]; then
-        pw=$(grep '^database_password=' /etc/gforge/config.ini.d/debian-install-secrets.ini | sed 's/database_password=//')
-        echo "Since you asked not to see all the debconf questions, I reused the" 
-	echo "password for the database that was already set in "
-	echo "/etc/gforge/config.ini.d/debian-install-secrets.ini."
-	echo "Use it if you want to have a peek at the database by hand."
-    else
-        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 '$pw'."
-    fi    
-    db_set @PACKAGE@/shared/db_password $pw
-    db_get @PACKAGE@/shared/db_password || true
-    db_fset @PACKAGE@/shared/db_password seen true
-fi
-
-db_go || true
-
-vars="db_password"
-update_mainconffile $vars
-#- end of included section from dbpasswd-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/dbpasswd-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,20 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-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: @PACKAGE@/shared/db_password_confirm
-Type: password
-_Description: Password confirmation:
- Please re-type the password for confirmation.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,13 +0,0 @@
-#- beginning of included section from downloadhost-variables.config
-db_fget @PACKAGE@/shared/download_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/download_host download.$RET
-fi
-
-db_input low @PACKAGE@/shared/download_host || true
-db_go || true
-
-vars="download_host"
-update_mainconffile $vars
-#- end of included section from downloadhost-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/downloadhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,15 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/download_host
-Type: string
-_Description: Download server:
- Please enter the host name of the server that will host the @FORGENAME@ packages.
- .
- It should not be the same as the main @FORGENAME@ host.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/ftpuploadhost seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/ftpuploadhost upload.$RET
-fi
-
-db_input low @PACKAGE@/shared/ftpuploadhost || true
-db_go || true
-
-vars="ftpuploadhost"
-update_mainconffile $vars

Deleted: branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/ftpuploadhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,5 +0,0 @@
-Template: @PACKAGE@/shared/ftpuploadhost
-Type: string
-_Description: Your upload server for released files:
- The hostname of the server where you will upload files
- to release

Deleted: branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,10 +0,0 @@
-#- beginning of included section from groupid-variables.config
-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
-
-vars="newsadmin_groupid statsadmin_groupid peerrating_groupid"
-update_mainconffile $vars
-#- end of included section from groupid-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/groupid-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,26 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-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 @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: @PACKAGE@/shared/statsadmin_groupid
-Type: string
-Default: 3
-_Description: Statistics administrative group ID:
-
-Template: @PACKAGE@/shared/peerrating_groupid
-Type: string
-Default: 4
-_Description: Peer rating administrative group ID:

Deleted: branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,63 +0,0 @@
-#- beginning of included section from handle-mainconffile.config
-###
-# Functions to handle the main @FORGENAME@ configuration file
-###
-mainconfdir=/etc/@PACKAGE@
-mainconffile=$mainconfdir/@PACKAGE at .conf
-create_mainconffile () {
-    if [ ! -e $mainconfdir ] ; then
-	mkdir -p $mainconfdir
-    fi
-    if [ ! -e $mainconffile ] ; then
-	if [ -e /etc/gforge/gforge.conf ] ; then
-	    cp -a /etc/gforge/gforge.conf $mainconffile
-	else
-            touch $mainconffile
-	fi
-        chmod 600 $mainconffile
-    fi
-}
-init_debconf_from_mainconffile () {
-    for i in $(grep -v "^ *#" $mainconffile | sort -u | cut -d= -f1) ; do
-	update_onevar_from_mainconfile $i
-    done
-}
-update_onevar_from_mainconfile () {
-    key=$1
-    update_onevar_from_mainconfile__retcode=0
-    value=$(grep ^$key= $mainconffile | tail -1 | cut -d= -f2-)
-    if [ ! -z "$value" ] ; then
-	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 @PACKAGE@/shared/$key seen true || true
-# 	    ;;
-# 	10)
-# 	    echo "$key = $value not injected into Debconf (non-existing question maybe?)"
-# 	    ;;
-# 	*)
-# 	    echo "Something wicked happened"
-# 	    exit 1
-# 	    ;;
-#     esac
-    fi
-}
-update_mainconffile () {
-    for key in $@ ; do
-	db_get @PACKAGE@/shared/$key
-	val=$RET
-	update_onevar_mainconffile $key $val
-    done
-}
-update_onevar_mainconffile () {
-    key=$1
-    val=$2
-    if grep -q "^$key=" $mainconffile ; then
-	newval=$(echo $val | sed -e 's/@/\\@/g' -e 's/\$/\\$/g' -e 's/\//\\\//g')
-	perl -pi -e "s/^$key=.*/$key=$newval/" $mainconffile
-    else
-	echo "$key=$val" >> $mainconffile
-    fi
-}
-#- end of included section from handle-mainconffile.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postinst
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postinst	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postinst	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,35 +0,0 @@
-###
-# Functions to handle the main @FORGENAME@ configuration file
-###
-mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
-# Update it for the variables received as parameters
-create_mainconffile () {
-    if [ ! -e $mainconffile ] ; then
-        touch $mainconffile
-        chmod 600 $mainconffile
-    fi
-}
-update_mainconffile () {
-    for key in $@ ; do
-	db_get @PACKAGE@/shared/$key
-	val=$RET
-	update_onevar_mainconffile $key $val
-    done
-}
-update_onevar_mainconfile () {
-    key=$1
-    val=$2
-    if grep -q "^$key=" $mainconffile ; then
-	newval=$(echo $val | sed -e 's/@/\\@/g' -e 's/\$/\\$/g' -e 's/\//\\\//g')
-	perl -pi -e "s/^$key=.*/$key=$newval/" $mainconffile
-    else
-	echo "$key=$val" >> $mainconffile
-    fi
-}
-add_onevar_mainconfile () {
-    key=$1
-    val=$2
-    if ! grep -q "^$key=" $mainconffile ; then
-	echo "$key=$val" >> $mainconffile
-    fi
-}

Deleted: branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postrm
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postrm	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/handle-mainconffile.postrm	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,8 +0,0 @@
-###
-# Functions to handle the main @FORGENAME@ confguration file
-###
-mainconffile=/etc/@PACKAGE@/@PACKAGE at .conf
-# Delete the main configuration file
-delete_mainconffile () {
-    rm -f $mainconffile
-}

Deleted: branches/Branch_5_2/src/debian/dsf-helper/host-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/host-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/host-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,15 +0,0 @@
-#- beginning of included section from host-variables.config
-db_fget @PACKAGE@/shared/ip_address seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/ip_address $(hostname -i | cut -f1 -d" ")
-fi
-
-db_input medium @PACKAGE@/shared/ip_address || true
-db_input medium @PACKAGE@/shared/server_admin || true
-db_go || true
-
-
-vars="ip_address server_admin"
-update_mainconffile $vars
-#- end of included section from host-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/host-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/host-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/host-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/ip_address
-Type: string
-_Description: IP address:
- Please enter the IP address of the server that will host the @FORGENAME@
- installation.
- .
- This is needed for the configuration of Apache virtual hosting.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/jabber_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/jabber_host jabber.$RET
-fi
-
-db_input low @PACKAGE@/shared/jabber_host || true
-db_go || true
-
-vars="jabber_host"
-update_mainconffile $vars

Deleted: branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/jabberhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,4 +0,0 @@
-Template: @PACKAGE@/shared/jabber_host
-Type: string
-_Description: Your jabber server:
- The hostname of the server that will host your Jabber server

Deleted: branches/Branch_5_2/src/debian/dsf-helper/lists-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/lists-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/lists-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,14 +0,0 @@
-#- beginning of included section from lists-variables.config
-db_fget @PACKAGE@/shared/lists_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/lists_host lists.$RET
-fi
-
-db_input medium @PACKAGE@/shared/lists_host || true
-
-db_go || true
-
-vars="lists_host"
-update_mainconffile $vars
-#- end of included section from lists-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/lists-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/lists-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/lists-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/lists_host
-Type: string
-_Description: Mailing lists server:
- Please enter the host name of the server that will host the @FORGENAME@
- mailing lists.
- .
- It should not be the same as the main @FORGENAME@ host.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,13 +0,0 @@
-#- beginning of included section from shellhost-variables.config
-db_fget @PACKAGE@/shared/shell_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/shell_host shell.$RET
-fi
-
-db_input low @PACKAGE@/shared/shell_host || true
-db_go || true
-
-vars="shell_host"
-update_mainconffile $vars
-#- end of included section from shellhost-variables.config

Deleted: branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/shellhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,14 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# debian-l10n-english at lists.debian.org for advice.
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: @PACKAGE@/shared/shell_host
-Type: string
-_Description: Shell server:
- Please enter the host name of the server that will host the @FORGENAME@
- shell accounts.

Deleted: branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,11 +0,0 @@
-db_fget @PACKAGE@/shared/upload_host seen || true
-if [ "$RET" = "false" ] ; then
-    db_get @PACKAGE@/shared/domain_name
-    db_set @PACKAGE@/shared/upload_host upload.$RET
-fi
-
-db_input low @PACKAGE@/shared/upload_host || true
-db_go || true
-
-vars="upload_host"
-update_mainconffile $vars

Deleted: branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-helper/uploadhost-variables.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,5 +0,0 @@
-Template: @PACKAGE@/shared/upload_host
-Type: string
-_Description: Your upload server:
- The hostname of the server where you will upload files available
- in ftp space

Modified: branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.config	2012-05-29 16:50:48 UTC (rev 15601)
@@ -3,16 +3,8 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:handle-mainconffile#
-
-create_mainconffile
-init_debconf_from_mainconffile
-
 #DSFHELPER:get-pw-from-debconf#
 #DSFHELPER:create-random-pw#
-#DSFHELPER:common-variables#
-#DSFHELPER:dbhost-variables#
-#DSFHELPER:dbpasswd-variables#
 
 db_fget @PACKAGE@/shared/admin_password seen || true
 if [ "$RET" = "false" ]; then
@@ -26,8 +18,4 @@
 fi
 
 db_go || true
-
-vars="admin_password"
-update_mainconffile $vars
-
 db_stop

Modified: branches/Branch_5_2/src/debian/dsf-in/db-postgresql.postinst
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/db-postgresql.postinst	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.postinst	2012-05-29 16:50:48 UTC (rev 15601)
@@ -51,11 +51,8 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:handle-mainconffile#
 case "$1" in
     configure)
-	add_onevar_mainconfile default_trove_cat 18
-
         # Patch DB configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure-files
 

Modified: branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -7,34 +7,6 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-#DSFHELPER:common-variables#
-
-Template: @PACKAGE@/shared/shell_host
-Type: string
-_Description: Shell server:
- Please enter the hostname of the server that will host the @FORGENAME@
- shell accounts.
-
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/download_host
-Type: string
-_Description: Download server:
- Please enter the hostname of the server that will host the @FORGENAME@
- packages. 
- .
- It should not be the same as the main @FORGENAME@ host.
-
-#DSFHELPER:dbpasswd-variables#
-
-Template: @PACKAGE@/shared/ip_address
-Type: string
-_Description: IP address:
- 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: @PACKAGE@/shared/admin_password
 Type: password
 _Description: @FORGENAME@ administrator password:
@@ -48,8 +20,4 @@
 _Description: Password confirmation:
  Please re-type the password for confirmation.
 
-#DSFHELPER:dbhost-variables#
-
-#DSFHELPER:groupid-variables#
-
 #DSFHELPER:ucf-choices#

Modified: branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -7,11 +7,6 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-#DSFHELPER:common-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:host-variables#
-
 Template: @PACKAGE@/shared/simple_dns
 Type: boolean
 Default: false

Deleted: branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,8 +0,0 @@
-#DSFHELPER:host-variables#
-#DSFHELPER:uploadhost-variables#
-#DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#
-#DSFHELPER:lists-variables#
-#DSFHELPER:shellhost-variables#
-#DSFHELPER:groupid-variables#
-#DSFHELPER:dbpasswd-variables#

Modified: branches/Branch_5_2/src/debian/dsf-po/POTFILES.in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/POTFILES.in	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/POTFILES.in	2012-05-29 16:50:48 UTC (rev 15601)
@@ -1,10 +1,3 @@
 [type: gettext/rfc822deb] dsf-in/common.templates
 [type: gettext/rfc822deb] dsf-in/db-postgresql.templates
 [type: gettext/rfc822deb] dsf-in/dns-bind9.templates
-[type: gettext/rfc822deb] dsf-helper/common-variables.templates
-[type: gettext/rfc822deb] dsf-helper/dbhost-variables.templates
-[type: gettext/rfc822deb] dsf-helper/dbpasswd-variables.templates
-[type: gettext/rfc822deb] dsf-helper/groupid-variables.templates
-[type: gettext/rfc822deb] dsf-helper/host-variables.templates
-[type: gettext/rfc822deb] dsf-helper/lists-variables.templates
-[type: gettext/rfc822deb] dsf-helper/shellhost-variables.templates

Modified: branches/Branch_5_2/src/debian/dsf-po/cs.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/cs.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/cs.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -27,7 +27,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
@@ -36,7 +35,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Please enter the domain that will host the @FORGENAME@ installation. Some "
@@ -52,7 +50,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -61,7 +58,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -73,84 +69,9 @@
 "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
-#. Description
-#: ../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
-#: ../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 ""
-"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Server pro stahování:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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 "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP adresa:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr ""
-"Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -158,7 +79,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -172,7 +93,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -180,15 +101,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Potvrzení hesla:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Zadejte heslo ještě jednou pro potvrzení."
 
@@ -196,7 +115,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -206,7 +125,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -222,7 +141,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -232,175 +151,168 @@
 "Nastavení bude pouze předpokládat, budete mít všechny adresáře s weby "
 "projektů na jednom počítači a že pro SCM použijete jediný server."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Emailová adresa správce @FORGENAME@:"
+#~| 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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . Adresa "
-"se použije v případě výskytu problémů."
+#~| 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 ""
+#~ "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/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databázový server:"
+#~ msgid "Download server:"
+#~ msgstr "Server pro stahování:"
 
-#. 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 "
-"@FORGENAME@ database."
-msgstr ""
-"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši "
-"@FORGENAME@ databázi."
+#~| 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 "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Jméno databáze:"
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Database server:"
+#~ msgstr "Databázový server:"
+
 #, 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 ""
-"Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
+#~| 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 ""
+#~ "Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši "
+#~ "@FORGENAME@ databázi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Uživatelské jméno správce databáze:"
+#~ msgid "Database name:"
+#~ msgstr "Jméno databáze:"
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Zadejte prosím uživatelské jméno správce databáze na serveru, který bude "
-"hostit databázi @FORGENAME at ."
+#~| 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 ""
+#~ "Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Heslo pro připojení do databáze:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Uživatelské jméno správce databáze:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Připojení do databáze je ověřováno heslem."
+#, 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 ""
+#~ "Zadejte prosím uživatelské jméno správce databáze na serveru, který bude "
+#~ "hostit databázi @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Zadejte zde prosím heslo pro připojení."
+#~ msgid "Password used for the database:"
+#~ msgstr "Heslo pro připojení do databáze:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID skupiny správců novinek:"
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Připojení do databáze je ověřováno heslem."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
+#~ msgid "Please choose the connection password."
+#~ msgstr "Zadejte zde prosím heslo pro připojení."
+
+#~ msgid "IP address:"
+#~ msgstr "IP adresa:"
+
 #, 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 ""
-"Členové správcovské skupiny pro novinky mohou schvalovat novinky pro hlavní "
-"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."
+#~| 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 ""
+#~ "Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID skupiny správců pro statistiky:"
+#~ 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: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID skupiny správců pro hodnocení:"
+#~ msgid "Shell server:"
+#~ msgstr "Server se shellovými účty:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Server pro poštovní konference:"
+#, 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 ""
+#~ "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
+#~ msgid "Mailing lists server:"
+#~ msgstr "Server pro poštovní konference:"
+
 #, 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 ""
-"Zadejte prosím jméno serveru, který bude hostit poštovní konference "
-"@FORGENAME at ."
+#~| 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 ""
+#~ "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 @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
+#~| 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 ""
+#~ "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID skupiny správců novinek:"
+
 #, 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 ""
+#~ "Členové správcovské skupiny pro novinky mohou schvalovat novinky pro "
+#~ "hlavní 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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID skupiny správců pro statistiky:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID skupiny správců pro hodnocení:"
+
+#, fuzzy
+#~| msgid ""
 #~| "Please enter the host name of the server that will host the @FORGENAME@ "
 #~| "packages."
 #~ msgid ""

Modified: branches/Branch_5_2/src/debian/dsf-po/de.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/de.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/de.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+0200\n"
 "PO-Revision-Date: 2009-12-27 09:30+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -18,14 +18,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -37,7 +35,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@/FusionForge system name:"
 msgid "@FORGENAME@ system name:"
@@ -46,7 +43,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
@@ -54,82 +50,15 @@
 "Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
 "verschiedenen Stellen im ganzen System verwendet."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Shell-Server:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"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 @FORGENAME at -Shell-"
-"Konten beherbergen wird."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Download-Server:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
-"Pakete beherbergen wird."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr ""
-"Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
-"übereinstimmen."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-Adresse:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"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 @FORGENAME at -"
-"Installation beherbergen wird."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -144,7 +73,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -152,15 +81,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Bestätigung des Passworts:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Bitte geben Sie zur Bestätigung das Passwort erneut ein."
 
@@ -168,7 +95,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Möchten Sie eine einfache DNS-Installation für @FORGENAME@?"
 
@@ -176,7 +103,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -192,7 +119,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -203,148 +130,134 @@
 "angenommen, dass sich alle Webverzeichnisse der Projekte auf dem gleichen "
 "Server mit einem einzelnen Server für SCM befinden."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"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 @FORGENAME at -Administrators Ihrer Site "
-"an. Diese wird beim Auftritt von Problemen benötigt."
+#~ msgid ""
+#~ "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 @FORGENAME at -Administrators Ihrer "
+#~ "Site an. Diese wird beim Auftritt von Problemen benötigt."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Datenbank-Server:"
+#~ msgid "Download server:"
+#~ msgstr "Download-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Bitte geben Sie die IP-Adresse (oder den Rechnernamen) des Servers ein, der "
-"die @FORGENAME at -Datenbank beherbergen wird."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+#~ "Pakete beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Datenbankname:"
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr ""
+#~ "Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
+#~ "übereinstimmen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
-"beherbergen wird."
+#~ msgid "Database server:"
+#~ msgstr "Datenbank-Server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Name des Administrators der Datenbank:"
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Bitte geben Sie die IP-Adresse (oder den Rechnernamen) des Servers ein, "
+#~ "der die @FORGENAME at -Datenbank beherbergen wird."
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Bitte geben Sie den Benutzernamen des Datenbankadministrators für den Server "
-"ein, der die @FORGENAME at -Datenbank beherbergen wird."
+#~ msgid "Database name:"
+#~ msgstr "Datenbankname:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Für die Datenbank verwendetes Passwort:"
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
+#~ "beherbergen wird."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Verbindungen zum Datenbank-System werden durch ein Passwort authentifiziert."
+#~ msgid "Database administrator username:"
+#~ msgstr "Name des Administrators der Datenbank:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Bitte wählen Sie das Passwort für Verbindungen aus."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Bitte geben Sie den Benutzernamen des Datenbankadministrators für den "
+#~ "Server ein, der die @FORGENAME at -Datenbank beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID der News-Administrators-Gruppe:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Für die Datenbank verwendetes Passwort:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-"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."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Verbindungen zum Datenbank-System werden durch ein Passwort "
+#~ "authentifiziert."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID der Statistik-Administratorgruppe:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Bitte wählen Sie das Passwort für Verbindungen aus."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID der »peer rating«-Administratorgruppe:"
+#~ msgid "IP address:"
+#~ msgstr "IP-Adresse:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Mailinglisten-Server:"
+#~ msgid ""
+#~ "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 @FORGENAME at -"
+#~ "Installation beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 @FORGENAME at -"
-"Mailinglisten beherbergen wird."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr ""
+#~ "Diese wird für die virtualhosting-Konfiguration des Apache benötigt."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"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 @FORGENAME at -Shell-"
-"Konten beherbergen wird."
+#~ msgid "Shell server:"
+#~ msgstr "Shell-Server:"
 
 #~ msgid ""
+#~ "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 @FORGENAME at -"
+#~ "Shell-Konten beherbergen wird."
+
+#~ msgid "Mailing lists server:"
+#~ msgstr "Mailinglisten-Server:"
+
+#~ msgid ""
 #~ "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 @FORGENAME at -"
+#~ "Mailinglisten beherbergen wird."
+
+#~ msgid ""
+#~ "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 @FORGENAME at -"
+#~ "Shell-Konten beherbergen wird."
+
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID der News-Administrators-Gruppe:"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID der Statistik-Administratorgruppe:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID der »peer rating«-Administratorgruppe:"
+
+#~ msgid ""
+#~ "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 @FORGENAME at -"

Modified: branches/Branch_5_2/src/debian/dsf-po/es.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/es.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/es.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -31,7 +31,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.7~rc2-7\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -43,7 +43,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
@@ -52,7 +51,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Please enter the domain that will host the @FORGENAME@ installation. Some "
@@ -68,7 +66,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -77,7 +74,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -89,87 +85,9 @@
 "Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
 "del sistema."
 
-#. Type: string
-#. Description
-#: ../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
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Servidor de descargas:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Dirección IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr ""
-"Introduzca la dirección IP del servidor que albergará la instalación de "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -177,7 +95,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -191,7 +109,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -199,15 +117,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación de la contraseña:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Escriba nuevamente la contraseña para su confirmación."
 
@@ -215,7 +131,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -225,7 +141,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -242,7 +158,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -253,180 +169,176 @@
 "que todos los directorios web de los proyectos están en el mismo servidor y "
 "que tiene un único servidor para SCM."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Dirección de correo electrónico del administrador de @FORGENAME@:"
+#~| 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
 #, 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."
+#~| 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/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de datos:"
+#~ msgid "Download server:"
+#~ msgstr "Servidor de descargas:"
 
-#. 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 "
-"@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 ."
+#~| 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nombre de la base de datos:"
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de datos:"
+
 #, 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 ."
+#~| 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
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nombre de usuario del administrador de la base de datos:"
+#~ msgid "Database name:"
+#~ msgstr "Nombre de la base de datos:"
 
-#. 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 @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 ."
+#~| 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: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Contraseña de la base de datos:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nombre de usuario del administrador de la base de datos:"
 
-#. Type: password
-#. 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."
+#, 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
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Escriba la contraseña de conexión."
+#~ msgid "Password used for the database:"
+#~ msgstr "Contraseña de la base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID del grupo de administración de las noticias:"
+#~ 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."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
+#~ msgid "Please choose the connection password."
+#~ msgstr "Escriba la contraseña de conexión."
+
+#~ msgid "IP address:"
+#~ msgstr "Dirección IP:"
+
 #, 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."
+#~| 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
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID del grupo de administración de estadísticas:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Es necesario para la configuración del servidor virtual de Apache."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID del grupo de administradores de las calificaciones comunitarias:"
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de la consola:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de las listas de correo:"
+#, 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
-#: ../dsf-helper/lists-variables.templates:2001
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de las listas de correo:"
+
 #, 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 ."
+#~| 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
 #, 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 ."
+#~| 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 ."
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID del grupo de administración de las noticias:"
+
 #, 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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID del grupo de administración de estadísticas:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID del grupo de administradores de las calificaciones comunitarias:"
+
+#, fuzzy
+#~| msgid ""
 #~| "Please enter the host name of the server that will host the @FORGENAME@ "
 #~| "packages."
 #~ msgid ""

Modified: branches/Branch_5_2/src/debian/dsf-po/fi.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/fi.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/fi.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -16,7 +16,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
@@ -25,7 +24,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Please enter the domain that will host the @FORGENAME@ installation. Some "
@@ -42,7 +40,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -51,7 +48,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -63,83 +59,9 @@
 "Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
 "järjestelmää."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Komentorivipalvelin:"
-
-#. Type: string
-#. Description
-#: ../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 ""
-"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Latauspalvelin:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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 "Anna @FORGENAME at -paketteja isännöivän palvelimen verkkonimi."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-osoite:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr "Anna @FORGENAME at -asennusta isännöivän palvelimen IP-osoite."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -147,7 +69,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -161,7 +83,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -169,15 +91,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Salasanan vahvistus:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Anna salasana uudestaan vahvistukseksi."
 
@@ -185,7 +105,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -195,7 +115,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -212,7 +132,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -223,172 +143,163 @@
 "projektien verkkohakemistot ovat samalla palvelimella yhden "
 "versionhallintapalvelimen kanssa."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "@FORGENAME at n ylläpidon sähköpostiosoite:"
+#~| 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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Anna @FORGENAME at n ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia "
-"ilmaantuu."
+#~| 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 ""
+#~ "Anna @FORGENAME at n ylläpidon sähköpostiosoite. Tätä käytetään, kun "
+#~ "ongelmia ilmaantuu."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Tietokantapalvelin:"
+#~ msgid "Download server:"
+#~ msgstr "Latauspalvelin:"
 
-#. 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 "
-"@FORGENAME@ database."
-msgstr ""
-"Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai "
-"verkkonimi)."
+#~| 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 "Anna @FORGENAME at -paketteja isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Tietokannan nimi:"
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Database server:"
+#~ msgstr "Tietokantapalvelin:"
+
 #, 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 "Anna @FORGENAME at n tietokantaa isännöivän tietokannan nimi."
+#~| 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 ""
+#~ "Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai "
+#~ "verkkonimi)."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Tietokannan ylläpitotunnus:"
+#~ msgid "Database name:"
+#~ msgstr "Tietokannan nimi:"
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Anna @FORGENAME at n tietokantaa isännöivän palvelimen tietokannan "
-"ylläpitokäyttäjätunnus."
+#~| 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 "Anna @FORGENAME at n tietokantaa isännöivän tietokannan nimi."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Tietokannan salasana:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Tietokannan ylläpitotunnus:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Yhteydet tietokantaan todennetaan salasanalla."
+#, 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 ""
+#~ "Anna @FORGENAME at n tietokantaa isännöivän palvelimen tietokannan "
+#~ "ylläpitokäyttäjätunnus."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Anna yhteyssalasana."
+#~ msgid "Password used for the database:"
+#~ msgstr "Tietokannan salasana:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Uutisten ylläpitäjäryhmän ID:"
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Yhteydet tietokantaan todennetaan salasanalla."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
+#~ msgid "Please choose the connection password."
+#~ msgstr "Anna yhteyssalasana."
+
+#~ msgid "IP address:"
+#~ msgstr "IP-osoite:"
+
 #, 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 ""
-"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."
+#~| 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 "Anna @FORGENAME at -asennusta isännöivän palvelimen IP-osoite."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Tilastojen ylläpitäjäryhmän ID:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Tätä tarvitaan Apachen näennäiskoneiden asetukseen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Vertaisarvioiden ylläpitäjäryhmän ID:"
+#~ msgid "Shell server:"
+#~ msgstr "Komentorivipalvelin:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Postituslistapalvelin:"
+#, 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 ""
+#~ "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
+#~ msgid "Mailing lists server:"
+#~ msgstr "Postituslistapalvelin:"
+
 #, 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 "Anna @FORGENAME at n postituslistoja isännöivän palvelimen verkkonimi."
+#~| 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 "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 @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
+#~| 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 ""
+#~ "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "Uutisten ylläpitäjäryhmän ID:"
+
 #, 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 ""
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Tilastojen ylläpitäjäryhmän ID:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Vertaisarvioiden ylläpitäjäryhmän ID:"
+
+#, fuzzy
+#~| msgid ""
 #~| "Please enter the host name of the server that will host the @FORGENAME@ "
 #~| "packages."
 #~ msgid ""

Modified: branches/Branch_5_2/src/debian/dsf-po/fr.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/fr.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/fr.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+0200\n"
 "PO-Revision-Date: 2009-12-29 13:36+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -21,14 +21,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -40,7 +38,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@/FusionForge system name:"
 msgid "@FORGENAME@ system name:"
@@ -49,7 +46,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
@@ -57,79 +53,15 @@
 "Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
 "plusieurs parties du serveur."
 
-#. Type: string
-#. Description
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"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 "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Serveur de téléchargement :"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid ""
-"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 @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Adresse IP :"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"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 @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr ""
-"Cette information est indispensable à la configuration des hôtes virtuels "
-"pour Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mot de passe de l'administrateur de @FORGENAME@ :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -143,7 +75,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -151,15 +83,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Veuillez entrer à nouveau le mot de passe, pour confirmation."
 
@@ -167,7 +97,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Souhaitez-vous une configuration DNS simplifiée ?"
 
@@ -175,7 +105,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -193,7 +123,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -204,148 +134,132 @@
 "choix n'apporte qu'une restriction : tous les répertoires web sont sur un "
 "seul serveur, ainsi que tous les entrepôts SCM."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"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 @FORGENAME at . Elle est "
-"utilisée quand un problème se produit."
+#~ msgid ""
+#~ "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 @FORGENAME at . Elle est "
+#~ "utilisée quand un problème se produit."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Serveur de base de données :"
+#~ msgid "Download server:"
+#~ msgstr "Serveur de téléchargement :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Veuillez indiquer l'adresse IP ou le nom du serveur qui hébergera la base de "
-"données de @FORGENAME at ."
+#~ msgid ""
+#~ "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 "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nom de la base de données :"
+#~ 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"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 ."
+#~ msgid "Database server:"
+#~ msgstr "Serveur de base de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Identifiant de l'administrateur du serveur de bases de données :"
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Veuillez indiquer l'adresse IP ou le nom du serveur qui hébergera la base "
+#~ "de données de @FORGENAME at ."
 
-#. 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 @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 @FORGENAME at ."
+#~ msgid "Database name:"
+#~ msgstr "Nom de la base de données :"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Mot de passe de connexion au serveur de bases de données :"
+#~ msgid ""
+#~ "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: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Les connexions au serveur de bases de données sont protégées par un mot de "
-"passe."
+#~ msgid "Database administrator username:"
+#~ msgstr "Identifiant de l'administrateur du serveur de bases de données :"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Veuillez choisir ce mot de passe de connexion."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that 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 @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Numéro du groupe (GID) d'administration des nouvelles :"
+#~ msgid "Password used for the database:"
+#~ msgstr "Mot de passe de connexion au serveur de bases de données :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-"Les membres du groupe d'administration des nouvelles peuvent approuver des "
-"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."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Les connexions au serveur de bases de données sont protégées par un mot "
+#~ "de passe."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Numéro du groupe d'administration des statistiques :"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Veuillez choisir ce mot de passe de connexion."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Numéro du groupe d'administration des notations (« rating ») :"
+#~ msgid "IP address:"
+#~ msgstr "Adresse IP :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Serveur de listes de diffusion :"
+#~ msgid ""
+#~ "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 @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 @FORGENAME at ."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr ""
+#~ "Cette information est indispensable à la configuration des hôtes virtuels "
+#~ "pour Apache."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"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 @FORGENAME at ."
+#~ msgid "Shell server:"
+#~ msgstr "Serveur interactif (« shell server ») :"
 
 #~ msgid ""
+#~ "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 "
+#~ "@FORGENAME at ."
+
+#~ msgid "Mailing lists server:"
+#~ msgstr "Serveur de listes de diffusion :"
+
+#~ msgid ""
 #~ "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 @FORGENAME at ."
+
+#~ msgid ""
+#~ "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 @FORGENAME at ."
+
+#~ msgid "News administrative group ID:"
+#~ msgstr "Numéro du groupe (GID) d'administration des nouvelles :"
+
+#~ 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 ""
+#~ "Les membres du groupe d'administration des nouvelles peuvent approuver "
+#~ "des 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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Numéro du groupe d'administration des statistiques :"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Numéro du groupe d'administration des notations (« rating ») :"
+
+#~ msgid ""
+#~ "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 "

Modified: branches/Branch_5_2/src/debian/dsf-po/gl.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/gl.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/gl.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -18,7 +18,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
@@ -27,7 +26,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Please enter the domain that will host the @FORGENAME@ installation. Some "
@@ -44,7 +42,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -53,7 +50,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -65,86 +61,9 @@
 "Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
 "sistema."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Servidor de shell:"
-
-#. Type: string
-#. Description
-#: ../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 ""
-"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Servidor de descargas:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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 ""
-"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Enderezo IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr ""
-"Introduza o enderezo IP do servidor que ha hospedar a instalación de "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -152,7 +71,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -166,7 +85,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -174,15 +93,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación do contrasinal:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Volva introducir o contrasinal para confirmalo."
 
@@ -190,7 +107,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -200,7 +117,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -216,7 +133,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -226,178 +143,175 @@
 "os servidores dos proxectos; só supón que tódolos directorios web dos "
 "proxectos están no mesmo servidor cun só servidor para SCM."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Enderezo de email do administrador de @FORGENAME@:"
+#~| 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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Introduza o enderezo de email do administrador de @FORGENAME@ deste sitio. "
-"Hase empregar se aparecen problemas."
+#~| 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 ""
+#~ "Introduza o enderezo de email do administrador de @FORGENAME@ deste "
+#~ "sitio. Hase empregar se aparecen problemas."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de datos:"
+#~ msgid "Download server:"
+#~ msgstr "Servidor de descargas:"
 
-#. 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 "
-"@FORGENAME@ database."
-msgstr ""
-"Introduza o enderezo IP (ou nome) do servidor que ha hospedar a base de "
-"datos de @FORGENAME at ."
+#~| 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 ""
+#~ "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nome da base de datos:"
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de datos:"
+
 #, 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 ""
-"Introduza o nome da base de datos que ha hospedar as contas shell de "
-"@FORGENAME@"
+#~| 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 ""
+#~ "Introduza o enderezo IP (ou nome) do servidor que ha hospedar a base de "
+#~ "datos de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nome de usuario do administrador da base de datos:"
+#~ msgid "Database name:"
+#~ msgstr "Nome da base de datos:"
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Introduza o nome de usuario do administrador de bases de datos do servidor "
-"que ha hospedar a base de datos de @FORGENAME at ."
+#~| 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 ""
+#~ "Introduza o nome da base de datos que ha hospedar as contas shell de "
+#~ "@FORGENAME@"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Contrasinal para a base de datos:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nome de usuario do administrador da base de datos:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"As conexións ao sistema de bases de datos van autenticadas cun contrasinal."
+#, 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 ""
+#~ "Introduza o nome de usuario do administrador de bases de datos do "
+#~ "servidor que ha hospedar a base de datos de @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Escolla o contrasinal para a conexión."
+#~ msgid "Password used for the database:"
+#~ msgstr "Contrasinal para a base de datos:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID do grupo de administradores de novas:"
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "As conexións ao sistema de bases de datos van autenticadas cun "
+#~ "contrasinal."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
+#~ msgid "Please choose the connection password."
+#~ msgstr "Escolla o contrasinal para a conexión."
+
+#~ msgid "IP address:"
+#~ msgstr "Enderezo IP:"
+
 #, 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 ""
-"Os membros do grupo de administradores de novas poden aprobar as novas da "
-"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."
+#~| 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 ""
+#~ "Introduza o enderezo IP do servidor que ha hospedar a instalación de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID do grupo de administradores de estatísticas:"
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Isto é preciso para configurar a hospedaxe virtual de Apache."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID do grupo de administradores de calificacións de iguais:"
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de shell:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de listas de correo:"
+#, 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 ""
+#~ "Introduza o nome do servidor que ha hospedar as contas shell de "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de listas de correo:"
+
 #, 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 ""
-"Introduza o nome do servidor que ha hospedar as listas de correo de "
-"@FORGENAME at ."
+#~| 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 ""
+#~ "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 @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
+#~| 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 ""
+#~ "Introduza o nome do servidor que ha hospedar as contas shell de "
+#~ "@FORGENAME at ."
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID do grupo de administradores de novas:"
+
 #, 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 ""
+#~ "Os membros do grupo de administradores de novas poden aprobar as novas da "
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID do grupo de administradores de estatísticas:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID do grupo de administradores de calificacións de iguais:"
+
+#, fuzzy
+#~| msgid ""
 #~| "Please enter the host name of the server that will host the @FORGENAME@ "
 #~| "packages."
 #~ msgid ""

Modified: branches/Branch_5_2/src/debian/dsf-po/nl.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/nl.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/nl.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -30,7 +30,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
@@ -41,7 +40,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 #, fuzzy
 #| msgid ""
 #| "Please enter the domain that will host the @FORGENAME@ installation. Some "
@@ -60,7 +58,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -71,7 +68,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -83,102 +79,11 @@
 "Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
 "plaatsen in het systeem gebruikt."
 
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Shell-server:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../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 ""
-"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
-"aanbieden?"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Downloadserver:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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 ""
-"Wat is de computernaam van de server waarop de @FORGENAME at -pakketten gehost "
-"gaan worden?"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-adres:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -installatie gaat "
-"hosten?"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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."
-
 #  Type: password
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -188,7 +93,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -204,7 +109,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -214,8 +119,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Wachtwoordbevestiging:"
 
@@ -223,8 +127,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Ter bevestiging dient het wachtwoord nogmaals ingevoerd te worden."
 
@@ -234,7 +137,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 #, fuzzy
 #| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
@@ -246,7 +149,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -265,7 +168,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -278,204 +181,212 @@
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "E-mailadres van de @FORGENAME at -beheerder:"
+#~| 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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Wat is het e-mail-adres van de @FORGENAME at -beheerder op dit systeem? Wordt "
-"gebruikt wanneer er problemen optreden."
+#~| 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 ""
+#~ "Wat is het e-mail-adres van de @FORGENAME at -beheerder op dit systeem? "
+#~ "Wordt gebruikt wanneer er problemen optreden."
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databaseserver:"
+#~ msgid "Download server:"
+#~ msgstr "Downloadserver:"
 
 #  Type: string
 #  Description
-#. 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 "
-"@FORGENAME@ database."
-msgstr ""
-"Wat is het IP-adres (of de computernaam) van de server die de @FORGENAME at -"
-"database gaat hosten?"
+#~| 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 ""
+#~ "Wat is de computernaam van de server waarop de @FORGENAME at -pakketten "
+#~ "gehost gaan worden?"
 
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Databasenaam:"
+#~ msgid "Database server:"
+#~ msgstr "Databaseserver:"
 
 #  Type: string
 #  Description
-#. 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 @FORGENAME@ "
-"database."
-msgstr ""
-"Wat is de naam van de database die als de @FORGENAME at -database gebruikt gaat "
-"worden?"
+#~| 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 ""
+#~ "Wat is het IP-adres (of de computernaam) van de server die de @FORGENAME at -"
+#~ "database gaat hosten?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Gebruikersnaam van de databasebeheerder:"
+#~ msgid "Database name:"
+#~ msgstr "Databasenaam:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
+#  Type: string
+#  Description
 #, 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 ""
-"Wat is de gebruikersnaam van de database-beheerder van de server die de "
-"@FORGENAME at -database gaat hosten?"
+#~| 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 ""
+#~ "Wat is de naam van de database die als de @FORGENAME at -database gebruikt "
+#~ "gaat worden?"
 
+#  Type: string
+#  Description
+#~ msgid "Database administrator username:"
+#~ msgstr "Gebruikersnaam van de databasebeheerder:"
+
+#, 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 ""
+#~ "Wat is de gebruikersnaam van de database-beheerder van de server die de "
+#~ "@FORGENAME at -database gaat hosten?"
+
 #  Type: password
 #  Description
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Databasewachtwoord:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Databasewachtwoord:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-"Verbindingen met het databasesysteem worden geauthentificeerd via een "
-"wachtwoord."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr ""
+#~ "Verbindingen met het databasesysteem worden geauthentificeerd via een "
+#~ "wachtwoord."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Wat is het wachtwoord voor de verbinding?"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Wat is het wachtwoord voor de verbinding?"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Groep-ID van de nieuws-beheerdersgroep:"
+#  Type: string
+#  Description
+#~ msgid "IP address:"
+#~ msgstr "IP-adres:"
 
 #  Type: string
 #  Description
-#. 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 @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 @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."
+#~| 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 ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -installatie gaat "
+#~ "hosten?"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Groep-ID van de statistiekbeheerdersgroep:"
+#~ 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."
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "groep-ID van de 'peer rating'-beheerdersgroep:"
+#~ msgid "Shell server:"
+#~ msgstr "Shell-server:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "E-maillijst-server:"
+#  Type: string
+#  Description
+#, 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 ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts "
+#~ "gaat aanbieden?"
 
+#~ msgid "Mailing lists server:"
+#~ msgstr "E-maillijst-server:"
+
 #  Type: string
 #  Description
-#. 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 @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten gaat "
-"hosten?"
+#~| 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 ""
+#~ "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 @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
-"aanbieden?"
+#~| 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 ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts "
+#~ "gaat aanbieden?"
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "Groep-ID van de nieuws-beheerdersgroep:"
+
 #  Type: string
 #  Description
 #, 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 ""
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Groep-ID van de statistiekbeheerdersgroep:"
+
+#  Type: string
+#  Description
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "groep-ID van de 'peer rating'-beheerdersgroep:"
+
+#  Type: string
+#  Description
+#, fuzzy
+#~| msgid ""
 #~| "Please enter the host name of the server that will host the @FORGENAME@ "
 #~| "packages."
 #~ msgid ""

Modified: branches/Branch_5_2/src/debian/dsf-po/pt.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/pt.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/pt.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+0200\n"
 "PO-Revision-Date: 2010-10-03 21:23+0200\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -19,14 +19,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -38,7 +36,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@ system name:"
 msgid "@FORGENAME@ system name:"
@@ -47,7 +44,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid ""
 #| "Please enter the name of the @FORGENAME@ system. It is used in various "
@@ -59,88 +55,9 @@
 "Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
 "vários lugares pelo sistema."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Servidor de shells:"
-
-#. Type: string
-#. Description
-#: ../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 ""
-"Por favor introduza o nome da máquina do servidor onde ficarão as contas "
-"shell do @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Servidor de downloads:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#, 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 ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-#, 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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Endereço IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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 @FORGENAME@ "
-"installation."
-msgstr ""
-"Por favor introduza o endereço IP do servidor onde será feita a instalação "
-"do @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -148,7 +65,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -162,7 +79,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -170,15 +87,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmação da palavra-passe:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Por favor, reescreva a palavra-passe para confirmação."
 
@@ -186,7 +101,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Deseja uma configuração simples de DNS no @FORGENAME@?"
 
@@ -194,7 +109,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -211,7 +126,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -222,165 +137,162 @@
 "tem os directórios de projectos no mesmo servidor e tem um único servidor "
 "SCM."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
-#| msgid "@FORGENAME@ administrator e-mail address:"
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Endereço de email do administrador do @FORGENAME@:"
+#~| 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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Por favor introduza o endereço de email do administrador @FORGENAME@ neste "
-"site. Será usado quando houverem problemas."
+#~| 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 ""
+#~ "Por favor introduza o endereço de email do administrador @FORGENAME@ "
+#~ "neste site. Será usado quando houverem problemas."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Servidor de bases de dados:"
+#~ msgid "Download server:"
+#~ msgstr "Servidor de downloads:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@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 @FORGENAME at ."
+#, 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 ""
+#~ "Por favor introduza o nome do servidor que irá guardar os pacotes "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Nome da sua base de dados:"
+#, 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
-#: ../dsf-helper/dbhost-variables.templates:3001
+#~ msgid "Database server:"
+#~ msgstr "Servidor de bases de dados:"
+
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @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 @FORGENAME at ."
+
+#~ msgid "Database name:"
+#~ msgstr "Nome da sua base de dados:"
+
 #, 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 ""
-"Por favor introduza o nome da base de dados que irá guardar a base de dados "
-"do @FORGENAME at ."
+#~| 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 ""
+#~ "Por favor introduza o nome da base de dados que irá guardar a base de "
+#~ "dados do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Nome do administrador da sua base de dados:"
+#~ msgid "Database administrator username:"
+#~ msgstr "Nome do administrador da sua base de dados:"
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Por favor introduza o nome de utilizador do administrador do servidor que "
-"irá guardar a base de dados do @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that 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 @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Palavra-passe utilizada na base de dados:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Palavra-passe utilizada na base de dados:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "As ligações à base de dados são autenticadas por uma palavra-passe."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "As ligações à base de dados são autenticadas por uma palavra-passe."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Por favor escolha a palavra-passe da ligação."
+#~ msgid "Please choose the connection password."
+#~ msgstr "Por favor escolha a palavra-passe da ligação."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Identificador do grupo de administradores de notícias:"
+#~ msgid "IP address:"
+#~ msgstr "Endereço IP:"
 
-#. 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 @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 @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."
+#~| 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 ""
+#~ "Por favor introduza o endereço IP do servidor onde será feita a "
+#~ "instalação do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Identificador do grupo de administradores de estatísticas:"
+#~ 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: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Identificador do grupo de administradores de classificação por pares:"
+#~ msgid "Shell server:"
+#~ msgstr "Servidor de shells:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Servidor de listas de email:"
+#, 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 ""
+#~ "Por favor introduza o nome da máquina do servidor onde ficarão as contas "
+#~ "shell do @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 "
-"@FORGENAME at ."
+#~ msgid "Mailing lists server:"
+#~ msgstr "Servidor de listas de email:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
+#~ msgid ""
+#~ "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 @FORGENAME at ."
+
 #, 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 ""
-"Por favor introduza o nome do servidor onde irão ficar as contas de shell do "
-"@FORGENAME at ."
+#~| 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 ""
+#~ "Por favor introduza o nome do servidor onde irão ficar as contas de shell "
+#~ "do @FORGENAME at ."
 
+#~ msgid "News administrative group ID:"
+#~ msgstr "Identificador do grupo de administradores de notícias:"
+
+#, 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 ""
+#~ "Os membros do grupo de administradores de notícias podem aprovar notícias "
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Identificador do grupo de administradores de estatísticas:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr ""
+#~ "Identificador do grupo de administradores de classificação por pares:"
+
+#~ msgid ""
 #~ "Please enter the host name of the server that will host the @FORGENAME@ "
 #~ "packages."
 #~ msgstr ""

Modified: branches/Branch_5_2/src/debian/dsf-po/ru.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/ru.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/ru.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+0200\n"
 "PO-Revision-Date: 2010-01-02 10:03+0300\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -23,14 +23,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "Имя домена или поддомена @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -42,7 +40,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@/FusionForge system name:"
 msgid "@FORGENAME@ system name:"
@@ -51,7 +48,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
@@ -59,78 +55,15 @@
 "Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
 "системе."
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Сервер оболочек:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
-msgstr ""
-"Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Сервер загрузок:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-адрес:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr ""
-"Введите IP-адрес сервера, на котором будет располагаться установка "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr "Это нужно для настройки виртуального хостинга Apache."
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Пароль администратора @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -144,7 +77,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -152,15 +85,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Подтверждение пароля:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Введите пароль ещё раз для подтверждения."
 
@@ -168,7 +99,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Выполнить простую настройку DNS для @FORGENAME@?"
 
@@ -176,7 +107,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -192,7 +123,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -203,146 +134,127 @@
 "предполагается, что все веб-каталоги проектов размещены на том же сервере с "
 "одним сервером SCM."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Адрес электронной почты администратора @FORGENAME@:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "Адрес электронной почты администратора @FORGENAME@:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-"Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
-"использован при возникновении проблем."
+#~ msgid ""
+#~ "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#~ "site. It will be used when problems occur."
+#~ msgstr ""
+#~ "Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
+#~ "использован при возникновении проблем."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Сервер базы данных:"
+#~ msgid "Download server:"
+#~ msgstr "Сервер загрузок:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"Введите IP-адрес (или имя хоста) сервера, на котором будет расположена база "
-"данных @FORGENAME at ."
+#~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Имя базы данных:"
+#~ msgid "It should not be the same as the main @FORGENAME@ host."
+#~ msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-"Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
+#~ msgid "Database server:"
+#~ msgstr "Сервер базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Имя пользователя администратора базы данных:"
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Введите IP-адрес (или имя хоста) сервера, на котором будет расположена "
+#~ "база данных @FORGENAME at ."
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Введите имя пользователя администратора базы данных для сервера, на котором "
-"будет расположена база данных @FORGENAME at ."
+#~ msgid "Database name:"
+#~ msgstr "Имя базы данных:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Пароль для базы данных:"
+#~ msgid ""
+#~ "Please enter the name of the database that will host the @FORGENAME@ "
+#~ "database."
+#~ msgstr ""
+#~ "Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Для подключений к базе данных требуется пароль."
+#~ msgid "Database administrator username:"
+#~ msgstr "Имя пользователя администратора базы данных:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Введите пароль для подключения."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Введите имя пользователя администратора базы данных для сервера, на "
+#~ "котором будет расположена база данных @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Административный ID группы новостей:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Пароль для базы данных:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-"Члены административной группы новостей могут утверждать новости для главной "
-"страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен быть "
-"изменён, только если вы обновляетесь с предыдущей версии и хотите сохранить "
-"данные."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Для подключений к базе данных требуется пароль."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Административный ID группы статистики:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Введите пароль для подключения."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Административный ID группы рейтинга:"
+#~ msgid "IP address:"
+#~ msgstr "IP-адрес:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Сервер списков почтовых рассылок:"
+#~ msgid ""
+#~ "Please enter the IP address of the server that will host the @FORGENAME@ "
+#~ "installation."
+#~ msgstr ""
+#~ "Введите IP-адрес сервера, на котором будет располагаться установка "
+#~ "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"mailing lists."
-msgstr ""
-"Введите имя хоста сервера, который будет обслуживать списки почтовых "
-"рассылок @FORGENAME at ."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Это нужно для настройки виртуального хостинга Apache."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"shell accounts."
-msgstr ""
-"Введите имя сервера, на котором будут расположены учётные записи оболочек "
-"для @FORGENAME at ."
+#~ msgid "Shell server:"
+#~ msgstr "Сервер оболочек:"
 
 #~ msgid ""
+#~ "Please enter the hostname of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены учётные записи оболочек "
+#~ "для @FORGENAME at ."
+
+#~ msgid "Mailing lists server:"
+#~ msgstr "Сервер списков почтовых рассылок:"
+
+#~ msgid ""
 #~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "mailing lists."
+#~ msgstr ""
+#~ "Введите имя хоста сервера, который будет обслуживать списки почтовых "
+#~ "рассылок @FORGENAME at ."
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "shell accounts."
+#~ msgstr ""
+#~ "Введите имя сервера, на котором будут расположены учётные записи оболочек "
+#~ "для @FORGENAME at ."
+
+#~ msgid "News administrative group ID:"
+#~ msgstr "Административный ID группы новостей:"
+
+#~ 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 ""
+#~ "Члены административной группы новостей могут утверждать новости для "
+#~ "главной страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен "
+#~ "быть изменён, только если вы обновляетесь с предыдущей версии и хотите "
+#~ "сохранить данные."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Административный ID группы статистики:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Административный ID группы рейтинга:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
 #~ "packages."
 #~ msgstr ""
 #~ "Введите имя хоста сервера, на котором будут располагаться пакеты "

Modified: branches/Branch_5_2/src/debian/dsf-po/sv.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/sv.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/sv.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME at _4.6.99+svn6580-1_sv\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -24,14 +24,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -43,7 +41,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 #, fuzzy
 #| msgid "@FORGENAME@/FusionForge system name:"
 msgid "@FORGENAME@ system name:"
@@ -52,86 +49,21 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr "Skalserver:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"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 "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Hämtningsserver:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "IP-adress:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"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 @FORGENAME at -"
-"installationen."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -administratörens lösenord:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -145,7 +77,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -153,15 +85,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Lösenordsbekräftelse:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Mata in lösenordet igen för bekräftelse."
 
@@ -169,7 +99,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Vill du ha en enkel DNS-konfiguration för @FORGENAME@?"
 
@@ -177,7 +107,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -194,7 +124,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 "
@@ -204,146 +134,127 @@
 "maskiner för dina projektservrar; den antar bara att du har alla projektens "
 "webbkataloger på samma server och en enda källkodshanteringsserver."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "@FORGENAME at -administratörens e-postadress:"
+#~ msgid "@FORGENAME@ administrator e-mail address:"
+#~ msgstr "@FORGENAME at -administratörens e-postadress:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid ""
-"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 @FORGENAME at -administratören på systemet. Den kommer "
-"användas ifall problem uppstår."
+#~ msgid ""
+#~ "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 @FORGENAME at -administratören på systemet. Den "
+#~ "kommer användas ifall problem uppstår."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Databasserver:"
+#~ msgid "Download server:"
+#~ msgstr "Hämtningsserver:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
-"@FORGENAME at -databasen."
+#~ 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Databasnamn:"
+#~ 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-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."
+#~ msgid "Database server:"
+#~ msgstr "Databasserver:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Databasadministratörens användarnamn:"
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @FORGENAME@ database."
+#~ msgstr ""
+#~ "IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
+#~ "@FORGENAME at -databasen."
 
-#. 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 @FORGENAME@ database."
-msgstr ""
-"Ange användarnamnet på databasadministratören för servers som kommer "
-"tillhandahålla @FORGENAME at -databasen."
+#~ msgid "Database name:"
+#~ msgstr "Databasnamn:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Lösenordet som används för databasen:"
+#~ 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: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Uppkopplingar till databassystem autentiseras med ett lösenord."
+#~ msgid "Database administrator username:"
+#~ msgstr "Databasadministratörens användarnamn:"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Välj uppkopplingslösenordet."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that will host the @FORGENAME@ database."
+#~ msgstr ""
+#~ "Ange användarnamnet på databasadministratören för servers som kommer "
+#~ "tillhandahålla @FORGENAME at -databasen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "Grupp-id för nyhetsadministratörerna:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Lösenordet som används för databasen:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-"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."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Uppkopplingar till databassystem autentiseras med ett lösenord."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "Grupp-id för statistikadministratörerna:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Välj uppkopplingslösenordet."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "Grupp-id för användarbedömningsadministratörerna:"
+#~ msgid "IP address:"
+#~ msgstr "IP-adress:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Server för sändlistor:"
+#~ msgid ""
+#~ "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 @FORGENAME at -"
+#~ "installationen."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 ."
+#~ msgid "This is needed for the configuration of Apache virtual hosting."
+#~ msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"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 ."
+#~ msgid "Shell server:"
+#~ msgstr "Skalserver:"
 
 #~ msgid ""
+#~ "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 "
+#~ "@FORGENAME at ."
+
+#~ msgid "Mailing lists server:"
+#~ msgstr "Server för sändlistor:"
+
+#~ msgid ""
 #~ "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 ."
+
+#~ msgid ""
+#~ "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 ."
+
+#~ msgid "News administrative group ID:"
+#~ msgstr "Grupp-id för nyhetsadministratörerna:"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "Grupp-id för statistikadministratörerna:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "Grupp-id för användarbedömningsadministratörerna:"
+
+#~ 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."

Modified: branches/Branch_5_2/src/debian/dsf-po/templates.pot
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/templates.pot	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/templates.pot	2012-05-29 16:50:48 UTC (rev 15601)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: fusionforge\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+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"
@@ -20,14 +20,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -36,87 +34,26 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid "@FORGENAME@ system name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Shell server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ shell "
-"accounts."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "It should not be the same as the main @FORGENAME@ host."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"Please enter the IP address of the server that will host the @FORGENAME@ "
-"installation."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "This is needed for the configuration of Apache virtual hosting."
-msgstr ""
-
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "forge. It will be used to approve the creation of new projects."
@@ -124,21 +61,19 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "Please choose the password for this forge account."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr ""
 
@@ -146,7 +81,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr ""
 
@@ -154,7 +89,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -166,132 +101,9 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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 ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-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 @FORGENAME@ administrator of this "
-"site. It will be used when problems occur."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@FORGENAME@ database."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ "
-"database."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr ""
-
-#. 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 @FORGENAME@ database."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 @FORGENAME@ "
-"shell accounts."
-msgstr ""

Modified: branches/Branch_5_2/src/debian/dsf-po/vi.po
===================================================================
--- branches/Branch_5_2/src/debian/dsf-po/vi.po	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/debian/dsf-po/vi.po	2012-05-29 16:50:48 UTC (rev 15601)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-05-29 15:53+0200\n"
+"POT-Creation-Date: 2012-05-29 18:13+0200\n"
 "PO-Revision-Date: 2010-03-10 10:10+0200\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -21,14 +21,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "Tên miền hay miền con @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:2001
-#: ../dsf-helper/common-variables.templates:2001
 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."
@@ -39,14 +37,12 @@
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid "@FORGENAME@ system name:"
 msgstr "Tên hệ thống @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-in/common.templates:3001
-#: ../dsf-helper/common-variables.templates:4001
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
@@ -54,75 +50,15 @@
 "Hãy gõ tên của hệ thống @FORGENAME at . Nó được dùng ở các nơi khác nhau trên "
 "khắp hệ thống."
 
-#. Type: string
-#. Description
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-msgid ""
-"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ẽ hỗ trợ các tài khoản trình bao @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid "Download server:"
-msgstr "Máy phục vụ tải xuống:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-msgid ""
-"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ẽ hỗ trợ các gói @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
-#: ../dsf-helper/lists-variables.templates:2001
-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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid "IP address:"
-msgstr "Địa chỉ IP:"
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../dsf-helper/host-variables.templates:2001
-msgid ""
-"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 @FORGENAME at ."
-
-#. Type: string
-#. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
-#: ../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
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mật khẩu quản trị @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -136,7 +72,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates:2001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -144,15 +80,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.templates:3001
 msgid "Password confirmation:"
 msgstr "Xác nhận mật khẩu :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
-#: ../dsf-helper/dbpasswd-variables.templates:3001
+#: ../dsf-in/db-postgresql.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ó."
 
@@ -160,7 +94,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Bạn có muốn tạo một thiết lập DNS đơn giản cho @FORGENAME@ không?"
 
@@ -168,7 +102,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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, "
@@ -184,7 +118,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates:2001
 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,142 +129,122 @@
 "mục Web của dự án nằm trên cùng một máy phục vụ, với một máy phục vụ SCM "
 "riêng lẻ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:3001
-msgid "@FORGENAME@ administrator e-mail address:"
-msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
+#~ 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
-msgid ""
-"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ị @FORGENAME@ của địa chỉ Web này. Nó "
-"sẽ được dùng khi gặp vấn đề."
+#~ msgid ""
+#~ "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ị @FORGENAME@ của địa chỉ Web này. "
+#~ "Nó sẽ được dùng khi gặp vấn đề."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Database server:"
-msgstr "Máy phục vụ cơ sở dữ liệu :"
+#~ msgid "Download server:"
+#~ msgstr "Máy phục vụ tải xuống:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:2001
-msgid ""
-"Please enter the IP address (or hostname) of the server that will host the "
-"@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 "
-"@FORGENAME at ."
+#~ msgid ""
+#~ "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ẽ hỗ trợ các gói @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Database name:"
-msgstr "Tên cơ sở dữ liệu :"
+#~ 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
-#: ../dsf-helper/dbhost-variables.templates:3001
-msgid ""
-"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ẽ hỗ trợ cơ sở dữ liệu @FORGENAME at ."
+#~ msgid "Database server:"
+#~ msgstr "Máy phục vụ cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Database administrator username:"
-msgstr "Tên người dùng quản trị cơ sở dữ liệu :"
+#~ msgid ""
+#~ "Please enter the IP address (or hostname) of the server that will host "
+#~ "the @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 "
+#~ "@FORGENAME at ."
 
-#. 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 @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 @FORGENAME at ."
+#~ msgid "Database name:"
+#~ msgstr "Tên cơ sở dữ liệu :"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Password used for the database:"
-msgstr "Mật khẩu dùng cho cơ sở dữ liệu :"
+#~ msgid ""
+#~ "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ẽ hỗ trợ cơ sở dữ liệu @FORGENAME at ."
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Connections to the database system are authenticated by a password."
-msgstr "Kết nối đến hệ thống cơ sở dữ liệu thì xác thực bằng mật khẩu."
+#~ msgid "Database administrator username:"
+#~ msgstr "Tên người dùng quản trị cơ sở dữ liệu :"
 
-#. Type: password
-#. Description
-#: ../dsf-helper/dbpasswd-variables.templates:2001
-msgid "Please choose the connection password."
-msgstr "Hãy chọn mật khẩu kết nối."
+#~ msgid ""
+#~ "Please enter the username of the database administrator for the server "
+#~ "that 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 @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-msgid "News administrative group ID:"
-msgstr "ID nhóm quản trị tin tức:"
+#~ msgid "Password used for the database:"
+#~ msgstr "Mật khẩu dùng cho cơ sở dữ liệu :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:2001
-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 ""
-"Các thành viên của nhóm quản trị tin tức cũng có quyền tán thành tin tức để "
-"hiển thị trên trang chính @FORGENAME at . Mã số 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ừ một phiên bản cũ và muốn giữ lại dữ "
-"liệu."
+#~ msgid "Connections to the database system are authenticated by a password."
+#~ msgstr "Kết nối đến hệ thống cơ sở dữ liệu thì xác thực bằng mật khẩu."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:3001
-msgid "Statistics administrative group ID:"
-msgstr "ID nhóm quản trị thống kê:"
+#~ msgid "Please choose the connection password."
+#~ msgstr "Hãy chọn mật khẩu kết nối."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/groupid-variables.templates:4001
-msgid "Peer rating administrative group ID:"
-msgstr "ID nhóm quản trị đánh giá ngang hàng:"
+#~ msgid "IP address:"
+#~ msgstr "Địa chỉ IP:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid "Mailing lists server:"
-msgstr "Máy phục vụ hộp thư chung:"
+#~ msgid ""
+#~ "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 @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/lists-variables.templates:2001
-msgid ""
-"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 ."
+#~ 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: string
-#. Description
-#: ../dsf-helper/shellhost-variables.templates:2001
-msgid ""
-"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 ."
+#~ msgid "Shell server:"
+#~ msgstr "Máy phục vụ trình bao :"
 
 #~ msgid ""
+#~ "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ẽ hỗ trợ các tài khoản trình bao "
+#~ "@FORGENAME at ."
+
+#~ msgid "Mailing lists server:"
+#~ msgstr "Máy phục vụ hộp thư chung:"
+
+#~ msgid ""
 #~ "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 ."
+
+#~ msgid ""
+#~ "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 ."
+
+#~ msgid "News administrative group ID:"
+#~ msgstr "ID nhóm quản trị tin tức:"
+
+#~ 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 ""
+#~ "Các thành viên của nhóm quản trị tin tức cũng có quyền tán thành tin tức "
+#~ "để hiển thị trên trang chính @FORGENAME at . Mã số 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ừ một phiên bản cũ và muốn "
+#~ "giữ lại dữ liệu."
+
+#~ msgid "Statistics administrative group ID:"
+#~ msgstr "ID nhóm quản trị thống kê:"
+
+#~ msgid "Peer rating administrative group ID:"
+#~ msgstr "ID nhóm quản trị đánh giá ngang hàng:"
+
+#~ msgid ""
+#~ "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 ."
 

Modified: branches/Branch_5_2/src/plugins/authopenid/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/authopenid/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/authopenid/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/authopenid/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/authopenid/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/authopenid/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/contribtracker/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/contribtracker/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/contribtracker/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/contribtracker/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/contribtracker/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/contribtracker/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/externalsearch/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/externalsearch/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/externalsearch/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/externalsearch/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/externalsearch/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/externalsearch/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/extratabs/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/extratabs/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/extratabs/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/extratabs/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/extratabs/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/extratabs/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -15,13 +15,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/extsubproj/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/extsubproj/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/extsubproj/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/extsubproj/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/extsubproj/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/extsubproj/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/forumml/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/forumml/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/forumml/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/globaldashboard/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/globaldashboard/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/globaldashboard/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/globaldashboard/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/globaldashboard/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/globaldashboard/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/globalsearch/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/globalsearch/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/globalsearch/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/globalsearch/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/globalsearch/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/globalsearch/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -14,13 +14,13 @@
 use Socket;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/helloworld/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/helloworld/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/helloworld/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/helloworld/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/helloworld/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/helloworld/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/hudson/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/hudson/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/hudson/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/hudson/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/hudson/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/hudson/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mailman/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mailman/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mailman/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mailman/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mailman/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mailman/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mantisbt/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mantisbt/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mantisbt/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mantisbt/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mantisbt/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mantisbt/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mediawiki/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mediawiki/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mediawiki/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/mediawiki/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/mediawiki/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/mediawiki/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/oauthprovider/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/oauthprovider/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/oauthprovider/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/oauthprovider/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/oauthprovider/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/oauthprovider/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/projectlabels/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/projectlabels/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/projectlabels/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/projectlabels/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/projectlabels/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/projectlabels/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/projects-hierarchy/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/scmdarcs/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/scmdarcs/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/scmdarcs/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/scmdarcs/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/scmdarcs/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/scmdarcs/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/scmgit/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/scmgit/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/scmgit/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/scmgit/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/scmgit/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/scmgit/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -13,13 +13,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $domain_name $newsadmin_groupid $statsadmin_groupid
+    $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/soapadmin/bin/db-delete.pl
===================================================================
--- branches/Branch_5_2/src/plugins/soapadmin/bin/db-delete.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/soapadmin/bin/db-delete.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/plugins/soapadmin/bin/db-upgrade.pl
===================================================================
--- branches/Branch_5_2/src/plugins/soapadmin/bin/db-upgrade.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/plugins/soapadmin/bin/db-upgrade.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -11,13 +11,13 @@
 use HTML::Entities ;
 
 use vars qw/$dbh @reqlist $query/ ;
-use vars qw/$sys_default_domain $sys_cvs_host $sys_download_host
+use vars qw/$sys_default_domain $sys_cvs_host
     $sys_shell_host $sys_users_host $sys_docs_host $sys_lists_host
     $sys_dns1_host $sys_dns2_host $FTPINCOMING_DIR $FTPFILES_DIR
     $sys_urlroot $sf_cache_dir $sys_name $sys_themeroot
     $sys_news_group $sys_dbhost $sys_dbname $sys_dbuser $sys_dbpasswd
     $sys_ldap_base_dn $sys_ldap_host $admin_login $admin_password
-    $server_admin $domain_name $newsadmin_groupid $statsadmin_groupid
+    $server_admin $domain_name
     $skill_list/ ;
 use vars qw/$pluginname/ ;
 

Modified: branches/Branch_5_2/src/utils/include.pl
===================================================================
--- branches/Branch_5_2/src/utils/include.pl	2012-05-29 16:50:21 UTC (rev 15600)
+++ branches/Branch_5_2/src/utils/include.pl	2012-05-29 16:50:48 UTC (rev 15601)
@@ -52,7 +52,6 @@
 $sys_ldap_base_dn = &forge_get_config ('ldap_base_dn') ;
 $sys_ldap_host = &forge_get_config ('ldap_host') ;
 $server_admin = &forge_get_config ('admin_email') ;
-$peerrating_groupid = &forge_get_config ('peer_rating_group') ;
 $chroot_prefix = &forge_get_config ('chroot') ;
 $homedir_prefix = &forge_get_config ('homedir_prefix') ;
 $grpdir_prefix = &forge_get_config ('groupdir_prefix') ;




More information about the Fusionforge-commits mailing list