[Fusionforge-commits] r15599 - in branches/Branch_5_2: . src/debian/dsf-helper src/debian/dsf-in src/debian/dsf-po

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


Author: lolando
Date: 2012-05-29 18:49:40 +0200 (Tue, 29 May 2012)
New Revision: 15599

Removed:
   branches/Branch_5_2/src/debian/dsf-helper/web-variables.config
   branches/Branch_5_2/src/debian/dsf-helper/web-variables.templates
   branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in
Modified:
   branches/Branch_5_2/
   branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/web-apache2.postinst.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates.dsfh-in
   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
Log:
Continuing progressive de-dsf-helper-isation

Deleted: branches/Branch_5_2/src/debian/dsf-helper/web-variables.config
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/web-variables.config	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-helper/web-variables.config	2012-05-29 16:49:40 UTC (rev 15599)
@@ -1,7 +0,0 @@
-db_input low @PACKAGE@/shared/sys_lang || true
-db_input low @PACKAGE@/shared/sys_theme || true
-
-db_go || true
-
-vars="sys_lang sys_theme newsadmin_groupid statsadmin_groupid peerrating_groupid"
-update_mainconffile $vars

Deleted: branches/Branch_5_2/src/debian/dsf-helper/web-variables.templates
===================================================================
--- branches/Branch_5_2/src/debian/dsf-helper/web-variables.templates	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-helper/web-variables.templates	2012-05-29 16:49:40 UTC (rev 15599)
@@ -1,22 +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/sys_lang
-Type: select
-__Choices: English, Bulgarian, Catalan, Chinese (Traditional), Dutch, Esperanto, French, German, Greek, Hebrew, Indonesian, Italian, Japanese, Korean, Latin, Norwegian, Polish, Portuguese (Brazilian), Portuguese, Russian, Chinese (Simplified), Spanish, Swedish, Thai
-_DefaultChoice: English[ Default language]
-_Description: Default language:
- Please choose the default language for web pages.
-
-Template: @PACKAGE@/shared/sys_theme
-Type: string
-Default: @PACKAGE@
-_Description: Default theme:
- Please choose the default theme for web pages. This must be a valid
- name.

Modified: branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -50,8 +50,6 @@
 
 #DSFHELPER:dbhost-variables#
 
-#DSFHELPER:web-variables#
-
 #DSFHELPER:groupid-variables#
 
 #DSFHELPER:ucf-choices#

Modified: branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates.dsfh-in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -10,9 +10,7 @@
 #DSFHELPER:common-variables#
 #DSFHELPER:shellhost-variables#
 #DSFHELPER:lists-variables#
-#DSFHELPER:downloadhost-variables#
 #DSFHELPER:host-variables#
-#DSFHELPER:web-variables#
 
 Template: @PACKAGE@/shared/simple_dns
 Type: boolean

Deleted: branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.config.dsfh-in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# 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:host-variables#
-#DSFHELPER:common-variables#
-#DSFHELPER:web-variables#
-#DSFHELPER:groupid-variables#
-#DSFHELPER:downloadhost-variables#
-#DSFHELPER:uploadhost-variables#
-#DSFHELPER:ftpuploadhost-variables#
-#DSFHELPER:jabberhost-variables#

Modified: branches/Branch_5_2/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -25,21 +25,8 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:handle-mainconffile#
-
 case "$1" in
     configure)
-	if [ -c /dev/urandom ]; then  # ...using /dev/urandom when possible
-	    sys_session_key=$(dd if=/dev/urandom count=1 bs=16 2> /dev/null | md5sum | cut -b1-32)
-	else			# ...or something else if need be.
-	    # Last I was told, the Hurd had no /dev/urandom
-	    # (Correct me if it has changed)
-	    sys_session_key=$(dd if=/dev/random count=1 bs=8 2> /dev/null | md5sum | cut -b1-32)
-	fi
-	add_onevar_mainconfile sys_session_key $sys_session_key
-	add_onevar_mainconfile sys_show_source 0
-	add_onevar_mainconfile sys_force_login 0
-
 	if [ ! -e /etc/@OLDPACKAGE@/ssl-cert.pem ] || [ ! -e /etc/@OLDPACKAGE@/ssl-cert.key ] ; then
 	    # Uh-oh, no SSL cert, let's make sure at least a dummy one exists.
 	    if [ ! -e /etc/ssl/certs/ssl-cert-snakeoil.pem ] || [ ! -e /etc/ssl/private/ssl-cert-snakeoil.key ] ; then

Modified: branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates.dsfh-in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -1,10 +1,8 @@
 #DSFHELPER:host-variables#
-#DSFHELPER:downloadhost-variables#
 #DSFHELPER:uploadhost-variables#
 #DSFHELPER:ftpuploadhost-variables#
 #DSFHELPER:jabberhost-variables#
 #DSFHELPER:lists-variables#
 #DSFHELPER:shellhost-variables#
-#DSFHELPER:web-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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/POTFILES.in	2012-05-29 16:49:40 UTC (rev 15599)
@@ -4,9 +4,7 @@
 [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/downloadhost-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
-[type: gettext/rfc822deb] dsf-helper/web-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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/cs.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -95,14 +95,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -114,8 +113,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -124,14 +122,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -145,14 +143,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -160,7 +158,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -174,7 +172,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -182,14 +180,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Potvrzení hesla:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Zadejte heslo ještě jednou pro potvrzení."
@@ -335,18 +333,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "ID skupiny správců novinek:"
@@ -413,182 +399,104 @@
 msgstr ""
 "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "angličtina"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Zadejte prosím jméno serveru, který bude hostit balíky @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulharština"
+#~ msgid "English"
+#~ msgstr "angličtina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "katalánština"
+#~ msgid "Bulgarian"
+#~ msgstr "bulharština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "čínština (tradiční)"
+#~ msgid "Catalan"
+#~ msgstr "katalánština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "holandština"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "čínština (tradiční)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "esperanto"
+#~ msgid "Dutch"
+#~ msgstr "holandština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "francouzština"
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "němčina"
+#~ msgid "French"
+#~ msgstr "francouzština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "řečtina"
+#~ msgid "German"
+#~ msgstr "němčina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "hebrejština"
+#~ msgid "Greek"
+#~ msgstr "řečtina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonéština"
+#~ msgid "Hebrew"
+#~ msgstr "hebrejština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italština"
+#~ msgid "Indonesian"
+#~ msgstr "indonéština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japonština"
+#~ msgid "Italian"
+#~ msgstr "italština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "korejština"
+#~ msgid "Japanese"
+#~ msgstr "japonština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latina"
+#~ msgid "Korean"
+#~ msgstr "korejština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norština"
+#~ msgid "Latin"
+#~ msgstr "latina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "polština"
+#~ msgid "Norwegian"
+#~ msgstr "norština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugalština (brazilská)"
+#~ msgid "Polish"
+#~ msgstr "polština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugalština"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugalština (brazilská)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "ruština"
+#~ msgid "Portuguese"
+#~ msgstr "portugalština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "čínština (zjednodušená)"
+#~ msgid "Russian"
+#~ msgstr "ruština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "španělština"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "čínština (zjednodušená)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "švédština"
+#~ msgid "Spanish"
+#~ msgstr "španělština"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thajština"
+#~ msgid "Swedish"
+#~ msgstr "švédština"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "English"
+#~ msgid "Thai"
+#~ msgstr "thajština"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Výchozí jazyk:"
+#~ msgid "English[ Default language]"
+#~ msgstr "English"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Vyberte prosím výchozí jazyk pro webové stránky."
+#~ msgid "Default language:"
+#~ msgstr "Výchozí jazyk:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Výchozí téma:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Vyberte prosím výchozí jazyk pro webové stránky."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Vyberte prosím výchozí téma pro webové stránky. Musí to být platný název."
+#~ msgid "Default theme:"
+#~ msgstr "Výchozí téma:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Vyberte prosím výchozí téma pro webové stránky. Musí to být platný název."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Chcete, aby se pošta doručená na ${noreply} zahazovala?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/de.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -73,14 +73,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr "Download-Server:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -90,8 +89,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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 ""
@@ -100,14 +98,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../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@ "
@@ -118,20 +116,20 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -146,7 +144,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -154,14 +152,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Bestätigung des Passworts:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Bitte geben Sie zur Bestätigung das Passwort erneut ein."
@@ -290,16 +288,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-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 -"
-"Pakete beherbergen wird."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "ID der News-Administrators-Gruppe:"
@@ -355,183 +343,103 @@
 "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
 "Konten beherbergen wird."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Englisch"
+#~ 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 -"
+#~ "Pakete beherbergen wird."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgarisch"
+#~ msgid "English"
+#~ msgstr "Englisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Katalanisch"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgarisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "(traditionelles) Chinesisch"
+#~ msgid "Catalan"
+#~ msgstr "Katalanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holländisch"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "(traditionelles) Chinesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Dutch"
+#~ msgstr "Holländisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Französisch"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Deutsch"
+#~ msgid "French"
+#~ msgstr "Französisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Griechisch"
+#~ msgid "German"
+#~ msgstr "Deutsch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebräisch"
+#~ msgid "Greek"
+#~ msgstr "Griechisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesisch"
+#~ msgid "Hebrew"
+#~ msgstr "Hebräisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italienisch"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japanisch"
+#~ msgid "Italian"
+#~ msgstr "Italienisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreanisch"
+#~ msgid "Japanese"
+#~ msgstr "Japanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latein"
+#~ msgid "Korean"
+#~ msgstr "Koreanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norwegisch"
+#~ msgid "Latin"
+#~ msgstr "Latein"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polnisch"
+#~ msgid "Norwegian"
+#~ msgstr "Norwegisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "brasilianisches Portugiesisch"
+#~ msgid "Polish"
+#~ msgstr "Polnisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugiesisch"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "brasilianisches Portugiesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russisch"
+#~ msgid "Portuguese"
+#~ msgstr "Portugiesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "(vereinfachtes) Chinesisch"
+#~ msgid "Russian"
+#~ msgstr "Russisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spanisch"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "(vereinfachtes) Chinesisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Schwedisch"
+#~ msgid "Spanish"
+#~ msgstr "Spanisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thailändisch"
+#~ msgid "Swedish"
+#~ msgstr "Schwedisch"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "German"
+#~ msgid "Thai"
+#~ msgstr "Thailändisch"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standardsprache:"
+#~ msgid "English[ Default language]"
+#~ msgstr "German"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Bitte wählen Sie die Standardsprache für Webseiten."
+#~ msgid "Default language:"
+#~ msgstr "Standardsprache:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standard Thema:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Bitte wählen Sie die Standardsprache für Webseiten."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Bitte wählen Sie das Standard-Thema für Webseiten. Dies muss ein gültiger "
-"Namen sein."
+#~ msgid "Default theme:"
+#~ msgstr "Standard Thema:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Bitte wählen Sie das Standard-Thema für Webseiten. Dies muss ein gültiger "
+#~ "Namen sein."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/es.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -112,14 +112,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -132,8 +131,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -142,14 +140,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -164,14 +162,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -179,7 +177,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -193,7 +191,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -201,14 +199,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación de la contraseña:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Escriba nuevamente la contraseña para su confirmación."
@@ -359,19 +357,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Introduzca el nombre del servidor que albergará los paquetes de @FORGENAME at ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "ID del grupo de administración de las noticias:"
@@ -440,182 +425,107 @@
 "Introduzca el nombre del servidor que albergará las cuentas de la consola de "
 "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglés"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará los paquetes de "
+#~ "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "English"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalán"
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chino (Tradicional)"
+#~ msgid "Catalan"
+#~ msgstr "Catalán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandés"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chino (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francés"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemán"
+#~ msgid "French"
+#~ msgstr "Francés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Griego"
+#~ msgid "German"
+#~ msgstr "Alemán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreo"
+#~ msgid "Greek"
+#~ msgstr "Griego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesio"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japonés"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Japanese"
+#~ msgstr "Japonés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latín"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noruego"
+#~ msgid "Latin"
+#~ msgstr "Latín"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Norwegian"
+#~ msgstr "Noruego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasileño)"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugués"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugués (Brasileño)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ruso"
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chino (Simplificado)"
+#~ msgid "Russian"
+#~ msgstr "Ruso"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Español"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chino (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Spanish"
+#~ msgstr "Español"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Tailandés"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglés [Idioma predeterminado]"
+#~ msgid "Thai"
+#~ msgstr "Tailandés"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma predeterminado:"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglés [Idioma predeterminado]"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Elija el idioma predeterminado para las páginas web."
+#~ msgid "Default language:"
+#~ msgstr "Idioma predeterminado:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema predeterminado:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Elija el idioma predeterminado para las páginas web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Elija el tema predeterminado para las páginas web. Debe ser un nombre válido."
+#~ msgid "Default theme:"
+#~ msgstr "Tema predeterminado:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Elija el tema predeterminado para las páginas web. Debe ser un nombre "
+#~ "válido."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "¿Desea borrar los correos enviados a ${noreply}?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/fi.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -85,14 +85,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr "Latauspalvelin:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -104,8 +103,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -114,14 +112,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -134,14 +132,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -149,7 +147,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -163,7 +161,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -171,14 +169,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Salasanan vahvistus:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Anna salasana uudestaan vahvistukseksi."
@@ -325,18 +323,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr "Anna @FORGENAME at n paketteja isännöivän palvelimen verkkonimi."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "Uutisten ylläpitäjäryhmän ID:"
@@ -401,181 +387,103 @@
 msgstr ""
 "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "englanti"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr "Anna @FORGENAME at n paketteja isännöivän palvelimen verkkonimi."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulgaria"
+#~ msgid "English"
+#~ msgstr "englanti"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "katalaani"
+#~ msgid "Bulgarian"
+#~ msgstr "bulgaria"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "kiina (perinteinen)"
+#~ msgid "Catalan"
+#~ msgstr "katalaani"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "hollanti"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "kiina (perinteinen)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "esperanto"
+#~ msgid "Dutch"
+#~ msgstr "hollanti"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "ranska"
+#~ msgid "Esperanto"
+#~ msgstr "esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "saksa"
+#~ msgid "French"
+#~ msgstr "ranska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "kreikka"
+#~ msgid "German"
+#~ msgstr "saksa"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "heprea"
+#~ msgid "Greek"
+#~ msgstr "kreikka"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonesia"
+#~ msgid "Hebrew"
+#~ msgstr "heprea"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italia"
+#~ msgid "Indonesian"
+#~ msgstr "indonesia"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japani"
+#~ msgid "Italian"
+#~ msgstr "italia"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "korea"
+#~ msgid "Japanese"
+#~ msgstr "japani"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latina"
+#~ msgid "Korean"
+#~ msgstr "korea"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norja"
+#~ msgid "Latin"
+#~ msgstr "latina"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "puola"
+#~ msgid "Norwegian"
+#~ msgstr "norja"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugali (Brasilian)"
+#~ msgid "Polish"
+#~ msgstr "puola"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugali"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugali (Brasilian)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "venäjä"
+#~ msgid "Portuguese"
+#~ msgstr "portugali"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "kiina (yksinkertaistettu)"
+#~ msgid "Russian"
+#~ msgstr "venäjä"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "espanja"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "kiina (yksinkertaistettu)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "ruotsi"
+#~ msgid "Spanish"
+#~ msgstr "espanja"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thai"
+#~ msgid "Swedish"
+#~ msgstr "ruotsi"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "englanti"
+#~ msgid "Thai"
+#~ msgstr "thai"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Oletuskieli:"
+#~ msgid "English[ Default language]"
+#~ msgstr "englanti"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Valitse verkkosivujen oletuskieli."
+#~ msgid "Default language:"
+#~ msgstr "Oletuskieli:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Oletusteema:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Valitse verkkosivujen oletuskieli."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
+#~ msgid "Default theme:"
+#~ msgstr "Oletusteema:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr ""
 #~ "Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/fr.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -76,14 +76,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -92,22 +91,21 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:8001
+#: ../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:8001
+#: ../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@ "
@@ -116,7 +114,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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 ""
@@ -125,13 +123,13 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mot de passe de l'administrateur de @FORGENAME@ :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -145,7 +143,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -153,14 +151,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Veuillez entrer à nouveau le mot de passe, pour confirmation."
@@ -290,15 +288,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-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 @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 :"
@@ -355,183 +344,103 @@
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
 "interactifs @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "French"
+#~ 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 "
+#~ "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "bulgare"
+#~ msgid "English"
+#~ msgstr "French"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "catalan"
+#~ msgid "Bulgarian"
+#~ msgstr "bulgare"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "chinois traditionnel"
+#~ msgid "Catalan"
+#~ msgstr "catalan"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "néerlandais"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "chinois traditionnel"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "espéranto"
+#~ msgid "Dutch"
+#~ msgstr "néerlandais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "français"
+#~ msgid "Esperanto"
+#~ msgstr "espéranto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "allemand"
+#~ msgid "French"
+#~ msgstr "français"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "grec"
+#~ msgid "German"
+#~ msgstr "allemand"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "hébreu"
+#~ msgid "Greek"
+#~ msgstr "grec"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "indonésien"
+#~ msgid "Hebrew"
+#~ msgstr "hébreu"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "italien"
+#~ msgid "Indonesian"
+#~ msgstr "indonésien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "japonais"
+#~ msgid "Italian"
+#~ msgstr "italien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "coréen"
+#~ msgid "Japanese"
+#~ msgstr "japonais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "latin"
+#~ msgid "Korean"
+#~ msgstr "coréen"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "norvégien"
+#~ msgid "Latin"
+#~ msgstr "latin"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "polonais"
+#~ msgid "Norwegian"
+#~ msgstr "norvégien"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "portugais du Brésil"
+#~ msgid "Polish"
+#~ msgstr "polonais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "portugais"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "portugais du Brésil"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "russe"
+#~ msgid "Portuguese"
+#~ msgstr "portugais"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "chinois simplifié"
+#~ msgid "Russian"
+#~ msgstr "russe"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "espagnol"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "chinois simplifié"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "suédois"
+#~ msgid "Spanish"
+#~ msgstr "espagnol"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "thaï"
+#~ msgid "Swedish"
+#~ msgstr "suédois"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "French"
+#~ msgid "Thai"
+#~ msgstr "thaï"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Langue par défaut :"
+#~ msgid "English[ Default language]"
+#~ msgstr "French"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Veuillez choisir la langue par défaut des pages web."
+#~ msgid "Default language:"
+#~ msgstr "Langue par défaut :"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Thème par défaut :"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Veuillez choisir la langue par défaut des pages web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Veuillez choisir le thème par défaut des pages web. Veillez à indiquer un "
-"nom valable."
+#~ msgid "Default theme:"
+#~ msgstr "Thème par défaut :"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Veuillez choisir le thème par défaut des pages web. Veillez à indiquer un "
+#~ "nom valable."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/gl.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -87,14 +87,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -107,8 +106,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -117,14 +115,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -139,14 +137,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -154,7 +152,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -168,7 +166,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -176,14 +174,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmación do contrasinal:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Volva introducir o contrasinal para confirmalo."
@@ -331,19 +329,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "ID do grupo de administradores de novas:"
@@ -411,182 +396,105 @@
 msgstr ""
 "Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglés"
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "English"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalán"
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chinés (Tradicional)"
+#~ msgid "Catalan"
+#~ msgstr "Catalán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandés"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chinés (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Dutch"
+#~ msgstr "Holandés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francés"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemán"
+#~ msgid "French"
+#~ msgstr "Francés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grego"
+#~ msgid "German"
+#~ msgstr "Alemán"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreo"
+#~ msgid "Greek"
+#~ msgstr "Grego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesio"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Xaponés"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Japanese"
+#~ msgstr "Xaponés"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latín"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noruegués"
+#~ msgid "Latin"
+#~ msgstr "Latín"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Norwegian"
+#~ msgstr "Noruegués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasil)"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugués"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugués (Brasil)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ruso"
+#~ msgid "Portuguese"
+#~ msgstr "Portugués"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chinés (Simplificado)"
+#~ msgid "Russian"
+#~ msgstr "Ruso"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Español"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chinés (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Spanish"
+#~ msgstr "Español"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thai"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglés"
+#~ msgid "Thai"
+#~ msgstr "Thai"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma por defecto:"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglés"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Escolla o idioma por defecto para as páxinas web."
+#~ msgid "Default language:"
+#~ msgstr "Idioma por defecto:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema por defecto:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Escolla o idioma por defecto para as páxinas web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Escolla o tema por defecto para as páxinas web. Debe ser un nome válido."
+#~ msgid "Default theme:"
+#~ msgstr "Tema por defecto:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Escolla o tema por defecto para as páxinas web. Debe ser un nome válido."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "¿Quere que se descarten as mensaxes enviadas a ${noreply}?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/nl.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -112,8 +112,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr "Downloadserver:"
 
@@ -121,7 +120,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -135,8 +134,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -147,7 +145,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-adres:"
@@ -156,7 +154,7 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -171,7 +169,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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."
@@ -180,7 +178,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -190,7 +188,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -206,7 +204,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -216,7 +214,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Wachtwoordbevestiging:"
@@ -225,7 +223,7 @@
 #  Description
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Ter bevestiging dient het wachtwoord nogmaals ingevoerd te worden."
@@ -396,24 +394,8 @@
 msgid "Please choose the connection password."
 msgstr "Wat is het wachtwoord voor de verbinding?"
 
-#  Type: string
-#  Description
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat "
-"hosten?"
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "Groep-ID van de nieuws-beheerdersgroep:"
@@ -490,236 +472,162 @@
 "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
 "aanbieden?"
 
+#  Type: string
+#  Description
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "packages."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat "
+#~ "hosten?"
+
 #  Type: select
 #  DefaultChoice
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Engels"
+#~ msgid "English"
+#~ msgstr "Engels"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgaars"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgaars"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalaans"
+#~ msgid "Catalan"
+#~ msgstr "Catalaans"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Traditioneel Chinees"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Traditioneel Chinees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Nederlands"
+#~ msgid "Dutch"
+#~ msgstr "Nederlands"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Frans"
+#~ msgid "French"
+#~ msgstr "Frans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Duits"
+#~ msgid "German"
+#~ msgstr "Duits"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grieks"
+#~ msgid "Greek"
+#~ msgstr "Grieks"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreeuws"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreeuws"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesisch"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesisch"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiaans"
+#~ msgid "Italian"
+#~ msgstr "Italiaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japans"
+#~ msgid "Japanese"
+#~ msgstr "Japans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreaans"
+#~ msgid "Korean"
+#~ msgstr "Koreaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latijns"
+#~ msgid "Latin"
+#~ msgstr "Latijns"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Noors"
+#~ msgid "Norwegian"
+#~ msgstr "Noors"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Pools"
+#~ msgid "Polish"
+#~ msgstr "Pools"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Braziliaans Portugees"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Braziliaans Portugees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugees"
+#~ msgid "Portuguese"
+#~ msgstr "Portugees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russisch"
+#~ msgid "Russian"
+#~ msgstr "Russisch"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Vereenvoudigd Chinees"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Vereenvoudigd Chinees"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spaans"
+#~ msgid "Spanish"
+#~ msgstr "Spaans"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Zweeds"
+#~ msgid "Swedish"
+#~ msgstr "Zweeds"
 
 #  Type: select
 #  Choices
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thais"
+#~ msgid "Thai"
+#~ msgstr "Thais"
 
 #  Type: select
 #  Description
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Dutch"
+#~ msgid "English[ Default language]"
+#~ msgstr "Dutch"
 
 #  Type: select
 #  Description
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standaardtaal:"
+#~ msgid "Default language:"
+#~ msgstr "Standaardtaal:"
 
 #  Type: select
 #  Description
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Wat wordt de standaardtaal voor webpagina's?"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Wat wordt de standaardtaal voor webpagina's?"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standaardthema:"
+#~ msgid "Default theme:"
+#~ msgstr "Standaardthema:"
 
 #  Type: string
 #  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te "
-"zijn."
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam "
+#~ "te zijn."
 
 #  Type: boolean
 #  Description

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/pt.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -82,14 +82,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 #, fuzzy
 #| msgid ""
 #| "Please enter the hostname of the server that will host the @FORGENAME@ "
@@ -103,8 +102,7 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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."
@@ -113,14 +111,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:7001
 #: ../dsf-helper/host-variables.templates:2001
 #, fuzzy
 #| msgid ""
@@ -135,14 +133,14 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
@@ -150,7 +148,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -164,7 +162,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -172,14 +170,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmação da palavra-passe:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Por favor, reescreva a palavra-passe para confirmação."
@@ -318,16 +316,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes do "
-"@FORGENAME at ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "Identificador do grupo de administradores de notícias:"
@@ -392,183 +380,103 @@
 "Por favor introduza o nome do servidor onde irão ficar as contas de shell do "
 "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Inglês"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que irá guardar os pacotes do "
+#~ "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Búlgaro"
+#~ msgid "English"
+#~ msgstr "Inglês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Catalão"
+#~ msgid "Bulgarian"
+#~ msgstr "Búlgaro"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
+#~ msgid "Catalan"
+#~ msgstr "Catalão"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holandês"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Chinês (Tradicional)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Dutch"
+#~ msgstr "Holandês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Francês"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Alemão"
+#~ msgid "French"
+#~ msgstr "Francês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grego"
+#~ msgid "German"
+#~ msgstr "Alemão"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebraico"
+#~ msgid "Greek"
+#~ msgstr "Grego"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonésio"
+#~ msgid "Hebrew"
+#~ msgstr "Hebraico"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italiano"
+#~ msgid "Indonesian"
+#~ msgstr "Indonésio"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japonês"
+#~ msgid "Italian"
+#~ msgstr "Italiano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Coreano"
+#~ msgid "Japanese"
+#~ msgstr "Japonês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latim"
+#~ msgid "Korean"
+#~ msgstr "Coreano"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norueguês"
+#~ msgid "Latin"
+#~ msgstr "Latim"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polaco"
+#~ msgid "Norwegian"
+#~ msgstr "Norueguês"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Português do Brasil"
+#~ msgid "Polish"
+#~ msgstr "Polaco"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Português"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Português do Brasil"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Russo"
+#~ msgid "Portuguese"
+#~ msgstr "Português"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
+#~ msgid "Russian"
+#~ msgstr "Russo"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Espanhol"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Chinês (Simplificado)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Sueco"
+#~ msgid "Spanish"
+#~ msgstr "Espanhol"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Tailandês"
+#~ msgid "Swedish"
+#~ msgstr "Sueco"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Inglês[ Idioma pré-definido]"
+#~ msgid "Thai"
+#~ msgstr "Tailandês"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Idioma pré-definido:"
+#~ msgid "English[ Default language]"
+#~ msgstr "Inglês[ Idioma pré-definido]"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Por favor escolha o idioma pré-definido das páginas web."
+#~ msgid "Default language:"
+#~ msgstr "Idioma pré-definido:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Tema pré-definido:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Por favor escolha o idioma pré-definido das páginas web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Por favor escolha o tema pré-definido para as páginas web. Tem de introduzir "
-"um nome válido."
+#~ msgid "Default theme:"
+#~ msgstr "Tema pré-definido:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Por favor escolha o tema pré-definido para as páginas web. Tem de "
+#~ "introduzir um nome válido."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Deseja que o mail para ${noreply} seja apagado?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/ru.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -78,14 +78,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr "Сервер загрузок:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -93,22 +92,21 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:8001
+#: ../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:8001
+#: ../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@ "
@@ -119,20 +117,20 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Пароль администратора @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -146,7 +144,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -154,14 +152,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Подтверждение пароля:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Введите пароль ещё раз для подтверждения."
@@ -288,15 +286,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Введите имя хоста сервера, на котором будут располагаться пакеты @FORGENAME at ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "Административный ID группы новостей:"
@@ -352,183 +341,103 @@
 "Введите имя сервера, на котором будут расположены учётные записи оболочек "
 "для @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "английский"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Введите имя хоста сервера, на котором будут располагаться пакеты "
+#~ "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "болгарский"
+#~ msgid "English"
+#~ msgstr "английский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "каталонский"
+#~ msgid "Bulgarian"
+#~ msgstr "болгарский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "китайский (традиционный)"
+#~ msgid "Catalan"
+#~ msgstr "каталонский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "голландский"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "китайский (традиционный)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "эсперанто"
+#~ msgid "Dutch"
+#~ msgstr "голландский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "французский"
+#~ msgid "Esperanto"
+#~ msgstr "эсперанто"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "немецкий"
+#~ msgid "French"
+#~ msgstr "французский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "греческий"
+#~ msgid "German"
+#~ msgstr "немецкий"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "иврит"
+#~ msgid "Greek"
+#~ msgstr "греческий"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "индонезийский"
+#~ msgid "Hebrew"
+#~ msgstr "иврит"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "итальянский"
+#~ msgid "Indonesian"
+#~ msgstr "индонезийский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "японский"
+#~ msgid "Italian"
+#~ msgstr "итальянский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "корейский"
+#~ msgid "Japanese"
+#~ msgstr "японский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "латинский"
+#~ msgid "Korean"
+#~ msgstr "корейский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "норвежский"
+#~ msgid "Latin"
+#~ msgstr "латинский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "польский"
+#~ msgid "Norwegian"
+#~ msgstr "норвежский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "португальский (бразильский)"
+#~ msgid "Polish"
+#~ msgstr "польский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "португальский"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "португальский (бразильский)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "русский"
+#~ msgid "Portuguese"
+#~ msgstr "португальский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "китайский (упрощённый)"
+#~ msgid "Russian"
+#~ msgstr "русский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "испанский"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "китайский (упрощённый)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "шведский"
+#~ msgid "Spanish"
+#~ msgstr "испанский"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "тайский"
+#~ msgid "Swedish"
+#~ msgstr "шведский"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "русский"
+#~ msgid "Thai"
+#~ msgstr "тайский"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Язык по умолчанию:"
+#~ msgid "English[ Default language]"
+#~ msgstr "русский"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Выберите язык по умолчанию для веб-страниц."
+#~ msgid "Default language:"
+#~ msgstr "Язык по умолчанию:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Тема по умолчанию:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Выберите язык по умолчанию для веб-страниц."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""
-"Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
-"имя."
+#~ msgid "Default theme:"
+#~ msgstr "Тема по умолчанию:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Выберите тему по умолчанию для веб-страниц. Должно быть указано "
+#~ "допустимое имя."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Удалять почту, присланную на адрес ${noreply}?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/sv.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -78,14 +78,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr "Hämtningsserver:"
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -94,22 +93,21 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:8001
+#: ../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:8001
+#: ../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@ "
@@ -120,20 +118,20 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -administratörens lösenord:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -147,7 +145,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -155,14 +153,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Lösenordsbekräftelse:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Mata in lösenordet igen för bekräftelse."
@@ -289,15 +287,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "Grupp-id för nyhetsadministratörerna:"
@@ -353,181 +342,101 @@
 "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
 "@FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "Engelska"
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "packages."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "Bulgariska"
+#~ msgid "English"
+#~ msgstr "Engelska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "Katalanska"
+#~ msgid "Bulgarian"
+#~ msgstr "Bulgariska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "Kinesiska (traditionell)"
+#~ msgid "Catalan"
+#~ msgstr "Katalanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "Holländska"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "Kinesiska (traditionell)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "Esperanto"
+#~ msgid "Dutch"
+#~ msgstr "Holländska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "Franska"
+#~ msgid "Esperanto"
+#~ msgstr "Esperanto"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "Tyska"
+#~ msgid "French"
+#~ msgstr "Franska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "Grekiska"
+#~ msgid "German"
+#~ msgstr "Tyska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "Hebreiska"
+#~ msgid "Greek"
+#~ msgstr "Grekiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "Indonesiska"
+#~ msgid "Hebrew"
+#~ msgstr "Hebreiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "Italienska"
+#~ msgid "Indonesian"
+#~ msgstr "Indonesiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "Japanska"
+#~ msgid "Italian"
+#~ msgstr "Italienska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "Koreanska"
+#~ msgid "Japanese"
+#~ msgstr "Japanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "Latin"
+#~ msgid "Korean"
+#~ msgstr "Koreanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "Norska"
+#~ msgid "Latin"
+#~ msgstr "Latin"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "Polska"
+#~ msgid "Norwegian"
+#~ msgstr "Norska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisiska (brasiliansk)"
+#~ msgid "Polish"
+#~ msgstr "Polska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "Portugisiska"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "Portugisiska (brasiliansk)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "Ryska"
+#~ msgid "Portuguese"
+#~ msgstr "Portugisiska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "Kinesiska (förenklad)"
+#~ msgid "Russian"
+#~ msgstr "Ryska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "Spanska"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "Kinesiska (förenklad)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "Svenska"
+#~ msgid "Spanish"
+#~ msgstr "Spanska"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "Thailändska"
+#~ msgid "Swedish"
+#~ msgstr "Svenska"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Engelska[ Standardspråk]"
+#~ msgid "Thai"
+#~ msgstr "Thailändska"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Standardspråk:"
+#~ msgid "English[ Default language]"
+#~ msgstr "Engelska[ Standardspråk]"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Ange standardspråket för webbsidorna."
+#~ msgid "Default language:"
+#~ msgstr "Standardspråk:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Standardtema:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Ange standardspråket för webbsidorna."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Ange standardtemat för webbsidorna. Detta måste vara ett giltigt namn."
+#~ msgid "Default theme:"
+#~ msgstr "Standardtema:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Ange standardtemat för webbsidorna. Detta måste vara ett giltigt namn."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Vill du att e-post till ${noreply} ska tas bort?"
 

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/templates.pot	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -66,14 +66,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid "Download server:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -81,22 +80,21 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:8001
+#: ../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:8001
+#: ../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@ "
@@ -105,20 +103,20 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "forge. It will be used to approve the creation of new projects."
@@ -126,20 +124,20 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the password for this forge account."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr ""
@@ -251,14 +249,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ "
-"packages."
-msgstr ""
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr ""
@@ -305,178 +295,3 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
 msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr ""
-
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr ""

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:49:07 UTC (rev 15598)
+++ branches/Branch_5_2/src/debian/dsf-po/vi.po	2012-05-29 16:49:40 UTC (rev 15599)
@@ -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 12:10+0200\n"
+"POT-Creation-Date: 2012-05-29 15:53+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"
@@ -72,14 +72,13 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:5001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -87,22 +86,21 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#: ../dsf-helper/downloadhost-variables.templates:2001
+#: ../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:8001
+#: ../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:8001
+#: ../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@ "
@@ -111,20 +109,20 @@
 
 #. Type: string
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../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:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mật khẩu quản trị @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid ""
 #| "The @FORGENAME@ administrator account will have full privileges on the "
@@ -138,7 +136,7 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 #| msgid "Please choose the password for this account."
 msgid "Please choose the password for this forge account."
@@ -146,14 +144,14 @@
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Xác nhận mật khẩu :"
 
 #. Type: password
 #. Description
-#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Hãy gõ lại mật khẩu để xác nhận nó."
@@ -279,14 +277,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/downloadhost-variables.templates:2001
-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 ."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid "News administrative group ID:"
 msgstr "ID nhóm quản trị tin tức:"
@@ -339,181 +329,100 @@
 msgstr ""
 "Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao @FORGENAME at ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "English"
-msgstr "tiếng Anh"
+#~ 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 ."
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Bulgarian"
-msgstr "tiếng Bun-ga-ri"
+#~ msgid "English"
+#~ msgstr "tiếng Anh"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Catalan"
-msgstr "tiếng Ca-ta-lăng"
+#~ msgid "Bulgarian"
+#~ msgstr "tiếng Bun-ga-ri"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Traditional)"
-msgstr "tiếng Trung (truyền thống)"
+#~ msgid "Catalan"
+#~ msgstr "tiếng Ca-ta-lăng"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Dutch"
-msgstr "tiếng Hòa"
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "tiếng Trung (truyền thống)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Esperanto"
-msgstr "tiếng Etpêrantô"
+#~ msgid "Dutch"
+#~ msgstr "tiếng Hòa"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "French"
-msgstr "tiếng Pháp"
+#~ msgid "Esperanto"
+#~ msgstr "tiếng Etpêrantô"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "German"
-msgstr "tiếng Đức"
+#~ msgid "French"
+#~ msgstr "tiếng Pháp"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Greek"
-msgstr "tiếng Hy Lạp"
+#~ msgid "German"
+#~ msgstr "tiếng Đức"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Hebrew"
-msgstr "tiếng Do Thái"
+#~ msgid "Greek"
+#~ msgstr "tiếng Hy Lạp"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Indonesian"
-msgstr "tiếng Nam Dương"
+#~ msgid "Hebrew"
+#~ msgstr "tiếng Do Thái"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Italian"
-msgstr "tiếng Ý"
+#~ msgid "Indonesian"
+#~ msgstr "tiếng Nam Dương"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Japanese"
-msgstr "tiếng Nhật"
+#~ msgid "Italian"
+#~ msgstr "tiếng Ý"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Korean"
-msgstr "tiếng Hàn"
+#~ msgid "Japanese"
+#~ msgstr "tiếng Nhật"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Latin"
-msgstr "tiếng La-tinh"
+#~ msgid "Korean"
+#~ msgstr "tiếng Hàn"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Norwegian"
-msgstr "tiếng Na Uy"
+#~ msgid "Latin"
+#~ msgstr "tiếng La-tinh"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Polish"
-msgstr "tiếng Ba Lan"
+#~ msgid "Norwegian"
+#~ msgstr "tiếng Na Uy"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese (Brazilian)"
-msgstr "tiếng Bổ Đào Nhà (Bra-xin)"
+#~ msgid "Polish"
+#~ msgstr "tiếng Ba Lan"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Portuguese"
-msgstr "tiếng Bổ Đào Nhà"
+#~ msgid "Portuguese (Brazilian)"
+#~ msgstr "tiếng Bổ Đào Nhà (Bra-xin)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Russian"
-msgstr "tiếng Nga"
+#~ msgid "Portuguese"
+#~ msgstr "tiếng Bổ Đào Nhà"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Chinese (Simplified)"
-msgstr "tiếng Trung (phổ thông)"
+#~ msgid "Russian"
+#~ msgstr "tiếng Nga"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Spanish"
-msgstr "tiếng Tây Ban Nha"
+#~ msgid "Chinese (Simplified)"
+#~ msgstr "tiếng Trung (phổ thông)"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Swedish"
-msgstr "tiếng Thuỵ Điển"
+#~ msgid "Spanish"
+#~ msgstr "tiếng Tây Ban Nha"
 
-#. Type: select
-#. Choices
-#: ../dsf-helper/web-variables.templates:2001
-msgid "Thai"
-msgstr "tiếng Thái"
+#~ msgid "Swedish"
+#~ msgstr "tiếng Thuỵ Điển"
 
-#. Type: select
-#. DefaultChoice
-#: ../dsf-helper/web-variables.templates:2002
-msgid "English[ Default language]"
-msgstr "Tiếng Việt [Ngôn ngữ mặc định]"
+#~ msgid "Thai"
+#~ msgstr "tiếng Thái"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Default language:"
-msgstr "Ngôn ngữ mặc định:"
+#~ msgid "English[ Default language]"
+#~ msgstr "Tiếng Việt [Ngôn ngữ mặc định]"
 
-#. Type: select
-#. Description
-#: ../dsf-helper/web-variables.templates:2003
-msgid "Please choose the default language for web pages."
-msgstr "Hãy chọn ngôn ngữ mặc định cho trang Web."
+#~ msgid "Default language:"
+#~ msgstr "Ngôn ngữ mặc định:"
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid "Default theme:"
-msgstr "Sắc thái mặc định:"
+#~ msgid "Please choose the default language for web pages."
+#~ msgstr "Hãy chọn ngôn ngữ mặc định cho trang Web."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/web-variables.templates:3001
-msgid ""
-"Please choose the default theme for web pages. This must be a valid name."
-msgstr "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
+#~ msgid "Default theme:"
+#~ msgstr "Sắc thái mặc định:"
 
+#~ msgid ""
+#~ "Please choose the default theme for web pages. This must be a valid name."
+#~ msgstr ""
+#~ "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
+
 #~ msgid "Do you want mail to ${noreply} to be discarded?"
 #~ msgstr "Bạn có muốn hủy mọi thư được gửi cho ${noreply} không?"
 




More information about the Fusionforge-commits mailing list